Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1507) +++ branches/2.8.x/CHANGELOG (revision 1508) @@ -12,6 +12,8 @@ =============================== FEATURES FREEZE ================================ ----------------------------------- Fixes 2.8.2 -------------------------------- +07 Sep-2011 Build 1508 Dietmar Woellbrink (Luisehahne) +# fixed print_error exit in frontend account 06 Sep-2011 Build 1507 Dietmar Woellbrink (Luisehahne) # fixed field_remove 26 Aug-2011 Build 1506 Werner v.d.Decken(DarkViper) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1507) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1508) @@ -52,4 +52,4 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.2'); -if(!defined('REVISION')) define('REVISION', '1507'); +if(!defined('REVISION')) define('REVISION', '1508'); Index: branches/2.8.x/wb/account/login_form.php =================================================================== --- branches/2.8.x/wb/account/login_form.php (revision 1507) +++ branches/2.8.x/wb/account/login_form.php (revision 1508) @@ -21,7 +21,7 @@ $username_fieldname = 'username'; $password_fieldname = 'password'; - + if(defined('SMART_LOGIN') AND SMART_LOGIN == 'enabled') { // Generate username field name $username_fieldname = 'username_'; @@ -34,7 +34,16 @@ $password_fieldname .= $temp[$i]; } } + +$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0; +$_SESSION['PAGE_LINK'] = get_page_link( $page_id ); +if(!file_exists($_SESSION['PAGE_LINK'])) {$_SESSION['PAGE_LINK'] = WB_URL.'/'; } +$thisApp->redirect_url = $_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']); + ?> +
+ +

 Login

 message; ?>
@@ -43,7 +52,7 @@

-

+

