X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=02c75c7755c6d9d28942ed420803847f5f12944b;hb=57fe19da72be37104915676b8003326d8e440343;hp=89e1f24df4727f358ebb51f8330e1da5e3c30a2d;hpb=c9d8211ae73332b6c4e91d82ba06275b92d7523a;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
index 89e1f24df4..02c75c7755 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -1,15 +1,26 @@
 <?php
 
+require_once('include/Contact.php');
+
 function contacts_init(&$a) {
 	require_once('include/group.php');
+	if(! x($a->page,'aside'))
+		$a->page['aside'] = '';
 	$a->page['aside'] .= group_side();
 
 	if($a->config['register_policy'] != REGISTER_CLOSED)
 		$a->page['aside'] .= '<div class="side-invite-link-wrapper" id="side-invite-link-wrapper" ><a href="invite" class="side-invite-link" id="side-invite-link">' . t("Invite Friends") . '</a></div>';
+
+	$tpl = load_view_file('view/follow.tpl');
+	$a->page['aside'] .= replace_macros($tpl,array(
+		'$label' => t('Connect/Follow [profile address]'),
+		'$hint' => t('Example: bob@example.com, http://example.com/barbara'),
+		'$follow' => t('Follow')
+	));
+
 }
 
 function contacts_post(&$a) {
-
 	
 	if(! local_user())
 		return;
@@ -20,11 +31,11 @@ function contacts_post(&$a) {
 
 	$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($contact_id),
-		intval($_SESSION['uid'])
+		intval(local_user())
 	);
 
 	if(! count($orig_record)) {
-		notice("Could not access contact record." . EOL);
+		notice( t('Could not access contact record.') . EOL);
 		goaway($a->get_baseurl() . '/contacts');
 		return; // NOTREACHED
 	}
@@ -33,14 +44,18 @@ function contacts_post(&$a) {
 	if($profile_id) {
 		$r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($profile_id),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 		if(! count($r)) {
 			notice( t('Could not locate selected profile.') . EOL);
 			return;
 		}
 	}
+
+
 	$priority = intval($_POST['priority']);
+	if($priority == (-1))
+		
 	if($priority > 5 || $priority < 0)
 		$priority = 0;
 
@@ -57,7 +72,7 @@ function contacts_post(&$a) {
 		intval($rating),
 		dbesc($reason),
 		intval($contact_id),
-		intval($_SESSION['uid'])
+		intval(local_user())
 	);
 	if($r)
 		notice( t('Contact updated.') . EOL);
@@ -71,6 +86,11 @@ function contacts_post(&$a) {
 
 function contacts_content(&$a) {
 
+	$sort_type = 0;
+	$o = '';
+	$o .= '<script>	$(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
+
+
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
@@ -86,7 +106,7 @@ function contacts_content(&$a) {
 
 		$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($contact_id),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 
 		if(! count($orig_record)) {
@@ -96,53 +116,37 @@ function contacts_content(&$a) {
 		}
 
 
-		if($cmd == 'block') {
+		if($cmd === 'block') {
 			$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
 			$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
 					intval($blocked),
 					intval($contact_id),
-					intval($_SESSION['uid'])
+					intval(local_user())
 			);
 			if($r) {
-				$msg = t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ;
-				notice($msg);
+				notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
 			}
-			goaway($a->get_baseurl() ."/contacts/$contact_id");
+			goaway($a->get_baseurl() . '/contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
 
-		if($cmd == 'ignore') {
+		if($cmd === 'ignore') {
 			$readonly = (($orig_record[0]['readonly']) ? 0 : 1);
 			$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
 					intval($readonly),
 					intval($contact_id),
-					intval($_SESSION['uid'])
+					intval(local_user())
 			);
 			if($r) {
-				$msg = t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL ;
-				notice($msg);
+				notice( t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL );
 			}
-			goaway($a->get_baseurl() ."/contacts/$contact_id");
+			goaway($a->get_baseurl() . '/contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
 
-		if($cmd == 'drop') {
-			$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($contact_id),
-				intval($_SESSION['uid'])
-			);
-
-			q("DELETE FROM `item` WHERE `contact-id` = %d AND `uid` = %d ",
-					intval($contact_id),
-					intval($_SESSION['uid'])
-			);
-			q("DELETE FROM `photo` WHERE `contact-id` = %d AND `uid` = %d ",
- 
-					intval($contact_id),
-					intval($_SESSION['uid'])
-			);
-	
-			notice("Contact has been removed." . EOL );
+		if($cmd === 'drop') {
+			contact_remove($contact_id);
+			notice( t('Contact has been removed.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
 			return; // NOTREACHED
 		}
@@ -152,7 +156,7 @@ function contacts_content(&$a) {
 
 		$contact_id = intval($a->argv[1]);
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
-			$_SESSION['uid'],
+			intval(local_user()),
 			intval($contact_id)
 		);
 		if(! count($r)) {
@@ -160,27 +164,37 @@ function contacts_content(&$a) {
 			return;
 		}
 
+		$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
 		require_once('view/contact_selectors.php');
 
-		$tpl = file_get_contents("view/contact_edit.tpl");
+		$tpl = load_view_file("view/contact_edit.tpl");
 
-		$direction = '';
-		if(strlen($r[0]['issued-id'])) {
-			if(strlen($r[0]['dfrn-id'])) {
-				$direction = DIRECTION_BOTH;
+		switch($r[0]['rel']) {
+			case REL_BUD:
 				$dir_icon = 'images/lrarrow.gif';
 				$alt_text = t('Mutual Friendship');
-			}
-			else {
-				$direction = DIRECTION_IN;
+				break;
+			case REL_VIP;
 				$dir_icon = 'images/larrow.gif';
 				$alt_text = t('is a fan of yours');
-			}
+				break;
+	
+			case REL_FAN;
+				$dir_icon = 'images/rarrow.gif';
+				$alt_text = t('you are a fan of');
+				break;
+			default:
+				break;
 		}
-		else {
-			$direction = DIRECTION_OUT;
-			$dir_icon = 'images/rarrow.gif';
-			$alt_text = t('you are a fan of');
+
+		if(($r[0]['network'] === 'dfrn') && ($r[0]['rel'])) {
+			$url = "redir/{$r[0]['id']}";
+			$sparkle = ' class="sparkle" ';
+		}
+		else { 
+			$url = $r[0]['url'];
+			$sparkle = '';
 		}
 
 		$o .= replace_macros($tpl,array(
@@ -188,10 +202,11 @@ function contacts_content(&$a) {
 			'$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00') 
 				? t('Never') 
 				: datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')),
-			'$profile_select' => contact_profile_assign($r[0]['profile-id']),
+			'$profile_select' => contact_profile_assign($r[0]['profile-id'],(($r[0]['network'] !== 'dfrn') ? true : false)),
 			'$contact_id' => $r[0]['id'],
 			'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
 			'$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
+			'$insecure' => (($r[0]['network'] === 'dfrn') ? '' : load_view_file('view/insecure_net.tpl')),
 			'$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
 			'$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),
 			'$rating' => contact_reputation($r[0]['rating']),
@@ -201,7 +216,8 @@ function contacts_content(&$a) {
 			'$name' => $r[0]['name'],
 			'$dir_icon' => $dir_icon,
 			'$alt_text' => $alt_text,
-			'$url' => (($direction != DIRECTION_IN) ? "redir/{$r[0]['id']}" : $r[0]['url'] )
+			'$sparkle' => $sparkle,
+			'$url' => $url
 
 		));
 
@@ -209,67 +225,78 @@ function contacts_content(&$a) {
 
 	}
 
-	if(($a->argc == 2) && ($a->argv[1] == 'all'))
+
+	if(($a->argc == 2) && ($a->argv[1] === 'all'))
 		$sql_extra = '';
 	else
 		$sql_extra = " AND `blocked` = 0 ";
 
-	$tpl = file_get_contents("view/contacts-top.tpl");
+	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+
+	$tpl = load_view_file("view/contacts-top.tpl");
 	$o .= replace_macros($tpl,array(
 		'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
-		'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections'))
+		'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
+		'$search' => $search,
+		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
+		'$submit' => t('Find'),
+		'$cmd' => $a->cmd
+
+
 	)); 
 
-	switch($sort_type) {
-		case DIRECTION_BOTH :
-			$sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` != '' ";
-			break;
-		case DIRECTION_IN :
-			$sql_extra2 = " AND `dfrn-id` = '' AND `issued-id` != '' ";
-			break;
-		case DIRECTION_OUT :
-			$sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` = '' ";
-			break;
-		case DIRECTION_ANY :
-		default:
-			$sql_extra2 = '';
-			break;
-	}
+	if($search)
+		$search = dbesc($search.'*');
+	$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
+	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= REL_BUD)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); 
+
+	
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact` 
 		WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
 		intval($_SESSION['uid']));
 	if(count($r))
 		$a->set_pager_total($r[0]['total']);
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
-		intval($_SESSION['uid']));
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
+		intval($_SESSION['uid']),
+		intval($a->pager['start']),
+		intval($a->pager['itemspage'])
+	);
 
 	if(count($r)) {
 
-		$tpl = file_get_contents("view/contact_template.tpl");
+		$tpl = load_view_file("view/contact_template.tpl");
 
 		foreach($r as $rr) {
 			if($rr['self'])
 				continue;
-			$direction = '';
-			if(strlen($rr['issued-id'])) {
-				if(strlen($rr['dfrn-id'])) {
-					$direction = DIRECTION_BOTH;
+
+			switch($rr['rel']) {
+				case REL_BUD:
 					$dir_icon = 'images/lrarrow.gif';
 					$alt_text = t('Mutual Friendship');
-				}
-				else {
-					$direction = DIRECTION_IN;
+					break;
+				case  REL_VIP;
 					$dir_icon = 'images/larrow.gif';
 					$alt_text = t('is a fan of yours');
-				}
+					break;
+				case REL_FAN;
+					$dir_icon = 'images/rarrow.gif';
+					$alt_text = t('you are a fan of');
+					break;
+				default:
+					break;
 			}
-			else {
-				$direction = DIRECTION_OUT;
-				$dir_icon = 'images/rarrow.gif';
-				$alt_text = t('you are a fan of');
+			if(($rr['network'] === 'dfrn') && ($rr['rel'])) {
+				$url = "redir/{$rr['id']}";
+				$sparkle = ' class="sparkle" ';
 			}
+			else { 
+				$url = $rr['url'];
+				$sparkle = '';
+			}
+
 
 			$o .= replace_macros($tpl, array(
 				'$img_hover' => t('Visit ') . $rr['name'] . t('\'s profile'),
@@ -279,12 +306,13 @@ function contacts_content(&$a) {
 				'$dir_icon' => $dir_icon,
 				'$thumb' => $rr['thumb'], 
 				'$name' => $rr['name'],
-				'$url' => (($direction != DIRECTION_IN) ? "redir/{$rr['id']}" : $rr['url'] )
+				'$sparkle' => $sparkle,
+				'$url' => $url
 			));
 		}
 		$o .= '<div id="contact-edit-end"></div>';
-		$o .= paginate($a);
 
 	}
+	$o .= paginate($a);
 	return $o;
 }
\ No newline at end of file