X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=81030842dcdf4dc220d05518e51a6fe2b157600f;hb=b8e8b771d4ead88ae08b062fa9fce9352ba3b5b4;hp=9708d160a9c87ab02543b55b5a5f057860320e16;hpb=d49f986d1eb6894dd948577288357b6c1755e3d3;p=friendica.git

diff --git a/mod/suggest.php b/mod/suggest.php
index 9708d160a9..81030842dc 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -2,17 +2,19 @@
 /**
  * @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\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
 
-function suggest_init(App $a) {
+function suggest_init(App $a)
+{
 	if (! local_user()) {
 		return;
 	}
@@ -33,29 +35,28 @@ function suggest_init(App $a) {
 
 			$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']) {
-			dba::insert('gcign', ['uid' => local_user(), 'gcid' => $_GET['ignore']]);
+			DBA::insert('gcign', ['uid' => local_user(), 'gcid' => $_GET['ignore']]);
 		}
 	}
 
 }
 
-function suggest_content(App $a) {
-
-	require_once("mod/proxy.php");
-
+function suggest_content(App $a)
+{
 	$o = '';
+
 	if (! local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
@@ -69,39 +70,41 @@ function suggest_content(App $a) {
 
 	$r = GContact::suggestionQuery(local_user());
 
-	if (! DBM::is_result($r)) {
-		$o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
+	if (! DBA::isResult($r)) {
+		$o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.');
 		return $o;
 	}
 
+	$id = 0;
+
 	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]
+			'profile' => [L10n::t("View Profile"), Contact::magicLink($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']),
+			'url' => Contact::magicLink($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),
+			'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::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' => t('Connect'),
+			'conntxt' => L10n::t('Connect'),
 			'connlnk' => $connlnk,
 			'photo_menu' => $photo_menu,
-			'ignore' => t('Ignore/Hide'),
+			'ignore' => L10n::t('Ignore/Hide'),
 			'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
 			'id' => ++$id,
 		];
@@ -111,7 +114,7 @@ function suggest_content(App $a) {
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
 	$o .= replace_macros($tpl,[
-		'$title' => t('Friend Suggestions'),
+		'$title' => L10n::t('Friend Suggestions'),
 		'$contacts' => $entries,
 	]);