aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-02-21 16:49:49 -0800
committerredmatrix <git@macgirvin.com>2016-02-21 16:49:49 -0800
commitf1564b4cff5a584d37b12000f68014df49e683d9 (patch)
treea96bcae8ace67e2e15c7579dafe96f504d117b38 /include
parentc9252d49f7f756fe734b2bcc456726730a035b1a (diff)
downloadvolse-hubzilla-f1564b4cff5a584d37b12000f68014df49e683d9.tar.gz
volse-hubzilla-f1564b4cff5a584d37b12000f68014df49e683d9.tar.bz2
volse-hubzilla-f1564b4cff5a584d37b12000f68014df49e683d9.zip
retry the move of AccessList to composer format (one or more third-party plugins will likely break as a result)
Diffstat (limited to 'include')
-rw-r--r--include/AccessList.php148
-rwxr-xr-xinclude/items.php2
-rw-r--r--include/menu.php4
-rw-r--r--include/photos.php2
-rw-r--r--include/text.php60
5 files changed, 64 insertions, 152 deletions
diff --git a/include/AccessList.php b/include/AccessList.php
deleted file mode 100644
index 43f1de111..000000000
--- a/include/AccessList.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-
-class AccessList {
-
- private $allow_cid;
- private $allow_gid;
- private $deny_cid;
- private $deny_gid;
-
- /* indicates if we are using the default constructor values or values that have been set explicitly. */
-
- private $explicit;
-
- function __construct($channel) {
-
- if($channel) {
- $this->allow_cid = $channel['channel_allow_cid'];
- $this->allow_gid = $channel['channel_allow_gid'];
- $this->deny_cid = $channel['channel_deny_cid'];
- $this->deny_gid = $channel['channel_deny_gid'];
- }
- else {
- $this->allow_cid = '';
- $this->allow_gid = '';
- $this->deny_cid = '';
- $this->deny_gid = '';
- }
-
- $this->explicit = false;
- }
-
- function get_explicit() {
- return $this->explicit;
- }
-
- /**
- * Set AccessList from strings such as those in already
- * existing stored data items
- */
-
- function set($arr,$explicit = true) {
- $this->allow_cid = $arr['allow_cid'];
- $this->allow_gid = $arr['allow_gid'];
- $this->deny_cid = $arr['deny_cid'];
- $this->deny_gid = $arr['deny_gid'];
-
- $this->explicit = $explicit;
- }
-
- /**
- * return an array consisting of the current
- * access list components where the elements
- * are directly storable.
- */
-
- function get() {
- return array(
- 'allow_cid' => $this->allow_cid,
- 'allow_gid' => $this->allow_gid,
- 'deny_cid' => $this->deny_cid,
- 'deny_gid' => $this->deny_gid,
- );
- }
-
- /**
- * Set AccessList from arrays, such as those provided by
- * acl_selector(). For convenience, a string (or non-array) input is
- * assumed to be a comma-separated list and auto-converted into an array.
- */
-
- function set_from_array($arr,$explicit = true) {
- $this->allow_cid = perms2str((is_array($arr['contact_allow']))
- ? $arr['contact_allow'] : explode(',',$arr['contact_allow']));
- $this->allow_gid = perms2str((is_array($arr['group_allow']))
- ? $arr['group_allow'] : explode(',',$arr['group_allow']));
- $this->deny_cid = perms2str((is_array($arr['contact_deny']))
- ? $arr['contact_deny'] : explode(',',$arr['contact_deny']));
- $this->deny_gid = perms2str((is_array($arr['group_deny']))
- ? $arr['group_deny'] : explode(',',$arr['group_deny']));
-
- $this->explicit = $explicit;
- }
-
- function is_private() {
- return (($this->allow_cid || $this->allow_gid || $this->deny_cid || $this->deny_gid) ? true : false);
- }
-
-}
-
-/**
- * @brief Used to wrap ACL elements in angle brackets for storage.
- *
- * @param[in,out] array &$item
- */
-function sanitise_acl(&$item) {
- if (strlen($item))
- $item = '<' . notags(trim($item)) . '>';
- else
- unset($item);
-}
-
-/**
- * @brief Convert an ACL array to a storable string.
- *
- * @param array $p
- * @return array
- */
-function perms2str($p) {
- $ret = '';
-
- if (is_array($p))
- $tmp = $p;
- else
- $tmp = explode(',', $p);
-
- if (is_array($tmp)) {
- array_walk($tmp, 'sanitise_acl');
- $ret = implode('', $tmp);
- }
-
- return $ret;
-}
-
-
-/**
- * @brief Turn user/group ACLs stored as angle bracketed text into arrays.
- *
- * turn string array of angle-bracketed elements into string array
- * e.g. "<123xyz><246qyo><sxo33e>" => array(123xyz,246qyo,sxo33e);
- *
- * @param string $s
- * @return array
- */
-function expand_acl($s) {
- $ret = array();
-
- if(strlen($s)) {
- $t = str_replace('<','',$s);
- $a = explode('>',$t);
- foreach($a as $aa) {
- if($aa)
- $ret[] = $aa;
- }
- }
-
- return $ret;
-}
diff --git a/include/items.php b/include/items.php
index 2391bd11c..363563278 100755
--- a/include/items.php
+++ b/include/items.php
@@ -5441,7 +5441,7 @@ function send_profile_photo_activity($channel,$photo,$profile) {
$arr['body'] = sprintf($t,$channel['channel_name'],$ptext) . "\n\n" . $ltext;
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$x = $acl->get();
$arr['allow_cid'] = $x['allow_cid'];
diff --git a/include/menu.php b/include/menu.php
index 075372515..d90cefddb 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 AccessList($channel);
+ $acl = new Zotlabs\Access\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 AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$acl->set_from_array($arr);
$p = $acl->get();
diff --git a/include/photos.php b/include/photos.php
index 93511d2c0..1a57ce76f 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 AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
if(array_key_exists('directory',$args) && $args['directory'])
$acl->set($args['directory']);
if(array_key_exists('allow_cid',$args))
diff --git a/include/text.php b/include/text.php
index f6fa1c304..6b074d390 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2728,3 +2728,63 @@ function item_url_replace($channel,&$item,$old,$new) {
// @fixme item['plink'] and item['llink']
}
+
+
+/**
+ * @brief Used to wrap ACL elements in angle brackets for storage.
+ *
+ * @param[in,out] array &$item
+ */
+function sanitise_acl(&$item) {
+ if (strlen($item))
+ $item = '<' . notags(trim($item)) . '>';
+ else
+ unset($item);
+}
+
+/**
+ * @brief Convert an ACL array to a storable string.
+ *
+ * @param array $p
+ * @return array
+ */
+function perms2str($p) {
+ $ret = '';
+
+ if (is_array($p))
+ $tmp = $p;
+ else
+ $tmp = explode(',', $p);
+
+ if (is_array($tmp)) {
+ array_walk($tmp, 'sanitise_acl');
+ $ret = implode('', $tmp);
+ }
+
+ return $ret;
+}
+
+
+/**
+ * @brief Turn user/group ACLs stored as angle bracketed text into arrays.
+ *
+ * turn string array of angle-bracketed elements into string array
+ * e.g. "<123xyz><246qyo><sxo33e>" => array(123xyz,246qyo,sxo33e);
+ *
+ * @param string $s
+ * @return array
+ */
+function expand_acl($s) {
+ $ret = array();
+
+ if(strlen($s)) {
+ $t = str_replace('<','',$s);
+ $a = explode('>',$t);
+ foreach($a as $aa) {
+ if($aa)
+ $ret[] = $aa;
+ }
+ }
+
+ return $ret;
+}