diff --git a/Templates/Alliance/Forum/forum_6.tpl b/Templates/Alliance/Forum/forum_6.tpl
index a124293e..73e52195 100644
--- a/Templates/Alliance/Forum/forum_6.tpl
+++ b/Templates/Alliance/Forum/forum_6.tpl
@@ -62,7 +62,7 @@ $bbcode_topic = stripslashes(nl2br($bbcoded));
 		<td class="pcontent"><div class="posted">created: <?php echo $date; ?></div>
 <?php
 if($database->CheckEditRes($aid)=="1"){
-	echo '<div class="admin"><a class="edit" href="allianz.php?s=2&pid='.$arr['alliance'].'&idf='.$arr['cat'].'&idt='.$arr['id'].'&admin=editans"><img src="img/x.gif" title="edit" alt="edit" /></a><a class="fdel" href="?s=2&pid='.$arr['alliance'].'&tid='.$arr['id'].'&admin=deltopic" onClick="return confirm(\'confirm delete?\');"><img src="img/x.gif" title="delete" alt="delete" /></a></div><br />';
+	echo '<div class="admin"><a class="edit" href="allianz.php?s=2&pid='.$arr['alliance'].'&fid2='.$_GET['fid2'].'&idf='.$arr['cat'].'&idt='.$arr['id'].'&admin=editans"><img src="img/x.gif" title="edit" alt="edit" /></a><a class="fdel" href="?s=2&pid='.$arr['alliance'].'&tid='.$arr['id'].'&admin=deltopic" onClick="return confirm(\'confirm delete?\');"><img src="img/x.gif" title="delete" alt="delete" /></a></div><br />';
 }
 ?>
 		<div class="clear dotted"></div><div class="text"><?php echo $bbcode_topic; ?></div></td>
@@ -135,7 +135,7 @@ foreach($posts as $po) {
 		$trip = "Teutons";
 	}else if($displayarray['tribe'] == 3) {
 		$trip = "Gauls";
-	} 
+	}
 	$owner = $database->getUserArray($po['owner'],1);
 	$allianceinfo = $database->getAlliance($owner['alliance']);
 	$input = $po['post'];
@@ -155,7 +155,7 @@ echo '<tr><td class="pinfo"><a class="name" href="spieler.php?uid='.$po['owner']
 		</td>
 		<td class="pcontent"><div class="posted">created: '.$date.'</div>';
 	if($database->CheckEditRes($aid)=="1"){
-		echo '<div class="admin"><a class="edit" href="allianz.php?s=2&pid='.$arr['alliance'].'&idt='.$_GET['tid'].'&pod='.$po['id'].'&admin=editpost"><img src="img/x.gif" title="edit" alt="edit" /></a><a class="fdel" href="?s=2&pid='.$arr['alliance'].'&pod='.$po['id'].'&tid='.$_GET['tid'].'&admin=delpost" onClick="return confirm(\'confirm delete?\');"><img src="img/x.gif" title="delete" alt="delete" /></a></div><br />';
+		echo '<div class="admin"><a class="edit" href="allianz.php?s=2&pid='.$arr['alliance'].'&fid2='.$_GET['fid2'].'&idt='.$_GET['tid'].'&pod='.$po['id'].'&admin=editpost"><img src="img/x.gif" title="edit" alt="edit" /></a><a class="fdel" href="?s=2&pid='.$arr['alliance'].'&pod='.$po['id'].'&tid='.$_GET['tid'].'&admin=delpost" onClick="return confirm(\'confirm delete?\');"><img src="img/x.gif" title="delete" alt="delete" /></a></div><br />';
 	}
 echo '<div class="clear dotted"></div><div class="text">'.$bbcode_post.'</div></td>
 	</tr>';
@@ -169,7 +169,7 @@ echo '<div class="clear dotted"></div><div class="text">'.$bbcode_post.'</div></
 	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>';
 	}
-	 
+
 	 echo '</div>';
 }else{
 header("Location: banned.php");
diff --git a/Templates/Alliance/forum.tpl b/Templates/Alliance/forum.tpl
index d514058c..cf1791a8 100644
--- a/Templates/Alliance/forum.tpl
+++ b/Templates/Alliance/forum.tpl
@@ -19,7 +19,7 @@ $aid = $session->alliance;
 $allianceinfo = $database->getAlliance($aid);
 $opt = $database->getAlliPermissions($session->uid, $aid);
 echo "<h1>".$allianceinfo['tag']." - ".$allianceinfo['name']."</h1>";
-include("alli_menu.tpl"); 
+include("alli_menu.tpl");
 $ids = $_GET['s'];
 
 if(isset($_POST['new'])){
@@ -27,14 +27,14 @@ if(isset($_POST['new'])){
 	$forum_des = $_POST['u2'];
 	$forum_owner = $session->uid;
 	$forum_area = $_POST['bid'];
-	
+
 	$database->CreatForum($forum_owner,$aid,$forum_name,$forum_des,$forum_area);
 }
 if(isset($_POST['edittopic'])){
 	$topic_name = $_POST['thema'];
 	$topic_cat = $_POST['fid'];
 	$topic_id = $_POST['tid'];
-	
+
 	$database->UpdateEditTopic($topic_id,$topic_name,$topic_cat);
 }
 if(isset($_POST['editforum'])){
@@ -43,7 +43,7 @@ if(isset($_POST['editforum'])){
 	$forum_des = $_POST['u2'];
 	$forum_des = htmlspecialchars($forum_des);
 	$forum_id = $_POST['fid'];
-	
+
 	$database->UpdateEditForum($forum_id,$forum_name,$forum_des);
 }
 if(isset($_POST['newtopic'])){
@@ -297,10 +297,12 @@ if(isset($_POST['editpost'])){
 	$text = preg_replace('/\[coor'.$i.'\]/', '[coor0]', $text);
 	$text = preg_replace('/\[\/coor'.$i.'\]/', '[/coor0]', $text);
 	}
-	for($i=0;$i<=$text['report0'];$i++){
-	$text = preg_replace('/\[report'.$i.'\]/', '[report0]', $text);
-	$text = preg_replace('/\[\/report'.$i.'\]/', '[/report0]', $text);
-	}
+	if (isset($text['report0'])) {
+        for ( $i = 0; $i <= $text['report0']; $i ++ ) {
+            $text = preg_replace( '/\[report' . $i . '\]/', '[report0]', $text );
+            $text = preg_replace( '/\[\/report' . $i . '\]/', '[/report0]', $text );
+        }
+    }
 	$posts_id = $_POST['pod'];
 	if($text != ""){
 		if(!preg_match('/\[message\]/',$text) && !preg_match('/\[\/message\]/',$text)){
@@ -420,11 +422,11 @@ if($_GET['admin']== "newforum"){
 	if(isset($_GET['ac'])){
 		include("Forum/forum_7.tpl"); // new post
 	}else{
-		include("Forum/forum_6.tpl"); // showtopic 
+		include("Forum/forum_6.tpl"); // showtopic
 	}
 }else{
 	if($database->CheckForum($aid)){
-		include("Forum/forum_2.tpl"); 
+		include("Forum/forum_2.tpl");
 	}else if($opt['opt5'] == 1){
 	if($session->access==BANNED){
 			echo '<p class="error">Forum is not created yet</p><p>
@@ -435,5 +437,5 @@ if($_GET['admin']== "newforum"){
 			}}else{
 			echo '<p class="error">Forum is not created yet</p>';
 			}
-	}				
+	}
 ?>
\ No newline at end of file