X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=017b1d6435fd8456953d3fadcc312312fdc0b6e7;hb=14dff6b0e0c5ff43df8b2cd8da440bdeaf2b3384;hp=5d40ff9940ad318753a5ac4c5225979251cd3889;hpb=178b7eba1b6fea46b73ddc25dac9e669b8446a7a;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
index 5d40ff9940..017b1d6435 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -27,37 +27,41 @@ function contacts_init(&$a) {
 	require_once('include/group.php');
 	require_once('include/contact_widgets.php');
 
+	if ($_GET['nets'] == "all")
+	$_GET['nets'] = "";
+
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
 
 	if($contact_id) {
 			$a->data['contact'] = $r[0];
 			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
-				'$name' => $a->data['contact']['name'],
+				'$name' => htmlentities($a->data['contact']['name']),
 				'$photo' => $a->data['contact']['photo'],
-			        '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
+				'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
 			));
+			$finpeople_widget = '';
 			$follow_widget = '';
+			$networks_widget = '';
 	}
 	else {
 		$vcard_widget = '';
+		$networks_widget .= networks_widget('contacts',$_GET['nets']);
 		if (isset($_GET['add']))
 			$follow_widget = follow_widget($_GET['add']);
 		else
 			$follow_widget = follow_widget();
-	}
 
-	if ($_GET['nets'] == "all")
-		$_GET['nets'] = "";
+		$findpeople_widget .= findpeople_widget();
+	}
 
 	$groups_widget .= group_side('contacts','group',false,0,$contact_id);
-	$findpeople_widget .= findpeople_widget();
-	$networks_widget .= networks_widget('contacts',$_GET['nets']);
+	
 	$a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
 		'$vcard_widget' => $vcard_widget,
+		'$findpeople_widget' => $findpeople_widget,
 		'$follow_widget' => $follow_widget,
 		'$groups_widget' => $groups_widget,
-		'$findpeople_widget' => $findpeople_widget,
 		'$networks_widget' => $networks_widget
 	));
 
@@ -206,25 +210,53 @@ function contacts_post(&$a) {
 
 /*contact actions*/
 function _contact_update($contact_id) {
-	// pull feed and consume it, which should subscribe to the hub.
-	proc_run('php',"include/poller.php","$contact_id");
+	$r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
+	if (!$r)
+		return;
+
+	$uid = $r[0]["uid"];
+
+	if ($uid != local_user())
+		return;
+
+	if ($r[0]["network"] == NETWORK_OSTATUS) {
+		$result = new_contact($uid, $r[0]["url"], false);
+
+		if ($result['success'])
+			$r = q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d",
+				intval($contact_id));
+	} else
+		// pull feed and consume it, which should subscribe to the hub.
+		proc_run('php',"include/onepoll.php","$contact_id", "force");
 }
 
 function _contact_update_profile($contact_id) {
-	$r = q("SELECT `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
+	$r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
 	if (!$r)
 		return;
 
+	$uid = $r[0]["uid"];
+
+	if ($uid != local_user())
+		return;
+
 	$data = probe_url($r[0]["url"]);
 
-	// "Feed" is mostly a sign of communication problems
-	if (($data["network"] == NETWORK_FEED) AND ($data["network"] != $r[0]["network"]))
+	// "Feed" or "Unknown" is mostly a sign of communication problems
+	if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"]))
 		return;
 
 	$updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
-				"poco", "network", "alias", "pubkey");
+				"poco", "network", "alias");
 	$update = array();
 
+	if ($data["network"] == NETWORK_OSTATUS) {
+		$result = new_contact($uid, $data["url"], false);
+
+		if ($result['success'])
+			$update["subhub"] = true;
+	}
+
 	foreach($updatefields AS $field)
 		if (isset($data[$field]) AND ($data[$field] != ""))
 			$update[$field] = $data[$field];
@@ -404,7 +436,9 @@ function contacts_content(&$a) {
 				}
 
 				$a->page['aside'] = '';
