EOL removed

diff --git a/mod/api.php b/mod/api.php
index 47a809497ed03d636ee5e129b515fdcbaec555ad..474d57af4a84a738a0aa3b4f636136eaaba3554b 100644 (file)
--- a/mod/api.php
+++ b/mod/api.php
@@ -47,12 +47,12 @@ function oauth_get_client(OAuthRequest $request)
 function api_post(App $a)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
        if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 }
@@ -107,7 +107,7 @@ function api_content(App $a)
 
                if (!local_user()) {
                        /// @TODO We need login form to redirect to this page
-                       notice(DI::l10n()->t('Please login to continue.') . EOL);
+                       notice(DI::l10n()->t('Please login to continue.'));
                        return Login::form(DI::args()->getQueryString(), false, $request->get_parameters());
                }
                //FKOAuth1::loginUser(4);

diff --git a/mod/cal.php b/mod/cal.php
index 8db2237844017286c5a2f4f1eef0ff416d1d6ea9..0e8e8a2af3328d1b73db78ed18c579a2f1cafac1 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -134,7 +134,7 @@ function cal_content(App $a)
        $is_owner = local_user() == $a->profile['uid'];
 
        if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
-               notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL);
+               notice(DI::l10n()->t('Access to this profile has been restricted.'));
                return;
        }
 

diff --git a/mod/common.php b/mod/common.php
index 9231d090b8d35608b120e0c967d86ebd4bea1fd3..0ff523b3f77c0d0f38b8ba9d3ce5c960a597908e 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -40,7 +40,7 @@ function common_content(App $a)
        $zcid = 0;
 
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -103,7 +103,7 @@ function common_content(App $a)
        }
 
        if ($total < 1) {
-               notice(DI::l10n()->t('No contacts in common.') . EOL);
+               notice(DI::l10n()->t('No contacts in common.'));
                return $o;
        }
 

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 8b87bae5d3ad86b571dcd3f42298533dfb413df3..f8d2be44d6da35eb393204a719ea4253fd5248c6 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -76,13 +76,13 @@ function dfrn_confirm_post(App $a, $handsfree = null)
        if (empty($_POST['source_url'])) {
                $uid = ($handsfree['uid'] ?? 0) ?: local_user();
                if (!$uid) {
-                       notice(DI::l10n()->t('Permission denied.') . EOL);
+                       notice(DI::l10n()->t('Permission denied.'));
                        return;
                }
 
                $user = DBA::selectFirst('user', [], ['uid' => $uid]);
                if (!DBA::isResult($user)) {
-                       notice(DI::l10n()->t('Profile not found.') . EOL);
+                       notice(DI::l10n()->t('Profile not found.'));
                        return;
                }
 
@@ -137,8 +137,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                );
                if (!DBA::isResult($r)) {
                        Logger::log('Contact not found in DB.');
-                       notice(DI::l10n()->t('Contact not found.') . EOL);
-                       notice(DI::l10n()->t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL);
+                       notice(DI::l10n()->t('Contact not found.'));
+                       notice(DI::l10n()->t('This may occasionally happen if contact was requested by both persons and it has already been approved.'));
                        return;
                }
 
@@ -239,20 +239,20 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                        // We shouldn't proceed, because the xml parser might choke,
                        // and $status is going to be zero, which indicates success.
                        // We can hardly call this a success.
-                       notice(DI::l10n()->t('Response from remote site was not understood.') . EOL);
+                       notice(DI::l10n()->t('Response from remote site was not understood.'));
                        return;
                }
 
                if (strlen($leading_junk) && DI::config()->get('system', 'debugging')) {
                        // This might be more common. Mixed error text and some XML.
                        // If we're configured for debugging, show the text. Proceed in either case.
-                       notice(DI::l10n()->t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL);
+                       notice(DI::l10n()->t('Unexpected response from remote site: ') . $leading_junk);
                }
 
                if (stristr($res, "<status") === false) {
                        // wrong xml! stop here!
                        Logger::log('Unexpected response posting to ' . $dfrn_confirm);
-                       notice(DI::l10n()->t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
+                       notice(DI::l10n()->t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res));
                        return;
                }
 
@@ -261,7 +261,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                $message = XML::unescape($xml->message);   // human readable text of what may have gone wrong.
                switch ($status) {
                        case 0:
-                               info(DI::l10n()->t("Confirmation completed successfully.") . EOL);
+                               info(DI::l10n()->t("Confirmation completed successfully."));
                                break;
                        case 1:
                                // birthday paradox - generate new dfrn-id and fall through.
@@ -273,15 +273,15 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                );
 
                        case 2:
-                               notice(DI::l10n()->t("Temporary failure. Please wait and try again.") . EOL);
+                               notice(DI::l10n()->t("Temporary failure. Please wait and try again."));
                                break;
                        case 3:
