diff options
| author | zotlabs <mike@macgirvin.com> | 2017-02-12 17:40:18 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-02-12 17:40:18 -0800 |
| commit | 2a525922929d5d9d54fd898e6f1658f0b959e667 (patch) | |
| tree | 87a4859ebcd5a43a6123e201b99ef26447d6df69 /Zotlabs | |
| parent | ccdfbc721fa0cf6710cce262cbaa219e2803e8c2 (diff) | |
| download | volse-hubzilla-2a525922929d5d9d54fd898e6f1658f0b959e667.tar.gz volse-hubzilla-2a525922929d5d9d54fd898e6f1658f0b959e667.tar.bz2 volse-hubzilla-2a525922929d5d9d54fd898e6f1658f0b959e667.zip | |
testing and bug fixes virtual profile groups
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Lockview.php | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/Zotlabs/Module/Lockview.php b/Zotlabs/Module/Lockview.php index 7d1d8a43f..fc7d5c7c8 100644 --- a/Zotlabs/Module/Lockview.php +++ b/Zotlabs/Module/Lockview.php @@ -32,10 +32,10 @@ class Lockview extends \Zotlabs\Web\Controller { if(! $item_id) killme(); - if (!in_array($type, array('item','photo','event', 'menu_item', 'chatroom'))) + if (! in_array($type, array('item', 'photo', 'attach', 'event', 'menu_item', 'chatroom'))) killme(); - //we have different naming in in menu_item table and chatroom table + // we have different naming in in menu_item table and chatroom table switch($type) { case 'menu_item': $id = 'mitem_id'; @@ -101,6 +101,22 @@ class Lockview extends \Zotlabs\Web\Controller { stringify_array_elms($deny_groups,true); stringify_array_elms($deny_users,true); + + $profile_groups = []; + if($allowed_groups) { + foreach($allowed_groups as $g) { + if(substr($g,0,4) === '\'vp.') { + $profile_groups[] = '\'' . substr($g,4); + } + } + } + if(count($profile_groups)) { + $r = q("SELECT profile_name FROM profile WHERE profile_guid IN ( " . implode(', ', $profile_groups) . " )"); + if($r) + foreach($r as $rr) + $l[] = '<li><b>' . t('Profile','acl') . ' ' . $rr['profile_name'] . '</b></li>'; + } + if(count($allowed_groups)) { $r = q("SELECT gname FROM groups WHERE hash IN ( " . implode(', ', $allowed_groups) . " )"); if($r) @@ -120,6 +136,25 @@ class Lockview extends \Zotlabs\Web\Controller { } } } + + + $profile_groups = []; + if($deny_groups) { + foreach($deny_groups as $g) { + if(substr($g,0,4) === '\'vp.') { + $profile_groups[] = '\'' . substr($g,4); + } + } + } + if(count($profile_groups)) { + $r = q("SELECT profile_name FROM profile WHERE profile_guid IN ( " . implode(', ', $profile_groups) . " )"); + if($r) + foreach($r as $rr) + $l[] = '<li><b><strike>' . t('Profile','acl') . ' ' . $rr['profile_name'] . '</strike></b></li>'; + } + + + if(count($deny_groups)) { $r = q("SELECT gname FROM groups WHERE hash IN ( " . implode(', ', $deny_groups) . " )"); if($r) |