From 069748aa9106c1a2a583e4ab295157c7a33ad33b Mon Sep 17 00:00:00 2001 From: vdigital Date: Sat, 17 May 2008 20:40:27 +0000 Subject: [PATCH] Bug 703: Authorization system in Cat management works now with well ordered lists (Minor: Admin theme changes) git-svn-id: http://piwigo.org/svn/trunk@2349 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_perm.php | 9 ++++++--- include/functions_html.inc.php | 17 +++++++++++++++++ .../yoga/theme/admin/images/header_bottom.png | Bin 0 -> 190 bytes template/yoga/theme/admin/images/logo23.jpg | Bin 6708 -> 0 bytes template/yoga/theme/admin/images/select_bt.png | Bin 493 -> 0 bytes 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 template/yoga/theme/admin/images/header_bottom.png delete mode 100644 template/yoga/theme/admin/images/logo23.jpg delete mode 100644 template/yoga/theme/admin/images/select_bt.png diff --git a/admin/cat_perm.php b/admin/cat_perm.php index e265430cf..45eb15937 100644 --- a/admin/cat_perm.php +++ b/admin/cat_perm.php @@ -231,12 +231,13 @@ SELECT group_id WHERE cat_id = '.$page['cat'].' ;'; $group_granted_ids = array_from_query($query, 'group_id'); +$group_granted_ids = order_by_name($group_granted_ids, $groups); $template->assign('group_granted_ids', $group_granted_ids); // groups denied $template->assign('group_denied_ids', - array_diff(array_keys($groups), $group_granted_ids) + order_by_name(array_diff(array_keys($groups), $group_granted_ids), $groups) ); // users... @@ -257,7 +258,7 @@ SELECT user_id WHERE cat_id = '.$page['cat'].' ;'; $user_granted_direct_ids = array_from_query($query, 'user_id'); - +$user_granted_direct_ids = order_by_name($user_granted_direct_ids, $users); $template->assign('user_granted_direct_ids', $user_granted_direct_ids); @@ -294,7 +295,8 @@ SELECT user_id, group_id $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) { foreach ($granted_groups as $group_id => $group_users) @@ -317,6 +319,7 @@ SELECT user_id, group_id $user_denied_ids = array_diff(array_keys($users), $user_granted_indirect_ids, $user_granted_direct_ids); +$user_denied_ids = order_by_name($user_denied_ids, $users); $template->assign('user_denied_ids', $user_denied_ids); diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index c2e34bef6..4c24ad17f 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -731,4 +731,21 @@ function render_category_literal_description($desc) { return strip_tags($desc, '


'); } + +/** returns the argument_ids array with new sequenced keys based on related + * names. Sequence is not case sensitive. + * Warning: By definition, this function breaks original keys + */ +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; +} + ?> diff --git a/template/yoga/theme/admin/images/header_bottom.png b/template/yoga/theme/admin/images/header_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..e4d0498816191ede61eb7a63c55256649f98e304 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^OhC-V0U`z4CFFnzNX)BbV5pc=tmDOZ&R;w5!U>Nv h-s?}D(7(#UV4KL+u|ZT~8&Eler>mdKI;Vst1^^$*K1Kil literal 0 HcmV?d00001 diff --git a/template/yoga/theme/admin/images/logo23.jpg b/template/yoga/theme/admin/images/logo23.jpg deleted file mode 100644 index 15f830e60fd457e541efa5a3d32c74c050ff589a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6708 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 diff --git a/template/yoga/theme/admin/images/select_bt.png b/template/yoga/theme/admin/images/select_bt.png deleted file mode 100644 index 8082b81cadac2e0c8bc1d7d3f558102abce5ea33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 493 zcmViJ!4;?|5I5rzoPvf5 zX&Xw4g@R%wHoGML6bV*eKKp1p7y;6I=RLFTacy9yS_2S4Tr;!^p$1s)B+=WiYmD! z(`S~#QwtsIDg6Cw%buY|0Vr!|Ty-UjE9hAiI5gVzG_L-JMS(-((2a`35$cRN+<>Ci zcyaTu38BPca71Y7DI9@N;4rx9ghQgNr*RaFx>zwxS1O(C2^>Jt(lbm;ufQR2gnohI z@B}Mp*kjbl0ox86_88SMz{itVwP)-}suSOzx>C`oKBG~6Mx*+SMp;jz`iw^P8I9^Q z8r5ess?TUtpV6p3<1pY4X!>bY%TVyH0000ZdQ@0+LvL+xVQzT<0C=2pEJ_Z}Pb*Q- j$Vkjfugb_T)dT=NVFrk>6&SVv0000