X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=d1b791136f6aec05c84d7d0d3a51b6be7e4cb209;hb=5a0260a10fa375d34ceabd32363003f91aca18a4;hp=f2d2999ba6175341ef254b4754e29f0f4b9c0083;hpb=d2b3e0daf57319caa80393914102d575d464a6ea;p=friendica.git diff --git a/include/acl_selectors.php b/include/acl_selectors.php index f2d2999ba6..d1b791136f 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -1,15 +1,17 @@ module . '_pre_' . $selname, $arr); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach ($r as $rr) { - if((is_array($preselected)) && in_array($rr['id'], $preselected)) + if ((is_array($preselected)) && in_array($rr['id'], $preselected)) { $selected = " selected=\"selected\" "; - else + } else { $selected = ''; + } $trimmed = mb_substr($rr['name'],0,12); @@ -54,9 +57,9 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { return $o; } - -function contact_selector($selname, $selclass, $preselected = false, $options) { - +/// @TODO find proper type-hints +function contact_selector($selname, $selclass, $options, $preselected = false) +{ $a = get_app(); $mutual = false; @@ -66,40 +69,42 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { $size = 4; if (is_array($options)) { - if (x($options,'size')) + if (x($options, 'size')) $size = $options['size']; - if (x($options,'mutual_friends')) { + if (x($options, 'mutual_friends')) { $mutual = true; } - if (x($options,'single')) { + if (x($options, 'single')) { $single = true; } - if (x($options,'multiple')) { + if (x($options, 'multiple')) { $single = false; } - if (x($options,'exclude')) { + if (x($options, 'exclude')) { $exclude = $options['exclude']; } - if (x($options,'networks')) { - switch($options['networks']) { + if (x($options, 'networks')) { + switch ($options['networks']) { case 'DFRN_ONLY': $networks = array(NETWORK_DFRN); break; case 'PRIVATE': - if(is_array($a->user) && $a->user['prvnets']) - $networks = array(NETWORK_DFRN,NETWORK_MAIL,NETWORK_DIASPORA); - else - $networks = array(NETWORK_DFRN,NETWORK_FACEBOOK,NETWORK_MAIL, NETWORK_DIASPORA); + if (is_array($a->user) && $a->user['prvnets']) { + $networks = array(NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA); + } else { + $networks = array(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); - else - $networks = array(NETWORK_DFRN,NETWORK_FACEBOOK,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_OSTATUS); + if (is_array($a->user) && $a->user['prvnets']) { + $networks = array(NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA); + } else { + $networks = array(NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS); + } break; - default: + default: /// @TODO Maybe log this call? break; } } @@ -113,26 +118,30 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { $sql_extra = ''; - if($x['mutual']) { + if (x($x, 'mutual')) { $sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND)); } - if(intval($x['exclude'])) + if (x($x, 'exclude')) { $sql_extra .= sprintf(" AND `id` != %d ", intval($x['exclude'])); + } - if(is_array($x['networks']) && count($x['networks'])) { - for($y = 0; $y < count($x['networks']) ; $y ++) + if (is_array($x['networks']) && count($x['networks'])) { + /// @TODO rewrite to foreach() + for ($y = 0; $y < count($x['networks']) ; $y ++) { $x['networks'][$y] = "'" . dbesc($x['networks'][$y]) . "'"; - $str_nets = implode(',',$x['networks']); + } + $str_nets = implode(',', $x['networks']); $sql_extra .= " AND `network` IN ( $str_nets ) "; } $tabindex = (x($options, 'tabindex') ? "tabindex=\"" . $options["tabindex"] . "\"" : ""); - if($x['single']) + if ($x['single']) { $o .= "\r\n"; + } $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' @@ -148,7 +157,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { call_hooks($a->module . '_pre_' . $selname, $arr); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach ($r as $rr) { if ((is_array($preselected)) && in_array($rr['id'], $preselected)) { $selected = " selected=\"selected\" "; @@ -174,7 +183,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) { - require_once("include/bbcode.php"); + require_once "include/bbcode.php"; $a = get_app(); @@ -185,29 +194,32 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $sql_extra = ''; - if($privmail || $celeb) { + if ($privmail || $celeb) { $sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND)); } - if($privmail) + if ($privmail) { $sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ", NETWORK_DFRN, NETWORK_DIASPORA); - elseif($privatenet) + } elseif ($privatenet) { $sql_extra .= sprintf(" AND `network` IN ('%s' , '%s', '%s', '%s') ", NETWORK_DFRN, NETWORK_MAIL, NETWORK_FACEBOOK, NETWORK_DIASPORA); + } $tabindex = ($tabindex > 0 ? "tabindex=\"$tabindex\"" : ""); - if ($privmail AND $preselected) { + if ($privmail && $preselected) { $sql_extra .= " AND `id` IN (".implode(",", $preselected).")"; $hidepreselected = ' style="display: none;"'; - } else + } else { $hidepreselected = ""; + } - if($privmail) + if ($privmail) { $o .= "\r\n"; + } $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' @@ -225,12 +237,11 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $receiverlist = array(); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach ($r as $rr) { if ((is_array($preselected)) && in_array($rr['id'], $preselected)) { $selected = " selected=\"selected\" "; - } - else { + } else { $selected = ''; } @@ -249,8 +260,9 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o .= "\r\n"; - if ($privmail AND $preselected) + if ($privmail && $preselected) { $o .= implode(", ", $receiverlist); + } call_hooks($a->module . '_post_' . $selname, $o); @@ -259,7 +271,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p function fixacl(&$item) { - $item = intval(str_replace(array('<','>'),array('',''),$item)); + $item = intval(str_replace(array('<', '>'), array('', ''), $item)); } function prune_deadguys($arr) { @@ -268,11 +280,11 @@ function prune_deadguys($arr) { return $arr; } - $str = dbesc(implode(',',$arr)); + $str = dbesc(implode(',', $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)) { + if (DBM::is_result($r)) { $ret = array(); foreach ($r as $rr) { $ret[] = intval($rr['id']); @@ -287,7 +299,7 @@ function prune_deadguys($arr) { function get_acl_permissions($user = null) { $allow_cid = $allow_gid = $deny_cid = $deny_gid = false; - if(is_array($user)) { + if (is_array($user)) { $allow_cid = ((strlen($user['allow_cid'])) ? explode('><', $user['allow_cid']) : array() ); $allow_gid = ((strlen($user['allow_gid'])) @@ -318,34 +330,36 @@ function populate_acl($user = null, $show_jotnets = false) { $perms = get_acl_permissions($user); $jotnets = ''; - if($show_jotnets) { - $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); + if ($show_jotnets) { + $mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1); $mail_enabled = false; $pubmail_enabled = false; - if(! $mail_disabled) { + if (! $mail_disabled) { $r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $mail_enabled = true; - if(intval($r[0]['pubmail'])) + if (intval($r[0]['pubmail'])) { $pubmail_enabled = true; + } } } if (!$user['hidewall']) { - if($mail_enabled) { + if ($mail_enabled) { $selected = (($pubmail_enabled) ? ' checked="checked" ' : ''); $jotnets .= '
' . t("Post to Email") . '
'; } call_hooks('jot_networks', $jotnets); - } else + } else { $jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'), t('Hide your profile details from unknown viewers?')); } + } $tpl = get_markup_template("acl_selector.tpl"); $o = replace_macros($tpl, array( @@ -363,7 +377,7 @@ function populate_acl($user = null, $show_jotnets = false) { '$aclModalTitle' => t('Permissions'), '$aclModalDismiss' => t('Close'), '$features' => array( - "aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false") + 'aclautomention' => (Feature::isEnabled($user['uid'], "aclautomention") ? "true" : "false") ), )); @@ -373,30 +387,35 @@ function populate_acl($user = null, $show_jotnets = false) { } function construct_acl_data(App $a, $user) { + // This function is now deactivated. It seems as if the generated data isn't used anywhere. + /// @todo Remove this function and all function calls before releasing Friendica 3.5.3 + return; // Get group and contact information for html ACL selector $acl_data = acl_lookup($a, 'html'); $user_defaults = get_acl_permissions($user); - if($acl_data['groups']) { - foreach($acl_data['groups'] as $key=>$group) { + if ($acl_data['groups']) { + foreach ($acl_data['groups'] as $key => $group) { // Add a "selected" flag to groups that are posted to by default - if($user_defaults['allow_gid'] && - in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) ) + if ($user_defaults['allow_gid'] && + in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) ) { $acl_data['groups'][$key]['selected'] = 1; - else + } else { $acl_data['groups'][$key]['selected'] = 0; + } } } - if($acl_data['contacts']) { - foreach($acl_data['contacts'] as $key=>$contact) { + if ($acl_data['contacts']) { + foreach ($acl_data['contacts'] as $key => $contact) { // Add a "selected" flag to groups that are posted to by default - if($user_defaults['allow_cid'] && - in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) ) + if ($user_defaults['allow_cid'] && + in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) ) { $acl_data['contacts'][$key]['selected'] = 1; - else + } else { $acl_data['contacts'][$key]['selected'] = 0; + } } } @@ -419,23 +438,25 @@ function acl_lookup(App $a, $out_type = 'json') { // For use with jquery.textcomplete for private mail completion - if(x($_REQUEST,'query') && strlen($_REQUEST['query'])) { - if(! $type) + if (x($_REQUEST, 'query') && strlen($_REQUEST['query'])) { + if (! $type) { $type = 'm'; + } $search = $_REQUEST['query']; } logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG); - if ($search!=""){ + if ($search != "") { $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'"; $sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')"; } else { + /// @TODO Avoid these needless else blocks by putting variable-initialization atop of if() $sql_extra = $sql_extra2 = ""; } // count groups and contacts - if ($type=='' || $type=='g'){ + if ($type == '' || $type == 'g') { $r = q("SELECT COUNT(*) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra", intval(local_user()) ); @@ -446,33 +467,42 @@ function acl_lookup(App $a, $out_type = 'json') { $sql_extra2 .= " ".unavailable_networks(); - // autocomplete for editor mentions - if ($type=='' || $type=='c'){ + if ($type == '' || $type == 'c') { + // autocomplete for editor mentions $r = q("SELECT COUNT(*) AS c FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` + AND `success_update` >= `failure_update` AND `notify` != '' $sql_extra2" , intval(local_user()) ); $contact_count = (int)$r[0]['c']; - } - elseif ($type == 'm') { - + } elseif ($type == 'f') { + // autocomplete for editor mentions of forums + $r = q("SELECT COUNT(*) AS c FROM `contact` + WHERE `uid` = %d AND NOT `self` + AND NOT `blocked` AND NOT `pending` AND NOT `archive` + AND (`forum` OR `prv`) + AND `success_update` >= `failure_update` + AND `notify` != '' $sql_extra2" , + intval(local_user()) + ); + $contact_count = (int)$r[0]['c']; + } elseif ($type == 'm') { // autocomplete for Private Messages $r = q("SELECT COUNT(*) AS c FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND `network` IN ('%s','%s','%s') $sql_extra2" , + AND `success_update` >= `failure_update` + AND `network` IN ('%s', '%s') $sql_extra2" , intval(local_user()), dbesc(NETWORK_DFRN), - dbesc(NETWORK_ZOT), dbesc(NETWORK_DIASPORA) ); $contact_count = (int)$r[0]['c']; - } - elseif ($type == 'a') { + } elseif ($type == 'a') { // autocomplete for Contacts @@ -493,7 +523,7 @@ function acl_lookup(App $a, $out_type = 'json') { $groups = array(); $contacts = array(); - if ($type=='' || $type=='g'){ + if ($type == '' || $type == 'g') { /// @todo We should cache this query. // This can be done when we can delete cache entries via wildcard @@ -510,7 +540,7 @@ function acl_lookup(App $a, $out_type = 'json') { intval($count) ); - foreach($r as $g){ + foreach ($r as $g) { // logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']); $groups[] = array( "type" => "g", @@ -522,44 +552,53 @@ function acl_lookup(App $a, $out_type = 'json') { "forum" => '0' ); } + if ((count($groups) > 0) && ($search == "")) { + $groups[] = array("separator" => true); + } } - if ($type==''){ + if ($type == '') { - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact` + $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv`, (`prv` OR `forum`) AS `frm` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' - AND NOT (`network` IN ('%s', '%s')) + AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s', '%s')) $sql_extra2 ORDER BY `name` ASC ", intval(local_user()), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_STATUSNET) ); - } - elseif ($type=='c'){ - - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact` + } elseif ($type == 'c') { + $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' - AND NOT (`network` IN ('%s')) + AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s')) $sql_extra2 ORDER BY `name` ASC ", intval(local_user()), dbesc(NETWORK_STATUSNET) ); - } - elseif($type == 'm') { - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` + } elseif ($type == 'f') { + $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` + WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' + AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s')) + AND (`forum` OR `prv`) + $sql_extra2 + ORDER BY `name` ASC ", + intval(local_user()), + dbesc(NETWORK_STATUSNET) + ); + } elseif ($type == 'm') { + $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND `network` IN ('%s','%s','%s') + AND `success_update` >= `failure_update` AND `network` IN ('%s', '%s') $sql_extra2 ORDER BY `name` ASC ", intval(local_user()), dbesc(NETWORK_DFRN), - dbesc(NETWORK_ZOT), dbesc(NETWORK_DIASPORA) ); } elseif ($type == 'a') { - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `forum`, `prv` FROM `contact` - WHERE `uid` = %d AND `pending` = 0 + $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact` + WHERE `uid` = %d AND `pending` = 0 AND `success_update` >= `failure_update` $sql_extra2 ORDER BY `name` ASC ", intval(local_user()) @@ -592,9 +631,10 @@ function acl_lookup(App $a, $out_type = 'json') { } - if (dbm::is_result($r)) { - foreach ($r as $g){ - $contacts[] = array( + if (DBM::is_result($r)) { + $forums = array(); + foreach ($r as $g) { + $entry = array( 'type' => 'c', 'photo' => proxy_url($g['micro'], false, PROXY_SIZE_MICRO), 'name' => htmlentities($g['name']), @@ -602,8 +642,20 @@ function acl_lookup(App $a, $out_type = 'json') { 'network' => $g['network'], 'link' => $g['url'], 'nick' => htmlentities(($g['attag']) ? $g['attag'] : $g['nick']), - 'forum' => ((x($g['forum']) || x($g['prv'])) ? 1 : 0), + 'addr' => htmlentities(($g['addr']) ? $g['addr'] : $g['url']), + 'forum' => ((x($g, 'forum') || x($g, 'prv')) ? 1 : 0), ); + if ($entry['forum']) { + $forums[] = $entry; + } else { + $contacts[] = $entry; + } + } + if (count($forums) > 0) { + if ($search == "") { + $forums[] = array("separator" => true); + } + $contacts = array_merge($forums, $contacts); } } @@ -633,9 +685,9 @@ function acl_lookup(App $a, $out_type = 'json') { dbesc($search), implode("', '", $known_contacts) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach ($r as $row) { - $contact = get_contact_details_by_url($row['author-link']); + $contact = Contact::getDetailsByURL($row['author-link']); if (count($contact) > 0) { $unknown_contacts[] = array( @@ -646,6 +698,7 @@ function acl_lookup(App $a, $out_type = 'json') { 'network' => $contact['network'], 'link' => $contact['url'], 'nick' => htmlentities($contact['nick'] ? : $contact['addr']), + 'addr' => htmlentities(($contact['addr']) ? $contact['addr'] : $contact['url']), 'forum' => $contact['forum'] ); } @@ -669,7 +722,7 @@ function acl_lookup(App $a, $out_type = 'json') { call_hooks('acl_lookup_end', $results); - if($out_type === 'html') { + if ($out_type === 'html') { $o = array( 'tot' => $results['tot'], 'start' => $results['start'], @@ -701,12 +754,12 @@ function navbar_complete(App $a) { // logger('navbar_complete'); - if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { return; } // check if searching in the local global contact table is enabled - $localsearch = get_config('system','poco_local_search'); + $localsearch = Config::get('system','poco_local_search'); $search = $prefix.notags(trim($_REQUEST['search'])); $mode = $_REQUEST['smode']; @@ -721,7 +774,7 @@ function navbar_complete(App $a) { } if ($localsearch) { - $x = DirSearch::global_search_by_name($search, $mode); + $x = GContact::searchByName($search, $mode); return $x; }