-                               notice(DI::l10n()->t("Introduction failed or was revoked.") . EOL);
+                               notice(DI::l10n()->t("Introduction failed or was revoked."));
                                break;
                }
 
                if (strlen($message)) {
-                       notice(DI::l10n()->t('Remote site reported: ') . $message . EOL);
+                       notice(DI::l10n()->t('Remote site reported: ') . $message);
                }
 
                if (($status == 0) && $intro_id) {

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 8d50761db18c755134573a7b2b5b5721516d68c8..d19ae287c084ecc3cfd810b9f9773416ab281dd5 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -133,7 +133,7 @@ function dfrn_poll_init(App $a)
                                        Session::setVisitorsContacts();
 
                                        if (!$quiet) {
-                                               info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
+                                               info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']));
                                        }
 
                                        // Visitors get 1 day session.
@@ -536,7 +536,7 @@ function dfrn_poll_content(App $a)
                                        Session::setVisitorsContacts();
 
                                        if (!$quiet) {
-                                               info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
+                                               info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']));
                                        }
 
                                        // Visitors get 1 day session.

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index f8e4c90236a8f2332068c55688af2bfaa26cea21..eb323c24821ac41af751d57cdd29075a94ab4a17 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;
                        }
                }

diff --git a/mod/editpost.php b/mod/editpost.php
index 8bde0329331b1dd3f0e1f427a4b92b82c6561fc3..cfca7695e0dd397eaa9208d9ea5e1a4f99b67c46 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -35,14 +35,14 @@ function editpost_content(App $a)
        $o = '';
 
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
        if (!$post_id) {
-               notice(DI::l10n()->t('Item not found') . EOL);
+               notice(DI::l10n()->t('Item not found'));
                return;
        }
 
@@ -52,7 +52,7 @@ function editpost_content(App $a)
        $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
 
        if (!DBA::isResult($item)) {
-               notice(DI::l10n()->t('Item not found') . EOL);
+               notice(DI::l10n()->t('Item not found'));
                return;
        }
 

diff --git a/mod/events.php b/mod/events.php
index 0c16044b48ae1fef8fbafc6e048ca9fa6f099165..69f6b6f326853cf2923379c94d982ce50008d57d 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -132,7 +132,7 @@ function events_post(App $a)
        $onerror_path = 'events/' . $action . '?' . http_build_query($params, null, null, PHP_QUERY_RFC3986);
 
        if (strcmp($finish, $start) < 0 && !$nofinish) {
-               notice(DI::l10n()->t('Event can not end before it has started.') . EOL);
+               notice(DI::l10n()->t('Event can not end before it has started.'));
                if (intval($_REQUEST['preview'])) {
                        echo DI::l10n()->t('Event can not end before it has started.');
                        exit();
@@ -141,7 +141,7 @@ function events_post(App $a)
        }
 
        if (!$summary || ($start === DBA::NULL_DATETIME)) {
-               notice(DI::l10n()->t('Event title and start time are required.') . EOL);
+               notice(DI::l10n()->t('Event title and start time are required.'));
                if (intval($_REQUEST['preview'])) {
                        echo DI::l10n()->t('Event title and start time are required.');
                        exit();
@@ -225,7 +225,7 @@ function events_post(App $a)
 function events_content(App $a)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return Login::form();
        }
 
@@ -583,7 +583,7 @@ function events_content(App $a)
                }
 
                if (Item::exists(['id' => $ev[0]['itemid']])) {
-                       notice(DI::l10n()->t('Failed to remove event') . EOL);
+                       notice(DI::l10n()->t('Failed to remove event'));
                }
 
                DI::baseUrl()->redirect('events');

diff --git a/mod/item.php b/mod/item.php
index 57fb64e3dac8d3c4864407cb775bdad493a5a23a..7faec2e4e60065ed0610d3653110fc37d5765e65 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -888,7 +888,7 @@ function drop_item(int $id, string $return = '')
        $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
        if (!DBA::isResult($item)) {
-               notice(DI::l10n()->t('Item not found.') . EOL);
+               notice(DI::l10n()->t('Item not found.'));
                DI::baseUrl()->redirect('network');
        }
 

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 211477b0dbd252b12322e2521b7456592194e292..036a308df5cad1a2303730d3627b4457d11c3144 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -37,7 +37,7 @@ function lostpass_post(App $a)
        $condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame];
        $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'email', 'language'], $condition);
        if (!DBA::isResult($user)) {
-               notice(DI::l10n()->t('No valid account found.') . EOL);
+               notice(DI::l10n()->t('No valid account found.'));
                DI::baseUrl()->redirect();
        }
 
@@ -49,7 +49,7 @@ function lostpass_post(App $a)
        ];
        $result = DBA::update('user', $fields, ['uid' => $user['uid']]);
        if ($result) {
-               info(DI::l10n()->t('Password reset request issued. Check your email.') . EOL);
+               info(DI::l10n()->t('Password reset request issued. Check your email.'));
        }
 
        $sitename = DI::config()->get('config', 'sitename');
@@ -152,7 +152,7 @@ function lostpass_generate_password($user)
                        '$newpass' => $new_password,
                ]);
 
-               info("Your password has been reset." . EOL);
+               info("Your password has been reset.");
 
                $sitename = DI::config()->get('config', 'sitename');
                $preamble = Strings::deindent(DI::l10n()->t('

diff --git a/mod/match.php b/mod/match.php
index 747e0b2f0379f7211521b49b8707bcd1cb37ec31..b7a9d3a5672bbea35b6d9db1d5fec81dd7f3cf90 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -60,7 +60,7 @@ function match_content(App $a)
                return '';
        }
        if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) {
-               notice(DI::l10n()->t('No keywords to match. Please add keywords to your profile.') . EOL);
+               notice(DI::l10n()->t('No keywords to match. Please add keywords to your profile.'));
                return '';
        }
 
