mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-08 16:30:28 +03:00
Added support for custom/extra/unknown permissions.
Also alphabetic sorting of permissions with identical levels and group.
This commit is contained in:
parent
bd53c8bdc7
commit
a7fac59c3b
1 changed files with 13 additions and 9 deletions
|
|
@ -224,38 +224,42 @@ class FDroid
|
||||||
$out.='<div style="display:'.$divStyleDisplay.';" id="'.$divId.'">';
|
$out.='<div style="display:'.$divStyleDisplay.';" id="'.$divId.'">';
|
||||||
$permissions = explode(',',$apk['permissions']);
|
$permissions = explode(',',$apk['permissions']);
|
||||||
usort($permissions,
|
usort($permissions,
|
||||||
|
|
||||||
|
|
||||||
function ($a, $b) use (&$permissions_data) {
|
function ($a, $b) use (&$permissions_data) {
|
||||||
|
|
||||||
$aProtectionLevel = $permissions_data['permission'][$a]['protectionLevel'];
|
$aProtectionLevel = $permissions_data['permission'][$a]['protectionLevel'];
|
||||||
$bProtectionLevel = $permissions_data['permission'][$b]['protectionLevel'];
|
$bProtectionLevel = $permissions_data['permission'][$b]['protectionLevel'];
|
||||||
|
|
||||||
if($aProtectionLevel != $bProtectionLevel) {
|
if($aProtectionLevel != $bProtectionLevel) {
|
||||||
|
if(strlen($aProtectionLevel)==0) return 1;
|
||||||
|
if(strlen($bProtectionLevel)==0) return -1;
|
||||||
|
|
||||||
return strcmp($aProtectionLevel, $bProtectionLevel);
|
return strcmp($aProtectionLevel, $bProtectionLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
$aGroup = $permissions_data['permission'][$a]['permissionGroup'];
|
$aGroup = $permissions_data['permission'][$a]['permissionGroup'];
|
||||||
$bGroup = $permissions_data['permission'][$b]['permissionGroup'];
|
$bGroup = $permissions_data['permission'][$b]['permissionGroup'];
|
||||||
|
|
||||||
|
if($aGroup != $bGroup) {
|
||||||
return strcmp($aGroup, $bGroup);
|
return strcmp($aGroup, $bGroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return strcmp($a, $b);
|
||||||
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
$permission_group_last = '';
|
$permission_group_last = '';
|
||||||
foreach($permissions as $permission) {
|
foreach($permissions as $permission) {
|
||||||
$permission_group = $permissions_data['permission'][$permission]['permissionGroup'];
|
$permission_group = $permissions_data['permission'][$permission]['permissionGroup'];
|
||||||
if($permission_group != $permission_group_last) {
|
if($permission_group != $permission_group_last) {
|
||||||
$out.='<strong>'.strtoupper($permissions_data['permission-group'][$permission_group]['label']).'</strong><br/>';
|
$permission_group_label = $permissions_data['permission-group'][$permission_group]['label'];
|
||||||
|
if($permission_group_label=='') $permission_group_label = 'Extra/Custom';
|
||||||
|
$out.='<strong>'.strtoupper($permission_group_label).'</strong><br/>';
|
||||||
$permission_group_last = $permission_group;
|
$permission_group_last = $permission_group;
|
||||||
}
|
}
|
||||||
|
|
||||||
$out.=$this->get_permission_protection_level_icon($permissions_data['permission'][$permission]['protectionLevel']).' ';
|
$out.=$this->get_permission_protection_level_icon($permissions_data['permission'][$permission]['protectionLevel']).' ';
|
||||||
$out.='<strong>'.$permissions_data['permission'][$permission]['label'].'</strong> [<code>'.$permission.'</code>]<br/>';
|
$out.='<strong>'.$permissions_data['permission'][$permission]['label'].'</strong> [<code>'.$permission.'</code>]<br/>';
|
||||||
$out.=$permissions_data['permission'][$permission]['description'].'<br/>';
|
if($permissions_data['permission'][$permission]['description']) $out.=$permissions_data['permission'][$permission]['description'].'<br/>';
|
||||||
//$out.=$permissions_data['permission'][$permission]['comment'].'<br/>';
|
//$out.=$permissions_data['permission'][$permission]['comment'].'<br/>';
|
||||||
$out.='<br/>';
|
$out.='<br/>';
|
||||||
}
|
}
|
||||||
|
|
@ -284,7 +288,7 @@ class FDroid
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return '<em>!</em>';
|
return '<span style="color:#33AA33;font-size:130%;">⚙</span>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue