issue 2119. supporting php 5.4. config

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12698 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-02-05 04:36:52 +00:00
parent ba9800ff34
commit 9f0e24d59b
3 changed files with 483 additions and 271 deletions

View file

@ -1,14 +1,24 @@
<?php <?php
/** /**
* set the include of the class file and other environment configurations * set the include of the class file and other environment configurations
* *
* @file config/config.inc.php * @file config/config.inc.php
* @author NHN (developers@xpressengine.com) * @author NHN (developers@xpressengine.com)
*/ */
if(version_compare(PHP_VERSION, '5.4.0', '<'))
{
@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
}
else
{
@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_STRICT);
}
@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED); if(!defined('__XE__'))
{
if(!defined('__ZBXE__')) exit(); exit();
}
/** /**
* Display XE's full version. * Display XE's full version.
@ -44,31 +54,31 @@ define('_XE_PATH_', str_replace('config/config.inc.php', '', str_replace('\\', '
ini_set('session.use_only_cookies', 0); ini_set('session.use_only_cookies', 0);
if(file_exists(_XE_PATH_.'config/package.inc.php')) if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
{ {
require _XE_PATH_.'config/package.inc.php'; require _XE_PATH_ . 'config/package.inc.php';
} }
else else
{ {
/** /**
* Package type * Package type
*/ */
define('_XE_PACKAGE_','XE'); define('_XE_PACKAGE_', 'XE');
/** /**
* Location * Location
*/ */
define('_XE_LOCATION_','en'); define('_XE_LOCATION_', 'en');
/** /**
* Location site * Location site
*/ */
define('_XE_LOCATION_SITE_','http://www.xpressengine.org/'); define('_XE_LOCATION_SITE_', 'http://www.xpressengine.org/');
/** /**
* Download server * Download server
*/ */
define('_XE_DOWNLOAD_SERVER_','http://en.download.xpressengine.org/'); define('_XE_DOWNLOAD_SERVER_', 'http://en.download.xpressengine.org/');
} }
/* /*
@ -87,9 +97,9 @@ else
* define('__XE_CDN_PREFIX__', 'http://yourCdnDomain.com/path/'); * define('__XE_CDN_PREFIX__', 'http://yourCdnDomain.com/path/');
* define('__XE_CDN_VERSION__', 'yourCdnVersion'); * define('__XE_CDN_VERSION__', 'yourCdnVersion');
*/ */
if(file_exists(_XE_PATH_.'config/config.user.inc.php')) if(file_exists(_XE_PATH_ . 'config/config.user.inc.php'))
{ {
require _XE_PATH_.'config/config.user.inc.php'; require _XE_PATH_ . 'config/config.user.inc.php';
} }
if(!defined('__DEBUG__')) if(!defined('__DEBUG__'))
@ -215,7 +225,7 @@ if(!defined('__PROXY_SERVER__'))
* __PROXY_SERVER__ has server information to request to the external through the target server * __PROXY_SERVER__ has server information to request to the external through the target server
* FileHandler:: getRemoteResource uses the constant * FileHandler:: getRemoteResource uses the constant
*/ */
define('__PROXY_SERVER__', null); define('__PROXY_SERVER__', NULL);
} }
if(!defined('__XE_CDN_PREFIX__')) if(!defined('__XE_CDN_PREFIX__'))
@ -237,7 +247,7 @@ if(!defined('__XE_CDN_VERSION__'))
// Require specific files when using Firebug console output // Require specific files when using Firebug console output
if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1) if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
{ {
require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php'; require _XE_PATH_ . 'libs/FirePHPCore/FirePHP.class.php';
} }
// Set Timezone as server time // Set Timezone as server time
@ -249,37 +259,40 @@ if(version_compare(PHP_VERSION, '5.3.0') >= 0)
if(!defined('__XE_LOADED_CLASS__')) if(!defined('__XE_LOADED_CLASS__'))
{ {
// Require a function-defined-file for simple use // Require a function-defined-file for simple use
require(_XE_PATH_.'config/func.inc.php'); require(_XE_PATH_ . 'config/func.inc.php');
if(__DEBUG__) define('__StartTime__', getMicroTime()); if(__DEBUG__)
define('__StartTime__', getMicroTime());
// include the class files // include the class files
//TODO When _autoload() can be used for PHP5 based applications, it will be removed. //TODO When _autoload() can be used for PHP5 based applications, it will be removed.
if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime()); if(__DEBUG__)
require(_XE_PATH_.'classes/object/Object.class.php'); define('__ClassLoadStartTime__', getMicroTime());
require(_XE_PATH_.'classes/extravar/Extravar.class.php'); require(_XE_PATH_ . 'classes/object/Object.class.php');
require(_XE_PATH_.'classes/handler/Handler.class.php'); require(_XE_PATH_ . 'classes/extravar/Extravar.class.php');
require(_XE_PATH_.'classes/xml/XmlParser.class.php'); require(_XE_PATH_ . 'classes/handler/Handler.class.php');
require(_XE_PATH_.'classes/xml/XmlGenerator.class.php'); require(_XE_PATH_ . 'classes/xml/XmlParser.class.php');
require(_XE_PATH_.'classes/xml/XmlJsFilter.class.php'); require(_XE_PATH_ . 'classes/xml/XmlGenerator.class.php');
require(_XE_PATH_.'classes/xml/XmlLangParser.class.php'); require(_XE_PATH_ . 'classes/xml/XmlJsFilter.class.php');
require(_XE_PATH_.'classes/cache/CacheHandler.class.php'); require(_XE_PATH_ . 'classes/xml/XmlLangParser.class.php');
require(_XE_PATH_.'classes/context/Context.class.php'); require(_XE_PATH_ . 'classes/cache/CacheHandler.class.php');
require(_XE_PATH_.'classes/db/DB.class.php'); require(_XE_PATH_ . 'classes/context/Context.class.php');
require(_XE_PATH_.'classes/file/FileHandler.class.php'); require(_XE_PATH_ . 'classes/db/DB.class.php');
require(_XE_PATH_.'classes/widget/WidgetHandler.class.php'); require(_XE_PATH_ . 'classes/file/FileHandler.class.php');
require(_XE_PATH_.'classes/editor/EditorHandler.class.php'); require(_XE_PATH_ . 'classes/widget/WidgetHandler.class.php');
require(_XE_PATH_.'classes/module/ModuleObject.class.php'); require(_XE_PATH_ . 'classes/editor/EditorHandler.class.php');
require(_XE_PATH_.'classes/module/ModuleHandler.class.php'); require(_XE_PATH_ . 'classes/module/ModuleObject.class.php');
require(_XE_PATH_.'classes/display/DisplayHandler.class.php'); require(_XE_PATH_ . 'classes/module/ModuleHandler.class.php');
require(_XE_PATH_.'classes/template/TemplateHandler.class.php'); require(_XE_PATH_ . 'classes/display/DisplayHandler.class.php');
require(_XE_PATH_.'classes/mail/Mail.class.php'); require(_XE_PATH_ . 'classes/template/TemplateHandler.class.php');
require(_XE_PATH_.'classes/page/PageHandler.class.php'); require(_XE_PATH_ . 'classes/mail/Mail.class.php');
require(_XE_PATH_.'classes/mobile/Mobile.class.php'); require(_XE_PATH_ . 'classes/page/PageHandler.class.php');
require(_XE_PATH_.'classes/validator/Validator.class.php'); require(_XE_PATH_ . 'classes/mobile/Mobile.class.php');
require(_XE_PATH_.'classes/frontendfile/FrontEndFileHandler.class.php'); require(_XE_PATH_ . 'classes/validator/Validator.class.php');
require(_XE_PATH_.'classes/security/Security.class.php'); require(_XE_PATH_ . 'classes/frontendfile/FrontEndFileHandler.class.php');
if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__; require(_XE_PATH_ . 'classes/security/Security.class.php');
if(__DEBUG__)
$GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
} }
/* End of file config.inc.php */ /* End of file config.inc.php */
/* Location: ./config/config.inc.php */ /* Location: ./config/config.inc.php */

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,6 @@
<?php <?php
define('_XE_PACKAGE_','XE');
define('_XE_LOCATION_','ko'); define('_XE_PACKAGE_', 'XE');
define('_XE_LOCATION_SITE_','http://www.xpressengine.com/'); define('_XE_LOCATION_', 'ko');
define('_XE_DOWNLOAD_SERVER_','http://download.xpressengine.com/'); define('_XE_LOCATION_SITE_', 'http://www.xpressengine.com/');
define('_XE_DOWNLOAD_SERVER_', 'http://download.xpressengine.com/');