Revision 1566
Added by Dietmar over 12 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 | 13 |
=========================== add small Features 2.8.2 ========================== |
| 14 |
07 Jan-2012 Build 1566 Dietmar Woellbrink (Luisehahne) |
|
| 15 |
# fix class.login, when name and pass are both empty no longer call increase_attemps |
|
| 16 |
! some redirect updates in frontend account files |
|
| 14 | 17 |
06 Jan-2012 Build 1565 Dietmar Woellbrink (Luisehahne) |
| 15 | 18 |
! fixed:: detection of serverdefined charsets more different |
| 16 | 19 |
06 Jan-2012 Build 1564 Dietmar Woellbrink (Luisehahne) |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 52 | 52 |
|
| 53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.2');
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1565');
|
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1566');
|
|
| 56 | 56 |
if(!defined('SP')) define('SP', 'SP2');
|
| branches/2.8.x/wb/account/forgot.php | ||
|---|---|---|
| 1 |
<?php |
|
| 2 |
/** |
|
| 3 |
* |
|
| 4 |
* @category frontend |
|
| 5 |
* @package account |
|
| 6 |
* @author WebsiteBaker Project |
|
| 7 |
* @copyright 2004-2009, Ryan Djurovich |
|
| 8 |
* @copyright 2009-2011, Website Baker Org. e.V. |
|
| 9 |
* @link http://www.websitebaker2.org/ |
|
| 10 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 11 |
* @platform WebsiteBaker 2.8.x |
|
| 12 |
* @requirements PHP 5.2.2 and higher |
|
| 13 |
* @version $Id$ |
|
| 14 |
* @filesource $HeadURL$ |
|
| 15 |
* @lastmodified $Date$ |
|
| 16 |
* |
|
| 17 |
*/ |
|
| 18 |
|
|
| 19 |
require_once('../config.php');
|
|
| 20 |
|
|
| 21 |
// Required page details |
|
| 22 |
$page_id = 0; |
|
| 23 |
$page_description = ''; |
|
| 24 |
$page_keywords = ''; |
|
| 25 |
define('PAGE_ID', 0);
|
|
| 26 |
define('ROOT_PARENT', 0);
|
|
| 27 |
define('PARENT', 0);
|
|
| 28 |
define('LEVEL', 0);
|
|
| 29 |
define('PAGE_TITLE', $MENU['FORGOT']);
|
|
| 30 |
define('MENU_TITLE', $MENU['FORGOT']);
|
|
| 31 |
define('VISIBILITY', 'public');
|
|
| 32 |
|
|
| 33 |
if(!FRONTEND_LOGIN) {
|
|
| 34 |
if(INTRO_PAGE) {
|
|
| 35 |
header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
|
|
| 36 |
exit(0); |
|
| 37 |
} else {
|
|
| 38 |
header('Location: '.WB_URL.'/index.php');
|
|
| 39 |
exit(0); |
|
| 40 |
} |
|
| 41 |
} |
|
| 42 |
|
|
| 43 |
// Set the page content include file |
|
| 44 |
define('PAGE_CONTENT', WB_PATH.'/account/forgot_form.php');
|
|
| 45 |
|
|
| 46 |
// Set auto authentication to false |
|
| 47 |
$auto_auth = false; |
|
| 48 |
|
|
| 49 |
// Include the index (wrapper) file |
|
| 50 |
require(WB_PATH.'/index.php'); |
|
| 51 |
|
|
| 52 |
?> |
|
| 1 |
<?php |
|
| 2 |
/** |
|
| 3 |
* |
|
| 4 |
* @category frontend |
|
| 5 |
* @package account |
|
| 6 |
* @author WebsiteBaker Project |
|
| 7 |
* @copyright 2004-2009, Ryan Djurovich |
|
| 8 |
* @copyright 2009-2011, Website Baker Org. e.V. |
|
| 9 |
* @link http://www.websitebaker2.org/ |
|
| 10 |
* @license http://www.gnu.org/licenses/gpl.html |
|
| 11 |
* @platform WebsiteBaker 2.8.x |
|
| 12 |
* @requirements PHP 5.2.2 and higher |
|
| 13 |
* @version $Id$ |
|
| 14 |
* @filesource $HeadURL$ |
|
| 15 |
* @lastmodified $Date$ |
|
| 16 |
* |
|
| 17 |
*/ |
|
| 18 |
|
|
| 19 |
require_once('../config.php');
|
|
| 20 |
|
|
| 21 |
$page_id = (!empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0); |
|
| 22 |
|
|
| 23 |
// Required page details |
|
| 24 |
// $page_id = 0; |
|
| 25 |
$page_description = ''; |
|
| 26 |
$page_keywords = ''; |
|
| 27 |
define('PAGE_ID', $page_id);
|
|
| 28 |
define('ROOT_PARENT', 0);
|
|
| 29 |
define('PARENT', 0);
|
|
| 30 |
define('LEVEL', 0);
|
|
| 31 |
define('PAGE_TITLE', $MENU['FORGOT']);
|
|
| 32 |
define('MENU_TITLE', $MENU['FORGOT']);
|
|
| 33 |
define('VISIBILITY', 'public');
|
|
| 34 |
|
|
| 35 |
if(!FRONTEND_LOGIN) {
|
|
| 36 |
if(INTRO_PAGE) {
|
|
| 37 |
header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
|
|
| 38 |
exit(0); |
|
| 39 |
} else {
|
|
| 40 |
header('Location: '.WB_URL.'/index.php');
|
|
| 41 |
exit(0); |
|
| 42 |
} |
|
| 43 |
} |
|
| 44 |
|
|
| 45 |
// Set the page content include file |
|
| 46 |
define('PAGE_CONTENT', WB_PATH.'/account/forgot_form.php');
|
|
| 47 |
|
|
| 48 |
// Set auto authentication to false |
|
| 49 |
$auto_auth = false; |
|
| 50 |
|
|
| 51 |
// Include the index (wrapper) file |
|
| 52 |
require(WB_PATH.'/index.php'); |
|
| branches/2.8.x/wb/account/signup.php | ||
|---|---|---|
| 47 | 47 |
$load_language = false; |
| 48 | 48 |
} |
| 49 | 49 |
|
| 50 |
require_once(WB_PATH.'/framework/class.frontend.php'); |
|
| 51 |
$wb_inst = new wb(); |
|
| 52 | 50 |
$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0; |
| 53 | 51 |
|
| 54 | 52 |
// Required page details |
| branches/2.8.x/wb/account/login.php | ||
|---|---|---|
| 29 | 29 |
} |
| 30 | 30 |
} |
| 31 | 31 |
|
| 32 |
require_once(WB_PATH.'/framework/class.frontend.php'); |
|
| 33 |
$wb_inst = new wb(); |
|
| 34 | 32 |
$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0; |
| 35 | 33 |
|
| 36 | 34 |
// Required page details |
| branches/2.8.x/wb/account/forgot_form.php | ||
|---|---|---|
| 93 | 93 |
$message_color = '000000'; |
| 94 | 94 |
} |
| 95 | 95 |
|
| 96 |
$_SESSION['PAGE_LINK'] = get_page_link( $_SESSION['PAGE_ID'] ); |
|
| 97 |
$_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']); |
|
| 98 |
|
|
| 96 |
$page_id = (!empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0); |
|
| 97 |
$_SESSION['PAGE_LINK'] = get_page_link( $page_id ); |
|
| 98 |
$_SESSION['HTTP_REFERER'] = (($_SESSION['PAGE_LINK']!='') ? page_link($_SESSION['PAGE_LINK']) : WB_URL); |
|
| 99 |
|
|
| 99 | 100 |
?> |
| 100 | 101 |
<div style="margin: 1em auto;"> |
| 101 | 102 |
<button type="button" value="cancel" onClick="javascript: window.location = '<?php print $_SESSION['HTTP_REFERER'] ?>';"><?php print $TEXT['CANCEL'] ?></button> |
| branches/2.8.x/wb/account/signup2.php | ||
|---|---|---|
| 22 | 22 |
// require_once(WB_PATH.'/framework/class.wb.php'); |
| 23 | 23 |
$wb = new wb('Start', 'start', false, false);
|
| 24 | 24 |
|
| 25 |
$_SESSION['PAGE_LINK'] = get_page_link( $_SESSION['PAGE_ID'] ); |
|
| 26 |
$_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']); |
|
| 25 |
$page_id = (!empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0); |
|
| 26 |
$_SESSION['PAGE_LINK'] = get_page_link( $page_id ); |
|
| 27 |
$_SESSION['HTTP_REFERER'] = (($_SESSION['PAGE_LINK']!='') ? page_link($_SESSION['PAGE_LINK']) : WB_URL); |
|
| 27 | 28 |
|
| 28 |
// Create new database object |
|
| 29 |
// $database = new database(); |
|
| 30 |
|
|
| 31 | 29 |
// Get details entered |
| 32 | 30 |
$groups_id = FRONTEND_SIGNUP; |
| 33 | 31 |
$active = 1; |
| branches/2.8.x/wb/framework/class.login.php | ||
|---|---|---|
| 93 | 93 |
} |
| 94 | 94 |
} elseif($this->username == '' AND $this->password == '') {
|
| 95 | 95 |
$this->message = $MESSAGE['LOGIN']['BOTH_BLANK']; |
| 96 |
$this->increase_attemps();
|
|
| 96 |
$this->display_login();
|
|
| 97 | 97 |
} elseif($this->username == '') {
|
| 98 | 98 |
$this->message = $MESSAGE['LOGIN']['USERNAME_BLANK']; |
| 99 | 99 |
$this->increase_attemps(); |
Also available in: Unified diff
fix class.login, when name and pass are both empty, no longer call increase_attemps
some redirect updates in frontend account files