Revision 1924
Added by darkviper over 11 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 |
08 Jun-2013 Build 1924 Werner v.d.Decken(DarkViper) |
|
| 15 |
! syncronize project and some small typo corrections in /admin/ |
|
| 14 | 16 |
08 Jun-2013 Build 1923 Werner v.d.Decken(DarkViper) |
| 15 | 17 |
! syncronize project |
| 16 | 18 |
# some small corrections in /admin/ |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.3');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1923');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1924');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/account/confirm.php | ||
|---|---|---|
| 16 | 16 |
*/ |
| 17 | 17 |
|
| 18 | 18 |
require_once('../config.php');
|
| 19 |
$mLang = Translate::getinstance(); |
|
| 20 |
$mLang->enableAddon('account');
|
|
| 19 | 21 |
|
| 20 | 22 |
if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
|
| 21 | 23 |
|
| ... | ... | |
| 27 | 29 |
// load module language file |
| 28 | 30 |
//$sAutoLanguage = isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : AccountSignup::GetBowserLanguage(DEFAULT_LANGUAGE); |
| 29 | 31 |
|
| 30 |
$mLang = ModLanguage::getInstance(); |
|
| 31 |
$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
|
| 32 |
|
|
| 33 | 32 |
//$langDir = WB_PATH . '/languages/' . LANGUAGE . '.php'; |
| 34 | 33 |
//require_once(!file_exists($langDir) ? WB_PATH . '/languages/EN.php' : $langDir ); |
| 35 | 34 |
|
| ... | ... | |
| 63 | 62 |
define('ROOT_PARENT', $root_parent);
|
| 64 | 63 |
define('PARENT', 0);
|
| 65 | 64 |
define('LEVEL', $level);
|
| 66 |
define('PAGE_TITLE', $TEXT['SIGNUP']);
|
|
| 67 |
define('MENU_TITLE', $TEXT['SIGNUP']);
|
|
| 65 |
define('PAGE_TITLE', $mLang->TEXT_SIGNUP);
|
|
| 66 |
define('MENU_TITLE', $mLang->TEXT_SIGNUP);
|
|
| 68 | 67 |
define('MODULE', '');
|
| 69 | 68 |
define('VISIBILITY', 'public');
|
| 70 | 69 |
|
| 71 | 70 |
define('PAGE_CONTENT', WB_PATH.'/account/confirm_form.php');
|
| 72 | 71 |
|
| 73 |
|
|
| 72 |
$mLang->disableAddon(); |
|
| 74 | 73 |
// Include the index (wrapper) file |
| 75 | 74 |
require(WB_PATH.'/index.php'); |
| 76 | 75 |
|
| branches/2.8.x/wb/account/confirm_form.php | ||
|---|---|---|
| 25 | 25 |
require_once(dirname(__FILE__).'/AccountSignup.php'); |
| 26 | 26 |
|
| 27 | 27 |
// load module language file |
| 28 |
$mLang = ModLanguage::getInstance(); |
|
| 28 |
$mLang = Translate::getInstance(); |
|
| 29 |
$mLang->enableAddon('account');
|
|
| 29 | 30 |
|
| 30 | 31 |
$sConfirmationId = ( isset($_GET['id']) ? $_GET['id'] : ( isset($_POST['confirm_code']) ? $_POST['confirm_code'] : '' ) ); |
| 31 | 32 |
$sSubmitAction = 'show'; // default action |
| branches/2.8.x/wb/account/confirm_mails.php | ||
|---|---|---|
| 46 | 46 |
} |
| 47 | 47 |
|
| 48 | 48 |
// load module language file |
| 49 |
$mLang = ModLanguage::getInstance(); |
|
| 49 |
$mLang = Translate::getInstance(); |
|
| 50 |
$mLang->enableAddon('account');
|
|
| 50 | 51 |
//WB_MAILER settings |
| 51 | 52 |
$sServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : emailAdmin());
|
| 52 | 53 |
$sWebMailer = (defined('WBMAILER_DEFAULT_SENDERNAME') && WBMAILER_DEFAULT_SENDERNAME != '' ? WBMAILER_DEFAULT_SENDERNAME : 'WebsiteBaker Mailer');
|
| branches/2.8.x/wb/account/signup_form.php | ||
|---|---|---|
| 24 | 24 |
/* -------------------------------------------------------- */ |
| 25 | 25 |
|
| 26 | 26 |
// load module language file |
| 27 |
$lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php'; |
|
| 28 |
require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang ); |
|
| 27 |
//$lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
|
|
| 28 |
//require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang );
|
|
| 29 | 29 |
|
| 30 | 30 |
require_once(WB_PATH.'/include/captcha/captcha.php'); |
| 31 | 31 |
|
| 32 | 32 |
include_once (WB_PATH.'/framework/functions.php'); |
| 33 | 33 |
|
| 34 |
$mLang = ModLanguage::getInstance();
|
|
| 35 |
$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE);
|
|
| 34 |
$mLang = Translate::getinstance();
|
|
| 35 |
$mLang->enableAddon('account');
|
|
| 36 | 36 |
|
| 37 | 37 |
if(isset($_POST['action']) && $_POST['action']=='send') {
|
| 38 | 38 |
require(dirname(__FILE__).'/save_signup.php'); |
| ... | ... | |
| 70 | 70 |
'HTTP_REFERER' => $_SESSION['HTTP_REFERER'], |
| 71 | 71 |
'MESSAGE_VALUE' => '', |
| 72 | 72 |
'ERROR_VALUE' => '', |
| 73 |
'HEADING_SIGNUP' => $TEXT['SIGNUP'],
|
|
| 74 |
'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
|
|
| 75 |
'TEXT_SIGNUP' => $TEXT['SIGNUP'],
|
|
| 76 |
'TEXT_RESET' => $TEXT['RESET'],
|
|
| 77 |
'TEXT_CANCEL' => $TEXT['CANCEL'],
|
|
| 73 |
'HEADING_SIGNUP' => $mLang->TEXT_SIGNUP,
|
|
| 74 |
'TEXT_LANGUAGE' => $mLang->TEXT_LANGUAGE,
|
|
| 75 |
'TEXT_SIGNUP' => $mLang->TEXT_SIGNUP,
|
|
| 76 |
'TEXT_RESET' => $mLang->TEXT_RESET,
|
|
| 77 |
'TEXT_CANCEL' => $mLang->TEXT_CANCEL,
|
|
| 78 | 78 |
) |
| 79 | 79 |
); |
| 80 | 80 |
|
| ... | ... | |
| 102 | 102 |
|
| 103 | 103 |
// login label vars |
| 104 | 104 |
$oTpl->set_var(array( |
| 105 |
'TEXT_INFO' => $TEXT['INFO'],
|
|
| 106 |
'TEXT_USERNAME' => $TEXT['USERNAME'],
|
|
| 107 |
'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
|
|
| 108 |
'TEXT_EMAIL' => $TEXT['EMAIL'],
|
|
| 105 |
'TEXT_INFO' => $mLang->TEXT_INFO,
|
|
| 106 |
'TEXT_USERNAME' => $mLang->TEXT_USERNAME,
|
|
| 107 |
'TEXT_DISPLAY_NAME' => $mLang->TEXT_DISPLAY_NAME,
|
|
| 108 |
'TEXT_EMAIL' => $mLang->TEXT_EMAIL,
|
|
| 109 | 109 |
) |
| 110 | 110 |
); |
| 111 | 111 |
|
| ... | ... | |
| 169 | 169 |
if(CONFIRMED_REGISTRATION) {
|
| 170 | 170 |
$oTpl->parse('captcha', '', true);
|
| 171 | 171 |
$oTpl->set_var(array( |
| 172 |
'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'],
|
|
| 173 |
'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'],
|
|
| 174 |
'HELP_SIGNUP_REMEMBER_PASSWORD' => $HELP['SIGNUP_REMEMBER_PASSWORD'],
|
|
| 172 |
'TEXT_NEW_PASSWORD' => $mLang->TEXT_NEW_PASSWORD,
|
|
| 173 |
'TEXT_RETYPE_NEW_PASSWORD' => $mLang->TEXT_RETYPE_NEW_PASSWORD,
|
|
| 174 |
'HELP_SIGNUP_REMEMBER_PASSWORD' => $mLang->HELP_SIGNUP_REMEMBER_PASSWORD,
|
|
| 175 | 175 |
) |
| 176 | 176 |
); |
| 177 | 177 |
$oTpl->parse('password', 'password_block',true);
|
| ... | ... | |
| 182 | 182 |
call_captcha(); |
| 183 | 183 |
$captcha = ob_get_clean(); |
| 184 | 184 |
$oTpl->set_var(array( |
| 185 |
'TEXT_VERIFICATION' => $TEXT['VERIFICATION'],
|
|
| 185 |
'TEXT_VERIFICATION' => $mLang->TEXT_VERIFICATION,
|
|
| 186 | 186 |
'CAPTCHA' => $captcha, |
| 187 | 187 |
) |
| 188 | 188 |
); |
| ... | ... | |
| 214 | 214 |
$oTpl->parse('message', 'show_registration_block', true);
|
| 215 | 215 |
} |
| 216 | 216 |
$oTpl->set_var(array( |
| 217 |
'BACK' => $TEXT['BACK'],
|
|
| 217 |
'BACK' => $mLang->TEXT_BACK,
|
|
| 218 | 218 |
'HTTP_REFERER' => isset($_SESSION['HTTP_REFERER']) ? $_SESSION['HTTP_REFERER'] : WB_URL, |
| 219 | 219 |
) |
| 220 | 220 |
); |
| 221 | 221 |
|
| 222 | 222 |
if(CONFIRMED_REGISTRATION) {
|
| 223 |
$sMessage = $MESSAGE['SIGNUP2_SUBJECT_NEW_USER'].' ';
|
|
| 224 |
$sMessage .= $MESSAGE['SIGNUP_CONFIRMED_REGISTRATION'];
|
|
| 223 |
$sMessage = $mLang->MESSAGE_SIGNUP2_SUBJECT_NEW_USER.' ';
|
|
| 224 |
$sMessage .= $mLang->MESSAGE_SIGNUP_CONFIRMED_REGISTRATION;
|
|
| 225 | 225 |
$oTpl->set_var('MESSAGE',$sMessage);
|
| 226 | 226 |
} else {
|
| 227 |
$sMessage = $MESSAGE['SIGNUP2_SUBJECT_NEW_USER'].' ';
|
|
| 228 |
$sMessage .= $MESSAGE['SIGNUP_REGISTRATION'];
|
|
| 227 |
$sMessage = $mLang->MESSAGE_SIGNUP2_SUBJECT_NEW_USER.' ';
|
|
| 228 |
$sMessage .= $mLang->MESSAGE_SIGNUP_REGISTRATION;
|
|
| 229 | 229 |
$oTpl->set_var('MESSAGE',$sMessage);
|
| 230 | 230 |
} |
| 231 | 231 |
//$oTpl->parse('message', 'message_block', true);
|
Also available in: Unified diff
syncronize project and some small typo corrections in /account/