From 1379f68c9265ddbd67befeabb4aeca260b41d751 Mon Sep 17 00:00:00 2001
From: chschy <chschy@gmail.com>
Date: Tue, 12 Feb 2013 03:11:05 +0000
Subject: [PATCH] issue 2948, changed variable definition to __XE__

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12730 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/captcha/captcha.addon.php                     | 4 +---
 config/config.inc.php                                | 5 +++++
 index.php                                            | 2 --
 modules/admin/admin.admin.controller.php             | 2 +-
 modules/admin/admin.admin.model.php                  | 2 +-
 modules/admin/admin.admin.view.php                   | 6 +++---
 modules/autoinstall/autoinstall.admin.controller.php | 2 +-
 modules/document/document.controller.php             | 5 ++---
 modules/editor/editor.controller.php                 | 4 ++--
 modules/editor/editor.model.php                      | 6 +++---
 modules/importer/importer.admin.controller.php       | 2 +-
 modules/install/install.admin.controller.php         | 2 +-
 modules/install/install.controller.php               | 6 +++---
 modules/install/script/ko.install.php                | 2 +-
 modules/install/tpl/check_env.html                   | 2 +-
 modules/install/tpl/header.html                      | 2 +-
 modules/layout/layout.model.php                      | 2 +-
 modules/member/member.controller.php                 | 2 +-
 modules/menu/menu.admin.controller.php               | 4 ++--
 modules/module/module.model.php                      | 4 ++--
 modules/widget/widget.model.php                      | 4 ++--
 21 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php
index 14d9a8cfc..f061488bd 100644
--- a/addons/captcha/captcha.addon.php
+++ b/addons/captcha/captcha.addon.php
@@ -1,7 +1,5 @@
 <?php
-
-if(!defined("__ZBXE__"))
-	exit();
+if(!defined("__XE__")) exit();
 
 /**
  * @file captcha.addon.php
diff --git a/config/config.inc.php b/config/config.inc.php
index 1317be1c5..b9e4705e7 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -20,6 +20,11 @@ if(!defined('__XE__'))
 	exit();
 }
 
+/**
+ * @deprecated __ZBXE__ will be removed. Use __XE__ instead.
+ */
+define('__ZBXE__', __XE__);
+
 /**
  * Display XE's full version.
  * The version should be revised when releasing even if no change is made.
diff --git a/index.php b/index.php
index f00609e29..5d35fd341 100644
--- a/index.php
+++ b/index.php
@@ -34,8 +34,6 @@
  * @brief Declare constants for generic use and for checking to avoid a direct call from the Web
  **/
 define('__XE__',   TRUE);
-define('__ZBXE__', TRUE); // deprecated : __ZBXE__ will be removed. Use __XE__ instead.
-
 /**
  * @brief Include the necessary configuration files
  **/
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 2b58f097f..632a2482e 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -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';
 		FileHandler::writeFile($siteDesignFile, $buff);
diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index 0212fd3f0..fb8bed1ef 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -320,7 +320,7 @@ class adminAdminModel extends admin
 		$info['package'] = _XE_PACKAGE_;
 		$info['host'] = $db_type->default_url ? $db_type->default_url : getFullUrl();
 		$info['app'] = $_SERVER['SERVER_SOFTWARE'];
-		$info['xe_version'] = __ZBXE_VERSION__;
+		$info['xe_version'] = __XE_VERSION__;
 		$info['php'] = phpversion();
 
 		$db_info = Context::getDBInfo();
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 3c2cd98cd..b93473553 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -205,7 +205,7 @@ class adminAdminView extends admin
 
 		// Retrieve recent news and set them into context,
 		// 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_);
 		if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < time())
 		{
@@ -368,7 +368,7 @@ class adminAdminView extends admin
 		Context::set('newVersionList', $needUpdateList);
 
 		// 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);
 		$isEnviromentGatheringAgreement = FALSE;
 		if(file_exists($path))
@@ -481,7 +481,7 @@ class adminAdminView extends admin
 		$server = 'http://collect.xpressengine.com/env/img.php?';
 		$path = './files/env/';
 		$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)))
 		{
diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php
index 18093f1d3..72aa5271b 100644
--- a/modules/autoinstall/autoinstall.admin.controller.php
+++ b/modules/autoinstall/autoinstall.admin.controller.php
@@ -102,7 +102,7 @@ class autoinstallAdminController extends autoinstall
 			$type = $oModel->getTypeFromPath($package->path);
 			if($type == "core")
 			{
-				$version = __ZBXE_VERSION__;
+				$version = __XE_VERSION__;
 			}
 			else
 			{
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index b5fca31e9..7d2c9cdb3 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1711,7 +1711,7 @@ class documentController extends document
 		{
 			$xml_buff = "<root />";
 			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;
 		}
 		// 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_buff = sprintf(
 			'<?php '.
-			'define(\'__ZBXE__\', true); '.
 			'define(\'__XE__\', true); '.
 			'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '.
 			'$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_buff = sprintf(
 			'<?php '.
-			'if(!defined("__ZBXE__")) exit(); '.
+			'if(!defined("__XE__")) exit(); '.
 			'%s; '.
 			'%s; '.
 			'$menu->list = array(%s); '.
diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php
index 5bd8e5cf5..8f1796215 100644
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@@ -432,7 +432,7 @@ class editorController extends editor
 		if($filter_enabled)
 		{
 			$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);
 			return $component_list;
 		}
@@ -454,7 +454,7 @@ class editorController extends editor
 		}
 
 		$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);
 
 		return $component_list;
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index c10629eae..b33d1e87f 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -111,7 +111,7 @@ class editorModel extends editor
 		$component_info->license = $xml_doc->component->license->body;
 		$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->title = "%s";', $component_info->title);
 		$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_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 .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name);
 			$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->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 .= sprintf('$xml_info->component_name = "%s";', $xml_info->component_name);
 			$buff .= sprintf('$xml_info->title = "%s";', $xml_info->title);
diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php
index a5adb9160..6eb554a21 100644
--- a/modules/importer/importer.admin.controller.php
+++ b/modules/importer/importer.admin.controller.php
@@ -472,7 +472,7 @@ class importerAdminController extends importer
 				if($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));
 					if(!is_dir($target_path)) FileHandler::makeDir($target_path);
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index 5afa33d8f..3e811fbc3 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -185,7 +185,7 @@ class installAdminController extends install
 			$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)
 		{
 			if(!$val) continue;
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 39c9262c3..ce381150b 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -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_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)
 		{
 			$buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
@@ -507,7 +507,7 @@ class installController extends install
 
 	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);
 		foreach($db_info as $key => $val)
 		{
@@ -553,7 +553,7 @@ class installController extends install
 	{
 		$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)
 		{
 			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
diff --git a/modules/install/script/ko.install.php b/modules/install/script/ko.install.php
index 31d04849a..1d231bceb 100644
--- a/modules/install/script/ko.install.php
+++ b/modules/install/script/ko.install.php
@@ -134,7 +134,7 @@ $oDocumentModel = &getModel('document');
 $oDocumentController = &getController('document');
 
 $obj->module_srl = $module_srl;
-Context::set('version', __ZBXE_VERSION__);
+Context::set('version', __XE_VERSION__);
 $obj->title = 'Welcome XE';
 
 $obj->content = $oTemplateHandler->compile('./modules/install/script/welcome_content', 'welcome_content_'.$lang);
diff --git a/modules/install/tpl/check_env.html b/modules/install/tpl/check_env.html
index 03691b054..53d6c38ed 100644
--- a/modules/install/tpl/check_env.html
+++ b/modules/install/tpl/check_env.html
@@ -14,7 +14,7 @@
 		<div cond="!$isDisable">
 			<p>
 				<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>
 			</p>
 			<ul id="details" style="display:none;outline:none">
diff --git a/modules/install/tpl/header.html b/modules/install/tpl/header.html
index 41be1a0a8..6727d984e 100644
--- a/modules/install/tpl/header.html
+++ b/modules/install/tpl/header.html
@@ -3,5 +3,5 @@
 <div class="x">
 	<div id="header">
 		<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>
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index c8f064016..f66f07a30 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -697,7 +697,7 @@ class layoutModel extends layout
 			$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);
 		if(file_exists($cache_file)) @include($cache_file);
 
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 7a7f38683..d394732e9 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1383,7 +1383,7 @@ class memberController extends member
 
 		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::writeFile($filename, $buff);
 	}
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 282bf464e..e0c7a746f 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -1584,7 +1584,7 @@ class menuAdminController extends menu
 		{
 			$xml_buff = "<root />";
 			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;
 		}
 		// Change to an array if only a single data is obtained
@@ -2011,7 +2011,7 @@ class menuAdminController extends menu
 
 	public function makeHomemenuCacheFile($menuSrl)
 	{
-		$cacheBuff .= sprintf('<?php if(!defined("__ZBXE__")) exit();');
+		$cacheBuff .= sprintf('<?php if(!defined("__XE__")) exit();');
 		$cacheBuff .= sprintf('$homeMenuSrl = %d;', $menuSrl);
 
 		FileHandler::writeFile($this->homeMenuCacheFile, $cacheBuff);
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index bb66868af..bcdd36030 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -740,7 +740,7 @@ class moduleModel extends module
 		$xml_file = sprintf("%sconf/module.xml", $class_path);
 		if(!file_exists($xml_file)) return;
 		// 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
 		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);
 
diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index 05fa36a00..b89172480 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -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);
 
 		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);
 
 		if(file_exists($cache_file)) @include($cache_file);