X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=5e8dcc5fb7325ec3cd66f2041752a62b438b2164;hb=6e7c6ab0fa46dc3ab2f35326bc1b2c747377d509;hp=e07e9331146cd1ec8efa4840de23eeb3763d37dd;hpb=a36014fb0ff63c82a9a9abcb1fe2cadcc87b9f87;p=friendica.git

diff --git a/mod/suggest.php b/mod/suggest.php
index e07e933114..5e8dcc5fb7 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -1,101 +1,119 @@
 <?php
-
-require_once('include/socgraph.php');
-require_once('include/contact_widgets.php');
-
-
-function suggest_init(&$a) {
-	if(! local_user())
+/**
+ * @file mod/suggest.php
+ */
+use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Widget;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Model\Profile;
+
+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) {
+			$inputs = [];
+			foreach ($query['args'] as $arg) {
+				if (strpos($arg, 'confirm=') === false) {
 					$arg_parts = explode('=', $arg);
-					$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+					$inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
 				}
 			}
 
-			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
 				'$method' => 'get',
-				'$message' => t('Do you really want to delete this suggestion?'),
+				'$message' => L10n::t('Do you really want to delete this suggestion?'),
 				'$extra_inputs' => $inputs,
-				'$confirm' => t('Yes'),
+				'$confirm' => L10n::t('Yes'),
 				'$confirm_url' => $query['base'],
 				'$confirm_name' => 'confirmed',
-				'$cancel' => t('Cancel'),
-			));
+				'$cancel' => L10n::t('Cancel'),
+			]);
 			$a->error = 1; // Set $a->error so the other module functions don't execute
 			return;
 		}
 		// Now check how the user responded to the confirmation query
-		if(!$_REQUEST['canceled']) {
-			q("insert into gcign ( uid, gcid ) values ( %d, %d ) ",
-				intval(local_user()),
-				intval($_GET['ignore'])
-			);
+		if (!$_REQUEST['canceled']) {
+			dba::insert('gcign', ['uid' => local_user(), 'gcid' => $_GET['ignore']]);
 		}
 	}
 
 }
 
-
-
-
-
-function suggest_content(&$a) {
+function suggest_content(App $a) {
 
 	require_once("mod/proxy.php");
 
 	$o = '';
-	if(! local_user()) {
-		notice( t('Permission denied.') . EOL);
+	if (! local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
-
-	$a->page['aside'] .= follow_widget();
-	$a->page['aside'] .= findpeople_widget();
-
+	$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
 
-	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-		'$title' => t('Friend Suggestions')
-	));
+	$a->page['aside'] .= Widget::findPeople();
+	$a->page['aside'] .= Widget::follow();
 
 
-	$r = suggestion_query(local_user());
+	$r = GContact::suggestionQuery(local_user());
 
-	if(! count($r)) {
-		$o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
+	if (! DBM::is_result($r)) {
+		$o .= L10n::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) {
+	foreach ($r as $rr) {
+
+		$connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+		$ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
+		$photo_menu = [
+			'profile' => [L10n::t("View Profile"), Profile::zrl($rr["url"])],
+			'follow' => [L10n::t("Connect/Follow"), $connlnk],
+			'hide' => [L10n::t('Ignore/Hide'), $ignlnk]
+		];
+
+		$contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
+
+		$entry = [
+			'url' => Profile::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'  => Contact::getAccountType($contact_details),
+			'ignlnk' => $ignlnk,
+			'ignid' => $rr['id'],
+			'conntxt' => L10n::t('Connect'),
+			'connlnk' => $connlnk,
+			'photo_menu' => $photo_menu,
+			'ignore' => L10n::t('Ignore/Hide'),
+			'network' => ContactSelector::networkToName($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,[
+		'$title' => L10n::t('Friend Suggestions'),
+		'$contacts' => $entries,
+	]);
 
-	$o .= cleardiv();
-//	$o .= paginate($a);
 	return $o;
 }