From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/mailuser/form/mail_user_password.tform.php |   64 ++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/interface/web/mailuser/form/mail_user_password.tform.php b/interface/web/mailuser/form/mail_user_password.tform.php
index 65212b3..a11982e 100644
--- a/interface/web/mailuser/form/mail_user_password.tform.php
+++ b/interface/web/mailuser/form/mail_user_password.tform.php
@@ -33,16 +33,16 @@
 
 */
 
-$form["title"] 			= "mailbox_password_txt";
-$form["description"] 	= "";
-$form["name"] 			= "mail_user_password";
-$form["action"]			= "mail_user_password_edit.php";
-$form["db_table"]		= "mail_user";
-$form["db_table_idx"]	= "mailuser_id";
-$form["db_history"]		= "yes";
-$form["tab_default"]	= "mailuser";
-$form["list_default"]	= "index.php";
-$form["auth"]			= 'no'; // yes / no
+$form["title"]    = "mailbox_password_txt";
+$form["description"]            = "";
+$form["name"]    = "mail_user_password";
+$form["action"]   = "mail_user_password_edit.php";
+$form["db_table"]  = "mail_user";
+$form["db_table_idx"]           = "mailuser_id";
+$form["db_history"]  = "yes";
+$form["tab_default"]            = "mailuser";
+$form["list_default"]           = "index.php";
+$form["auth"]   = 'no'; // yes / no
 
 $form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
 $form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
@@ -51,27 +51,35 @@
 $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
 
 $form["tabs"]['mailuser'] = array (
-	'title' 	=> "password_txt",
-	'width' 	=> 100,
-	'template' 	=> "templates/mail_user_password_edit.htm",
-	'fields' 	=> array (
-	##################################
-	# Begin Datatable fields
-	##################################
+	'title'  => "password_txt",
+	'width'  => 100,
+	'template'  => "templates/mail_user_password_edit.htm",
+	'fields'  => array (
+		//#################################
+		// Begin Datatable fields
+		//#################################
 		'password' => array (
-			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'PASSWORD',
-			'encryption'=> 'CRYPT',
-			'default'	=> '',
-			'value'		=> '',
-			'width'		=> '30',
-			'maxlength'	=> '255'
+			'datatype' => 'VARCHAR',
+			'formtype' => 'PASSWORD',
+			'validators' => array(
+				0 => array(
+					'type' => 'CUSTOM',
+					'class' => 'validate_password',
+					'function' => 'password_check',
+					'errmsg' => 'weak_password_txt'
+				)
+			),
+			'encryption'    => 'CRYPT',
+			'default' => '',
+			'value'  => '',
+			'width'  => '30',
+			'maxlength' => '255'
 		),
-	##################################
-	# END Datatable fields
-	##################################
+		//#################################
+		// END Datatable fields
+		//#################################
 	)
 );
 
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1