From a371c60661070ef228014bfdd35088153a56c5d1 Mon Sep 17 00:00:00 2001
From: Shadowss <cata7007@gmail.com>
Date: Sat, 21 Dec 2013 10:28:59 +0200
Subject: [PATCH] forum update

---
 Templates/Alliance/Forum/forum_1.tpl  |   7 +-
 Templates/Alliance/Forum/forum_10.tpl |   7 +-
 Templates/Alliance/Forum/forum_2.tpl  | 273 ++++++++++++++------------
 Templates/Alliance/Forum/forum_3.tpl  |   7 +-
 Templates/Alliance/Forum/forum_4.tpl  |  13 +-
 Templates/Alliance/Forum/forum_5.tpl  |  18 +-
 Templates/Alliance/Forum/forum_6.tpl  |  27 ++-
 Templates/Alliance/Forum/forum_8.tpl  |   7 +-
 Templates/Alliance/Forum/forum_9.tpl  |   9 +-
 Templates/Alliance/forum.tpl          | 176 +++++++++--------
 Templates/Alliance/medal.php          |   6 +-
 Templates/Alliance/overview.tpl       |   6 +-
 allianz.php                           |  81 ++++----
 13 files changed, 365 insertions(+), 272 deletions(-)

diff --git a/Templates/Alliance/Forum/forum_1.tpl b/Templates/Alliance/Forum/forum_1.tpl
index 84033b47..39fa3123 100644
--- a/Templates/Alliance/Forum/forum_1.tpl
+++ b/Templates/Alliance/Forum/forum_1.tpl
@@ -1,5 +1,10 @@
-<!-- //////////////// made by TTMTT //////////////// -->
 <?php
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
 if($session->access!=BANNED){
 ?>
 <script language="JavaScript" type="text/javascript">
diff --git a/Templates/Alliance/Forum/forum_10.tpl b/Templates/Alliance/Forum/forum_10.tpl
index 273ad21e..71ce49dc 100644
--- a/Templates/Alliance/Forum/forum_10.tpl
+++ b/Templates/Alliance/Forum/forum_10.tpl
@@ -1,5 +1,10 @@
 <?php
-//////////////// made by TTMTT ////////////////
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
 if($session->access!=BANNED){
 $topic_id = $_GET['pod'];
 $post_id = $_GET['pod'];
diff --git a/Templates/Alliance/Forum/forum_2.tpl b/Templates/Alliance/Forum/forum_2.tpl
index baaf2656..063cba66 100644
--- a/Templates/Alliance/Forum/forum_2.tpl
+++ b/Templates/Alliance/Forum/forum_2.tpl
@@ -1,9 +1,13 @@
 <?php
-//////////////// made by TTMTT ////////////////
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
 if($session->access!=BANNED){
 $displayarray = $database->getUserArray($session->uid,1);
 $forumcat = $database->ForumCat(htmlspecialchars($displayarray['alliance']));
-$forum_cat = $database->ForumCat;
 $ally = $session->alliance;
 $public = mysql_query("SELECT * FROM ".TB_PREFIX."forum_cat WHERE alliance = $ally AND forum_area = 1");
 $public1 = mysql_num_rows($public);
@@ -28,38 +32,48 @@ if($public1 != 0){
 		</tr></thead><tbody>
 <?php
 foreach($forumcat as $arr) {
-if($arr['forum_area']==1){
-	$countop = $database->CountCat($arr['id']);
-	$ltopic = $database->LastTopic($arr['id']);
-	foreach($ltopic as $las) {
-	}
-	$lpos = $database->LastPost($las['id']);
-	foreach($lpos as $pos) {
-	}
-	if($database->CheckLastTopic($arr['id'])){
-		if($database->CheckLastPost($las['id'])){
-			$lpost = date('m/d/y H:i a',$pos['date']);
-			$owner = $database->getUserArray($pos['owner'],1);
+	if($arr['forum_area']==1){
+			$countop = $database->CountCat($arr['id']);
+			$lpost = "";
+			$owner = "";
+			if ($countop>0) {
+				$ltopic = $database->LastTopic($arr['id']);
+				foreach($ltopic as $las){}
+				$lpos = $database->LastPost($las['id']);
+				foreach($lpos as $pos){}
+				if($database->CheckLastTopic($arr['id'])){
+					if($database->CheckLastPost($las['id'])){
+						$lpost = date('m/d/y H:i a',$pos['date']);
+						$owner = $database->getUserArray($pos['owner'],1);
+					}else{
+						$lpost = date('m/d/y H:i a',$las['date']);
+						$owner = $database->getUserArray($las['owner'],1);
+					}
+				}
+			}	
+		echo	'<tr><td class="ico">';
+		if($database->CheckEditRes($aid)=="1"){
+			echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top">
+			<img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit">
+			<img src="img/x.gif" alt="edit" /></a><br />
+			<a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom">
+			<img src="img/x.gif" alt="To bottom" /></a>
+			<a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete">
+			<img src="img/x.gif" alt="delete" /></a>';
 		}else{
-			$lpost = date('m/d/y H:i a',$las[date]);
-			$owner = $database->getUserArray($las['owner'],1);
-		}
-	}else{
-		$lpost = "";
-		$owner = "";
-	}
-echo	'<tr><td class="ico">';
-if($database->CheckEditRes($aid)=="1"){
-	echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
-}else{
-	echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
-}		
-echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$aid.'" title="'.stripslashes($arr['forum_name']).'">'.stripslashes($arr['forum_name']).'</a><br />'.stripslashes($arr['forum_des']).'</td>
-			<td class="cou">'.$countop.'</td>
-			<td class="last">'.$lpost.'</span><span><br /><a href="spieler.php?uid='.$owner['id'].'">'.$owner['username'].'</a> <img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" /></td>
+			echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
+		}		
+		echo '</td><td class="tit">
+		<a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$aid.'" title="'.stripslashes($arr['forum_name']).'">'.stripslashes($arr['forum_name']).'</a><br />'.stripslashes($arr['forum_des']).'</td>
+		<td class="cou">'.$countop.'</td>
+		<td class="last">'.$lpost.'</span><span><br />';
+		if ($owner!="") {
+			echo '<a href="spieler.php?uid='.$owner['id'].'">'.$owner['username'].'</a> <img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" />';
+		}	
+		echo '</td>
 		</tr>';
 		
-}
+	}
 }
 ?>
 		</tbody></table>
@@ -79,38 +93,42 @@ echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$ai
 		</tr></thead><tbody>
 <?php
 foreach($forumcat as $arr) {
-if($arr['forum_area']==2){
-	$countop = $database->CountCat($arr['id']);
-	$ltopic = $database->LastTopic($arr['id']);
-	foreach($ltopic as $las) {
-	}
-	$lpos = $database->LastPost($las['id']);
-	foreach($lpos as $pos) {
-	}
-	if($database->CheckLastTopic($arr['id'])){
-		if($database->CheckLastPost($las['id'])){
-			$lpost = date('m/d/y H:i a',$pos['date']);
-			$owner = $database->getUserArray($pos['owner'],1);
+	if($arr['forum_area']==2){
+			$countop = $database->CountCat($arr['id']);
+			$lpost = "";
+			$owner = "";
+			if ($countop>0) {
+				$ltopic = $database->LastTopic($arr['id']);
+				foreach($ltopic as $las){}
+				$lpos = $database->LastPost($las['id']);
+				foreach($lpos as $pos){}
+				if($database->CheckLastTopic($arr['id'])){
+					if($database->CheckLastPost($las['id'])){
+						$lpost = date('m/d/y H:i a',$pos['date']);
+						$owner = $database->getUserArray($pos['owner'],1);
+					}else{
+						$lpost = date('m/d/y H:i a',$las['date']);
+						$owner = $database->getUserArray($las['owner'],1);
+					}
+				}
+			}	
+		echo	'<tr><td class="ico">';
+		if($database->CheckEditRes($aid)=="1"){
+			echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
 		}else{
-			$lpost = date('m/d/y H:i a',$las[date]);
-			$owner = $database->getUserArray($las['owner'],1);
-		}
-	}else{
-		$lpost = "";
-		$owner = "";
-	}
-echo	'<tr><td class="ico">';
-if($database->CheckEditRes($aid)=="1"){
-	echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
-}else{
-	echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
-}		
-echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$aid.'" title="'.stripslashes($arr['forum_name']).'">'.stripslashes($arr['forum_name']).'</a><br />'.stripslashes($arr['forum_des']).'</td>
-			<td class="cou">'.$countop.'</td>
-			<td class="last">'.$lpost.'</span><span><br /><a href="spieler.php?uid='.$owner['id'].'">'.$owner['username'].'</a> <img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" /></td>
+			echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
+		}		
+		echo '</td><td class="tit">
+		<a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$aid.'" title="'.stripslashes($arr['forum_name']).'">'.stripslashes($arr['forum_name']).'</a><br />'.stripslashes($arr['forum_des']).'</td>
+		<td class="cou">'.$countop.'</td>
+		<td class="last">'.$lpost.'</span><span><br />';
+		if ($owner!="") {
+			echo '<a href="spieler.php?uid='.$owner['id'].'">'.$owner['username'].'</a> <img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" />';
+		}	
+		echo '</td>
 		</tr>';
 		
-}
+	}
 }
 ?>
 		</tbody></table>
@@ -129,46 +147,50 @@ echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$ai
 			<td>&nbsp;Last post&nbsp;</td>
 		</tr></thead><tbody>
 <?php
-foreach($forumcat as $arr) {
-if($arr['forum_area']==0){
-	$countop = $database->CountCat($arr['id']);
-	$ltopic = $database->LastTopic($arr['id']);
-	foreach($ltopic as $las) {
-	}
-	$lpos = $database->LastPost($las['id']);
-	foreach($lpos as $pos) {
-	}
-	if($database->CheckLastTopic($arr['id'])){
-		if($database->CheckLastPost($las['id'])){
-			$lpost = date('m/d/y H:i a',$pos['date']);
-			$owner = $database->getUserArray($pos['owner'],1);
-		}else{
-			$lpost = date('m/d/y H:i a',$las[date]);
-			$owner = $database->getUserArray($las['owner'],1);
+	foreach($forumcat as $arr) {
+		if($arr['forum_area']==0){
+			$countop = $database->CountCat($arr['id']);
+			$lpost = "";
+			$owner = "";
+			if ($countop>0) {
+				$ltopic = $database->LastTopic($arr['id']);
+				foreach($ltopic as $las){}
+				$lpos = $database->LastPost($las['id']);
+				foreach($lpos as $pos){}
+				if($database->CheckLastTopic($arr['id'])){
+					if($database->CheckLastPost($las['id'])){
+						$lpost = date('m/d/y H:i a',$pos['date']);
+						$owner = $database->getUserArray($pos['owner'],1);
+					}else{
+						$lpost = date('m/d/y H:i a',$las['date']);
+						$owner = $database->getUserArray($las['owner'],1);
+					}
+				}
+			}	
+				echo	'<tr><td class="ico">';
+				if($database->CheckEditRes($aid)=="1"){
+					echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
+				}else{
+					echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
+				}		
+				echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$aid.'" title="'.stripslashes($arr['forum_name']).'">'.stripslashes($arr['forum_name']).'</a><br />'.stripslashes($arr['forum_des']).'</td>
+				<td class="cou">'.$countop.'</td>
+				<td class="last">'.$lpost.'</span><span><br />';
+				if ($owner!="") {
+					echo '<a href="spieler.php?uid='.$owner['id'].'">'.$owner['username'].'</a> <img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" />';
+				}
+				echo '</td>
+				</tr>';
+			
 		}
-	}else{
-		$lpost = "";
-		$owner = "";
-	}
-echo	'<tr><td class="ico">';
-if($database->CheckEditRes($aid)=="1"){
-	echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
-}else{
-	echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
-}		
-echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$aid.'" title="'.stripslashes($arr['forum_name']).'">'.stripslashes($arr['forum_name']).'</a><br />'.stripslashes($arr['forum_des']).'</td>
-			<td class="cou">'.$countop.'</td>
-			<td class="last">'.$lpost.'</span><span><br /><a href="spieler.php?uid='.$owner['id'].'">'.$owner['username'].'</a> <img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" /></td>
-		</tr>';
-		
-}
-}
+	}	
 ?>
 		</tbody></table>
 <?php
-}if($closed1 != 0){
+}
+if($closed1 != 0){
 ?>
-<table cellpadding="1" cellspacing="1" id="closed"><thead>
+	<table cellpadding="1" cellspacing="1" id="closed"><thead>
 		<tr>
 	        <th colspan="4">Closed Forum</th>
 		</tr>
@@ -180,39 +202,42 @@ echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$ai
 			<td>&nbsp;Last post&nbsp;</td>
 		</tr></thead><tbody>
 <?php
-foreach($forumcat as $arr) {
-if($arr['forum_area']==3){
-	$countop = $database->CountCat($arr['id']);
-	$ltopic = $database->LastTopic($arr['id']);
-	foreach($ltopic as $las) {
-	}
-	$lpos = $database->LastPost($las['id']);
-	foreach($lpos as $pos) {
-	}
-	if($database->CheckLastTopic($arr['id'])){
-		if($database->CheckLastPost($las['id'])){
-			$lpost = date('m/d/y H:i a',$pos['date']);
-			$owner = $database->getUserArray($pos['owner'],1);
+	foreach($forumcat as $arr) {
+	if($arr['forum_area']==3){
+			$countop = $database->CountCat($arr['id']);
+			$lpost = "";
+			$owner = "";
+			if ($countop>0) {
+				$ltopic = $database->LastTopic($arr['id']);
+				foreach($ltopic as $las){}
+				$lpos = $database->LastPost($las['id']);
+				foreach($lpos as $pos){}
+				if($database->CheckLastTopic($arr['id'])){
+					if($database->CheckLastPost($las['id'])){
+						$lpost = date('m/d/y H:i a',$pos['date']);
+						$owner = $database->getUserArray($pos['owner'],1);
+					}else{
+						$lpost = date('m/d/y H:i a',$las['date']);
+						$owner = $database->getUserArray($las['owner'],1);
+					}
+				}
+			}	
+		echo	'<tr><td class="ico">';
+		if($database->CheckEditRes($aid)=="1"){
+			echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
 		}else{
-			$lpost = date('m/d/y H:i a',$las[date]);
-			$owner = $database->getUserArray($las['owner'],1);
-		}
-	}else{
-		$lpost = "";
-		$owner = "";
-	}
-echo	'<tr><td class="ico">';
-if($database->CheckEditRes($aid)=="1"){
-	echo '<a class="up_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=-1" title="To top"><img src="img/x.gif" alt="To top" /></a><a class="edit" href="allianz.php?s=2&idf='.$arr['id'].'&admin=editforum" title="edit"><img src="img/x.gif" alt="edit" /></a><br /><a class="down_arr" href="allianz.php?s=2&fid='.$arr['id'].'&bid=0&admin=pos&res=1" title="To bottom"><img src="img/x.gif" alt="To bottom" /></a><a class="fdel" href="allianz.php?s=2&idf='.$arr['id'].'&admin=delforum" onClick="return confirm(\'confirm delete?\');" title="delete"><img src="img/x.gif" alt="delete" /></a>';
-}else{
-	echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
-}		
-echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$aid.'" title="'.stripslashes($arr['forum_name']).'">'.stripslashes($arr['forum_name']).'</a><br />'.stripslashes($arr['forum_des']).'</td>
+			echo '<img class="folder" src="img/x.gif" title="Thread without new posts" alt="Thread without new posts">';
+		}		
+		echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$aid.'" title="'.stripslashes($arr['forum_name']).'">'.stripslashes($arr['forum_name']).'</a><br />'.stripslashes($arr['forum_des']).'</td>
 			<td class="cou">'.$countop.'</td>
-			<td class="last">'.$lpost.'</span><span><br /><a href="spieler.php?uid='.$owner['id'].'">'.$owner['username'].'</a> <img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" /></td>
+			<td class="last">'.$lpost.'</span><span><br />';
+			if ($owner!="") {
+				echo '<a href="spieler.php?uid='.$owner['id'].'">'.$owner['username'].'</a> <img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" />';
+			}	
+			echo '</td>
 		</tr>';
 		
-}
+	}
 }
 ?>
 		</tbody></table>
diff --git a/Templates/Alliance/Forum/forum_3.tpl b/Templates/Alliance/Forum/forum_3.tpl
index cb28dad8..3169b6ec 100644
--- a/Templates/Alliance/Forum/forum_3.tpl
+++ b/Templates/Alliance/Forum/forum_3.tpl
@@ -1,5 +1,10 @@
 <?php
-//////////////// made by TTMTT ////////////////
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
 if($session->access!=BANNED){
 $topic_id = $_GET['idt'];
 $show_topic = $database->ShowTopic($topic_id);
diff --git a/Templates/Alliance/Forum/forum_4.tpl b/Templates/Alliance/Forum/forum_4.tpl
index e8d3af1f..309a7a34 100644
--- a/Templates/Alliance/Forum/forum_4.tpl
+++ b/Templates/Alliance/Forum/forum_4.tpl
@@ -1,5 +1,10 @@
 <?php
-//////////////// made by TTMTT ////////////////
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
 if($session->access!=BANNED){
 $cat_id = $_GET['fid'];
 $CatName = stripslashes($database->ForumCatName($cat_id));
@@ -24,7 +29,7 @@ if($ChckTopic){
 		$lposts = $database->LastPost($arrs['id']);
 			foreach($lposts as $post) {
 			}
-		if($database->CheckLastPost($arrs[id])){
+		if($database->CheckLastPost($arrs['id'])){
 			$post_dates = date('m/d/y, H:i a',$post['date']);
 			$owner_topics = $database->getUserArray($post['owner'],1);
 		}else{
@@ -48,7 +53,7 @@ if($ChckTopic){
 		echo '</td>
 		<td class="tit"><a href="allianz.php?s=2&fid2='.$arrs['cat'].'&pid='.$aid.'&tid='.$arrs['id'].'">'.stripslashes($arrs['title']).'</a><br></td>
 		<td class="cou">'.$CountPosts.'</td>
-		<td class="last">'.$post_dates.'<br /><a href="spieler.php?uid='.$arrs[owner].'">'.$owner_topics['username'].'</a> <a href="allianz.php?s=2&fid2='.$arrs['cat'].'&pid='.$aid.'&tid='.$arrs['id'].'&seite=max"><img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" /></a>
+		<td class="last">'.$post_dates.'<br /><a href="spieler.php?uid='.$arrs['owner'].'">'.$owner_topics['username'].'</a> <a href="allianz.php?s=2&fid2='.$arrs['cat'].'&pid='.$aid.'&tid='.$arrs['id'].'&seite=max"><img class="latest_reply" src="img/x.gif" alt="Show last post" title="Show last post" /></a>
 		</td></tr>';
 	
 	}
@@ -96,7 +101,7 @@ echo '<tr>
 	<a href="allianz.php?s=2&pid=<?php echo $aid; ?>&fid=<?php echo $cat_id; ?>&ac=newtopic"><img id="fbtn_post" class="dynamic_img" src="img/x.gif" alt="Post new thread" /></a> 
 <?php
 	$opt = $database->getAlliPermissions($session->uid, $aid);
-	if($opt[opt5] == 1){
+	if(isset($opt['opt5']) && $opt['opt5']== 1){
 		echo '<a href="allianz.php?s=2&fid='.$cat_id.'&seite=1&admin=switch_admin" title="Toggle Admin mode"><img class="switch_admin dynamic_img" src="img/x.gif" alt="Toggle Admin mode" /></a>';
 	}
 ?>
diff --git a/Templates/Alliance/Forum/forum_5.tpl b/Templates/Alliance/Forum/forum_5.tpl
index 24c75954..802f7eca 100644
--- a/Templates/Alliance/Forum/forum_5.tpl
+++ b/Templates/Alliance/Forum/forum_5.tpl
@@ -1,5 +1,10 @@
-<!-- //////////////// made by TTMTT //////////////// -->
 <?php
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
 if($session->access!=BANNED){
 ?>
 <form method="post" name="post" action="allianz.php?s=2&fid=<?php echo $_GET['fid']; ?>&pid=<?php echo $_GET['pid']; ?>">
@@ -89,7 +94,16 @@ if($session->access!=BANNED){
 
 		<th>Options</th>
 		<td>
-<input class="text" type="text" name="option_1" maxlength="60" /><input class="text" type="text" name="option_2" maxlength="60" /><input class="text" type="text" name="option_3" maxlength="60" /><input class="text" type="text" name="option_4" maxlength="60" /><input class="text" type="text" name="option_5" maxlength="60" /><input class="text" type="text" name="option_6" maxlength="60" /><input class="text" type="text" name="option_7" maxlength="60" /><input class="text" type="text" name="option_8" maxlength="60" /></td><td></td>
+Option 1: <input class="text" type="text" name="option_1" maxlength="100" style="width:150px"/><br>
+Option 2: <input class="text" type="text" name="option_2" maxlength="100" style="width:150px"/><br>
+Option 3: <input class="text" type="text" name="option_3" maxlength="100" style="width:150px"/><br>
+Option 4: <input class="text" type="text" name="option_4" maxlength="100" style="width:150px"/><br>
+Option 5: <input class="text" type="text" name="option_5" maxlength="100" style="width:150px"/><br>
+Option 6: <input class="text" type="text" name="option_6" maxlength="100" style="width:150px"/><br>
+Option 7: <input class="text" type="text" name="option_7" maxlength="100" style="width:150px"/><br>
+Option 8: <input class="text" type="text" name="option_8" maxlength="100" style="width:150px"/><br>
+</td>
+<td></td>
 		</tr>
 <tr>
 	<th>ends on</th>
diff --git a/Templates/Alliance/Forum/forum_6.tpl b/Templates/Alliance/Forum/forum_6.tpl
index 35313a1a..bd6d6f08 100644
--- a/Templates/Alliance/Forum/forum_6.tpl
+++ b/Templates/Alliance/Forum/forum_6.tpl
@@ -1,5 +1,10 @@
 <?php
-//////////////// made by TTMTT ////////////////
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
 if($session->access!=BANNED){
 $tid = $_GET['tid'];
 $opt = $database->getAlliPermissions($session->uid, $aid);
@@ -66,16 +71,26 @@ if($database->CheckEditRes($aid)=="1"){
 	$survey = $database->getSurvey($arr['id']);
 	if(!$database->checkVote($arr['id'], $session->uid) && ($survey['ends'] > time() || $survey['ends'] == 0)){
 	?>
-	<tr><td class="pcontent" colspan="2"><div><center>Survey: <?php echo $survey['title']; ?></center></div>
-		<div class="clear dotted"></div><div class="text">
+	<tr><td colspan="2"><div><center>Survey: <?php echo $survey['title']; ?></center></div>
+		<div class="clear dotted"></div>
 		<form method="post" name="post" action="allianz.php?s=2&fid2=<?php echo $_GET['fid2']; ?>&pid=<?php echo $_GET['pid']; ?>&tid=<?php echo $_GET['tid']; ?>">
+		<table width="100%" border="0" align="left" cellPadding="0" style="border-collapse: collapse">
 		<?php
 		for($i=1;$i<=8;$i++){
+		if (!empty($survey['option'.$i])) {
 		?>
-		<input class="radio" type="radio" name="vote" value="<?php echo $i; ?>" /><?php echo $survey['option'.$i]; ?></br>
+		<tr>
+		<td width="5%">
+		<input class="radio" type="radio" name="vote" value="<?php echo $i; ?>" /></td>
+		<td width="95%">
+		<?php echo $survey['option'.$i]; ?>
+		</td>
 		<?php
 		}
+		}
 		?>
+		</table>
+		<div class="text">
 		<input type="hidden" name="fid2" value="<?php echo $_GET['fid2']; ?>" />
 		<input type="hidden" name="pid" value="<?php echo $_GET['pid']; ?>" />
 		<input type="hidden" name="tid" value="<?php echo $_GET['tid']; ?>" />
@@ -148,10 +163,10 @@ echo '<div class="clear dotted"></div><div class="text">'.$bbcode_post.'</div></
 ?>
 	</tbody></table><div style="margin-top: 15px;">
 	<?php
-	if(empty($arr[close])){
+	if(empty($arr['close'])){
 		echo '<a href="allianz.php?s=2&fid2='.$arr['cat'].'&pid='.$arr['alliance'].'&tid='.$arr['id'].'&ac=newpost"><img id="fbtn_reply" class="dynamic_img"src="img/x.gif" alt="Replies" /></a>';
 	}
-	if($opt[opt5] == 1){
+	if($opt['opt5'] == 1){
 		echo '<a href="allianz.php?s=2&pid='.$aid.'&tid='.$arr['id'].'&admin=switch_admin" title="Toggle Admin mode"><img class="switch_admin dynamic_img" src="img/x.gif" alt="Toggle Admin mode" /></a>';
 	}
 	 
diff --git a/Templates/Alliance/Forum/forum_8.tpl b/Templates/Alliance/Forum/forum_8.tpl
index 5d21c911..92c919a2 100644
--- a/Templates/Alliance/Forum/forum_8.tpl
+++ b/Templates/Alliance/Forum/forum_8.tpl
@@ -1,5 +1,10 @@
 <?php
-//////////////// made by TTMTT ////////////////
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
 if($session->access!=BANNED){
 $forum_data = $database->ForumCatEdit($_GET['idf']);
 foreach($forum_data as $cats) {
diff --git a/Templates/Alliance/Forum/forum_9.tpl b/Templates/Alliance/Forum/forum_9.tpl
index 93094e7a..05d4d281 100644
--- a/Templates/Alliance/Forum/forum_9.tpl
+++ b/Templates/Alliance/Forum/forum_9.tpl
@@ -1,5 +1,10 @@
 <?php
-//////////////// made by TTMTT ////////////////
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
 if($session->access!=BANNED){
 $topic_id = $_GET['idt'];
 $topics = $database->ShowTopic($topic_id);
@@ -14,7 +19,7 @@ foreach($topics as $top) {
 	$report0 = $top['report0'];
 }
 ?>
-<form method="post" name="post" action="allianz.php?s=2&fid2=<?php echo $_GET['fid2']; ?>&pid=<?php echo $_GET['pid']; ?>&tid=<?php echo $_GET['idt']; ?>">
+<form method="post" name="post" action="allianz.php?s=2&fid2=<?php echo $_GET['pid']; ?>&pid=<?php echo $_GET['pid']; ?>&tid=<?php echo $_GET['idt']; ?>">
 	<input type="hidden" name="s" value="2">
 	<input type="hidden" name="tid" value="<?php echo $_GET['idt']; ?>">
 	<input type="hidden" name="alliance0" value="<?php echo $alliance0; ?>">
diff --git a/Templates/Alliance/forum.tpl b/Templates/Alliance/forum.tpl
index 8f59108b..1013aaea 100644
--- a/Templates/Alliance/forum.tpl
+++ b/Templates/Alliance/forum.tpl
@@ -1,10 +1,16 @@
 <?php
-//////////////// made by TTMTT ////////////////
+############################################################
+##              DO NOT REMOVE THIS NOTICE                 ##
+##                    MADE BY TTMTT                       ##
+##                     FIX BY RONIX                       ##
+##                       TRAVIANZ                         ##
+############################################################
+
 if(isset($aid)) {
 $aid = $aid;
-}else if($_GET['fid']){
+}else if(isset($_GET['fid'])){
 $aid = $database->ForumCatAlliance($_GET['fid']);
-}else if($_GET['fid2']){
+}else if(isset($_GET['fid2'])){
 $aid = $database->ForumCatAlliance($_GET['fid2']);
 }else{
 $aid = $session->alliance;
@@ -49,84 +55,83 @@ if(isset($_POST['newtopic'])){
 
 	if($text != ""){
 		if(!preg_match('/\[message\]/',$text) && !preg_match('/\[\/message\]/',$text)){
-		$text = "[message]".$text."[/message]";
-		$alliance = $player = $coor = $report = 0;
-		for($i=0;$i<=$alliance;$i++){
-		if(preg_match('/\[alliance'.$i.'\]/',$text) && preg_match('/\[\/alliance'.$i.'\]/',$text)){
-		$alliance1 = preg_replace('/\[message\](.*?)\[\/alliance'.$i.'\]/is', '', $text);
-		if(preg_match('/\[alliance'.$i.'\]/',$alliance1) && preg_match('/\[\/alliance'.$i.'\]/',$alliance1)){
-		$j = $i+1;
-		$alliance2 = preg_replace('/\[\/alliance'.$i.'\](.*?)\[\/message\]/is', '', $text);
-		$alliance1 = preg_replace('/\[alliance'.$i.'\]/', '[alliance'.$j.']', $alliance1);
-		$alliance1 = preg_replace('/\[\/alliance'.$i.'\]/', '[/alliance'.$j.']', $alliance1);
-		$text = $alliance2."[/alliance".$i."]".$alliance1;
-		$alliance += 1;
-		}
-		}
-		}
-		for($i=0;$i<=$player;$i++){
-		if(preg_match('/\[player'.$i.'\]/',$text) && preg_match('/\[\/player'.$i.'\]/',$text)){
-		$player1 = preg_replace('/\[message\](.*?)\[\/player'.$i.'\]/is', '', $text);
-		if(preg_match('/\[player'.$i.'\]/',$player1) && preg_match('/\[\/player'.$i.'\]/',$player1)){
-		$j = $i+1;
-		$player2 = preg_replace('/\[\/player'.$i.'\](.*?)\[\/message\]/is', '', $text);
-		$player1 = preg_replace('/\[player'.$i.'\]/', '[player'.$j.']', $player1);
-		$player1 = preg_replace('/\[\/player'.$i.'\]/', '[/player'.$j.']', $player1);
-		$text = $player2."[/player".$i."]".$player1;
-		$player += 1;
-		}
-		}
-		}
-		for($i=0;$i<=$coor;$i++){
-		if(preg_match('/\[coor'.$i.'\]/',$text) && preg_match('/\[\/coor'.$i.'\]/',$text)){
-		$coor1 = preg_replace('/\[message\](.*?)\[\/coor'.$i.'\]/is', '', $text);
-		if(preg_match('/\[coor'.$i.'\]/',$coor1) && preg_match('/\[\/coor'.$i.'\]/',$coor1)){
-		$j = $i+1;
-		$coor2 = preg_replace('/\[\/coor'.$i.'\](.*?)\[\/message\]/is', '', $text);
-		$coor1 = preg_replace('/\[coor'.$i.'\]/', '[coor'.$j.']', $coor1);
-		$coor1 = preg_replace('/\[\/coor'.$i.'\]/', '[/coor'.$j.']', $coor1);
-		$text = $coor2."[/coor".$i."]".$coor1;
-		$coor += 1;
-		}
-		}
-		}
-		for($i=0;$i<=$report;$i++){
-		if(preg_match('/\[report'.$i.'\]/',$text) && preg_match('/\[\/report'.$i.'\]/',$text)){
-		$report1 = preg_replace('/\[message\](.*?)\[\/report'.$i.'\]/is', '', $text);
-		if(preg_match('/\[report'.$i.'\]/',$report1) && preg_match('/\[\/report'.$i.'\]/',$report1)){
-		$j = $i+1;
-		$report2 = preg_replace('/\[\/report'.$i.'\](.*?)\[\/message\]/is', '', $text);
-		$report1 = preg_replace('/\[report'.$i.'\]/', '[report'.$j.']', $report1);
-		$report1 = preg_replace('/\[\/report'.$i.'\]/', '[/report'.$j.']', $report1);
-		$text = $report2."[/report".$i."]".$report1;
-		$report += 1;
-		}
-		}
-		}
-	$topic_id = $database->CreatTopic($title,$text,$cat,$owner,$alli,$ends,$alliance,$player,$coor,$report);
-	if($_POST['umfrage']) {
-		if(isset($_POST['umfrage_ende'])){
-			$ends_date = $_POST['month']."/".$_POST['day']."/".$_POST['year'];
-			if($_POST['meridiem'] == 1){
-			$_POST['hour'] += 12;
+			$text = "[message]".$text."[/message]";
+			$alliance = $player = $coor = $report = 0;
+			for($i=0;$i<=$alliance;$i++){
+				if(preg_match('/\[alliance'.$i.'\]/',$text) && preg_match('/\[\/alliance'.$i.'\]/',$text)){
+					$alliance1 = preg_replace('/\[message\](.*?)\[\/alliance'.$i.'\]/is', '', $text);
+					if(preg_match('/\[alliance'.$i.'\]/',$alliance1) && preg_match('/\[\/alliance'.$i.'\]/',$alliance1)){
+						$j = $i+1;
+						$alliance2 = preg_replace('/\[\/alliance'.$i.'\](.*?)\[\/message\]/is', '', $text);
+						$alliance1 = preg_replace('/\[alliance'.$i.'\]/', '[alliance'.$j.']', $alliance1);
+						$alliance1 = preg_replace('/\[\/alliance'.$i.'\]/', '[/alliance'.$j.']', $alliance1);
+						$text = $alliance2."[/alliance".$i."]".$alliance1;
+						$alliance += 1;
+					}
+				}
+			}
+			for($i=0;$i<=$player;$i++){
+				if(preg_match('/\[player'.$i.'\]/',$text) && preg_match('/\[\/player'.$i.'\]/',$text)){
+					$player1 = preg_replace('/\[message\](.*?)\[\/player'.$i.'\]/is', '', $text);
+					if(preg_match('/\[player'.$i.'\]/',$player1) && preg_match('/\[\/player'.$i.'\]/',$player1)){
+						$j = $i+1;
+						$player2 = preg_replace('/\[\/player'.$i.'\](.*?)\[\/message\]/is', '', $text);
+						$player1 = preg_replace('/\[player'.$i.'\]/', '[player'.$j.']', $player1);
+						$player1 = preg_replace('/\[\/player'.$i.'\]/', '[/player'.$j.']', $player1);
+						$text = $player2."[/player".$i."]".$player1;
+						$player += 1;
+					}
+				}
+			}
+			for($i=0;$i<=$coor;$i++){
+				if(preg_match('/\[coor'.$i.'\]/',$text) && preg_match('/\[\/coor'.$i.'\]/',$text)){
+					$coor1 = preg_replace('/\[message\](.*?)\[\/coor'.$i.'\]/is', '', $text);
+					if(preg_match('/\[coor'.$i.'\]/',$coor1) && preg_match('/\[\/coor'.$i.'\]/',$coor1)){
+						$j = $i+1;
+						$coor2 = preg_replace('/\[\/coor'.$i.'\](.*?)\[\/message\]/is', '', $text);
+						$coor1 = preg_replace('/\[coor'.$i.'\]/', '[coor'.$j.']', $coor1);
+						$coor1 = preg_replace('/\[\/coor'.$i.'\]/', '[/coor'.$j.']', $coor1);
+						$text = $coor2."[/coor".$i."]".$coor1;
+						$coor += 1;
+					}
+				}
+			}
+			for($i=0;$i<=$report;$i++){
+				if(preg_match('/\[report'.$i.'\]/',$text) && preg_match('/\[\/report'.$i.'\]/',$text)){
+					$report1 = preg_replace('/\[message\](.*?)\[\/report'.$i.'\]/is', '', $text);
+					if(preg_match('/\[report'.$i.'\]/',$report1) && preg_match('/\[\/report'.$i.'\]/',$report1)){
+						$j = $i+1;
+						$report2 = preg_replace('/\[\/report'.$i.'\](.*?)\[\/message\]/is', '', $text);
+						$report1 = preg_replace('/\[report'.$i.'\]/', '[report'.$j.']', $report1);
+						$report1 = preg_replace('/\[\/report'.$i.'\]/', '[/report'.$j.']', $report1);
+						$text = $report2."[/report".$i."]".$report1;
+						$report += 1;
+					}
+				}
+			}
+			$survey = 0;
+			$ends='';
+			if(isset($_POST['umfrage'])) {
+				if(isset($_POST['umfrage_ende'])){
+					$ends_date = $_POST['month']."/".$_POST['day']."/".$_POST['year'];
+					if($_POST['meridiem'] == 1){
+						$_POST['hour'] += 12;
+					}
+					$ends_time = $_POST['hour'].":".$_POST['minute'];
+					$ends = strtotime($ends_date)-strtotime(date('m/d/Y'))+strtotime($ends_time);
+				}
+				for($i=1;$i<=8;$i++){
+					if(isset($_POST['option_'.$i]) && $_POST['option_'.$i]!= ""){
+						$survey = 1;
+					}
+				}
+			}
+			$topic_id = $database->CreatTopic($title,$text,$cat,$owner,$alli,$ends,$alliance,$player,$coor,$report);
+			if($survey == 1){
+				$database->createSurvey($topic_id, $_POST['umfrage_thema'], $_POST['option_1'], $_POST['option_2'], $_POST['option_3'], $_POST['option_4'], $_POST['option_5'], $_POST['option_6'], $_POST['option_7'], $_POST['option_8'], $ends);
 			}
-			$ends_time = $_POST['hour'].":".$_POST['minute'];
-			$ends = strtotime($ends_date)-strtotime(date('m/d/Y'))+strtotime($ends_time);
-		}else{
-			$ends = '';
-		}
-		$survey = 0;
-		for($i=1;$i<=8;$i++){
-		if($_POST['option'.$i] != ""){
-		$survey = 1;
-		}
-		}
-		if($survey == 1){
-		$database->createSurvey($topic_id, $_POST['umfrage_thema'], $_POST['option_1'], $_POST['option_2'], $_POST['option_3'], $_POST['option_4'], $_POST['option_5'], $_POST['option_6'], $_POST['option_7'], $_POST['option_8'], $ends);
 		}
 	}
-	}
-}
 }
 if(isset($_POST['newpost'])){
 	$text = $_POST['text'];
@@ -373,25 +378,26 @@ if($opt['opt5'] == 1){
 }
 }
 if($_GET['admin']== "pin"){
-	$database->StickTopic($_GET[idt],1); // stick topic
+	$database->StickTopic($_GET['idt'],1); // stick topic
 }
 if($_GET['admin']== "unpin"){
-	$database->StickTopic($_GET[idt],''); // unstick topic
+	$database->StickTopic($_GET['idt'],''); // unstick topic
 }
 if($_GET['admin']== "delforum"){
-	$database->DeleteCat($_GET[idf]); // delete forum
+	$database->DeleteCat($_GET['idf']); // delete forum
 }
 if($_GET['admin']== "deltopic"){
-	$database->DeleteTopic($_GET[idt]); // delete topic
+	$database->DeleteTopic($_GET['idt']); // delete topic
+	$database->DeleteSurvey($_GET['idt']); // delete survey
 }
 if($_GET['admin']== "delpost"){
-	$database->DeletePost($_GET[pod]); // stick topic
+	$database->DeletePost($_GET['pod']); // stick topic
 }
 if($_GET['admin']== "lock"){
-	$database->LockTopic($_GET[idt],1); // lock topic
+	$database->LockTopic($_GET['idt'],1); // lock topic
 }
 if($_GET['admin']== "unlock"){
-	$database->LockTopic($_GET[idt],''); // unlock topic
+	$database->LockTopic($_GET['idt'],''); // unlock topic
 }
 if($_GET['admin']== "newforum"){
 	include("Forum/forum_1.tpl");  // new forum
diff --git a/Templates/Alliance/medal.php b/Templates/Alliance/medal.php
index 3d9de4c1..c3e58e68 100644
--- a/Templates/Alliance/medal.php
+++ b/Templates/Alliance/medal.php
@@ -22,7 +22,7 @@ INDELING CATEGORIEEN:
 == 8. in top 3 - klimmers    ==
 == 9. in top 3 - overval     ==
 ******************************/
-$geregistreerd=date('d-m-Y', ($allianceinfo['timestamp']));
+//$geregistreerd=date('d-m-Y', ($allianceinfo['timestamp']));
 
 $profiel = preg_replace("/\[war]/s",'At war with<br>'.$database->getAllianceWar($aid), $profiel, 1); 
 $profiel = preg_replace("/\[ally]/s",'Confederacies<br>'.$database->getAllianceDipProfile($aid,1), $profiel, 1); 
@@ -50,7 +50,7 @@ switch ($medal['categorie']) {
 		$woord="Resources";
         break;
 	 case "5":
-        $titel="Receiving this medal shows that your alliance was in the top 3 of both attackers and defenders of the week.";
+        $titel="Receiving this medal shows that your alliance was in the top 3 of both attacckers and defenders of the week.";
         $bonus[$medal['id']]=1;
 		break;
 	 case "6":
@@ -58,7 +58,7 @@ switch ($medal['categorie']) {
         $bonus[$medal['id']]=1;
 		break;
 	 case "7":
-        $titel="Receiving this medal shows that your alliance was in the top 3 of the defenders of the week ".$medal['points']." in a row";
+        $titel="Receiving this medal shows that your alliance was in the top 3 of the deffenders of the week ".$medal['points']." in a row";
         $bonus[$medal['id']]=1;
 		break;
 	 case "8":
diff --git a/Templates/Alliance/overview.tpl b/Templates/Alliance/overview.tpl
index a7a1021c..cb93aff9 100644
--- a/Templates/Alliance/overview.tpl
+++ b/Templates/Alliance/overview.tpl
@@ -18,9 +18,9 @@ foreach($memberlist as $member) {
 }
 echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
 
-$profiel="".$allianceinfo['notice']."".md5(skJkev3)."".$allianceinfo['desc']."";
+$profiel="".$allianceinfo['notice']."".md5('skJkev3')."".$allianceinfo['desc']."";
 require("medal.php");
-$profiel=explode("".md5(skJkev3)."", $profiel);
+$profiel=explode("".md5('skJkev3')."", $profiel);
 
 include("alli_menu.tpl"); 
 
@@ -54,7 +54,7 @@ include("alli_menu.tpl");
             </tr>
             <tr>
                 <th>Rank</th>
-                <td><?php echo $ranking->getAllianceRank($aid); ?></td>
+                <td><?php echo $ranking->getAllianceRank($aid); ?>.</td>
             </tr>
             <tr>
                 <th>Points</th>
diff --git a/allianz.php b/allianz.php
index d5690177..3f0c0218 100644
--- a/allianz.php
+++ b/allianz.php
@@ -1,55 +1,58 @@
 <?php
-
+//fix by ronix
 if(isset($_GET['aid']) && !is_numeric($_GET['aid'])) die('Hacking Attemp');
-	   include ("GameEngine/Village.php");
-	   include ("GameEngine/Chat.php");
-	   $start = $generator->pageLoadTimeStart();
-	   $alliance->procAlliance($_GET);
+include ("GameEngine/Village.php");
+include ("GameEngine/Chat.php");
+$start = $generator->pageLoadTimeStart();
+$alliance->procAlliance($_GET);
 if(isset($_GET['newdid'])) {
 	$_SESSION['wid'] = $_GET['newdid'];
 	if(isset($_GET['s'])){
-	header("Location: ".$_SERVER['PHP_SELF']."?s=".preg_replace("/[^a-zA-Z0-9_-]/","",$_GET['s']));
+		header("Location: ".$_SERVER['PHP_SELF']."?s=".preg_replace("/[^a-zA-Z0-9_-]/","",$_GET['s']));
 	}else if(isset($_GET['aid'])){
-	header("Location: ".$_SERVER['PHP_SELF']."?aid=".preg_replace("/[^a-zA-Z0-9_-]/","",$_GET['aid']));
+		header("Location: ".$_SERVER['PHP_SELF']."?aid=".preg_replace("/[^a-zA-Z0-9_-]/","",$_GET['aid']));
+	}else{
+		header("Location: ".$_SERVER['PHP_SELF']);
 	}
-	else{
-	header("Location: ".$_SERVER['PHP_SELF']);
 }
+if(isset($_GET['s'])){
+	$automation->isWinner();
 }
-	   if(isset($_GET['s'])){
-		$automation->isWinner();
-		}
 
 if(isset($_GET['fid'])){
-$fid = preg_replace("/[^0-9]/","",$_GET['fid']);
-$forum = mysql_query("SELECT * FROM " . TB_PREFIX . "forum_cat WHERE id = ".$fid."");
-$forum_type = mysql_fetch_array($forum);
-if($forum_type['forum_name'] != "" && $forum_type['forum_area'] == 0){
-if($forum_type['alliance'] != $session->alliance){
-	header("Location: ".$_SERVER['PHP_SELF']);
-}
-}
+	$fid = preg_replace("/[^0-9]/","",$_GET['fid']);
+	$forum = mysql_query("SELECT * FROM " . TB_PREFIX . "forum_cat WHERE id = ".$fid."");
+	$forum_type = mysql_fetch_array($forum);
+	if($forum_type['forum_name'] != "" && $forum_type['forum_area'] == 0){
+		if($forum_type['alliance'] != $session->alliance){
+			header("Location: ".$_SERVER['PHP_SELF']);
+		}
+	}
 }else if(isset($_GET['fid2'])){
-$fid = preg_replace("/[^0-9]/","",$_GET['fid2']);
-$forum = mysql_query("SELECT * FROM " . TB_PREFIX . "forum_cat WHERE id = ".$fid."");
-$forum_type = mysql_fetch_array($forum);
-if($forum_type['forum_name'] != "" && $forum_type['forum_area'] != 1){
-if($forum_type['forum_area'] == 0){
-if($forum_type['alliance'] != $session->alliance){
-	header("Location: ".$_SERVER['PHP_SELF']);
+	$fid = preg_replace("/[^0-9]/","",$_GET['fid2']);
+	$forum = mysql_query("SELECT * FROM " . TB_PREFIX . "forum_cat WHERE id = ".$fid."");
+	if (!empty($forum)) {
+		$forum_type = mysql_fetch_array($forum);
+		if($forum_type['forum_name'] != "" && $forum_type['forum_area'] != 1){
+			if($forum_type['forum_area'] == 0){
+				if($forum_type['alliance'] != $session->alliance){
+					header("Location: ".$_SERVER['PHP_SELF']);
+				}
+			}else if($forum_type['forum_area'] == 2){
+				if($forum_type['alliance'] != $session->alliance){
+					header("Location: ".$_SERVER['PHP_SELF']);
+				}
+			}else if($forum_type['forum_area'] == 3){
+				if($forum_type['alliance'] != $session->alliance){
+					header("Location: ".$_SERVER['PHP_SELF']);
+				}
+			}else{
+				header("Location: ".$_SERVER['PHP_SELF']);
+			}
+		}
+	}	
 }
-}else if($forum_type['forum_area'] == 2){
-if($forum_type['alliance'] != $session->alliance){
-}else if($forum_type['forum_area'] == 3){
-
-}
-
-}else{
-	header("Location: ".$_SERVER['PHP_SELF']);
-}
-}
-}
-if($_GET['aid'] or $_GET['fid'] or $_GET['fid2'] or $session->alliance!=0){
+if(isset($_GET['aid']) or isset($_GET['fid']) or isset($_GET['fid2']) or $session->alliance!=0){
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>