ban 유저 포함 ACL 추가

language/en-US.json

@@ -197,6 +197,7 @@
         "blocked_user" : "Blocked user",
         "blocked_admin" : "Blocked administrator",
         "category_title" : "Documents under this category",
+        "ban_acl" : "Include blocked users",
         "_comment_2.1_" : "Filter",
             "_comment_2.1.1_" : "List",
                 "interwiki_list" : "Interwiki(s) list",

language/ko-KR.json

@@ -352,5 +352,6 @@
     "category_title" : "이 분류 아래 문서들",
     "extension_filter_list" : "확장자 필터 목록",
     "extension_filter_add" : "확장자 필터 추가",
-    "extension" : "확장자"
+    "extension" : "확장자",
+    "ban_acl" : "차단된 사용자 포함"
 }

route/application_submitted.py

@@ -5,6 +5,6 @@ def application_submitted_2(conn):
 
     return easy_minify(flask.render_template(skin_check(),
         imp = [load_lang('application_submitted'), wiki_set(), custom(), other2([0, 0])],
-        data =  '''<p>''' + load_lang('waiting_for_approval') + '''</p>''',
+        data = '<p>' + load_lang('waiting_for_approval') + '</p>',
         menu = [['user', load_lang('return')]]
     ))

route/give_acl.py

@@ -71,7 +71,7 @@ def give_acl_2(conn, name):
         if re.search('^user:', name):
             acl_list = ['', 'user', 'all']
         else:
-            acl_list = ['', 'all', 'user', 'admin', 'owner', '50_edit', 'email']
+            acl_list = ['', 'all', 'user', 'admin', 'owner', '50_edit', 'email', 'ban']
 
         curs.execute(db_change("select decu from acl where title = ?"), [name])
         acl_data = curs.fetchall()
@@ -121,6 +121,7 @@ def give_acl_2(conn, name):
                     <li>all : ''' + load_lang('all_acl') + '''</li>
                     <li>email : ''' + load_lang('email_acl') + '''</li>
                     <li>owner : ''' + load_lang('owner_acl') + '''</li>
+                    <li>ban : ''' + load_lang('ban_acl') + '''</li>
                 </ul>
             '''
 

route/main_manager.py

@@ -37,6 +37,7 @@ def main_manager_2(conn, num, r_ver):
                         <li><a href="/give_log">''' + load_lang('admin_group_list') + '''</a></li>
                         <li><a href="/many_delete">''' + load_lang('many_delete') + '''</a></li>
                         <li><a href="/applications">''' + load_lang('application_list') + '''</a></li>
+                        <li><a href="/adsense_setting">''' + load_lang('adsense_setting') + '''</a></li>
                         <li><a href="/setting">''' + load_lang('setting') + '''</a></li>
                     </ul>
                     <h3>''' + load_lang('filter') + '''</h3>
@@ -55,7 +56,6 @@ def main_manager_2(conn, num, r_ver):
                     <ul>
                         <li><a href="/restart">''' + load_lang('wiki_restart') + '''</a></li>
                         <li><a href="/update">''' + load_lang('update') + '''</a></li>
-                        <li><a href="/adsense_setting">''' + load_lang('adsense_setting') + '''</a></li>
                     </ul>
                     <br>
                     <h2>''' + load_lang('version') + '''</h2>

route/tool/func.py

@@ -818,15 +818,16 @@ def slow_edit_check():
 
 def acl_check(name = 'test', tool = '', sub = 'test'):
     ip = ip_check()
+    get_ban = ban_check()
 
-    if ban_check() == 1:
-        return 1
-
-    if tool == '' and tool != 'render' and name:
+    if tool == '' and name:
         acl_c = re.search("^user:((?:(?!\/).)*)", name)
         if acl_c:
             acl_n = acl_c.groups()
 
+            if get_ban == 1:
+                return 1
+
             if admin_check(5) == 1:
                 return 0
 
@@ -891,9 +892,12 @@ def acl_check(name = 'test', tool = '', sub = 'test'):
             num = 5
 
         acl_data = curs.fetchall()
-        if acl_data and acl_data[0][0] != 'normal':
-            if acl_data[0][0] == 'all':
-                return 1
+        print(acl_data, name)
+        if ((not acl_data and i == (end - 1)) or (acl_data and acl_data[0][0] != 'ban')) and get_ban == 1 and tool != 'render':
+            return 1
+        elif acl_data and acl_data[0][0] != 'normal':
+            if acl_data[0][0] == 'all' or acl_data[0][0] == 'ban':
+                return 0
 
             if acl_data[0][0] == 'user':
                 if ip_or_user(ip) == 1:

route/tool/set_mark/tool.py

@@ -41,10 +41,7 @@ def savemark(data):
     data = re.sub("\[date\(now\)\]", get_time(), data)
 
     ip = ip_check()
-    if not re.search("\.|:", ip):
-        name = '[[user:' + ip + '|' + ip + ']]'
-    else:
-        name = ip
+    name = '[[user:' + ip + '|' + ip + ']]' if not re.search("\.|:", ip) else ip
 
     data = re.sub("\[name\]", name, data)