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

Add more protections to prevent XE core update

Browse source
This commit is contained in:
Kijin Sung 2020-02-15 16:32:09 +09:00
parent 030f27d488
commit 1d0c1a5329
5 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -325,8 +325,11 @@ class adminAdminView extends admin
}
// Get need update from easy install
$oAutoinstallAdminModel = getAdminModel('autoinstall');
$needUpdateList = $oAutoinstallAdminModel->getNeedUpdateList();
//$oAutoinstallAdminModel = getAdminModel('autoinstall');
//$needUpdateList = $oAutoinstallAdminModel->getNeedUpdateList();
$needUpdateList = array();
// Check counter addon
$site_module_info = Context::get('site_module_info');
$oAddonAdminModel = getAdminModel('addon');
$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl );

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

@ -201,6 +201,12 @@ class autoinstallAdminController extends autoinstall
foreach($packages as $package_srl)
{
$package = $oModel->getPackage($package_srl);
$package->type = $oModel->getTypeFromPath($package->path);
if ($package->type === 'core')
{
continue;
}
if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
{
$oModuleInstaller = new DirectModuleInstaller($package);

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

@ -215,7 +215,6 @@ class autoinstallAdminModel extends autoinstall
if($packageInfo->type == 'core')
{
//$title = 'XpressEngine';
continue;
}
else

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

@ -216,7 +216,7 @@ class autoinstallAdminView extends autoinstall
if($v->type == "core")
{
$v->avail_remove = FALSE;
continue;
}
else if($v->type == "module")
{

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

@ -17,10 +17,6 @@
</ul>
</div>
<div cond="$contain_core" class="x_alert x_alert-block">
<h4>{$lang->msg_update_core_title}</h4>
<p>{$lang->msg_update_core}</p>
</div>
<div cond="$package->installed" class="x_well">
<p>{$lang->current_version}: {$package->cur_version} <block cond="$package->need_update">({$lang->require_update})</block></p>
</div>