Merge branch 'master' of https://github.com/roundcube/roundcubemail

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index def07a175..548d327e1 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -85,7 +85,7 @@ class rcube_ldap_password
 
         // Crypt new samba password
         if ($smbpwattr && !($samba_pass = $this->hashPassword($passwd, 'samba'))) {
-	        return PASSWORD_CRYPT_ERROR;
+            return PASSWORD_CRYPT_ERROR;
         }
 
         // Writing new crypted password to LDAP
@@ -271,11 +271,11 @@ class rcube_ldap_password
 
         case 'samba':
             if (function_exists('hash')) {
-                $cryptedPassword = hash('md4', rcube_charset_convert($passwordClear, RCMAIL_CHARSET, 'UTF-16LE'));
+                $cryptedPassword = hash('md4', rcube_charset::convert($passwordClear, RCUBE_CHARSET, 'UTF-16LE'));
                 $cryptedPassword = strtoupper($cryptedPassword);
             } else {
-				/* Your PHP install does not have the hash() function */
-				return false;
+                /* Your PHP install does not have the hash() function */
+                return false;
             }
             break;