Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2062) +++ branches/2.8.x/CHANGELOG (revision 2063) @@ -12,6 +12,8 @@ =============================================================================== +01 Jan-2014 Build 2063 Dietmar Woellbrink (Luisehahne) +# problems with confirmation mail solved 01 Jan-2014 Build 2062 Manuela v.d.Decken(DarkViper) ! wb::mail added message on error if DEBUG is set 01 Jan-2014 Build 2061 Manuela v.d.Decken(DarkViper) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2062) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2063) @@ -51,5 +51,5 @@ // 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.4'); -if(!defined('REVISION')) define('REVISION', '2062'); +if(!defined('REVISION')) define('REVISION', '2063'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/account/signup_mails.php =================================================================== --- branches/2.8.x/wb/account/signup_mails.php (revision 2062) +++ branches/2.8.x/wb/account/signup_mails.php (revision 2063) @@ -23,6 +23,8 @@ } /* -------------------------------------------------------- */ + $search = array(); + $replace = array(); //WB_MAILER settings $sServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : emailAdmin()); $sWebMailer = (defined('WBMAILER_DEFAULT_SENDERNAME') && WBMAILER_DEFAULT_SENDERNAME != '' ? WBMAILER_DEFAULT_SENDERNAME : 'WebsiteBaker Mailer'); @@ -42,8 +44,8 @@ $mail_replyto = $email_to; $mail_replyName = $sDisplayName; - $mail_message = $MESSAGE['SIGNUP2_ADMIN_INFO']; - $email_subject = $MESSAGE['SIGNUP2_NEW_USER']; + $mail_message = $mLang->MESSAGE_SIGNUP2_ADMIN_INFO; + $email_subject = $mLang->MESSAGE_SIGNUP2_NEW_USER; $search = array('{LOGIN_EMAIL}','{LOGIN_ID}', '{SIGNUP_DATE}', '{LOGIN_NAME}', '{LOGIN_IP}'); $replace = array($email_to, $email_fromname.' ('.$user_id.')', date(DATE_FORMAT.' '.TIME_FORMAT,$get_ts ), $sLoginName, $get_ip); $mail_message = str_replace($search, $replace, $mail_message); @@ -53,9 +55,9 @@ // prepare confirmation mail to user, easy old style if(($email_to != '') && $bSaveRegistration) { - $email_subject = $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO']; - $mail_message = $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'].$MESSAGE['SUCCESS_EMAIL_TEXT_GENERATED']; - $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}'); + $sEmailSubject = $mLang->MESSAGE_SIGNUP2_SUBJECT_LOGIN_INFO; + $mail_message = $mLang->MESSAGE_SIGNUP2_BODY_LOGIN_INFO.$mLang->MESSAGE_SUCCESS_EMAIL_TEXT_GENERATED; + $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}'); $replace = array($sDisplayName, WEBSITE_TITLE, $sLoginName, $sNewPassword); $mail_message = str_replace($search, $replace, $mail_message); } @@ -64,11 +66,13 @@ if(($email_to != '') && $bSaveRegistration) { // $daylight_saving = date('I'); $sConfirmedTimeOut = gmdate('Y/m/d H:i',$sTimeOut).' GMT'; - $email_subject = $MESSAGE['SIGNUP_ACTIVATION']; - $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LINK}', '{CONFIRMED_REGISTRATION_ENDTIME}'); + $sEmailSubject = $mLang->MESSAGE_SIGNUP_ACTIVATION; + $search = array("{LOGIN_DISPLAY_NAME}", "{LOGIN_WEBSITE_TITLE}", "{LOGIN_NAME}", "{LINK}", "{CONFIRMED_REGISTRATION_ENDTIME}" ); $replace = array($sDisplayName, WEBSITE_TITLE, $sLoginName, $sConfirmedLink,$sConfirmedTimeOut); - $mail_message = $MESSAGE['SEND_CONFIRMED_REGISTRATION'].$MESSAGE['SUCCESS_EMAIL_TEXT_GENERATED']; + $mail_message = $mLang->MESSAGE_SEND_CONFIRMED_REGISTRATION.$mLang->MESSAGE_SUCCESS_EMAIL_TEXT_GENERATED; $mail_message = str_replace($search, $replace, $mail_message); +//print '
function '.__FUNCTION__.'( '.''.' );  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> 
'; 
+//print_r( $mail_message ); print '
'; // flush ();sleep(10); die(); } } // now send user email, first prepare values for both of type @@ -77,5 +81,4 @@ $recipient = preg_replace( $regex, "?", $sDisplayName ); $email_fromname = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "?", $recipient ); $email_body = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $mail_message ); - - $bSendRegistrationMailtoUser = $wb->mail($sServerEmail,$email_to,$email_subject,$email_body,$sWebMailer); + $bSendRegistrationMailtoUser = $wb->mail($sServerEmail,$email_to,$sEmailSubject,$email_body,$sWebMailer); Index: branches/2.8.x/wb/account/confirm_form_mask.php =================================================================== --- branches/2.8.x/wb/account/confirm_form_mask.php (revision 2062) +++ branches/2.8.x/wb/account/confirm_form_mask.php (revision 2063) @@ -16,13 +16,17 @@ */ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -if(defined('WB_PATH') == false) -{ - die('