-				return replace_macros(get_markup_template('confirm.tpl'), array(
+
+				return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
+					'$contact' =>  _contact_detail_for_template($orig_record[0]),
 					'$method' => 'get',
 					'$message' => t('Do you really want to delete this contact?'),
 					'$extra_inputs' => $inputs,
@@ -479,7 +513,7 @@ function contacts_content(&$a) {
 		if(!in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
 				$relation_text = "";
 
-		$relation_text = sprintf($relation_text,$contact['name']);
+		$relation_text = sprintf($relation_text,htmlentities($contact['name']));
 
 		if(($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
 			$url = "redir/{$contact['id']}";
@@ -503,7 +537,7 @@ function contacts_content(&$a) {
 
 		$poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2));
 
-		$nettype = sprintf( t('Network type: %s'),network_to_name($contact['network']));
+		$nettype = sprintf( t('Network type: %s'),network_to_name($contact['network'], $contact["url"]));
 
 		$common = count_common_friends(local_user(),$contact['id']);
 		$common_text = (($common) ? sprintf( tt('%d contact in common','%d contacts in common', $common),$common) : '');
@@ -520,12 +554,16 @@ function contacts_content(&$a) {
 				'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
 				'sel'   => '',
 				'title' => t('Toggle Blocked status'),
+				'id'	=> 'toggle-block-tab',
+				'accesskey' => 'b',
 			),
 			array(
 				'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
 				'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
 				'sel'   => '',
 				'title' => t('Toggle Ignored status'),
+				'id'	=> 'toggle-ignore-tab',
+				'accesskey' => 'i',
 			),
 
 			array(
@@ -533,12 +571,16 @@ function contacts_content(&$a) {
 				'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
 				'sel'   => '',
 				'title' => t('Toggle Archive status'),
+				'id'	=> 'toggle-archive-tab',
+				'accesskey' => 'v',
 			),
 			array(
 				'label' => t('Repair'),
 				'url'   => $a->get_baseurl(true) . '/crepair/' . $contact_id,
 				'sel'   => '',
 				'title' => t('Advanced Contact Settings'),
+				'id'	=> 'repair-tab',
+				'accesskey' => 'r',
 			)
 		);
 		$tab_tpl = get_markup_template('common_tabs.tpl');
@@ -556,6 +598,10 @@ function contacts_content(&$a) {
 		if ($contact['network'] == NETWORK_DFRN)
 			$profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
 
+		if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
+			($contact['rel'] == CONTACT_IS_FOLLOWER))
+			$follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
+
 		$o .= replace_macros($tpl, array(
 			'$header' => t('Contact Editor'),
 			'$tab_str' => $tab_str,
@@ -583,6 +629,8 @@ function contacts_content(&$a) {
 			'$updpub' => t('Update public posts'),
 			'$last_update' => $last_update,
 			'$udnow' => t('Update now'),
+			'$follow' => $follow,
+			'$follow_text' => t("Connect/Follow"),
 			'$profile_select' => $profile_select,
 			'$contact_id' => $contact['id'],
 			'$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
@@ -598,11 +646,13 @@ function contacts_content(&$a) {
 			'$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'],
 			'$ffi_keyword_blacklist' => array('ffi_keyword_blacklist', t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')),
 			'$photo' => $contact['photo'],
-			'$name' => $contact['name'],
+			'$name' => htmlentities($contact['name']),
 			'$dir_icon' => $dir_icon,
 			'$alt_text' => $alt_text,
 			'$sparkle' => $sparkle,
 			'$url' => $url,
+			'$profileurllabel' => t('Profile URL'),
+			'$profileurl' => $contact['url'],
 
 		));
 
@@ -648,21 +698,27 @@ function contacts_content(&$a) {
 	$tabs = array(
 		array(
 			'label' => t('Suggestions'),
-			'url'   => $a->get_baseurl(true) . '/suggest', 
+			'url'   => $a->get_baseurl(true) . '/suggest',
 			'sel'   => '',
 			'title' => t('Suggest potential friends'),
+			'id'	=> 'suggestions-tab',
+			'accesskey' => 'g',
 		),
 		array(
 			'label' => t('All Contacts'),
-			'url'   => $a->get_baseurl(true) . '/contacts/all', 
+			'url'   => $a->get_baseurl(true) . '/contacts/all',
 			'sel'   => ($all) ? 'active' : '',
 			'title' => t('Show all contacts'),
+			'id'	=> 'showall-tab',
+			'accesskey' => 'l',
 		),
 		array(
 			'label' => t('Unblocked'),
 			'url'   => $a->get_baseurl(true) . '/contacts',
 			'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
 			'title' => t('Only show unblocked contacts'),
+			'id'	=> 'showunblocked-tab',
+			'accesskey' => 'o',
 		),
 
 		array(
@@ -670,6 +726,8 @@ function contacts_content(&$a) {
 			'url'   => $a->get_baseurl(true) . '/contacts/blocked',
 			'sel'   => ($blocked) ? 'active' : '',
 			'title' => t('Only show blocked contacts'),
+			'id'	=> 'showblocked-tab',
+			'accesskey' => 'b',
 		),
 
 		array(
@@ -677,6 +735,8 @@ function contacts_content(&$a) {
 			'url'   => $a->get_baseurl(true) . '/contacts/ignored',
 			'sel'   => ($ignored) ? 'active' : '',
 			'title' => t('Only show ignored contacts'),
+			'id'	=> 'showignored-tab',
+			'accesskey' => 'i',
 		),
 
 		array(
@@ -684,6 +744,8 @@ function contacts_content(&$a) {
 			'url'   => $a->get_baseurl(true) . '/contacts/archived',
 			'sel'   => ($archived) ? 'active' : '',
 			'title' => t('Only show archived contacts'),
+			'id'	=> 'showarchived-tab',
+			'accesskey' => 'y',
 		),
 
 		array(
@@ -691,6 +753,8 @@ function contacts_content(&$a) {
 			'url'   => $a->get_baseurl(true) . '/contacts/hidden',
 			'sel'   => ($hidden) ? 'active' : '',
 			'title' => t('Only show hidden contacts'),
+			'id'	=> 'showhidden-tab',
+			'accesskey' => 'h',
 		),
 
 	);
@@ -732,54 +796,9 @@ function contacts_content(&$a) {
 	$contacts = array();
 
 	if(count($r)) {
-
 		foreach($r as $rr) {
-
-			switch($rr['rel']) {
-				case CONTACT_IS_FRIEND:
-					$dir_icon = 'images/lrarrow.gif';
-					$alt_text = t('Mutual Friendship');
-					break;
-				case  CONTACT_IS_FOLLOWER;
-					$dir_icon = 'images/larrow.gif';
-					$alt_text = t('is a fan of yours');
-					break;
-				case CONTACT_IS_SHARING;
-					$dir_icon = 'images/rarrow.gif';
-					$alt_text = t('you are a fan of');
-					break;
-				default:
-					break;
-			}
-			if(($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
-				$url = "redir/{$rr['id']}";
-				$sparkle = ' class="sparkle" ';
-			}
-			else {
-				$url = $rr['url'];
-				$sparkle = '';
-			}
-
-
-			$contacts[] = array(
-				'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
-				'edit_hover' => t('Edit contact'),
-				'photo_menu' => contact_photo_menu($rr),
-				'id' => $rr['id'],
-				'alt_text' => $alt_text,
-				'dir_icon' => $dir_icon,
-				'thumb' => proxy_url($rr['thumb']),
-				'name' => $rr['name'],
-				'username' => $rr['name'],
-				'sparkle' => $sparkle,
-				'itemurl' => $rr['url'],
-				'url' => $url,
-				'network' => network_to_name($rr['network']),
-			);
+			$contacts[] = _contact_detail_for_template($rr);
 		}
-
-
-
 	}
 
 	$tpl = get_markup_template("contacts-template.tpl");
@@ -795,6 +814,7 @@ function contacts_content(&$a) {
 		'$cmd' => $a->cmd,
 		'$contacts' => $contacts,
 		'$contact_drop_confirm' => t('Do you really want to delete this contact?'),
+		'multiselect' => 1,
 		'$batch_actions' => array(
 			'contacts_batch_update' => t('Update'),
 			'contacts_batch_block' => t('Block')."/".t("Unblock"),
@@ -808,3 +828,48 @@ function contacts_content(&$a) {
 
 	return $o;
 }
+
+function _contact_detail_for_template($rr){
+	switch($rr['rel']) {
+		case CONTACT_IS_FRIEND:
+			$dir_icon = 'images/lrarrow.gif';
+			$alt_text = t('Mutual Friendship');
+			break;
+		case  CONTACT_IS_FOLLOWER;
+			$dir_icon = 'images/larrow.gif';
+			$alt_text = t('is a fan of yours');
+			break;
+		case CONTACT_IS_SHARING;
+			$dir_icon = 'images/rarrow.gif';
+			$alt_text = t('you are a fan of');
+			break;
+		default:
+			break;
+	}
+	if(($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
+		$url = "redir/{$rr['id']}";
+		$sparkle = ' class="sparkle" ';
+	}
+	else {
+		$url = $rr['url'];
+		$sparkle = '';
+	}
+
+
+	return array(
+		'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
+		'edit_hover' => t('Edit contact'),
+		'photo_menu' => contact_photo_menu($rr),
+		'id' => $rr['id'],
+		'alt_text' => $alt_text,
+		'dir_icon' => $dir_icon,
+		'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
+		'name' => htmlentities($rr['name']),
+		'username' => htmlentities($rr['name']),
+		'sparkle' => $sparkle,
+		'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
+		'url' => $url,
+		'network' => network_to_name($rr['network'], $rr['url']),
+	);
+
+}