From 807b684e296e2daa8975b9131fb3671c0bfe6dc9 Mon Sep 17 00:00:00 2001
From: iopietro <iopietro@hotmail.it>
Date: Sun, 20 May 2018 17:08:42 +0200
Subject: [PATCH] General alliances fixes

+Fixed some conditions for MHs
---
 Templates/Alliance/Forum/forum_3.tpl | 2 --
 Templates/Alliance/Forum/forum_4.tpl | 2 +-
 Templates/Alliance/Forum/forum_8.tpl | 2 +-
 Templates/Alliance/forum.tpl         | 9 +++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Templates/Alliance/Forum/forum_3.tpl b/Templates/Alliance/Forum/forum_3.tpl
index 3aeb5d16..442f0f7d 100644
--- a/Templates/Alliance/Forum/forum_3.tpl
+++ b/Templates/Alliance/Forum/forum_3.tpl
@@ -38,8 +38,6 @@ $canBeMoved = $forumData['forum_area'] == 1 && $session->access == 9;
 			<td><select class="dropdown" name="fid">
 <?php
 	$show_cat = $database->ForumCat($forumData['alliance']);
-	if($canBeMoved) $show_cat = array_merge($show_cat, $database->ForumCat($session->alliance));
-			
 	foreach($show_cat as $cats) {
 		if($session->access == 9 && $cats['owner'] != $session->uid) continue;
 		
diff --git a/Templates/Alliance/Forum/forum_4.tpl b/Templates/Alliance/Forum/forum_4.tpl
index f91c88e2..d8cc4d6c 100644
--- a/Templates/Alliance/Forum/forum_4.tpl
+++ b/Templates/Alliance/Forum/forum_4.tpl
@@ -64,7 +64,7 @@ if($ChckTopic){
 			}
 			echo $locks.'<a class="edit" href="?s=2&fid='.$_GET['fid'].'&idt='.$arrs['id'].'&admin=edittopic" title="edit"><img src="img/x.gif" alt="edit" /></a><br />'.$pin.'<a class="fdel" href="?s=2&fid='.$_GET['fid'].'&idt='.$arrs['id'].'&admin=deltopic" title="delete"><img src="img/x.gif" alt="delete" onClick="return confirm(\'confirm delete?\');" /></a>';
 		}elseif($arrs['close'] == 1){
-			echo '<img class="folder_'.($arrs['stick'] == 1 ? 'sticky_' : 'lock').'lock" src="img/x.gif" alt="Closed Thread without new posts" title="Closed Thread without new posts" />';
+			echo '<img class="folder_'.($arrs['stick'] == 1 ? 'sticky_' : '').'lock" src="img/x.gif" alt="Closed Thread without new posts" title="Closed Thread without new posts" />';
 		}else{
 			echo '<img class="folder'.($arrs['stick'] == 1 ? '_sticky' : '').'" src="img/x.gif" alt="'.($arrs['stick'] == 1 ? 'Important ' : '').'Thread without new posts" title="'.($arrs['stick'] == 1 ? 'Important ' : '').'Thread without new posts" />';
 		}
diff --git a/Templates/Alliance/Forum/forum_8.tpl b/Templates/Alliance/Forum/forum_8.tpl
index 39a3c6a5..0da6cea4 100644
--- a/Templates/Alliance/Forum/forum_8.tpl
+++ b/Templates/Alliance/Forum/forum_8.tpl
@@ -11,7 +11,7 @@ if($session->access == BANNED){
 }
 
 $forumData = reset($database->ForumCatEdit($_GET['idf']));
-if(empty($forumData) || ($session->alliance == 0 && $session->access != ADMIN) ||
+if(empty($forumData) || ($forumData['alliance'] == 0 && $session->access != ADMIN) ||
   ($forumData['alliance'] > 0 && ($forumData['alliance'] != $session->alliance ||
   (!$opt['opt5'] && $session->access != ADMIN)))) $alliance->redirect($_GET);
 
diff --git a/Templates/Alliance/forum.tpl b/Templates/Alliance/forum.tpl
index 718b4882..8d08ca63 100644
--- a/Templates/Alliance/forum.tpl
+++ b/Templates/Alliance/forum.tpl
@@ -41,7 +41,7 @@ if(isset($_POST['new']) &&
 	$forum_des = $_POST['u2'];
 	$forum_owner = $session->uid;
 	$forum_area = $_POST['bid'];
-	$database->CreatForum($forum_owner, $session->alliance, $forum_name, $forum_des, $forum_area, $forumViewable['alliances'], $forumViewable['users']);
+	$database->CreatForum($forum_owner, $session->access == ADMIN ? 0 : $session->alliance, $forum_name, $forum_des, $forum_area, $forumViewable['alliances'], $forumViewable['users']);
 }
 
 if(isset($_POST['edittopic']) && 
@@ -52,7 +52,7 @@ if(isset($_POST['edittopic']) &&
 		'forum_perm' => $opt['opt5'], 'admin' => $_GET['admin'], 'owner' => $topic['owner'],
    		'forum_owner' => ($forumData = reset($database->ForumCatEdit($_POST['fid'])))['owner']], 1) &&
    (($forumData['forum_area'] != 1 && reset($database->ForumCatEdit($topic['cat']))['forum_area'] != 1 && $forumData['alliance'] == $session->alliance) ||
-   $forumData['id'] == $topic['cat'] || $session->access == ADMIN))
+   		$forumData['id'] == $topic['cat'] || ($session->access == ADMIN && $forumData['alliance'] = 0)))
 {
 	$topic_name = $_POST['thema'];
 	$topic_cat = $_POST['fid'];
@@ -227,8 +227,9 @@ elseif(isset($_GET['idt']) && !empty($_GET['idt'])){
 	if($_GET['admin'] != "edittopic" && $_GET['admin'] != "editans") $alliance->redirect($_GET);
 }
 elseif($_GET['admin'] == "delforum" && isset($_GET['idf']) && !empty($_GET['idf']) &&
-	  (($database->ForumCatAlliance($_GET['idf']) == $session->alliance && $opt['opt5'] == 1) ||
-	  ($forumData = reset($database->ForumCatEdit($_GET['idf'])))['owner'] == $session->uid && $forumData['alliance'] == 0))
+	  ((($database->ForumCatAlliance($_GET['idf']) == $session->alliance && $opt['opt5'] == 1) ||
+	  ($forumData = reset($database->ForumCatEdit($_GET['idf'])))['owner'] == $session->uid) ||
+	  ($forumData['alliance'] == 0 && $session->access == ADMIN)))
 {
 	$database->DeleteCat($_GET['idf']); // delete forum
 	$alliance->redirect($_GET);