Index: branches/2.8.x/wb/account/preferences.php =================================================================== --- branches/2.8.x/wb/account/preferences.php (revision 1507) +++ branches/2.8.x/wb/account/preferences.php (revision 1508) @@ -28,7 +28,7 @@ } } -require_once(WB_PATH.'/framework/class.wb.php'); +require_once(WB_PATH.'/framework/class.frontend.php'); $wb_inst = new wb(); if ($wb_inst->is_authenticated()==false) { header('Location: '.WB_URL.'/account/login.php'); @@ -35,29 +35,23 @@ exit(0); } +$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0; + // Required page details -$page_id = 0; +/* */ +// $page_id = 0; $page_description = ''; $page_keywords = ''; -define('PAGE_ID', 0); +define('PAGE_ID', $page_id); define('ROOT_PARENT', 0); define('PARENT', 0); define('LEVEL', 0); + define('PAGE_TITLE', $MENU['PREFERENCES']); define('MENU_TITLE', $MENU['PREFERENCES']); define('MODULE', ''); define('VISIBILITY', 'public'); -// Set the page content include file -if(isset($_POST['current_password']) AND isset($_POST['new_password'])) { - define('PAGE_CONTENT', WB_PATH.'/account/password.php'); -} elseif(isset($_POST['current_password']) AND isset($_POST['email'])) { - define('PAGE_CONTENT', WB_PATH.'/account/email.php'); -} elseif(isset($_POST['display_name'])) { - define('PAGE_CONTENT', WB_PATH.'/account/details.php'); -} else { - define('PAGE_CONTENT', WB_PATH.'/account/preferences_form.php'); -} - +define('PAGE_CONTENT', WB_PATH.'/account/preferences_form.php'); // Include the index (wrapper) file require(WB_PATH.'/index.php'); Index: branches/2.8.x/wb/account/password.php =================================================================== --- branches/2.8.x/wb/account/password.php (revision 1507) +++ branches/2.8.x/wb/account/password.php (revision 1508) @@ -19,46 +19,33 @@ // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } -// Get the values entered -$current_password = $_POST['current_password']; -$new_password = $_POST['new_password']; -$new_password2 = $_POST['new_password2']; - -// Create a javascript back link -$js_back = WB_URL.'/account/preferences.php'; -/* -if (!$wb->checkFTAN()) -{ - $wb->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back, false); - exit(); -} -*/ +// Get entered values + $current_password = $wb->get_post('current_password'); + $new_password = $wb->get_post('new_password'); + $new_password2 = $wb->get_post('new_password2'); // Get existing password -// $database = new database(); -$query = "SELECT user_id FROM ".TABLE_PREFIX."users WHERE user_id = '".$wb->get_user_id()."' AND password = '".md5($current_password)."'"; -$results = $database->query($query); - + $sql = "SELECT `user_id` FROM `".TABLE_PREFIX."users` WHERE `user_id` = ".$wb->get_user_id()." AND `password` = '".md5($current_password)."'"; + $rowset = $database->query($sql); // Validate values -if($results->numRows() == 0) { - $wb->print_error($MESSAGE['PREFERENCES']['CURRENT_PASSWORD_INCORRECT'], $js_back, false); -} - -if(strlen($new_password) < 3) { - $wb->print_error($MESSAGE['USERS']['PASSWORD_TOO_SHORT'], $js_back, false); -} -if($new_password != $new_password2) { - $wb->print_error($MESSAGE['USERS']['PASSWORD_MISMATCH'], $js_back, false); -} - + if($rowset->numRows() == 0) { + $error[] = $MESSAGE['PREFERENCES']['CURRENT_PASSWORD_INCORRECT']; + }else { + if(strlen($new_password) < 3) { + $error[] = $MESSAGE['USERS']['PASSWORD_TOO_SHORT']; + }else { + if($new_password != $new_password2) { + $error[] = $MESSAGE['USERS']['PASSWORD_MISMATCH']; + }else { // MD5 the password -$md5_password = md5($new_password); - + $md5_password = md5($new_password); // Update the database -// $database = new database(); -$query = "UPDATE ".TABLE_PREFIX."users SET password = '$md5_password' WHERE user_id = '".$wb->get_user_id()."'"; -$database->query($query); -if($database->is_error()) { - $wb->print_error($database->get_error, $js_back, false); -} else { - $wb->print_success($MESSAGE['PREFERENCES']['PASSWORD_CHANGED']); -} + $sql = "UPDATE `".TABLE_PREFIX."users` SET `password` = '".$md5_password."' WHERE `user_id` = ".$wb->get_user_id(); + $database->query($sql); + if($database->is_error()) { + $error[] = $database->get_error(); + } else { + $success[] = $MESSAGE['PREFERENCES']['PASSWORD_CHANGED']; + } + } + } + } Index: branches/2.8.x/wb/account/signup.php =================================================================== --- branches/2.8.x/wb/account/signup.php (revision 1507) +++ branches/2.8.x/wb/account/signup.php (revision 1508) @@ -46,12 +46,15 @@ $load_language = false; } +require_once(WB_PATH.'/framework/class.frontend.php'); +$wb_inst = new wb(); +$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0; // Required page details -$page_id = 0; +// $page_id = 0; $page_description = ''; $page_keywords = ''; -define('PAGE_ID', 0); +define('PAGE_ID', $page_id); define('ROOT_PARENT', 0); define('PARENT', 0); define('LEVEL', 0); @@ -72,5 +75,3 @@ // Include the index (wrapper) file require(WB_PATH.'/index.php'); - -?> \ No newline at end of file Index: branches/2.8.x/wb/account/login.php =================================================================== --- branches/2.8.x/wb/account/login.php (revision 1507) +++ branches/2.8.x/wb/account/login.php (revision 1508) @@ -29,11 +29,15 @@ } } +require_once(WB_PATH.'/framework/class.frontend.php'); +$wb_inst = new wb(); +$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0; + // Required page details -$page_id = 0; +// $page_id = 0; $page_description = ''; $page_keywords = ''; -define('PAGE_ID', 0); +define('PAGE_ID', $page_id); define('ROOT_PARENT', 0); define('PARENT', 0); define('LEVEL', 0); @@ -76,4 +80,3 @@ // Include the index (wrapper) file require(WB_PATH.'/index.php'); - Index: branches/2.8.x/wb/account/languages/EN.php =================================================================== --- branches/2.8.x/wb/account/languages/EN.php (nonexistent) +++ branches/2.8.x/wb/account/languages/EN.php (revision 1508) @@ -0,0 +1,34 @@ + 'please select', + 'DETAILS_SAVED' => 'details successfully saved', + 'SAVE_SETTINGS' => 'save details', + 'SAVE_EMAIL' => 'save email', + 'SAVE_PASSWORD' => 'save password', +); + +?> \ No newline at end of file Property changes on: branches/2.8.x/wb/account/languages/EN.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/account/languages/DE.php =================================================================== --- branches/2.8.x/wb/account/languages/DE.php (nonexistent) +++ branches/2.8.x/wb/account/languages/DE.php (revision 1508) @@ -0,0 +1,34 @@ + 'bitte wählen', + 'DETAILS_SAVED' => 'allgemeine Einstellungen geändert', + 'SAVE_SETTINGS' => 'Einstellungen speichern', + 'SAVE_EMAIL' => 'Email speichern', + 'SAVE_PASSWORD' => 'Passwort speichern', +); +?> \ No newline at end of file Property changes on: branches/2.8.x/wb/account/languages/DE.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/account/languages =================================================================== --- branches/2.8.x/wb/account/languages (nonexistent) +++ branches/2.8.x/wb/account/languages (revision 1508) Property changes on: branches/2.8.x/wb/account/languages ___________________________________________________________________ Added: bugtraq:number ## -0,0 +1 ## +true \ No newline at end of property Index: branches/2.8.x/wb/account/preferences_form.php =================================================================== --- branches/2.8.x/wb/account/preferences_form.php (revision 1507) +++ branches/2.8.x/wb/account/preferences_form.php (revision 1508) @@ -16,193 +16,187 @@ * */ -// Must include code to stop this file being access directly -if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } +// prevent this file from being accesses directly +if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } -?> + if($wb->is_authenticated() === false) { +// User needs to login first + header("Location: ".WB_URL."/account/login.php?redirect=".$wb->link); + exit(0); + } -

 

