X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=c99ac14520a625bac36210136305034c6d29d8e1;hb=dadf80f64479792be85c7026fe1e3c5440066211;hp=4f5a49acd1c7062e0462cf4b66af26d876920390;hpb=e22e823e93756fbfbb175f4f9f182aee64c1f5b1;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
old mode 100644
new mode 100755
index 4f5a49acd1..c99ac14520
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -1,12 +1,14 @@
 <?php
 
 require_once('include/Contact.php');
+require_once('include/socgraph.php');
 
 function contacts_init(&$a) {
 	if(! local_user())
 		return;
 
 	$contact_id = 0;
+
 	if(($a->argc == 2) && intval($a->argv[1])) {
 		$contact_id = intval($a->argv[1]);
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
@@ -19,36 +21,28 @@ function contacts_init(&$a) {
 	}
 
 	require_once('include/group.php');
+	require_once('include/contact_widgets.php');
+
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
-	$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
-
-	$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
-
-	if(get_config('system','invitation_only')) {
-		$x = get_pconfig(local_user(),'system','invites_remaining');
-		if($x || is_site_admin()) {
-			$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">' 
-			. sprintf( tt('%d invitation available','%d invitations available',$x), $x) 
-			. '</div>' . $inv;
-		}
-	}
-	elseif($a->config['register_policy'] != REGISTER_CLOSED)
-		$a->page['aside'] .= $inv;
-
 
-	$a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' 
-		. t('Find People With Shared Interests') . '</a></div>';
+	if($contact_id) {
+			$a->data['contact'] = $r[0];
+			$o .= '<div class="vcard">';
+			$o .= '<div class="fn">' . $a->data['contact']['name'] . '</div>';
+			$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->data['contact']['photo'] . '" alt="' . $a->data['contact']['name'] . '" /></div>';
+			$o .= '</div>';
+			$a->page['aside'] .= $o;
 
-	$tpl = get_markup_template('follow.tpl');
-	$a->page['aside'] .= replace_macros($tpl,array(
-		'$label' => t('Connect/Follow'),
-		'$hint' => t('Example: bob@example.com, http://example.com/barbara'),
-		'$follow' => t('Follow')
-	));
+	}	
+	else
+		$a->page['aside'] .= follow_widget();
 
+	$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
 
+	$a->page['aside'] .= findpeople_widget();
 
+	$a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
 }
 
 function contacts_post(&$a) {
@@ -85,28 +79,20 @@ function contacts_post(&$a) {
 		}
 	}
 
+	$hidden = intval($_POST['hidden']);
 
 	$priority = intval($_POST['poll']);
-	if($priority == (-1))
-		
 	if($priority > 5 || $priority < 0)
 		$priority = 0;
 
-	$rating = intval($_POST['reputation']);
-	if($rating > 5 || $rating < 0)
-		$rating = 0;
-
-	$reason = notags(trim($_POST['reason']));
-
 	$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",
+	$r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s',
+		`hidden` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($profile_id),
 		intval($priority),
-		intval($rating),
-		dbesc($reason),
 		dbesc($info),
+		intval($hidden),
 		intval($contact_id),
 		intval(local_user())
 	);
@@ -114,6 +100,14 @@ function contacts_post(&$a) {
 		info( t('Contact updated.') . EOL);
 	else
 		notice( t('Failed to update contact record.') . EOL);
+
+	$r = q("select * from contact where id = %d and uid = %d limit 1",
+		intval($contact_id),
+		intval(local_user())
+	);
+	if($r && count($r))
+		$a->data['contact'] = $r[0];
+
 	return;
 
 }
