Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1772) +++ branches/2.8.x/CHANGELOG (revision 1773) @@ -13,6 +13,10 @@ +28 Sep-2012 Build 1773 Dietmar Woellbrink (Luisehahne) +! account split html and code ++ add signup activation registering ++ add missing icons in themes 28 Sep-2012 Build 1772 Dietmar Woellbrink (Luisehahne) # fixed show e-mail in submission overview ! set title to tooltip if you add a pageX Index: branches/2.8.x/wb/admin/skel/themes/htt/users_form.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/users_form.htt (revision 1772) +++ branches/2.8.x/wb/admin/skel/themes/htt/users_form.htt (revision 1773) @@ -6,6 +6,7 @@ document.getElementById(radio_off).checked = true; } +

{HEADING_MODIFY_USER}

@@ -13,10 +14,10 @@ {FTAN} - +
- + - + @@ -92,15 +93,14 @@ - -
{TEXT_USERNAME}:{TEXT_USERNAME}: @@ -25,7 +26,7 @@
{TEXT_USERNAME}:{TEXT_USERNAME}:
  + - +
- +
\ No newline at end of file Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1772) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1773) @@ -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.3'); -if(!defined('REVISION')) define('REVISION', '1772'); +if(!defined('REVISION')) define('REVISION', '1773'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/account/preferences.htt =================================================================== --- branches/2.8.x/wb/account/preferences.htt (revision 1772) +++ branches/2.8.x/wb/account/preferences.htt (nonexistent) @@ -1,137 +0,0 @@ - - -

- {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}: - -
  - - -
