Revert Photo::getImageDataForPhoto return-type change

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index d501e3a3f2ae4570f717eac0ee501dee64aa31cf..c18de1bd3dc46ea26db8c113ca225afd25629946 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,31 +26,12 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Module\Contact as ModuleContact;
-
-function suggest_init(App $a)
-{
-       if (! local_user()) {
-               return;
-       }
-}
-
-function suggest_post(App $a)
-{
-       if (!empty($_POST['ignore']) && !empty($_POST['confirm'])) {
-               DBA::insert('gcign', ['uid' => local_user(), 'gcid' => $_POST['ignore']]);
-               notice(DI::l10n()->t('Contact suggestion successfully ignored.'));
-       }
-
-       DI::baseUrl()->redirect('suggest');
-}
+use Friendica\Network\HTTPException;
 
 function suggest_content(App $a)
 {
-       $o = '';
-
-       if (! local_user()) {
-               notice(DI::l10n()->t('Permission denied.'));
-               return;
+       if (!local_user()) {
+               throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
        }
 
        $_SESSION['return_path'] = DI::args()->getCommand();
@@ -58,35 +39,9 @@ function suggest_content(App $a)
        DI::page()['aside'] .= Widget::findPeople();
        DI::page()['aside'] .= Widget::follow();
 
-
-       $contacts = Contact::getSuggestions(local_user());
+       $contacts = Contact\Relation::getSuggestions(local_user());
        if (!DBA::isResult($contacts)) {
-               $o .= DI::l10n()->t('No suggestions available. If this is a new site, please try again in 24 hours.');
-               return $o;
-       }
-
-
-       if (!empty($_GET['ignore'])) {
-               // <form> can't take arguments in its "action" parameter
-               // so add any arguments as hidden inputs
-               $query = explode_querystring(DI::args()->getQueryString());
-               $inputs = [];
-               foreach ($query['args'] as $arg) {
-                       if (strpos($arg, 'confirm=') === false) {
-                               $arg_parts = explode('=', $arg);
-                               $inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
-                       }
-               }
-
-               return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
-                       '$method' => 'post',
-                       '$message' => DI::l10n()->t('Do you really want to delete this suggestion?'),
-                       '$extra_inputs' => $inputs,
-                       '$confirm' => DI::l10n()->t('Yes'),
-                       '$confirm_url' => $query['base'],
-                       '$confirm_name' => 'confirm',
-                       '$cancel' => DI::l10n()->t('Cancel'),
-               ]);
+               return DI::l10n()->t('No suggestions available. If this is a new site, please try again in 24 hours.');
        }
 
        $entries = [];
@@ -96,10 +51,8 @@ function suggest_content(App $a)
 
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-       $o .= Renderer::replaceMacros($tpl,[
+       return Renderer::replaceMacros($tpl,[
                '$title' => DI::l10n()->t('Friend Suggestions'),
                '$contacts' => $entries,
        ]);
-
-       return $o;
 }