summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d49fb5f)
raw | patch | inline | side by side (parent: d49fb5f)
author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Mon, 3 Mar 2008 16:24:27 +0000 (16:24 +0000) | ||
committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Mon, 3 Mar 2008 16:24:27 +0000 (16:24 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9258 594d385d-05f5-0310-b6e9-bd551577e9d8
gosa-core/include/password-methods/class_password-methods-sha.inc | patch | blob | history | |
gosa-core/include/password-methods/class_password-methods-ssha.inc | patch | blob | history |
diff --git a/gosa-core/include/password-methods/class_password-methods-sha.inc b/gosa-core/include/password-methods/class_password-methods-sha.inc
index 3cd0ea656f4755f86e78ab18c001463df93926ab..7c5d80c120320da250e9fbf067b109f9f81a16e0 100644 (file)
}elseif (function_exists('mhash')) {
$hash = "{SHA}" . base64_encode(mHash(MHASH_SHA1, $password));
}else{
- msg_dialog::display(_("Configuration error"), sprintf(_("Cannot use %s encryption: no PHP functions for sha1/mhash available"), 'SHA'), ERROR_DIALOG);
+ msg_dialog::display(_("Configuration error"), msgPool::missingext("mhash"), ERROR_DIALOG);
return false;
}
diff --git a/gosa-core/include/password-methods/class_password-methods-ssha.inc b/gosa-core/include/password-methods/class_password-methods-ssha.inc
index 3851c62d2cb9959195c4271bede526bef8083977..e2d6e27d5e8dc8cbb7dd243f2c9c8714f4ddfde2 100644 (file)
$salt=mhash_keygen_s2k(MHASH_SHA1,$pwd, substr(pack("h*",md5(mt_rand())),0,8),4);
$pwd= "{SSHA}".base64_encode(mhash(MHASH_SHA1, $pwd.$salt).$salt);
} else {
- msg_dialog::display(_("Configuration error"), sprintf(_("Cannot use %s encryption: no PHP functions for sha1/mhash available"), 'SSHA'), ERROR_DIALOG);
+ msg_dialog::display(_("Configuration error"), msgPool::missingext("mhash"), ERROR_DIALOG);
return(false);
}
return $pwd;