]> git.mxchange.org Git - friendica.git/blobdiff - mod/dfrn_request.php
Remove unneeded Config namespace usages
[friendica.git] / mod / dfrn_request.php
index 24548c027ac4cdf54d9c773f059e5ebd2a195196..e29109160ac84363e4a4f8e51f286191051c6275 100644 (file)
@@ -2,7 +2,7 @@
 
 /**
  * @file mod/dfrn_request.php
- * @brief Module: dfrn_request
+ * Module: dfrn_request
  *
  * Purpose: Handles communication associated with the issuance of
  * friend requests.
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\Core\System;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
@@ -98,7 +97,7 @@ function dfrn_request_post(App $a)
                                if (DBA::isResult($r)) {
                                        if (strlen($r[0]['dfrn-id'])) {
                                                // We don't need to be here. It has already happened.
-                                               notice(L10n::t("This introduction has already been accepted.") . EOL);
+                                               notice(DI::l10n()->t("This introduction has already been accepted.") . EOL);
                                                return;
                                        } else {
                                                $contact_record = $r[0];
@@ -116,18 +115,18 @@ function dfrn_request_post(App $a)
                                        $parms = Probe::profile($dfrn_url);
 
                                        if (!count($parms)) {
-                                               notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
+                                               notice(DI::l10n()->t('Profile location is not valid or does not contain profile information.') . EOL);
                                                return;
                                        } else {
                                                if (empty($parms['fn'])) {
-                                                       notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
+                                                       notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL);
                                                }
                                                if (empty($parms['photo'])) {
-                                                       notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
+                                                       notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL);
                                                }
                                                $invalid = Probe::validDfrn($parms);
                                                if ($invalid) {
-                                                       notice(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL);
+                                                       notice(DI::l10n()->tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL);
                                                        return;
                                                }
                                        }
@@ -165,7 +164,7 @@ function dfrn_request_post(App $a)
                                }
 
                                if ($r) {
-                                       info(L10n::t("Introduction complete.") . EOL);
+                                       info(DI::l10n()->t("Introduction complete.") . EOL);
                                }
 
                                $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
@@ -201,7 +200,7 @@ function dfrn_request_post(App $a)
                }
 
                // invalid/bogus request
-               notice(L10n::t('Unrecoverable protocol error.') . EOL);
+               notice(DI::l10n()->t('Unrecoverable protocol error.') . EOL);
                DI::baseUrl()->redirect();
                return; // NOTREACHED
        }
@@ -228,7 +227,7 @@ function dfrn_request_post(App $a)
         *
         */
        if (!(is_array($a->profile) && count($a->profile))) {
-               notice(L10n::t('Profile unavailable.') . EOL);
+               notice(DI::l10n()->t('Profile unavailable.') . EOL);
                return;
        }
 
@@ -249,9 +248,9 @@ function dfrn_request_post(App $a)
                                intval($uid)
                        );
                        if (DBA::isResult($r) && count($r) > $maxreq) {
-                               notice(L10n::t('%s has received too many connection requests today.', $a->profile['name']) . EOL);
-                               notice(L10n::t('Spam protection measures have been invoked.') . EOL);
-                               notice(L10n::t('Friends are advised to please try again in 24 hours.') . EOL);
+                               notice(DI::l10n()->t('%s has received too many connection requests today.', $a->profile['name']) . EOL);
+                               notice(DI::l10n()->t('Spam protection measures have been invoked.') . EOL);
+                               notice(DI::l10n()->t('Friends are advised to please try again in 24 hours.') . EOL);
                                return;
                        }
                }
@@ -275,7 +274,7 @@ function dfrn_request_post(App $a)
 
                $url = trim($_POST['dfrn_url']);
                if (!strlen($url)) {
-                       notice(L10n::t("Invalid locator") . EOL);
+                       notice(DI::l10n()->t("Invalid locator") . EOL);
                        return;
                }
 
