From adba50bfc14fd602d23885e7b6aefc5fe3faa95e Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 8 Dec 2022 18:52:52 +0800 Subject: [PATCH 01/23] Update redis.sh --- plugins/php/versions/common/redis.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/php/versions/common/redis.sh b/plugins/php/versions/common/redis.sh index b7502f80d..6847b15f1 100755 --- a/plugins/php/versions/common/redis.sh +++ b/plugins/php/versions/common/redis.sh @@ -21,6 +21,8 @@ if [ "$version" == "52" ];then LIBV=2.2.7 elif [ "$version" -lt "70" ];then LIBV=4.2.0 +elif [ "$version" -lt "74" ];then + LIBV=5.3.7 else echo 'ok' fi From 71b43e9f2f7a2dda031f0892d059911fe80ec752 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 8 Dec 2022 18:53:46 +0800 Subject: [PATCH 02/23] Update redis.sh --- plugins/php/versions/common/redis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/common/redis.sh b/plugins/php/versions/common/redis.sh index 6847b15f1..35838a86c 100755 --- a/plugins/php/versions/common/redis.sh +++ b/plugins/php/versions/common/redis.sh @@ -21,7 +21,7 @@ if [ "$version" == "52" ];then LIBV=2.2.7 elif [ "$version" -lt "70" ];then LIBV=4.2.0 -elif [ "$version" -lt "74" ];then +elif [ "$version" -gt "74" ];then LIBV=5.3.7 else echo 'ok' From 344603f1b20336bb69e8f2664188c80ca169358a Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 8 Dec 2022 19:06:49 +0800 Subject: [PATCH 03/23] Update redis.sh --- plugins/php/versions/common/redis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/common/redis.sh b/plugins/php/versions/common/redis.sh index 35838a86c..10d6bb239 100755 --- a/plugins/php/versions/common/redis.sh +++ b/plugins/php/versions/common/redis.sh @@ -22,7 +22,7 @@ if [ "$version" == "52" ];then elif [ "$version" -lt "70" ];then LIBV=4.2.0 elif [ "$version" -gt "74" ];then - LIBV=5.3.7 + LIBV=5.3.5 else echo 'ok' fi From 9aa9c4f799184409ae73c627751da099c8f67f2a Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 12:16:32 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/files_api.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/class/core/files_api.py b/class/core/files_api.py index eea61e6f7..b902a0a68 100755 --- a/class/core/files_api.py +++ b/class/core/files_api.py @@ -240,6 +240,11 @@ class files_api: system_api.system_api().restartTask() except: system_api.system_api().restartTask() + + # 删除日志 + task_log = mw.getRunDir() + "/tmp/panelTask.pl" + if os.path.exists(task_log): + os.remove(task_log) return mw.returnJson(True, '任务已删除!') # 上传文件 From b8e1fb2ca29e49decd670033fdfcaf96747a340b Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 15:05:41 +0800 Subject: [PATCH 05/23] Update install.sh --- plugins/php/versions/82/install.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index 4650bec20..41f9fbb97 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } -version=8.2.0RC7 +version=8.2.0 PHP_VER=82 Install_php() { @@ -32,8 +32,7 @@ cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - # wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://downloads.php.net/~pierrick/php-${version}.tar.xz - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://downloads.php.net/~pierrick/php-${version}.tar.xz + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz fi cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz From 1868b3197d871d344679ac0105a670aa0c73e16a Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 18:04:07 +0800 Subject: [PATCH 06/23] Update tools.py --- tools.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools.py b/tools.py index 6f60765e5..d99bbb417 100755 --- a/tools.py +++ b/tools.py @@ -132,6 +132,22 @@ def set_panel_pwd(password, ncli=False): print(username) +def show_panel_pwd(): + # 设置面板密码 + import db + sql = db.Sql() + password = sql.table('users').where('id=?', (1,)).getField('password') + + file_pwd = '' + if os.path.exists('data/default.pl'): + file_pwd = mw.readFile('data/default.pl').strip() + + if mw.md5(file_pwd) == password: + print('password: ' + file_pwd) + return + print("the password has been changed..") + + def set_panel_username(username=None): # 随机面板用户名 import db @@ -171,6 +187,8 @@ if __name__ == "__main__": set_panel_username(sys.argv[2]) else: set_panel_username() + elif method == 'password': + print("123123") elif method == 'getServerIp': getServerIp() elif method == "cli": From f33f80cf348b1483c0d3f5c5787dfa8523378066 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 18:04:33 +0800 Subject: [PATCH 07/23] Update mw.tpl --- scripts/init.d/mw.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl index 1a177aa93..8563e9341 100755 --- a/scripts/init.d/mw.tpl +++ b/scripts/init.d/mw.tpl @@ -331,7 +331,8 @@ case "$1" in echo -e "==================================================================" echo -e "$address" echo -e `python3 $mw_path/tools.py username` - echo -e "password: $password" + echo -e `python3 $mw_path/tools.py password` + # echo -e "password: $password" echo -e "\033[33mWarning:\033[0m" echo -e "\033[33mIf you cannot access the panel. \033[0m" echo -e "\033[33mrelease the following port (${show_panel_ip}888|80|443|22) in the security group.\033[0m" From 85aba4f1ce4f5658e2d672ce10e0ca230b181917 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 18:32:32 +0800 Subject: [PATCH 08/23] Update tools.py --- tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.py b/tools.py index d99bbb417..8b8f6e264 100755 --- a/tools.py +++ b/tools.py @@ -188,7 +188,7 @@ if __name__ == "__main__": else: set_panel_username() elif method == 'password': - print("123123") + show_panel_pwd() elif method == 'getServerIp': getServerIp() elif method == "cli": From 3acbc362972997e239abc99ff4d27a10803700c6 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 18:34:36 +0800 Subject: [PATCH 09/23] Update tools.py --- tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.py b/tools.py index 8b8f6e264..be8da7adc 100755 --- a/tools.py +++ b/tools.py @@ -145,7 +145,7 @@ def show_panel_pwd(): if mw.md5(file_pwd) == password: print('password: ' + file_pwd) return - print("the password has been changed..") + print("the password has been changed!") def set_panel_username(username=None): From aa0423544686ec21b23bcc451644440f98648e5b Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 19:03:16 +0800 Subject: [PATCH 10/23] up --- README.md | 6 ++++-- plugins/php/versions/common/yar.sh | 6 ------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4e47218a1..e635f01d3 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ logo

