Merge remote-tracking branch 'origin/0.9.31'

2013-12-10 07:23:42 +01:00
parent 7bf4cc73b6 3e54fd765c
commit 7bf0299d33
11 changed files with 41 additions and 15 deletions
--- a/lib/functions/froxlor/function.generatePassword.php
+++ b/lib/functions/froxlor/function.generatePassword.php
@@ -19,5 +19,9 @@
 * Generates a random password
 */
 function generatePassword() {
-	return substr(md5(uniqid(microtime(), 1)), 24, 10);
+	global $settings;
+	return substr(
+		base64_encode(sha1(md5(uniqid(microtime(), 1))).md5(uniqid(microtime(), 1)).sha1(md5(uniqid(microtime(), 1)))),
+		rand(5, 50), ($settings['panel']['password_min_length'] > 0 ? $settings['panel']['password_min_length'] : 10)
+	);
 }