xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-19 19:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

more alliance fixes

Browse Source
This commit is contained in:
unknown
2012-06-26 23:17:47 +03:00
parent 6c3502fbee
commit 1f4b475e2f
14 changed files with 105 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Alliance/allidesc.tpl
+2 -8
View File
@@ -15,8 +15,7 @@ foreach($memberlist as $member) {
}
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
include("alli_menu.tpl");
if($session->access!=BANNED){
include("alli_menu.tpl");
?>
<table cellpadding="1" cellspacing="1" id="edit"><thead>
<form method="post" action="allianz.php">
@@ -134,9 +133,4 @@ INDELING CATEGORIEEN:
</table></p>
</table>
<p class="btn"><input tabindex="3" type="image" value="" name="s1" id="btn_save" class="dynamic_img" src="img/x.gif" alt="save" /></p></form>
<?php
}else{
header("Location: banned.php");
}
?>
<p class="btn"><input tabindex="3" type="image" value="" name="s1" id="btn_save" class="dynamic_img" src="img/x.gif" alt="save" /></p></form>
Templates/Alliance/changename.tpl
+1 -7
View File
@@ -8,7 +8,6 @@ $aid = $session->alliance;
$allianceinfo = $database->getAlliance($aid);
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
include("alli_menu.tpl");
if($session->access!=BANNED){
?>
<table cellpadding="1" cellspacing="1" cellpadding="1" cellspacing="1" id="name" class="small_option"><thead>
<form method="post" action="allianz.php">
@@ -36,9 +35,4 @@ if($session->access!=BANNED){
<p class="error3"><?php echo $form->getError("ally2"); ?></p>
<p class="error3"><?php echo $form->getError("owner"); ?></p>
<p class="error3"><?php echo $form->getError("tag"); ?></p>
<p class="error3"><?php echo $form->getError("name"); ?></p>
<?php
}else{
header("Location: banned.php");
}
?>
<p class="error3"><?php echo $form->getError("name"); ?></p>
Templates/Alliance/chgdiplo.tpl
+1 -7
View File
@@ -24,7 +24,6 @@
$allianceinfo = $database->getAlliance($aid);
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
include("alli_menu.tpl");
if($session->access!=BANNED){
?>
<form method="post" action="allianz.php">
<input type="hidden" name="a" value="6"> <input type="hidden" name="o" value="6"> <input type="hidden" name="s" value="5">
@@ -200,9 +199,4 @@
?>
</tbody>
</table>
<?php
}else{
header("Location: banned.php");
}
?>
</table>
Templates/Alliance/invite.tpl
+2 -8
View File
@@ -9,7 +9,6 @@ $allianceinfo = $database->getAlliance($aid);
$allianceInvitations = $database->getAliInvitations($aid);
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
include("alli_menu.tpl");
if($session->access!=BANNED){
?>
<table cellpadding="1" cellspacing="1" id="invite" class="small_option"><thead>
@@ -27,7 +26,7 @@ if($session->access!=BANNED){
<td><input class="name text" type="text" name="a_name" maxlength="20"><span class="error"></span></td>
</tr>
</tbody></table>
<p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></form> </p>
<p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" onclick="this.disabled=true;this.form.submit();"/></form> </p>
<p class="error"><?php echo $form->getError("name1"); ?><br /><?php echo $form->getError("name2"); ?><br /><?php echo $form->getError("name3"); ?><br /><?php echo $form->getError("name4"); ?><br /><?php echo $form->getError("name5"); ?><br /><?php echo $form->getError("perm"); ?></p><br />
<table cellpadding="1" cellspacing="1" id="invitations" class="small_option"><thead>
@@ -53,9 +52,4 @@ if (count($allianceInvitations) == 0) {
}
?>
</tbody>
</table>
<?php
}else{
header("Location: banned.php");
}
?>
</table>
Templates/Alliance/kick.tpl
+1 -7
View File
@@ -9,7 +9,6 @@ $memberlist = $database->getAllMember($aid);
$allianceinfo = $database->getAlliance($aid);
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
include("alli_menu.tpl");
if($session->access!=BANNED){
?>
<form method="post" action="allianz.php">
<table cellpadding="1" cellspacing="1" id="position" class="small_option">
@@ -43,9 +42,4 @@ if($session->access!=BANNED){
<input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" />
</p>
</form>
<p class="error"></p>
<?php
}else{
header("Location: banned.php");
}
?>
<p class="error"></p>
Templates/Alliance/linkforum.tpl
+1 -7
View File
@@ -8,7 +8,6 @@ $aid = $session->alliance;
$allianceinfo = $database->getAlliance($aid);
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
include("alli_menu.tpl");
if($session->access!=BANNED){
?>
<form method="post" action="allianz.php">
<input type="hidden" name="a" value="5">
@@ -30,9 +29,4 @@ if($session->access!=BANNED){
</tr></tbody>
</table>
<p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></form></p>
<?php
}else{
header("Location: banned.php");
}
?>
<p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></form></p>
Templates/Alliance/option.tpl
+1 -1
View File
@@ -82,4 +82,4 @@ if ($alliance->userPermArray['opt5']==1){
</tbody>
</table>
<p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></form></p>
<p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" onclick="this.disabled=true;this.form.submit();"/></form></p>
Templates/Alliance/quitalli.tpl
+1 -7
View File
@@ -8,7 +8,6 @@ $aid = $session->alliance;
$allianceinfo = $database->getAlliance($aid);
echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
include("alli_menu.tpl");
if($session->access!=BANNED){
?>
<table cellpadding="1" cellspacing="1" id="quit" class="small_option"><thead>
@@ -26,9 +25,4 @@ if($session->access!=BANNED){
<td><input class="pass text" type="password" name="pw" maxlength="20"></td>
</tr></tbody></table>
<p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></form></p>
<?php
}else{
header("Location: banned.php");
}
?>
<p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" alt="OK" /></form></p>
Templates/Build/18.tpl
+1 -7
View File
@@ -46,15 +46,9 @@ echo "
<?php
if($alliance->gotInvite) {
foreach($alliance->inviteArray as $invite) {
if($session->access!=BANNED){
echo "<td class=\"abo\"><a href=\"build.php?id=".$id."&a=2&d=".$invite['id']."\"><img class=\"del\" src=\"img/x.gif\" alt=\"refuse\" title=\"refuse\" /></a></td>
<td class=\"nam\"><a href=\"allianz.php?aid=".$invite['alliance']."\">&nbsp;".$database->getAllianceName($invite['alliance'])."</a></td>
<td class=\"acc\"><a href=\"build.php?id=".$id."&a=3&d=".$invite['id']."\">&nbsp;accept</a></td>";
}else{
echo "<td class=\"abo\"><a href=\"banned.php\"><img class=\"del\" src=\"img/x.gif\" alt=\"refuse\" title=\"refuse\" /></a></td>
<td class=\"nam\"><a href=\"banned.php\">&nbsp;".$database->getAllianceName($invite['alliance'])."</a></td>
<td class=\"acc\"><a href=\"banned.php\">&nbsp;accept</a></td>";
}
<td class=\"acc\"><a href=\"build.php?id=".$id."&a=3&d=".$invite['id']."\">&nbsp;accept</a></td><tr>";
}
}
else {
Templates/text.tpl
+2 -2
View File
@@ -2,7 +2,7 @@
#################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ##
## Filename text.tpl ##
## Filename text_format.tpl ##
## Developed by: Dixie ##
## License: TravianX Project ##
## Copyright: TravianX (c) 2010-2011. All rights reserved. ##
@@ -10,7 +10,7 @@
#################################################################################
$txt="ssss";
$txt="1";
//bbcode = html code
$txt = preg_replace("/\[b\]/is",'<b>', $txt);