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

diff --git a/mod/suggest.php b/mod/suggest.php
index 578338b505..8a25fb0b21 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -1,28 +1,36 @@
 <?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\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?'),
 				'$extra_inputs' => $inputs,
@@ -30,87 +38,81 @@ function suggest_init(&$a) {
 				'$confirm_url' => $query['base'],
 				'$confirm_name' => 'confirmed',
 				'$cancel' => 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()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+	$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
 
-	$a->page['aside'] .= findpeople_widget();
-	$a->page['aside'] .= follow_widget();
+	$a->page['aside'] .= Widget::findPeople();
+	$a->page['aside'] .= Widget::follow();
 
 
-	$r = suggestion_query(local_user());
+	$r = GContact::suggestionQuery(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 = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+		$ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
+		$photo_menu = [
+			'profile' => [t("View Profile"), Profile::zrl($rr["url"])],
+			'follow' => [t("Connect/Follow"), $connlnk],
+			'hide' => [t('Ignore/Hide'), $ignlnk]
+		];
 
-		$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());
+		$contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
 
-		$entry = array(
-			'url' => zrl($rr['url']),
+		$entry = [
+			'url' => Profile::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'],
+			'tags'          => $contact_details['keywords'],
+			'about'         => $contact_details['about'],
+			'account_type'  => Contact::getAccountType($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']),
+			'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
 			'id' => ++$id,
-		);
+		];
 		$entries[] = $entry;
 	}
 
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
-	$o .= replace_macros($tpl,array(
+	$o .= replace_macros($tpl,[
 		'$title' => t('Friend Suggestions'),
 		'$contacts' => $entries,
-		
-	));
+	]);
 
 	return $o;
 }