Changeset 2348

Timestamp:

May 17, 2008, 10:16:45 PM (16 years ago)

Author:

vdigital

Message:

Bug 703: Authorization system in Cat management works now with well ordered lists

File:

• branches/branch-1_7/admin/cat_perm.php (modified) (6 diffs)

branches/branch-1_7/admin/cat_perm.php

@@ -244 +244 @@
 ;';
 $group_granted_ids = array_from_query($query, 'group_id');
-
+$group_granted_ids = order_by_name($group_granted_ids, $groups);
 // groups granted to access the category
 foreach ($group_granted_ids as $group_id)
@@ -256 +256 @@
     );
 }
-
+$group_denied_ids = array_diff(array_keys($groups), $group_granted_ids);
+$group_denied_ids = order_by_name($group_denied_ids, $groups);
 // groups denied
-foreach (array_diff(array_keys($groups), $group_granted_ids) as $group_id)
+foreach ($group_denied_ids as $group_id)
 {
   $template->assign_block_vars(
@@ -289 +290 @@
 ;';
 $user_granted_direct_ids = array_from_query($query, 'user_id');
-
+$user_granted_direct_ids = order_by_name($user_granted_direct_ids, $users);
 foreach ($user_granted_direct_ids as $user_id)
 {
@@ -333 +334 @@
   $user_granted_indirect_ids = array_diff($user_granted_by_group_ids,
                                           $user_granted_direct_ids);
-  
+  $user_granted_indirect_ids = 
+    order_by_name($user_granted_indirect_ids, $users);
   foreach ($user_granted_indirect_ids as $user_id)
   {
@@ -360 +362 @@
                               $user_granted_indirect_ids,
                               $user_granted_direct_ids);
-
+$user_denied_ids = order_by_name($user_denied_ids, $users);
 foreach ($user_denied_ids as $user_id)
 {
@@ -372 +374 @@
 }
 
+// Warning: this function breaks original keys
+// This function should be move in the futur to ./include/functions_html.inc
+function order_by_name($element_ids,$name)
+{
+  $ordered_element_ids = array();
+  foreach ($element_ids as $k_id => $element_id)
+  {
+    $key = strtolower($name[$element_id]) .'-'. $name[$element_id] .'-'. $k_id;
+    $ordered_element_ids[$key] = $element_id;
+  }
+  ksort($ordered_element_ids);
+  return $ordered_element_ids;
+}
 
 // +-----------------------------------------------------------------------+