+$_SESSION['PAGE_LINK'] = get_page_link( $_SESSION['PAGE_ID'] ); +$_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']); - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
: - -
: - -
: - -
: - -
: - -
  - - -
+ $template->parse('language_list', 'language_list_block', true); + } + } -
+// Insert default timezone values + $template->set_block('main_block', 'timezone_list_block', 'timezone_list'); + foreach($TIMEZONES AS $hour_offset => $title) { + $template->set_var('VALUE', $hour_offset); + $template->set_var('NAME', $title); + if($wb->get_timezone() == $hour_offset*3600) { + $template->set_var('SELECTED', 'selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('timezone_list', 'timezone_list_block', true); + } -

 

+// Insert date format list + $template->set_block('main_block', 'date_format_list_block', 'date_format_list'); + foreach($DATE_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + if(DATE_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) { + $template->set_var('SELECTED', 'selected="selected"'); + } elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) { + $template->set_var('SELECTED', 'selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('date_format_list', 'date_format_list_block', true); + } -
- - - - - - - - - - - - - - -
: - -
: - -
  - - -
+// Insert time format list + $template->set_block('main_block', 'time_format_list_block', 'time_format_list'); + foreach($TIME_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + if(TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { + $template->set_var('SELECTED', 'selected="selected"'); + } elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { + $template->set_var('SELECTED', 'selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('time_format_list', 'time_format_list_block', true); + } +// Insert language headings + $template->set_var(array( + 'HEADING_MY_SETTINGS' => $HEADING['MY_SETTINGS'], + 'HEADING_MY_EMAIL' => $HEADING['MY_EMAIL'], + 'HEADING_MY_PASSWORD' => $HEADING['MY_PASSWORD'] + ) + ); +// Insert language text and messages + $template->set_var(array( + 'HTTP_REFERER' => $_SESSION['HTTP_REFERER'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_CANCEL' => $TEXT['CANCEL'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'], + 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'], + 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], + 'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'], + 'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'], + 'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'] + ) + ); -
+// Insert module releated language text and messages + $template->set_var(array( + 'MOD_PREFERENCE_PLEASE_SELECT' => $MOD_PREFERENCE['PLEASE_SELECT'], + 'MOD_PREFERENCE_SAVE_SETTINGS' => $MOD_PREFERENCE['SAVE_SETTINGS'], + 'MOD_PREFERENCE_SAVE_EMAIL' => $MOD_PREFERENCE['SAVE_EMAIL'], + 'MOD_PREFERENCE_SAVE_PASSWORD' => $MOD_PREFERENCE['SAVE_PASSWORD'], + ) + ); +// Insert error and/or success messages + $template->set_block('main_block', 'error_block', 'error_list'); + if(sizeof($error)>0){ + foreach($error AS $value){ + $template->set_var('ERROR_VALUE', $value); + $template->parse('error_list', 'error_block', true); + } + } - -

 

- -
- - - - - - - - - - - - - - - - - - -
: - -
: - -
: - -
  - - -
- -
\ No newline at end of file + $template->set_block('main_block', 'success_block', 'success_list'); + if(sizeof($success)!=0){ + foreach($success AS $value){ + $template->set_var('SUCCESS_VALUE', $value); + $template->parse('success_list', 'success_block', true); + } + } +// Parse template for preferences form + $template->parse('main', 'main_block', false); + $template->pparse('output', 'page'); Index: branches/2.8.x/wb/account/signup2.php =================================================================== --- branches/2.8.x/wb/account/signup2.php (revision 1507) +++ branches/2.8.x/wb/account/signup2.php (revision 1508) @@ -19,9 +19,12 @@ // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } -require_once(WB_PATH.'/framework/class.wb.php'); +// require_once(WB_PATH.'/framework/class.wb.php'); $wb = new wb('Start', 'start', false, false); +$_SESSION['PAGE_LINK'] = get_page_link( $_SESSION['PAGE_ID'] ); +$_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']); + // Create new database object // $database = new database(); Index: branches/2.8.x/wb/account/signup_form.php =================================================================== --- branches/2.8.x/wb/account/signup_form.php (revision 1507) +++ branches/2.8.x/wb/account/signup_form.php (revision 1508) @@ -21,8 +21,13 @@ require_once(WB_PATH.'/include/captcha/captcha.php'); +$_SESSION['PAGE_LINK'] = get_page_link( $_SESSION['PAGE_ID'] ); +$_SESSION['HTTP_REFERER'] = page_link($_SESSION['PAGE_LINK']); + ?> - +
+ +

 

Index: branches/2.8.x/wb/account/template.html =================================================================== --- branches/2.8.x/wb/account/template.html (nonexistent) +++ branches/2.8.x/wb/account/template.html (revision 1508) @@ -0,0 +1,138 @@ + + + +

+ {SUCCESS_VALUE} +

+ + +

+ {ERROR_VALUE} +

+ +
+ +
+
+ +

{HEADING_MY_SETTINGS}

+ + + + + + + + + + + + + + + + + + + + + + + + + +
{TEXT_DISPLAY_NAME}: + +
{TEXT_LANGUAGE}: + +
{TEXT_TIMEZONE}: + +
{TEXT_DATE_FORMAT}: + +
{TEXT_TIME_FORMAT}: + +
  + + +
+
+
+
+

{HEADING_MY_EMAIL}

+ + + + + + + + + + + + + +
{TEXT_EMAIL}: + +
{TEXT_CURRENT_PASSWORD}: + +
  + + +
+
+
+
+

{HEADING_MY_PASSWORD}

+ + + + + + + + + + + + + + + + + +
{TEXT_CURRENT_PASSWORD}: + +
{TEXT_NEW_PASSWORD}: + +
{TEXT_RETYPE_NEW_PASSWORD}: + +
  + + +
+
+
+ +
+ + Property changes on: branches/2.8.x/wb/account/template.html ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Revision \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/html \ No newline at end of property