[permission-manager] renamed some files, moved html generation to templates,

using bind variables in mysql code, changed order of modules in role editor

1 files changed, 9 insertions, 1 deletions

diff --git a/modules-available/permissionmanager/inc/permissionutil.inc.php b/modules-available/permissionmanager/inc/permissionutil.inc.php
index 10f2a61a..d6adf2bf 100644
--- a/modules-available/permissionmanager/inc/permissionutil.inc.php
+++ b/modules-available/permissionmanager/inc/permissionutil.inc.php
@@ -16,10 +16,18 @@ class PermissionUtil
 				$permissions = self::putInPermissionTree($out[1].".".$k, $v, $permissions);
 			}
 		}
+		ksort($permissions);
+		global $MENU_CAT_OVERRIDE;
+		$sortingOrder = $MENU_CAT_OVERRIDE;
+		foreach ($permissions as $module => $v) $sortingOrder[Module::get($module)->getCategory()][] = $module;
+		$permissions = array_replace(array_flip(call_user_func_array('array_merge', $sortingOrder)), $permissions);
+		foreach ($permissions as $module => $v) if (is_int($v)) unset($permissions[$module]);
+
+
 		return $permissions;
 	}
 
-	private function putInPermissionTree($permission, $description, $tree)
+	private static function putInPermissionTree($permission, $description, $tree)
 	{
 		$subPermissions = explode('.', $permission);
 		$original =& $tree;