-
-
- -
- \ No newline at end of file Property changes on: branches/2.8.x/wb/account/preferences.htt ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Date Revision \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/html \ No newline at end of property Index: branches/2.8.x/wb/account/signup2.php =================================================================== --- branches/2.8.x/wb/account/signup2.php (revision 1772) +++ branches/2.8.x/wb/account/signup2.php (nonexistent) @@ -1,134 +0,0 @@ -get_post_escaped('username'))); -$display_name = strip_tags($wb->get_post_escaped('display_name')); -$email = $wb->get_post('email'); - -// Create a javascript back link -$js_back = WB_URL.'/account/signup.php'; -/* -if (!$wb->checkFTAN()) -{ - $wb->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back, false); - exit(); -} -*/ -// Check values -if($groups_id == "") { - $wb->print_error($MESSAGE['USERS_NO_GROUP'], $js_back, false); -} -if(!preg_match('/^[a-z]{1}[a-z0-9_-]{2,}$/i', $username)) { - $wb->print_error( $MESSAGE['USERS_NAME_INVALID_CHARS'].' / '. - $MESSAGE['USERS_USERNAME_TOO_SHORT'], $js_back); -} -if($email != "") { - if($wb->validate_email($email) == false) { - $wb->print_error($MESSAGE['USERS_INVALID_EMAIL'], $js_back, false); - } -} else { - $wb->print_error($MESSAGE['SIGNUP_NO_EMAIL'], $js_back, false); -} - -$email = $wb->add_slashes($email); -$search = array('{SERVER_EMAIL}'); -$replace = array( SERVER_EMAIL); -// Captcha -if(ENABLED_CAPTCHA) { - $aServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : $_SERVER['SERVER_NAME']); - $replace = array('SERVER_EMAIL' => $aServerEmail ); - $MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = replace_vars($MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'], $replace); - if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){ - // Check for a mismatch - if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { - $wb->print_error($MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'], $js_back, false); - } - } else { - $wb->print_error($MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'], $js_back, false); - } -} -if(isset($_SESSION['captcha'])) { unset($_SESSION['captcha']); } - -// Generate a random password then update the database with it -$new_pass = ''; -$salt = "abchefghjkmnpqrstuvwxyz0123456789"; -srand((double)microtime()*1000000); -$i = 0; -while ($i <= 7) { - $num = rand() % 33; - $tmp = substr($salt, $num, 1); - $new_pass = $new_pass . $tmp; - $i++; -} -$md5_password = md5($new_pass); - -// Check if username already exists -$results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE username = '$username'"); -if($results->numRows() > 0) { - $wb->print_error($MESSAGE['USERS_USERNAME_TAKEN'], $js_back, false); -} - -// Check if the email already exists -$results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE email = '".$wb->add_slashes($email)."'"); -if($results->numRows() > 0) { - if(isset($MESSAGE['USERS_EMAIL_TAKEN'])) { - $wb->print_error($MESSAGE['USERS_EMAIL_TAKEN'], $js_back, false); - } else { - $wb->print_error($MESSAGE['USERS_INVALID_EMAIL'], $js_back, false); - } -} - -// MD5 supplied password -$md5_password = md5($new_pass); - -// Inser the user into the database -$query = "INSERT INTO ".TABLE_PREFIX."users (group_id,groups_id,active,username,password,display_name,email) VALUES ('$groups_id', '$groups_id', '$active', '$username','$md5_password','$display_name','$email')"; -$database->query($query); - -if($database->is_error()) { - // Error updating database - $message = $database->get_error(); -} else { - // Setup email to send - $mail_to = $email; - $mail_subject = $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO']; - - // Replace placeholders from language variable with values - $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}'); - $replace = array($display_name, WEBSITE_TITLE, $username, $new_pass); - $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2_BODY_LOGIN_INFO']); - - // Try sending the email - if($wb->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) { - $display_form = false; - $wb->print_success($MESSAGE['FORGOT_PASS_PASSWORD_RESET'], WB_URL.'/account/login.php' ); - } else { - $database->query("DELETE FROM ".TABLE_PREFIX."users WHERE username = '$username'"); - $wb->print_error($MESSAGE['FORGOT_PASS_CANNOT_EMAIL'], $js_back, false); - } -} - Property changes on: branches/2.8.x/wb/account/signup2.php ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1,4 +0,0 ## -Id -Revision -HeadURL -Date \ No newline at end of property Index: branches/2.8.x/wb/account/signup_mails.php =================================================================== --- branches/2.8.x/wb/account/signup_mails.php (nonexistent) +++ branches/2.8.x/wb/account/signup_mails.php (revision 1773) @@ -0,0 +1,82 @@ +Cannot access this file directly'); +} +/* -------------------------------------------------------- */ + + //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'); + + $aDebugUserMail = array(); + $aDebugAdminMail = array(); + + $bSendRegistrationMailtoUser = false; + // Send mail to Admin easy old style + if(!CONFIRMED_REGISTRATION) + { + // first send to admin + $bSendRegistrationMailtoAdmin = false; + $sql = 'SELECT `user_id` FROM `'.TABLE_PREFIX.'users` '; + $sql .= 'ORDER BY `user_id` DESC '; + $user_id = $database->get_one($sql)+1; + + $mail_replyto = $email_to; + $mail_replyName = $sDisplayName; + $mail_message = $MESSAGE['SIGNUP2_ADMIN_INFO']; + $email_subject = $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); + $email_body = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $mail_message ); + $success_email_to = emailAdmin(); + + $bSendRegistrationMailtoAdmin = $wb->mail($sServerEmail,$success_email_to,$email_subject,$email_body,$mail_replyName,$mail_replyto); + +// 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}'); + $replace = array($sDisplayName, WEBSITE_TITLE, $sLoginName, $sNewPassword); + $mail_message = str_replace($search, $replace, $mail_message); + } + } else { +// prepare confirmation mail to user, Register with confirmation + 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}'); + $replace = array($sDisplayName, WEBSITE_TITLE, $sLoginName, $sConfirmedLink,$sConfirmedTimeOut); + $mail_message = $MESSAGE['SEND_CONFIRMED_REGISTRATION'].$MESSAGE['SUCCESS_EMAIL_TEXT_GENERATED']; + $mail_message = str_replace($search, $replace, $mail_message); + } + } +// now send user email, first prepare values for both of type + $email_body = ''; + $regex = "/[^a-z0-9ßöäüÖÄÜ !?:;,.\/_\-=+@#$&\*\(\)]/im"; + $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); Property changes on: branches/2.8.x/wb/account/signup_mails.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/account/confirm_form_mask.php =================================================================== --- branches/2.8.x/wb/account/confirm_form_mask.php (nonexistent) +++ branches/2.8.x/wb/account/confirm_form_mask.php (revision 1773) @@ -0,0 +1,84 @@ +Cannot access this file directly'); +} +/* -------------------------------------------------------- */ + + +// set template file and assign module and template block + $oTpl = new Template(dirname(__FILE__).'/htt','keep'); + $oTpl->set_file('page', 'confirm.htt'); + $oTpl->debug = false; // false, true + $oTpl->set_block('page', 'main_block', 'main'); + $oTpl->set_var(array( + 'FTAN' => $wb->getFTAN(), + 'ACTION_URL' => WB_URL.'/account/confirm.php', + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'HTTP_REFERER' => isset($_SESSION['HTTP_REFERER']) ? $_SESSION['HTTP_REFERER'] : WB_URL, + 'CONFIRM_CODE' => $sConfirmationId, + 'MESSAGE_VALUE' => '', + 'ERROR_VALUE' => '', + 'HEADING_SIGNUP' => $mLang->HEADING_SIGNUP2_CONFIMED_REGISTRATION, + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'HELP_CONFIRM_PASSWORD' => $mLang->HELP_CONFIRM_PASSWORD, + 'HEADING_MESSAGE_WELCOME' => $mLang->HEADING_MESSAGE_WELCOME, + 'TEXT_SIGNUP' => $mLang->TEXT_ACTIVATION, + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_CANCEL' => $TEXT['CANCEL'], + ) + ); +//print '
function '.__FUNCTION__.'( '.$sSubmitAction.' );  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> 
';
+//print_r( $sConfirmationId ); print '
'; + + $sSelected = ' selected="selected"'; + $checked = ' checked="checked"'; +// show messages, default block off + $oTpl->set_block('main_block', 'message_block', 'message'); + $oTpl->parse('message', ''); + if( ($msg = msgQueue::getError()) != '') + { + $output = $wb->format_message($msg, 'error'); + $oTpl->set_var('MESSAGE_VALUE',$output); + $oTpl->parse('message', 'message_block', true); + } + $oTpl->set_var('MESSAGE',''); + + $oTpl->set_block('main_block', 'asp_block', 'asp'); + if(ENABLED_ASP) { + $oTpl->set_var('DISPLAY_ASP','nixhier'); + $oTpl->parse('asp', 'asp_block', true); + } else { + $oTpl->parse('asp', '', true); + } + + $oTpl->set_var(array( + 'DISPLAY_USER' => '', + 'TEXT_USERNAME' => $mLang->TEXT_USERNAME, + 'TEXT_PASSWORD' => $mLang->TEXT_PASSWORD, + ) + ); + + // Parse template object + $oTpl->parse('main', 'main_block', false); + $output = $oTpl->finish($oTpl->parse('output', 'page')); + unset($oTpl); + print $output; Property changes on: branches/2.8.x/wb/account/confirm_form_mask.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/account/confirm.php =================================================================== --- branches/2.8.x/wb/account/confirm.php (nonexistent) +++ branches/2.8.x/wb/account/confirm.php (revision 1773) @@ -0,0 +1,66 @@ +setLanguage(dirname(__FILE__).'/languages/', $sAutoLanguage, DEFAULT_LANGUAGE); + +// form faked? Check the honeypot-fields. +if(ENABLED_ASP && isset($_POST['username']) && ( + (!isset($_POST['submitted_when']) OR !isset($_SESSION['submitted_when']) ) OR + ($_POST['submitted_when'] != $_SESSION['submitted_when']) OR + (!isset($_POST['email-address']) OR $_POST['email-address']) OR + (!isset($_POST['name']) OR $_POST['name']) OR + (!isset($_POST['full_name']) OR $_POST['full_name']) + )) +{ + $wb->send_header(WB_URL.'/index.php'); +} + +$page_id = isset($_SESSION['PAGE_ID']) ? intval($_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']; + +$page_description = ''; +$page_keywords = ''; +define('PAGE_ID', $page_id); +define('ROOT_PARENT', 0); +define('PARENT', 0); +define('LEVEL', 0); +define('PAGE_TITLE', $TEXT['SIGNUP']); +define('MENU_TITLE', $TEXT['SIGNUP']); +define('MODULE', ''); +define('VISIBILITY', 'public'); + +define('PAGE_CONTENT', WB_PATH.'/account/confirm_form.php'); + + +// Include the index (wrapper) file +require(WB_PATH.'/index.php'); + Property changes on: branches/2.8.x/wb/account/confirm.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/account/password.php =================================================================== --- branches/2.8.x/wb/account/password.php (revision 1772) +++ branches/2.8.x/wb/account/password.php (revision 1773) @@ -15,8 +15,14 @@ * */ -// Must include code to stop this file being access directly -if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } +/* -------------------------------------------------------- */ +// Must include code to stop this file being accessed directly +if(defined('WB_PATH') == false) +{ + // Stop this file being access directly + die('

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ // Get entered values $iMinPassLength = 6; Index: branches/2.8.x/wb/account/signup.php =================================================================== --- branches/2.8.x/wb/account/signup.php (revision 1772) +++ branches/2.8.x/wb/account/signup.php (revision 1773) @@ -3,9 +3,8 @@ * * @category frontend * @package account - * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2011, Website Baker Org. e.V. + * @author Ryan Djurovich, WebsiteBaker Project + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -19,40 +18,54 @@ require_once('../config.php'); ini_set('display_errors','0'); -if(!( intval(FRONTEND_SIGNUP) && ( 0 == (isset($_SESSION['USER_ID']) ? intval($_SESSION['USER_ID']) : 0) ))) +require_once(WB_PATH.'/framework/class.admin.php'); + +// Create new frontend object +$wb = new admin(); + +//require_once(dirname(__FILE__).'/MySignUp.php'); +//print '
function '.__FUNCTION__.'( '.$page_id.' );  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> 
';
+//print_r( dirname(__FILE__) ); print '
'; + +// +if( ( (intval(FRONTEND_SIGNUP)==0) && + ( 0 == (isset($_SESSION['USER_ID']) ? intval($_SESSION['USER_ID']) : 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(WB_URL.'/index.php'); +// if(INTRO_PAGE) { +// } else { +// header('Location: '.WB_URL.'/index.php'); +// exit(0); +// } } -if(ENABLED_ASP && isset($_POST['username']) && ( // form faked? Check the honeypot-fields. - (!isset($_POST['submitted_when']) OR !isset($_SESSION['submitted_when'])) OR - ($_POST['submitted_when'] != $_SESSION['submitted_when']) OR - (!isset($_POST['email-address']) OR $_POST['email-address']) OR - (!isset($_POST['name']) OR $_POST['name']) OR - (!isset($_POST['full_name']) OR $_POST['full_name']) -)) { - exit(header("Location: ".WB_URL.PAGES_DIRECTORY."")); +// form faked? Check the honeypot-fields. +if(ENABLED_ASP && isset($_POST['username']) && ( + (!isset($_POST['submitted_when']) OR !isset($_SESSION['submitted_when']) ) OR +// ($_POST['submitted_when'] != $_SESSION['submitted_when']) OR + (!isset($_POST['email-address']) OR $_POST['email-address']) OR + (!isset($_POST['name']) OR $_POST['name']) OR + (!isset($_POST['full_name']) OR $_POST['full_name']) + )) +{ + $wb->send_header(WB_URL.'/index.php'); } // Load the language file -if(!file_exists(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php')) { - exit('Error loading language file '.DEFAULT_LANGUAGE.', please check configuration'); -} else { - require_once(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php'); - $load_language = false; -} +//if(!file_exists(WB_PATH.'/languages/'.LANGUAGE.'.php')) { +// exit('Error loading language file '.LANGUAGE.', please check configuration'); +//} else { +// require_once(WB_PATH.'/languages/'.LANGUAGE.'.php'); +// $load_language = false; +//} -$page_id = (isset($_SESSION['PAGE_ID']) && ($_SESSION['PAGE_ID']!='') ? $_SESSION['PAGE_ID'] : 0); +$lang = WB_PATH . '/languages/' . LANGUAGE . '.php'; +require_once(!file_exists($lang) ? WB_PATH . '/languages/EN.php' : $lang ); + $_SESSION['display_form'] = true; -// Required page details -// $page_id = 0; +$page_id = isset($_SESSION['PAGE_ID']) ? intval($_SESSION['PAGE_ID']) : 0; + $page_description = ''; $page_keywords = ''; define('PAGE_ID', $page_id); @@ -65,14 +78,7 @@ define('VISIBILITY', 'public'); define('PAGE_CONTENT', WB_PATH.'/account/signup_form.php'); -/* -// Set the page content include file -if(isset($_POST['username'])) { - define('PAGE_CONTENT', WB_PATH.'/account/signup2.php'); -} else { - define('PAGE_CONTENT', WB_PATH.'/account/signup_form.php'); -} -*/ + // Set auto authentication to false $auto_auth = false; Index: branches/2.8.x/wb/account/htt/preferences.htt =================================================================== --- branches/2.8.x/wb/account/htt/preferences.htt (nonexistent) +++ branches/2.8.x/wb/account/htt/preferences.htt (revision 1773) @@ -0,0 +1,142 @@ + + + {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}: + +
 
+ + + +
+
+
+
+ \ No newline at end of file Property changes on: branches/2.8.x/wb/account/htt/preferences.htt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/account/htt/signup.htt =================================================================== --- branches/2.8.x/wb/account/htt/signup.htt (nonexistent) +++ branches/2.8.x/wb/account/htt/signup.htt (revision 1773) @@ -0,0 +1,92 @@ + + +{MESSAGE_VALUE} + + +
+
+
+ +
+ + + +

+ + + +
+ +
+ +
+

+ +

{HEADING_SIGNUP}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{TEXT_USERNAME}: + +
{TEXT_DISPLAY_NAME}: + +
{TEXT_EMAIL}: + +
{TEXT_LANGUAGE}: + +
{HELP_SIGNUP_REMEMBER_PASSWORD}
{TEXT_NEW_PASSWORD}: + +
{TEXT_RETYPE_NEW_PASSWORD}: + +
{TEXT_VERIFICATION}:{CAPTCHA}
 
+ + + +
+
+
+
+ \ No newline at end of file Property changes on: branches/2.8.x/wb/account/htt/signup.htt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/account/htt/login.htt =================================================================== --- branches/2.8.x/wb/account/htt/login.htt (revision 1772) +++ branches/2.8.x/wb/account/htt/login.htt (revision 1773) @@ -3,26 +3,27 @@ {MESSAGE_VALUE}

-
+
+ - +
\ No newline at end of file Index: branches/2.8.x/wb/account/htt/success.htt =================================================================== --- branches/2.8.x/wb/account/htt/success.htt (revision 1772) +++ branches/2.8.x/wb/account/htt/success.htt (revision 1773) @@ -1,5 +1,5 @@ -
+

{MESSAGE_VALUE}

Index: branches/2.8.x/wb/account/htt/blue.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/2.8.x/wb/account/htt/blue.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: branches/2.8.x/wb/account/htt/confirm.htt =================================================================== --- branches/2.8.x/wb/account/htt/confirm.htt (nonexistent) +++ branches/2.8.x/wb/account/htt/confirm.htt (revision 1773) @@ -0,0 +1,57 @@ + + +{MESSAGE_VALUE} + + +
+ + \ No newline at end of file Property changes on: branches/2.8.x/wb/account/htt/confirm.htt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/account/htt/forgot.htt =================================================================== --- branches/2.8.x/wb/account/htt/forgot.htt (revision 1772) +++ branches/2.8.x/wb/account/htt/forgot.htt (revision 1773) @@ -3,46 +3,43 @@ {MESSAGE_VALUE}

-