@@ -141,7 +141,7 @@ function match_content(App $a)
        }
 
        if (empty($entries)) {
-               info(DI::l10n()->t('No matches') . EOL);
+               info(DI::l10n()->t('No matches'));
        }
 
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');

diff --git a/mod/message.php b/mod/message.php
index 4404e6aff81f0650a1e549247cd6ed8e6af8e353..204b136f9bb93a5c4f92601bab5ad5e90e8ee29c 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -68,7 +68,7 @@ function message_init(App $a)
 function message_post(App $a)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -82,17 +82,17 @@ function message_post(App $a)
 
        switch ($ret) {
                case -1:
-                       notice(DI::l10n()->t('No recipient selected.') . EOL);
+                       notice(DI::l10n()->t('No recipient selected.'));
                        $norecip = true;
                        break;
                case -2:
-                       notice(DI::l10n()->t('Unable to locate contact information.') . EOL);
+                       notice(DI::l10n()->t('Unable to locate contact information.'));
                        break;
                case -3:
-                       notice(DI::l10n()->t('Message could not be sent.') . EOL);
+                       notice(DI::l10n()->t('Message could not be sent.'));
                        break;
                case -4:
-                       notice(DI::l10n()->t('Message collection failure.') . EOL);
+                       notice(DI::l10n()->t('Message collection failure.'));
                        break;
        }
 
@@ -111,7 +111,7 @@ function message_content(App $a)
        Nav::setSelected('messages');
 
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return Login::form();
        }
 
@@ -176,12 +176,12 @@ function message_content(App $a)
                if ($cmd === 'drop') {
                        $message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
                        if(!DBA::isResult($message)){
-                               notice(DI::l10n()->t('Conversation not found.') . EOL);
+                               notice(DI::l10n()->t('Conversation not found.'));
                                DI::baseUrl()->redirect('message');
                        }
 
                        if (!DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
-                               notice(DI::l10n()->t('Message was not deleted.') . EOL);
+                               notice(DI::l10n()->t('Message was not deleted.'));
                        }
 
                        $conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
@@ -199,7 +199,7 @@ function message_content(App $a)
                                $parent = $r[0]['parent-uri'];
 
                                if (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
-                                       notice(DI::l10n()->t('Conversation was not removed.') . EOL);
+                                       notice(DI::l10n()->t('Conversation was not removed.'));
                                }
                        }
                        DI::baseUrl()->redirect('message');
@@ -298,7 +298,7 @@ function message_content(App $a)
                $r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
 
                if (!DBA::isResult($r)) {
-                       notice(DI::l10n()->t('No messages.') . EOL);
+                       notice(DI::l10n()->t('No messages.'));
                        return $o;
                }
 
@@ -355,7 +355,7 @@ function message_content(App $a)
                }
 
                if (!DBA::isResult($messages)) {
-                       notice(DI::l10n()->t('Message not available.') . EOL);
+                       notice(DI::l10n()->t('Message not available.'));
                        return $o;
                }
 

diff --git a/mod/network.php b/mod/network.php
index 2afc90dbf1389822b8ba244442e3068e205bdb82..1aa8046db1dac105d954c8e0f5431e159d6dfb77 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -47,7 +47,7 @@ use Friendica\Util\Strings;
 function network_init(App $a)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -548,7 +548,7 @@ function networkThreadedView(App $a, $update, $parent)
                        if ($update) {
                                exit();
                        }
-                       notice(DI::l10n()->t('No such group') . EOL);
+                       notice(DI::l10n()->t('No such group'));
                        DI::baseUrl()->redirect('network/0');
                        // NOTREACHED
                }
@@ -598,7 +598,7 @@ function networkThreadedView(App $a, $update, $parent)
                                'id' => 'network',
                        ]) . $o;
                } else {
-                       notice(DI::l10n()->t('Invalid contact.') . EOL);
+                       notice(DI::l10n()->t('Invalid contact.'));
                        DI::baseUrl()->redirect('network');
                        // NOTREACHED
                }

diff --git a/mod/notes.php b/mod/notes.php
index 67f8fcab29f08b9bedd2acf7f0d73335c90a4805..f1cf6cfde566d413e339058599403a1cc0f30ec9 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -40,7 +40,7 @@ function notes_init(App $a)
 function notes_content(App $a, $update = false)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 751afcc7315a085408ec859fb6b5623d7bb1fdae..a1b378001f055973816b7c4888c42df65985ea49 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -28,7 +28,7 @@ use Friendica\Util\Network;
 function ostatus_subscribe_content(App $a)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect('ostatus_subscribe');
                // NOTREACHED
        }

diff --git a/mod/photos.php b/mod/photos.php
index 4118b806950869f1be93e4e9a0916d1b8c4a9aaa..e5ab6b8dcea416b4eafd282efe232298f817a747 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -175,14 +175,14 @@ function photos_post(App $a)
        }
 
        if (!$can_post) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                exit();
        }
 
        $owner_record = User::getOwnerDataById($page_owner_uid);
 
        if (!$owner_record) {
-               notice(DI::l10n()->t('Contact information unavailable') . EOL);
+               notice(DI::l10n()->t('Contact information unavailable'));
                Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
                exit();
        }