Cannot access this file directly

'); +if(!defined('WB_PATH')) { + require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ +$sIncludeHeadLinkCss = ''; +if( is_readable(WB_PATH .'/account/frontend.css')) { + $sIncludeHeadLinkCss .= 'set_file('page', 'confirm.htt'); Index: branches/2.8.x/wb/account/confirm.php =================================================================== --- branches/2.8.x/wb/account/confirm.php (revision 2062) +++ branches/2.8.x/wb/account/confirm.php (revision 2063) @@ -15,7 +15,21 @@ * */ -require_once('../config.php'); +$config_file = realpath('../framework/initialize.php'); +if(file_exists($config_file) && !defined('WB_URL')) +{ + $sAutoLanguage = 'EN'; +// 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=( isset($_SESSION['LANGUAGE'] ) ? $_SESSION['LANGUAGE'] : $sAutoLanguage); + if(!defined('LANGUAGE')) { define('LANGUAGE',$sAutoLanguage); } + + require_once($config_file); +} $mLang = Translate::getinstance(); $mLang->enableAddon('account'); Index: branches/2.8.x/wb/account/signup.php =================================================================== --- branches/2.8.x/wb/account/signup.php (revision 2062) +++ branches/2.8.x/wb/account/signup.php (revision 2063) @@ -23,9 +23,19 @@ */ // Include config file -$config_file = realpath('../config.php'); +$config_file = realpath('../framework/initialize.php'); if(file_exists($config_file) && !defined('WB_URL')) { + $sAutoLanguage = 'EN'; +// 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=( isset($_SESSION['LANGUAGE'] ) ? $_SESSION['LANGUAGE'] : $sAutoLanguage); + if(!defined('LANGUAGE')) { define('LANGUAGE',$sAutoLanguage); } + require_once($config_file); } @@ -61,8 +71,8 @@ $wb->send_header(WB_URL.'/index.php'); } -$langDir = WB_PATH . '/languages/' . LANGUAGE . '.php'; -require_once(!file_exists($langDir) ? WB_PATH . '/languages/EN.php' : $langDir ); +//$langDir = WB_PATH . '/languages/' . LANGUAGE . '.php'; +//require_once(!file_exists($langDir) ? WB_PATH . '/languages/EN.php' : $langDir ); $_SESSION['display_form'] = true; Index: branches/2.8.x/wb/account/save_confirm.php =================================================================== --- branches/2.8.x/wb/account/save_confirm.php (revision 2062) +++ branches/2.8.x/wb/account/save_confirm.php (revision 2063) @@ -30,7 +30,7 @@ $sLoginName = $database->escapeString($wb->StripCodeFromText($wb->get_post('new_loginname'))); $sConfirmationId = $database->escapeString($wb->StripCodeFromText($wb->get_post('confirm_code'))); -$bSendRegistrationMailtoUser = false; +$bSendRegistrationMailtoUser = false; $bSendRegistrationMailtoAdmin = false; $aUser = array(); if( ($sPassword=='') || ($sLoginName=='') ) { Index: branches/2.8.x/wb/account/confirm_form.php =================================================================== --- branches/2.8.x/wb/account/confirm_form.php (revision 2062) +++ branches/2.8.x/wb/account/confirm_form.php (revision 2063) @@ -16,9 +16,9 @@ */ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -if(defined('WB_PATH') == false) -{ - die('

Cannot access this file directly

'); +if(!defined('WB_PATH')) { + require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ @@ -27,6 +27,12 @@ // load module language file $mLang = Translate::getInstance(); $mLang->enableAddon('account'); + $sIncludeHeadLinkCss = ''; + if( is_readable(WB_PATH .'/account/frontend.css')) { + $sIncludeHeadLinkCss .= 'format_message($msg, 'ok').$output; -// } -// if( ($msg = msgQueue::getError()) != '') -// { -// $output = $admin->format_message($msg, 'error').$output; -// } -// print $output; Index: branches/2.8.x/wb/account/frontend.css =================================================================== --- branches/2.8.x/wb/account/frontend.css (revision 2062) +++ branches/2.8.x/wb/account/frontend.css (revision 2063) @@ -46,5 +46,6 @@ div.box-info { border-color :#bb7a00; color :#003ff2; } div.box-warning { border-color :#ffa500; color :#ffa500; } /* Border attributes for mbox and other elements also *********************** */ - +.signup { } +.nixhier {display: none;} /* ]]> */ Index: branches/2.8.x/wb/account/languages/EN.php =================================================================== --- branches/2.8.x/wb/account/languages/EN.php (revision 2062) +++ branches/2.8.x/wb/account/languages/EN.php (revision 2063) @@ -36,7 +36,7 @@ $HEADING['SIGNUP2_CONFIMED_REGISTRATION'] = 'Unlock account'; $HEADING['MESSAGE_WELCOME'] = 'Welcome to unlock of your account'; -$HELP['SIGNUP_REMEMBER_PASSWORD'] = 'Remember your Loginname and Passwoprd please! You will need it later to complete the activation!'; +$HELP['SIGNUP_REMEMBER_PASSWORD'] = '"Please remember your login name and password! Afterwards you will need it to complete your activation!" '; $HELP['CONFIRM_PASSWORD'] = 'Enter your Loginname and Password please to finish the the activation!'; $MESSAGE['ACTIVATED_NEW_USER'] = 'Your account is activated. You can logon now.'; @@ -95,11 +95,11 @@ $MESSAGE['CONFIRMED'] .= 'Thank you!'; $MESSAGE['CHANGE_PASSWORD'] = 'For security reasons change the password as soon as possible please. For that visit following website:'; -$MESSAGE['LOGIN_BOTH_BLANK'] = 'Give your login name and password please'; -$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Give your password please'; +$MESSAGE['LOGIN_BOTH_BLANK'] = 'Please enter your login name and password'; +$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Please enter your password'; $MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'given password is too long'; $MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'given password is too short'; -$MESSAGE['LOGIN_USERNAME_BLANK'] = 'Give your login name please'; +$MESSAGE['LOGIN_USERNAME_BLANK'] = 'Please enter your login name'; $MESSAGE['LOGIN_USERNAME_TOO_LONG'] = 'given login name is too long'; $MESSAGE['LOGIN_USERNAME_TOO_SHORT'] = 'given login name is too short'; $MESSAGE['MAIL_GENERATED'] = 'This email is autogenerated by WebsiteBaker! Do NOT answer to this e-mail! If you need some help or you have any questions, please contact Webmaster'; @@ -142,7 +142,7 @@ $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your WB account data ...'; $MESSAGE['SIGNUP_NO_EMAIL'] = 'Please key in your valid email address'; -$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. +$MESSAGE['SIGNUP_CONFIRMED_REGISTRATION'] = "During the next minutes you will be receive an 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'] = 'You get your data by e-mail!!'; Index: branches/2.8.x/wb/account/languages/DE.php =================================================================== --- branches/2.8.x/wb/account/languages/DE.php (revision 2062) +++ branches/2.8.x/wb/account/languages/DE.php (revision 2063) @@ -27,8 +27,8 @@ // Array fuer alle sprachabhaengigen Textausgaben im Front- und Backend // Hinweis: Verwende nachfolgende Namenskonvention für die Sprachausgabe des Moduls: $MOD_MODULE_DIRECTORY $MOD_PREFERENCE = array( - 'PLEASE_SELECT' => 'bitte wählen', - 'DETAILS_SAVED' => 'allgemeine Einstellungen geändert', + 'PLEASE_SELECT' => 'bitte wählen', + 'DETAILS_SAVED' => 'allgemeine Einstellungen geändert', 'SAVE_SETTINGS' => 'Einstellungen speichern', 'SAVE_EMAIL' => 'Email speichern', 'SAVE_PASSWORD' => 'Passwort speichern', @@ -144,19 +144,19 @@ "; -$MESSAGE['SIGNUP2_SUBJECT_NEW_USER'] = 'Vielen Dank für Ihre Registrierung!'; +$MESSAGE['SIGNUP2_SUBJECT_NEW_USER'] = 'Vielen Dank für Ihre Registrierung!'; $MESSAGE['SIGNUP2_NEW_USER'] = 'Es wurde ein neuer User regisriert'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Deine WB Logindaten ...'; $MESSAGE['SIGNUP_NO_EMAIL'] = 'Bitte geben Sie Ihre E-Mail Adresse an'; -$MESSAGE['SIGNUP_CONFIRMED_REGISTRATION'] = "Um Ihr Konto nutzen zu können, erhalten Sie eine E-Mail mit einem Link, um Ihr Konto zu aktivieren. -
Die Aktivierung muss innerhalb 24 Stunden erfolgen, da ansonsten das Konto wieder gelöscht wird. +$MESSAGE['SIGNUP_CONFIRMED_REGISTRATION'] = "Um Ihr Konto nutzen zu können, erhalten Sie eine E-Mail mit einem Link, um Ihr Konto zu aktivieren. +
Die Aktivierung muss innerhalb 24 Stunden erfolgen, da ansonsten das Konto wieder gelöscht wird. "; $MESSAGE['SIGNUP_REGISTRATION'] = 'Sie erhalten Ihre Zugangsdaten per E-Mail!!'; $MESSAGE['SIGNUP_NEW_USER'] = 'Das Konto wurde angelegt.'; $MESSAGE['SIGNUP_ACTIVATION'] = 'Kontoaktivierung'; -$TEXT['NEED_CURRENT_PASSWORD'] = 'mit aktuellem Passwort bestätigen'; +$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'; Index: branches/2.8.x/wb/account/confirm_mails.php =================================================================== --- branches/2.8.x/wb/account/confirm_mails.php (revision 2062) +++ branches/2.8.x/wb/account/confirm_mails.php (revision 2063) @@ -17,9 +17,9 @@ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly -if(defined('WB_PATH') == false) -{ - die('

Cannot access this file directly

'); +if(!defined('WB_PATH')) { + require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ if (!function_exists('ObfuscateIp')) { @@ -48,9 +48,16 @@ // load module language file $mLang = Translate::getInstance(); $mLang->enableAddon('account'); + //WB_MAILER settings $sServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : emailAdmin()); $sWebMailer = (defined('WBMAILER_DEFAULT_SENDERNAME') && WBMAILER_DEFAULT_SENDERNAME != '' ? WBMAILER_DEFAULT_SENDERNAME : 'WebsiteBaker Mailer'); +$sIncludeHeadLinkCss = ''; +if( is_readable(WB_PATH .'/account/frontend.css')) { + $sIncludeHeadLinkCss .= 'MESSAGE_SIGNUP2_ADMIN_INFO; + $email_subject = $mLang->MESSAGE_SIGNUP2_NEW_USER; $search = array('{LOGIN_EMAIL}','{LOGIN_ID}', '{SIGNUP_DATE}', '{LOGIN_NAME}', '{LOGIN_IP}'); $replace = array($email_to, $email_fromname.' ('.$iUserId.')', date(DATE_FORMAT.' '.TIME_FORMAT,$get_ts ), $sLoginName, $sLoginIp); $mail_message = str_replace($search, $replace, $mail_message); @@ -96,6 +103,7 @@ $oTpl->set_file('page', 'success.htt'); $oTpl->debug = false; // false, true $oTpl->set_block('page', 'main_block', 'main'); +// $oTpl->parse('CSS_BLOCK', $sIncludeHeadLinkCss); // show messages, default block off $oTpl->set_block('main_block', 'show_registration_block', 'message'); $oTpl->parse('message', ''); Index: branches/2.8.x/wb/account/save_signup.php =================================================================== --- branches/2.8.x/wb/account/save_signup.php (revision 2062) +++ branches/2.8.x/wb/account/save_signup.php (revision 2063) @@ -66,6 +66,9 @@ return false; } } +// load module language file +//$lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php'; +//require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang ); //if(isset($_POST['action']) && $_POST['action']=='send') if($wb->StripCodeFromText($wb->get_post('action'))=='send') @@ -102,19 +105,16 @@ // Check if username already exists $sql = 'SELECT `user_id` FROM `'.TABLE_PREFIX.'users` WHERE `username` = \''.$_SESSION['USERNAME'].'\''; if($database->get_one($sql)){ -// $aErrorMsg[] = $MESSAGE['USERS_USERNAME_TAKEN']; - msgQueue::add($MESSAGE['USERS_USERNAME_TAKEN']); + msgQueue::add($mLang->MESSAGE_USERS_USERNAME_TAKEN); $_SESSION['USERNAME'] = ''; } else { if(preg_match('/^[a-z]{1}[a-z0-9_-]{3,}$/i', $_SESSION['USERNAME'])==false) { -// $aErrorMsg[] = $MESSAGE['USERS_NAME_INVALID_CHARS']; - msgQueue::add($MESSAGE['USERS_NAME_INVALID_CHARS']); + msgQueue::add($mLang->MESSAGE_USERS_NAME_INVALID_CHARS); $_SESSION['USERNAME'] = ''; } } } else { -// $aErrorMsg[] = $MESSAGE['LOGIN_USERNAME_BLANK']; - msgQueue::add($MESSAGE['LOGIN_USERNAME_BLANK']); + msgQueue::add($mLang->MESSAGE_LOGIN_USERNAME_BLANK); } // check that display_name is unique in whoole system (prevents from User-faking) @@ -121,11 +121,12 @@ $sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'users` '; $sql .= 'WHERE `user_id` <> '.(int)$admin->get_user_id().' AND `display_name` LIKE "'.$wb->get_session('DISPLAY_NAME').'"'; if( ($iFoundUser = intval($database->get_one($sql))) > 0 ){ - msgQueue::add($MESSAGE['USERS_USERNAME_TAKEN'].' ('.$TEXT['DISPLAY_NAME'].')'); +// msgQueue::add($mLang->MESSAGE_USERS_USERNAME_TAKEN ); +// $_SESSION['USERNAME'] = ''; +// } else { + if($wb->get_session('DISPLAY_NAME') == '') { + msgQueue::add($mLang->MESSAGE_GENERIC_FILL_IN_ALL.' ('.$mLang->TEXT_DISPLAY_NAME.')'); $_SESSION['DISPLAY_NAME'] = ''; - } else { - if($wb->get_session('DISPLAY_NAME') == '') { - msgQueue::add($MESSAGE['GENERIC_FILL_IN_ALL'].' ('.$TEXT['DISPLAY_NAME'].')'); } } @@ -133,23 +134,18 @@ // Check if the email already exists $sql = 'SELECT `user_id` FROM `'.TABLE_PREFIX.'users` WHERE `email` = \''.$_SESSION['EMAIL'].'\''; if($database->get_one($sql)){ - msgQueue::add($MESSAGE['USERS_EMAIL_TAKEN']); + msgQueue::add($mLang->MESSAGE_USERS_EMAIL_TAKEN); $_SESSION['EMAIL'] = ''; } else { if(!$wb->validate_email($_SESSION['EMAIL'])){ - msgQueue::add($MESSAGE['USERS_INVALID_EMAIL']); + msgQueue::add($mLang->MESSAGE_USERS_INVALID_EMAIL); $_SESSION['EMAIL'] = ''; } } } else { - msgQueue::add($MESSAGE['SIGNUP_NO_EMAIL']); + msgQueue::add($mLang->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 @@ -163,14 +159,14 @@ $sPwHashNew = false; if($sNewPassword != '') { if(strlen($sNewPassword) < $iMinPassLength) { - msgQueue::add($MESSAGE['USERS_PASSWORD_TOO_SHORT']); + msgQueue::add($mLang->MESSAGE_USERS_PASSWORD_TOO_SHORT); } else { if($sNewPassword != $sNewPasswordRetyped) { - msgQueue::add($MESSAGE['USERS_PASSWORD_MISMATCH']); + msgQueue::add($mLang->MESSAGE_USERS_PASSWORD_MISMATCH); } else { $pattern = '/[^'.$wb->password_chars.']/'; if (preg_match($pattern, $sNewPassword)) { - msgQueue::add($MESSAGE['PREFERENCES_INVALID_CHARS']); + msgQueue::add($mLang->MESSAGE_PREFERENCES_INVALID_CHARS); }else { $sPwHashNew = md5($sNewPassword); } @@ -177,7 +173,7 @@ } } } else { - msgQueue::add($MESSAGE['LOGIN_PASSWORD_BLANK']); + msgQueue::add($mLang->MESSAGE_LOGIN_PASSWORD_BLANK); } } else { @@ -190,10 +186,10 @@ { // Check for a mismatch get email user_id if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { - msgQueue::add(replace_vars($MESSAGE['INCORRECT_CAPTCHA'], $aReplacement)); + msgQueue::add(replace_vars($mLang->MESSAGE_INCORRECT_CAPTCHA, $aReplacement)); } } else { - msgQueue::add(replace_vars($MESSAGE['INCORRECT_CAPTCHA'],$aReplacement )); + msgQueue::add(replace_vars($mLang->MESSAGE_INCORRECT_CAPTCHA,$aReplacement )); } } if(isset($_SESSION['captcha'])) { unset($_SESSION['captcha']); } @@ -213,6 +209,7 @@ if( ($msg = msgQueue::getError()) != '') { // back to signup_form to show errors, otherwise save user and send mail + } else { $get_ip = ObfuscateIp(); $get_ts = time(); @@ -268,13 +265,15 @@ } } else { $bSaveRegistration = true; - msgQueue::add($MESSAGE['SIGNUP_NEW_USER'],true); - + msgQueue::add($mLang->MESSAGE_SIGNUP_NEW_USER,true); + // send mails and check if $bSendRegistrationMailtoUser was send include(dirname(__FILE__).'/signup_mails.php'); if($bSaveRegistration && $bSendRegistrationMailtoUser) { // send success message to screen, no signup form $_SESSION['display_form'] = false; + } else { + msgQueue::add('No Activation E-Mail was send! Contact your Administrator'); } } // end success $bSaveRegistration Index: branches/2.8.x/wb/account/signup_form.php =================================================================== --- branches/2.8.x/wb/account/signup_form.php (revision 2062) +++ branches/2.8.x/wb/account/signup_form.php (revision 2063) @@ -28,12 +28,34 @@ //require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang ); require_once(WB_PATH.'/include/captcha/captcha.php'); - include_once (WB_PATH.'/framework/functions.php'); $mLang = Translate::getinstance(); $mLang->enableAddon('account'); +$oDb = WbDatabase::getInstance(); +$oReg = WbAdaptor::getInstance(); +// default, if no information from client available +$aLangAddons = array(); +$aLangBrowser = array(); +$sAutoLanguage = 'EN'; +// 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=($wb->get_session('LANGUAGE')) ? $_SESSION['LANGUAGE'] : $sAutoLanguage; +if(!defined('LANGUAGE')) { define('LANGUAGE',$sAutoLanguage);} + +$sIncludeHeadLinkCss = ''; +if( is_readable(WB_PATH .'/account/frontend.css')) { + $sIncludeHeadLinkCss .= 'set_file('page', 'signup.htt'); @@ -61,6 +76,7 @@ $oTpl->debug = false; // false, true $oTpl->set_block('page', 'main_block', 'main'); // generell vars + $oTpl->set_var(array( 'FTAN' => $wb->getFTAN(), 'ACTION_URL' => WB_URL.'/account/signup.php', @@ -120,22 +136,19 @@ ) ); - - $aLangAddons = array(); - $aLangBrowser = array(); // read available languages from table addons $aLangAddons = $admin->getAvailableLanguages(); // default, if no information from client available - $sAutoLanguage = DEFAULT_LANGUAGE; +// $sAutoLanguage = 'EN'; // 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=($wb->get_session('LANGUAGE')) ? $_SESSION['LANGUAGE'] : $sAutoLanguage; +// 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=($wb->get_session('LANGUAGE')) ? $_SESSION['LANGUAGE'] : $sAutoLanguage; //$sAutoLanguage = 'NL'; $aLangUsed = array_flip(explode(',',$wb->getLanguagesInUsed())); @@ -161,6 +174,7 @@ $oTpl->set_block('main_block', 'captcha_block', 'captcha'); if(CONFIRMED_REGISTRATION) { $oTpl->parse('captcha', '', true); +// $oTpl->parse('CSS_BLOCK', $sIncludeHeadLinkCss); $oTpl->set_var(array( 'TEXT_NEW_PASSWORD' => $mLang->TEXT_NEW_PASSWORD, 'TEXT_RETYPE_NEW_PASSWORD' => $mLang->TEXT_RETYPE_NEW_PASSWORD, @@ -197,6 +211,7 @@ $oTpl->set_file('page', 'success.htt'); $oTpl->debug = false; // false, true $oTpl->set_block('page', 'main_block', 'main'); +// $oTpl->parse('CSS_BLOCK', $sIncludeHeadLinkCss); // show messages, default block off $oTpl->set_block('main_block', 'show_registration_block', 'message'); $oTpl->parse('message', '');