From 274bb3587f97d6198a61a09622e94f997a608ce1 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 29 Aug 2020 23:39:59 +0900
Subject: [PATCH] Remove dependence on deprecated constants

---
 common/constants.php                           | 5 -----
 modules/autoinstall/autoinstall.admin.view.php | 1 +
 modules/autoinstall/tpl/install.html           | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/common/constants.php b/common/constants.php
index cffe7d532..3a080c7c9 100644
--- a/common/constants.php
+++ b/common/constants.php
@@ -139,11 +139,6 @@ define('__XE_RECOMMEND_PHP_VERSION__', '7.2.0');
 define('__ZBXE__', true);
 define('__ZBXE_VERSION__', RX_VERSION);
 define('_XE_PATH_', RX_BASEDIR);
-define('_XE_PACKAGE_', 'XE');
-define('_XE_LOCATION_', 'en');
-//define('_XE_LOCATION_SITE_', 'https://xe1.xpressengine.com/');
-//define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/');
-define('__DEBUG__', 0);
 
 /**
  * Status constants for various content types.
diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php
index 8b0f1cf0d..d4bef340e 100644
--- a/modules/autoinstall/autoinstall.admin.view.php
+++ b/modules/autoinstall/autoinstall.admin.view.php
@@ -387,6 +387,7 @@ class autoinstallAdminView extends autoinstall
 
 		Context::set("package", $package);
 		Context::set('contain_core', $package->contain_core);
+		Context::set('module_config', $oAdminModel->getAutoInstallAdminModuleConfig());
 
 		if(!$_SESSION['ftp_password'])
 		{
diff --git a/modules/autoinstall/tpl/install.html b/modules/autoinstall/tpl/install.html
index 55e2e4642..bfaecf6d5 100644
--- a/modules/autoinstall/tpl/install.html
+++ b/modules/autoinstall/tpl/install.html
@@ -29,7 +29,7 @@
 			<block cond="$dep->installed">{$lang->current_version}: {$dep->cur_version} <block cond="$dep->need_update">({$lang->require_update})</block></block>
 			<block cond="!$dep->installed">{$lang->require_installation}</block>
 			<block cond="$show_ftp_note && ($dep->need_update || !$dep->installed)">
-				<a href="{_XE_DOWNLOAD_SERVER_}?module=resourceapi&act=procResourceapiDownload&package_srl={$dep->package_srl}">{$lang->cmd_download}</a> ({$lang->path}: {$dep->path})
+				<a href="{$module_config->download_server}?module=resourceapi&act=procResourceapiDownload&package_srl={$dep->package_srl}">{$lang->cmd_download}</a> ({$lang->path}: {$dep->path})
 			</block>
 		</li>
 	</ul>
@@ -46,7 +46,7 @@
 		<block cond="$show_ftp_note" >
 			<p>{$lang->description_download}. (<a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp')}">FTP Setup</a>)</p>
 			<p>{$lang->path}: {$package->path}</p>
-			<p><a class="x_btn x_btn-primary x_pull-right" href="{_XE_DOWNLOAD_SERVER_}?module=resourceapi&act=procResourceapiDownload&package_srl={$package->package_srl}">{$lang->cmd_download}</a>
+			<p><a class="x_btn x_btn-primary x_pull-right" href="{$module_config->download_server}?module=resourceapi&act=procResourceapiDownload&package_srl={$package->package_srl}">{$lang->cmd_download}</a>
 		</block>
 	</div>
 	<div cond="!$show_ftp_note">