sync

[Pman.Admin] / GroupRights.php

diff --git a/GroupRights.php b/GroupRights.php
index 24a37db..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') {
@@ -87,24 +87,16 @@ class Pman_Admin_GroupRights extends Pman
             );
                 
         }
+        
+        if (isset($_GET['_sort'])) {
+            foreach ($ar as $key => $row) {
+                $shortname[$key]  = $row['shortname'];
+                $descript[$key] = $row['descript'];
+            }
 
-        foreach ($ar as $key => $row) {
-            $shortname[$key]  = $row['shortname'];
-            $descript[$key] = $row['descript'];
+            array_multisort($shortname, SORT_ASC, $descript, SORT_ASC, $ar);        
         }
-
-        // Sort the data with volume descending, edition ascending
-        //array_multisort($shortname, SORT_ASC, $descript, SORT_ASC, $ar);        
-        
-        //print_r($ar); exit;
-        
-        usort($ar, function($a, $b) {          
-                  $rdiff = $a['shortname'] - $b['shortname'];
-            if ($rdiff) return $rdiff; 
-            return $a['descript'] - $b['descript'];     
-        });
         
-        print_r($ar);exit;
         $this->jdata($ar);