fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 09:14:48 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 2948, changed variable definition to __XE__

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12730 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2013-02-12 03:11:05 +00:00
parent c3647b3f99
commit 1379f68c92
21 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
addons/captcha/captcha.addon.php
View file

@ -1,7 +1,5 @@
<?php <?php
if(!defined("__XE__")) exit();
if(!defined("__ZBXE__"))
exit();
/** /**
* @file captcha.addon.php * @file captcha.addon.php

5
config/config.inc.php
View file

@ -20,6 +20,11 @@ if(!defined('__XE__'))
exit(); exit();
} }
/**
* @deprecated __ZBXE__ will be removed. Use __XE__ instead.
*/
define('__ZBXE__', __XE__);
/** /**
* Display XE's full version. * Display XE's full version.
* The version should be revised when releasing even if no change is made. * The version should be revised when releasing even if no change is made.

2
index.php
View file

@ -34,8 +34,6 @@
* @brief Declare constants for generic use and for checking to avoid a direct call from the Web * @brief Declare constants for generic use and for checking to avoid a direct call from the Web
**/ **/
define('__XE__', TRUE); define('__XE__', TRUE);
define('__ZBXE__', TRUE); // deprecated : __ZBXE__ will be removed. Use __XE__ instead.
/** /**
* @brief Include the necessary configuration files * @brief Include the necessary configuration files
**/ **/

2
modules/admin/admin.admin.controller.php
View file

@ -217,7 +217,7 @@ class adminAdminController extends admin
} }
} }
$buff = sprintf('<?php if(!defined("__ZBXE__")) exit();' . "\n" . 'if(!defined("__XE__")) exit();' . "\n" . '$designInfo = new stdClass();' . "\n" . '%s ?>', $buff); $buff = sprintf('<?php if(!defined("__XE__")) exit();' . "\n" . '$designInfo = new stdClass();' . "\n" . '%s ?>', $buff);
$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $site_srl . '.php'; $siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $site_srl . '.php';
FileHandler::writeFile($siteDesignFile, $buff); FileHandler::writeFile($siteDesignFile, $buff);

2
modules/admin/admin.admin.model.php
View file

@ -320,7 +320,7 @@ class adminAdminModel extends admin
$info['package'] = _XE_PACKAGE_; $info['package'] = _XE_PACKAGE_;
$info['host'] = $db_type->default_url ? $db_type->default_url : getFullUrl(); $info['host'] = $db_type->default_url ? $db_type->default_url : getFullUrl();
$info['app'] = $_SERVER['SERVER_SOFTWARE']; $info['app'] = $_SERVER['SERVER_SOFTWARE'];
$info['xe_version'] = __ZBXE_VERSION__; $info['xe_version'] = __XE_VERSION__;
$info['php'] = phpversion(); $info['php'] = phpversion();
$db_info = Context::getDBInfo(); $db_info = Context::getDBInfo();

6
modules/admin/admin.admin.view.php
View file

