merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -1,8 +1,9 @@
<?php
/**
* set the include of the class file and other environment configurations
*
* @file config/config.inc.php
* @author NHN (developers@xpressengine.com)
* @brief set the include of the class file and other environment configurations
**/
@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
@ -10,35 +11,52 @@
if(!defined('__ZBXE__')) exit();
/**
* @brief display XE's full version
* Display XE's full version
* Even The file should be revised when releasing altough no change is made
**/
define('__XE_VERSION__', '1.5.2.7');
define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
*/
define('__XE_VERSION__', '1.5.3');
/**
* @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
*/
define('__ZBXE_VERSION__', __XE_VERSION__);
/**
* @brief The base path to where you installed zbXE Wanted
**/
* The base path to where you installed zbXE Wanted
*/
define('_XE_PATH_', str_replace('config/config.inc.php', '', str_replace('\\', '/', __FILE__)));
/**
* @brief 쿠키 이외의 값에서도 세션을 인식할 있도록 (파일업로드 등에서의 문제 수정)
**/
// Set can use other method instead cookie to store session id(for file upload)
ini_set('session.use_only_cookies', 0);
if(file_exists(_XE_PATH_.'config/package.inc.php')) {
require _XE_PATH_.'config/package.inc.php';
} else {
/**
* Package type
*/
define('_XE_PACKAGE_','XE');
/**
* Location
*/
define('_XE_LOCATION_','en');
/**
* Location site
*/
define('_XE_LOCATION_SITE_','http://www.xpressengine.org/');
/**
* Download server
*/
define('_XE_DOWNLOAD_SERVER_','http://en.download.xpressengine.org/');
}
/**
* @brief user configuration files which override the default settings
/*
* user configuration files which override the default settings
* save the following information into config/config.user.inc.php
* <?php
* define('__DEBUG__', 0);
@ -57,111 +75,167 @@
require _XE_PATH_.'config/config.user.inc.php';
}
/**
* @brief output debug message(bit value)
* 0: generate debug messages/not display
* 1: display messages through debugPrint() function
* 2: output execute time, Request/Response info
* 4: output DB query history
**/
if(!defined('__DEBUG__')) define('__DEBUG__', 0);
if(!defined('__DEBUG__'))
{
/**
* output debug message(bit value)
*
* <pre>
* 0: generate debug messages/not display
* 1: display messages through debugPrint() function
* 2: output execute time, Request/Response info
* 4: output DB query history
* </pre>
*/
define('__DEBUG__', 0);
}
/**
* @brief output location of debug message
* 0: connect to the files/_debug_message.php and output
* 1: HTML output as a comment on the bottom (when response method is the HTML)
* 2: Firebug console output (PHP 4 & 5. Firebug/FirePHP plug-in required)
**/
if(!defined('__DEBUG_OUTPUT__')) define('__DEBUG_OUTPUT__', 0);
if(!defined('__DEBUG_OUTPUT__'))
{
/**
* output location of debug message
*
* <pre>
* 0: connect to the files/_debug_message.php and output
* 1: HTML output as a comment on the bottom (when response method is the HTML)
* 2: Firebug console output (PHP 4 & 5. Firebug/FirePHP plug-in required)
* </pre>
*/
define('__DEBUG_OUTPUT__', 0);
}
/**
* @brief output comments of the firePHP console and browser
* 0: No limit (not recommended)
* 1: Allow only specified IP addresses
**/
if(!defined('__DEBUG_PROTECT__')) define('__DEBUG_PROTECT__', 1);
if(!defined('__DEBUG_PROTECT_IP__')) define('__DEBUG_PROTECT_IP__', '127.0.0.1');
if(!defined('__DEBUG_PROTECT__'))
{
/**
* output comments of the firePHP console and browser
*
* <pre>
* 0: No limit (not recommended)
* 1: Allow only specified IP addresses
* </pre>
*/
define('__DEBUG_PROTECT__', 1);
}
/**
* @brief DB error message definition
* 0: No output
* 1: files/_debug_db_query.php connected to the output
**/
if(!defined('__DEBUG_DB_OUTPUT__')) define('__DEBUG_DB_OUTPUT__', 0);
if(!defined('__DEBUG_PROTECT_IP__'))
{
/**
* Set a ip address to allow debug
*/
define('__DEBUG_PROTECT_IP__', '127.0.0.1');
}
/**
* @brief Query log for only timeout query among DB queries
* 0: Do not leave a log
* = 0: leave a log when the slow query takes over specified seconds
* Log file is saved as ./files/_db_slow_query.php file
**/
if(!defined('__LOG_SLOW_QUERY__')) define('__LOG_SLOW_QUERY__', 0);
if(!defined('__DEBUG_DB_OUTPUT__'))
{
/**
* DB error message definition
*
* <pre>
* 0: No output
* 1: files/_debug_db_query.php connected to the output
* </pre>
*/
define('__DEBUG_DB_OUTPUT__', 0);
}
/**
* @brief Leave DB query information
* 0: Do not add information to the query
* 1: Comment the XML Query ID
**/
if(!defined('__DEBUG_QUERY__')) define('__DEBUG_QUERY__', 0);
if(!defined('__LOG_SLOW_QUERY__'))
{
/**
* Query log for only timeout query among DB queries
*
* <pre>
* 0: Do not leave a log
* = 0: leave a log when the slow query takes over specified seconds
* Log file is saved as ./files/_db_slow_query.php file
* </pre>
*/
define('__LOG_SLOW_QUERY__', 0);
}
/**
* @brief option to enable/disable a compression feature using ob_gzhandler
* 0: Not used
* 1: Enabled
* Only particular servers may have a problem in IE browser when sending a compression
**/
if(!defined('__OB_GZHANDLER_ENABLE__')) define('__OB_GZHANDLER_ENABLE__', 1);
if(!defined('__DEBUG_QUERY__'))
{
/**
* Leave DB query information
*
* <pre>
* 0: Do not add information to the query
* 1: Comment the XML Query ID
* </pre>
*/
define('__DEBUG_QUERY__', 0);
}
/**
* @brief decide to use/not use the php unit test (Path/tests/index.php)
* 0: Not used
* 1: Enabled
**/
if(!defined('__ENABLE_PHPUNIT_TEST__')) define('__ENABLE_PHPUNIT_TEST__', 0);
if(!defined('__OB_GZHANDLER_ENABLE__'))
{
/**
* option to enable/disable a compression feature using ob_gzhandler
*
* <pre>
* 0: Not used
* 1: Enabled
* Only particular servers may have a problem in IE browser when sending a compression
* </pre>
*/
define('__OB_GZHANDLER_ENABLE__', 1);
}
/**
* @brief __PROXY_SERVER__ has server information to request to the external through the target server
* FileHandler:: getRemoteResource uses the constant
**/
if(!defined('__PROXY_SERVER__')) define('__PROXY_SERVER__', null);
if(!defined('__ENABLE_PHPUNIT_TEST__'))
{
/**
* decide to use/not use the php unit test (Path/tests/index.php)
*
* <pre>
* 0: Not used
* 1: Enabled
* </pre>
*/
define('__ENABLE_PHPUNIT_TEST__', 0);
}
/**
* @brief CDN prefix
**/
if(!defined('__XE_CDN_PREFIX__')) define('__XE_CDN_PREFIX__', 'http://static.xpressengine.com/core/');
if(!defined('__PROXY_SERVER__'))
{
/**
* __PROXY_SERVER__ has server information to request to the external through the target server
* FileHandler:: getRemoteResource uses the constant
*/
define('__PROXY_SERVER__', null);
}
/**
* @brief CDN version
**/
if(!defined('__XE_CDN_VERSION__')) define('__XE_CDN_VERSION__', '%__XE_CDN_VERSION__%');
if(!defined('__XE_CDN_PREFIX__'))
{
/**
* CDN prefix
*/
define('__XE_CDN_PREFIX__', 'http://static.xpressengine.com/core/');
}
/**
* @brief Require specific files when using Firebug console output
**/
if(!defined('__XE_CDN_VERSION__'))
{
/**
* CDN version
*/
define('__XE_CDN_VERSION__', '%__XE_CDN_VERSION__%');
}
// Require specific files when using Firebug console output
if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1) {
require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
}
/**
* @brief Set Timezone as server time
**/
// Set Timezone as server time
if(version_compare(PHP_VERSION, '5.3.0') >= 0)
{
date_default_timezone_set(@date_default_timezone_get());
}
if(!defined('__XE_LOADED_CLASS__')){
/**
* @brief Require a function-defined-file for simple use
**/
// Require a function-defined-file for simple use
require(_XE_PATH_.'config/func.inc.php');
if(__DEBUG__) define('__StartTime__', getMicroTime());
/**
* @brief include the class files
* @TODO : When _autoload() can be used for PHP5 based applications, it will be removed.
**/
// include the class files
//TODO When _autoload() can be used for PHP5 based applications, it will be removed.
if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime());
require(_XE_PATH_.'classes/object/Object.class.php');
require(_XE_PATH_.'classes/extravar/Extravar.class.php');