Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index b1b6e83dac9476d6aa38cd3954307d5eb567ea40..7f1fe3386c139f297244f88f0ea45f2d23aba310 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -2,22 +2,25 @@
 /**
  * @file mod/suggest.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Widget;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 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;
        }
 
-       if (x($_GET,'ignore') && intval($_GET['ignore'])) {
+       if (!empty($_GET['ignore'])) {
                // Check if we should do HTML-based delete confirmation
                if ($_REQUEST['confirm']) {
                        // <form> can't take arguments in its "action" parameter
@@ -31,7 +34,7 @@ function suggest_init(App $a) {
                                }
                        }
 
-                       $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
+                       $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'get',
                                '$message' => L10n::t('Do you really want to delete this suggestion?'),
                                '$extra_inputs' => $inputs,
@@ -45,23 +48,22 @@ 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;
        }
 
-       $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
+       $_SESSION['return_path'] = $a->cmd;
 
        $a->page['aside'] .= Widget::findPeople();
        $a->page['aside'] .= Widget::follow();
@@ -69,11 +71,13 @@ 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;
        }
 
+       $id = 0;
+
        foreach ($r as $rr) {
 
                $connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
@@ -91,7 +95,7 @@ function suggest_content(App $a) {
                        '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'],
@@ -108,9 +112,9 @@ function suggest_content(App $a) {
                $entries[] = $entry;
        }
 
-       $tpl = get_markup_template('viewcontact_template.tpl');
+       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-       $o .= replace_macros($tpl,[
+       $o .= Renderer::replaceMacros($tpl,[
                '$title' => L10n::t('Friend Suggestions'),
                '$contacts' => $entries,
        ]);