From 76c0bd312d2db7f30dbf93552151dbee1abeb365 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 26 May 2015 08:22:14 -0400
Subject: [PATCH] - fixed FS#3907 - "Reset password" generates too short passwords
---
interface/web/admin/form/server_config.tform.php | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 838ade8..a03636a 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -182,7 +182,7 @@
'backup_dir_is_mount' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => 'n',
+ 'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'backup_mode' => array(
@@ -295,6 +295,12 @@
'width' => '40',
'maxlength' => '255'
),
+ 'maildir_format' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '20',
+ 'value' => array('maildir' => 'Maildir', 'mdbox' => 'mdbox')
+ ),
'homedir_path' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -321,7 +327,7 @@
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
'default' => '2048',
- 'value' => array('1024' => 'week (1024)', '2048' => 'normal (2048)', '4096' => 'strong (4096)')
+ 'value' => array('1024' => 'weak (1024)', '2048' => 'normal (2048)', '4096' => 'strong (4096)')
),
'relayhost_password' => array(
'datatype' => 'VARCHAR',
@@ -610,14 +616,12 @@
'width' => '40',
'maxlength' => '255'
),
- /*
-'vhost_rewrite_v6' => array (
-'datatype' => 'VARCHAR',
-'formtype' => 'CHECKBOX',
-'default' => 'n',
-'value' => array(0 => 'n',1 => 'y')
-),
-*/
+ 'vhost_rewrite_v6' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n',1 => 'y')
+ ),
'vhost_conf_dir' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -1030,7 +1034,7 @@
'enable_spdy' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => 'n',
+ 'default' => 'y',
'value' => array (
0 => 'n',
1 => 'y'
--
Gitblit v1.9.1