X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=b2c4b31c8132e60161c63a747ac840586d566326;hb=cbe4e2bf8c7b6fea2e700811a15b427e6141c9dd;hp=72c434692c0c6087f432f56402049ba41c248b70;hpb=e312b734ca86f0e3b8903825357e40fab9a4e6a8;p=friendica.git
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 72c434692c..b2c4b31c81 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -2,13 +2,14 @@
require_once("include/contact_selectors.php");
require_once("include/features.php");
+require_once("mod/proxy.php");
/**
- *
+ *
*/
/**
- * @package acl_selectors
+ * @package acl_selectors
*/
function group_select($selname,$selclass,$preselected = false,$size = 4) {
@@ -35,11 +36,12 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
$selected = " selected=\"selected\" ";
else
$selected = '';
+
$trimmed = mb_substr($rr['name'],0,12);
$o .= "\r\n";
}
-
+
}
$o .= "\r\n";
@@ -76,26 +78,26 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
if(x($options,'networks')) {
switch($options['networks']) {
case 'DFRN_ONLY':
- $networks = array('dfrn');
+ $networks = array(NETWORK_DFRN);
break;
case 'PRIVATE':
if(is_array($a->user) && $a->user['prvnets'])
- $networks = array('dfrn','mail','dspr');
+ $networks = array(NETWORK_DFRN,NETWORK_MAIL,NETWORK_DIASPORA);
else
- $networks = array('dfrn','face','mail', 'dspr');
+ $networks = array(NETWORK_DFRN,NETWORK_FACEBOOK,NETWORK_MAIL, NETWORK_DIASPORA);
break;
case 'TWO_WAY':
if(is_array($a->user) && $a->user['prvnets'])
- $networks = array('dfrn','mail','dspr');
+ $networks = array(NETWORK_DFRN,NETWORK_MAIL,NETWORK_DIASPORA);
else
- $networks = array('dfrn','face','mail','dspr','stat');
- break;
+ $networks = array(NETWORK_DFRN,NETWORK_FACEBOOK,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_OSTATUS);
+ break;
default:
break;
}
}
}
-
+
$x = array('options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks);
call_hooks('contact_select_options', $x);
@@ -117,15 +119,15 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
$str_nets = implode(',',$x['networks']);
$sql_extra .= " AND `network` IN ( $str_nets ) ";
}
-
+
$tabindex = (x($options, 'tabindex') ? "tabindex=\"" . $options["tabindex"] . "\"" : "");
if($x['single'])
$o .= "