Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2123) +++ branches/2.8.x/CHANGELOG (revision 2124) @@ -11,6 +11,10 @@ ! = Update/Change =============================================================================== +16 May-2015 Build 2124 Manuela v.d.Decken(DarkViper) +! /framework/initialize + +! /framework/WbAutoloader abbreviation list moved to initialize; added method getAbbreviations() + SqlImport modified for new export format of phpMyAdmin 01 Apr-2015 Build 2123 Manuela v.d.Decken(DarkViper) ! /framework/SqlImport modified for new export format of phpMyAdmin 18 Mar-2015 Build 2122 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 2123) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2124) @@ -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', '2123'); +if(!defined('REVISION')) define('REVISION', '2124'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/initialize.php =================================================================== --- branches/2.8.x/wb/framework/initialize.php (revision 2123) +++ branches/2.8.x/wb/framework/initialize.php (revision 2124) @@ -114,7 +114,7 @@ * Read DB settings from configuration file * @return array * @throws RuntimeException - * + * */ function initReadSetupFile() { @@ -122,7 +122,7 @@ initCheckValidCaller(array('save.php','index.php','config.php','upgrade-script.php')); $aCfg = array(); - $sSetupFile = dirname(dirname(__FILE__)).'/setup.ini.php'; + $sSetupFile = dirname(__DIR__).'/setup.ini.php'; if(is_readable($sSetupFile)) { $aCfg = parse_ini_file($sSetupFile, true); if (!isset($aCfg['Constants']) || !isset($aCfg['DataBase'])) { @@ -218,9 +218,14 @@ /* *************************************************************************************** * Start initialization * ****************************************************************************************/ +// reset global output buffering + while (ob_get_level()) { ob_end_clean(); } // test for existing and active old config.php if (defined('TABLE_PREFIX')) { /** TODO */ } -// initialize debug evaluation values --- +// set system defaults + date_default_timezone_set('UTC'); + +// initialize debug evaluation values --- $starttime = array_sum(explode(" ",microtime())); $iPhpDeclaredClasses = sizeof(get_declared_classes()); $sDbConnectType = 'url'; // depending from class WbDatabase it can be 'url' or 'dsn' @@ -241,28 +246,35 @@ initSetInstallPathConstants(); initSanitizeHttpReferer(WB_URL); // register WB basic autoloader --- - $sTmp = dirname(__FILE__).'/WbAutoloader.php'; + $sTmp = __DIR__.'/WbAutoloader.php'; if(!class_exists('WbAutoloader')){ include($sTmp); } - WbAutoloader::doRegister(array(ADMIN_DIRECTORY=>'a', 'modules'=>'m', 'templates'=>'t', 'include'=>'i')); + WbAutoloader::doRegister( array( + 'a' => trim(str_replace('\\', '/',ADMIN_DIRECTORY), '/'), + 'm' => 'modules', + 't' => 'templates', + 'i' => 'include', + 'v' => 'vendor' + )); +// WbAutoloader::doRegister(array(ADMIN_DIRECTORY=>'a', 'modules'=>'m', 'templates'=>'t', 'include'=>'i')); // instantiate and initialize adaptor for temporary registry replacement --- $oReg = WbAdaptor::getInstance(); $oReg->getWbConstants(); // register TWIG autoloader --- - $sTmp = dirname(dirname(__FILE__)).'/include/Sensio/Twig/lib/Twig/Autoloader.php'; + $sTmp = dirname(__DIR__).'/include/Sensio/Twig/lib/Twig/Autoloader.php'; if(!class_exists('Twig_Autoloader') && is_readable($sTmp)) { include($sTmp); - Twig_Autoloader::register(); + Twig_Autoloader::register(); } // register PHPMailer autoloader --- - $sTmp = $oReg->AppPath.'include/phpmailer/PHPMailerAutoload.php'; + $sTmp = dirname(__DIR__).'include/phpmailer/PHPMailerAutoload.php'; if (!function_exists('PHPMailerAutoload') && is_readable($sTmp)) { require($sTmp); } // aktivate exceptionhandler --- if(!function_exists('globalExceptionHandler')) { - include(dirname(__FILE__).'/globalExceptionHandler.php'); + include(__DIR__.'/globalExceptionHandler.php'); } // --------------------------- // get Database connection data from configuration @@ -334,7 +346,6 @@ } // get/set server timezone --- if(!defined('SERVER_TIMEZONE')) { define('SERVER_TIMEZONE', "UTC"); } - date_default_timezone_set( SERVER_TIMEZONE ); if(!defined('MAX_TIME')) { define('MAX_TIME', (pow(2, 31)-1)); } // 32-Bit Timestamp of 19 Jan 2038 03:14:07 GMT $sTmp = (isset($_SERVER['HTTP_DNT']) && $_SERVER['HTTP_DNT'] != '') ? $_SERVER['HTTP_DNT'] : '0'; if(!defined('DO_NOT_TRACK')) { define('DO_NOT_TRACK', ($sTmp[0] == '1')); } @@ -342,7 +353,7 @@ if(!defined('TIMEZONE')) { define('TIMEZONE', (isset($_SESSION['TIMEZONE']) ? $_SESSION['TIMEZONE'] : DEFAULT_TIMEZONE)); } if(!defined('DATE_FORMAT')) { define('DATE_FORMAT', (isset($_SESSION['DATE_FORMAT']) ? $_SESSION['DATE_FORMAT'] : DEFAULT_DATE_FORMAT)); } if(!defined('TIME_FORMAT')) { define('TIME_FORMAT', (isset($_SESSION['TIME_FORMAT']) ? $_SESSION['TIME_FORMAT'] : DEFAULT_TIME_FORMAT)); } -// set Theme directory --- +// set Theme directory --- if(!defined('THEME_URL')) { define('THEME_URL', WB_URL.'/templates/'.DEFAULT_THEME); } if(!defined('THEME_PATH')) { define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME); } if(!defined('THEME_REL')) { define('THEME_REL', WB_REL.'/templates/'.DEFAULT_THEME); } @@ -394,7 +405,7 @@ } $_SESSION['LANGUAGE'] = LANGUAGE; // activate translations / load language definitions -/** begin of deprecated part || will be replaced by class Translate **/ +/** begin of deprecated part || will be replaced by class Translate **/ // Load Language file if(!file_exists(WB_PATH.'/languages/'.LANGUAGE.'.php')) { $sMsg = 'Error loading language file '.LANGUAGE.', please check configuration'; @@ -408,7 +419,7 @@ $oReg->getWbConstants(); // load and activate new global translation table $oTrans = Translate::getInstance(); -/* initializise Translate old style */ +/* initializise Translate old style *************************************************** */ $oTrans->initialize( 'en', (defined('DEFAULT_LANGUAGE') ? DEFAULT_LANGUAGE : ''), @@ -417,7 +428,7 @@ // (Translate::CACHE_DISABLED|Translate::KEEP_MISSING), (DEBUG ? Translate::CACHE_DISABLED|Translate::KEEP_MISSING : 0) ); -/* initializise Translate new style */ +/* initializise Translate new style *************************************************** */ /* $oTrans->initialize( new TranslateAdaptorWbOldStyle, Index: branches/2.8.x/wb/framework/WbAutoloader.php =================================================================== --- branches/2.8.x/wb/framework/WbAutoloader.php (revision 2123) +++ branches/2.8.x/wb/framework/WbAutoloader.php (revision 2124) @@ -1,5 +1,5 @@ 'shortKey' + * @param array $aAbbreviations list of 'directory'=>'shortKey' */ - static public function doRegister(array $aDirectories) - { - if(!sizeof(self::$_aSearchpatterns)) - { - if(sizeof($aDirectories > 0)) - { - self::$_aSearchpatterns[] = '/(^.[^_].*$)/i'; - self::$_aReplacements[] = basename(dirname(__FILE__)).'_\1'; - foreach($aDirectories as $value => $shortKey) - { - self::$_aSearchpatterns[] = '/^'.$shortKey.'_/i'; - self::$_aReplacements[] = $value.'_'; - } - } - } - spl_autoload_register(array(new self, 'CoreAutoloader')); - } + static public function doRegister(array $aAbbreviations) + { + if (!sizeof(self::$aSearchpatterns)) { + if (sizeof($aAbbreviations > 0)) { + self::$aAbbreviations = $aAbbreviations; + self::$aSearchpatterns[] = '/(^.[^_].*$)/i'; + self::$aReplacements[] = basename(__DIR__).'_\1'; + foreach ($aAbbreviations as $shortKey => $value) { + self::$aSearchpatterns[] = '/^'.$shortKey.'_/i'; + self::$aReplacements[] = $value.'_'; + } + } + } + spl_autoload_register(array(new self, 'CoreAutoloader')); + } /** * tries autoloading the given class * @param string $sClassName */ - static public function CoreAutoloader($sClassName) - { - $sClassName = preg_replace(self::$_aSearchpatterns, self::$_aReplacements, $sClassName); - $sFileName = dirname(dirname(__FILE__)).'/'.str_replace('_', '/', $sClassName).'.php'; - if (!is_file($sFileName = dirname(dirname(__FILE__)).'/'.str_replace('_', '/', $sClassName).'.php')) { - // alternatively search for file with prefix 'class.' - if (!is_file(($sFileName = dirname($sFileName).'/class.'.basename($sFileName)))) { - return false; - } - } - include($sFileName); - } + static public function CoreAutoloader($sClassName) + { + $sFileName = ''; + $sBaseDir = trim(str_replace('\\', '/', dirname(__DIR__)), '/').'/'; + $sClassName = preg_replace(self::$aSearchpatterns, self::$aReplacements, $sClassName); + $sFileName = $sBaseDir.str_replace('_', '/', $sClassName); + if (! is_readable($sFileName.'.php')) { + // alternatively search for file with prefix 'class.' + $sFileName = dirname($sFileName).'/class.'.basename($sFileName); + if (! is_readable($sFileName.'.php')) { + $sFileName = ''; + } + } + if ($sFileName) { include($sFileName.'.php'); } + } +/** + * + * @return array list of abbreviations + */ + static public function getAbbreviations() + { + return self::$aAbbreviations; + } } // end class Autoloader \ No newline at end of file