General alliances fixes

+Fixed some conditions for MHs
This commit is contained in:
iopietro
2018-05-20 17:08:42 +02:00
parent 877762ea6e
commit 807b684e29
4 changed files with 7 additions and 8 deletions
-2
View File
@@ -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;
+1 -1
View File
@@ -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" />';
}
+1 -1
View File
@@ -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);