From 94c5161fde6bbf2bad751fcfa18346401f838750 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 11 Oct 2018 19:26:06 +0800
Subject: [PATCH] u

---
 plugins/nginx/install.sh | 15 ++-------------
 static/js/soft.js        |  2 +-
 views/plugins.py         | 12 ++++++++++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/plugins/nginx/install.sh b/plugins/nginx/install.sh
index 6965e237a..87807a833 100755
--- a/plugins/nginx/install.sh
+++ b/plugins/nginx/install.sh
@@ -12,25 +12,14 @@ download_Url=$NODE_URL
 
 Install_safelogin()
 {
-	mkdir -p /www/server/panel/plugin/safelogin
-	echo '正在安装脚本文件...' > $install_tmp
-	wget -O /www/server/panel/plugin/safelogin/safelogin_main.py $download_Url/install/lib/plugin/safelogin/safelogin_main.py -T 5
-	wget -O /www/server/panel/plugin/safelogin/index.html $download_Url/install/lib/plugin/safelogin/index.html -T 5
-	wget -O /www/server/panel/plugin/safelogin/info.json $download_Url/install/lib/plugin/safelogin/info.json -T 5
-	wget -O /www/server/panel/plugin/safelogin/icon.png $download_Url/install/lib/plugin/safelogin/icon.png -T 5
-	echo '安装完成' > $install_tmp
-	
+	echo "Install_safelogin"
 }
 
 Uninstall_safelogin()
 {
-	chattr -i /www/server/panel/plugin/safelogin/token.pl
-	rm -f /www/server/panel/data/limitip.conf
-	sed -i "/ALL/d" /etc/hosts.deny
-	rm -rf /www/server/panel/plugin/safelogin
+	echo "Uninstall_safelogin"
 }
 
-
 action=$1
 host=$2;
 if [ "${1}" == 'install' ];then
diff --git a/static/js/soft.js b/static/js/soft.js
index 4c5041f4a..f161b3209 100755
--- a/static/js/soft.js
+++ b/static/js/soft.js
@@ -2119,7 +2119,7 @@ function AddVersion(name, ver, type, obj, title) {
         var data = "name=" + name + "&version=" + version + "&type=" + type;
 
         var loadT = layer.msg(lan.soft.add_install, { icon: 16, time: 0, shade: [0.3, '#000'] });
-        $.post("/plugin?action=install", data, function(rdata) {
+        $.post("/plugins/install", data, function(rdata) {
             layer.closeAll();
             layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
             GetSList();
diff --git a/views/plugins.py b/views/plugins.py
index b5a0b0293..eb0ad3d63 100644
--- a/views/plugins.py
+++ b/views/plugins.py
@@ -75,6 +75,14 @@ def list():
     return jsonify(ret)
 
 
-@plugins.route("install", methods=['GET'])
+@plugins.route("/install", methods=['POST'])
 def install():
-    pass
+    name = request.form['name']
+    if name.strip() == '':
+        return ''
+
+    install = "plugins/" + name + "/install.sh"
+    print install
+    os.system('/bin/bash ' + install + ' install')
+    print request.args
+    return ''