Merge branch '2.1.25.2'

nilsteampassnet · Jan 31, 2016 · e62fa82 · e62fa82
2 parents 88ede56 + 8683593
commit e62fa82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/sources/main.functions.php b/sources/main.functions.php
@@ -417,7 +417,7 @@ function identifyUserRights($groupesVisiblesUser, $groupesInterditsUser, $isAdmi
             "SELECT * FROM ".prefix_table("roles_title")."
             ORDER BY title ASC");
         foreach ($rows as $record) {
-            if (!in_array($record['id'], $tmp)) {
+            if (!empty($record['id']) && !in_array($record['id'], $tmp)) {
                 array_push($tmp, $record['id']);
             }
         }

diff --git a/sources/roles.queries.php b/sources/roles.queries.php
@@ -230,8 +230,9 @@
             $previous = 1;
 
             //count nb of roles
-			if (empty($_SESSION['fonction_id'])) $where = "";
-			else  $where = " WHERE id IN (".str_replace(";", ",", $_SESSION['fonction_id']).")";
+            $arrUserRoles = array_filter($_SESSION['user_roles']);
+            if (count($arrUserRoles) == 0) $where = "";
+            else  $where = " WHERE id IN (".implode(',', $arrUserRoles).")";
             DB::query("SELECT * FROM ".prefix_table("roles_title").$where);
             $roles_count =  DB::count();
             if ($roles_count > $display_nb) {
@@ -247,12 +248,12 @@
             }
 
             // array of roles for actual user
-            $my_functions = explode(';', $_SESSION['fonction_id']);
+            $my_functions = $arrUserRoles;
 
             //Display table header
             $rows = DB::query(
                 "SELECT * FROM ".prefix_table("roles_title").
-				$where."
+                $where."
                 ORDER BY title ASC".$sql_limit);
             foreach ($rows as $record) {
                 if ($_SESSION['is_admin'] == 1  || ($_SESSION['user_manager'] == 1 && (in_array($record['id'], $my_functions) || $record['creator_id'] == $_SESSION['user_id']))) {