Merge pull request #8911 from MrPetovan/task/curl_DI

[friendica.git/.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index cb21a21..e93df39 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -110,7 +110,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(DI::l10n()->t("This introduction has already been accepted.") . EOL);
+                                               notice(DI::l10n()->t("This introduction has already been accepted."));
                                                return;
                                        } else {
                                                $contact_record = $r[0];
@@ -128,18 +128,18 @@ function dfrn_request_post(App $a)
                                        $parms = Probe::profile($dfrn_url);
 
                                        if (!count($parms)) {
-                                               notice(DI::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.'));
                                                return;
                                        } else {
                                                if (empty($parms['fn'])) {
-                                                       notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL);
+                                                       notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.'));
                                                }
                                                if (empty($parms['photo'])) {
-                                                       notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL);
+                                                       notice(DI::l10n()->t('Warning: profile location has no profile photo.'));
                                                }
                                                $invalid = Probe::validDfrn($parms);
                                                if ($invalid) {
-                                                       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);
+                                                       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));
                                                        return;
                                                }
                                        }
@@ -177,7 +177,7 @@ function dfrn_request_post(App $a)
                                }
 
                                if ($r) {
-                                       info(DI::l10n()->t("Introduction complete.") . EOL);
+                                       info(DI::l10n()->t("Introduction complete."));
                                }
 
                                $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
@@ -213,7 +213,7 @@ function dfrn_request_post(App $a)
                }
 
                // invalid/bogus request
-               notice(DI::l10n()->t('Unrecoverable protocol error.') . EOL);
+               notice(DI::l10n()->t('Unrecoverable protocol error.'));
                DI::baseUrl()->redirect();
                return; // NOTREACHED
        }
@@ -240,7 +240,7 @@ function dfrn_request_post(App $a)
         *
         */
        if (empty($a->profile['uid'])) {
-               notice(DI::l10n()->t('Profile unavailable.') . EOL);
+               notice(DI::l10n()->t('Profile unavailable.'));
                return;
        }
 
@@ -261,9 +261,9 @@ function dfrn_request_post(App $a)
                                intval($uid)
                        );
                        if (DBA::isResult($r) && count($r) > $maxreq) {
-                               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);
+                               notice(DI::l10n()->t('%s has received too many connection requests today.', $a->profile['name']));
+                               notice(DI::l10n()->t('Spam protection measures have been invoked.'));
+                               notice(DI::l10n()->t('Friends are advised to please try again in 24 hours.'));
                                return;
                        }
                }
@@ -287,7 +287,7 @@ function dfrn_request_post(App $a)
 
                $url = trim($_POST['dfrn_url']);
                if (!strlen($url)) {
-                       notice(DI::l10n()->t("Invalid locator") . EOL);
+                       notice(DI::l10n()->t("Invalid locator"));
                        return;
                }
 
@@ -323,10 +323,10 @@ function dfrn_request_post(App $a)
 
                        if (DBA::isResult($ret)) {
                                if (strlen($ret[0]['issued-id'])) {
-                                       notice(DI::l10n()->t('You have already introduced yourself here.') . EOL);
+                                       notice(DI::l10n()->t('You have already introduced yourself here.'));
                                        return;
                                } elseif ($ret[0]['rel'] == Contact::FRIEND) {
-                                       notice(DI::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']));
                                        return;
                                } else {
                                        $contact_record = $ret[0];
@@ -346,19 +346,19 @@ function dfrn_request_post(App $a)
                        } else {
                                $url = Network::isUrlValid($url);
                                if (!$url) {
-                                       notice(DI::l10n()->t('Invalid profile URL.') . EOL);
+                                       notice(DI::l10n()->t('Invalid profile URL.'));
                                        DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
                                if (!Network::isUrlAllowed($url)) {
-                                       notice(DI::l10n()->t('Disallowed profile URL.') . EOL);
+                                       notice(DI::l10n()->t('Disallowed profile URL.'));
                                        DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
 
                                if (Network::isUrlBlocked($url)) {
-                                       notice(DI::l10n()->t('Blocked domain') . EOL);
+                                       notice(DI::l10n()->t('Blocked domain'));
                                        DI::baseUrl()->redirect(DI::args()->getCommand());
                                        return; // NOTREACHED
                                }
@@ -366,18 +366,18 @@ function dfrn_request_post(App $a)
                                $parms = Probe::profile(($hcard) ? $hcard : $url);
 
                                if (!count($parms)) {
-                                       notice(DI::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.'));
                                        DI::baseUrl()->redirect(DI::args()->getCommand());
                                } else {
                                        if (empty($parms['fn'])) {
-                                               notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.') . EOL);
+                                               notice(DI::l10n()->t('Warning: profile location has no identifiable owner name.'));
                                        }
                                        if (empty($parms['photo'])) {
-                                               notice(DI::l10n()->t('Warning: profile location has no profile photo.') . EOL);
+                                               notice(DI::l10n()->t('Warning: profile location has no profile photo.'));
                                        }
                                        $invalid = Probe::validDfrn($parms);
                                        if ($invalid) {
-                                               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);
+                                               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));
 
                                                return;
                                        }
@@ -425,7 +425,7 @@ function dfrn_request_post(App $a)
                                }
                        }
                        if ($r === false) {
-                               notice(DI::l10n()->t('Failed to update contact record.') . EOL);
+                               notice(DI::l10n()->t('Failed to update contact record.'));
                                return;
                        }
 
@@ -445,7 +445,7 @@ 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(DI::l10n()->t('Your introduction has been sent.') . EOL);
+                               info(DI::l10n()->t('Your introduction has been sent.'));
                        }
 
                        // "Homecoming" - send the requestor back to their site to record the introduction.
@@ -477,7 +477,7 @@ function dfrn_request_post(App $a)
                        // NOTREACHED
                        // END $network != Protocol::PHANTOM
                } else {
-                       notice(DI::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."));
                        return;
                }
        } return;
@@ -493,7 +493,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(DI::l10n()->t("Please login to confirm introduction.") . EOL);
+                       info(DI::l10n()->t("Please login to confirm introduction."));
                        /* setup the return URL to come back to this page if they use openid */
                        return Login::form();
                }
@@ -501,7 +501,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(DI::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."));
                        return Login::form();
                }
 
@@ -603,7 +603,7 @@ function dfrn_request_content(App $a)
                // Normal web request. Display our user's introduction form.
                if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                        if (!DI::config()->get('system', 'local_block')) {
-                               notice(DI::l10n()->t('Public access denied.') . EOL);
+                               notice(DI::l10n()->t('Public access denied.'));
                                return;
                        }
                }