From 06956572ec2d30f190c92aac22ee8c8c24c75071 Mon Sep 17 00:00:00 2001
From: Zbigniew Szmyd <zbigniew.szmyd@linseco.pl>
Date: Mon, 10 Oct 2016 11:27:41 +0200
Subject: [PATCH] Change parameters names to the standard.

---
 plugins/password/config.inc.php.dist      | 12 ++++++------
 plugins/password/drivers/ldap_ppolicy.php | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index 9ab30160a..832c6eca3 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -279,23 +279,23 @@ $config['password_ldap_ppolicy_cmd'] = 'change_ldap_pass.pl';
 
 // LDAP URI
 // Example: 'ldap://ldap.example.com/ ldaps://ldap2.example.com:636/'
-$config['password_ldap_uri'] = 'ldap://localhost/ ;
+$config['password_ldap_ppolicy_uri'] = 'ldap://localhost/ ;
 
 // LDAP base name (root directory)
 // Exemple: 'dc=exemple,dc=com'
-$config['password_ldap_basedn'] = 'dc=example,dc=com';
+$config['password_ldap_ppolicy_basedn'] = 'dc=example,dc=com';
 
-$config['password_ldap_searchDN'] = 'cn=someuser,dc=example,dc=com';
+$config['password_ldap_ppolicy_searchDN'] = 'cn=someuser,dc=example,dc=com';
 
-$config['password_ldap_searchPW'] = 'secret';
+$config['password_ldap_ppolicy_searchPW'] = 'secret';
 
 // LDAP search filter
 // Example: '(uid=%login)'
 // Example: '(&(objectClass=posixAccount)(uid=%login))'
-$config['password_ldap_search_filter'] = '(uid=%login)';
+$config['password_ldap_ppolicy_search_filter'] = '(uid=%login)';
 
 // CA Certificate file if in URI is LDAPS connection
-$config['password_ldap_cafile'] = '/etc/ssl/cacert.crt';
+$config['password_ldap_ppolicy_cafile'] = '/etc/ssl/cacert.crt';
 
 
 
diff --git a/plugins/password/drivers/ldap_ppolicy.php b/plugins/password/drivers/ldap_ppolicy.php
index 79acc78cf..667be2f4f 100644
--- a/plugins/password/drivers/ldap_ppolicy.php
+++ b/plugins/password/drivers/ldap_ppolicy.php
@@ -21,12 +21,12 @@ class rcube_ldap_ppolicy_password
     	$this->debug = $rcmail->config->get('ldap_debug');
     	 
     	$cmd    = $rcmail->config->get('password_ldap_ppolicy_cmd');
-        $uri    = $rcmail->config->get('password_ldap_uri');
-    	$baseDN = $rcmail->config->get('password_ldap_basedn');
-        $filter = $rcmail->config->get('password_ldap_search_filter');
-        $bindDN = $rcmail->config->get('password_ldap_searchDN');
-        $bindPW = $rcmail->config->get('password_ldap_searchPW');
-        $cafile = $rcmail->config->get('password_ldap_cafile');
+        $uri    = $rcmail->config->get('password_ldap_ppolicy_uri');
+    	$baseDN = $rcmail->config->get('password_ldap_ppolicy_basedn');
+        $filter = $rcmail->config->get('password_ldap_ppolicy_search_filter');
+        $bindDN = $rcmail->config->get('password_ldap_ppolicy_searchDN');
+        $bindPW = $rcmail->config->get('password_ldap_ppolicy_searchPW');
+        $cafile = $rcmail->config->get('password_ldap_ppolicy_cafile');
 
         $log_dir = $rcmail->config->get('log_dir');
         
@@ -35,7 +35,7 @@ class rcube_ldap_ppolicy_password
         }
         
         // try to open specific log file for writing
-        $logfile = $log_dir.'/ldap_ppolicy.err';
+        $logfile = $log_dir.'/password_ldap_ppolicy.err';
         
         $descriptorspec = array(
         		0 => array("pipe", "r"),  // stdin is a pipe that the child will read from
@@ -93,7 +93,7 @@ class rcube_ldap_ppolicy_password
     private function _debug($str)
     {
     	if ($this->debug) {
-    		rcube::write_log('ldap_ppolicy', $str);
+    		rcube::write_log('password_ldap_ppolicy', $str);
     	}
     }