]> git.mxchange.org Git - friendica.git/blobdiff - include/acl_selectors.php
Merge pull request #4634 from tobiasd/20180319-de
[friendica.git] / include / acl_selectors.php
index a93393d80fd61d6c652a10aaeaaa8c0d25e6e781..91f94155900adba71fbd74e3cb356340c2ea9465 100644 (file)
@@ -2,13 +2,18 @@
 /**
  * @file include/acl_selectors.php
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Widget;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Util\Network;
 
 require_once "mod/proxy.php";
 
@@ -28,11 +33,11 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
        );
 
 
-       $arr = array('group' => $r, 'entry' => $o);
+       $arr = ['group' => $r, 'entry' => $o];
 
        // e.g. 'network_pre_group_deny', 'profile_pre_group_allow'
 
-       call_hooks($a->module . '_pre_' . $selname, $arr);
+       Addon::callHooks($a->module . '_pre_' . $selname, $arr);
 
        if (DBM::is_result($r)) {
                foreach ($r as $rr) {
@@ -50,7 +55,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
        }
        $o .= "</select>\r\n";
 
-       call_hooks($a->module . '_post_' . $selname, $o);
+       Addon::callHooks($a->module . '_post_' . $selname, $o);
 
 
        return $o;
@@ -87,20 +92,20 @@ function contact_selector($selname, $selclass, $options, $preselected = false)
                if (x($options, 'networks')) {
                        switch ($options['networks']) {
                                case 'DFRN_ONLY':
-                                       $networks = array(NETWORK_DFRN);
+                                       $networks = [NETWORK_DFRN];
                                        break;
                                case 'PRIVATE':
                                        if (is_array($a->user) && $a->user['prvnets']) {
-                                               $networks = array(NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA);
+                                               $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA];
                                        } else {
-                                               $networks = array(NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA);
+                                               $networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA];
                                        }
                                        break;
                                case 'TWO_WAY':
                                        if (is_array($a->user) && $a->user['prvnets']) {
-                                               $networks = array(NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA);
+                                               $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA];
                                        } else {
-                                               $networks = array(NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS);
+                                               $networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS];
                                        }
                                        break;
                                default: /// @TODO Maybe log this call?
@@ -109,9 +114,9 @@ function contact_selector($selname, $selclass, $options, $preselected = false)
                }
        }
 
-       $x = array('options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks);
+       $x = ['options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks];
 
-       call_hooks('contact_select_options', $x);
+       Addon::callHooks('contact_select_options', $x);
 
        $o = '';
 
@@ -150,11 +155,11 @@ function contact_selector($selname, $selclass, $options, $preselected = false)
        );
 
 
-       $arr = array('contact' => $r, 'entry' => $o);
+       $arr = ['contact' => $r, 'entry' => $o];
 
        // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
 
-       call_hooks($a->module . '_pre_' . $selname, $arr);
+       Addon::callHooks($a->module . '_pre_' . $selname, $arr);
 
        if (DBM::is_result($r)) {
                foreach ($r as $rr) {
@@ -173,7 +178,7 @@ function contact_selector($selname, $selclass, $options, $preselected = false)
 
        $o .= "</select>\r\n";
 
-       call_hooks($a->module . '_post_' . $selname, $o);
+       Addon::callHooks($a->module . '_post_' . $selname, $o);
 
        return $o;
 }
@@ -181,9 +186,6 @@ function contact_selector($selname, $selclass, $options, $preselected = false)
 
 
 function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) {
-
-       require_once "include/bbcode.php";
-
        $a = get_app();
 
        $o = '';
@@ -228,13 +230,13 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
        );
 
 
-       $arr = array('contact' => $r, 'entry' => $o);
+       $arr = ['contact' => $r, 'entry' => $o];
 
        // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
 
-       call_hooks($a->module . '_pre_' . $selname, $arr);
+       Addon::callHooks($a->module . '_pre_' . $selname, $arr);
 
-       $receiverlist = array();
+       $receiverlist = [];
 
        if (DBM::is_result($r)) {
                foreach ($r as $rr) {
@@ -245,7 +247,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                        }
 
                        if ($privmail) {
-                               $trimmed = GetProfileUsername($rr['url'], $rr['name'], false);
+                               $trimmed = Protocol::formatMention($rr['url'], $rr['name']);
                        } else {
                                $trimmed = mb_substr($rr['name'],0,20);
                        }
@@ -263,14 +265,14 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                $o .= implode(", ", $receiverlist);
        }
 
-       call_hooks($a->module . '_post_' . $selname, $o);
+       Addon::callHooks($a->module . '_post_' . $selname, $o);
 
        return $o;
 }
 
 
 function fixacl(&$item) {
-       $item = intval(str_replace(array('<', '>'), array('', ''), $item));
+       $item = intval(str_replace(['<', '>'], ['', ''], $item));
 }
 
 function prune_deadguys($arr) {
@@ -284,14 +286,14 @@ function prune_deadguys($arr) {
        $r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 ");
 
        if (DBM::is_result($r)) {
-               $ret = array();
+               $ret = [];
                foreach ($r as $rr) {
                        $ret[] = intval($rr['id']);
                }
                return $ret;
        }
 
-       return array();
+       return [];
 }
 
 
@@ -300,13 +302,13 @@ function get_acl_permissions($user = null) {
 
        if (is_array($user)) {
                $allow_cid = ((strlen($user['allow_cid']))
-                       ? explode('><', $user['allow_cid']) : array() );
+                       ? explode('><', $user['allow_cid']) : [] );
                $allow_gid = ((strlen($user['allow_gid']))
-                       ? explode('><', $user['allow_gid']) : array() );
+                       ? explode('><', $user['allow_gid']) : [] );
                $deny_cid  = ((strlen($user['deny_cid']))
-                       ? explode('><', $user['deny_cid']) : array() );
+                       ? explode('><', $user['deny_cid']) : [] );
                $deny_gid  = ((strlen($user['deny_gid']))
-                       ? explode('><', $user['deny_gid']) : array() );
+                       ? explode('><', $user['deny_gid']) : [] );
                array_walk($allow_cid,'fixacl');
                array_walk($allow_gid,'fixacl');
                array_walk($deny_cid,'fixacl');
@@ -315,12 +317,12 @@ function get_acl_permissions($user = null) {
 
        $allow_cid = prune_deadguys($allow_cid);
 
-       return array(
+       return [
                'allow_cid' => $allow_cid,
                'allow_gid' => $allow_gid,
                'deny_cid' => $deny_cid,
                'deny_gid' => $deny_gid,
-       );
+       ];
 }
 
 
@@ -350,35 +352,34 @@ function populate_acl($user = null, $show_jotnets = false) {
                if (!$user['hidewall']) {
                        if ($mail_enabled) {
                                $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-                               $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
+                               $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . L10n::t("Post to Email") . '</div>';
                        }
 
-                       call_hooks('jot_networks', $jotnets);
+                       Addon::callHooks('jot_networks', $jotnets);
                } else {
-                       $jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'),
-                                           t('Hide your profile details from unknown viewers?'));
+                       $jotnets .= L10n::t('Connectors disabled, since "%s" is enabled.', L10n::t('Hide your profile details from unknown viewers?'));
                }
        }
 
        $tpl = get_markup_template("acl_selector.tpl");
-       $o = replace_macros($tpl, array(
-               '$showall'=> t("Visible to everybody"),
-               '$show' => t("show"),
-               '$hide'  => t("don't show"),
+       $o = replace_macros($tpl, [
+               '$showall'=> L10n::t("Visible to everybody"),
+               '$show' => L10n::t("show"),
+               '$hide'  => L10n::t("don't show"),
                '$allowcid' => json_encode($perms['allow_cid']),
                '$allowgid' => json_encode($perms['allow_gid']),
                '$denycid' => json_encode($perms['deny_cid']),
                '$denygid' => json_encode($perms['deny_gid']),
                '$networks' => $show_jotnets,
-               '$emailcc' => t('CC: email addresses'),
-               '$emtitle' => t('Example: bob@example.com, mary@example.com'),
+               '$emailcc' => L10n::t('CC: email addresses'),
+               '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
                '$jotnets' => $jotnets,
-               '$aclModalTitle' => t('Permissions'),
-               '$aclModalDismiss' => t('Close'),
-               '$features' => array(
+               '$aclModalTitle' => L10n::t('Permissions'),
+               '$aclModalDismiss' => L10n::t('Close'),
+               '$features' => [
                'aclautomention' => (Feature::isEnabled($user['uid'], "aclautomention") ? "true" : "false")
-               ),
-       ));
+               ],
+       ]);
 
 
        return $o;
@@ -405,7 +406,7 @@ function acl_lookup(App $a, $out_type = 'json')
                $search = $_REQUEST['query'];
        }
 
-       logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG);
+       logger("Searching for ".$search." - type ".$type." conversation ".$conv_id, LOGGER_DEBUG);
 
        if ($search != '') {
                $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
@@ -475,8 +476,8 @@ function acl_lookup(App $a, $out_type = 'json')
 
        $tot = $group_count + $contact_count;
 
-       $groups = array();
-       $contacts = array();
+       $groups = [];
+       $contacts = [];
 
        if ($type == '' || $type == 'g') {
                /// @todo We should cache this query.
@@ -495,7 +496,7 @@ function acl_lookup(App $a, $out_type = 'json')
                );
 
                foreach ($r as $g) {
-                       $groups[] = array(
+                       $groups[] = [
                                "type"  => "g",
                                "photo" => "images/twopeople.png",
                                "name"  => htmlentities($g['name']),
@@ -503,10 +504,10 @@ function acl_lookup(App $a, $out_type = 'json')
                                "uids"  => array_map("intval", explode(",",$g['uids'])),
                                "link"  => '',
                                "forum" => '0'
-                       );
+                       ];
                }
                if ((count($groups) > 0) && ($search == "")) {
-                       $groups[] = array("separator" => true);
+                       $groups[] = ["separator" => true];
                }
        }
 
@@ -558,34 +559,34 @@ function acl_lookup(App $a, $out_type = 'json')
        } elseif ($type == 'x') {
                // autocomplete for global contact search (e.g. navbar search)
                $r = navbar_complete($a);
-               $contacts = array();
+               $contacts = [];
                if ($r) {
                        foreach ($r as $g) {
-                               $contacts[] = array(
+                               $contacts[] = [
                                        'photo'   => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
                                        'name'    => $g['name'],
                                        'nick'    => (x($g['addr']) ? $g['addr'] : $g['url']),
                                        'network' => $g['network'],
                                        'link'    => $g['url'],
                                        'forum'   => (x($g['community']) ? 1 : 0),
-                               );
+                               ];
                        }
                }
-               $o = array(
+               $o = [
                        'start' => $start,
                        'count' => $count,
                        'items' => $contacts,
-               );
+               ];
                echo json_encode($o);
                killme();
        } else {
-               $r = array();
+               $r = [];
        }
 
        if (DBM::is_result($r)) {
-               $forums = array();
+               $forums = [];
                foreach ($r as $g) {
-                       $entry = array(
+                       $entry = [
                                'type'    => 'c',
                                'photo'   => proxy_url($g['micro'], false, PROXY_SIZE_MICRO),
                                'name'    => htmlentities($g['name']),
@@ -595,7 +596,7 @@ function acl_lookup(App $a, $out_type = 'json')
                                'nick'    => htmlentities(($g['attag']) ? $g['attag'] : $g['nick']),
                                'addr'    => htmlentities(($g['addr']) ? $g['addr'] : $g['url']),
                                'forum'   => ((x($g, 'forum') || x($g, 'prv')) ? 1 : 0),
-                       );
+                       ];
                        if ($entry['forum']) {
                                $forums[] = $entry;
                        } else {
@@ -604,7 +605,7 @@ function acl_lookup(App $a, $out_type = 'json')
                }
                if (count($forums) > 0) {
                        if ($search == "") {
-                               $forums[] = array("separator" => true);
+                               $forums[] = ["separator" => true];
                        }
                        $contacts = array_merge($forums, $contacts);
                }
@@ -612,6 +613,14 @@ function acl_lookup(App $a, $out_type = 'json')
 
        $items = array_merge($groups, $contacts);
 
+       // At multi threaded posts the conv_id is not the parent of the whole thread
+       if ($conv_id > 0) {
+               $parent_item = dba::selectFirst('item', ['parent'], ['id' => $conv_id]);
+               if (DBM::is_result($parent_item)) {
+                       $conv_id = $parent_item['parent'];
+               }
+       }
+
        if ($conv_id) {
                /*
                 * if $conv_id is set, get unknown contacts in thread
@@ -623,7 +632,7 @@ function acl_lookup(App $a, $out_type = 'json')
                        }
                , $contacts);
 
-               $unknown_contacts = array();
+               $unknown_contacts = [];
                $r = q("SELECT `author-link`
                                FROM `item` WHERE `parent` = %d
                                        AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%')
@@ -641,7 +650,7 @@ function acl_lookup(App $a, $out_type = 'json')
                                $contact = Contact::getDetailsByURL($row['author-link']);
 
                                if (count($contact) > 0) {
-                                       $unknown_contacts[] = array(
+                                       $unknown_contacts[] = [
                                                'type'    => 'c',
                                                'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
                                                'name'    => htmlentities($contact['name']),
@@ -651,7 +660,7 @@ function acl_lookup(App $a, $out_type = 'json')
                                                'nick'    => htmlentities($contact['nick'] ? : $contact['addr']),
                                                'addr'    => htmlentities(($contact['addr']) ? $contact['addr'] : $contact['url']),
                                                'forum'   => $contact['forum']
-                                       );
+                                       ];
                                }
                        }
                }
@@ -660,7 +669,7 @@ function acl_lookup(App $a, $out_type = 'json')
                $tot += count($unknown_contacts);
        }
 
-       $results = array(
+       $results = [
                'tot'      => $tot,
                'start'    => $start,
                'count'    => $count,
@@ -669,27 +678,27 @@ function acl_lookup(App $a, $out_type = 'json')
                'items'    => $items,
                'type'     => $type,
                'search'   => $search,
-       );
+       ];
 
-       call_hooks('acl_lookup_end', $results);
+       Addon::callHooks('acl_lookup_end', $results);
 
        if ($out_type === 'html') {
-               $o = array(
+               $o = [
                        'tot'      => $results['tot'],
                        'start'    => $results['start'],
                        'count'    => $results['count'],
                        'groups'   => $results['groups'],
                        'contacts' => $results['contacts'],
-               );
+               ];
                return $o;
        }
 
-       $o = array(
+       $o = [
                'tot'   => $results['tot'],
                'start' => $results['start'],
                'count' => $results['count'],
                'items' => $results['items'],
-       );
+       ];
 
        echo json_encode($o);
 
@@ -712,12 +721,12 @@ function navbar_complete(App $a) {
        // check if searching in the local global contact table is enabled
        $localsearch = Config::get('system','poco_local_search');
 
-       $search = $prefix.notags(trim($_REQUEST['search']));
+       $search = notags(trim($_REQUEST['search']));
        $mode = $_REQUEST['smode'];
 
        // don't search if search term has less than 2 characters
        if (! $search || mb_strlen($search) < 2) {
-               return array();
+               return [];
        }
 
        if (substr($search,0,1) === '@') {
@@ -732,7 +741,7 @@ function navbar_complete(App $a) {
        if (! $localsearch) {
                $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 
-               $x = z_fetch_url(get_server() . '/lsearch?f=' . $p .  '&search=' . urlencode($search));
+               $x = Network::curl(get_server() . '/lsearch?f=' . $p .  '&search=' . urlencode($search));
                if ($x['success']) {
                        $j = json_decode($x['body'],true);
                        if ($j && isset($j['results'])) {