X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Facl_selectors.php;h=66fe104eaab2aee3acc1901564cb2064ea6b756f;hb=53590d216691a572ede5e30dbc631a6cd0669c41;hp=94f51a9ff5ae1fd0e1b3636b557cace370a6d752;hpb=9e746b504fd0f1367cce6353ac51f71327d8fb75;p=friendica.git

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 94f51a9ff5..66fe104eaa 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -10,7 +10,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 	$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
 
 	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
-		$_SESSION['uid']
+		intval(local_user())
 	);
 
 
@@ -26,7 +26,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 				$selected = " selected=\"selected\" ";
 			else
 				$selected = '';
-			$trimmed = substr($rr['name'],0,12);
+			$trimmed = mb_substr($rr['name'],0,12);
 
 			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}\" >$trimmed</option>\r\n";
 		}
@@ -41,6 +41,115 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 }
 
 
+function contact_selector($selname, $selclass, $preselected = false, $options) {
+
+	$a = get_app();
+
+	$mutual = false;
+	$networks = null;
+	$single = false;
+	$exclude = false;
+	$size = 4;
+
+	if(is_array($options)) {
+		if(x($options,'size'))
+			$size = $options['size'];
+
+		if(x($options,'mutual_friends'))
+			$mutual = true;
+		if(x($options,'single'))
+			$single = true;
+		if(x($options,'multiple'))
+			$single = false;
+		if(x($options,'exclude'))
+			$exclude = $options['exclude'];
+
+		if(x($options,'networks')) {
+			switch($options['networks']) {
+				case 'DFRN_ONLY':
+					$networks = array('dfrn');
+					break;
+				case 'PRIVATE':
+					if(is_array($a->user) && $a->user['prvnets'])
+						$networks = array('dfrn','mail','dspr');
+					else
+						$networks = array('dfrn','face','mail', 'dspr');
+					break;
+				case 'TWO_WAY':
+					if(is_array($a->user) && $a->user['prvnets'])
+						$networks = array('dfrn','mail','dspr');
+					else
+						$networks = array('dfrn','face','mail','dspr','stat');
+					break;					
+				default:
+					break;
+			}
+		}
+	}
+		
+	$x = array('options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks);
+
+	call_hooks('contact_select_options', $x);
+
+	$o = '';
+
+	$sql_extra = '';
+
+	if($x['mutual']) {
+		$sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
+	}
+
+	if(intval($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 ++)
+			$x['networks'][$y] = "'" . dbesc($x['networks'][$y]) . "'";
+		$str_nets = implode(',',$x['networks']);
+		$sql_extra .= " AND `network` IN ( $str_nets ) ";
+	}
+
+	if($x['single'])
+		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"" . $x['size'] . "\" >\r\n";
+	else 
+		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" >\r\n";
+
+	$r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` 
+		WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
+		$sql_extra
+		ORDER BY `name` ASC ",
+		intval(local_user())
+	);
+
+
+	$arr = array('contact' => $r, 'entry' => $o);
+
+	// e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
+
+	call_hooks($a->module . '_pre_' . $selname, $arr);
+
+	if(count($r)) {
+		foreach($r as $rr) {
+			if((is_array($preselected)) && in_array($rr['id'], $preselected))
+				$selected = " selected=\"selected\" ";
+			else
+				$selected = '';
+
+			$trimmed = mb_substr($rr['name'],0,20);
+
+			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
+		}
+	
+	}
+
+	$o .= "</select>\r\n";
+
+	call_hooks($a->module . '_post_' . $selname, $o);
+
+	return $o;
+}
+
+
 
 function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false) {
 
@@ -48,18 +157,23 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$o = '';
 
-	// When used for private messages, we limit correspondence to mutual friends and the selector
+	// When used for private messages, we limit correspondence to mutual DFRN/Friendika friends and the selector
 	// to one recipient. By default our selector allows multiple selects amongst all contacts.
 
 	$sql_extra = '';
 
 	if($privmail || $celeb) {
-		$sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
+		$sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
 	}
 
-	if($privmail || $privatenet) {
+	if($privmail) {
 		$sql_extra .= " AND `network` IN ( 'dfrn' ) ";
-	}	
+	}
+	elseif($privatenet) {	
+		$sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face', 'dspr' ) ";
+	}
+
+
 
 	if($privmail)
 		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
@@ -80,8 +194,6 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	call_hooks($a->module . '_pre_' . $selname, $arr);
 
-
-
 	if(count($r)) {
 		foreach($r as $rr) {
 			if((is_array($preselected)) && in_array($rr['id'], $preselected))
@@ -89,7 +201,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 			else
 				$selected = '';
 
-			$trimmed = substr($rr['name'],0,22);
+			$trimmed = mb_substr($rr['name'],0,20);
 
 			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
 		}
@@ -103,6 +215,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 	return $o;
 }
 
+
 function fixacl(&$item) {
 	$item = intval(str_replace(array('<','>'),array('',''),$item));
 }
@@ -126,10 +239,10 @@ function populate_acl($user = null,$celeb = false) {
 		array_walk($deny_gid,'fixacl');
 	}
 
-	$o = '';
+	/*$o = '';
 	$o .= '<div id="acl-wrapper">';
 	$o .= '<div id="acl-permit-outer-wrapper">';
-	$o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div>';
+	$o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div><div id="jot-public">' . t('everybody') . '</div>';
 	$o .= '<div id="acl-permit-text-end"></div>';
 	$o .= '<div id="acl-permit-wrapper">';
 	$o .= '<div id="group_allow_wrapper">';
@@ -159,7 +272,20 @@ function populate_acl($user = null,$celeb = false) {
 	$o .= '<div id="acl-deny-end"></div>' . "\r\n";
 	$o .= '</div>';
 	$o .= '</div>' . "\r\n";
-	$o .= '<div id="acl-wrapper-end"></div>' . "\r\n";
+	$o .= '<div id="acl-wrapper-end"></div>' . "\r\n";*/
+	
+	$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"),
+		'$allowcid' => json_encode($allow_cid),
+		'$allowgid' => json_encode($allow_gid),
+		'$denycid' => json_encode($deny_cid),
+		'$denygid' => json_encode($deny_gid),
+	));
+	
+	
 	return $o;
 
 }