@@ -124,9 +118,8 @@ function contacts_content(&$a) {
 
 	$sort_type = 0;
 	$o = '';
-	$o .= '<script>	$(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
+	nav_set_selected('contacts');
 
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -141,7 +134,7 @@ function contacts_content(&$a) {
 
 		$cmd = $a->argv[2];
 
-		$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1",
 			intval($contact_id),
 			intval(local_user())
 		);
@@ -163,9 +156,9 @@ function contacts_content(&$a) {
 		if($cmd === 'block') {
 			$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
 			$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-					intval($blocked),
-					intval($contact_id),
-					intval(local_user())
+				intval($blocked),
+				intval($contact_id),
+				intval(local_user())
 			);
 			if($r) {
 				//notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
@@ -178,9 +171,9 @@ function contacts_content(&$a) {
 		if($cmd === 'ignore') {
 			$readonly = (($orig_record[0]['readonly']) ? 0 : 1);
 			$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-					intval($readonly),
-					intval($contact_id),
-					intval(local_user())
+				intval($readonly),
+				intval($contact_id),
+				intval(local_user())
 			);
 			if($r) {
 				info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
@@ -193,7 +186,7 @@ function contacts_content(&$a) {
 
 			// create an unfollow slap
 
-			if($orig_record[0]['network'] === 'stat') {
+			if($orig_record[0]['network'] === NETWORK_OSTATUS) {
 				$tpl = get_markup_template('follow_slap.tpl');
 				$slap = replace_macros($tpl, array(
 					'$name' => $a->user['username'],
@@ -215,31 +208,29 @@ function contacts_content(&$a) {
 					slapper($a->user,$orig_record[0]['notify'],$slap);
 				}
 			}
-
-			if($orig_record[0]['network'] === 'dfrn') {
+			elseif($orig_record[0]['network'] === NETWORK_DIASPORA) {
+				require_once('include/diaspora.php');
+				diaspora_unshare($a->user,$orig_record[0]);
+			}
+			elseif($orig_record[0]['network'] === NETWORK_DFRN) {
 				require_once('include/items.php');
 				dfrn_deliver($a->user,$orig_record[0],'placeholder', 1);
 			}
 
-
-			contact_remove($contact_id);
+			contact_remove($orig_record[0]['id']);
 			info( t('Contact has been removed.') . EOL );
-			goaway($a->get_baseurl() . '/contacts');
+			if(x($_SESSION,'return_url'))
+				goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+			else
+				goaway($a->get_baseurl() . '/contacts');
 			return; // NOTREACHED
 		}
 	}
 
-	if(($a->argc == 2) && intval($a->argv[1])) {
+	if((x($a->data,'contact')) && (is_array($a->data['contact']))) {
 
-		$contact_id = intval($a->argv[1]);
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
-			intval(local_user()),
-			intval($contact_id)
-		);
-		if(! count($r)) {
-			notice( t('Contact not found.') . EOL);
-			return;
-		}
+		$contact_id = $a->data['contact']['id'];
+		$contact = $a->data['contact'];
 
 		$tpl = get_markup_template('contact_head.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
@@ -248,86 +239,117 @@ function contacts_content(&$a) {
 
 		$tpl = get_markup_template("contact_edit.tpl");
 
-		switch($r[0]['rel']) {
-			case REL_BUD:
+		switch($contact['rel']) {
+			case CONTACT_IS_FRIEND:
 				$dir_icon = 'images/lrarrow.gif';
-				$alt_text = t('Mutual Friendship');
+				$relation_text = t('You are mutual friends with %s');
 				break;
-			case REL_VIP;
+			case CONTACT_IS_FOLLOWER;
 				$dir_icon = 'images/larrow.gif';
-				$alt_text = t('is a fan of yours');
+				$relation_text = t('You are sharing with %s');
 				break;
 	
-			case REL_FAN;
+			case CONTACT_IS_SHARING;
 				$dir_icon = 'images/rarrow.gif';
-				$alt_text = t('you are a fan of');
+				$relation_text = t('%s is sharing with you');
 				break;
 			default:
 				break;
 		}
 
-		if(($r[0]['network'] === 'dfrn') && ($r[0]['rel'])) {
-			$url = "redir/{$r[0]['id']}";
+		$relation_text = sprintf($relation_text,$contact['name']);
+
+		if(($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
+			$url = "redir/{$contact['id']}";
 			$sparkle = ' class="sparkle" ';
 		}
 		else { 
-			$url = $r[0]['url'];
+			$url = $contact['url'];
 			$sparkle = '';
 		}
 
-		$grps = '';
-
-		$insecure = '<div id="profile-edit-insecure"><p><img src="images/unlock_icon.gif" alt="' . t('Privacy Unavailable') . '" />&nbsp;'
-			. t('Private communications are not available for this contact.') . '</p></div>';
+		$insecure = t('Private communications are not available for this contact.');
 
-		$last_update = (($r[0]['last-update'] == '0000-00-00 00:00:00') 
+		$last_update = (($contact['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'));
-
-		if($r[0]['last-update'] !== '0000-00-00 00:00:00')
-			$last_update .= ' ' . (($r[0]['last-update'] == $r[0]['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
-
-		$lblsuggest = (($r[0]['network'] === NETWORK_DFRN) 
-			? '<div id="contact-suggest-wrapper"><a href="fsuggest/' . $r[0]['id'] . '" id="contact-suggest">' . t('Suggest friends') . '</a></div>' : '');
+				: datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A'));
+
+		if($contact['last-update'] !== '0000-00-00 00:00:00')
+			$last_update .= ' ' . (($contact['last-update'] == $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
+
+		$lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : '');
+
+		$poll_enabled = (($contact['network'] !== NETWORK_DIASPORA) ? true : false);
+
+		$nettype = sprintf( t('Network type: %s'),network_to_name($contact['network']));
+
+		$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') : '');
+
+		// tabs
+		$tabs = array(
+			array(
+				'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
+				'url'   => $a->get_baseurl() . '/contacts/' . $contact_id . '/block',
+				'sel'   => '',
+			),
+			array(
+				'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
+				'url'   => $a->get_baseurl() . '/contacts/' . $contact_id . '/ignore',
+				'sel'   => '',
+			),
+			array(
+				'label' => t('Repair'),
+				'url'   => $a->get_baseurl() . '/crepair/' . $contact_id,
+				'sel'   => '',
+			)
+		);
+		$tab_tpl = get_markup_template('common_tabs.tpl');
+		$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
 
 
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Contact Editor'),
+			'$tab_str' => $tab_str,
 			'$submit' => t('Submit'),
 			'$lbl_vis1' => t('Profile Visibility'),
-			'$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $r[0]['name']),
+			'$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['name']),
 			'$lbl_info1' => t('Contact Information / Notes'),
-			'$lbl_rep1' => t('Online Reputation'),
-			'$lbl_rep2' => t('Occasionally your friends may wish to inquire about this person\'s online legitimacy.'),
-			'$lbl_rep3' => t('You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them.'),
-			'$lbl_rep4' => t('Please take a moment to elaborate on this selection if you feel it could be helpful to others.'),
-			'$visit' => sprintf( t('Visit %s\'s profile [%s]'),$r[0]['name'],$r[0]['url']),
+			'$infedit' => t('Edit contact notes'),
+			'$common_text' => $common_text,
+			'$common_link' => $a->get_baseurl() . '/common/' . $contact['id'],
+			'$all_friends' => $all_friends,
+			'$relation_text' => $relation_text,
+			'$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),
 			'$blockunblock' => t('Block/Unblock contact'),
 			'$ignorecont' => t('Ignore contact'),
-			'$altcrepair' => t('Repair contact URL settings'),
-			'$lblcrepair' => t("Repair contact URL settings \x28WARNING: Advanced\x29"),
+			'$lblcrepair' => t("Repair URL settings"),
 			'$lblrecent' => t('View conversations'),
 			'$lblsuggest' => $lblsuggest,
-			'$grps' => $grps,
 			'$delete' => t('Delete contact'),
-			'$poll_interval' => contact_poll_interval($r[0]['priority']),
-			'$lastupdtext' => t('Last updated: '),
-			'$updpub' => t('Update public posts: '),
+			'$nettype' => $nettype,
+			'$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)),
+			'$poll_enabled' => $poll_enabled,
+			'$lastupdtext' => t('Last update:'),
+			'$updpub' => t('Update public posts'),
 			'$last_update' => $last_update,
 			'$udnow' => t('Update now'),
-			'$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'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_FACEBOOK) ? $insecure : ''),
-			'$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']),
-			'$reason' => $r[0]['reason'],
-			'$groups' => '', // group_selector(),
-			'$photo' => $r[0]['photo'],
-			'$name' => $r[0]['name'],
+			'$profile_select' => contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)),
+			'$contact_id' => $contact['id'],
+			'$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
+			'$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
+			'$insecure' => (($contact['network'] !== NETWORK_DFRN && $contact['network'] !== NETWORK_MAIL && $contact['network'] !== NETWORK_FACEBOOK && $contact['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
+			'$info' => $contact['info'],
+			'$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''),
+			'$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
+			'$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts <strong>may</strong> still be visible')),
+			'$photo' => $contact['photo'],
+			'$name' => $contact['name'],
 			'$dir_icon' => $dir_icon,
 			'$alt_text' => $alt_text,
 			'$sparkle' => $sparkle,
@@ -335,7 +357,7 @@ function contacts_content(&$a) {
 
 		));
 
-		$arr = array('contact' => $r[0],'output' => $o);
+		$arr = array('contact' => $contact,'output' => $o);
 
 		call_hooks('contact_edit', $arr);
 
@@ -343,32 +365,83 @@ function contacts_content(&$a) {
 
 	}
 
+	$blocked = false;
+	$hidden = false;
+	$ignored = false;
+	$all = false;
+
+	$_SESSION['return_url'] = $a->query_string;
 
-	if(($a->argc == 2) && ($a->argv[1] === 'all'))
+	if(($a->argc == 2) && ($a->argv[1] === 'all')) {
 		$sql_extra = '';
+		$all = true;
+	}
+	elseif(($a->argc == 2) && ($a->argv[1] === 'blocked')) {
+		$sql_extra = " AND `blocked` = 1 ";
+		$blocked = true;
+	}
+	elseif(($a->argc == 2) && ($a->argv[1] === 'hidden')) {
+		$sql_extra = " AND `hidden` = 1 ";
+		$hidden = true;
+	}
+	elseif(($a->argc == 2) && ($a->argv[1] === 'ignored')) {
+		$sql_extra = " AND `readonly` = 1 ";
+		$ignored = true;
+	}
 	else
 		$sql_extra = " AND `blocked` = 0 ";
 
 	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+	$nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : '');
+
+	$tabs = array(
+		array(
+			'label' => t('All Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/all', 
+			'sel'   => ($all) ? 'active' : '',
+		),
+		array(
+			'label' => t('Unblocked Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts',
+			'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored)) ? 'active' : '',
+		),
+
+		array(
+			'label' => t('Blocked Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/blocked',
+			'sel'   => ($blocked) ? 'active' : '',
+		),
+
+		array(
+			'label' => t('Ignored Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/ignored',
+			'sel'   => ($ignored) ? 'active' : '',
+		),
+
+		array(
+			'label' => t('Hidden Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/hidden',
+			'sel'   => ($hidden) ? 'active' : '',
+		),
 
-	$tpl = get_markup_template("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,
-		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
-		'$submit' => t('Find'),
-		'$cmd' => $a->cmd
+	);
+
+	$tab_tpl = get_markup_template('common_tabs.tpl');
+	$t = replace_macros($tab_tpl, array('$tabs'=>$tabs));
 
 
-	)); 
 
-	if($search)
+
+	if($search) {
+		$search_hdr = $search;
 		$search = dbesc($search.'*');
+	}
 	$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
-	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= REL_BUD)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); 
+	if($nets)
+		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+ 
+	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); 
 
 	
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact` 
@@ -377,30 +450,33 @@ function contacts_content(&$a) {
 	if(count($r))
 		$a->set_pager_total($r[0]['total']);
 
+
+
+
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($_SESSION['uid']),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
 
-	if(count($r)) {
+	$contacts = array();
 
-		$tpl = get_markup_template("contact_template.tpl");
+	if(count($r)) {
 
 		foreach($r as $rr) {
 			if($rr['self'])
 				continue;
 
 			switch($rr['rel']) {
-				case REL_BUD:
+				case CONTACT_IS_FRIEND:
 					$dir_icon = 'images/lrarrow.gif';
 					$alt_text = t('Mutual Friendship');
 					break;
-				case  REL_VIP;
+				case  CONTACT_IS_FOLLOWER;
 					$dir_icon = 'images/larrow.gif';
 					$alt_text = t('is a fan of yours');
 					break;
-				case REL_FAN;
+				case CONTACT_IS_SHARING;
 					$dir_icon = 'images/rarrow.gif';
 					$alt_text = t('you are a fan of');
 					break;
@@ -417,23 +493,41 @@ function contacts_content(&$a) {
 			}
 
 
-			$o .= replace_macros($tpl, array(
-				'$img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
-				'$edit_hover' => t('Edit contact'),
-				'$id' => $rr['id'],
-				'$alt_text' => $alt_text,
-				'$dir_icon' => $dir_icon,
-				'$thumb' => $rr['thumb'], 
-				'$name' => substr($rr['name'],0,20),
-				'$username' => $rr['name'],
-				'$sparkle' => $sparkle,
-				'$url' => $url
-			));
+			$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' => $rr['thumb'], 
+				'name' => $rr['name'],
+				'username' => $rr['name'],
+				'sparkle' => $sparkle,
+				'itemurl' => $rr['url'],
+				'url' => $url,
+				'network' => network_to_name($rr['network']),
+			);
 		}
 
-		$o .= '<div id="contact-edit-end"></div>';
+		
 
 	}
-	$o .= paginate($a);
+	
+	$tpl = get_markup_template("contacts-template.tpl");
+	$o .= replace_macros($tpl,array(
+		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
+		'$tabs' => $t,
+		'$total' => $r[0]['total'],
+		'$search' => $search_hdr,
+		'$desc' => t('Search your contacts'),
+		'$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""),
+		'$submit' => t('Find'),
+		'$cmd' => $a->cmd,
+		'$contacts' => $contacts,
+		'$paginate' => paginate($a),
+
+	)); 
+	
 	return $o;
 }