From 7556043bef2f7014bf1e4a70f5d55fcda3da887a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 1 Mar 2019 17:37:18 +0800
Subject: [PATCH] update

---
 plugins/l2tp/index.py        | 16 +++++++++++++---
 plugins/l2tp/js/l2tp.js      |  4 ++--
 plugins/l2tp/scripts/l2tp.sh | 20 +-------------------
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/plugins/l2tp/index.py b/plugins/l2tp/index.py
index 7f24a8b1e..bd6c046e0 100755
--- a/plugins/l2tp/index.py
+++ b/plugins/l2tp/index.py
@@ -149,10 +149,20 @@ def modUser():
     if not data[0]:
         return data[1]
 
-    ret = public.execShell('echo ' + args['username'] + '|l2tp -d')
+    path = getPathFile()
+    username = args['username']
+    password = args['password']
+
+    # sed -i "/^\<${user}\>/d" /etc/ppp/chap-secrets
+    # echo "${user}    l2tpd    ${pass}       *" >> /etc/ppp/chap-secrets
+    public.execShell("sed -i .bak '/^\(" + username + "\)/d' " + path)
+    # print 'echo "' + username + "    l2tpd    " + password + "      *\" >>"
+    # + path
+    ret = public.execShell("echo \"" + username +
+                           "    l2tpd    " + password + "       *\" >>" + path)
     if ret[1] == '':
-        return public.returnJson(True, '修改成功!:' + ret[0])
-    return public.returnJson(False, '修改失败:' + ret[0])
+        return public.returnJson(True, '修改成功!')
+    return public.returnJson(False, '修改失败')
 
 
 if __name__ == "__main__":
diff --git a/plugins/l2tp/js/l2tp.js b/plugins/l2tp/js/l2tp.js
index 7d7942d8d..12b0c4fc4 100755
--- a/plugins/l2tp/js/l2tp.js
+++ b/plugins/l2tp/js/l2tp.js
@@ -126,7 +126,7 @@ function modUser(username){
         area: '240px',
         content:"<div class='bt-form pd20 pb70 c6'>\
             <div class='version line'>\
-                <div><input class='bt-input-text mr5 outline_no' type='text' name='password' style='height: 28px; border-radius: 3px;width: 200px;' placeholder='输入密码'></div>\
+                <div><input class='bt-input-text mr5 outline_no' type='text' id='password' name='password' style='height: 28px; border-radius: 3px;width: 200px;' placeholder='输入密码'></div>\
             </div>\
             <div class='bt-form-submit-btn'>\
                 <button type='button' id='mod_ok' class='btn btn-success btn-sm btn-title bi-btn'>确认</button>\
@@ -139,7 +139,7 @@ function modUser(username){
         _data['username'] = username;
         _data['password'] = $('#password').val();
         var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
-        lpPost('add_user', _data, function(data){
+        lpPost('mod_user', _data, function(data){
             var rdata = $.parseJSON(data.data);
             layer.close(loadOpen);
             layer.msg(rdata.msg,{icon:rdata.status?1:2,time:2000,shade: [0.3, '#000']});
diff --git a/plugins/l2tp/scripts/l2tp.sh b/plugins/l2tp/scripts/l2tp.sh
index 72b769a63..2109a4489 100644
--- a/plugins/l2tp/scripts/l2tp.sh
+++ b/plugins/l2tp/scripts/l2tp.sh
@@ -784,24 +784,6 @@ mod_user(){
 }
 
 
-mod_user2(){
-    if [ $1 == ''];then
-        echo 'user name cannot be empty'
-        exit 1
-    fi
-
-    if [ $2 == ''];then
-        echo 'password cannot be empty'
-        exit 1
-    fi
-    user=$1
-    pass=$2
-    sed -i "/^\<${user}\>/d" /etc/ppp/chap-secrets
-    echo "${user}    l2tpd    ${pass}       *" >> /etc/ppp/chap-secrets
-    echo "Username ${user}'s password has been changed."
-}
-
-
 
 # Main process
 action=$1
@@ -823,7 +805,7 @@ case ${action} in
         del_user
         ;;
     -m|--mod)
-        mod_user2
+        mod_user
         ;;
     -h|--help)
         echo "Usage: `basename $0` -l,--list   List all users"