@ -205,7 +205,7 @@ class adminAdminView extends admin
// Retrieve recent news and set them into context, // Retrieve recent news and set them into context,
// move from index method, because use in admin footer // move from index method, because use in admin footer
$newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __ZBXE_VERSION__, _XE_PACKAGE_); $newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_);
$cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_); $cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_);
if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < time()) if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < time())
{ {
@ -368,7 +368,7 @@ class adminAdminView extends admin
Context::set('newVersionList', $needUpdateList); Context::set('newVersionList', $needUpdateList);
// gathering enviroment check // gathering enviroment check
$mainVersion = join('.', array_slice(explode('.', __ZBXE_VERSION__), 0, 2)); $mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
$path = FileHandler::getRealPath('./files/env/' . $mainVersion); $path = FileHandler::getRealPath('./files/env/' . $mainVersion);
$isEnviromentGatheringAgreement = FALSE; $isEnviromentGatheringAgreement = FALSE;
if(file_exists($path)) if(file_exists($path))
@ -481,7 +481,7 @@ class adminAdminView extends admin
$server = 'http://collect.xpressengine.com/env/img.php?'; $server = 'http://collect.xpressengine.com/env/img.php?';
$path = './files/env/'; $path = './files/env/';
$install_env = $path . 'install'; $install_env = $path . 'install';
$mainVersion = join('.', array_slice(explode('.', __ZBXE_VERSION__), 0, 2)); $mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
if(file_exists(FileHandler::getRealPath($install_env))) if(file_exists(FileHandler::getRealPath($install_env)))
{ {

2
modules/autoinstall/autoinstall.admin.controller.php
View file

@ -102,7 +102,7 @@ class autoinstallAdminController extends autoinstall
$type = $oModel->getTypeFromPath($package->path); $type = $oModel->getTypeFromPath($package->path);
if($type == "core") if($type == "core")
{ {
$version = __ZBXE_VERSION__; $version = __XE_VERSION__;
} }
else else
{ {

5
modules/document/document.controller.php
View file

@ -1711,7 +1711,7 @@ class documentController extends document
{ {
$xml_buff = "<root />"; $xml_buff = "<root />";
FileHandler::writeFile($xml_file, $xml_buff); FileHandler::writeFile($xml_file, $xml_buff);
FileHandler::writeFile($php_file, '<?php if(!defined("__ZBXE__")) exit(); ?>'); FileHandler::writeFile($php_file, '<?php if(!defined("__XE__")) exit(); ?>');
return $xml_file; return $xml_file;
} }
// Change to an array if only a single data is obtained // Change to an array if only a single data is obtained
@ -1742,7 +1742,6 @@ class documentController extends document
$xml_body_buff = $this->getXmlTree($tree[0], $tree, $module_info->site_srl, $xml_header_buff); $xml_body_buff = $this->getXmlTree($tree[0], $tree, $module_info->site_srl, $xml_header_buff);
$xml_buff = sprintf( $xml_buff = sprintf(
'<?php '. '<?php '.
'define(\'__ZBXE__\', true); '.
'define(\'__XE__\', true); '. 'define(\'__XE__\', true); '.
'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '. 'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '.
'$oContext = &Context::getInstance(); '. '$oContext = &Context::getInstance(); '.
@ -1766,7 +1765,7 @@ class documentController extends document
$php_output = $this->getPhpCacheCode($tree[0], $tree, $module_info->site_srl, $php_header_buff); $php_output = $this->getPhpCacheCode($tree[0], $tree, $module_info->site_srl, $php_header_buff);
$php_buff = sprintf( $php_buff = sprintf(
'<?php '. '<?php '.
'if(!defined("__ZBXE__")) exit(); '. 'if(!defined("__XE__")) exit(); '.
'%s; '. '%s; '.
'%s; '. '%s; '.
'$menu->list = array(%s); '. '$menu->list = array(%s); '.

4
modules/editor/editor.controller.php
View file

@ -432,7 +432,7 @@ class editorController extends editor
if($filter_enabled) if($filter_enabled)
{ {
$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl); $cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
$buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list))); $buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
FileHandler::writeFile($cache_file, $buff); FileHandler::writeFile($cache_file, $buff);
return $component_list; return $component_list;
} }
@ -454,7 +454,7 @@ class editorController extends editor
} }
$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl); $cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
$buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list))); $buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
FileHandler::writeFile($cache_file, $buff); FileHandler::writeFile($cache_file, $buff);
return $component_list; return $component_list;

6
modules/editor/editor.model.php
View file

