Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG (revision 1791)
+++ branches/2.8.x/CHANGELOG (revision 1792)
@@ -13,6 +13,9 @@
+24 Oct-2012 Build 1792 Dietmar Woellbrink (Luisehahne)
+! all changes in folder account, Signup with confirmation Mail
+! frontend.css now included by account script
24 Oct-2012 Build 1791 Dietmar Woellbrink (Luisehahne)
# fixed save search settings
14 Oct-2012 Build 1790 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/skel/themes/htt/maintenance.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/maintenance.htt (nonexistent)
+++ branches/2.8.x/wb/admin/skel/themes/htt/maintenance.htt (revision 1792)
@@ -0,0 +1,57 @@
+
+
+
+ CMS WebsiteBaker | {PAGE_TITLE}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OFF-LINE
+
+
+
{PAGE_TITLE}
+
{BE_PATIENT}
+
+
{CHECK_BACK}
+
+
+
+
+
+
+
Cannot access this file directly
');
+if(!defined('WB_PATH')) {
+require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php');
+throw new IllegalFileException();
}
/* -------------------------------------------------------- */
@@ -42,8 +41,11 @@
$thisApp->redirect_url = (isset($thisApp->redirect_url) && ($thisApp->redirect_url!='') ? $thisApp->redirect_url : $_SESSION['HTTP_REFERER'] );
-//print 'function '.__FUNCTION__.'( '.''.' ); basename: '.basename(__FILE__).' line: '.__LINE__.' ->
';
-//print_r( $thisApp->redirect_url ); print '
';
+$sIncludeHeadLinkCss = '';
+if( is_readable(WB_PATH .'/account/frontend.css')) {
+ $sIncludeHeadLinkCss .= ' THEME_URL,
'TEMPLATE_URL' => TEMPLATE_DIR,
'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
+ 'CSS_BLOCK' => $sIncludeHeadLinkCss,
'MESSAGE_VALUE' => '',
'ERROR_VALUE' => '',
'THISAPP_MESSAGE_VALUE' => $thisApp->message,
Index: branches/2.8.x/wb/account/confirm.php
===================================================================
--- branches/2.8.x/wb/account/confirm.php (revision 1791)
+++ branches/2.8.x/wb/account/confirm.php (revision 1792)
@@ -17,18 +17,22 @@
require_once('../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
+if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
+
+require_once(WB_PATH.'/framework/functions.php');
+
// Create new frontend object
-$wb = new admin();
+$wb = new frontend(false);
-//require_once(dirname(__FILE__).'/AccountSignup.php');
-
// load module language file
-$sAutoLanguage = isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : AccountSignup::GetBowserLanguage(DEFAULT_LANGUAGE);
+//$sAutoLanguage = isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : AccountSignup::GetBowserLanguage(DEFAULT_LANGUAGE);
$mLang = ModLanguage::getInstance();
-$mLang->setLanguage(dirname(__FILE__).'/languages/', $sAutoLanguage, DEFAULT_LANGUAGE);
+$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE);
+//$langDir = WB_PATH . '/languages/' . LANGUAGE . '.php';
+//require_once(!file_exists($langDir) ? WB_PATH . '/languages/EN.php' : $langDir );
+
// form faked? Check the honeypot-fields.
if(ENABLED_ASP && isset($_POST['username']) && (
(!isset($_POST['submitted_when']) OR !isset($_SESSION['submitted_when']) ) OR
@@ -41,18 +45,24 @@
$wb->send_header(WB_URL.'/index.php');
}
-$page_id = isset($_SESSION['PAGE_ID']) ? intval($_SESSION['PAGE_ID']) : 0;
+$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
// needed for backlink/cancel
$_SESSION['HTTP_REFERER'] = isset($_SESSION['HTTP_REFERER']) ? ($_SESSION['HTTP_REFERER']) : WB_URL.'/';
// action modus
$_POST['action'] = !isset($_POST['action']) ? 'show' : $_POST['action'];
+// Required page details
$page_description = '';
$page_keywords = '';
+// Work out level
+$level = ($page_id > 0 )? level_count($page_id): $page_id;
+// Work out root parent
+$root_parent = ($page_id > 0 )? root_parent($page_id): $page_id;
+
define('PAGE_ID', $page_id);
-define('ROOT_PARENT', 0);
+define('ROOT_PARENT', $root_parent);
define('PARENT', 0);
-define('LEVEL', 0);
+define('LEVEL', $level);
define('PAGE_TITLE', $TEXT['SIGNUP']);
define('MENU_TITLE', $TEXT['SIGNUP']);
define('MODULE', '');
Index: branches/2.8.x/wb/account/forgot.php
===================================================================
--- branches/2.8.x/wb/account/forgot.php (revision 1791)
+++ branches/2.8.x/wb/account/forgot.php (revision 1792)
@@ -15,18 +15,34 @@
*
*/
-require_once('../config.php');
+// Include config file
+$config_file = realpath('../config.php');
+if(file_exists($config_file) && !defined('WB_URL'))
+{
+ require_once($config_file);
+}
-$page_id = (!empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0);
+if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
+require_once(WB_PATH.'/framework/functions.php');
+
+$wb = new frontend(false);
+
+$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : PAGE_ID;
+
// Required page details
-// $page_id = 0;
$page_description = '';
$page_keywords = '';
+// Work out level
+$level = ($page_id > 0 )? level_count($page_id): $page_id;
+// Work out root parent
+$root_parent = ($page_id > 0 )? root_parent($page_id): $page_id;
+
define('PAGE_ID', $page_id);
-define('ROOT_PARENT', 0);
+define('ROOT_PARENT', $root_parent);
define('PARENT', 0);
-define('LEVEL', 0);
+define('LEVEL', $level);
+
define('PAGE_TITLE', $MENU['FORGOT']);
define('MENU_TITLE', $MENU['FORGOT']);
define('VISIBILITY', 'public');
Index: branches/2.8.x/wb/account/preferences.php
===================================================================
--- branches/2.8.x/wb/account/preferences.php (revision 1791)
+++ branches/2.8.x/wb/account/preferences.php (revision 1792)
@@ -15,39 +15,42 @@
*
*/
-require_once('../config.php');
+// Include config file
+$config_file = realpath('../config.php');
+if(file_exists($config_file) && !defined('WB_URL'))
+{
+ require_once($config_file);
+}
+if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
+
+require_once(WB_PATH.'/framework/functions.php');
+
+$wb = new frontend(false);
+
if(!FRONTEND_LOGIN) {
- header('Location: '.WB_URL.'/index.php');
- exit(0);
-// if(INTRO_PAGE) {
-// header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
-// exit(0);
-// } else {
-// header('Location: '.WB_URL.'/index.php');
-// exit(0);
-// }
+ $wb->send_header('Location: '.WB_URL.'/');
+ exit(0);
}
-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');
+if ($wb->is_authenticated()==false) {
+ $wb->send_header('Location: '.WB_URL.'/account/login.php');
exit(0);
}
+$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
-$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
-
// Required page details
-/* */
-// $page_id = 0;
$page_description = '';
$page_keywords = '';
+// Work out level
+$level = ($page_id > 0 )? level_count($page_id): $page_id;
+// Work out root parent
+$root_parent = ($page_id > 0 )? root_parent($page_id): $page_id;
+
define('PAGE_ID', $page_id);
-define('ROOT_PARENT', 0);
+define('ROOT_PARENT', $root_parent);
define('PARENT', 0);
-define('LEVEL', 0);
+define('LEVEL', $level);
define('PAGE_TITLE', $MENU['PREFERENCES']);
define('MENU_TITLE', $MENU['PREFERENCES']);
@@ -55,5 +58,6 @@
define('VISIBILITY', 'public');
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/login.php
===================================================================
--- branches/2.8.x/wb/account/login.php (revision 1791)
+++ branches/2.8.x/wb/account/login.php (revision 1792)
@@ -15,11 +15,23 @@
*
*/
-require_once("../config.php");
+// Include config file
+$config_file = realpath('../config.php');
+if(file_exists($config_file) && !defined('WB_URL'))
+{
+ require_once($config_file);
+}
+if(!class_exists('login', false)){ include(WB_PATH.'/framework/class.login.php'); }
+if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
+
+require_once(WB_PATH.'/framework/functions.php');
+
+$wb = new frontend(false);
+
// Make sure the login is enabled
if(!FRONTEND_LOGIN) {
- header('Location: '.WB_URL.'/index.php');
+ header('Location: '.WB_URL.'/');
exit(0);
// if(INTRO_PAGE) {
// header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
@@ -28,16 +40,21 @@
// }
}
-$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
+$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
// Required page details
-// $page_id = 0;
$page_description = '';
$page_keywords = '';
+// Work out level
+$level = ($page_id > 0 )? level_count($page_id): $page_id;
+// Work out root parent
+$root_parent = ($page_id > 0 )? root_parent($page_id): $page_id;
+
define('PAGE_ID', $page_id);
-define('ROOT_PARENT', 0);
+define('ROOT_PARENT', $root_parent);
define('PARENT', 0);
-define('LEVEL', 0);
+define('LEVEL', $level);
+
define('PAGE_TITLE', $TEXT['PLEASE_LOGIN']);
define('MENU_TITLE', $TEXT['PLEASE_LOGIN']);
define('VISIBILITY', 'public');
@@ -44,12 +61,6 @@
// Set the page content include file
define('PAGE_CONTENT', WB_PATH.'/account/login_form.php');
-require_once(WB_PATH.'/framework/class.login.php');
-require_once(WB_PATH.'/framework/class.frontend.php');
-
-// Create new frontend object
-$wb = new frontend();
-
// Create new login app
$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
$redirect = strip_tags(isset(${$requestMethod}['redirect']) ? ${$requestMethod}['redirect'] : '');
@@ -59,9 +70,6 @@
$loginUrl = WB_URL.'/account/login.php';
$loginUrl .= (!empty($redirect) ? '?redirect=' .$_SESSION['HTTP_REFERER'] : '');
-//print 'function '.__FUNCTION__.'( '.''.' ); basename: '.basename(__FILE__).' line: '.__LINE__.' ->
';
-//print_r( $redirect ); print '
';
-
$ThemeUrl = WB_URL.$wb->correct_theme_source('warning.html');
// Setup template object, parse vars to it, then parse it
$ThemePath = realpath(WB_PATH.$wb->correct_theme_source('loginBox.htt'));
@@ -86,7 +94,7 @@
"USERS_TABLE" => TABLE_PREFIX."users",
"GROUPS_TABLE" => TABLE_PREFIX."groups",
"REDIRECT_URL" => $redirect
- )
+ )
);
// Set extra outsider var
Index: branches/2.8.x/wb/account/htt/preferences.htt
===================================================================
--- branches/2.8.x/wb/account/htt/preferences.htt (revision 1791)
+++ branches/2.8.x/wb/account/htt/preferences.htt (revision 1792)
@@ -1,142 +1,152 @@
-
-{SUCCESS_VALUE}
-
-
-{ERROR_VALUE}
+{CSS_BLOCK}
+
+ {SUCCESS_VALUE}
+
+
+ {ERROR_VALUE}
-
-
-
{HEADING_MY_SETTINGS}
-
+
+
{HEADING_MY_SETTINGS}
+
+
+
+
+
+
+
+
{HEADING_MY_PASSWORD}
+
+
+
-
-
-
{HEADING_MY_PASSWORD}
-
-
-
Die Aktivierung muss innerhalb 24 Stunden erfolgen, da ansonsten das Konto wieder gelöscht wird.
+$MESSAGE['SIGNUP_CONFIRMED_REGISTRATION'] = "To be able to use your account, receive during the next minutes e-mail with a link to activate your account.
+
The activation must be done during 24 hours. Otherwise the account will be deleted.
";
-$MESSAGE['SIGNUP_REGISTRATION'] = 'Sie erhalten Ihre Zugangsdaten per E-Mail!!';
-$MESSAGE['SIGNUP_NEW_USER'] = 'Das Konto wurde angelegt.';
-$MESSAGE['SIGNUP_ACTIVATION'] = 'Kontoaktivierung';
+$MESSAGE['SIGNUP_REGISTRATION'] = 'You get your data by e-mail!!';
+$MESSAGE['SIGNUP_NEW_USER'] = 'Your account is created.';
+$MESSAGE['SIGNUP_ACTIVATION'] = 'Account Activation';
-$TEXT['NEED_CURRENT_PASSWORD'] = 'mit aktuellem Passwort bestätigen';
-$TEXT['NEED_TO_LOGIN'] = 'Müssen Sie sich einloggen?';
-$TEXT['NEW_PASSWORD'] = 'Neues Passwort';
-$TEXT['PASSWORD'] = 'Kennwort';
-$TEXT['ACTIVATION'] = 'Freischalten';
-$TEXT['SEND'] = 'Anfordern';
-$TEXT['USERNAME'] = 'Loginname';
+$TEXT['NEED_CURRENT_PASSWORD'] = 'confirm with your password please';
+$TEXT['NEED_TO_LOGIN'] = 'You need to logon';
+$TEXT['NEW_PASSWORD'] = 'New password';
+$TEXT['PASSWORD'] = 'Password';
+$TEXT['ACTIVATION'] = 'Activate';
+$TEXT['SEND'] = 'Request';
+$TEXT['USERNAME'] = 'Login name';
Index: branches/2.8.x/wb/account/languages/DE.php
===================================================================
--- branches/2.8.x/wb/account/languages/DE.php (revision 1791)
+++ branches/2.8.x/wb/account/languages/DE.php (revision 1792)
@@ -32,10 +32,11 @@
'SAVE_SETTINGS' => 'Einstellungen speichern',
'SAVE_EMAIL' => 'Email speichern',
'SAVE_PASSWORD' => 'Passwort speichern',
+ 'SAVE_LANGUAGE' => 'Zuerst die Sprache wechseln',
);
$HEADING['SIGNUP2_CONFIMED_REGISTRATION'] = 'Kontofreischaltung';
-$HEADING['MESSAGE_WELCOME'] = 'Herzlich willkomen zur Freischaltung Ihres Konto';
+$HEADING['MESSAGE_WELCOME'] = 'Herzlich willkommen zur Freischaltung Ihres Konto';
$HELP['SIGNUP_REMEMBER_PASSWORD'] = 'Bitte merken Sie sich Ihren Loginnamen und das Kennwort! Sie benötigen den Loginnamen und das Kennwort um die Aktivierung abzuschliessen!';
$HELP['CONFIRM_PASSWORD'] = 'Geben Sie bitte Ihren Loginnamen und das Kennwort ein um die Aktivierung abzuschliessen!';
@@ -59,9 +60,8 @@
Sie erhalten diese E-Mail, weil sie ein neues Passwort angefordert haben.
-Ihre neuen Logindaten für {LOGIN_WEBSITE_TITLE} lauten:
+Ihr neues Passwort für {LOGIN_WEBSITE_TITLE} lautet:
-Loginname: {LOGIN_NAME}
Passwort: {LOGIN_PASSWORD}
Das bisherige Passwort wurde durch das neue Passwort oben ersetzt.
@@ -72,6 +72,7 @@
----------------------------------------
Diese E-Mail wurde automatisch erstellt!
';
+
$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
Hallo {LOGIN_DISPLAY_NAME},
Index: branches/2.8.x/wb/account/forgot_form.php
===================================================================
--- branches/2.8.x/wb/account/forgot_form.php (revision 1791)
+++ branches/2.8.x/wb/account/forgot_form.php (revision 1792)
@@ -114,6 +114,12 @@
$message_color = 'ff0000';
}
+$sIncludeHeadLinkCss = '';
+if( is_readable(WB_PATH .'/account/frontend.css')) {
+ $sIncludeHeadLinkCss .= 'set_file('page', 'forgot.htt');
@@ -133,6 +139,7 @@
'WB_URL' => WB_URL,
'THEME_URL' => THEME_URL,
'TEMPLATE_URL' => TEMPLATE_DIR,
+ 'CSS_BLOCK' => $sIncludeHeadLinkCss,
'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
'MESSAGE_VALUE' => '',
'ERROR_VALUE' => '',
Index: branches/2.8.x/wb/account/save_signup.php
===================================================================
--- branches/2.8.x/wb/account/save_signup.php (revision 1791)
+++ branches/2.8.x/wb/account/save_signup.php (revision 1792)
@@ -117,11 +117,6 @@
msgQueue::add($MESSAGE['LOGIN_USERNAME_BLANK']);
}
- if($wb->get_session('DISPLAY_NAME') != "") {
-// $aErrorMsg[] = $MESSAGE['GENERIC_FILL_IN_ALL'];
- msgQueue::add($MESSAGE['GENERIC_FILL_IN_ALL']);
- }
-
if($wb->get_session('EMAIL') != "") {
// Check if the email already exists
$sql = 'SELECT `user_id` FROM `'.TABLE_PREFIX.'users` WHERE `email` = \''.$_SESSION['EMAIL'].'\'';
@@ -138,6 +133,11 @@
msgQueue::add($MESSAGE['SIGNUP_NO_EMAIL']);
}
+ if($wb->get_session('DISPLAY_NAME') == "") {
+// $aErrorMsg[] = $MESSAGE['GENERIC_FILL_IN_ALL'];
+ msgQueue::add($MESSAGE['GENERIC_FILL_IN_ALL'].' ('.$TEXT['DISPLAY_NAME'].')');
+ }
+
if(CONFIRMED_REGISTRATION) {
$iMinPassLength = 6;
// receive password vars and calculate needed action
@@ -156,7 +156,7 @@
if($sNewPassword != $sNewPasswordRetyped) {
msgQueue::add($MESSAGE['USERS_PASSWORD_MISMATCH']);
} else {
- $pattern = '/[^'.$admin->password_chars.']/';
+ $pattern = '/[^'.$wb->password_chars.']/';
if (preg_match($pattern, $sNewPassword)) {
msgQueue::add($MESSAGE['PREFERENCES_INVALID_CHARS']);
}else {
@@ -210,7 +210,7 @@
// $sDisplayName = $_SESSION['DISPLAY_NAME'];
$sDisplayName = $wb->add_slashes($_SESSION['DISPLAY_NAME']);
$groups_id = FRONTEND_SIGNUP;
- $email_to = $_SESSION['email'];
+ $email_to = $_SESSION['EMAIL'];
// Delete outdated confirmation IDs
deleteOutdatedConfirmations();
@@ -227,7 +227,6 @@
}
// Save new user
- $bSaveRegistration = true;
$sql = 'INSERT INTO `'.TABLE_PREFIX.'users` SET ';
$sql .= '`group_id` = \''.$groups_id.'\', ';
@@ -258,6 +257,7 @@
msgQueue::add($database->get_error());
}
} else {
+ $bSaveRegistration = true;
msgQueue::add($MESSAGE['SIGNUP_NEW_USER'],true);
include(dirname(__FILE__).'/signup_mails.php');
@@ -270,5 +270,3 @@
} // end success $bSaveRegistration
}
} // end $_POST['action']
-// if page_id lost
-$page_id = isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
Index: branches/2.8.x/wb/account/preferences_form.php
===================================================================
--- branches/2.8.x/wb/account/preferences_form.php (revision 1791)
+++ branches/2.8.x/wb/account/preferences_form.php (revision 1792)
@@ -5,7 +5,7 @@
* @package account
* @author WebsiteBaker Project
* @copyright 2009-2012, WebsiteBaker Org. e.V.
-* @link http://www.websitebaker2.org/
+* @link http://www.websitebaker2.org/
* @license http://www.gnu.org/licenses/gpl.html
* @platform WebsiteBaker 2.8.x
* @requirements PHP 5.2.2 and higher
@@ -25,22 +25,41 @@
if($wb->is_authenticated() === false) {
// User needs to login first
-header("Location: ".WB_URL."/account/login.php?redirect=".$wb->link);
-exit(0);
+ header("Location: ".WB_URL."/account/login.php?redirect=".$wb->link);
+ exit(0);
}
+/**
+ *
+ */
+$sUserLanguage = LANGUAGE;
+// Check existing language
+ $sql = 'SELECT `language` ';
+ $sql .= 'FROM `'.TABLE_PREFIX.'users` ';
+ $sql .= 'WHERE `user_id` = '.$wb->get_user_id();
+ if ($sUserLanguage = $database->get_one($sql)) {
+ $_SESSION['LANGUAGE'] = $sUserLanguage;
+ }
+
+$sDefaultLanguage = DEFAULT_LANGUAGE;
+//$sLang = $wb->get_session('LANGUAGE');
+$sLanguage = LANGUAGE.'.php';
+
+$LanguageDir = WB_PATH .'/account/languages/';
+
+$sLanguageFile = ( file_exists($LanguageDir.$sUserLanguage.'.php') ? $LanguageDir.$sUserLanguage.'.php' : $LanguageDir.$sLanguage);
+$sLanguageFile = ( is_readable($sLanguageFile) ? $sLanguageFile : $LanguageDir.$sDefaultLanguage.'.php' );
// load module default language file (EN)
-require_once(WB_PATH .'/account/languages/EN.php');
-// check for user defined language file, load it and override EN-Settings with
-if(file_exists(WB_PATH .'/account/languages/' .LANGUAGE .'.php')) {
-require_once(WB_PATH .'/account/languages/' .LANGUAGE .'.php');
+require($sLanguageFile);
+
+require(WB_PATH.'/framework/functions-utf8.php');
+
+$sIncludeHeadLinkCss = '';
+if( is_readable(WB_PATH .'/account/frontend.css')) {
+ $sIncludeHeadLinkCss .= '';
-// include(WB_PATH .'/account/frontend.css');
-// echo "\n\n";
-
$user_time = true;
require(ADMIN_PATH.'/interface/timezones.php');
require(ADMIN_PATH.'/interface/date_formats.php');
@@ -47,52 +66,126 @@
require(ADMIN_PATH.'/interface/time_formats.php');
$error = array();
$success = array();
+
$template = new Template(WB_PATH .'/account/htt','keep');
+// show template
+$template->set_file('page', 'preferences.htt');
+$template->set_block('page', 'main_block', 'main');
+
+/**
+ *
+ */
switch($wb->get_post('action')):
-case 'details':
-require_once(WB_PATH .'/account/details.php');
-break;
-case 'email':
-require_once(WB_PATH .'/account/email.php');
-
-break;
-case 'password':
-require_once(WB_PATH .'/account/password.php');
-break;
-default:
+ case 'details':
+ require_once(WB_PATH .'/account/details.php');
+ break;
+ case 'email':
+ require_once(WB_PATH .'/account/email.php');
+ break;
+ case 'password':
+ require_once(WB_PATH .'/account/password.php');
+ break;
+ default:
// do nothing
endswitch; // switch
+// require(dirname(__FILE__).'/save_preferences.php');
+// get existing values from database
+$sql = "SELECT `display_name`,`email`,`language`,`timezone`,`date_format`,`time_format` ";
+$sql .= "FROM `".TABLE_PREFIX."users` ";
+$sql .= "WHERE `user_id` = '".$wb->get_user_id()."'";
-// show template
-$template->set_file('page', 'preferences.htt');
-$template->set_block('page', 'main_block', 'main');
-// get existing values from database
-$sql = "SELECT `display_name`,`email` FROM ".TABLE_PREFIX."users WHERE `user_id` = '".$wb->get_user_id()."'";
-$rowset = $database->query($sql);
+if($rowset = $database->query($sql)) {
+ $row = $rowset->fetchRow();
+ $_SESSION['LANGUAGE'] = $row['language'];
+ $_SESSION['EMAIL'] = $row['email'];
+ $_SESSION['DISPLAY_NAME'] = $row['display_name'];
+ $_SESSION['TIMEZONE'] = $row['timezone'];
+ $_SESSION['DATE_FORMAT'] = $row['date_format'];
+ $_SESSION['TIME_FORMAT'] = $row['time_format'];
+}
if($database->is_error()) $error[] = $database->get_error();
-$row = $rowset->fetchRow();
// insert values into form
$template->set_var('DISPLAY_NAME', $row['display_name']);
$template->set_var('EMAIL', $row['email']);
$template->set_var('ACTION_URL', WB_URL.'/account/preferences.php');
-// read available languages from table addons and assign it to the template
+$_SESSION['HTTP_REFERER'] =( ($_SESSION['LANGUAGE'] != LANGUAGE ) ? WB_URL.'?lang='.$_SESSION['LANGUAGE'] : $_SESSION['HTTP_REFERER']);
+$template->set_block('main_block', 'show_detail_send_block', 'show_detail_send');
+$template->set_block('main_block', 'show_email_send_block', 'show_email_send');
+$template->set_block('main_block', 'show_password_send_block', 'show_password_send');
+
+if(($sUserLanguage != LANGUAGE) ) {
+ $template->parse('show_detail_send', '');
+ $template->parse('show_email_send', '');
+ $template->parse('show_password_send', '');
+} else {
+ $template->parse('show_detail_send', 'show_detail_send_block');
+ $template->parse('show_email_send', 'show_email_send_block');
+ $template->parse('show_password_send', 'show_password_send_block');
+}
+
+// Insert language text and messages
+$template->set_var(array(
+ 'HTTP_REFERER' => ( $wb->get_session('HTTP_REFERER')!='' ? $_SESSION['HTTP_REFERER'] : WB_URL),
+ 'CSS_BLOCK' => $sIncludeHeadLinkCss,
+ 'TEXT_SAVE' => $TEXT['SAVE'],
+ 'TEXT_RESET' => $TEXT['RESET'],
+ 'TEXT_CANCEL' => ($sUserLanguage!=LANGUAGE) ? $MOD_PREFERENCE['SAVE_LANGUAGE']:$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']
+ )
+);
+
+$aLangAddons = array();
+$aLangBrowser = array();
+
+// read available languages from table addons
$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ';
$sql .= 'WHERE `type` = \'language\' ORDER BY `directory`';
-if( $res_lang = $database->query($sql) )
+if( $oLang = $database->query($sql) )
{
- $template->set_block('main_block', 'language_list_block', 'language_list');
- while( $rec_lang = $res_lang->fetchRow() )
+ while( $aLang = $oLang->fetchRow(MYSQL_ASSOC) )
{
- $langIcons = (empty($rec_lang['directory'])) ? 'none' : strtolower($rec_lang['directory']);
- $template->set_var('CODE', $rec_lang['directory']);
- $template->set_var('NAME', $rec_lang['name']);
- $template->set_var('FLAG', THEME_URL.'/images/flags/'.$langIcons);
- $template->set_var('SELECTED', ($wb->get_session('LANGUAGE') == $rec_lang['directory'] ? ' selected="selected"' : '') );
- $template->parse('language_list', 'language_list_block', true);
+ $aLangAddons[$aLang['directory']] = $aLang['name'];
}
}
+
+// default, if no information from client available
+$sAutoLanguage = DEFAULT_LANGUAGE;
+// detect client language
+//if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+// if(preg_match('/([a-z]{2})(?:-[a-z]{2})*/i', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']), $matches)) {
+// $sAutoLanguage = strtoupper($matches[1]);
+// }
+//}
+
+//$sAutoLanguage = 'FR';
+$aLangUsed = array_flip(explode(',',$wb->GetLanguagesInUsed()));
+$aLangUsed = array_intersect_key($aLangAddons, $aLangUsed);
+//$sAutoLanguage = array_key_exists($sAutoLanguage,$aLangUsed) ? $sAutoLanguage : DEFAULT_LANGUAGE;
+
+// read available languages from table addons and assign it to the template
+$template->set_block('main_block', 'language_list_block', 'language_list');
+foreach( $aLangUsed as $sDirectory => $sName )
+{
+ $langIcons = ( empty($sDirectory) ? 'none' : strtolower($sDirectory));
+
+ $template->set_var('CODE', $sDirectory);
+ $template->set_var('NAME', $sName);
+ $template->set_var('FLAG', THEME_URL.'/images/flags/'.$langIcons);
+ $template->set_var('SELECTED', ( $_SESSION['LANGUAGE'] == $sDirectory ? ' selected="selected"' : '') );
+
+ $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) {
@@ -149,26 +242,9 @@
}
// 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']
+ 'HEADING_MY_SETTINGS' => $HEADING['MY_SETTINGS'],
+ 'HEADING_MY_EMAIL' => $HEADING['MY_EMAIL'],
+ 'HEADING_MY_PASSWORD' => $HEADING['MY_PASSWORD']
)
);
Index: branches/2.8.x/wb/account/details.php
===================================================================
--- branches/2.8.x/wb/account/details.php (revision 1791)
+++ branches/2.8.x/wb/account/details.php (revision 1792)
@@ -26,15 +26,14 @@
// Get entered values
$display_name = strip_tags($wb->StripCodeFromText($wb->get_post('display_name')));
- $language = strip_tags($wb->StripCodeFromText($wb->get_post('language')));
+ $sUserLanguage = strip_tags($wb->StripCodeFromText($wb->get_post('language')));
$timezone = intval($wb->StripCodeFromText($wb->get_post('timezone')))*60*60;
$date_format = strip_tags($wb->StripCodeFromText($wb->get_post('date_format')));
$time_format = strip_tags($wb->StripCodeFromText($wb->get_post('time_format')));
-// Update the database
-// $database = new database();
+// Update the database
$sql = "UPDATE `".TABLE_PREFIX."users` SET ";
- $sql .= "`display_name` = '".$display_name."', `language` = '".$language."', ";
+ $sql .= "`display_name` = '".$display_name."', `language` = '".$sUserLanguage."', ";
$sql .= "`timezone` = '".$timezone."', `date_format` = '".$date_format."', ";
$sql .= "`time_format` = '".$time_format."' ";
$sql .= "WHERE `user_id` = '".$wb->get_user_id()."'";
@@ -44,7 +43,7 @@
} else {
$success[] = $MOD_PREFERENCE['DETAILS_SAVED'];
$_SESSION['DISPLAY_NAME'] = $display_name;
- $_SESSION['LANGUAGE'] = $language;
+ $_SESSION['LANGUAGE'] = $sUserLanguage;
$_SESSION['TIME_FORMAT'] = $time_format;
$_SESSION['DATE_FORMAT'] = $date_format;
$_SESSION['TIMEZONE'] = $timezone;
Index: branches/2.8.x/wb/account/signup_form.php
===================================================================
--- branches/2.8.x/wb/account/signup_form.php (revision 1791)
+++ branches/2.8.x/wb/account/signup_form.php (revision 1792)
@@ -34,10 +34,6 @@
$mLang = ModLanguage::getInstance();
$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE);
-//echo '\n";
-
if(isset($_POST['action']) && $_POST['action']=='send') {
require(dirname(__FILE__).'/save_signup.php');
} else {
@@ -50,8 +46,15 @@
unset($_SESSION['TIMEZONE']);
}
-if($_SESSION['display_form']){
+if($_SESSION['display_form'])
+{
+$sIncludeHeadLinkCss = '';
+if( is_readable(WB_PATH .'/account/frontend.css')) {
+ $sIncludeHeadLinkCss .= 'set_file('page', 'signup.htt');
@@ -63,6 +66,7 @@
'ACTION_URL' => WB_URL.'/account/signup.php',
'WB_URL' => WB_URL,
'THEME_URL' => THEME_URL,
+ 'CSS_BLOCK' => $sIncludeHeadLinkCss,
'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
'MESSAGE_VALUE' => '',
'ERROR_VALUE' => '',
@@ -116,36 +120,49 @@
)
);
+
+$aLangAddons = array();
+$aLangBrowser = array();
+// read available languages from table addons
+$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ';
+$sql .= 'WHERE `type` = \'language\' ORDER BY `directory`';
+if( $oLang = $database->query($sql) )
+{
+ while( $aLang = $oLang->fetchRow(MYSQL_ASSOC) )
+ {
+ $aLangAddons[$aLang['directory']] = $aLang['name'];
+ }
+}
+
+// default, if no information from client available
+$sAutoLanguage = DEFAULT_LANGUAGE;
// detect client language
- $oTpl->set_block('main_block', 'language_list_block', 'language_list');
- $sAutoLanguage = DEFAULT_LANGUAGE; // default, if no information from client available
- if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
- if(preg_match('/([a-z]{2})(?:-[a-z]{2})*/i', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']), $matches)) {
- $sAutoLanguage = strtoupper($matches[1]);
- }
+if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+ if(preg_match('/([a-z]{2})(?:-[a-z]{2})*/i', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']), $matches)) {
+ $sAutoLanguage = strtoupper($matches[1]);
}
- $sAutoLanguage = isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : $sAutoLanguage;
- // Insert language values
- $sql = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` ';
- $sql .= 'WHERE `type` = \'language\' ';
-// $sql .= 'AND `function` != \'theme\' ';
- $sql .= 'ORDER BY `directory`';
- if( ($result = $database->query($sql)) && ($result->numRows() > 0) )
-// $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' ORDER BY directory");
-// if($result->numRows() > 0)
- {
- while($addon = $result->fetchRow())
- {
- $langIcons = (empty($addon['directory'])) ? 'none' : strtolower($addon['directory']);
+}
- $oTpl->set_var('CODE', $addon['directory']);
- $oTpl->set_var('NAME', $addon['name']);
- $oTpl->set_var('FLAG', THEME_URL.'/images/flags/'.$langIcons);
- $oTpl->set_var('SELECTED', ($sAutoLanguage == $addon['directory'] ? $sSelected : '') );
- $oTpl->parse('language_list', 'language_list_block', true);
- }
- }
+$sAutoLanguage=($wb->get_session('LANGUAGE')) ? $_SESSION['LANGUAGE'] : $sAutoLanguage;
+//$sAutoLanguage = 'NL';
+$aLangUsed = array_flip(explode(',',$wb->GetLanguagesInUsed()));
+$aLangUsed = array_intersect_key($aLangAddons, $aLangUsed);
+$sAutoLanguage = array_key_exists($sAutoLanguage,$aLangUsed) ? $sAutoLanguage : DEFAULT_LANGUAGE;
+//print 'function '.__FUNCTION__.'( '.''.' ); basename: '.basename(__FILE__).' line: '.__LINE__.' ->
';
+//print_r( $aLangUsed ); print '
'; // flush ();sleep(10); die();
+// read available languages from table addons and assign it to the template
+ $oTpl->set_block('main_block', 'language_list_block', 'language_list');
+ foreach( $aLangUsed as $sDirectory => $aName )
+ {
+ $langIcons = ( empty($sDirectory) ? 'none' : strtolower($sDirectory));
+ $oTpl->set_var('CODE', $sDirectory );
+ $oTpl->set_var('NAME', $aName );
+ $oTpl->set_var('FLAG', THEME_URL.'/images/flags/'.$langIcons );
+ $oTpl->set_var('SELECTED', ( $sAutoLanguage == $sDirectory ? ' selected="selected"' : '') );
+ $oTpl->parse('language_list', 'language_list_block', true);
+ }
+
// if type == confirmed_registration mail show password block, otherwise old login with captcha
$oTpl->set_block('main_block', 'password_block', 'password');
$oTpl->set_block('main_block', 'captcha_block', 'captcha');
+