From 958755d18d8c17c59e0ab434466f8d47d75f2d3e Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Tue, 11 Dec 2018 00:28:09 +0800
Subject: [PATCH] update

---
 plugins/csvn/index.py   | 36 ++++++++++++++++++++++++++++++++++--
 plugins/csvn/js/csvn.js | 37 +++++++++++++++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/plugins/csvn/index.py b/plugins/csvn/index.py
index 50ebf4719..9b3cfc785 100755
--- a/plugins/csvn/index.py
+++ b/plugins/csvn/index.py
@@ -150,8 +150,36 @@ def initdUinstall():
     return 'ok'
 
 
-def getAllUserList():
-    pass
+def userAdd():
+    args = getArgs()
+    if not 'username' in args:
+        return 'name missing'
+
+    if not 'password' in args:
+        return 'password missing'
+
+    htpasswd = getServerDir() + "/bin/htpasswd"
+    svn_auth_file = getServerDir() + "/data/conf/svn_auth_file"
+    cmd = htpasswd + ' -b ' + svn_auth_file + ' ' + \
+        args['username'] + ' ' + args['password']
+    data = public.execShell(cmd)
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def userDel():
+    args = getArgs()
+    if not 'username' in args:
+        return 'name missing'
+
+    htpasswd = getServerDir() + "/bin/htpasswd"
+    svn_auth_file = getServerDir() + "/data/conf/svn_auth_file"
+    cmd = htpasswd + ' -D ' + svn_auth_file + ' ' + args['username']
+    data = public.execShell(cmd)
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
 
 
 def userList():
@@ -221,6 +249,10 @@ if __name__ == "__main__":
         print saveConf()
     elif func == 'user_list':
         print userList()
+    elif func == 'user_add':
+        print userAdd()
+    elif func == 'user_del':
+        print userDel()
     elif func == 'project_list':
         print projectList()
     else:
diff --git a/plugins/csvn/js/csvn.js b/plugins/csvn/js/csvn.js
index 7959f116e..87febf9fd 100755
--- a/plugins/csvn/js/csvn.js
+++ b/plugins/csvn/js/csvn.js
@@ -31,7 +31,7 @@ function csvnUserList(page) {
         ulist = rdata.data;
         for (i in ulist){
             content += '<tr><td>'+ulist[i]+'</td><td>'+
-                '<a class="btlink" onclick="csvnDelUser(\''+ulist[i]+'\')">删除</a>|' +
+                '<a class="btlink" onclick="csvnDelUser(\''+ulist[i]+'\')">删除</a> | ' +
                 '<a class="btlink" onclick="csvnModPwdUser(\''+ulist[i]+'\')">改密</a></td></tr>';
         }
 
@@ -49,7 +49,40 @@ function csvnUserList(page) {
 }
 
 function csvnDelUser(name){
-    console.log(name);   
+    var loadOpen = layer.open({
+        type: 1,
+        title: '删除用户',
+        area: '350px',
+        content:"<div class='bt-form pd20 pb70 c6'>\
+            <div class='version line'>你要确认要删除"+ name + "账户?</div>\
+            <div class='bt-form-submit-btn'>\
+                <button type='button' id='csvn_del_close' class='btn btn-danger btn-sm btn-title'>关闭</button>\
+                <button type='button' id='csvn_del_ok' class='btn btn-success btn-sm btn-title bi-btn'>确认</button>\
+            </div>\
+        </div>"
+    });
+
+    $('#csvn_del_close').click(function(){
+        layer.close(loadOpen);
+    });
+
+    $('#csvn_del_ok').click(function(){
+        _data = {};
+        _data['username'] = name;
+        var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+        $.post('/plugins/run', {name:'csvn', func:'user_del', args:JSON.stringify(_data)}, function(data) {
+            layer.close(loadT);
+            if (!data.status){
+                layer.msg(data.data,{icon:0,time:2000,shade: [0.3, '#000']});
+                return;
+            }
+
+            if (data.data !='ok'){
+                layer.msg(data.data,{icon:2,time:2000,shade: [0.3, '#000']});
+            }
+        },'json');
+
+    });
 }
 
 function csvnModPwdUser(name){