[evolvis-commits] r6770: rename genstr() into account_genstr() for better namespacing↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Wed Jun 30 13:29:33 CEST 2010
Author: mirabilos
Date: 2010-06-30 13:29:32 +0200 (Wed, 30 Jun 2010)
New Revision: 6770
Modified:
trunk/gforge_base/evolvisforge/gforge/common/include/account.php
trunk/gforge_base/evolvisforge/gforge/www/account/lostpw.php
Log:
rename genstr() into account_genstr() for better namespacing
Modified: trunk/gforge_base/evolvisforge/gforge/common/include/account.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/account.php 2010-06-30 11:29:30 UTC (rev 6769)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/account.php 2010-06-30 11:29:32 UTC (rev 6770)
@@ -120,7 +120,7 @@
}
/**
- * genstr() - Generate an encoded random string
+ * account_genstr() - Generate an encoded random string
*
* This is a local function used for account_gensalt()
*
@@ -128,7 +128,7 @@
* @returns The random string, bcrypt ASCIIfied, or false if an error occured
*
*/
-function genstr($n) {
+function account_genstr($n) {
$o = (int)(($n + 3) / 4);
$f = fopen("/dev/urandom", "rb");
@@ -164,19 +164,19 @@
return $plainpw;
case 'des':
$prefix = '';
- $salt = genstr(2);
+ $salt = account_genstr(2);
$postfix = '';
break;
case 'blowfish':
$prefix = '$2a$08$';
- $salt = genstr(22);
+ $salt = account_genstr(22);
$postfix = '';
$cmplensub = 1;
break;
case 'md5':
default:
$prefix = '$1$';
- $salt = genstr(8);
+ $salt = account_genstr(8);
$postfix = '$';
break;
}
Modified: trunk/gforge_base/evolvisforge/gforge/www/account/lostpw.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/account/lostpw.php 2010-06-30 11:29:30 UTC (rev 6769)
+++ trunk/gforge_base/evolvisforge/gforge/www/account/lostpw.php 2010-06-30 11:29:32 UTC (rev 6770)
@@ -46,7 +46,7 @@
// First, we need to create new confirm hash
- $confirm_hash = md5(genstr(12) . strval(time()) . strval(rand()));
+ $confirm_hash = md5(account_genstr(12) . strval(time()) . strval(rand()));
$u->setNewEmailAndHash($u->getEmail(), $confirm_hash);
if ($u->isError()) {
More information about the evolvis-commits
mailing list