1
0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-09 05:02:44 +03:00

CHANGELOG.TXT:

- updated with latest changes

functions.inc.php
- whitespace fixes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@561 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
Christian Boltz
2009-02-03 21:02:04 +00:00
parent e218b81af2
commit 48f3be29bf
2 changed files with 21 additions and 20 deletions

View File

@@ -256,7 +256,7 @@ function check_domain ($domain)
flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!");
}
}
return true;
}
@@ -1162,23 +1162,23 @@ function pacrypt ($pw, $pw_db="")
}
if ($CONF['encrypt'] == 'authlib') {
$flavor = $CONF['authlib_default_flavor'];
$salt = ' ';
if(ereg('^{.*}', $pw_db)) {
// we have a flavor in the db -> use it instead of default flavor
$result = split('{|}', $pw_db, 3);
$flavor = $result[1];
$salt = substr($result[2], 0, 2);
}
if(stripos($flavor, 'md5raw') === 0) {
$password = '{' . $flavor . '}' . md5($pw);
} else if(stripos($flavor, 'md5') === 0) {
$password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE));
} else if(stripos($flavor, 'crypt') === 0) {
$password = '{' . $flavor . '}' . crypt($pw, $salt);
}
}
$flavor = $CONF['authlib_default_flavor'];
$salt = ' ';
if(ereg('^{.*}', $pw_db)) {
// we have a flavor in the db -> use it instead of default flavor
$result = split('{|}', $pw_db, 3);
$flavor = $result[1];
$salt = substr($result[2], 0, 2);
}
if(stripos($flavor, 'md5raw') === 0) {
$password = '{' . $flavor . '}' . md5($pw);
} else if(stripos($flavor, 'md5') === 0) {
$password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE));
} else if(stripos($flavor, 'crypt') === 0) {
$password = '{' . $flavor . '}' . crypt($pw, $salt);
}
}
$password = escape_string ($password);