From a6160e30262107ff73c253ecc46fffaa2986f79b Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 7 Feb 2017 16:43:00 -0800 Subject: move permcat library functions to Zlib --- Zotlabs/Module/Permcat.php | 52 +++++++--------------------------------------- 1 file changed, 8 insertions(+), 44 deletions(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Permcat.php b/Zotlabs/Module/Permcat.php index e118f8aee..064c9cefb 100644 --- a/Zotlabs/Module/Permcat.php +++ b/Zotlabs/Module/Permcat.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module; -use \Zotlabs\Access as Zaccess; +use \Zotlabs\Lib as Zlib; class Permcat extends \Zotlabs\Web\Controller { @@ -12,50 +12,14 @@ class Permcat extends \Zotlabs\Web\Controller { if(! local_channel()) return; - $name = 'default'; - $localname = t('default','permcat'); - - $perms = Zaccess\Permissions::FilledAutoPerms(local_channel()); - if(! $perms) { - $role = get_pconfig(local_channel(),'system','permissions_role'); - if($role) { - $x = Zaccess\PermissionRoles::role_perms($role); - $perms = Zaccess\Permissions::FilledPerms($x['perms_connect']); - } - if(! $perms) { - $perms = Zaccess\Permissions::FilledPerms([]); - } - } - - $this->permcats[] = [ - 'name' => $name, - 'localname' => $localname, - 'perms' => Zaccess\Permissions::Operms($perms) - ]; - - - $p = Zaccess\PermissionRoles::permcats(local_channel()); - if($p) { - for($x = 0; $x < count($p); $x++) { - $this->permcats[] = [ - 'name' => $p[$x][0], - 'localname' => $p[$x][1], - 'perms' => Zaccess\Permissions::Operms(Zaccess\Permissions::FilledPerms($p[$x][2])) - ]; - } - } - - if(argc() > 1 && $this->permcats) { - foreach($this->permcats as $permcat) { - if(strcasecmp($permcat['name'],argv(1)) === 0) { - json_return_and_die($permcat); - } - } - json_return_and_die(['error' => true]); - } - - json_return_and_die($this->permcats); + $permcat = new Zlib\Permcat(local_channel()); + + if(argc() > 1) + json_return_and_die($permcat->fetch(argv(1))); + + json_return_and_die($permcat->listing()); } + } \ No newline at end of file -- cgit v1.2.3