General fixes

+WWs aren't affected anymore by stronger building artifacts
+Walls damaging/destruction (wall bonus reduction) during a battle, is
now counted
+Added a button for normal acess users, for editing/sticking, etc. their
own topics (instead of directly display the topic "admin menu")
+Fixed some possible warnings
This commit is contained in:
iopietro
2018-05-21 16:45:54 +02:00
parent 3a14da51e0
commit 628894f478
5 changed files with 279 additions and 253 deletions
+3 -3
View File
@@ -109,10 +109,10 @@ class Alliance {
$hasSwitchedToAdmin = isset($datas['admin']) && !empty($datas['admin']) && $datas['admin'] == "switch_admin";
return (/*$database->CheckEditRes($datas['aid']) == 1 && */($datas['alliance'] > 0 && (($database->isAllianceOwner($session->uid) == $datas['alliance'] ||
($datas['forum_perm'] == 1 && $session->alliance == $datas['alliance'])) &&
($mode || $hasSwitchedToAdmin)) ||
($datas['forum_perm'] == 1 && $session->alliance == $datas['alliance']))) ||
($datas['owner'] == $session->uid && $session->access != ADMIN)) ||
($session->access == ADMIN && ($mode || $hasSwitchedToAdmin)));
($session->access == ADMIN)) &&
($mode || $hasSwitchedToAdmin);
}
/**