From 0b36d151572e050b51d82e7429fee847ebb33e22 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 20 Nov 2014 06:03:22 -0500
Subject: [PATCH] Add method to display operation (uploading) progress in UI message

---
 plugins/password/config.inc.php.dist |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index 335ef7f..94c4368 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -35,6 +35,9 @@
 // for upgrading the stored passwords after the encryption scheme has changed.
 $config['password_force_save'] = false;
 
+// Enables forcing new users to change their password at their first login.
+$config['password_force_new_user'] = false;
+
 
 // SQL Driver options
 // ------------------
@@ -201,10 +204,11 @@
 
 // LDAP password hash type
 // Standard LDAP encryption type which must be one of: crypt,
-// ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, ad or clear.
+// ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, ad, cram-md5 (dovecot style) or clear.
 // Please note that most encodage types require external libraries
 // to be included in your PHP installation, see function hashPassword in drivers/ldap.php for more info.
-// Default: 'crypt'
+// Multiple password Values can be generated by concatenating encodings with a +. E.g. 'cram-md5+crypt'
+// Default: 'crypt'.
 $config['password_ldap_encodage'] = 'crypt';
 
 // LDAP password attribute
@@ -255,6 +259,9 @@
 
 // TCP port used for vpopmaild connections
 $config['password_vpopmaild_port'] = 89;
+
+// Timout used for the connection to vpopmaild (in seconds)
+$config['password_vpopmaild_timeout'] = 10;
 
 
 // cPanel Driver options
@@ -362,6 +369,11 @@
 // Location of smbpasswd binary
 $config['password_smb_cmd'] = '/usr/bin/smbpasswd';
 
+// gearman driver options
+// ---------------------
+// Gearman host (default: localhost)
+$config['password_gearman_host'] = 'localhost';
+
 
 
 // Plesk/PPA Driver options
@@ -378,7 +390,7 @@
 $config['password_plesk_pass'] = 'password';
 
 // Plesk RPC Port
-$config['password_plesk_rcp_port'] = 8443;
+$config['password_plesk_rpc_port'] = '8443';
 
 // Plesk RPC Path
-$config['password_plesk_rcp_path'] = enterprise/control/agent.php;
+$config['password_plesk_rpc_path'] = 'enterprise/control/agent.php';

--
Gitblit v1.9.1