@ -111,7 +111,7 @@ class editorModel extends editor
$component_info->license = $xml_doc->component->license->body; $component_info->license = $xml_doc->component->license->body;
$component_info->license_link = $xml_doc->component->license->attrs->link; $component_info->license_link = $xml_doc->component->license->attrs->link;
$buff = '<?php if(!defined("__ZBXE__")) exit(); '; $buff = '<?php if(!defined("__XE__")) exit(); ';
$buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name); $buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name);
$buff .= sprintf('$xml_info->title = "%s";', $component_info->title); $buff .= sprintf('$xml_info->title = "%s";', $component_info->title);
$buff .= sprintf('$xml_info->description = "%s";', $component_info->description); $buff .= sprintf('$xml_info->description = "%s";', $component_info->description);
@ -748,7 +748,7 @@ class editorModel extends editor
$component_info->license = $xml_doc->component->license->body; $component_info->license = $xml_doc->component->license->body;
$component_info->license_link = $xml_doc->component->license->attrs->link; $component_info->license_link = $xml_doc->component->license->attrs->link;
$buff = '<?php if(!defined("__ZBXE__")) exit(); '; $buff = '<?php if(!defined("__XE__")) exit(); ';
$buff .= '$xml_info = new stdClass();'; $buff .= '$xml_info = new stdClass();';
$buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name); $buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name);
$buff .= sprintf('$xml_info->title = "%s";', $component_info->title); $buff .= sprintf('$xml_info->title = "%s";', $component_info->title);
@ -827,7 +827,7 @@ class editorModel extends editor
$xml_info->author->email_address = $xml_doc->component->author->attrs->email_address; $xml_info->author->email_address = $xml_doc->component->author->attrs->email_address;
$xml_info->author->homepage = $xml_doc->component->author->attrs->link; $xml_info->author->homepage = $xml_doc->component->author->attrs->link;
$buff = '<?php if(!defined("__ZBXE__")) exit(); '; $buff = '<?php if(!defined("__XE__")) exit(); ';
$buff .= '$xml_info = new stdClass();'; $buff .= '$xml_info = new stdClass();';
$buff .= sprintf('$xml_info->component_name = "%s";', $xml_info->component_name); $buff .= sprintf('$xml_info->component_name = "%s";', $xml_info->component_name);
$buff .= sprintf('$xml_info->title = "%s";', $xml_info->title); $buff .= sprintf('$xml_info->title = "%s";', $xml_info->title);

2
modules/importer/importer.admin.controller.php
View file

@ -472,7 +472,7 @@ class importerAdminController extends importer
if($obj->signature) if($obj->signature)
{ {
$signature = removeHackTag($obj->signature); $signature = removeHackTag($obj->signature);
$signature_buff = sprintf('<?php if(!defined("__ZBXE__")) exit();?>%s', $signature); $signature_buff = sprintf('<?php if(!defined("__XE__")) exit();?>%s', $signature);
$target_path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($obj->member_srl)); $target_path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($obj->member_srl));
if(!is_dir($target_path)) FileHandler::makeDir($target_path); if(!is_dir($target_path)) FileHandler::makeDir($target_path);

2
modules/install/install.admin.controller.php
View file

