holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some scrutinizer "bugs"

Browse Source
This commit is contained in:
Ralf Becker 2016-06-26 19:00:41 +02:00
parent 6e557f02f8
commit b47dd39072
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/Auth.php
View File

@ -504,7 +504,7 @@ class Auth
* Create a password for storage in the accounts table * Create a password for storage in the accounts table
* *
* @param string $password * @param string $password
* @param string $type =null default $GLOBALS['egw_info']['server']['sql_encryption_type'] * @param string $type =null default $GLOBALS['egw_info']['server']['sql_encryption_type'], if valid otherwise blowfish_crypt
* @return string hash * @return string hash
*/ */
static function encrypt_sql($password, $type=null) static function encrypt_sql($password, $type=null)
@ -527,9 +527,12 @@ class Auth
$e_password = md5($password); $e_password = md5($password);
break; break;
default:
$type = 'blowfisch_crypt';
// fall throught
// all other types are identical to ldap, so no need to doublicate the code here // all other types are identical to ldap, so no need to doublicate the code here
case 'des': case 'des':
case 'blowish_crypt': // was for some time a typo in setup
case 'crypt': case 'crypt':
case 'sha256_crypt': case 'sha256_crypt':
case 'sha512_crypt': case 'sha512_crypt':
@ -541,11 +544,6 @@ class Auth
case 'ssha': case 'ssha':
$e_password = self::encrypt_ldap($password, $type); $e_password = self::encrypt_ldap($password, $type);
break; break;
default:
self::$error = 'no valid encryption available';
$e_password = false;
break;
} }
//error_log(__METHOD__."('$password') using '$type' returning ".array2string($e_password).(self::$error ? ' error='.self::$error : '')); //error_log(__METHOD__."('$password') using '$type' returning ".array2string($e_password).(self::$error ? ' error='.self::$error : ''));
return $e_password; return $e_password;