@@ -204,7 +204,7 @@ function photos_post(App $a)
                );
 
                if (!DBA::isResult($r)) {
-                       notice(DI::l10n()->t('Album not found.') . EOL);
+                       notice(DI::l10n()->t('Album not found.'));
                        DI::baseUrl()->redirect('photos/' . $a->data['user']['nickname'] . '/album');
                        return; // NOTREACHED
                }
@@ -296,7 +296,7 @@ function photos_post(App $a)
                                // Update the photo albums cache
                                Photo::clearAlbumCache($page_owner_uid);
                        } else {
-                               notice('Failed to delete the photo.');
+                               notice(DI::l10n()->t('Failed to delete the photo.'));
                                DI::baseUrl()->redirect('photos/' . $a->argv[1] . '/image/' . $a->argv[3]);
                        }
 
@@ -675,21 +675,21 @@ function photos_post(App $a)
        if ($error !== UPLOAD_ERR_OK) {
                switch ($error) {
                        case UPLOAD_ERR_INI_SIZE:
-                               notice(DI::l10n()->t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL);
+                               notice(DI::l10n()->t('Image exceeds size limit of %s', ini_get('upload_max_filesize')));
                                break;
                        case UPLOAD_ERR_FORM_SIZE:
-                               notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0)) . EOL);
+                               notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0)));
                                break;
                        case UPLOAD_ERR_PARTIAL:
-                               notice(DI::l10n()->t('Image upload didn\'t complete, please try again') . EOL);
+                               notice(DI::l10n()->t('Image upload didn\'t complete, please try again'));
                                break;
                        case UPLOAD_ERR_NO_FILE:
-                               notice(DI::l10n()->t('Image file is missing') . EOL);
+                               notice(DI::l10n()->t('Image file is missing'));
                                break;
                        case UPLOAD_ERR_NO_TMP_DIR:
                        case UPLOAD_ERR_CANT_WRITE:
                        case UPLOAD_ERR_EXTENSION:
-                               notice(DI::l10n()->t('Server can\'t accept new file upload at this time, please contact your administrator') . EOL);
+                               notice(DI::l10n()->t('Server can\'t accept new file upload at this time, please contact your administrator'));
                                break;
                }
                @unlink($src);
@@ -705,7 +705,7 @@ function photos_post(App $a)
        $maximagesize = DI::config()->get('system', 'maximagesize');
 
        if ($maximagesize && ($filesize > $maximagesize)) {
-               notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
+               notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
                @unlink($src);
                $foo = 0;
                Hook::callAll('photo_post_end', $foo);
@@ -713,7 +713,7 @@ function photos_post(App $a)
        }
 
        if (!$filesize) {
-               notice(DI::l10n()->t('Image file is empty.') . EOL);
+               notice(DI::l10n()->t('Image file is empty.'));
                @unlink($src);
                $foo = 0;
                Hook::callAll('photo_post_end', $foo);
@@ -728,7 +728,7 @@ function photos_post(App $a)
 
        if (!$image->isValid()) {
                Logger::log('mod/photos.php: photos_post(): unable to process image' , Logger::DEBUG);
-               notice(DI::l10n()->t('Unable to process image.') . EOL);
+               notice(DI::l10n()->t('Unable to process image.'));
                @unlink($src);
                $foo = 0;
                Hook::callAll('photo_post_end',$foo);
@@ -757,7 +757,7 @@ function photos_post(App $a)
 
        if (!$r) {
                Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
-               notice(DI::l10n()->t('Image upload failed.') . EOL);
+               notice(DI::l10n()->t('Image upload failed.'));
                return;
        }
 
@@ -840,12 +840,12 @@ function photos_content(App $a)
        // photos/name/image/xxxxx/drop
 
        if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
-               notice(DI::l10n()->t('Public access denied.') . EOL);
+               notice(DI::l10n()->t('Public access denied.'));
                return;
        }
 
        if (empty($a->data['user'])) {
-               notice(DI::l10n()->t('No photos selected') . EOL);
+               notice(DI::l10n()->t('No photos selected'));
                return;
        }
 
@@ -911,7 +911,7 @@ function photos_content(App $a)
        }
 
        if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
-               notice(DI::l10n()->t('Access to this item is restricted.') . EOL);
+               notice(DI::l10n()->t('Access to this item is restricted.'));
                return;
        }
 
