X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=a6c4b6e5680219e549e0391048b0190c8d2b7634;hb=3472191b055bdb9a912daceaea1ccd8516137091;hp=8f5f4f6a128b05cd20afea3083dc169ead318e5e;hpb=9330a6994c1b9aee49a482efe32e84ca1a944c9b;p=friendica.git

diff --git a/mod/suggest.php b/mod/suggest.php
index 8f5f4f6a12..a6c4b6e568 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -3,20 +3,20 @@
 require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 
-if(! function_exists('suggest_init')) {
-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,31 +35,31 @@ function suggest_init(&$a) {
 			return;
 		}
 		// Now check how the user responded to the confirmation query
-		if(!$_REQUEST['canceled']) {
+		if (!$_REQUEST['canceled']) {
 			q("INSERT INTO `gcign` ( `uid`, `gcid` ) VALUES ( %d, %d ) ",
 				intval(local_user()),
 				intval($_GET['ignore'])
 			);
 		}
 	}
+
 }
-}
 
 
 
 
-if(! function_exists('suggest_content')) {
-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'] .= findpeople_widget();
 	$a->page['aside'] .= follow_widget();
@@ -67,32 +67,35 @@ function suggest_content(&$a) {
 
 	$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;
 	}
 
 	require_once 'include/contact_selectors.php';
 
-	foreach($r as $rr) {
+	foreach ($r as $rr) {
 
-		$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());
+		$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' => $rr['name'],
-			'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
+			'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'  => (($contact_details['community']) ? t('Forum') : ''),
+			'account_type'  => account_type($contact_details),
 			'ignlnk' => $ignlnk,
 			'ignid' => $rr['id'],
 			'conntxt' => t('Connect'),
@@ -110,9 +113,7 @@ function suggest_content(&$a) {
 	$o .= replace_macros($tpl,array(
 		'$title' => t('Friend Suggestions'),
 		'$contacts' => $entries,
-
 	));
 
 	return $o;
 }
-}