Improve feedback in mod/settings

diff --git a/mod/settings.php b/mod/settings.php
index fcbd8208d497b8486d731d02190ca41eb57f6979..1d1caa6f8ea0969097d3e38e35d93c42d8a818e9 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -252,6 +252,8 @@ function settings_post(App $a)
                                unlink($_FILES['importcontact-filename']['tmp_name']);
                        }
                }
+
+               return;
        }
 
        if (!empty($_POST['resend_relocate'])) {
@@ -363,17 +365,17 @@ function settings_post(App $a)
 
        if ($username != $a->user['username']) {
                if (strlen($username) > 40) {
-                       $err .= DI::l10n()->t(' Please use a shorter name.');
+                       $err .= DI::l10n()->t('Please use a shorter name.');
                }
                if (strlen($username) < 3) {
-                       $err .= DI::l10n()->t(' Name too short.');
+                       $err .= DI::l10n()->t('Name too short.');
                }
        }
 
        if ($email != $a->user['email']) {
                //  check for the correct password
                if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
-                       $err .= DI::l10n()->t('Wrong Password') . EOL;
+                       $err .= DI::l10n()->t('Wrong Password.');
                        $email = $a->user['email'];
                }
                //  check the email is valid
@@ -391,7 +393,7 @@ function settings_post(App $a)
        }
 
        if (strlen($err)) {
-               notice($err . EOL);
+               notice($err);
                return;
        }