@@ -1136,7 +1136,7 @@ function photos_content(App $a)
                        if (DBA::exists('photo', ['resource-id' => $datum, 'uid' => $owner_uid])) {
                                notice(DI::l10n()->t('Permission denied. Access to this item may be restricted.'));
                        } else {
-                               notice(DI::l10n()->t('Photo not available') . EOL);
+                               notice(DI::l10n()->t('Photo not available'));
                        }
                        return;
                }

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index 33e97499e570bd0a0242ea10e95a43e922b5f015..0d30fc298dea1c83be9183906b7a2aa23dc801e9 100644 (file)
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -28,7 +28,7 @@ use Friendica\Model\Contact;
 function repair_ostatus_content(App $a) {
 
        if (! local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect('ostatus_repair');
                // NOTREACHED
        }

diff --git a/mod/settings.php b/mod/settings.php
index 14db27e6f8a5d3f4ac4f133a277aff4b5ecae83c..d02375ed7c657ee5b30fad15b44039d9ed19ff86 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -63,7 +63,7 @@ function settings_post(App $a)
        }
 
        if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -198,7 +198,7 @@ function settings_post(App $a)
                                                unset($dcrpass);
                                                if (!$mbox) {
                                                        $failed = true;
-                                                       notice(DI::l10n()->t('Failed to connect with email account using the settings provided.') . EOL);
+                                                       notice(DI::l10n()->t('Failed to connect with email account using the settings provided.'));
                                                }
                                        }
                                }
@@ -420,10 +420,10 @@ function settings_post(App $a)
                $hidewall = 1;
                if (!$str_contact_allow && !$str_group_allow && !$str_contact_deny && !$str_group_deny) {
                        if ($def_gid) {
-                               info(DI::l10n()->t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
+                               info(DI::l10n()->t('Private forum has no privacy permissions. Using default privacy group.'));
                                $str_group_allow = '<' . $def_gid . '>';
                        } else {
-                               notice(DI::l10n()->t('Private forum has no privacy permissions and no default privacy group.') . EOL);
+                               notice(DI::l10n()->t('Private forum has no privacy permissions and no default privacy group.'));
                        }
                }
        }
@@ -440,7 +440,7 @@ function settings_post(App $a)
        }
 
        if (!DBA::update('user', $fields, ['uid' => local_user()])) {
-               notice(DI::l10n()->t('Settings were not updated.') . EOL);
+               notice(DI::l10n()->t('Settings were not updated.'));
        }
 
        // clear session language
@@ -485,12 +485,12 @@ function settings_content(App $a)
        Nav::setSelected('settings');
 
        if (!local_user()) {
-               //notice(DI::l10n()->t('Permission denied.') . EOL);
+               //notice(DI::l10n()->t('Permission denied.'));
                return Login::form();
        }
 
        if (!empty($_SESSION['submanage'])) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -718,7 +718,7 @@ function settings_content(App $a)
 
        $profile = DBA::selectFirst('profile', [], ['uid' => local_user()]);
        if (!DBA::isResult($profile)) {
-               notice(DI::l10n()->t('Unable to find your profile. Please contact your admin.') . EOL);
+               notice(DI::l10n()->t('Unable to find your profile. Please contact your admin.'));
                return;
        }
 

diff --git a/mod/suggest.php b/mod/suggest.php
index 9cd2fb1cd9b625fa015ff2a2bf2c44f5ab4e9267..66d22b001ef40d8501c57175deac6ca08fa22b68 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -51,7 +51,7 @@ function suggest_content(App $a)
        $o = '';
 
        if (! local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 

diff --git a/mod/uimport.php b/mod/uimport.php
index eb99a366f23968d08107561a867556d5c52a5011..8abff0cd997f521fc4559c63c995488a8bc630f9 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -29,7 +29,7 @@ use Friendica\DI;
 function uimport_post(App $a)
 {
        if ((DI::config()->get('config', 'register_policy') != \Friendica\Module\Register::OPEN) && !is_site_admin()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -42,7 +42,7 @@ function uimport_post(App $a)
 function uimport_content(App $a)
 {
        if ((DI::config()->get('config', 'register_policy') != \Friendica\Module\Register::OPEN) && !is_site_admin()) {
-               notice(DI::l10n()->t('User imports on closed servers can only be done by an administrator.') . EOL);
+               notice(DI::l10n()->t('User imports on closed servers can only be done by an administrator.'));
                return;
        }
 
@@ -51,7 +51,7 @@ function uimport_content(App $a)
                $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
                if ($r && $r[0]['total'] >= $max_dailies) {
                        Logger::log('max daily registrations exceeded.');
-                       notice(DI::l10n()->t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
+                       notice(DI::l10n()->t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.'));
                        return;
                }
        }

diff --git a/mod/videos.php b/mod/videos.php
index a3344a8b4300d2c04550489c35f07a286bb55a7c..3dd17179ae5e281813d3ce25657630493ada2d5a 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -126,7 +126,7 @@ function videos_content(App $a)
 
 
        if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
-               notice(DI::l10n()->t('Public access denied.') . EOL);
+               notice(DI::l10n()->t('Public access denied.'));
                return;
        }
 
@@ -179,7 +179,7 @@ function videos_content(App $a)
        }
 
        if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
-               notice(DI::l10n()->t('Access to this item is restricted.') . EOL);
+               notice(DI::l10n()->t('Access to this item is restricted.'));
                return;
        }
 

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index c02a06c37521900ae62439c1476eda61ee8008cb..8cb19ab1a09e4953e1a2653c667553358260fb23 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -106,7 +106,7 @@ function wall_attach_post(App $a) {
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {
-                       notice($msg . EOL);
+                       notice($msg);
                }
                @unlink($src);
                exit();

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 093d5db773d3325e372035d5eb78747703bc2d8d..c3ba323043aa5a55ca8b0cb1f0029e477b9c19da 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -99,7 +99,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                        echo json_encode(['error' => DI::l10n()->t('Permission denied.')]);
                        exit();
                }
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                exit();
        }
 
@@ -159,7 +159,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                        echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
                        exit();
                }
