diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/chat.php | 2 | ||||
| -rw-r--r-- | mod/display.php | 2 | ||||
| -rw-r--r-- | mod/editwebpage.php | 2 | ||||
| -rwxr-xr-x | mod/events.php | 2 | ||||
| -rw-r--r-- | mod/filestorage.php | 2 | ||||
| -rw-r--r-- | mod/mitem.php | 4 | ||||
| -rw-r--r-- | mod/photos.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 2 | ||||
| -rw-r--r-- | mod/webpages.php | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/mod/chat.php b/mod/chat.php index caf800f80..e2428f1f7 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -207,7 +207,7 @@ function chat_content(&$a) { '$header' => t('New Chatroom'), '$name' => array('room_name',t('Chatroom Name'),'', ''), '$permissions' => t('Permissions'), - '$acl' => populate_acl($channel_acl), + '$acl' => populate_acl($channel_acl,false), '$submit' => t('Submit') )); return $o; diff --git a/mod/display.php b/mod/display.php index 4c30ae554..15b76e63d 100644 --- a/mod/display.php +++ b/mod/display.php @@ -55,7 +55,7 @@ function display_content(&$a, $update = 0, $load = false) { 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel_acl, false), + 'acl' => populate_acl($channel_acl), 'bang' => '', 'visitor' => true, 'profile_uid' => local_user(), diff --git a/mod/editwebpage.php b/mod/editwebpage.php index deaf9ae57..b8b7a465c 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -157,7 +157,7 @@ function editwebpage_content(&$a) { '$baseurl' => $a->get_baseurl(), '$defloc' => $itm[0]['location'], '$visitor' => ($is_owner) ? true : false, - '$acl' => populate_acl($itm[0]), + '$acl' => populate_acl($itm[0],false), '$showacl' => ($is_owner) ? true : false, '$public' => t('Public post'), '$jotnets' => $jotnets, diff --git a/mod/events.php b/mod/events.php index e7b5e35a9..911b6c891 100755 --- a/mod/events.php +++ b/mod/events.php @@ -488,7 +488,7 @@ function events_content(&$a) { '$t_orig' => $t_orig, '$sh_text' => t('Share this event'), '$sh_checked' => $sh_checked, - '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults))), + '$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults),false)), '$submit' => t('Submit') )); diff --git a/mod/filestorage.php b/mod/filestorage.php index ed7164070..bcf798e7b 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -111,7 +111,7 @@ function filestorage_content(&$a) { $cloudpath = get_cloudpath($f) . (($f['flags'] & ATTACH_FLAG_DIR) ? '?f=&davguest=1' : ''); - $aclselect_e = populate_acl($f); + $aclselect_e = populate_acl($f,false); $is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false); $lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock'); diff --git a/mod/mitem.php b/mod/mitem.php index e0aa1b87a..3240bb68b 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -132,7 +132,7 @@ function mitem_content(&$a) { '$menu_id' => $a->data['menu']['menu_id'], '$permissions' => t('Menu Item Permissions'), '$permdesc' => t("\x28click to open/close\x29"), - '$aclselect' => populate_acl($perm_defaults), + '$aclselect' => populate_acl($perm_defaults,false), '$mitem_desc' => array('mitem_desc', t('Link text'), '', '','*'), '$mitem_link' => array('mitem_link', t('URL of link'), '', '', '*'), '$usezid' => array('usezid', t('Use Red magic-auth if available'), true, ''), @@ -175,7 +175,7 @@ function mitem_content(&$a) { '$menu_id' => $a->data['menu']['menu_id'], '$permissions' => t('Menu Item Permissions'), '$permdesc' => t("\x28click to open/close\x29"), - '$aclselect' => populate_acl($mitem), + '$aclselect' => populate_acl($mitem,false), '$mitem_id' => intval(argv(2)), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), '$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'), diff --git a/mod/photos.php b/mod/photos.php index 2740f91f9..a3ca933b1 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -591,7 +591,7 @@ function photos_content(&$a) { } $albumselect_e = $albumselect; - $aclselect_e = (($_is_owner) ? populate_acl($channel_acl) : ''); + $aclselect_e = (($_is_owner) ? populate_acl($channel_acl,false) : ''); $tpl = get_markup_template('photos_upload.tpl'); $o .= replace_macros($tpl,array( diff --git a/mod/settings.php b/mod/settings.php index e1ae0b8ec..bdf30bae2 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -957,7 +957,7 @@ function settings_content(&$a) { '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), - '$aclselect' => populate_acl($perm_defaults), + '$aclselect' => populate_acl($perm_defaults,false), '$suggestme' => $suggestme, '$group_select' => $group_select, diff --git a/mod/webpages.php b/mod/webpages.php index dea034357..e7c4b40ad 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -84,7 +84,7 @@ function webpages_content(&$a) { 'nickname' => $a->profile['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'bang' => (($group || $cid) ? '!' : ''), - 'acl' => ((local_user() && local_user() == $owner) ? populate_acl($channel_acl) : ''), + 'acl' => ((local_user() && local_user() == $owner) ? populate_acl($channel_acl,false) : ''), 'visitor' => true, 'profile_uid' => intval($owner), 'mimetype' => $mimetype, |