From 6e5b10cffe1f6628cf64d2aa821f77fee5363f5c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Mar 2019 16:09:54 +0800
Subject: [PATCH] u

---
 plugins/l2tp/index.py   | 14 ++++++++++----
 plugins/l2tp/js/l2tp.js |  2 --
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/l2tp/index.py b/plugins/l2tp/index.py
index 250e03137..84e153bf2 100755
--- a/plugins/l2tp/index.py
+++ b/plugins/l2tp/index.py
@@ -110,8 +110,8 @@ def getUserList():
         line = re.match(r'(\w*)\s*(\w*)\s*(\w*)\s*(.*)',
                         line.strip(), re.M | re.I).groups()
         line_info['user'] = line[0]
-        line_info['pwd'] = line[1]
-        line_info['psk'] = line[2]
+        line_info['pwd'] = line[2]
+        line_info['type'] = line[1]
         line_info['ip'] = line[3]
         user.append(line_info)
 
@@ -123,8 +123,10 @@ def addUser():
     data = checkArgs(args, ['username'])
     if not data[0]:
         return data[1]
-
-    public.execShell('echo ' + args['username'] + '> ')
+    ret = public.execShell('echo ' + args['username'] + '|l2tp -a')
+    if ret[0] == ''
+        return public.returnJson(True, '添加成功!')
+    return public.returnJson(False, '添加失败:' + ret[1])
 
 
 def delUser():
@@ -133,6 +135,10 @@ def delUser():
     if not data[0]:
         return data[1]
 
+    ret = public.execShell('echo ' + args['username'] + '|l2tp -l')
+    if ret[0] == ''
+        return public.returnJson(True, '删除成功!')
+    return public.returnJson(False, '删除失败:' + ret[1])
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
diff --git a/plugins/l2tp/js/l2tp.js b/plugins/l2tp/js/l2tp.js
index 580118aa6..2822f55b7 100755
--- a/plugins/l2tp/js/l2tp.js
+++ b/plugins/l2tp/js/l2tp.js
@@ -63,7 +63,6 @@ function userList(){
         con += '<thead><tr>';
         con += '<th>用户</th>';
         con += '<th>密码</th>';
-        con += '<th>PSK</th>';
         con += '<th>操作(<a class="btlink" onclick="addUser()">添加</a>)</th>';
         con += '</tr></thead>';
 
@@ -73,7 +72,6 @@ function userList(){
             con += '<tr>'+
                 '<td>' + list[i]['user']+'</td>' +
                 '<td>' + list[i]['pwd']+'</td>' +
-                '<td>' + list[i]['psk']+'</td>' +
                 '<td><a class="btlink" onclick="modPwd()">改密</a>|<a class="btlink" onclick="delUser(\''+list[i]['user']+'\')">删除</a></td></tr>';
         }