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

diff --git a/mod/contacts.php b/mod/contacts.php
index 1dc886363a..0c0b88a823 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()),
@@ -56,7 +56,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,
@@ -464,6 +464,9 @@ function contacts_content(&$a) {
 				goaway($a->get_baseurl(true) . '/contacts');
 			return; // NOTREACHED
 		}
+		if($cmd === 'posts') {
+			return contact_posts($a, $contact_id);
+		}
 	}
 
 
@@ -548,43 +551,7 @@ function contacts_content(&$a) {
 		$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 = contact_tabs($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 +569,17 @@ function contacts_content(&$a) {
 			($contact['rel'] == CONTACT_IS_FOLLOWER))
 			$follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
 
+
+		$header = $contact["name"];
+
+		if ($contact["addr"] != "")
+			$header .= " <".$contact["addr"].">";
+
+		$header .= " (".network_to_name($contact['network'], $contact['url']).")";
+
 		$o .= replace_macros($tpl, array(
-			'$header' => t('Contact Editor'),
+			//'$header' => t('Contact Editor'),
+			'$header' => htmlentities($header),
 			'$tab_str' => $tab_str,
 			'$submit' => t('Submit'),
 			'$lbl_vis1' => t('Profile Visibility'),
@@ -653,6 +629,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:")
 
 		));
 
@@ -786,8 +768,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'])
@@ -829,6 +812,124 @@ function contacts_content(&$a) {
 	return $o;
 }
 
+function contact_tabs($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' => 'r',
+		),
+		array(
+			'label' => t('Repair'),
+			'url'   => $a->get_baseurl(true) . '/crepair/' . $contact_id,
+			'sel' => (($active_tab == 3)?'active':''),
+			'title' => t('Advanced Contact Settings'),
+			'id'	=> 'repair-tab',
+			'accesskey' => 'r',
+		),
+		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',
+		)
+	);
+	$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) {
+
+	require_once('include/conversation.php');
+
+	$r = q("SELECT * 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"]));
+	}
+
+	if(get_config('system', 'old_pager')) {
+		$r = q("SELECT COUNT(*) AS `total` FROM `item`
+			WHERE `item`.`uid` = %d AND (`author-link` = '%s')",
+			intval(local_user()), dbesc($contact["url"]));
+
+		$a->set_pager_total($r[0]['total']);
+	}
+
+	$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
+			`author-name` AS `name`, `owner-avatar` AS `photo`,
+			`owner-link` AS `url`, `owner-avatar` AS `thumb`
+		FROM `item` FORCE INDEX (uid_contactid_created)
+		WHERE `item`.`uid` = %d AND `contact-id` = %d
+			AND (`author-link` = '%s')
+		ORDER BY `item`.`created` DESC LIMIT %d, %d",
+		intval(local_user()),
+		intval($contact_id),
+		dbesc($contact["url"]),
+		intval($a->pager['start']),
+		intval($a->pager['itemspage'])
+	);
+
+	$tab_str = contact_tabs($a, $contact_id, 1);
+
+	$header = $contact["name"];
+
+	if ($contact["addr"] != "")
+		$header .= " <".$contact["addr"].">";
+
+	$header .= " (".network_to_name($contact['network'], $contact['url']).")";
+
+	$tpl = get_markup_template("section_title.tpl");
+	$o = replace_macros($tpl,array(
+                '$title' => htmlentities($header)
+        ));
+
+	$o .= $tab_str;
+
+	$o .= conversation($a,$r,'community',false);
+
+	if(!get_config('system', 'old_pager')) {
+		$o .= alt_pager($a,count($r));
+	} else {
+		$o .= paginate($a);
+	}
+
+	return $o;
+}
+
 function _contact_detail_for_template($rr){
 	switch($rr['rel']) {
 		case CONTACT_IS_FRIEND: