diff --git a/plugins/php/conf/php72.ini b/plugins/php/conf/php72.ini index 0c84de2d1..ae12180d5 100644 --- a/plugins/php/conf/php72.ini +++ b/plugins/php/conf/php72.ini @@ -36,7 +36,7 @@ enable_dl = Off file_uploads = On -upload_tmp_dir = "MD:/bin/tmp/upload" +upload_tmp_dir = "/tmp/upload" upload_max_filesize = 2M max_file_uploads = 20 @@ -153,7 +153,7 @@ bcmath.scale = 0 [Session] session.save_handler = files -session.save_path = "MD:/bin/tmp/session" +session.save_path = "/tmp/session" session.use_strict_mode = 0 session.use_cookies = 1 session.use_only_cookies = 1 diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh index bf25b054b..bee10b8bf 100755 --- a/plugins/php/versions/72/install.sh +++ b/plugins/php/versions/72/install.sh @@ -37,6 +37,7 @@ cd $sourcePath/php/php-7.2.5 && ./configure \ --exec-prefix=$serverPath/php/72 \ --with-config-file-path=$serverPath/php/72/etc \ --with-zlib-dir=$serverPath/lib/zlib \ +--enable-mysqlnd \ --without-iconv \ --enable-zip \ --enable-mbstring \ diff --git a/plugins/phpmyadmin/conf/phpmyadmin.conf b/plugins/phpmyadmin/conf/phpmyadmin.conf index ac208afaa..0923997d0 100755 --- a/plugins/phpmyadmin/conf/phpmyadmin.conf +++ b/plugins/phpmyadmin/conf/phpmyadmin.conf @@ -23,5 +23,5 @@ server deny all; } - access_log off; + access_log {$SERVER_PATH}/phpmyadmin/access.log; } \ No newline at end of file diff --git a/plugins/phpmyadmin/index.html b/plugins/phpmyadmin/index.html index a4180e9fa..b56e6364d 100755 --- a/plugins/phpmyadmin/index.html +++ b/plugins/phpmyadmin/index.html @@ -4,8 +4,8 @@

服务

重写模版

主页

-

PHP版本

-

安全设置

+

PHP版本

+

安全设置

diff --git a/plugins/phpmyadmin/index.py b/plugins/phpmyadmin/index.py index f8c2b3c7d..9ceb764f7 100755 --- a/plugins/phpmyadmin/index.py +++ b/plugins/phpmyadmin/index.py @@ -133,6 +133,33 @@ def reload(): return start() +def setPhpVer(): + args = getArgs() + + if not 'phpver' in args: + return 'phpver missing' + + cacheFile = getServerDir() + '/php.pl' + public.writeFile(cacheFile, args['phpver']) + restart() + + return 'ok' + + +def getSetPhpVer(): + cacheFile = getServerDir() + '/php.pl' + if os.path.exists(cacheFile): + return public.readFile(cacheFile).strip() + return '' + + +def getPmaPort(): + try: + port = getPort() + return public.returnJson(True, 'OK', port) + except Exception as e: + return public.returnJson(False, '插件未启动!') + if __name__ == "__main__": func = sys.argv[1] if func == 'status': @@ -149,5 +176,11 @@ if __name__ == "__main__": print getConf() elif func == 'get_home_page': print getHomePage() + elif func == 'set_php_ver': + print setPhpVer() + elif func == 'get_set_php_ver': + print getSetPhpVer() + elif func == 'get_pma_port': + print getPmaPort() else: print 'error' diff --git a/plugins/phpmyadmin/js/phpmyadmin.js b/plugins/phpmyadmin/js/phpmyadmin.js index 9689bb9c3..040a64c9e 100755 --- a/plugins/phpmyadmin/js/phpmyadmin.js +++ b/plugins/phpmyadmin/js/phpmyadmin.js @@ -31,11 +31,21 @@ function pmaPost(method,args,callback){ },'json'); } + +function pmaAsyncPost(method,args){ + + var _args = null; + if (typeof(args) == 'string'){ + _args = JSON.stringify(str2Obj(args)); + } else { + _args = JSON.stringify(args); + } + return syncPost('/plugins/run', {name:'phpmyadmin', func:method, args:_args}); +} + function homePage(){ pmaPost('get_home_page', '', function(data){ - console.log(data); var rdata = $.parseJSON(data.data); - console.log(rdata); if (!rdata.status){ layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']}); return; @@ -45,61 +55,84 @@ function homePage(){ }); } +//phpmyadmin切换php版本 +function phpVer(version) { + + var _version = pmaAsyncPost('get_set_php_ver','') + if (_version['data'] != ''){ + version = _version['data']; + } + + $.post('/site/get_php_version', function(rdata) { + // console.log(rdata); + var body = "
PHP版本
'; + $(".soft-man-con").html(body); + },'json'); +} + +function phpVerChange(type, msg) { + var phpver = $("#phpver").val(); + pmaPost('set_php_ver', 'phpver='+phpver, function(data){ + if ( data.data == 'ok' ){ + layer.msg('设置成功!',{icon:1,time:2000,shade: [0.3, '#000']}); + } else { + layer.msg('设置失败!',{icon:2,time:2000,shade: [0.3, '#000']}); + } + }); +} + + //phpmyadmin安全设置 -function safeConf(name, port, auth) { +function safeConf(name, auth) { + var data = pmaAsyncPost('get_pma_port'); + var rdata = $.parseJSON(data.data); + if (!rdata.status){ + layer.msg(rdata.msg,{icon:2,time:2000,shade: [0.3, '#000']}); + return; + } var con = '
\ - ' + lan.soft.pma_port + '\ - \ - \ + 访问端口\ + \ + \
\
\ - ' + lan.soft.pma_pass + '\ + 密码访问\ \ \ \
\
\ -

' + lan.soft.pma_user + '

\ -

' + lan.soft.pma_pass1 + '

\ -

' + lan.soft.pma_pass2 + '

\ -

\ +

授权账号

\ +

访问密码

\ +

重复密码

\ +

\
\ - '; + '; $(".soft-man-con").html(con); - if (auth) { + // if (auth) { + // $(".user_pw").show(); + // } +} + +//phpmyadmin二级密码 +function phpmyadminSafe() { + var stat = $("#phpmyadminsafe").prop("checked"); + if (stat) { + $(".user_pw").hide(); + phpmyadmin('close'); + } else { $(".user_pw").show(); } } -function phpVerChange(type, msg) { - var data = type + '=' + $("#" + msg).val(); - var loadT = layer.msg(lan.public.the, { icon: 16, time: 0, shade: [0.3, '#000'] }); - $.post('/ajax?action=setPHPMyAdmin', data, function(rdata) { - layer.closeAll(); - layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 }); - if (rdata.status) { - setTimeout(function() { - window.location.reload(); - }, 3000); - } - }) -} - -//phpmyadmin切换php版本 -function phpVer(name, version) { - $.post('/site?action=GetPHPVersion', function(rdata) { - var body = "
" + lan.soft.php_version + "
'; - $(".soft-man-con").html(body); - }) -} //修改phpmyadmin端口 function phpmyadminport() { var pmport = $("#pmport").val(); @@ -115,17 +148,6 @@ function phpmyadminport() { }); } -//phpmyadmin二级密码 -function phpmyadminSafe() { - var stat = $("#phpmyadminsafe").prop("checked"); - if (stat) { - $(".user_pw").hide(); - phpmyadmin('close'); - } else { - $(".user_pw").show(); - } - -} //设置phpmyadmin二级密码 function phpmyadmin(msg) {