From e5a9f8bc15c744ee10e834783775124bf15f0477 Mon Sep 17 00:00:00 2001 From: zhangjialiang Date: Wed, 25 Jun 2025 09:57:09 +0800 Subject: [PATCH 1/3] * [bug#63567] Optimize the installed version. --- module/install/control.php | 8 ++++++-- module/install/ui/step6.html.php | 11 +---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/module/install/control.php b/module/install/control.php index e74f547d14..2ae79d9479 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -419,12 +419,16 @@ class install extends control $this->loadModel('common'); if(!isset($this->config->installed) || !$this->config->installed) $this->session->set('installing', true); - if($this->config->inQuickon) + if(strpos($this->config->version, 'ipd') === false) { $editionName = $this->config->edition === 'open' ? $this->lang->pmsName : $this->lang->{$this->config->edition . 'Name'}; + $this->config->version = $editionName . str_replace(array('max', 'biz'), '', $this->config->version); + } + + if($this->config->inQuickon) + { $this->lang->install->successLabel = str_replace('IPD', '', $this->lang->install->successLabel); $this->lang->install->successNoticeLabel = str_replace('IPD', '', $this->lang->install->successNoticeLabel); - $this->config->version = $editionName . str_replace(array('max', 'biz', 'ipd'), '', $this->config->version); } $canDelFile = is_writable($this->app->getAppRoot() . 'www'); diff --git a/module/install/ui/step6.html.php b/module/install/ui/step6.html.php index 2764f305cc..616547cdd2 100644 --- a/module/install/ui/step6.html.php +++ b/module/install/ui/step6.html.php @@ -14,15 +14,6 @@ set::zui(true); $successLabel = ($installFileDeleted ? $lang->install->successLabel : $lang->install->successNoticeLabel); -if(trim($config->visions, ',') == 'lite') -{ - $versionName = $lang->liteName . $config->liteVersion; -} -else -{ - $versionName = $lang->pmsName . $config->version; -} - jsVar('sendEventLink', $sendEventLink); @@ -60,7 +51,7 @@ div ), cell( setClass('flex'), - html(nl2br(sprintf($successLabel, $versionName))) + html(nl2br(sprintf($successLabel, $config->version))) ), ), cell From 3769b3464d97a64bd2ed8e0a03e208e52339e16e Mon Sep 17 00:00:00 2001 From: zhangjialiang Date: Wed, 25 Jun 2025 09:59:21 +0800 Subject: [PATCH 2/3] * [bug#63567] Optimize the installed version. --- module/install/control.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/module/install/control.php b/module/install/control.php index 2ae79d9479..6d8a4ce4c5 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -419,18 +419,19 @@ class install extends control $this->loadModel('common'); if(!isset($this->config->installed) || !$this->config->installed) $this->session->set('installing', true); - if(strpos($this->config->version, 'ipd') === false) + if($this->config->inQuickon) + { + $editionName = $this->config->edition === 'open' ? $this->lang->pmsName : $this->lang->{$this->config->edition . 'Name'}; + $this->lang->install->successLabel = str_replace('IPD', '', $this->lang->install->successLabel); + $this->lang->install->successNoticeLabel = str_replace('IPD', '', $this->lang->install->successNoticeLabel); + $this->config->version = $editionName . str_replace(array('max', 'biz', 'ipd'), '', $this->config->version); + } + elseif(strpos($this->config->version, 'ipd') === false) { $editionName = $this->config->edition === 'open' ? $this->lang->pmsName : $this->lang->{$this->config->edition . 'Name'}; $this->config->version = $editionName . str_replace(array('max', 'biz'), '', $this->config->version); } - if($this->config->inQuickon) - { - $this->lang->install->successLabel = str_replace('IPD', '', $this->lang->install->successLabel); - $this->lang->install->successNoticeLabel = str_replace('IPD', '', $this->lang->install->successNoticeLabel); - } - $canDelFile = is_writable($this->app->getAppRoot() . 'www'); $installFile = $this->app->getAppRoot() . 'www/install.php'; $upgradeFile = $this->app->getAppRoot() . 'www/upgrade.php'; From 952be31ae0e93545248954c19f50ebe8a88453e1 Mon Sep 17 00:00:00 2001 From: zhangjialiang Date: Wed, 25 Jun 2025 10:00:38 +0800 Subject: [PATCH 3/3] * [bug#63567] Format code. --- module/install/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/install/control.php b/module/install/control.php index 6d8a4ce4c5..3cd871dc86 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -428,7 +428,7 @@ class install extends control } elseif(strpos($this->config->version, 'ipd') === false) { - $editionName = $this->config->edition === 'open' ? $this->lang->pmsName : $this->lang->{$this->config->edition . 'Name'}; + $editionName = $this->config->edition === 'open' ? $this->lang->pmsName : $this->lang->{$this->config->edition . 'Name'}; $this->config->version = $editionName . str_replace(array('max', 'biz'), '', $this->config->version); }