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

Remove dependence on deprecated constants

Browse source
This commit is contained in:
Kijin Sung 2020-08-29 23:39:59 +09:00
parent 5e9d9ef02f
commit 274bb3587f
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/constants.php
View file

@ -139,11 +139,6 @@ define('__XE_RECOMMEND_PHP_VERSION__', '7.2.0');
define('__ZBXE__', true); define('__ZBXE__', true);
define('__ZBXE_VERSION__', RX_VERSION); define('__ZBXE_VERSION__', RX_VERSION);
define('_XE_PATH_', RX_BASEDIR); 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. * Status constants for various content types.

1
modules/autoinstall/autoinstall.admin.view.php
View file

@ -387,6 +387,7 @@ class autoinstallAdminView extends autoinstall
Context::set("package", $package); Context::set("package", $package);
Context::set('contain_core', $package->contain_core); Context::set('contain_core', $package->contain_core);
Context::set('module_config', $oAdminModel->getAutoInstallAdminModuleConfig());
if(!$_SESSION['ftp_password']) if(!$_SESSION['ftp_password'])
{ {

4
modules/autoinstall/tpl/install.html
View file

@ -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->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="!$dep->installed">{$lang->require_installation}</block>
<block cond="$show_ftp_note && ($dep->need_update || !$dep->installed)"> <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> </block>
</li> </li>
</ul> </ul>
@ -46,7 +46,7 @@
<block cond="$show_ftp_note" > <block cond="$show_ftp_note" >
<p>{$lang->description_download}. (<a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp')}">FTP Setup</a>)</p> <p>{$lang->description_download}. (<a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp')}">FTP Setup</a>)</p>
<p>{$lang->path}: {$package->path}</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> </block>
</div> </div>
<div cond="!$show_ftp_note"> <div cond="!$show_ftp_note">