X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fcontacts.php;h=92bce0a73fef4f9b4577c4c9391dfa0557cc620d;hb=166424c92eafa55045b8e52f55a7ec7128062397;hp=f0e677ba5926a3f805d26bea4ce699a4954c6d63;hpb=0abaa6724d6b2e7e3f5a3f8d81026cee9def0b10;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
index f0e677ba59..92bce0a73f 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -65,12 +65,15 @@ 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(local_user())
 	);
@@ -146,6 +149,32 @@ 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);
+				}
+			}
+
 			contact_remove($contact_id);
 			notice( t('Contact has been removed.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
@@ -165,8 +194,10 @@ function contacts_content(&$a) {
 			return;
 		}
 
+		$tpl = load_view_file('view/contact_head.tpl');
+		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
-		require_once('view/contact_selectors.php');
+		require_once('include/contact_selectors.php');
 
 		$tpl = load_view_file("view/contact_edit.tpl");
 
@@ -198,7 +229,14 @@ function contacts_content(&$a) {
 		}
 
 		$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')),
@@ -207,6 +245,7 @@ function contacts_content(&$a) {
 			'$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')),
+			'$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']),
@@ -235,6 +274,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,