deindent calls

implement function in new class

diff --git a/mod/admin.php b/mod/admin.php
index 730d21984d0f7c90fd816f91b0f2bb6addd39a93..76f994502ba903a2c3882380e3676d0ecfc7c7d7 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1696,10 +1696,10 @@ function admin_page_users_post(App $a)
                }
 
                $user = $result['user'];
-               $preamble = deindent(L10n::t('
+               $preamble = Strings::deindent(L10n::t('
                        Dear %1$s,
                                the administrator of %2$s has set up an account for you.'));
-               $body = deindent(L10n::t('
+               $body = Strings::deindent(L10n::t('
                        The login details are as follows:
 
                        Site Location:  %1$s

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 8fcdd9aae694e3e044529fe8f100f969b1bf24aa..57f3d89b4222da07f0454be6073ee0f9970e39c0 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -45,7 +45,7 @@ function lostpass_post(App $a)
        $sitename = Config::get('config', 'sitename');
        $resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token;
 
-       $preamble = deindent(L10n::t('
+       $preamble = Strings::deindent(L10n::t('
                Dear %1$s,
                        A request was recently received at "%2$s" to reset your account
                password. In order to confirm this request, please select the verification link
@@ -56,7 +56,7 @@ function lostpass_post(App $a)
 
                Your password will not be changed unless we can verify that you
                issued this request.', $user['username'], $sitename));
-       $body = deindent(L10n::t('
+       $body = Strings::deindent(L10n::t('
                Follow this link soon to verify your identity:
 
                %1$s
@@ -151,13 +151,13 @@ function lostpass_generate_password($user)
                info("Your password has been reset." . EOL);
 
                $sitename = Config::get('config', 'sitename');
-               $preamble = deindent(L10n::t('
+               $preamble = Strings::deindent(L10n::t('
                        Dear %1$s,
                                Your password has been changed as requested. Please retain this
                        information for your records ' . "\x28" . 'or change your password immediately to
                        something that you will remember' . "\x29" . '.
                ', $user['username']));
-               $body = deindent(L10n::t('
+               $body = Strings::deindent(L10n::t('
                        Your login details are as follows:
 
                        Site Location:  %1$s

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 13968833576bdc4910dc8210fa6541f86a002354..252ea8ef31d5f190c534ed53cbffeec0fc075842 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -4,6 +4,7 @@ namespace Friendica\Core;
 
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
+use Friendica\Util\Strings;
 
 class Update
 {
@@ -209,7 +210,7 @@ class Update
                        $lang = (($admin['language'])?$admin['language']:'en');
                        L10n::pushLang($lang);
 
-                       $preamble = deindent(L10n::t("
+                       $preamble = Strings::deindent(L10n::t("
                                The friendica developers released update %s recently,
                                but when I tried to install it, something went terribly wrong.
                                This needs to be fixed soon and I can't do it alone. Please contact a
@@ -244,7 +245,7 @@ class Update
                                $lang = (($admin['language']) ? $admin['language'] : 'en');
                                L10n::pushLang($lang);
 
-                               $preamble = deindent(L10n::t("
+                               $preamble = Strings::deindent(L10n::t("
                                        The friendica database was successfully updated from %s to %s.",
                                        $from_build, $to_build));
 

diff --git a/src/Model/User.php b/src/Model/User.php
index 187708eb79bf794b1f8551047fc846d2dc840b01..cbf86244614a388aa5b1508bbd96190a97d1f445 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -693,7 +693,7 @@ class User
         */
        public static function sendRegisterPendingEmail($user, $sitename, $siteurl, $password)
        {
-               $body = deindent(L10n::t('
+               $body = Strings::deindent(L10n::t('
                        Dear %1$s,
                                Thank you for registering at %2$s. Your account is pending for approval by the administrator.
 
@@ -728,13 +728,13 @@ class User
         */
        public static function sendRegisterOpenEmail($user, $sitename, $siteurl, $password)
        {
-               $preamble = deindent(L10n::t('
+               $preamble = Strings::deindent(L10n::t('
                        Dear %1$s,
                                Thank you for registering at %2$s. Your account has been created.
                ',
                        $preamble, $user['username'], $sitename
                ));
-               $body = deindent(L10n::t('
+               $body = Strings::deindent(L10n::t('
                        The login details are as follows:
 
                        Site Location:  %3$s