X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=7f758b43c57b38756897038a60b982ea408a02c3;hb=1f7f964bb7200d4f658742a999c07f1dd6cbe97c;hp=1dc886363ae1ddf699f4aa41a19a6a4d6c799e9f;hpb=a3059d02d40684f2bc1a0439c979ca7f79d8f10f;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
index 1dc886363a..7f758b43c5 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -13,7 +13,7 @@ function contacts_init(&$a) {
 
 	$contact_id = 0;
 
-	if(($a->argc == 2) && intval($a->argv[1])) {
+	if((($a->argc == 2) && intval($a->argv[1])) OR (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) {
 		$contact_id = intval($a->argv[1]);
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
 			intval(local_user()),
@@ -35,10 +35,20 @@ function contacts_init(&$a) {
 
 	if($contact_id) {
 			$a->data['contact'] = $r[0];
+
+			if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
+				$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
+			} else 
+				$networkname = '';
+
 			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
 				'$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) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
+				'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
+				'$network_name' => $networkname,
+				'$network' => t('Network:'),
+				'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '')
 			));
 			$finpeople_widget = '';
 			$follow_widget = '';
@@ -56,7 +66,7 @@ function contacts_init(&$a) {
 	}
 
 	$groups_widget .= group_side('contacts','group','full',0,$contact_id);
-	
+
 	$a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
 		'$vcard_widget' => $vcard_widget,
 		'$findpeople_widget' => $findpeople_widget,
@@ -65,7 +75,7 @@ function contacts_init(&$a) {
 		'$networks_widget' => $networks_widget
 	));
 
-	$base = $a->get_baseurl();
+	$base = z_root();
 	$tpl = get_markup_template("contacts-head.tpl");
 	$a->page['htmlhead'] .= replace_macros($tpl,array(
 		'$baseurl' => $a->get_baseurl(true),
@@ -115,13 +125,13 @@ function contacts_batch_actions(&$a){
 		}
 	}
 	if ($count_actions>0) {
-		info ( sprintf( tt("%d contact edited.", "%d contacts edited", $count_actions), $count_actions) );
+		info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
 	}
 
 	if(x($_SESSION,'return_url'))
-		goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+		goaway('' . $_SESSION['return_url']);
 	else
-		goaway($a->get_baseurl(true) . '/contacts');
+		goaway('contacts');
 
 }
 
@@ -147,7 +157,7 @@ function contacts_post(&$a) {
 
 	if(! count($orig_record)) {
 		notice( t('Could not access contact record.') . EOL);
-		goaway($a->get_baseurl(true) . '/contacts');
+		goaway('contacts');
 		return; // NOTREACHED
 	}
 
@@ -283,24 +293,11 @@ function _contact_update_profile($contact_id) {
 		intval(local_user())
 	);
 
-	$photos = import_profile_photo($data['photo'], local_user(), $contact_id);
-
-	$r = q("UPDATE `contact` SET `photo` = '%s',
-			`thumb` = '%s',
-			`micro` = '%s',
-			`name-date` = '%s',
-			`uri-date` = '%s',
-			`avatar-date` = '%s'
-			WHERE `id` = %d",
-			dbesc($photos[0]),
-			dbesc($photos[1]),
-			dbesc($photos[2]),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			intval($contact_id)
-		);
+	// Update the entry in the contact table
+	update_contact_avatar($data['photo'], local_user(), $contact_id);
 
+	// Update the entry in the gcontact table
+	update_gcontact_from_probe($data["url"]);
 }
 
 function _contact_block($contact_id, $orig_record) {
@@ -335,7 +332,6 @@ function _contact_archive($contact_id, $orig_record) {
 	return $r;
 }
 function _contact_drop($contact_id, $orig_record) {
-	require_once('include/Contact.php');
 	$a = get_app();
 
 	terminate_friendship($a->user,$a->contact,$orig_record);
@@ -370,19 +366,19 @@ function contacts_content(&$a) {
 
 		if(! count($orig_record)) {
 			notice( t('Could not access contact record.') . EOL);
-			goaway($a->get_baseurl(true) . '/contacts');
+			goaway('contacts');
 			return; // NOTREACHED
 		}
 
 		if($cmd === 'update') {
 			_contact_update($contact_id);
-			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+			goaway('contacts/' . $contact_id);
 			// NOTREACHED
 		}
 
 		if($cmd === 'updateprofile') {
 			_contact_update_profile($contact_id);
-			goaway($a->get_baseurl(true) . '/crepair/' . $contact_id);
+			goaway('crepair/' . $contact_id);
 			// NOTREACHED
 		}
 
@@ -393,7 +389,7 @@ function contacts_content(&$a) {
 				info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
 			}
 
-			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+			goaway('contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
 
@@ -404,7 +400,7 @@ function contacts_content(&$a) {
 				info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
 			}
 
-			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+			goaway('contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
 
@@ -416,7 +412,7 @@ function contacts_content(&$a) {
 				info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
 			}
 
-			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+			goaway('contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
 
@@ -451,19 +447,22 @@ function contacts_content(&$a) {
 			// Now check how the user responded to the confirmation query
 			if($_REQUEST['canceled']) {
 				if(x($_SESSION,'return_url'))
-					goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+					goaway('' . $_SESSION['return_url']);
 				else
-					goaway($a->get_baseurl(true) . '/contacts');
+					goaway('contacts');
 			}
 
 			_contact_drop($contact_id, $orig_record[0]);
 			info( t('Contact has been removed.') . EOL );
 			if(x($_SESSION,'return_url'))
-				goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+				goaway('' . $_SESSION['return_url']);
 			else
-				goaway($a->get_baseurl(true) . '/contacts');
+				goaway('contacts');
 			return; // NOTREACHED
 		}
+		if($cmd === 'posts') {
+			return contact_posts($a, $contact_id);
+		}
 	}
 
 
@@ -539,52 +538,16 @@ function contacts_content(&$a) {
 
 		$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) : '');
+		//$common = count_common_friends(local_user(),$contact['id']);
+		//$common_text = (($common) ? sprintf( tt('%d contact in common','%d contacts in common', $common),$common) : '');
 
 		$polling = (($contact['network'] === NETWORK_MAIL | $contact['network'] === NETWORK_FEED) ? 'polling' : '');
 
-		$x = count_all_friends(local_user(), $contact['id']);
-		$all_friends = (($x) ? t('View all contacts') : '');
+		//$x = count_all_friends(local_user(), $contact['id']);
+		//$all_friends = (($x) ? t('View all contacts') : '');
 
 		// tabs
-		$tabs = array(
-			array(
-				'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
-				'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(
-				'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
-				'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');
-		$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
+		$tab_str = contacts_tab($a, $contact_id, 2);
 
 		$lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
@@ -602,8 +565,9 @@ function contacts_content(&$a) {
 			($contact['rel'] == CONTACT_IS_FOLLOWER))
 			$follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
 
+
 		$o .= replace_macros($tpl, array(
-			'$header' => t('Contact Editor'),
+			//'$header' => t('Contact Editor'),
 			'$tab_str' => $tab_str,
 			'$submit' => t('Submit'),
 			'$lbl_vis1' => t('Profile Visibility'),
@@ -611,7 +575,7 @@ function contacts_content(&$a) {
 			'$lbl_info1' => t('Contact Information / Notes'),
 			'$infedit' => t('Edit contact notes'),
 			'$common_text' => $common_text,
-			'$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
+			'$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'],
 			'$all_friends' => $all_friends,
 			'$relation_text' => $relation_text,
 			'$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),
@@ -653,6 +617,12 @@ function contacts_content(&$a) {
 			'$url' => $url,
 			'$profileurllabel' => t('Profile URL'),
 			'$profileurl' => $contact['url'],
+			'$location' => bbcode($contact["location"]),
+			'$location_label' => t("Location:"),
+			'$about' => bbcode($contact["about"], false, false),
+			'$about_label' => t("About:"),
+			'$keywords' => $contact["keywords"],
+			'$keywords_label' => t("Tags:")
 
 		));
 
@@ -698,7 +668,7 @@ function contacts_content(&$a) {
 	$tabs = array(
 		array(
 			'label' => t('Suggestions'),
-			'url'   => $a->get_baseurl(true) . '/suggest',
+			'url'   => 'suggest',
 			'sel'   => '',
 			'title' => t('Suggest potential friends'),
 			'id'	=> 'suggestions-tab',
@@ -706,7 +676,7 @@ function contacts_content(&$a) {
 		),
 		array(
 			'label' => t('All Contacts'),
-			'url'   => $a->get_baseurl(true) . '/contacts/all',
+			'url'   => 'contacts/all',
 			'sel'   => ($all) ? 'active' : '',
 			'title' => t('Show all contacts'),
 			'id'	=> 'showall-tab',
@@ -714,7 +684,7 @@ function contacts_content(&$a) {
 		),
 		array(
 			'label' => t('Unblocked'),
-			'url'   => $a->get_baseurl(true) . '/contacts',
+			'url'   => 'contacts',
 			'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
 			'title' => t('Only show unblocked contacts'),
 			'id'	=> 'showunblocked-tab',
@@ -723,7 +693,7 @@ function contacts_content(&$a) {
 
 		array(
 			'label' => t('Blocked'),
-			'url'   => $a->get_baseurl(true) . '/contacts/blocked',
+			'url'   => 'contacts/blocked',
 			'sel'   => ($blocked) ? 'active' : '',
 			'title' => t('Only show blocked contacts'),
 			'id'	=> 'showblocked-tab',
@@ -732,7 +702,7 @@ function contacts_content(&$a) {
 
 		array(
 			'label' => t('Ignored'),
-			'url'   => $a->get_baseurl(true) . '/contacts/ignored',
+			'url'   => 'contacts/ignored',
 			'sel'   => ($ignored) ? 'active' : '',
 			'title' => t('Only show ignored contacts'),
 			'id'	=> 'showignored-tab',
@@ -741,7 +711,7 @@ function contacts_content(&$a) {
 
 		array(
 			'label' => t('Archived'),
-			'url'   => $a->get_baseurl(true) . '/contacts/archived',
+			'url'   => 'contacts/archived',
 			'sel'   => ($archived) ? 'active' : '',
 			'title' => t('Only show archived contacts'),
 			'id'	=> 'showarchived-tab',
@@ -750,7 +720,7 @@ function contacts_content(&$a) {
 
 		array(
 			'label' => t('Hidden'),
-			'url'   => $a->get_baseurl(true) . '/contacts/hidden',
+			'url'   => 'contacts/hidden',
 			'sel'   => ($hidden) ? 'active' : '',
 			'title' => t('Only show hidden contacts'),
 			'id'	=> 'showhidden-tab',
@@ -786,8 +756,9 @@ function contacts_content(&$a) {
 		$total = $r[0]['total'];
 	}
 
+	$sql_extra3 = unavailable_networks();
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($_SESSION['uid']),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
@@ -803,7 +774,7 @@ function contacts_content(&$a) {
 
 	$tpl = get_markup_template("contacts-template.tpl");
 	$o .= replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => z_root(),
 		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
 		'$tabs' => $t,
 		'$total' => $total,
@@ -829,7 +800,112 @@ function contacts_content(&$a) {
 	return $o;
 }
 
+function contacts_tab($a, $contact_id, $active_tab) {
+	// tabs
+	$tabs = array(
+		array(
+			'label'=>t('Status'),
+			'url' => "contacts/".$contact_id."/posts",
+			'sel' => (($active_tab == 1)?'active':''),
+			'title' => t('Status Messages and Posts'),
+			'id' => 'status-tab',
+			'accesskey' => 'm',
+		),
+		array(
+			'label'=>t('Profile'),
+			'url' => "contacts/".$contact_id,
+			'sel' => (($active_tab == 2)?'active':''),
+			'title' => t('Profile Details'),
+			'id' => 'status-tab',
+			'accesskey' => 'o',
+		)
+	);
+
+	$x = count_all_friends(local_user(), $contact_id);
+	if ($x)
+		$tabs[] = array('label'=>t('Contacts'),
+				'url' => "allfriends/".$contact_id,
+				'sel' => (($active_tab == 3)?'active':''),
+				'title' => t('View all contacts'),
+				'id' => 'allfriends-tab',
+				'accesskey' => 't');
+
+	$common = count_common_friends(local_user(),$contact_id);
+	if ($common)
+		$tabs[] = array('label'=>t('Common Friends'),
+				'url' => "common/loc/".local_user()."/".$contact_id,
+				'sel' => (($active_tab == 4)?'active':''),
+				'title' => t('View all common friends'),
+				'id' => 'common-loc-tab',
+				'accesskey' => 'd');
+
+	$tabs[] = array('label' => t('Repair'),
+			'url'   => 'crepair/' . $contact_id,
+			'sel' => (($active_tab == 5)?'active':''),
+			'title' => t('Advanced Contact Settings'),
+			'id'	=> 'repair-tab',
+			'accesskey' => 'r');
+
+
+	$tabs[] = array('label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
+			'url'   => 'contacts/' . $contact_id . '/block',
+			'sel'   => '',
+			'title' => t('Toggle Blocked status'),
+			'id'	=> 'toggle-block-tab',
+			'accesskey' => 'b');
+
+	$tabs[] = array('label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
+			'url'   => 'contacts/' . $contact_id . '/ignore',
+			'sel'   => '',
+			'title' => t('Toggle Ignored status'),
+			'id'	=> 'toggle-ignore-tab',
+			'accesskey' => 'i');
+
+	$tabs[] = array('label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
+			'url'   => 'contacts/' . $contact_id . '/archive',
+			'sel'   => '',
+			'title' => t('Toggle Archive status'),
+			'id'	=> 'toggle-archive-tab',
+			'accesskey' => 'v');
+
+	$tab_tpl = get_markup_template('common_tabs.tpl');
+	$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
+
+	return $tab_str;
+}
+
+function contact_posts($a, $contact_id) {
+
+	$r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
+	if ($r) {
+		$contact = $r[0];
+		$a->page['aside'] = "";
+		profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
+	} else
+		$profile = "";
+
+	$tab_str = contacts_tab($a, $contact_id, 1);
+
+	$o .= $tab_str;
+
+	$r = q("SELECT `id` FROM `item` WHERE `contact-id` = %d LIMIT 1", intval($contact_id));
+	if ($r)
+		$o .= posts_from_contact($a, $contact_id);
+	elseif ($contact["url"]) {
+		$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+			dbesc(normalise_link($contact["url"])));
+
+		if ($r[0]["id"] <> 0)
+			$o .= posts_from_gcontact($a, $r[0]["id"]);
+	}
+
+	return $o;
+}
+
 function _contact_detail_for_template($rr){
+
+	$community = '';
+
 	switch($rr['rel']) {
 		case CONTACT_IS_FRIEND:
 			$dir_icon = 'images/lrarrow.gif';
@@ -855,6 +931,10 @@ function _contact_detail_for_template($rr){
 		$sparkle = '';
 	}
 
+	//test if contact is a forum page
+	if (isset($rr['forum']) OR isset($rr['prv']))
+				$community = ($rr['forum'] OR $rr['prv']);
+
 
 	return array(
 		'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
@@ -866,6 +946,7 @@ function _contact_detail_for_template($rr){
 		'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
 		'name' => htmlentities($rr['name']),
 		'username' => htmlentities($rr['name']),
+		'account_type' => ($community ? t('Forum') : ''),
 		'sparkle' => $sparkle,
 		'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
 		'url' => $url,