X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=8330250a7bb756b2aded74a9c3797c7c7ffb79e9;hb=4d39164c1ee6de2b1a09c2a1a8a4c89531d47ee5;hp=5e8dcc5fb7325ec3cd66f2041752a62b438b2164;hpb=6b44fbbda03af125035c185c964f10ce78f97610;p=friendica.git diff --git a/mod/suggest.php b/mod/suggest.php index 5e8dcc5fb7..8330250a7b 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -2,15 +2,16 @@ /** * @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) { if (! local_user()) { @@ -45,17 +46,16 @@ function suggest_init(App $a) { } // 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,7 +69,7 @@ function suggest_content(App $a) { $r = GContact::suggestionQuery(local_user()); - if (! DBM::is_result($r)) { + if (! DBA::isResult($r)) { $o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.'); return $o; } @@ -79,7 +79,7 @@ function suggest_content(App $a) { $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"])], + 'profile' => [L10n::t("View Profile"), Contact::magicLink($rr["url"])], 'follow' => [L10n::t("Connect/Follow"), $connlnk], 'hide' => [L10n::t('Ignore/Hide'), $ignlnk] ]; @@ -87,11 +87,11 @@ function suggest_content(App $a) { $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'],