X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=dd24fc0a2a3a01a120557f7bf659d638c30440cf;hb=9259feec6f4b0a24c15f971a3dc8fa54f4f08141;hp=e07e9331146cd1ec8efa4840de23eeb3763d37dd;hpb=74267310d63ac4867f0238ed1b11013736790c93;p=friendica.git

diff --git a/mod/suggest.php b/mod/suggest.php
index e07e933114..dd24fc0a2a 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -3,20 +3,20 @@
 require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 
-
-function suggest_init(&$a) {
-	if(! local_user())
+function suggest_init(App $a) {
+	if (! local_user()) {
 		return;
+	}
 
-	if(x($_GET,'ignore') && intval($_GET['ignore'])) {
+	if (x($_GET,'ignore') && intval($_GET['ignore'])) {
 		// Check if we should do HTML-based delete confirmation
-		if($_REQUEST['confirm']) {
+		if ($_REQUEST['confirm']) {
 			// <form> can't take arguments in its "action" parameter
 			// so add any arguments as hidden inputs
 			$query = explode_querystring($a->query_string);
 			$inputs = array();
-			foreach($query['args'] as $arg) {
-				if(strpos($arg, 'confirm=') === false) {
+			foreach ($query['args'] as $arg) {
+				if (strpos($arg, 'confirm=') === false) {
 					$arg_parts = explode('=', $arg);
 					$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
 				}
@@ -35,8 +35,8 @@ function suggest_init(&$a) {
 			return;
 		}
 		// Now check how the user responded to the confirmation query
-		if(!$_REQUEST['canceled']) {
-			q("insert into gcign ( uid, gcid ) values ( %d, %d ) ",
+		if (!$_REQUEST['canceled']) {
+			q("INSERT INTO `gcign` ( `uid`, `gcid` ) VALUES ( %d, %d ) ",
 				intval(local_user()),
 				intval($_GET['ignore'])
 			);
@@ -49,53 +49,71 @@ function suggest_init(&$a) {
 
 
 
-function suggest_content(&$a) {
+function suggest_content(App $a) {
 
 	require_once("mod/proxy.php");
 
 	$o = '';
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+	$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
 
-	$a->page['aside'] .= follow_widget();
 	$a->page['aside'] .= findpeople_widget();
-
-
-	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-		'$title' => t('Friend Suggestions')
-	));
+	$a->page['aside'] .= follow_widget();
 
 
 	$r = suggestion_query(local_user());
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		$o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
 		return $o;
 	}
 
-	$tpl = get_markup_template('suggest_friends.tpl');
-
-	foreach($r as $rr) {
+	require_once 'include/contact_selectors.php';
+
+	foreach ($r as $rr) {
+
+		$connlnk = App::get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+		$ignlnk = App::get_baseurl() . '/suggest?ignore=' . $rr['id'];
+		$photo_menu = array(
+			'profile' => array(t("View Profile"), zrl($rr["url"])),
+			'follow' => array(t("Connect/Follow"), $connlnk),
+			'hide' => array(t('Ignore/Hide'), $ignlnk)
+		);
+
+		$contact_details = get_contact_details_by_url($rr["url"], local_user(), $rr);
+
+		$entry = array(
+			'url' => zrl($rr['url']),
+			'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'img_hover' => $rr['url'],
+			'name' => $contact_details['name'],
+			'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+			'details'       => $contact_details['location'],
+			'tags'          => $contact_details['keywords'],
+			'about'         => $contact_details['about'],
+			'account_type'  => account_type($contact_details),
+			'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;
+	}
 
-		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);			
+	$tpl = get_markup_template('viewcontact_template.tpl');
 
-		$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')
-		));
-	}
+	$o .= replace_macros($tpl,array(
+		'$title' => t('Friend Suggestions'),
+		'$contacts' => $entries,
+	));
 
-	$o .= cleardiv();
-//	$o .= paginate($a);
 	return $o;
 }