Merge pull request #971 from gdl-888-2/master

차단된 사용자+관리자 ACL

language/en-US.json

@@ -326,6 +326,7 @@
             "owner_acl" : "Owner only",
             "before_acl" : "Only those who have edited this document before",
             "ban_acl" : "Include blocked users",
+            "ban_admin_acl" : "Blocked users and administrators",
             "30_day_acl" : "Only members 30 days after register",
             "_comment_2.6_1_" : "Set",
                 "document_acl" : "Document ACL",

language/ko-KR.json

@@ -353,6 +353,7 @@
     "extension_filter_add": "확장자 필터 추가",
     "extension": "확장자",
     "ban_acl": "차단된 사용자 포함",
+    "ban_admin_acl": "차단된 사용자 및 관리자",
     "topic_name_change": "토론 제목 변경",
     "topic_acl_setting" : "토론 ACL 설정",
     "topic_acl" : "토론 ACL",

route/give_acl.py

@@ -138,6 +138,7 @@ def give_acl_2(conn, name):
                     <li>ban : ''' + load_lang('ban_acl') + '''</li>
                     <li>before : ''' + load_lang('before_acl') + '''</li>
                     <li>30_day : ''' + load_lang('30_day_acl') + '''</li>
+                    <li>ban_admin : ''' + load_lang('ban_admin_acl') + '''</li>
                 </ul>
             '''
 
@@ -164,4 +165,4 @@ def give_acl_2(conn, name):
                 </form>
             ''',
             menu = [['w/' + url_pas(name), load_lang('document')], ['manager', load_lang('admin')], ['admin_log?search=' + url_pas('acl (' + name + ')'), load_lang('acl_record')]]
-        ))
+        ))

route/tool/func.py

@@ -981,6 +981,9 @@ def acl_check(name = 'test', tool = '', topic_num = '1'):
             elif acl_data[0][0] == 'owner':
                 if admin_check() == 1:
                     return 0
+            elif acl_data[0][0] == 'ban_admin':
+                if admin_check(1) == 1 or ban_check() == 1:
+                    return 0
 
             return 1
         else:
@@ -1175,7 +1178,7 @@ def get_acl_list(type_d = 'normal'):
     if type_d == 'user':
         return ['', 'user', 'all']
     else:
-        return ['', 'all', 'user', 'admin', 'owner', '50_edit', 'email', 'ban', 'before', '30_day']
+        return ['', 'all', 'user', 'admin', 'owner', '50_edit', 'email', 'ban', 'before', '30_day', 'ban_admin']
 
 def re_error(data):
     conn.commit()