Replaced the nifty anonymous permissions sorting comparison function with inherited...

Now the code should work with PHP versions prior to 5.3.0 as well...

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index 1fb3d1ac1ae1c4d6227f3f009d1a6bd8115dcf32..dfb79c6c82e789526d29688511f5f2948708ea8c 100644 (file)
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -102,6 +102,7 @@ class FDroid
 
 
        function get_app($query_vars) {
+               global $permissions_data;
                $permissions_object = new AndroidPermissions($this->site_path.'/repo/AndroidManifest.xml', $this->site_path.'/repo/strings.xml', $this->site_path.'/repo/android-permissions.cache');
                $permissions_data = $permissions_object->get_permissions_array();
 
@@ -224,29 +225,7 @@ class FDroid
                                                $out.='<br /><a href="javascript:void(0);" onClick="showHidePermissions(\''.$divId.'\');">view permissions</a><br/>';
                                                $out.='<div style="display:'.$divStyleDisplay.';" id="'.$divId.'">';
                                                $permissions = explode(',',$apk['permissions']);
-                                               usort($permissions,
-                                                       function ($a, $b) use (&$permissions_data) {
-
-                                                               $aProtectionLevel = $permissions_data['permission'][$a]['protectionLevel'];
-                                                               $bProtectionLevel = $permissions_data['permission'][$b]['protectionLevel'];
-
-                                                               if($aProtectionLevel != $bProtectionLevel) {
-                                                                       if(strlen($aProtectionLevel)==0) return 1;
-                                                                       if(strlen($bProtectionLevel)==0) return -1;
-
-                                                                       return strcmp($aProtectionLevel, $bProtectionLevel);
-                                                               }
-
-                                                               $aGroup = $permissions_data['permission'][$a]['permissionGroup'];
-                                                               $bGroup = $permissions_data['permission'][$b]['permissionGroup'];
-
-                                                               if($aGroup != $bGroup) {
-                                                                       return strcmp($aGroup, $bGroup);
-                                                               }
-
-                                                               return strcmp($a, $b);
-                                                       }
-                                               );
+                                               usort($permissions, "permissions_cmp");
 
                                                $permission_group_last = '';
                                                foreach($permissions as $permission) {
@@ -523,6 +502,29 @@ class FDOutGrid
        }
 }
 
+function permissions_cmp($a, $b) {
+       global $permissions_data;
+
+       $aProtectionLevel = $permissions_data['permission'][$a]['protectionLevel'];
+       $bProtectionLevel = $permissions_data['permission'][$b]['protectionLevel'];
+
+       if($aProtectionLevel != $bProtectionLevel) {
+               if(strlen($aProtectionLevel)==0) return 1;
+               if(strlen($bProtectionLevel)==0) return -1;
+
+               return strcmp($aProtectionLevel, $bProtectionLevel);
+       }
+
+       $aGroup = $permissions_data['permission'][$a]['permissionGroup'];
+       $bGroup = $permissions_data['permission'][$b]['permissionGroup'];
+
+       if($aGroup != $bGroup) {
+               return strcmp($aGroup, $bGroup);
+       }
+
+       return strcmp($a, $b);
+}
+
 // Make a link to this page, with the current query vars attached and desired params added/modified
 function makelink($query_vars, $params=array()) {
        $link=get_permalink();