diff --git a/class/core/site_api.py b/class/core/site_api.py index f1a216828..b65b68e1c 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -1,6 +1,5 @@ # coding: utf-8 -import psutil import time import os import sys @@ -9,6 +8,9 @@ import re import json import pwd +sys.path.append("/usr/local/lib/python2.7/site-packages") +import psutil + from flask import request diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index 38f2d832d..d16ff9a8b 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -536,6 +536,27 @@ function delDb(id, name){ }); } +function openPhpmyadmin(name,username,password){ + + if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){ + layer.msg(lan.database.phpmyadmin_err,{icon:2,shade: [0.3, '#000']}) + setTimeout(function(){ window.location.href = '/soft'; },3000); + return; + } + + var murl = $("#toPHPMyAdmin").attr('action'); + $("#pma_username").val(username); + $("#pma_password").val(password); + $("#db").val(name); + + layer.msg(lan.database.phpmyadmin,{icon:16,shade: [0.3, '#000'],time:1000}); + + setTimeout(function(){ + $("#toPHPMyAdmin").submit(); + },200); + +} + function dbList(page, search){ var _data = {}; if (typeof(page) =='undefined'){ @@ -577,7 +598,7 @@ function dbList(page, search){ var con = '