From d7ababc9ebb9bcb03c56e39ba5a4e06c8348d3ff Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 26 May 2015 08:21:27 -0400
Subject: [PATCH] - fixed  FS#3907 - "Reset password" generates too short passwords

---
 interface/web/admin/templates/server_config_mail_edit.htm |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 0374931..9d66ba9 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -20,10 +20,6 @@
                 <input name="homedir_path" id="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255" type="text" class="textInput" />
             </div>
             <div class="ctrlHolder">
-                <label for="dkim_path">{tmpl_var name='dkim_path_txt'}</label>
-                <input name="dkim_path" id="dkim_path" value="{tmpl_var name='dkim_path'}" size="40" maxlength="255" type="text" class="textInput" />
-            </div>
-            <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='pop3_imap_daemon_txt'}</p>
                 <div class="multiField">
                     <select name="pop3_imap_daemon" id="pop3_imap_daemon" class="selectInput">
@@ -61,11 +57,11 @@
             </div>
             <div class="ctrlHolder">
                 <label for="relayhost_user">{tmpl_var name='relayhost_user_txt'}</label>
-                <input name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
+                <input name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255" type="text" autocomplete="off" class="textInput formLengthHalf" autocomplete="off" />
             </div>
             <div class="ctrlHolder">
                 <label for="relayhost_password">{tmpl_var name='relayhost_password_txt'}</label>
-                <input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="password" class="textInput formLengthHalf" />
+                <input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="password" autocomplete="off" class="textInput formLengthHalf" autocomplete="off" />
             </div>
             <div class="ctrlHolder">
                 <label for="mailbox_size_limit">{tmpl_var name='mailbox_size_limit_txt'}</label>
@@ -85,9 +81,27 @@
                 <label for="realtime_blackhole_list">{tmpl_var name='realtime_blackhole_list_txt'}</label>
                 <input name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='realtime_blackhole_list_note_txt'}
             </div>
+			<div class="ctrlHolder">
+                <p class="label">{tmpl_var name='overquota_notify_admin_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='overquota_notify_admin'}
+                </div>
+            </div>
             <div class="ctrlHolder">
-                <label for="sendmail_path">{tmpl_var name='sendmail_path_txt'}</label>
-                <input name="sendmail_path" id="sendmail_path" value="{tmpl_var name='sendmail_path'}" size="40" maxlength="255" type="text" class="textInput" />
+                <p class="label">{tmpl_var name='overquota_notify_client_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='overquota_notify_client'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
+                <input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='overquota_notify_freq_note_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='overquota_notify_onok_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='overquota_notify_onok'}
+                </div>
             </div>
         </fieldset>
             
@@ -99,4 +113,4 @@
         </div>
     </div>
     
-</div>
+</div>
\ No newline at end of file

--
Gitblit v1.9.1