ACL 기록 기능 추가

language/en-US.json

@@ -88,6 +88,8 @@
         "pass" : "Passing",
         "file_name" : "File name",
         "pinned" : "Pinned",
+        "markup" : "Markup",
+        "title" : "Title",
         "_comment_1.1_" : "Time",
             "second" : "Second(s)",
             "hour" : "Hour(s)",
@@ -169,9 +171,8 @@
         "closed_discussion" : "Closed discussion",
         "agreed_discussion" : "Agreed discussion",
         "history_delete" : "History delete",
-        "markup" : "Markup",
-        "title" : "Title",
         "direct_input" : "Direct input",
+        "acl_record" : "ACL record",
         "_comment_2.1_" : "Filter",
             "_comment_2.1.1_" : "List",
                 "interwiki_list" : "Interwiki(s) list",

language/ko-KR.json

@@ -295,5 +295,6 @@
     "edit_tool_add": "편집 도구 추가",
     "image_license_list": "이미지 라이선스 목록",
     "image_license_add": "이미지 라이선스 추가",
-    "direct_input": "직접 입력"
+    "direct_input": "직접 입력",
+    "acl_record": "ACL 기록"
 }

route/give_acl.py

@@ -16,40 +16,50 @@ def give_acl_2(conn, name):
             return redirect('/login')
         
         if user_data.groups()[0] != ip_check():
-            if admin_check(5, check_data) != 1:
+            if admin_check(5) != 1:
                 if check_data:
                     return re_error('/error/3')
                 else:
                     check_ok = 'disabled'
     else:
-        if admin_check(5, check_data) != 1:
+        if admin_check(5) != 1:
             if check_data:
                 return re_error('/error/3')
             else:
                 check_ok = 'disabled'
 
     if flask.request.method == 'POST':
-        decu = flask.request.form.get('decu', '')
-        view = flask.request.form.get('view', '')
-
         curs.execute("select title from acl where title = ?", [name])
         if curs.fetchall():
-            curs.execute("update acl set decu = ? where title = ?", [decu, name])
+            curs.execute("update acl set decu = ? where title = ?", [flask.request.form.get('decu', ''), name])
             curs.execute("update acl set dis = ? where title = ?", [flask.request.form.get('dis', ''), name])
             curs.execute("update acl set why = ? where title = ?", [flask.request.form.get('why', ''), name])
-            curs.execute("update acl set view = ? where title = ?", [view, name])
+            curs.execute("update acl set view = ? where title = ?", [flask.request.form.get('view', ''), name])
         else:
             curs.execute("insert into acl (title, decu, dis, why, view) values (?, ?, ?, ?, ?)", [
                 name, 
-                decu, 
+                flask.request.form.get('decu', ''), 
                 flask.request.form.get('dis', ''), 
                 flask.request.form.get('why', ''), 
-                view
+                flask.request.form.get('view', '')
             ])
         
         curs.execute("select title from acl where title = ? and decu = '' and dis = '' and view = ''", [name])
         if curs.fetchall():
             curs.execute("delete from acl where title = ?", [name])
+            
+        all = ''
+        for i in ['decu', 'dis', 'view']:
+            if flask.request.form.get(i, '') == '':
+                all += 'normal'
+                if i != 'view':
+                    all += ' | '
+            else:
+                all += flask.request.form.get(i, '')
+                if i != 'view':
+                    all += ' | '
+            
+        admin_check(5, check_data + ' (' + all + ')')
 
         conn.commit()
             
@@ -58,19 +68,19 @@ def give_acl_2(conn, name):
         data = '<h2>' + load_lang('document_acl') + '</h2><hr class=\"main_hr\"><select name="decu" ' + check_ok + '>'
     
         if re.search('^user:', name):
-            acl_list = [['', 'normal'], ['user', 'member'], ['all', 'all']]
+            acl_list = ['', 'user', 'all']
         else:
-            acl_list = [['', 'normal'], ['user', 'member'], ['admin', 'admin'], ['50_edit', '50 edit'], ['email', 'email']]
+            acl_list = ['', 'user', 'admin', '50_edit', 'email']
         
         curs.execute("select decu from acl where title = ?", [name])
         acl_data = curs.fetchall()
         for data_list in acl_list:
-            if acl_data and acl_data[0][0] == data_list[0]:
+            if acl_data and acl_data[0][0] == data_list:
                 check = 'selected="selected"'
             else:
                 check = ''
             
-            data += '<option value="' + data_list[0] + '" ' + check + '>' + data_list[1] + '</option>'
+            data += '<option value="' + data_list + '" ' + check + '>' + (data_list if data_list != '' else 'normal') + '</option>'
             
         data += '</select>'
         
@@ -80,23 +90,23 @@ def give_acl_2(conn, name):
             curs.execute("select dis, why, view from acl where title = ?", [name])
             acl_data = curs.fetchall()
             for data_list in acl_list:
-                if acl_data and acl_data[0][0] == data_list[0]:
+                if acl_data and acl_data[0][0] == data_list:
                     check = 'selected="selected"'
                 else:
                     check = ''
                     
-                data += '<option value="' + data_list[0] + '" ' + check + '>' + data_list[1] + '</option>'
+                data += '<option value="' + data_list + '" ' + check + '>' + (data_list if data_list != '' else 'normal') + '</option>'
                 
             data += '</select>'
 
             data += '<hr class=\"main_hr\"><h2>' + load_lang('view_acl') + '</h2><hr class=\"main_hr\"><select name="view" ' + check_ok + '>'
             for data_list in acl_list:
-                if acl_data and acl_data[0][2] == data_list[0]:
+                if acl_data and acl_data[0][2] == data_list:
                     check = 'selected="selected"'
                 else:
                     check = ''
                     
-                data += '<option value="' + data_list[0] + '" ' + check + '>' + data_list[1] + '</option>'
+                data += '<option value="' + data_list + '" ' + check + '>' + (data_list if data_list != '' else 'normal') + '</option>'
                 
             data += '''
                 </select>
@@ -104,7 +114,7 @@ def give_acl_2(conn, name):
                 <ul>
                     <li>normal : ''' + load_lang('default') + '''</li>
                     <li>admin : ''' + load_lang('admin_acl') + '''</li>
-                    <li>member : ''' + load_lang('member_acl') + '''</li>
+                    <li>user : ''' + load_lang('member_acl') + '''</li>
                     <li>50 edit : ''' + load_lang('50_edit_acl') + '''</li>
                     <li>all : ''' + load_lang('all_acl') + '''</li>
                     <li>email : ''' + load_lang('email_acl') + '''</li>
@@ -126,5 +136,5 @@ def give_acl_2(conn, name):
                     <button type="submit" ''' + check_ok + '''>''' + load_lang('save') + '''</button>
                 </form>
             ''',
-            menu = [['w/' + url_pas(name), load_lang('document')], ['manager', load_lang('admin')]]
+            menu = [['w/' + url_pas(name), load_lang('document')], ['manager', load_lang('admin')], ['admin_log?search=' + url_pas('acl (' + name + ')'), load_lang('acl_record')]]
         ))

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.3-master-11",
+        "r_ver" : "v3.1.3-master-12",
         "c_ver" : "400003",
         "s_ver" : "2"
     }, "stable" : {