diff options
| author | zotlabs <mike@macgirvin.com> | 2017-02-07 16:15:15 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-02-07 16:15:15 -0800 |
| commit | ecca69442d28cc8f328809f0589c79159639fefc (patch) | |
| tree | 905cb0a200b5fe5e4258153a88125c81c7df2c08 /Zotlabs/Access | |
| parent | cfe843b870c71ef36c75030866091ef7746038bc (diff) | |
| parent | b2bae867d02b62708e09e5abf0ebd03a4d2b095e (diff) | |
| download | volse-hubzilla-ecca69442d28cc8f328809f0589c79159639fefc.tar.gz volse-hubzilla-ecca69442d28cc8f328809f0589c79159639fefc.tar.bz2 volse-hubzilla-ecca69442d28cc8f328809f0589c79159639fefc.zip | |
Merge branch 'abroles' into dev
Diffstat (limited to 'Zotlabs/Access')
| -rw-r--r-- | Zotlabs/Access/PermissionRoles.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Access/Permissions.php | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/Zotlabs/Access/PermissionRoles.php b/Zotlabs/Access/PermissionRoles.php index d7e162197..dd9a49d05 100644 --- a/Zotlabs/Access/PermissionRoles.php +++ b/Zotlabs/Access/PermissionRoles.php @@ -281,22 +281,22 @@ class PermissionRoles { $permcats = [ [ 'follower', t('follower','permcat'), - [ 'view_stream','view_profile','view_contacts','view_storage','view_pages', + [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki', 'post_like' ] ], [ 'contributor', t('contributor','permcat'), - [ 'view_stream','view_profile','view_contacts','view_storage','view_pages', - 'post_wall','post_comments','post_like','tag_deliver','chat' ] + [ 'view_stream','view_profile','view_contacts','view_storage','view_pages','view_wiki', + 'post_wall','post_comments','write_wiki','post_like','tag_deliver','chat' ] ], [ 'trusted', t('trusted','permcat'), [ 'view_stream','view_profile','view_contacts','view_storage','view_pages', - 'write_storage','post_wall','post_comments','post_like','tag_deliver', + 'write_storage','post_wall','write_pages','write_wiki','post_comments','post_like','tag_deliver', 'chat', 'republish' ] ], [ 'moderator', t('moderator','permcat'), [ 'view_stream','view_profile','view_contacts','view_storage','view_pages', - 'write_storage','post_wall','post_comments','post_like','tag_deliver', + 'write_storage','post_wall','wite_pages','write_wiki','post_comments','post_like','tag_deliver', 'chat', 'republish' ] ] ]; diff --git a/Zotlabs/Access/Permissions.php b/Zotlabs/Access/Permissions.php index 81408f122..b4b2e4d44 100644 --- a/Zotlabs/Access/Permissions.php +++ b/Zotlabs/Access/Permissions.php @@ -106,6 +106,18 @@ class Permissions { } + static public function OPerms($arr) { + $ret = []; + if($arr) { + foreach($arr as $k => $v) { + $ret[] = [ 'name' => $k, 'value' => $v ]; + } + } + return $ret; + } + + + static public function FilledAutoperms($channel_id) { if(! intval(get_pconfig($channel_id,'system','autoperms'))) return false; |