X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=578338b5058055ff85d57dbb22d7c6abff4aab9f;hb=5a8d66e2d4315a00eb45dec4b7f5fb88ed3dbc02;hp=af16197a04d827a938a8f656cbd8a890ed8a198a;hpb=8f1cfac20ab5c7acfbe26d8ccf04ebbd0d94a0e3;p=friendica.git

diff --git a/mod/suggest.php b/mod/suggest.php
index af16197a04..578338b505 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -61,11 +61,8 @@ function suggest_content(&$a) {
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
-	$a->page['aside'] .= follow_widget();
 	$a->page['aside'] .= findpeople_widget();
-
-
-	$o .= '<h2>' . t('Friend Suggestions') . '</h2>';
+	$a->page['aside'] .= follow_widget();
 
 
 	$r = suggestion_query(local_user());
@@ -75,25 +72,45 @@ function suggest_content(&$a) {
 		return $o;
 	}
 
-	$tpl = get_markup_template('suggest_friends.tpl');
+	require_once 'include/contact_selectors.php';
 
 	foreach($r as $rr) {
 
-		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);			
-
-		$o .= replace_macros($tpl,array(
-			'$url' => zrl($rr['url']),
-			'$name' => $rr['name'],
-			'$photo' => proxy_url($rr['photo']),
-			'$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
-			'$ignid' => $rr['id'],
-			'$conntxt' => t('Connect'),
-			'$connlnk' => $connlnk,
-			'$ignore' => t('Ignore/Hide')
-		));
+		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+		$ignlnk = $a->get_baseurl() . '/suggest?ignore=' . $rr['id'];
+		$photo_menu = array(array(t("View Profile"), zrl($rr["url"])));
+		$photo_menu[] = array(t("Connect/Follow"), $connlnk);
+		$photo_menu[] = array(t('Ignore/Hide'), $ignlnk);
+		$contact_details = get_contact_details_by_url($rr["url"], local_user());
+
+		$entry = array(
+			'url' => zrl($rr['url']),
+			'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'img_hover' => $rr['url'],
+			'name' => $rr['name'],
+			'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
+			'details'       => $contact_details['location'],
+                        'tags'          => $contact_details['keywords'],
+                        'about'         => $contact_details['about'],
+			'ignlnk' => $ignlnk,
+			'ignid' => $rr['id'],
+			'conntxt' => t('Connect'),
+			'connlnk' => $connlnk,
+			'photo_menu' => $photo_menu,
+			'ignore' => t('Ignore/Hide'),
+			'network' => network_to_name($rr['network'], $rr['url']),
+			'id' => ++$id,
+		);
+		$entries[] = $entry;
 	}
 
-	$o .= cleardiv();
-//	$o .= paginate($a);
+	$tpl = get_markup_template('viewcontact_template.tpl');
+
+	$o .= replace_macros($tpl,array(
+		'$title' => t('Friend Suggestions'),
+		'$contacts' => $entries,
+		
+	));
+
 	return $o;
 }