mdserver-web

一款简单Linux面板服务

+

强烈推荐系统:debian

### 简介 @@ -10,10 +11,11 @@ 复制了后台管理界面，按照自己想要的方式写了一版。 -![CentOS](https://img.shields.io/badge/LINUX-CentOS-blue?style=for-the-badge&logo=CentOS) -![Ubuntu](https://img.shields.io/badge/LINUX-Ubuntu-blue?style=for-the-badge&logo=Ubuntu) ![Debian](https://img.shields.io/badge/LINUX-Debian-blue?style=for-the-badge&logo=Debian) +![Ubuntu](https://img.shields.io/badge/LINUX-Ubuntu-blue?style=for-the-badge&logo=Ubuntu) ![Fedora](https://img.shields.io/badge/LINUX-Fedora-blue?style=for-the-badge&logo=Fedora) +![CentOS](https://img.shields.io/badge/LINUX-CentOS-blue?style=for-the-badge&logo=CentOS) + [![Wiki](https://img.shields.io/badge/MW-Wiki-red?style=for-the-badge&logo=wiki)](https://github.com/midoks/mdserver-web/wiki) [![](https://data.jsdelivr.com/v1/package/gh/midoks/mdserver-web/badge?style=for-the-badge)](https://www.jsdelivr.com/package/gh/midoks/mdserver-web) diff --git a/plugins/php/versions/common/yar.sh b/plugins/php/versions/common/yar.sh index 69306fbd1..3ea9778cc 100755 --- a/plugins/php/versions/common/yar.sh +++ b/plugins/php/versions/common/yar.sh @@ -21,12 +21,6 @@ if [ "$version" -lt "70" ];then LIBV=1.2.5 fi -if [ "$version" -eq "82" ];then - echo "wait php82 release" - exit 0 -fi - - LIB_PATH_NAME=lib/php if [ -d $serverPath/php/${version}/lib64 ];then LIB_PATH_NAME=lib64 From 1cf8e4ecb77f4006b97376f2caab06724c0af655 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 19:11:55 +0800 Subject: [PATCH 11/23] Update fileinfo.sh --- plugins/php/versions/common/fileinfo.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index 0f07354ac..a2be4a9a9 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -49,6 +49,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then + echo "cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version}" cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} fi @@ -57,10 +58,10 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config - FIND_C99=`cat Makefile|grep c99` - if [ "$FIND_C99" == "" ];then - sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=c99/g' Makefile - fi + # FIND_C99=`cat Makefile|grep c99` + # if [ "$FIND_C99" == "" ];then + # sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=c99/g' Makefile + # fi make clean && make && make install && make clean From e8a152b1a393252fe53a4c76f724093a4efdd01e Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 19:15:58 +0800 Subject: [PATCH 12/23] Update install.sh --- plugins/php/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/php/install.sh b/plugins/php/install.sh index 3a98e5901..583d97ade 100755 --- a/plugins/php/install.sh +++ b/plugins/php/install.sh @@ -32,9 +32,9 @@ if [ ! -d $curPath/versions/$2 ];then fi -if [ "${action}" == "install" ] && [ -d $serverPath/php/${type} ];then - exit 0 -fi +# if [ "${action}" == "install" ] && [ -d $serverPath/php/${type} ];then +# exit 0 +# fi if [ "${action}" == "uninstall" ];then From 6b9aab37595c259df2f61100431ebd70f4a02efe Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 19:22:32 +0800 Subject: [PATCH 13/23] Update fileinfo.sh --- plugins/php/versions/common/fileinfo.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index a2be4a9a9..4de574ce6 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -58,10 +58,10 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config - # FIND_C99=`cat Makefile|grep c99` - # if [ "$FIND_C99" == "" ];then - # sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=c99/g' Makefile - # fi + FIND_C99=`cat Makefile|grep c99` + if [ "$version" -gt "74" ] && [ "$FIND_C99" == "" ];then + sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=gnu99/g' Makefile + fi make clean && make && make install && make clean From 231048a4a3a90c378cecfcaf630d55b6f2a9e4a6 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 19:42:08 +0800 Subject: [PATCH 14/23] Update phalcon.sh --- plugins/php/versions/common/phalcon.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/php/versions/common/phalcon.sh b/plugins/php/versions/common/phalcon.sh index bcfcc9fb3..8aa9e1673 100755 --- a/plugins/php/versions/common/phalcon.sh +++ b/plugins/php/versions/common/phalcon.sh @@ -24,8 +24,6 @@ else if [ "$version" -gt "74" ];then LIBV=5.1.2 -else - echo "not support!" fi LIB_PATH_NAME=lib/php @@ -120,4 +118,4 @@ if [ "$actionType" == 'install' ];then Install_lib elif [ "$actionType" == 'uninstall' ];then Uninstall_lib -fi \ No newline at end of file +fi From 6ba1e4c19cd94efea72a3a9e9275885bdb1b2c8f Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 19:44:58 +0800 Subject: [PATCH 15/23] Update yaf.sh --- plugins/php/versions/common/yaf.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plugins/php/versions/common/yaf.sh b/plugins/php/versions/common/yaf.sh index 5b3bf8fb0..632b953e8 100755 --- a/plugins/php/versions/common/yaf.sh +++ b/plugins/php/versions/common/yaf.sh @@ -31,11 +31,6 @@ if [ "$version" -eq "72" ] || [ "$version" -eq "73" ];then LIBV=3.2.5 fi -if [ "$version" -eq "82" ];then - echo "not need" - exit 1 -fi - LIB_PATH_NAME=lib/php if [ -d $serverPath/php/${version}/lib64 ];then From 2001a3b5dc207f38e34c3c3365b311c59dc27681 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 19:49:24 +0800 Subject: [PATCH 16/23] Update install.sh --- plugins/php/install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/php/install.sh b/plugins/php/install.sh index 583d97ade..e28431f07 100755 --- a/plugins/php/install.sh +++ b/plugins/php/install.sh @@ -71,6 +71,12 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then cd ${rootPath}/plugins/php/versions/common && bash gettext.sh install ${type} cd ${rootPath}/plugins/php/versions/common && bash redis.sh install ${type} cd ${rootPath}/plugins/php/versions/common && bash memcached.sh install ${type} + cd ${rootPath}/plugins/php/versions/common && bash zlib.sh install ${type} + + if [ "${type}" -gt "72" ];then + cd ${rootPath}/plugins/php/versions/common && bash zip.sh install ${type} + fi + echo "install PHP${type} extend end" fi From 9235affadf8e991832b059e6700911fd6f977b7b Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 20:06:43 +0800 Subject: [PATCH 17/23] Update phalcon.sh --- plugins/php/versions/common/phalcon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/php/versions/common/phalcon.sh b/plugins/php/versions/common/phalcon.sh index 8aa9e1673..b3c201610 100755 --- a/plugins/php/versions/common/phalcon.sh +++ b/plugins/php/versions/common/phalcon.sh @@ -20,7 +20,7 @@ LIBV=4.1.2 if [ "$version" -lt "73" ];then echo "not support!" exit 1 -else +fi if [ "$version" -gt "74" ];then LIBV=5.1.2 @@ -118,4 +118,4 @@ if [ "$actionType" == 'install' ];then Install_lib elif [ "$actionType" == 'uninstall' ];then Uninstall_lib -fi +fi \ No newline at end of file From 0c8f7774522f586bd9b4f1702bc9b73957627094 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 20:23:52 +0800 Subject: [PATCH 18/23] Update phplib.conf --- plugins/php/versions/phplib.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/php/versions/phplib.conf b/plugins/php/versions/phplib.conf index a07765625..2fc5f4b5b 100755 --- a/plugins/php/versions/phplib.conf +++ b/plugins/php/versions/phplib.conf @@ -520,8 +520,7 @@ "73", "74", "80", - "81", - "82" + "81" ], "type": "框架", "msg": "Yaf是一个C语言编写的PHP框架", @@ -541,8 +540,7 @@ "73", "74", "80", - "81", - "82" + "81" ], "type": "框架", "msg": "Yar是一个RPC框架", From f37de275ba6016eea7acb1258a879c1f107a0cda Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 22:19:17 +0800 Subject: [PATCH 19/23] Update fileinfo.sh --- plugins/php/versions/common/fileinfo.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index 4de574ce6..5e0f8144f 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -58,6 +58,20 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config + + # It is considered as a temporary bug + if [ "$version" == "81" ] || [ "$version" == "82" ];then + bash ${rootPath}/scripts/getos.sh + OSNAME=`cat ${rootPath}/data/osname.pl` + if [ "$OSNAME" == 'centos' ];then + FILE_softmagic=$sourcePath/php${version}/ext/${LIBNAME}/libmagic/softmagic.c + FIND_UNDEF_STRNDUP=`cat $FILE_softmagic|grep '#undef strndup'` + if [ "$version" -gt "74" ] && [ "$FIND_C99" == "" ];then + sed -i $BAK "s/char *strndup(const char *str, size_t n); \=/#undef char *strndup\nchar *strndup(const char *str, size_t n);/g" $FILE_softmagic + fi + fi + fi + FIND_C99=`cat Makefile|grep c99` if [ "$version" -gt "74" ] && [ "$FIND_C99" == "" ];then sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=gnu99/g' Makefile From 4854142f9a1fa9abc450e5300c74279dad032921 Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 22:24:56 +0800 Subject: [PATCH 20/23] Update fileinfo.sh --- plugins/php/versions/common/fileinfo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index 5e0f8144f..8f84386cb 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -67,7 +67,7 @@ Install_lib() FILE_softmagic=$sourcePath/php${version}/ext/${LIBNAME}/libmagic/softmagic.c FIND_UNDEF_STRNDUP=`cat $FILE_softmagic|grep '#undef strndup'` if [ "$version" -gt "74" ] && [ "$FIND_C99" == "" ];then - sed -i $BAK "s/char *strndup(const char *str, size_t n); \=/#undef char *strndup\nchar *strndup(const char *str, size_t n);/g" $FILE_softmagic + sed -i $BAK "s/char *strndup(const char *str, size_t n);/#undef char *strndup\nchar *strndup(const char *str, size_t n);/g" $FILE_softmagic fi fi fi From e919fac1d597751ad7ed7db94b0dc9039ee62c8b Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 22:38:21 +0800 Subject: [PATCH 21/23] Update fileinfo.sh --- plugins/php/versions/common/fileinfo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index 8f84386cb..0974013a3 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -67,7 +67,7 @@ Install_lib() FILE_softmagic=$sourcePath/php${version}/ext/${LIBNAME}/libmagic/softmagic.c FIND_UNDEF_STRNDUP=`cat $FILE_softmagic|grep '#undef strndup'` if [ "$version" -gt "74" ] && [ "$FIND_C99" == "" ];then - sed -i $BAK "s/char *strndup(const char *str, size_t n);/#undef char *strndup\nchar *strndup(const char *str, size_t n);/g" $FILE_softmagic + sed -i $BAK "s/char \*strndup/#undef strndup\nchar \*strndup/g" $FILE_softmagic fi fi fi From 6c478be4df6c134e6d13617feba70518f6d123bc Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 9 Dec 2022 22:38:53 +0800 Subject: [PATCH 22/23] Update fileinfo.sh --- plugins/php/versions/common/fileinfo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index 0974013a3..b947c9a60 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -66,7 +66,7 @@ Install_lib() if [ "$OSNAME" == 'centos' ];then FILE_softmagic=$sourcePath/php${version}/ext/${LIBNAME}/libmagic/softmagic.c FIND_UNDEF_STRNDUP=`cat $FILE_softmagic|grep '#undef strndup'` - if [ "$version" -gt "74" ] && [ "$FIND_C99" == "" ];then + if [ "$version" -gt "74" ] && [ "$FIND_UNDEF_STRNDUP" == "" ];then sed -i $BAK "s/char \*strndup/#undef strndup\nchar \*strndup/g" $FILE_softmagic fi fi From 7e9df9640ed9cc0eb9007320832205493951f899 Mon Sep 17 00:00:00 2001 From: midoks Date: Sat, 10 Dec 2022 01:48:52 +0800 Subject: [PATCH 23/23] =?UTF-8?q?PHP82=E6=AD=A3=E5=BC=8F=E9=87=8A=E5=87=BA?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +++++------- class/core/config_api.py | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e635f01d3..03f02c4d3 100644 --- a/README.md +++ b/README.md @@ -92,14 +92,12 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443: ``` -### 版本更新 0.11.3 +### 版本更新 0.11.4 -* 域名绑定修改。 -* 面板ssl配置加入。 -* 文件搜索优化。 -* php加入phalcon。 -* 文件管理UI优化。 -* phpmyadmin优化。 +* PHP82正式释出。 +* PHP-fileinfo扩展优化。 +* 删除任务时删除日志。 +* 优化修改密码后的显示问题(#288)。 ### JSDelivr安装地址 diff --git a/class/core/config_api.py b/class/core/config_api.py index 128395382..2b868fa33 100755 --- a/class/core/config_api.py +++ b/class/core/config_api.py @@ -27,7 +27,7 @@ from flask import request class config_api: - __version = '0.11.3' + __version = '0.11.4' __api_addr = 'data/api.json' def __init__(self):