X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=177ca99734033bee7c1d280e4ffd6cc73471661b;hb=d2dddd995abef2d0805901b278647bef0ce50f88;hp=438b37aaf3714aca340e01cc37ee001bbec80c14;hpb=01d36785b052f722c982700bcfe29e7ea26d1321;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
index 438b37aaf3..177ca99734 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -4,10 +4,20 @@ 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) {
@@ -21,7 +31,7 @@ function contacts_post(&$a) {
 
 	$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($contact_id),
-		intval(get_uid())
+		intval(local_user())
 	);
 
 	if(! count($orig_record)) {
@@ -30,18 +40,24 @@ function contacts_post(&$a) {
 		return; // NOTREACHED
 	}
 
+	call_hooks('contact_edit_post', $_POST);
+
 	$profile_id = intval($_POST['profile-assign']);
 	if($profile_id) {
 		$r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($profile_id),
-			intval(get_uid())
+			intval(local_user())
 		);
 		if(! count($r)) {
 			notice( t('Could not locate selected profile.') . EOL);
 			return;
 		}
 	}
-	$priority = intval($_POST['priority']);
+logger('contact_edit ' . print_r($_POST,true));
+
+	$priority = intval($_POST['poll']);
+	if($priority == (-1))
+		
 	if($priority > 5 || $priority < 0)
 		$priority = 0;
 
@@ -51,14 +67,17 @@ function contacts_post(&$a) {
 
 	$reason = notags(trim($_POST['reason']));
 
-	$r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s'
+	$info = escape_tags(trim($_POST['info']));
+
+	$r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s', `info` = '%s'
 		WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($profile_id),
 		intval($priority),
 		intval($rating),
 		dbesc($reason),
+		dbesc($info),
 		intval($contact_id),
-		intval(get_uid())
+		intval(local_user())
 	);
 	if($r)
 		notice( t('Contact updated.') . EOL);
@@ -72,7 +91,12 @@ function contacts_post(&$a) {
 
 function contacts_content(&$a) {
 
+	$sort_type = 0;
+	$o = '';
 	$o .= '<script>	$(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
+
+	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
@@ -88,7 +112,7 @@ function contacts_content(&$a) {
 
 		$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($contact_id),
-			intval(get_uid())
+			intval(local_user())
 		);
 
 		if(! count($orig_record)) {
@@ -103,7 +127,7 @@ function contacts_content(&$a) {
 			$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
 					intval($blocked),
 					intval($contact_id),
-					intval(get_uid())
+					intval(local_user())
 			);
 			if($r) {
 				notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
@@ -117,7 +141,7 @@ function contacts_content(&$a) {
 			$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
 					intval($readonly),
 					intval($contact_id),
-					intval(get_uid())
+					intval(local_user())
 			);
 			if($r) {
 				notice( t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL );
@@ -127,6 +151,38 @@ function contacts_content(&$a) {
 		}
 
 		if($cmd === 'drop') {
+
+			// create an unfollow slap
+
+			if($orig_record[0]['network'] === 'stat') {
+				$tpl = load_view_file('view/follow_slap.tpl');
+				$slap = replace_macros($tpl, array(
+					'$name' => $a->user['username'],
+					'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
+					'$photo' => $a->contact['photo'],
+					'$thumb' => $a->contact['thumb'],
+					'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
+					'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(),
+					'$title' => '',
+					'$type' => 'text',
+					'$content' => t('stopped following'),
+					'$nick' => $a->user['nickname'],
+					'$verb' => ACTIVITY_UNFOLLOW,
+					'$ostat_follow' => '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
+				));
+
+				if((x($orig_record[0],'notify')) && (strlen($orig_record[0]['notify']))) {
+					require_once('include/salmon.php');
+					slapper($a->user,$orig_record[0]['notify'],$slap);
+				}
+			}
+
+			if($orig_record[0]['network'] === 'dfrn') {
+				require_once('include/items.php');
+				dfrn_deliver($a->user,$orig_record[0],'placeholder', 1);
+			}
+
+
 			contact_remove($contact_id);
 			notice( t('Contact has been removed.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
@@ -138,7 +194,7 @@ function contacts_content(&$a) {
 
 		$contact_id = intval($a->argv[1]);
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
-			intval(get_uid()),
+			intval(local_user()),
 			intval($contact_id)
 		);
 		if(! count($r)) {
@@ -146,7 +202,10 @@ function contacts_content(&$a) {
 			return;
 		}
 
-		require_once('view/contact_selectors.php');
+		$tpl = load_view_file('view/contact_head.tpl');
+		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+
+		require_once('include/contact_selectors.php');
 
 		$tpl = load_view_file("view/contact_edit.tpl");
 
@@ -168,7 +227,7 @@ function contacts_content(&$a) {
 				break;
 		}
 
-		if($r[0]['rel'] != REL_FAN) {
+		if(($r[0]['network'] === 'dfrn') && ($r[0]['rel'])) {
 			$url = "redir/{$r[0]['id']}";
 			$sparkle = ' class="sparkle" ';
 		}
@@ -176,15 +235,25 @@ function contacts_content(&$a) {
 			$url = $r[0]['url'];
 			$sparkle = '';
 		}
+
 		$o .= replace_macros($tpl,array(
+			'$header' => t('Contact Editor'),
+			'$visit' => t('Visit $name\'s profile'),
+			'$blockunblock' => t('Block/Unblock contact'),
+			'$ignorecont' => t('Ignore contact'),
+			'$delete' => t('Delete contact'),
 			'$poll_interval' => contact_poll_interval($r[0]['priority']),
+			'$lastupdtext' => t('Last updated: '),
+			'$updpub' => t('Update public posts: '),
 			'$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'] === 'stat') ? load_view_file('view/insecure_net.tpl') : ''),
+			'$info' => $r[0]['info'],
 			'$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']),
@@ -199,7 +268,11 @@ function contacts_content(&$a) {
 
 		));
 
-		return $o;
+		$arr = array('contact' => $r[0],'output' => $o);
+
+		call_hooks('contact_edit', $arr);
+
+		return $arr['output'];
 
 	}
 
@@ -213,6 +286,7 @@ function contacts_content(&$a) {
 
 	$tpl = load_view_file("view/contacts-top.tpl");
 	$o .= replace_macros($tpl,array(
+		'$header' => t('Contacts'),
 		'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
 		'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
 		'$search' => $search,
@@ -266,8 +340,7 @@ function contacts_content(&$a) {
 				default:
 					break;
 			}
-
-			if($rr['rel'] != REL_FAN) {
+			if(($rr['network'] === 'dfrn') && ($rr['rel'])) {
 				$url = "redir/{$rr['id']}";
 				$sparkle = ' class="sparkle" ';
 			}
@@ -289,6 +362,7 @@ function contacts_content(&$a) {
 				'$url' => $url
 			));
 		}
+
 		$o .= '<div id="contact-edit-end"></div>';
 
 	}