Move /profile_photo to Module\Settings\Profile\Photo

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index 86c7f7afdf4c759a4f4bc81ff1aed1f5aeae683c..77f75f8b8f3a816879cd9e9e8c071836e4ebe0e9 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -6,9 +6,7 @@
 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\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -26,7 +24,7 @@ function suggest_post(App $a)
 {
        if (!empty($_POST['ignore']) && !empty($_POST['confirm'])) {
                DBA::insert('gcign', ['uid' => local_user(), 'gcid' => $_POST['ignore']]);
-               notice(L10n::t('Contact suggestion successfully ignored.'));
+               notice(DI::l10n()->t('Contact suggestion successfully ignored.'));
        }
 
        DI::baseUrl()->redirect('suggest');
@@ -37,20 +35,20 @@ function suggest_content(App $a)
        $o = '';
 
        if (! local_user()) {
-               notice(L10n::t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.') . EOL);
                return;
        }
 
-       $_SESSION['return_path'] = $a->cmd;
+       $_SESSION['return_path'] = DI::args()->getCommand();
 
-       $a->page['aside'] .= Widget::findPeople();
-       $a->page['aside'] .= Widget::follow();
+       DI::page()['aside'] .= Widget::findPeople();
+       DI::page()['aside'] .= Widget::follow();
 
 
        $r = GContact::suggestionQuery(local_user());
 
        if (! DBA::isResult($r)) {
-               $o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.');
+               $o .= DI::l10n()->t('No suggestions available. If this is a new site, please try again in 24 hours.');
                return $o;
        }
 
@@ -58,7 +56,7 @@ function suggest_content(App $a)
        if (!empty($_GET['ignore'])) {
                // <form> can't take arguments in its "action" parameter
                // so add any arguments as hidden inputs
-               $query = explode_querystring($a->query_string);
+               $query = explode_querystring(DI::args()->getQueryString());
                $inputs = [];
                foreach ($query['args'] as $arg) {
                        if (strpos($arg, 'confirm=') === false) {
@@ -69,12 +67,12 @@ function suggest_content(App $a)
 
                return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                        '$method' => 'post',
-                       '$message' => L10n::t('Do you really want to delete this suggestion?'),
+                       '$message' => DI::l10n()->t('Do you really want to delete this suggestion?'),
                        '$extra_inputs' => $inputs,
-                       '$confirm' => L10n::t('Yes'),
+                       '$confirm' => DI::l10n()->t('Yes'),
                        '$confirm_url' => $query['base'],
                        '$confirm_name' => 'confirm',
-                       '$cancel' => L10n::t('Cancel'),
+                       '$cancel' => DI::l10n()->t('Cancel'),
                ]);
        }
 
@@ -82,12 +80,12 @@ function suggest_content(App $a)
        $entries = [];
 
        foreach ($r as $rr) {
-               $connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
-               $ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
+               $connlnk = DI::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+               $ignlnk = DI::baseUrl() . '/suggest?ignore=' . $rr['id'];
                $photo_menu = [
-                       'profile' => [L10n::t("View Profile"), Contact::magicLink($rr["url"])],
-                       'follow' => [L10n::t("Connect/Follow"), $connlnk],
-                       'hide' => [L10n::t('Ignore/Hide'), $ignlnk]
+                       'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($rr["url"])],
+                       'follow' => [DI::l10n()->t("Connect/Follow"), $connlnk],
+                       'hide' => [DI::l10n()->t('Ignore/Hide'), $ignlnk]
                ];
 
                $contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
@@ -104,10 +102,10 @@ function suggest_content(App $a)
                        'account_type'  => Contact::getAccountType($contact_details),
                        'ignlnk' => $ignlnk,
                        'ignid' => $rr['id'],
-                       'conntxt' => L10n::t('Connect'),
+                       'conntxt' => DI::l10n()->t('Connect'),
                        'connlnk' => $connlnk,
                        'photo_menu' => $photo_menu,
-                       'ignore' => L10n::t('Ignore/Hide'),
+                       'ignore' => DI::l10n()->t('Ignore/Hide'),
                        'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
                        'id' => ++$id,
                ];
@@ -117,7 +115,7 @@ function suggest_content(App $a)
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
        $o .= Renderer::replaceMacros($tpl,[
-               '$title' => L10n::t('Friend Suggestions'),
+               '$title' => DI::l10n()->t('Friend Suggestions'),
                '$contacts' => $entries,
        ]);