Commit dfbe2eaf authored by redmatrix's avatar redmatrix

Revert "move accesslist class to namespace"

This reverts commit a9711895.
parent a9711895
......@@ -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' );
......
<?php
namespace Zotlabs\Access;
class AccessList {
......
......@@ -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'];
......
......@@ -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();
......
......@@ -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))
......
......@@ -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');
......
......@@ -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'];
......
......@@ -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');
......
......@@ -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();
......
......@@ -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));
......
......@@ -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');
......
......@@ -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');
......
......@@ -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();
......
......@@ -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');
......
......@@ -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');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment