From 3e22fa826e5952c304d081590d177973ffbc874e Mon Sep 17 00:00:00 2001 From: liugang Date: Fri, 2 Aug 2024 10:24:08 +0800 Subject: [PATCH] - [refac] don't check apcu extension when installing. --- module/install/control.php | 1 - module/install/lang/de.php | 2 -- module/install/lang/en.php | 2 -- module/install/lang/fr.php | 2 -- module/install/lang/zh-cn.php | 2 -- module/install/lang/zh-tw.php | 2 -- module/install/ui/step1.html.php | 3 +-- module/install/zen.php | 12 ------------ 8 files changed, 1 insertion(+), 25 deletions(-) diff --git a/module/install/control.php b/module/install/control.php index 1a45677c4d..a7ef38ed52 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -92,7 +92,6 @@ class install extends control $this->view->curlResult = $this->installZen->checkCURL(); $this->view->filterResult = $this->installZen->checkFilter(); $this->view->iconvResult = $this->installZen->checkIconv(); - $this->view->apcuResult = $this->installZen->checkAPCu(); $this->view->tmpRootInfo = $this->installZen->getTmpRoot(); $this->view->tmpRootResult = $this->installZen->checkTmpRoot(); $this->view->dataRootInfo = $this->installZen->getDataRoot(); diff --git a/module/install/lang/de.php b/module/install/lang/de.php index 3f5296acdb..f6f8db2d02 100644 --- a/module/install/lang/de.php +++ b/module/install/lang/de.php @@ -110,8 +110,6 @@ $lang->install->gd = 'GD Extension'; $lang->install->gdFail = 'Bearbeiten Sie die PHP ini Datei um die gd Erweiterung zu laden.'; $lang->install->iconv = 'Iconv Extension'; $lang->install->iconvFail = 'Bearbeiten Sie die PHP ini Datei um die iconv Erweiterung zu laden.'; -$lang->install->apcu = 'APCu Extension'; -$lang->install->apcuFail = 'APCu nicht geladen. WENN der APCu geladen wurde, aktivieren Sie die Cache-Funktion.'; $lang->install->tmpRoot = 'Temp Directory'; $lang->install->dataRoot = 'Upload Dateiverzeichnis'; $lang->install->session = 'Session Speicherpfad'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 677600398c..49b5af6972 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -110,8 +110,6 @@ $lang->install->gd = 'GD Extension'; $lang->install->gdFail = 'Edit the php.ini file to load gd extension.'; $lang->install->iconv = 'Iconv Extension'; $lang->install->iconvFail = 'Edit the php.ini file to load iconv extension.'; -$lang->install->apcu = 'APCu Extension'; -$lang->install->apcuFail = "APCu isn't loaded. IF loaded the APCu, then enable cache function."; $lang->install->tmpRoot = 'Temp Directory'; $lang->install->dataRoot = 'Uploaded File Directory'; $lang->install->session = 'Session Save Path'; diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php index 84533ef8cc..5598de0e70 100644 --- a/module/install/lang/fr.php +++ b/module/install/lang/fr.php @@ -110,8 +110,6 @@ $lang->install->gd = 'GD Extension'; $lang->install->gdFail = 'Editez le fichier php.ini pour charger gd extension.'; $lang->install->iconv = 'Iconv Extension'; $lang->install->iconvFail = 'Editez le fichier php.ini pour charger iconv extension.'; -$lang->install->apcu = 'APCu Extension'; -$lang->install->apcuFail = "APCu n'est pas chargé. Si APCu est chargé, la fonction de mise en cache est activée."; $lang->install->tmpRoot = 'Répertoire Temporaire'; $lang->install->dataRoot = "Répertoire d'Upload"; $lang->install->session = "Chemin d'enregistrement des sessions"; diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 0bd89061a6..35f4b4168b 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -110,8 +110,6 @@ $lang->install->gd = 'GD扩展'; $lang->install->gdFail = '修改PHP配置文件，加载GD扩展。'; $lang->install->iconv = 'ICONV扩展'; $lang->install->iconvFail = '修改PHP配置文件，加载ICONV扩展。'; -$lang->install->apcu = 'APCu扩展'; -$lang->install->apcuFail = '未加载APCu扩展。加载APCu扩展后，可以开启缓存功能。'; $lang->install->tmpRoot = '临时文件目录'; $lang->install->dataRoot = '上传文件目录'; $lang->install->session = 'Session存储目录'; diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index 252a3dd284..0bfcc2899e 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -109,8 +109,6 @@ $lang->install->gd = 'GD擴展'; $lang->install->gdFail = '修改PHP配置檔案，加載GD擴展。'; $lang->install->iconv = 'ICONV擴展'; $lang->install->iconvFail = '修改PHP配置檔案，加載ICONV擴展。'; -$lang->install->APCu = 'APCu擴展'; -$lang->install->APCuFail = '修改PHP配置檔案，加載APCu擴展。'; $lang->install->tmpRoot = '臨時檔案目錄'; $lang->install->dataRoot = '上傳檔案目錄'; $lang->install->session = 'Session存儲目錄'; diff --git a/module/install/ui/step1.html.php b/module/install/ui/step1.html.php index 0b6326a533..635188806b 100644 --- a/module/install/ui/step1.html.php +++ b/module/install/ui/step1.html.php @@ -13,7 +13,7 @@ namespace zin; set::zui(true); $checkTrs = array(); -$extendItems = array('pdo', 'pdoMySQL', 'json', 'openssl', 'mbstring', 'zlib', 'curl', 'filter', 'iconv', 'apcu'); +$extendItems = array('pdo', 'pdoMySQL', 'json', 'openssl', 'mbstring', 'zlib', 'curl', 'filter', 'iconv'); $dirItems = array('tmpRoot', 'dataRoot', 'session'); foreach($extendItems as $extendItem) { @@ -21,7 +21,6 @@ foreach($extendItems as $extendItem) $failLang = $extendItem . 'Fail'; $resultClass = $result == 'ok' ? 'bg-success' : 'bg-danger'; - if($extendItem == 'apcu' && $result != 'ok') $resultClass = 'bg-warning'; $checkTrs[] = h::tr ( diff --git a/module/install/zen.php b/module/install/zen.php index 8ecfbea52f..5af3f5ca62 100644 --- a/module/install/zen.php +++ b/module/install/zen.php @@ -188,18 +188,6 @@ class installZen extends install return extension_loaded('iconv') ? 'ok' : 'fail'; } - /** - * 检查是否安装了apcu扩展。 - * Check apcu extension. - * - * @access protected - * @return string ok|fail - */ - protected function checkAPCu(): string - { - return extension_loaded('apcu') ? 'ok' : 'fail'; - } - /** * 检查tmp目录的完整性和可写性。 * Check tmpRoot.