-               notice(DI::l10n()->t('Invalid request.').EOL);
+               notice(DI::l10n()->t('Invalid request.'));
                exit();
        }
 

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 82d87ca2905bf26f19baa45d4d8c3cfda32f0711..cbf53b45d62c39548040409fe465cf3a0a4278f8 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -32,7 +32,7 @@ function wallmessage_post(App $a) {
 
        $replyto = Profile::getMyURL();
        if (!$replyto) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -56,7 +56,7 @@ function wallmessage_post(App $a) {
        $user = $r[0];
 
        if (! intval($user['unkmail'])) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -73,16 +73,16 @@ function wallmessage_post(App $a) {
 
        switch ($ret) {
                case -1:
-                       notice(DI::l10n()->t('No recipient selected.') . EOL);
+                       notice(DI::l10n()->t('No recipient selected.'));
                        break;
                case -2:
-                       notice(DI::l10n()->t('Unable to check your home location.') . EOL);
+                       notice(DI::l10n()->t('Unable to check your home location.'));
                        break;
                case -3:
-                       notice(DI::l10n()->t('Message could not be sent.') . EOL);
+                       notice(DI::l10n()->t('Message could not be sent.'));
                        break;
                case -4:
-                       notice(DI::l10n()->t('Message collection failure.') . EOL);
+                       notice(DI::l10n()->t('Message collection failure.'));
                        break;
        }
 
@@ -93,14 +93,14 @@ function wallmessage_post(App $a) {
 function wallmessage_content(App $a) {
 
        if (!Profile::getMyURL()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
        $recipient = (($a->argc > 1) ? $a->argv[1] : '');
 
        if (!$recipient) {
-               notice(DI::l10n()->t('No recipient.') . EOL);
+               notice(DI::l10n()->t('No recipient.'));
                return;
        }
 
@@ -109,7 +109,7 @@ function wallmessage_content(App $a) {
        );
 
        if (! DBA::isResult($r)) {
-               notice(DI::l10n()->t('No recipient.') . EOL);
+               notice(DI::l10n()->t('No recipient.'));
                Logger::log('wallmessage: no recipient');
                return;
        }
@@ -117,7 +117,7 @@ function wallmessage_content(App $a) {
        $user = $r[0];
 
        if (!intval($user['unkmail'])) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 

diff --git a/src/App/Authentication.php b/src/App/Authentication.php
index a0ce5df650f7a365cb1267833a578628820300cb..e3d273747029b452226a9a017737706984af64f8 100644 (file)
--- a/src/App/Authentication.php
+++ b/src/App/Authentication.php
@@ -207,7 +207,7 @@ class Authentication
 
                // if it's an email address or doesn't resolve to a URL, fail.
                if ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) {
-                       notice($this->l10n->t('Login failed.') . EOL);
+                       notice($this->l10n->t('Login failed.'));
                        $this->baseUrl->redirect();
                }
 
@@ -270,7 +270,7 @@ class Authentication
                        }
                } catch (Exception $e) {
                        $this->logger->warning('authenticate: failed login attempt', ['action' => 'login', 'username' => Strings::escapeTags($username), 'ip' => $_SERVER['REMOTE_ADDR']]);
-                       notice($this->l10n->t('Login failed. Please check your credentials.' . EOL));
+                       notice($this->l10n->t('Login failed. Please check your credentials.'));
                        $this->baseUrl->redirect();
                }
 

diff --git a/src/Model/Group.php b/src/Model/Group.php
index b4dbb87d82f315cc1b77ead3f53eab96fba40248..5376b817fc6ccef33bd74089cdbfd028bcae148e 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -89,7 +89,7 @@ class Group
                                $group = DBA::selectFirst('group', ['deleted'], ['id' => $gid]);
                                if (DBA::isResult($group) && $group['deleted']) {
                                        DBA::update('group', ['deleted' => 0], ['id' => $gid]);
-                                       notice(DI::l10n()->t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL);
+                                       notice(DI::l10n()->t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.'));
                                }
                                return true;
                        }

diff --git a/src/Module/Admin/Blocklist/Server.php b/src/Module/Admin/Blocklist/Server.php
index eccb65598f09a1fbdb03abdadbe2d89894d2005c..b145d6d0198c72f7ea5a432266b1bed5a0a300c2 100644 (file)
--- a/src/Module/Admin/Blocklist/Server.php
+++ b/src/Module/Admin/Blocklist/Server.php
@@ -46,7 +46,7 @@ class Server extends BaseAdmin
                                'reason' => Strings::escapeTags(trim($_POST['newentry_reason']))
                        ];
                        DI::config()->set('system', 'blocklist', $blocklist);
-                       info(DI::l10n()->t('Server domain pattern added to blocklist.') . EOL);
+                       info(DI::l10n()->t('Server domain pattern added to blocklist.'));
                } else {
                        // Edit the entries from blocklist
                        $blocklist = [];

diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php
index dd7febcc59123555a1b619a53cfd66164c9416c5..950e258f8e4964b0709be20b66346fe54c3fca22 100644 (file)
--- a/src/Module/Admin/DBSync.php
+++ b/src/Module/Admin/DBSync.php
@@ -47,7 +47,7 @@ class DBSync extends BaseAdmin
                                if (intval($curr) == $update) {
                                        DI::config()->set('system', 'build', intval($curr) + 1);
                                }
-                               info(DI::l10n()->t('Update has been marked successful') . EOL);
+                               info(DI::l10n()->t('Update has been marked successful'));
                        }
                        DI::baseUrl()->redirect('admin/dbsync');
                }

diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php
index 0ad20f97c983ffc423ed3a9c9f16c90f0736e488..b907d39bda6e584e16e633038589d6be86ad317a 100644 (file)
--- a/src/Module/Admin/Item/Delete.php
+++ b/src/Module/Admin/Item/Delete.php
@@ -51,7 +51,7 @@ class Delete extends BaseAdmin
                        Item::markForDeletion(['guid' => $guid]);
                }
 
