sync

[Pman.Admin] / GroupRights.php

diff --git a/GroupRights.php b/GroupRights.php
index 7228a21..0dbd455 100644 (file)
--- a/GroupRights.php
+++ b/GroupRights.php
@@ -12,7 +12,7 @@ class Pman_Admin_GroupRights extends Pman
         parent::getAuth(); // load company!
         $au = $this->getAuthUser();
         if (!$au) {
-            $this->jerr("Not authenticated", array('authFailure' => true));
+            $this->jerror("LOGIN-NOAUTH", "Not authenticated", array('authFailure' => true));
         }
         
         if ($au->company()->comptype !='OWNER') {
@@ -75,35 +75,28 @@ class Pman_Admin_GroupRights extends Pman
                 $cur[$k] = clone($gr);
             }
             
-            
+            $short = explode('.',$k);
             $ar[] = array(
                 'id' => $cur[$k]->id * 1, //
                 'rightname' => $k,
                 'descript' => isset($defdata[2]) ? $defdata[2] : '' ,
                 'accessmask' => $cur[$k]->accessmask,
                 'FullMask' => $defdata[0],
-                'group_id' => (int)$_GET['group_id']
+                'group_id' => (int)$_GET['group_id'],
+                'shortname' => $short[0]
             );
                 
         }
+        
+        if (isset($_GET['_sort'])) {
+            foreach ($ar as $key => $row) {
+                $shortname[$key]  = $row['shortname'];
+                $descript[$key] = $row['descript'];
+            }
 
-        foreach ($ar as $key => $row) {
-            $rightname[$key]  = $row['rightname'];
-            $descript[$key] = $row['descript'];
+            array_multisort($shortname, SORT_ASC, $descript, SORT_ASC, $ar);        
         }
-
-        // Sort the data with volume descending, edition ascending
-        array_multisort($rightname, SORT_ASC, $descript, SORT_ASC, $ar);        
         
-        //print_r($ar); exit;
-        /*
-        usort($ar, function($a, $b) {          
-                  $rdiff = $a['rightname'] - $b['rightname'];
-            if ($rdiff) return $rdiff; 
-            return $a['descript'] - $b['descript'];     
-        });
-        */
-        //print_r($ar);exit;
         $this->jdata($ar);