@ -185,7 +185,7 @@ class installAdminController extends install
$ftp_info->ftp_password = Context::get('ftp_password'); $ftp_info->ftp_password = Context::get('ftp_password');
} }
$buff = '<?php if(!defined("__ZBXE__")) exit();'."\n"; $buff = '<?php if(!defined("__XE__")) exit();'."\n";
foreach($ftp_info as $key => $val) foreach($ftp_info as $key => $val)
{ {
if(!$val) continue; if(!$val) continue;

6
modules/install/install.controller.php
View file

@ -234,7 +234,7 @@ class installController extends install
if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1'; if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/'; if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
$buff = '<?php if(!defined("__ZBXE__")) exit();'."\n"; $buff = '<?php if(!defined("__XE__")) exit();'."\n";
foreach($ftp_info as $key => $val) foreach($ftp_info as $key => $val)
{ {
$buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val)); $buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
@ -507,7 +507,7 @@ class installController extends install
function _getDBConfigFileContents($db_info) function _getDBConfigFileContents($db_info)
{ {
$buff = '<?php if(!defined("__ZBXE__")) exit();'."\n"; $buff = '<?php if(!defined("__XE__")) exit();'."\n";
$db_info = get_object_vars($db_info); $db_info = get_object_vars($db_info);
foreach($db_info as $key => $val) foreach($db_info as $key => $val)
{ {
@ -553,7 +553,7 @@ class installController extends install
{ {
$etc_tmp_config_file = $this->etc_tmp_config_file; $etc_tmp_config_file = $this->etc_tmp_config_file;
$buff = '<?php if(!defined("__ZBXE__")) exit();'."\n"; $buff = '<?php if(!defined("__XE__")) exit();'."\n";
foreach($config_info as $key => $val) foreach($config_info as $key => $val)
{ {
$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val)); $buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));

2
modules/install/script/ko.install.php
View file

@ -134,7 +134,7 @@ $oDocumentModel = &getModel('document');
$oDocumentController = &getController('document'); $oDocumentController = &getController('document');
$obj->module_srl = $module_srl; $obj->module_srl = $module_srl;
Context::set('version', __ZBXE_VERSION__); Context::set('version', __XE_VERSION__);
$obj->title = 'Welcome XE'; $obj->title = 'Welcome XE';
$obj->content = $oTemplateHandler->compile('./modules/install/script/welcome_content', 'welcome_content_'.$lang); $obj->content = $oTemplateHandler->compile('./modules/install/script/welcome_content', 'welcome_content_'.$lang);

2
modules/install/tpl/check_env.html
View file

@ -14,7 +14,7 @@
<div cond="!$isDisable"> <div cond="!$isDisable">
<p> <p>
<i class="x_icon-ok-sign x_icon-white"></i> <i class="x_icon-ok-sign x_icon-white"></i>
<strong>XE {__ZBXE_VERSION__}</strong> {$lang->install_condition_enable} <strong>XE {__XE_VERSION__}</strong> {$lang->install_condition_enable}
<a href="#details" data-toggle>&rsaquo; {$lang->install_details}</a> <a href="#details" data-toggle>&rsaquo; {$lang->install_details}</a>
</p> </p>
<ul id="details" style="display:none;outline:none"> <ul id="details" style="display:none;outline:none">

2
modules/install/tpl/header.html
View file

@ -3,5 +3,5 @@
<div class="x"> <div class="x">
<div id="header"> <div id="header">
<h1><img src="img/xe.gif" width="163" height="26" alt="Xpress Engine" /></h1> <h1><img src="img/xe.gif" width="163" height="26" alt="Xpress Engine" /></h1>
<em>Version <strong>{__ZBXE_VERSION__}</strong> {$lang->introduce_title}</em> <em>Version <strong>{__XE_VERSION__}</strong> {$lang->introduce_title}</em>
</div> </div>

2
modules/layout/layout.model.php
View file

@ -697,7 +697,7 @@ class layoutModel extends layout
$buff .= sprintf(' $layout_info->header_script = "%s"; ', str_replace(array('$','"'),array('\$','\\"'),$header_script)); $buff .= sprintf(' $layout_info->header_script = "%s"; ', str_replace(array('$','"'),array('\$','\\"'),$header_script));
} }
$buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>'; $buff = '<?php if(!defined("__XE__")) exit(); '.$buff.' ?>';
FileHandler::writeFile($cache_file, $buff); FileHandler::writeFile($cache_file, $buff);
if(file_exists($cache_file)) @include($cache_file); if(file_exists($cache_file)) @include($cache_file);

2
modules/member/member.controller.php
View file

@ -1383,7 +1383,7 @@ class memberController extends member
if(!$check_signature) return FileHandler::removeFile($filename); if(!$check_signature) return FileHandler::removeFile($filename);
$buff = sprintf('<?php if(!defined("__ZBXE__")) exit();?>%s', $signature); $buff = sprintf('<?php if(!defined("__XE__")) exit();?>%s', $signature);
FileHandler::makeDir($path); FileHandler::makeDir($path);
FileHandler::writeFile($filename, $buff); FileHandler::writeFile($filename, $buff);
} }

4
modules/menu/menu.admin.controller.php
View file

@ -1584,7 +1584,7 @@ class menuAdminController extends menu
{ {
$xml_buff = "<root />"; $xml_buff = "<root />";
FileHandler::writeFile($xml_file, $xml_buff); FileHandler::writeFile($xml_file, $xml_buff);
FileHandler::writeFile($php_file, '<?php if(!defined("__ZBXE__")) exit(); ?>'); FileHandler::writeFile($php_file, '<?php if(!defined("__XE__")) exit(); ?>');
return $xml_file; return $xml_file;
} }
// Change to an array if only a single data is obtained // Change to an array if only a single data is obtained
@ -2011,7 +2011,7 @@ class menuAdminController extends menu
public function makeHomemenuCacheFile($menuSrl) public function makeHomemenuCacheFile($menuSrl)
{ {
$cacheBuff .= sprintf('<?php if(!defined("__ZBXE__")) exit();'); $cacheBuff .= sprintf('<?php if(!defined("__XE__")) exit();');
$cacheBuff .= sprintf('$homeMenuSrl = %d;', $menuSrl); $cacheBuff .= sprintf('$homeMenuSrl = %d;', $menuSrl);
FileHandler::writeFile($this->homeMenuCacheFile, $cacheBuff); FileHandler::writeFile($this->homeMenuCacheFile, $cacheBuff);

4
modules/module/module.model.php
View file

@ -740,7 +740,7 @@ class moduleModel extends module
$xml_file = sprintf("%sconf/module.xml", $class_path); $xml_file = sprintf("%sconf/module.xml", $class_path);
if(!file_exists($xml_file)) return; if(!file_exists($xml_file)) return;
// Check if cached file exists // Check if cached file exists
$cache_file = sprintf("./files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __ZBXE_VERSION__); $cache_file = sprintf("./files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
// Update if no cache file exists or it is older than xml file // Update if no cache file exists or it is older than xml file
if(!file_exists($cache_file) || filemtime($cache_file)<filemtime($xml_file)) if(!file_exists($cache_file) || filemtime($cache_file)<filemtime($xml_file))
{ {
@ -889,7 +889,7 @@ class moduleModel extends module
} }
} }
} }
$buff = sprintf('<?php if(!defined("__ZBXE__")) exit();$info->default_index_act = \'%s\';$info->setup_index_act=\'%s\';$info->simple_setup_index_act=\'%s\';$info->admin_index_act = \'%s\';%s?>', $default_index_act, $setup_index_act, $simple_setup_index_act, $admin_index_act, $buff); $buff = sprintf('<?php if(!defined("__XE__")) exit();$info->default_index_act = \'%s\';$info->setup_index_act=\'%s\';$info->simple_setup_index_act=\'%s\';$info->admin_index_act = \'%s\';%s?>', $default_index_act, $setup_index_act, $simple_setup_index_act, $admin_index_act, $buff);
FileHandler::writeFile($cache_file, $buff); FileHandler::writeFile($cache_file, $buff);

4
modules/widget/widget.model.php
View file

@ -281,7 +281,7 @@ class widgetModel extends widget
} }
} }
$buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>'; $buff = '<?php if(!defined("__XE__")) exit(); '.$buff.' ?>';
FileHandler::writeFile($cache_file, $buff); FileHandler::writeFile($cache_file, $buff);
if(file_exists($cache_file)) @include($cache_file); if(file_exists($cache_file)) @include($cache_file);
@ -424,7 +424,7 @@ class widgetModel extends widget
} }
} }
$buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>'; $buff = '<?php if(!defined("__XE__")) exit(); '.$buff.' ?>';
FileHandler::writeFile($cache_file, $buff); FileHandler::writeFile($cache_file, $buff);
if(file_exists($cache_file)) @include($cache_file); if(file_exists($cache_file)) @include($cache_file);