Revision 2051
Added by darkviper almost 11 years ago
- account/preferences_form : language selection fixed
- account/forgot_form : password generation fixed
branches/2.8.x/CHANGELOG | ||
---|---|---|
11 | 11 |
! = Update/Change |
12 | 12 |
=============================================================================== |
13 | 13 |
|
14 |
29 Dec-2013 Build 2051 Manuela v.d.Decken(DarkViper) |
|
15 |
# account/preferences_form : language selection fixed |
|
16 |
# account/forgot_form : password generation fixed |
|
14 | 17 |
22 Dec-2013 Build 2050 Manuela v.d.Decken(DarkViper) |
15 | 18 |
# little Typofixes in admin/groups/languages/IT.php |
16 | 19 |
20 Dec-2013 Build 2049 Dietmar Woellbrink (Luisehahne) |
branches/2.8.x/wb/admin/interface/version.php | ||
---|---|---|
51 | 51 |
|
52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.4'); |
54 |
if(!defined('REVISION')) define('REVISION', '2050');
|
|
54 |
if(!defined('REVISION')) define('REVISION', '2051');
|
|
55 | 55 |
if(!defined('SP')) define('SP', ''); |
branches/2.8.x/wb/account/forgot_form.php | ||
---|---|---|
55 | 55 |
// Tell the user that their password cannot be reset more than once per hour |
56 | 56 |
$errMsg = $MESSAGE['FORGOT_PASS_ALREADY_RESET']; |
57 | 57 |
} else { |
58 |
require_once(WB_PATH.'/framework/PasswordHash.php'); |
|
59 |
$pwh = new PasswordHash(0, true); |
|
58 |
$pwh = Password::getInstance(); |
|
60 | 59 |
$old_pass = $results_array['password']; |
61 | 60 |
// Generate a random password then update the database with it |
62 |
$new_pass = $pwh->NewPassword();
|
|
61 |
$new_pass = $pwh->createNew();
|
|
63 | 62 |
$sql = 'UPDATE `'.TABLE_PREFIX.'users` '. |
64 |
'SET `password`=\''.$pwh->HashPassword($new_pass, true).'\', '.
|
|
63 |
'SET `password`=\''.md5($new_pass);
|
|
65 | 64 |
'`last_reset`='.time().' '. |
66 | 65 |
'WHERE `user_id`='.(int)$results_array['user_id']; |
67 | 66 |
unset($pwh); // destroy $pwh-Object |
branches/2.8.x/wb/account/preferences_form.php | ||
---|---|---|
40 | 40 |
$sql = 'SELECT `language` '; |
41 | 41 |
$sql .= 'FROM `'.TABLE_PREFIX.'users` '; |
42 | 42 |
$sql .= 'WHERE `user_id` = '.$wb->get_user_id(); |
43 |
if ($sUserLanguage = $database->get_one($sql)) {
|
|
43 |
if (($sUserLanguage = $database->get_one($sql))) {
|
|
44 | 44 |
$_SESSION['LANGUAGE'] = $sUserLanguage; |
45 | 45 |
} |
46 | 46 |
|
... | ... | |
49 | 49 |
$sLanguage = LANGUAGE.'.php'; |
50 | 50 |
|
51 | 51 |
$LanguageDir = WB_PATH .'/account/languages/'; |
52 |
$sLanguageFile = ( file_exists($LanguageDir.$sUserLanguage.'.php') ? $LanguageDir.$sUserLanguage.'.php' : $LanguageDir.$sLanguage);
|
|
52 |
$sLanguageFile = ( is_readable($LanguageDir.$sUserLanguage.'.php') ? $LanguageDir.$sUserLanguage.'.php' : $LanguageDir.$sLanguage);
|
|
53 | 53 |
$sLanguageFile = ( is_readable($sLanguageFile) ? $sLanguageFile : $LanguageDir.$sDefaultLanguage.'.php' ); |
54 | 54 |
// load module default language file (EN) |
55 |
require($sLanguageFile);
|
|
55 |
if (is_readable($sLanguageFile)) { require_once($sLanguageFile); }
|
|
56 | 56 |
|
57 | 57 |
if(!function_exists('utf8_check')) { require(WB_PATH.'/framework/functions-utf8.php'); } |
58 | 58 |
|
Also available in: Unified diff