优化

phpmyadmin版本判断
waf的bug修改
soft页优化

plugins/mysql/js/mysql.js

@@ -805,6 +805,8 @@ function setDbPs(id, name, obj) {
 function openPhpmyadmin(name,username,password){
 
     data = syncPost('/plugins/check',{'name':'phpmyadmin'});
+
+
     if (!data.status){
         layer.msg(data.msg,{icon:2,shade: [0.3, '#000']});
         return;
@@ -815,7 +817,7 @@ function openPhpmyadmin(name,username,password){
         layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
         return;
     }
-
+    // console.log(data);
     data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_home_page'});
     var rdata = $.parseJSON(data.data);
     if (!rdata.status){
@@ -830,16 +832,28 @@ function openPhpmyadmin(name,username,password){
         return;
     }
 
+    //检查版本
+    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'version'});
+    bigVer = data.data.split('.')[0]
+    if (bigVer>=5){
+
+        setTimeout(function(){
+            $("#toPHPMyAdmin").submit();
+        },3000);
+        layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
+        
+    } else{
         var murl = $("#toPHPMyAdmin").attr('action');
         $("#pma_username").val(username);
         $("#pma_password").val(password);
         $("#db").val(name);
 
-    layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:1000});
+        layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
 
         setTimeout(function(){
             $("#toPHPMyAdmin").submit();
-    },2000);
+        },3000);
+    }    
 }
 
 function delBackup(filename,name){

plugins/op_waf/info.json

@@ -3,7 +3,7 @@
 	"tip":"soft",
 	"name":"op_waf",
 	"type":"其他插件",
-	"ps":"【兼容开发中,不要开启】有效防止sql注入/xss/一句话木马等常见渗透攻击",
+	"ps":"有效防止sql注入/xss/一句话木马等常见渗透攻击",
 	"shell":"install.sh",
 	"checks":"server/op_waf",
 	"path":"server/op_waf",

plugins/phpmyadmin/index.py

@@ -216,6 +216,10 @@ def errorLog():
     return '/www/server/phpmyadmin/error.log'
 
 
+def Version():
+    return mw.readFile(getServerDir() + '/version.pl')
+
+
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
@@ -230,6 +234,8 @@ if __name__ == "__main__":
         print(reload())
     elif func == 'conf':
         print(getConf())
+    elif func == 'version':
+        print(Version())
     elif func == 'config_inc':
         print(getConfInc())
     elif func == 'get_home_page':

route/static/app/soft.js

@@ -106,7 +106,7 @@ function getSList(isdisplay) {
                 var mupdate = '';//(plugin.versions[n] == plugin.updates[n]) '' : '<a class="btlink" onclick="SoftUpdate(\'' + plugin.name + '\',\'' + plugin.versions[n].version + '\',\'' + plugin.updates[n] + '\')">更新</a> | ';
                 // if (plugin.versions[n] == '') mupdate = '';
                 handle = mupdate + '<a class="btlink" onclick="softMain(\'' + plugin.name + '\',\'' + plugin.setup_version + '\')">设置</a> | <a class="btlink" onclick="uninstallVersion(\'' + plugin.name + '\',\'' + plugin.setup_version + '\')">卸载</a>';
-                titleClick = 'onclick="softMain(\'' + plugin.name + '\',\'' + setup_version + '\')" style="cursor:pointer"';
+                titleClick = 'onclick="softMain(\'' + plugin.name + '\',\'' + plugin.setup_version + '\')" style="cursor:pointer"';
              
                 softPath = '<span class="glyphicon glyphicon-folder-open" title="' + plugin.path + '" onclick="openPath(\'' + plugin.path + '\')"></span>';
                 if (plugin.coexist){