Merge pull request #780 from NasserNgandu/Error_message_at_the_beginn…

…ing_or_at_the_end [NEW] Error message if there is a space at the beginning or end of username or password(login, nux, smtp, imap)
cypht-org · Jul 9, 2024 · 9bbe27d · 9bbe27d
2 parents 91decf8 + c5a565f
commit 9bbe27d
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 16 deletions.
diff --git a/language/az.php b/language/az.php
@@ -630,4 +630,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/de.php b/language/de.php
@@ -627,4 +627,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/en.php b/language/en.php
@@ -645,4 +645,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/es.php b/language/es.php
@@ -627,4 +627,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/et.php b/language/et.php
@@ -635,4 +635,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/fa.php b/language/fa.php
@@ -679,4 +679,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/fr.php b/language/fr.php
@@ -626,4 +626,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/hu.php b/language/hu.php
@@ -627,4 +627,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/id.php b/language/id.php
@@ -634,4 +634,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/it.php b/language/it.php
@@ -627,4 +627,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/ja.php b/language/ja.php
@@ -627,4 +627,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/nl.php b/language/nl.php
@@ -627,4 +627,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/pt-BR.php b/language/pt-BR.php
@@ -626,4 +626,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/ro.php b/language/ro.php
@@ -626,4 +626,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/ru.php b/language/ru.php
@@ -628,4 +628,5 @@
     'IMAP and JMAP Servers' => false,
     'Junk' => false,
     'Trash' => false,
+    'Pasted text has leading or trailing spaces' => false,
 );
diff --git a/language/zh-Hans.php b/language/zh-Hans.php
@@ -648,4 +648,5 @@
     'IMAP and JMAP Servers' => 'IMAP 服务器及 JMAP 服务器',
     'Junk' => '垃圾',
     'Trash' => '已删除',
+    'Pasted text has leading or trailing spaces' => false,
 ); 
diff --git a/modules/carddav_contacts/modules.php b/modules/carddav_contacts/modules.php
@@ -269,7 +269,7 @@ protected function output() {
             }
             $res .= '<tr class="carddav_settings"><td>'.$this->html_safe($name).'</td><td>';
             $res .= '<input autocomplete="username" type="text" value="'.$user.'" name="carddav_usernames['.$this->html_safe($name).']" ';
