add_access_extensions();
-page(_("Access setup"));
+page(_($help_context = "Access setup"));
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/access_levels.inc");
// Following compare function is used for sorting areas
// in such a way that security areas defined by module/plugin
// is properly placed under related section regardless of
-// unique extension number
+// unique extension number, with order inside sections preserved.
//
function comp_areas($area1, $area2)
{
- return ($area1[0]&0xffff)-($area2[0]&0xffff);
+ $sec_comp = ($area1[0]&0xff00)-($area2[0]&0xff00);
+ return $sec_comp == 0 ? ($area1[2]-$area2[2]) : $sec_comp;
}
+function sort_areas($areas)
+{
+ $old_order = 0;
+ foreach($areas as $key => $area) {
+ $areas[$key][] = $old_order++;
+ }
+ uasort($areas,'comp_areas');
+ return $areas;
+}
//--------------------------------------------------------------------------------------------------
if (list_updated('role')) {
$Ajax->activate('details');
if (substr($p,0,7) == 'Section')
$sections[] = substr($p, 7);
}
- uasort($areas, 'comp_areas');
+// $areas = sort_areas($areas);
$sections = array_values($sections);
- _vd($sections);
+
if ($new_role)
{
add_security_role($_POST['name'], $_POST['description'], $sections, $areas);
start_form();
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
start_row();
security_roles_list_cells(_("Role:"). " ", 'role', null, true, true, check_value('show_inactive'));
$new_role = get_post('role')=='';
}
//-----------------------------------------------------------------------------------------------
div_start('details');
-start_table($table_style2);
+start_table(TABLESTYLE2);
text_row(_("Role name:"), 'name', null, 20, 22);
text_row(_("Role description:"), 'description', null, 50, 52);
record_status_list_row(_("Current status:"), 'inactive');
end_table(1);
- start_table("$table_style width=40%");
+ start_table(TABLESTYLE, "width=40%");
$k = $j = 0; //row colour counter
$ext = $sec = $m = -1;
- uasort($security_areas,'comp_areas');
- foreach($security_areas as $area =>$parms ) {
+
+ foreach(sort_areas($security_areas) as $area =>$parms ) {
// system setup areas are accessable only for site admins i.e.
// admins of first registered company
if (user_company() && (($parms[0]&0xff00) == SS_SADMIN)) continue;