Index: branches/main/admin/interface/version.php =================================================================== --- branches/main/admin/interface/version.php (revision 21) +++ branches/main/admin/interface/version.php (revision 22) @@ -48,7 +48,7 @@ if (!defined('VERSION_LOADED')) { $sInfo = ' VERSION = "2.10.1-dev" - REVISION = "21" + REVISION = "22" SP = "" '; foreach (parse_ini_string($sInfo) as $item=>$value) { Index: branches/main/framework/initialize.php =================================================================== --- branches/main/framework/initialize.php (revision 21) +++ branches/main/framework/initialize.php (revision 22) @@ -267,8 +267,14 @@ } error_reporting(E_ALL); $sStarttime = array_sum(explode(" ", microtime())); + if (!defined('MAX_DATETIME')) { define('MAX_DATETIME', ((2**31)-1)); } /* -------------------------------------------------------- */ if ( !defined('WB_PATH')) { define('WB_PATH', dirname(__DIR__)); } +// activate Autoloader + if (!class_exists('\bin\CoreAutoloader')) { + include __DIR__.'/CoreAutoloader.php'; + } + \bin\CoreAutoloader::doRegister(); // *** initialize Exception handling if(!function_exists('globalExceptionHandler')) { include(__DIR__.'/globalExceptionHandler.php'); @@ -312,161 +318,158 @@ define('DOCUMENT_ROOT', preg_replace('/'.preg_quote(str_replace('\\', '/', WB_REL), '/').'$/', '', str_replace('\\', '/', WB_PATH))); $_SERVER['DOCUMENT_ROOT'] = DOCUMENT_ROOT; } -// activate Autoloader - if (!class_exists('\bin\CoreAutoloader')) { - include __DIR__.'/CoreAutoloader.php'; - } - \bin\CoreAutoloader::doRegister(['acp' => ADMIN_DIRECTORY]); +// add Namespace 'acp' to Autoloader + \bin\CoreAutoloader::addNamespace('acp', ADMIN_DIRECTORY); -if (class_exists('database')) { - // sanitize $_SERVER['HTTP_REFERER'] - SanitizeHttpReferer(WB_URL); - date_default_timezone_set('UTC'); - // register TWIG autoloader --- - $sTmp = dirname(dirname(__FILE__)).'/include/Sensio/Twig/lib/Twig/Autoloader.php'; - if (!class_exists('Twig_Autoloader') && is_readable($sTmp)){ - include $sTmp; - Twig_Autoloader::register(); - } -// register PHPMailer autoloader --- - $sTmp = dirname(dirname(__FILE__)).'/include/phpmailer/PHPMailerAutoload.php'; - if (!function_exists('PHPMailerAutoload') && is_readable($sTmp)) { - include $sTmp; - } - // Create database class - $database = new database(); + if (class_exists('database')) { + // sanitize $_SERVER['HTTP_REFERER'] + SanitizeHttpReferer(WB_URL); + date_default_timezone_set('UTC'); + // register TWIG autoloader --- + $sTmp = dirname(dirname(__FILE__)).'/include/Sensio/Twig/lib/Twig/Autoloader.php'; + if (!class_exists('Twig_Autoloader') && is_readable($sTmp)){ + include $sTmp; + Twig_Autoloader::register(); + } + // register PHPMailer autoloader --- + $sTmp = dirname(dirname(__FILE__)).'/include/phpmailer/PHPMailerAutoload.php'; + if (!function_exists('PHPMailerAutoload') && is_readable($sTmp)) { + include $sTmp; + } + // Create database class + $database = new database(); - // activate frontend OutputFilterApi (initialize.php) - if (is_readable(WB_PATH .'/modules/output_filter/OutputFilterApi.php')) { - if (!function_exists('OutputFilterApi')) { - include WB_PATH .'/modules/output_filter/OutputFilterApi.php'; + // activate frontend OutputFilterApi (initialize.php) + if (is_readable(WB_PATH .'/modules/output_filter/OutputFilterApi.php')) { + if (!function_exists('OutputFilterApi')) { + include WB_PATH .'/modules/output_filter/OutputFilterApi.php'; + } + } else { + throw new RuntimeException('missing mandatory global OutputFilterApi!'); } - } else { - throw new RuntimeException('missing mandatory global OutputFilterApi!'); - } - // Get website settings (title, keywords, description, header, and footer) - $sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings`'; - if (($get_settings = $database->query($sql))) { - $x = 0; - while ($setting = $get_settings->fetchRow(MYSQLI_ASSOC)) { - $setting_name = strtoupper($setting['name']); - $setting_value = $setting['value']; - if ($setting_value == 'false') { - $setting_value = false; + // Get website settings (title, keywords, description, header, and footer) + $sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings`'; + if (($get_settings = $database->query($sql))) { + $x = 0; + while ($setting = $get_settings->fetchRow(MYSQLI_ASSOC)) { + $setting_name = strtoupper($setting['name']); + $setting_value = $setting['value']; + if ($setting_value == 'false') { + $setting_value = false; + } + if ($setting_value == 'true') { + $setting_value = true; + } + defined($setting_name) ? '' : define($setting_name, $setting_value); + $x++; } - if ($setting_value == 'true') { - $setting_value = true; + } else { + die($database->get_error()); + } + if (!$x) { + throw new RuntimeException('no settings found'); + } + defined('DO_NOT_TRACK') ? '' : define('DO_NOT_TRACK', (isset($_SERVER['HTTP_DNT']))); + ini_set('display_errors', ((defined('DEBUG') && (DEBUG==true)) ?'1':'0')); + + defined('DEBUG') ? '' : define('DEBUG', false); + $string_file_mode = defined('STRING_FILE_MODE') ? STRING_FILE_MODE : '0644'; + defined('OCTAL_FILE_MODE') ? '' : define('OCTAL_FILE_MODE', (int) octdec($string_file_mode)); + $string_dir_mode = defined('STRING_DIR_MODE') ? STRING_DIR_MODE : '0755'; + defined('OCTAL_DIR_MODE') ? '' : define('OCTAL_DIR_MODE', (int) octdec($string_dir_mode)); + // $sSecMod = (defined('SECURE_FORM_MODULE') && SECURE_FORM_MODULE != '') ? '.'.SECURE_FORM_MODULE : ''; + // $sSecMod = WB_PATH.'/framework/SecureForm'.$sSecMod.'.php'; + // require_once($sSecMod); + if (!defined('WB_INSTALL_PROCESS')) { + // get CAPTCHA and ASP settings + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_captcha_control`'; + if (($get_settings = $database->query($sql)) && + ($setting = $get_settings->fetchRow(MYSQLI_ASSOC)) + ) { + defined('ENABLED_CAPTCHA') ? '' : define('ENABLED_CAPTCHA', (bool) ($setting['enabled_captcha'] == '1')); + defined('ENABLED_ASP') ? '' : define('ENABLED_ASP', (bool) ($setting['enabled_asp'] == '1')); + defined('CAPTCHA_TYPE') ? '' : define('CAPTCHA_TYPE', $setting['captcha_type']); + defined('ASP_SESSION_MIN_AGE') ? '' : define('ASP_SESSION_MIN_AGE', (int) $setting['asp_session_min_age']); + defined('ASP_VIEW_MIN_AGE') ? '' : define('ASP_VIEW_MIN_AGE', (int) $setting['asp_view_min_age']); + defined('ASP_INPUT_MIN_AGE') ? '' : define('ASP_INPUT_MIN_AGE', (int) $setting['asp_input_min_age']); + } else { + throw new RuntimeException('CAPTCHA-Settings not found'); } - defined($setting_name) ? '' : define($setting_name, $setting_value); - $x++; } - } else { - die($database->get_error()); - } - if (!$x) { - throw new RuntimeException('no settings found'); - } - defined('DO_NOT_TRACK') ? '' : define('DO_NOT_TRACK', (isset($_SERVER['HTTP_DNT']))); - ini_set('display_errors', ((defined('DEBUG') && (DEBUG==true)) ?'1':'0')); - defined('DEBUG') ? '' : define('DEBUG', false); - $string_file_mode = defined('STRING_FILE_MODE') ? STRING_FILE_MODE : '0644'; - defined('OCTAL_FILE_MODE') ? '' : define('OCTAL_FILE_MODE', (int) octdec($string_file_mode)); - $string_dir_mode = defined('STRING_DIR_MODE') ? STRING_DIR_MODE : '0755'; - defined('OCTAL_DIR_MODE') ? '' : define('OCTAL_DIR_MODE', (int) octdec($string_dir_mode)); -// $sSecMod = (defined('SECURE_FORM_MODULE') && SECURE_FORM_MODULE != '') ? '.'.SECURE_FORM_MODULE : ''; -// $sSecMod = WB_PATH.'/framework/SecureForm'.$sSecMod.'.php'; -// require_once($sSecMod); - if (!defined('WB_INSTALL_PROCESS')) { - // get CAPTCHA and ASP settings - $sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_captcha_control`'; - if (($get_settings = $database->query($sql)) && - ($setting = $get_settings->fetchRow(MYSQLI_ASSOC)) + // Start a session + if (!defined('SESSION_STARTED')) { + session_name(APP_NAME.'-sid'); + @session_start(); + define('SESSION_STARTED', true); + } + if (defined('ENABLED_ASP') && ENABLED_ASP && !isset($_SESSION['session_started'])) { + $_SESSION['session_started'] = time(); + } + // Get users language + if ( + isset($_GET['lang']) AND + $_GET['lang'] != '' AND + !is_numeric($_GET['lang']) AND + strlen($_GET['lang']) == 2 ) { - defined('ENABLED_CAPTCHA') ? '' : define('ENABLED_CAPTCHA', (bool) ($setting['enabled_captcha'] == '1')); - defined('ENABLED_ASP') ? '' : define('ENABLED_ASP', (bool) ($setting['enabled_asp'] == '1')); - defined('CAPTCHA_TYPE') ? '' : define('CAPTCHA_TYPE', $setting['captcha_type']); - defined('ASP_SESSION_MIN_AGE') ? '' : define('ASP_SESSION_MIN_AGE', (int) $setting['asp_session_min_age']); - defined('ASP_VIEW_MIN_AGE') ? '' : define('ASP_VIEW_MIN_AGE', (int) $setting['asp_view_min_age']); - defined('ASP_INPUT_MIN_AGE') ? '' : define('ASP_INPUT_MIN_AGE', (int) $setting['asp_input_min_age']); + define('LANGUAGE', strtoupper($_GET['lang'])); + $_SESSION['LANGUAGE']=LANGUAGE; } else { - throw new RuntimeException('CAPTCHA-Settings not found'); + if (isset($_SESSION['LANGUAGE']) AND $_SESSION['LANGUAGE'] != '') { + define('LANGUAGE', $_SESSION['LANGUAGE']); + } else { + define('LANGUAGE', DEFAULT_LANGUAGE); + } } - } - - // Start a session - if (!defined('SESSION_STARTED')) { - session_name(APP_NAME.'-sid'); - @session_start(); - define('SESSION_STARTED', true); - } - if (defined('ENABLED_ASP') && ENABLED_ASP && !isset($_SESSION['session_started'])) { - $_SESSION['session_started'] = time(); - } - // Get users language - if ( - isset($_GET['lang']) AND - $_GET['lang'] != '' AND - !is_numeric($_GET['lang']) AND - strlen($_GET['lang']) == 2 - ) { - define('LANGUAGE', strtoupper($_GET['lang'])); - $_SESSION['LANGUAGE']=LANGUAGE; - } else { - if (isset($_SESSION['LANGUAGE']) AND $_SESSION['LANGUAGE'] != '') { - define('LANGUAGE', $_SESSION['LANGUAGE']); - } else { - define('LANGUAGE', DEFAULT_LANGUAGE); + $sCachePath = dirname(__DIR__).'/temp/cache/'; + if (!file_exists($sCachePath)) { + if (!mkdir($sCachePath, 0777, true)) { $sCachePath = dirname(__DIR__).'/temp/'; } } - } - $sCachePath = dirname(__DIR__).'/temp/cache/'; - if (!file_exists($sCachePath)) { - if (!mkdir($sCachePath, 0777, true)) { $sCachePath = dirname(__DIR__).'/temp/'; } - } - // Load Language file(s) - $sCurrLanguage = ''; - $slangFile = WB_PATH.'/languages/EN.php'; - if (is_readable($slangFile)) { - require $slangFile; - $sCurrLanguage ='EN'; - } - if ($sCurrLanguage != DEFAULT_LANGUAGE) { - $slangFile = WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php'; + // Load Language file(s) + $sCurrLanguage = ''; + $slangFile = WB_PATH.'/languages/EN.php'; if (is_readable($slangFile)) { require $slangFile; - $sCurrLanguage = DEFAULT_LANGUAGE; + $sCurrLanguage ='EN'; } - } - if ($sCurrLanguage != LANGUAGE) { - $slangFile = WB_PATH.'/languages/'.LANGUAGE.'.php'; - if (is_readable($slangFile)) { - require $slangFile; + if ($sCurrLanguage != DEFAULT_LANGUAGE) { + $slangFile = WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php'; + if (is_readable($slangFile)) { + require $slangFile; + $sCurrLanguage = DEFAULT_LANGUAGE; + } } + if ($sCurrLanguage != LANGUAGE) { + $slangFile = WB_PATH.'/languages/'.LANGUAGE.'.php'; + if (is_readable($slangFile)) { + require $slangFile; + } + } + $oTrans = Translate::getInstance(); + $oTrans->initialize(array('EN', DEFAULT_LANGUAGE, LANGUAGE), $sCachePath); // 'none' + // Get users timezone + if (isset($_SESSION['TIMEZONE'])) { + define('TIMEZONE', $_SESSION['TIMEZONE']); + } else { + define('TIMEZONE', DEFAULT_TIMEZONE); + } + // Get users date format + if (isset($_SESSION['DATE_FORMAT'])) { + define('DATE_FORMAT', $_SESSION['DATE_FORMAT']); + } else { + define('DATE_FORMAT', DEFAULT_DATE_FORMAT); + } + // Get users time format + if (isset($_SESSION['TIME_FORMAT'])) { + define('TIME_FORMAT', $_SESSION['TIME_FORMAT']); + } else { + define('TIME_FORMAT', DEFAULT_TIME_FORMAT); + } + // Set Theme dir + define('THEME_URL', WB_URL.'/templates/'.DEFAULT_THEME); + define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME); + // extended wb_settings + define('EDIT_ONE_SECTION', false); + define('EDITOR_WIDTH', 0); } - $oTrans = Translate::getInstance(); - $oTrans->initialize(array('EN', DEFAULT_LANGUAGE, LANGUAGE), $sCachePath); // 'none' - // Get users timezone - if (isset($_SESSION['TIMEZONE'])) { - define('TIMEZONE', $_SESSION['TIMEZONE']); - } else { - define('TIMEZONE', DEFAULT_TIMEZONE); - } - // Get users date format - if (isset($_SESSION['DATE_FORMAT'])) { - define('DATE_FORMAT', $_SESSION['DATE_FORMAT']); - } else { - define('DATE_FORMAT', DEFAULT_DATE_FORMAT); - } - // Get users time format - if (isset($_SESSION['TIME_FORMAT'])) { - define('TIME_FORMAT', $_SESSION['TIME_FORMAT']); - } else { - define('TIME_FORMAT', DEFAULT_TIME_FORMAT); - } - // Set Theme dir - define('THEME_URL', WB_URL.'/templates/'.DEFAULT_THEME); - define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME); - // extended wb_settings - define('EDIT_ONE_SECTION', false); - define('EDITOR_WIDTH', 0); -}