-            $res .= 'placeholder="'.$this->trans('Username').'" class="form-control" /> <input type="password" class="form-control"';
+            $res .= 'placeholder="'.$this->trans('Username').'" class="form-control warn_on_paste" /> <input type="password" class="form-control warn_on_paste"';
             if ($pass) {
                 $res .= 'disabled="disabled" placeholder="'.$this->trans('Password saved').'" ';
                 $res .= 'name="carddav_passwords['.$this->html_safe($name).']" /> <input type="button" ';

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
@@ -288,7 +288,7 @@ protected function output() {
                         <p class="text-wrap">'.$this->trans('Unsaved changes will be lost! Re-enter your password to save and exit.').' <a href="'.WEB_ROOT.'?page=save">'.$this->trans('More info').'</a></p>
                         <input type="text" value="'.$this->html_safe($this->get('username', 'cypht_user')).'" autocomplete="username" style="display: none;"/>
                         <div class="my-3 form-floating">
-                            <input id="logout_password" autocomplete="current-password" name="password" class="form-control" type="password" placeholder="'.$this->trans('Password').'">
+                            <input id="logout_password" autocomplete="current-password" name="password" class="form-control warn_on_paste" type="password" placeholder="'.$this->trans('Password').'">
                             <label for="logout_password" class="form-label screen-reader">'.$this->trans('Password').'</label>
                         </div>
                     </div>
@@ -1474,7 +1474,7 @@ protected function output() {
             '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />'.
             '<input type="text" value="'.$this->html_safe($this->get('username', 'cypht_user')).'" autocomplete="username" style="display: none;"/>'.
             '<label class="screen_reader" for="password">Password</label><input required id="password" '.
-            'name="password" autocomplete="current-password" class="save_settings_password form-control mb-2" type="password" placeholder="'.$this->trans('Password').'" />'.
+            'name="password" autocomplete="current-password" class="save_settings_password form-control mb-2 warn_on_paste" type="password" placeholder="'.$this->trans('Password').'" />'.
             '<input class="save_settings btn btn-primary me-2" type="submit" name="save_settings_permanently" value="'.$this->trans('Save').'" />'.
             '<input class="save_settings btn btn-outline-secondary me-2" type="submit" name="save_settings_permanently_then_logout" value="'.$this->trans('Save and Logout').'" />'.
             '</form><form method="post"><input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />'.
@@ -2159,12 +2159,12 @@ protected function output() {
                                             <span id="srv_setup_stepper_profile_name-error" class="invalid-feedback"></span>
                                         </div>
                                         <div class="form-floating mb-3">
-                                            <input required type="text" id="srv_setup_stepper_email" name="srv_setup_stepper_email" class="txt_fld form-control" value="" placeholder="'.$this->trans('Email or Username').'">
+                                            <input required type="text" id="srv_setup_stepper_email" name="srv_setup_stepper_email" class="txt_fld form-control warn_on_paste" value="" placeholder="'.$this->trans('Email or Username').'">
                                             <label class="" for="srv_setup_stepper_email">'.$this->trans('Email or Username').'</label>
                                             <span id="srv_setup_stepper_email-error" class="invalid-feedback"></span>
                                         </div>
                                         <div class="form-floating mb-3">
-                                            <input required type="password" id="srv_setup_stepper_password" name="srv_setup_stepper_password" class="txt_fld form-control" value="" placeholder="'.$this->trans('Password').'">
+                                            <input required type="password" id="srv_setup_stepper_password" name="srv_setup_stepper_password" class="txt_fld form-control warn_on_paste" value="" placeholder="'.$this->trans('Password').'">
                                             <label class="" for="srv_setup_stepper_password">'.$this->trans('Password').'</label>
                                             <span id="srv_setup_stepper_password-error" class="invalid-feedback"></span>
                                         </div>

diff --git a/modules/core/site.js b/modules/core/site.js
@@ -1943,6 +1943,10 @@ var imap_smtp_edit_action = function(event) {
     }
 };
 
+var hasLeadingOrTrailingSpaces = function(str) {
+    return str !== str.trim();
+};
+
 /* create a default message list object */
 var Hm_Message_List = new Message_List();
 
@@ -2022,6 +2026,13 @@ $(function() {
         $('form:not(.search_terms)').areYouSure();
     }
 
+    $(document).on('paste', '.warn_on_paste', function (e) {
+        const paste = (e.clipboardData || window.clipboardData).getData('text');
+        if (hasLeadingOrTrailingSpaces(paste)) {
+            Hm_Utils.add_sys_message(hm_trans('Pasted text has leading or trailing spaces'), 'danger');
+        }
+    });
+
     fixLtrInRtl()
 });
 

diff --git a/modules/dynamic_login/modules.php b/modules/dynamic_login/modules.php
@@ -122,7 +122,7 @@ protected function output() {
                 $this->trans('Unsaved changes will be lost! Re-enter your password to save and exit.').' &nbsp;'.
                 '<a href="?page=save">'.$this->trans('More info').'</a></div>'.
                 '<label class="screen_reader" for="logout_password">'.$this->trans('Password').'</label>'.
-                '<input id="logout_password" name="password" class="save_settings_password" type="password" placeholder="'.$this->trans('Password').'" />'.
+                '<input id="logout_password" name="password" class="save_settings_password warn_on_paste" type="password" placeholder="'.$this->trans('Password').'" />'.
                 '<input class="save_settings" type="submit" name="save_and_logout" value="'.$this->trans('Save and Logout').'" />'.
                 '<input class="save_settings" id="logout_without_saving" type="submit" name="logout" value="'.$this->trans('Just Logout').'" />'.
                 '<input class="cancel_logout save_settings" type="button" value="'.$this->trans('Cancel').'" />'.

diff --git a/modules/nasa/modules.php b/modules/nasa/modules.php
@@ -141,7 +141,7 @@ protected function output() {
             $res .= 'style="display: none;"';
         }
         $res .= '><div>Connect to NASA APIs</div>';
-        $res .= '<div class="col-lg-4 col-sm-12"><input type="text" size="50" class="nasa_api_key form-control" placeholder="'.$this->trans('Enter your API key').'" /><br/>';
+        $res .= '<div class="col-lg-4 col-sm-12"><input type="text" size="50" class="nasa_api_key form-control warn_on_paste" placeholder="'.$this->trans('Enter your API key').'" /><br/>';
         $res .= '<input type="button" class="nasa_api_connect btn btn-secondary" value="'.$this->trans('Connect').'" /></div></div>';
         $res .= '<div class="nasa_connect_inner_2" ';
         if (!$this->get('nasa_api_key')) {

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
@@ -474,12 +474,12 @@ function credentials_form($details, $mod) {
         $res .= '<div class="row"><div class="col col-lg-4">';
         // E-mail Address Field
         $res .= '<div class="form-floating mb-3 mt-3">';
-        $res .= '<input type="email" class="form-control" id="nux_email" name="nux_email" placeholder="'.$mod->trans('E-mail Address').'" value="'.$mod->html_safe($details['email']).'">';
+        $res .= '<input type="email" class="form-control warn_on_paste" id="nux_email" name="nux_email" placeholder="'.$mod->trans('E-mail Address').'" value="'.$mod->html_safe($details['email']).'">';
         $res .= '<label for="nux_email">'.$mod->trans('E-mail Address').'</label></div>';
 
         // E-mail Password Field
         $res .= '<div class="form-floating mb-3">';
-        $res .= '<input type="password" class="form-control nux_password" id="nux_password" name="nux_password" placeholder="'.$mod->trans('E-Mail Password').'">';
+        $res .= '<input type="password" class="form-control nux_password warn_on_paste" id="nux_password" name="nux_password" placeholder="'.$mod->trans('E-Mail Password').'">';
         $res .= '<label for="nux_password">'.$mod->trans('E-mail Password').'</label></div>';
 
         // Connect Button

diff --git a/modules/pgp/modules.php b/modules/pgp/modules.php
@@ -149,7 +149,7 @@ protected function output() {
         $res .= '<div class="mb-2"><input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
         $res .= '<label class="form-label" for="public_email">For</label>';
         $res .= '<input required id="public_email" name="public_key_email" placeholder="'.$this->trans('E-mail Address');
-        $res .= '" type="email" class="form-control"></div> <input type="submit" value="'.$this->trans('Import').'" class="btn btn-primary">';
+        $res .= '" type="email" class="form-control warn_on_paste"></div> <input type="submit" value="'.$this->trans('Import').'" class="btn btn-primary">';
         $res .= '</form>';
         $res .= '<table class="pgp_keys table mt-3"><thead><tr><th>'.$this->trans('Fingerprint').'</th>';
         $res .= '<th>'.$this->trans('E-mail').'</th><th></th></tr>';