Merge pull request #9843 from annando/no-filetag

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index f3421de47e420f84256d13facef3a1fc86c421ff..0965978ce04babda9db242f531a480a03db82be4 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -20,37 +20,18 @@
  */
 
 use Friendica\App;
-use Friendica\Content\ContactSelector;
 use Friendica\Content\Widget;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-
-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\Module\Contact as ModuleContact;
+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,64 +39,20 @@ 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.');
        }
 
-       $id = 0;
        $entries = [];
-
        foreach ($contacts as $contact) {
-               $entry = [
-                       'url'          => Contact::magicLink($contact['url']),
-                       'itemurl'      => $contact['addr'] ?: $contact['url'],
-                       'name'         => $contact['name'],
-                       'thumb'        => Contact::getThumb($contact),
-                       'img_hover'    => $contact['url'],
-                       'details'      => $contact['location'],
-                       'tags'         => $contact['keywords'],
-                       'about'        => $contact['about'],
-                       'account_type' => Contact::getAccountType($contact),
-                       'network'      => ContactSelector::networkToName($contact['network'], $contact['url']),
-                       'photo_menu'   => Contact::photoMenu($contact),
-                       'id'           => ++$id,
-               ];
-               $entries[] = $entry;
+               $entries[] = ModuleContact::getContactTemplateVars($contact);
        }
 
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-       $o .= Renderer::replaceMacros($tpl,[
+       return Renderer::replaceMacros($tpl,[
                '$title' => DI::l10n()->t('Friend Suggestions'),
                '$contacts' => $entries,
        ]);
-
-       return $o;
 }