Merge branch 'develop' of https://github.com/itflow-org/itflow into develop

inc_all_admin.php

@@ -6,10 +6,9 @@ require_once "functions.php";
 
 require_once "check_login.php";
 
-validateAdminRole();
-
-// TODO: Change this to enforceAdminPermission();
-//  We can't do this until everyone has the new database fields added in db 1.4.9 on Sept 14th 2024
+if (!isset($session_is_admin) || !$session_is_admin) {
+    exit(WORDING_ROLECHECK_FAILED . "<br>Tell your admin: Your role does not have admin access.");
+}
 
 require_once "header.php";
 

top_nav.php

@@ -161,7 +161,7 @@
                 </li>
                 <!-- Menu Footer-->
                 <li class="user-footer">
-                    <?php if ($session_user_role == 3) { ?>
+                    <?php if ($session_is_admin) { ?>
                         <a href="admin_user.php" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
                     <?php } ?>
                     <a href="user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>