-               info(DI::l10n()->t('Item marked for deletion.') . EOL);
+               info(DI::l10n()->t('Item marked for deletion.'));
                DI::baseUrl()->redirect('admin/item/delete');
        }
 

diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index dca8c9c2e6bd716f9a93da8ed944778d15e2fa76..41a691b0b7e7c92d5185cb13d50bd1b99c08c0f1 100644 (file)
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -109,7 +109,7 @@ class Users extends BaseAdmin
                        $uid = $a->argv[3];
                        $user = User::getById($uid, ['username', 'blocked']);
                        if (!DBA::isResult($user)) {
-                               notice('User not found' . EOL);
+                               notice(DI::l10n()->t('User not found'));
                                DI::baseUrl()->redirect('admin/users');
                                return ''; // NOTREACHED
                        }

diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index 04c7d7b6acd03b43770395ee06357b4399e4e149..29a735121d2b57dadd169288749f0b99c1a69ce5 100644 (file)
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -44,7 +44,7 @@ class Apps extends BaseModule
                $apps = Nav::getAppMenu();
 
                if (count($apps) == 0) {
-                       notice(DI::l10n()->t('No installed applications.') . EOL);
+                       notice(DI::l10n()->t('No installed applications.'));
                }
 
                $tpl = Renderer::getMarkupTemplate('apps.tpl');

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index ee8ad3663da208b237075769cb48a6c61a9b31e0..096f69330217233fbd706ba558bb7f18a068ed04 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -112,7 +112,7 @@ class Contact extends BaseModule
                }
 
                if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false])) {
-                       notice(DI::l10n()->t('Could not access contact record.') . EOL);
+                       notice(DI::l10n()->t('Could not access contact record.'));
                        DI::baseUrl()->redirect('contact');
                        return; // NOTREACHED
                }
@@ -145,7 +145,7 @@ class Contact extends BaseModule
                );
 
                if (!DBA::isResult($r)) {
-                       notice(DI::l10n()->t('Failed to update contact record.') . EOL);
+                       notice(DI::l10n()->t('Failed to update contact record.'));
                }
 
                $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
@@ -364,7 +364,7 @@ class Contact extends BaseModule
                Nav::setSelected('contact');
 
                if (!local_user()) {
-                       notice(DI::l10n()->t('Permission denied.') . EOL);
+                       notice(DI::l10n()->t('Permission denied.'));
                        return Login::form();
                }
 
@@ -398,7 +398,7 @@ class Contact extends BaseModule
                                self::blockContact($contact_id);
 
                                $blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
-                               info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked')) . EOL);
+                               info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked')));
 
                                DI::baseUrl()->redirect('contact/' . $contact_id);
                                // NOTREACHED
@@ -408,7 +408,7 @@ class Contact extends BaseModule
                                self::ignoreContact($contact_id);
 
                                $ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
-                               info(($ignored ? DI::l10n()->t('Contact has been ignored') : DI::l10n()->t('Contact has been unignored')) . EOL);
+                               info(($ignored ? DI::l10n()->t('Contact has been ignored') : DI::l10n()->t('Contact has been unignored')));
 
                                DI::baseUrl()->redirect('contact/' . $contact_id);
                                // NOTREACHED
@@ -418,7 +418,7 @@ class Contact extends BaseModule
                                $r = self::archiveContact($contact_id, $orig_record);
                                if ($r) {
                                        $archived = (($orig_record['archive']) ? 0 : 1);
-                                       info((($archived) ? DI::l10n()->t('Contact has been archived') : DI::l10n()->t('Contact has been unarchived')) . EOL);
+                                       info((($archived) ? DI::l10n()->t('Contact has been archived') : DI::l10n()->t('Contact has been unarchived')));
                                }
 
                                DI::baseUrl()->redirect('contact/' . $contact_id);
@@ -459,7 +459,7 @@ class Contact extends BaseModule
                                }
 
                                self::dropContact($orig_record);
-                               info(DI::l10n()->t('Contact has been removed.') . EOL);
+                               info(DI::l10n()->t('Contact has been removed.'));
 
                                DI::baseUrl()->redirect('contact');
                                // NOTREACHED

diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php
index 8640808439ad32247b6811d83092745fa9817c6c..5fa86ab3789959dc63e0c36c2d1cca77adc48e92 100644 (file)
--- a/src/Module/Contact/Advanced.php
+++ b/src/Module/Contact/Advanced.php
@@ -91,7 +91,7 @@ class Advanced extends BaseModule
                }
 
                if (!$r) {
-                       notice(DI::l10n()->t('Contact update failed.') . EOL);
+                       notice(DI::l10n()->t('Contact update failed.'));
                }
 
                return;

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 491023145cdff4fb9a869b9a1f79e0e74b3cc739..507da6b94292ef97e22da1735462ff2cd3789d6c 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -75,7 +75,7 @@ class Directory extends BaseModule
                $profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
 
                if ($profiles['total'] === 0) {
-                       notice(DI::l10n()->t('No entries (some entries may be hidden).') . EOL);
+                       notice(DI::l10n()->t('No entries (some entries may be hidden).'));
                } else {
                        if (in_array('small', $app->argv)) {
                                $photo = 'thumb';

diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php
index 28c849a861abbf4a7c9e5e9353913cd9db259be9..f4e4c5ebf9725282ba45317ad37c02d4620f09f2 100644 (file)
--- a/src/Module/FollowConfirm.php
+++ b/src/Module/FollowConfirm.php
@@ -13,7 +13,7 @@ class FollowConfirm extends BaseModule
        {
                $uid = local_user();
                if (!$uid) {
-                       notice(DI::l10n()->t('Permission denied.') . EOL);
+                       notice(DI::l10n()->t('Permission denied.'));
                        return;
                }
 

diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index 98668bf71da02777e7d56aa93db8e29ca3cd8ffa..cb944a3fd3d1b723dcd4b869b6b51d93bba4f02b 100644 (file)
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -75,7 +75,7 @@ class Invite extends BaseModule
                        $recipient = trim($recipient);
 
                        if (!filter_var($recipient, FILTER_VALIDATE_EMAIL)) {
-                               notice(DI::l10n()->t('%s : Not a valid email address.', $recipient) . EOL);
+                               notice(DI::l10n()->t('%s : Not a valid email address.', $recipient));
                                continue;
                        }
 
@@ -111,15 +111,15 @@ class Invite extends BaseModule
                                $current_invites++;
                                DI::pConfig()->set(local_user(), 'system', 'sent_invites', $current_invites);
                                if ($current_invites > $max_invites) {
-                                       notice(DI::l10n()->t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
+                                       notice(DI::l10n()->t('Invitation limit exceeded. Please contact your site administrator.'));
                                        return;
                                }
                        } else {
-                               notice(DI::l10n()->t('%s : Message delivery failed.', $recipient) . EOL);
+                               notice(DI::l10n()->t('%s : Message delivery failed.', $recipient));
                        }
 
                }
-               notice(DI::l10n()->tt('%d message sent.', '%d messages sent.', $total) . EOL);
+               notice(DI::l10n()->tt('%d message sent.', '%d messages sent.', $total));
        }
 
        public static function content(array $parameters = [])

diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php
index 4b05b8c2cd5e9c29d8f0cc1f491fb3d689fcd8b1..cd59626e6810352e559edd688fe858e54aed8c55 100644 (file)
--- a/src/Module/Notifications/Introductions.php
+++ b/src/Module/Notifications/Introductions.php
@@ -191,7 +191,7 @@ class Introductions extends BaseNotifications
                }
 
                if (count($notifications['notifications']) == 0) {
-                       notice(DI::l10n()->t('No introductions.') . EOL);
+                       notice(DI::l10n()->t('No introductions.'));
                        $notificationNoContent = DI::l10n()->t('No more %s notifications.', $notifications['ident']);
                }
 

diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index dbf0cf8d846fd0ad259f1638feb938fee968768b..4cd97b4097e914ea3e8ca24099e6e0c249be8ccc 100644 (file)
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -64,7 +64,7 @@ class Contacts extends BaseProfile
                $o = self::getTabsHTML($a, 'contacts', $is_owner, $nickname);
 
                if (!count($a->profile) || $a->profile['hide-friends']) {
-                       notice(DI::l10n()->t('Permission denied.') . EOL);
+                       notice(DI::l10n()->t('Permission denied.'));
                        return $o;
                }
 
@@ -92,7 +92,7 @@ class Contacts extends BaseProfile
                $contacts_stmt = DBA::select('contact', [], $condition, $params);
 
                if (!DBA::isResult($contacts_stmt)) {
-                       notice(DI::l10n()->t('No contacts.') . EOL);
+                       notice(DI::l10n()->t('No contacts.'));
                        return $o;
                }
 

diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index 9ab15a4e36cb355bf877cf4c49fa83cdf8e47f4e..4b36cdd4de72213a2c73856e5342d1fe9f994db6 100644 (file)
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -102,7 +102,7 @@ class Status extends BaseProfile
                $last_updated_key = "profile:" . $a->profile['uid'] . ":" . local_user() . ":" . $remote_contact;
 
                if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
-                       notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL);
+                       notice(DI::l10n()->t('Access to this profile has been restricted.'));
                        return '';
                }