@@ -311,10 +310,10 @@ function dfrn_request_post(App $a)
 
                        if (DBA::isResult($ret)) {
                                if (strlen($ret[0]['issued-id'])) {
-                                       notice(L10n::t('You have already introduced yourself here.') . EOL);
+                                       notice(DI::l10n()->t('You have already introduced yourself here.') . EOL);
                                        return;
                                } elseif ($ret[0]['rel'] == Contact::FRIEND) {
-                                       notice(L10n::t('Apparently you are already friends with %s.', $a->profile['name']) . EOL);
+                                       notice(DI::l10n()->t('Apparently you are already friends with %s.', $a->profile['name']) . EOL);
                                        return;
                                } else {
                                        $contact_record = $ret[0];
@@ -334,38 +333,38 @@ function dfrn_request_post(App $a)
                        } else {
                                $url = Network::isUrlValid($url);
                                if (!$url) {
-                                       notice(L10n::t('Invalid profile URL.') . EOL);
-                                       DI::baseUrl()->redirect($a->cmd);
+                                       notice(DI::l10n()->t('Invalid profile URL.') . EOL);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
                                if (!Network::isUrlAllowed($url)) {
-                                       notice(L10n::t('Disallowed profile URL.') . EOL);
-                                       DI::baseUrl()->redirect($a->cmd);
+                                       notice(DI::l10n()->t('Disallowed profile URL.') . EOL);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
                                if (Network::isUrlBlocked($url)) {
-                                       notice(L10n::t('Blocked domain') . EOL);
-                                       DI::baseUrl()->redirect($a->cmd);
+                                       notice(DI::l10n()->t('Blocked domain') . EOL);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
                                $parms = Probe::profile(($hcard) ? $hcard : $url);
 
                                if (!count($parms)) {
-                                       notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
-                                       DI::baseUrl()->redirect($a->cmd);
+                                       notice(DI::l10n()->t('Profile location is not valid or does not contain profile information.') . EOL);
+                                       DI::baseUrl()->redirect(DI::args()->getCommand());
                                } else {
                                        if (empty($parms['fn'])) {
-                                               notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
+                                               notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL);
                                        }
                                        if (empty($parms['photo'])) {
-                                               notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
+                                               notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL);
                                        }
                                        $invalid = Probe::validDfrn($parms);
                                        if ($invalid) {
-                                               notice(L10n::tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL);
+                                               notice(DI::l10n()->tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid) . EOL);
 
                                                return;
                                        }
@@ -413,7 +412,7 @@ function dfrn_request_post(App $a)
                                }
                        }
                        if ($r === false) {
-                               notice(L10n::t('Failed to update contact record.') . EOL);
+                               notice(DI::l10n()->t('Failed to update contact record.') . EOL);
                                return;
                        }
 
@@ -433,11 +432,11 @@ function dfrn_request_post(App $a)
 
                        // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
                        if (!$failed) {
-                               info(L10n::t('Your introduction has been sent.') . EOL);
+                               info(DI::l10n()->t('Your introduction has been sent.') . EOL);
                        }
 
                        // "Homecoming" - send the requestor back to their site to record the introduction.
-                       $dfrn_url = bin2hex($a->getBaseURL() . '/profile/' . $nickname);
+                       $dfrn_url = bin2hex(DI::baseUrl()->get() . '/profile/' . $nickname);
                        $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
 
                        System::externalRedirect($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
@@ -455,7 +454,7 @@ function dfrn_request_post(App $a)
                        // Diaspora needs the uri in the format user@domain.tld
                        // Diaspora will support the remote subscription in a future version
                        if ($network == Protocol::DIASPORA) {
-                               $uri = $nickname . '@' . $a->getHostName();
+                               $uri = $nickname . '@' . DI::baseUrl()->getHostname();
 
                                if (DI::baseUrl()->getUrlPath()) {
                                        $uri .= '/' . DI::baseUrl()->getUrlPath();
@@ -471,7 +470,7 @@ function dfrn_request_post(App $a)
                        // NOTREACHED
                        // END $network != Protocol::PHANTOM
                } else {
-                       notice(L10n::t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL);
+                       notice(DI::l10n()->t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL);
                        return;
                }
        } return;
@@ -487,7 +486,7 @@ function dfrn_request_content(App $a)
        // to send us to the post section to record the introduction.
        if (!empty($_GET['dfrn_url'])) {
                if (!local_user()) {
-                       info(L10n::t("Please login to confirm introduction.") . EOL);
+                       info(DI::l10n()->t("Please login to confirm introduction.") . EOL);
                        /* setup the return URL to come back to this page if they use openid */
                        return Login::form();
                }
@@ -495,7 +494,7 @@ function dfrn_request_content(App $a)
                // Edge case, but can easily happen in the wild. This person is authenticated,
                // but not as the person who needs to deal with this request.
                if ($a->user['nickname'] != $a->argv[1]) {
-                       notice(L10n::t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
+                       notice(DI::l10n()->t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
                        return Login::form();
                }
 
@@ -509,7 +508,7 @@ function dfrn_request_content(App $a)
                        $_POST["confirm_key"] = $confirm_key;
                        $_POST["localconfirm"] = 1;
                        $_POST["hidden-contact"] = 0;
-                       $_POST["submit"] = L10n::t('Confirm');
+                       $_POST["submit"] = DI::l10n()->t('Confirm');
 
                        dfrn_request_post($a);
 
@@ -520,11 +519,11 @@ function dfrn_request_content(App $a)
                $o = Renderer::replaceMacros($tpl, [
                        '$dfrn_url' => $dfrn_url,
                        '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
-                       '$hidethem' => L10n::t('Hide this contact'),
+                       '$hidethem' => DI::l10n()->t('Hide this contact'),
                        '$confirm_key' => $confirm_key,
-                       '$welcome' => L10n::t('Welcome home %s.', $a->user['username']),
-                       '$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url),
-                       '$submit' => L10n::t('Confirm'),
+                       '$welcome' => DI::l10n()->t('Welcome home %s.', $a->user['username']),
+                       '$please' => DI::l10n()->t('Please confirm your introduction/connection request to %s.', $dfrn_url),
+                       '$submit' => DI::l10n()->t('Confirm'),
                        '$uid' => $_SESSION['uid'],
                        '$nickname' => $a->user['nickname'],
                        'dfrn_rawurl' => $_GET['dfrn_url']
@@ -559,8 +558,8 @@ function dfrn_request_content(App $a)
                                                'to_name'      => $r[0]['username'],
                                                'to_email'     => $r[0]['email'],
                                                'uid'          => $r[0]['uid'],
-                                               'link'         => System::baseUrl() . '/notifications/intros',
-                                               'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : L10n::t('[Name Withheld]')),
+                                               'link'         => DI::baseUrl() . '/notifications/intros',
+                                               'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : DI::l10n()->t('[Name Withheld]')),
                                                'source_link'  => $r[0]['url'],
                                                'source_photo' => $r[0]['photo'],
                                                'verb'         => Activity::REQ_FRIEND,
@@ -595,9 +594,9 @@ function dfrn_request_content(App $a)
                exit();
        } else {
                // Normal web request. Display our user's introduction form.
-               if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
-                       if (!Config::get('system', 'local_block')) {
-                               notice(L10n::t('Public access denied.') . EOL);
+               if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+                       if (!DI::config()->get('system', 'local_block')) {
+                               notice(DI::l10n()->t('Public access denied.') . EOL);
                                return;
                        }
                }
@@ -611,16 +610,16 @@ function dfrn_request_content(App $a)
                        $myaddr = $_GET['address'];
                } elseif (local_user()) {
                        if (strlen(DI::baseUrl()->getUrlPath())) {
-                               $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
+                               $myaddr = DI::baseUrl() . '/profile/' . $a->user['nickname'];
                        } else {
-                               $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+                               $myaddr = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
                        }
                } else {
                        // last, try a zrl
                        $myaddr = Profile::getMyURL();
                }
 
-               $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+               $target_addr = $a->profile['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 
                /* The auto_request form only has the profile address
                 * because nobody is going to read the comments and
@@ -632,25 +631,25 @@ function dfrn_request_content(App $a)
                        $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
                }
 
-               $page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:");
+               $page_desc = DI::l10n()->t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
-               $invite_desc = L10n::t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.', get_server() . '/servers');
+               $invite_desc = DI::l10n()->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.', Search::getGlobalDirectory() . '/servers');
 
                $o = Renderer::replaceMacros($tpl, [
-                       '$header' => L10n::t('Friend/Connection Request'),
-                       '$desc' => L10n::t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
-                       '$pls_answer' => L10n::t('Please answer the following:'),
-                       '$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $a->profile['name']), false, '', [L10n::t('No'), L10n::t('Yes')]],
-                       '$add_note' => L10n::t('Add a personal note:'),
+                       '$header' => DI::l10n()->t('Friend/Connection Request'),
+                       '$desc' => DI::l10n()->t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
+                       '$pls_answer' => DI::l10n()->t('Please answer the following:'),
+                       '$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $a->profile['name']), false, '', [DI::l10n()->t('No'), DI::l10n()->t('Yes')]],
+                       '$add_note' => DI::l10n()->t('Add a personal note:'),
                        '$page_desc' => $page_desc,
-                       '$friendica' => L10n::t('Friendica'),
-                       '$statusnet' => L10n::t("GNU Social \x28Pleroma, Mastodon\x29"),
-                       '$diaspora' => L10n::t("Diaspora \x28Socialhome, Hubzilla\x29"),
-                       '$diasnote' => L10n::t(' - please do not use this form.  Instead, enter %s into your Diaspora search bar.', $target_addr),
-                       '$your_address' => L10n::t('Your Identity Address:'),
+                       '$friendica' => DI::l10n()->t('Friendica'),
+                       '$statusnet' => DI::l10n()->t("GNU Social \x28Pleroma, Mastodon\x29"),
+                       '$diaspora' => DI::l10n()->t("Diaspora \x28Socialhome, Hubzilla\x29"),
+                       '$diasnote' => DI::l10n()->t(' - please do not use this form.  Instead, enter %s into your Diaspora search bar.', $target_addr),
+                       '$your_address' => DI::l10n()->t('Your Identity Address:'),
                        '$invite_desc' => $invite_desc,
-                       '$submit' => L10n::t('Submit Request'),
-                       '$cancel' => L10n::t('Cancel'),
+                       '$submit' => DI::l10n()->t('Submit Request'),
+                       '$cancel' => DI::l10n()->t('Cancel'),
                        '$nickname' => $a->argv[1],
                        '$name' => $a->profile['name'],
                        '$myaddr' => $myaddr