diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/AccessList.php (renamed from Zotlabs/Access/AccessList.php) | 2 | ||||
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rw-r--r-- | include/menu.php | 4 | ||||
| -rw-r--r-- | include/photos.php | 2 | ||||
| -rw-r--r-- | mod/chat.php | 6 | ||||
| -rw-r--r-- | mod/cover_photo.php | 2 | ||||
| -rwxr-xr-x | mod/events.php | 4 | ||||
| -rw-r--r-- | mod/filestorage.php | 2 | ||||
| -rw-r--r-- | mod/item.php | 2 | ||||
| -rw-r--r-- | mod/mitem.php | 2 | ||||
| -rw-r--r-- | mod/photos.php | 4 | ||||
| -rw-r--r-- | mod/rpost.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 4 | ||||
| -rw-r--r-- | mod/thing.php | 4 |
15 files changed, 22 insertions, 22 deletions
@@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); require_once('include/identity.php'); require_once('include/Contact.php'); require_once('include/account.php'); - +require_once('include/AccessList.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); diff --git a/Zotlabs/Access/AccessList.php b/include/AccessList.php index bff7fad5e..43f1de111 100644 --- a/Zotlabs/Access/AccessList.php +++ b/include/AccessList.php @@ -1,5 +1,5 @@ <?php -namespace Zotlabs\Access; + class AccessList { diff --git a/include/items.php b/include/items.php index ee69f90af..a9597c1cf 100755 --- a/include/items.php +++ b/include/items.php @@ -5440,7 +5440,7 @@ function send_profile_photo_activity($channel,$photo,$profile) { $arr['body'] = sprintf($t,$channel['channel_name'],$ptext) . "\n\n" . $ltext; - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $x = $acl->get(); $arr['allow_cid'] = $x['allow_cid']; diff --git a/include/menu.php b/include/menu.php index d90cefddb..075372515 100644 --- a/include/menu.php +++ b/include/menu.php @@ -299,7 +299,7 @@ function menu_add_item($menu_id, $uid, $arr) { $channel = get_app()->get_channel(); } - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $acl->set_from_array($arr); $p = $acl->get(); @@ -340,7 +340,7 @@ function menu_edit_item($menu_id, $uid, $arr) { $channel = get_app()->get_channel(); } - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $acl->set_from_array($arr); $p = $acl->get(); diff --git a/include/photos.php b/include/photos.php index 1a57ce76f..93511d2c0 100644 --- a/include/photos.php +++ b/include/photos.php @@ -48,7 +48,7 @@ function photo_upload($channel, $observer, $args) { // all other settings. 'allow_cid' being passed from an external source takes priority over channel settings. // ...messy... needs re-factoring once the photos/files integration stabilises - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); if(array_key_exists('directory',$args) && $args['directory']) $acl->set($args['directory']); if(array_key_exists('allow_cid',$args)) diff --git a/mod/chat.php b/mod/chat.php index f219bde73..79a5c050b 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -54,7 +54,7 @@ function chat_post(&$a) { goaway(z_root() . '/chat/' . $channel['channel_address']); } - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $acl->set_from_array($_REQUEST); $arr = $acl->get(); @@ -162,7 +162,7 @@ function chat_content(&$a) { intval($a->profile['profile_uid']) ); if($x) { - $acl = new Zotlabs\Access\AccessList(false); + $acl = new AccessList(false); $acl->set($x[0]); $private = $acl->is_private(); @@ -199,7 +199,7 @@ function chat_content(&$a) { if(local_channel() && argc() > 2 && argv(2) === 'new') { - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $channel_acl = $acl->get(); require_once('include/acl_selectors.php'); diff --git a/mod/cover_photo.php b/mod/cover_photo.php index 9c99859ea..de11857b0 100644 --- a/mod/cover_photo.php +++ b/mod/cover_photo.php @@ -239,7 +239,7 @@ function send_cover_photo_activity($channel,$photo,$profile) { $arr['body'] = sprintf($t,$channel['channel_name'],$ptext) . "\n\n" . $ltext; - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $x = $acl->get(); $arr['allow_cid'] = $x['allow_cid']; diff --git a/mod/events.php b/mod/events.php index b07ffa184..ed9f0f2e3 100755 --- a/mod/events.php +++ b/mod/events.php @@ -118,7 +118,7 @@ function events_post(&$a) { $channel = $a->get_channel(); - $acl = new Zotlabs\Access\AccessList(false); + $acl = new AccessList(false); if($event_id) { $x = q("select * from event where id = %d and uid = %d limit 1", @@ -422,7 +422,7 @@ function events_content(&$a) { require_once('include/acl_selectors.php'); - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $perm_defaults = $acl->get(); $tpl = get_markup_template('event_form.tpl'); diff --git a/mod/filestorage.php b/mod/filestorage.php index 753300e89..7ba8c1801 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -30,7 +30,7 @@ function filestorage_post(&$a) { $channel = $a->get_channel(); - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $acl->set_from_array($_REQUEST); $x = $acl->get(); diff --git a/mod/item.php b/mod/item.php index f23bff3ac..d861967a9 100644 --- a/mod/item.php +++ b/mod/item.php @@ -310,7 +310,7 @@ function item_post(&$a) { } } - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $public_policy = ((x($_REQUEST,'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($channel['channel_r_stream'],true)); diff --git a/mod/mitem.php b/mod/mitem.php index 7f582c649..d6572bd56 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -127,7 +127,7 @@ function mitem_content(&$a) { $menu_names[] = $menus['menu_name']; } - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'); diff --git a/mod/photos.php b/mod/photos.php index 8f44f01b2..944686637 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -85,7 +85,7 @@ function photos_post(&$a) { $owner_record = $s[0]; - $acl = new Zotlabs\Access\AccessList($a->data['channel']); + $acl = new AccessList($a->data['channel']); if((argc() > 3) && (argv(2) === 'album')) { @@ -595,7 +595,7 @@ function photos_content(&$a) { if($_is_owner) { $channel = $a->get_channel(); - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $channel_acl = $acl->get(); $lockstate = (($acl->is_private()) ? 'lock' : 'unlock'); diff --git a/mod/rpost.php b/mod/rpost.php index 915b1ca96..ab5ef4ccd 100644 --- a/mod/rpost.php +++ b/mod/rpost.php @@ -95,7 +95,7 @@ function rpost_content(&$a) { $channel = $a->get_channel(); - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $channel_acl = $acl->get(); diff --git a/mod/settings.php b/mod/settings.php index a6655f46a..2f90b037f 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -323,7 +323,7 @@ function settings_post(&$a) { foreach($global_perms as $k => $v) { $set_perms .= ', ' . $v[0] . ' = ' . intval($_POST[$k]) . ' '; } - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $acl->set_from_array($_POST); $x = $acl->get(); @@ -1002,7 +1002,7 @@ function settings_content(&$a) { $stpl = get_markup_template('settings.tpl'); - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $perm_defaults = $acl->get(); require_once('include/group.php'); diff --git a/mod/thing.php b/mod/thing.php index 7e7d1bdc7..7c5020e62 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -65,7 +65,7 @@ function thing_init(&$a) { if((! $name) || (! $translated_verb)) return; - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); if(array_key_exists('contact_allow',$_REQUEST) || array_key_exists('group_allow',$_REQUEST) @@ -271,7 +271,7 @@ function thing_content(&$a) { return; } - $acl = new Zotlabs\Access\AccessList($channel); + $acl = new AccessList($channel); $channel_acl = $acl->get(); $lockstate = (($acl->is_private()) ? 'lock' : 'unlock'); |