Explorar o código

기본 편집 요청 ACL 추가

Surplus_Up (2DU) %!s(int64=6) %!d(string=hai) anos
pai
achega
7e79e61941
Modificáronse 6 ficheiros con 73 adicións e 75 borrados
  1. 25 26
      language/en-US.json
  2. 20 22
      language/ko-KR.json
  3. 2 3
      route/edit.py
  4. 20 23
      route/setting.py
  5. 5 0
      route/tool/func.py
  6. 1 1
      version.json

+ 25 - 26
language/en-US.json

@@ -20,9 +20,9 @@
         "host" : "Host",
         "port" : "Port",
         "restart" : "Restart",
-        "document_name" : "Document[s] name",
-        "discussion_name" : "Discussion[s] name",
-        "user_name" : "User[s] name",
+        "document_name" : "Document name",
+        "discussion_name" : "Discussion name",
+        "user_name" : "User name",
         "go" : "Go",
         "document" : "Document",
         "discussion" : "Discussion",
@@ -125,10 +125,10 @@
         "edit_filter" : "Contents filter",
         "recent_ban" : "Recently Block(s)",
         "load" : "Import another document",
-        "edit_filter_rule" : "Contents filter[s] rule",
+        "edit_filter_rule" : "Contents filter rule",
         "move_history" : "History of move",
         "other_tool" : "Other tool",
-        "admin_tool" : "Admin[s] tool",
+        "admin_tool" : "Admin tool",
         "check_user" : "Check user",
         "compare_target" : "Comparison target name",
         "authorize" : "Authorize",
@@ -137,7 +137,7 @@
         "pinned_release" : "Unpinned",
         "ban_release" : "Unblock",
         "discussion_tool" : "Discussion tools",
-        "discussion_raw" : "Discussion[s] raw",
+        "discussion_raw" : "Discussion raw",
         "oauth_signin_facebook" : "Sign-in with Facebook",
         "oauth_signin_naver" : "Sign-in with NAVER",
         "oauth_signin_discord" : "Sign-in with Discord",
@@ -153,15 +153,11 @@
         "login_able" : "Loginable",
         "band_ban" : "Range block",
         "band_blocked" : "Range blocked",
-        "document_acl" : "Document[s] ACL",
-        "discussion_acl" : "Discussion[s] ACL",
-        "view_acl" : "Document viewed ACL",
         "under_category" : "Sub-category",
         "count" : "Number of Contributions",
         "alarm" : "Notice(s)",
-        "user_document" : "User[s] document",
-        "user_head" : "User[s] <HEAD>",
-        "user_document_acl" : "User[s] document ACL",
+        "user_document" : "User document",
+        "user_head" : "User <HEAD>",
         "encryption_method" : "Encryption method",
         "check_key" : "Check authentication key",
         "reset_user_ok" : "Check Success",
@@ -186,8 +182,8 @@
         "old_page" : "Old decument(s)",
         "skin_set" : "Skin setting(s)",
         "many_delete" : "Bulk delete",
-        "edit_req" : "Edit Request",
-        "edit_req_check" : "Check Edit Request",
+        "edit_req" : "Edit request",
+        "edit_req_check" : "Check edit request",
         "_comment_2.1_" : "Filter",
             "_comment_2.1.1_" : "List",
                 "interwiki_list" : "Interwiki(s) list",
@@ -212,7 +208,7 @@
             "adsense_setting" : "Adsense settings",
             "adsense_enable" : "Adsense enable",
             "skin_setting" : "Skin settings",
-            "main_acl_setting" : "Main ACL settings",
+            "main_acl_setting" : "Default ACL settings",
             "_comment_2.2.1_" : "List",
                 "main_setting" : "Main settings",
                 "text_setting" : "Text settings",
@@ -220,22 +216,18 @@
                 "main_body" : "Top of body",
                 "main_bottom_body" : "Bottom of body",
             "_comment_2.2.2_" : "Main",
-                "wiki_name" : "Wiki[s] name",
-                "wiki_logo" : "Wiki[s] logo",
+                "wiki_name" : "Wiki name",
+                "wiki_logo" : "Wiki logo",
                 "main_page" : "Main page",
                 "bottom_text" : "Bottom text",
                 "max_file_size" : "Max file size",
                 "backup_interval" : "Backup Cycles",
-                "wiki_skin" : "Wiki[s] Skin",
-                "default_acl" : "Default edit ACL",
-                "default_discussion_acl" : "Default discussion ACL",
-                "upload_acl" : "Upload ACL",
-                "default_view_acl" : "Default document viewed ACL",
+                "wiki_skin" : "Wiki Skin",
                 "no_register" : "No sign-up",
                 "hide_ip" : "Hide IP",
-                "wiki_host" : "Wiki[s] host",
-                "wiki_port" : "Wiki[s] port",
-                "wiki_secret_key" : "Wiki[s] secret key",
+                "wiki_host" : "Wiki host",
+                "wiki_port" : "Wiki port",
+                "wiki_secret_key" : "Wiki secret key",
                 "email_required" : "Email required",
                 "google_imap_required" : "Google IMAP setting required",
                 "update_branch" : "Branch to import updates",
@@ -298,12 +290,19 @@
             "all_acl" : "All users",
             "email_acl" : "Only users with email",
             "owner_acl" : "Owner only",
+            "_comment_2.6_1_" : "Set",
+                "document_acl" : "Document ACL",
+                "discussion_acl" : "Discussion ACL",
+                "view_acl" : "Document viewed ACL",
+                "user_document_acl" : "User document ACL",
+                "upload_acl" : "Upload ACL",
+                "edit_req_acl" : "Edit request ACL",
     "_comment_3_" : "Long",
         "ie_no_data_required" : "Operation cannot continue because all required data has not been collected.",
         "oauth_settings_not_found" : "Administrator has not provided any data about using this feature.",
         "oauth_disabled" : "Administrator has disabled this feature.",
         "http_warring" : "Warning : If you are not on HTTPS connection, Your information can be leaked. We won't response to that.",
-        "user_head_warring" : "User[s] <HEAD> will deleted if you close the browser or sign-in",
+        "user_head_warring" : "User <HEAD> will deleted if you close the browser or sign-in",
         "no_login_warring" : "Non-login status. IP is logged when working with non-login.",
         "user_reset_sign" : "Your account information has changed like this.",
         "update_warring" : "Manual updates are recommended if your version is 0.2 or lower than the latest version. For Windows, the contents of the route folder disappear.",

+ 20 - 22
language/ko-KR.json

@@ -56,7 +56,7 @@
     "connect": "연결",
     "edit_record": "편집 기록",
     "preview": "미리보기",
-    "view" : "보기",
+    "view": "보기",
     "no_login_error": "비로그인 상태입니다.",
     "upload": "파일 올리기",
     "user_name": "사용자 이름",
@@ -136,7 +136,6 @@
     "update_error": "자동 업데이트가 지원되지 않습니다.",
     "need_document": "필요한 문서들",
     "sub": "하위",
-    "default_acl": "기본 수정 ACL",
     "template": "틀",
     "user_document_acl": "사용자 문서 ACL",
     "password_confirm": "비밀번호 확인",
@@ -251,7 +250,6 @@
     "topic_state": "토론 상태",
     "watchlist": "주시 목록",
     "main_page": "대문",
-    "default_discussion_acl": "기본 토론 ACL",
     "user": "사용자",
     "skin_info": "스킨 정보",
     "new_connection": "연결...",
@@ -297,23 +295,23 @@
     "last_edit_time": "최근 수정 시각",
     "link": "링크",
     "icon": "아이콘",
-    "topic_setting" : "토론 설정",
-    "old_page" : "오래된 문서",
-    "skin_set" : "스킨 설정",
-    "edit_help" : "편집창 문구",
-    "defalut_edit_help" : "이곳에 내용을 써주세요",
-    "many_delete" : "대량 삭제",
-    "many_delete_help" : "한 줄에 문서명 하나씩 적어주세요.",
-    "content" : "내용",
-    "upload_acl" : "파일 올리기 ACL",
-    "default_view_acl" : "기본 보기 ACL",
-    "topic_delete" : "토론 삭제",
-    "edit_req" : "편집 요청",
-    "edit_req_check" : "편집 요청 검사",
-    "sqlite_only" : "SQLite만",
-    "off" : "끄기",
-    "slow_edit" : "연속 편집 제한 시간",
-    "public_key" : "공개키",
-    "fast_edit_error" : "편집 속도가 너무 빠릅니다. 제한 (초) : ",
-    "main_acl_setting" : "메인 ACL 설정"
+    "topic_setting": "토론 설정",
+    "old_page": "오래된 문서",
+    "skin_set": "스킨 설정",
+    "edit_help": "편집창 문구",
+    "defalut_edit_help": "이곳에 내용을 써주세요",
+    "many_delete": "대량 삭제",
+    "many_delete_help": "한 줄에 문서명 하나씩 적어주세요.",
+    "content": "내용",
+    "upload_acl": "파일 올리기 ACL",
+    "topic_delete": "토론 삭제",
+    "edit_req": "편집 요청",
+    "edit_req_check": "편집 요청 검사",
+    "sqlite_only": "SQLite만",
+    "off": "끄기",
+    "slow_edit": "연속 편집 제한 시간",
+    "public_key": "공개키",
+    "fast_edit_error": "편집 속도가 너무 빠릅니다. 제한 (초) : ",
+    "main_acl_setting": "기본 ACL 설정",
+    "edit_req_acl": "편집 요청 ACL"
 }

+ 2 - 3
route/edit.py

@@ -4,17 +4,16 @@ def edit_2(conn, tool, name):
     curs = conn.cursor()
 
     ip = ip_check()
-    ban = acl_check(name)
     get_ver = flask.request.args.get('r', None)
     if get_ver:
         section = None
     else:
         section = flask.request.args.get('section', None)
 
-    if ban == 1:
+    if acl_check(name) == 1:
         if tool == 'edit':
             return redirect('/edit_req/' + url_pas(name))
-        elif tool == 'edit_req' and (re.search('^user:', name) or ban_check() == 1 or get_ver):
+        elif tool == 'edit_req' and (acl_check(name, 'edit_req') == 1 or re.search('^user:', name) or ban_check() == 1 or get_ver):
             return re_error('/ban')
     else:
         if tool == 'edit_req':

+ 20 - 23
route/setting.py

@@ -506,16 +506,18 @@ def setting_2(conn, num):
             ))
     elif num == 8:
         i_list = {
-            6 : 'edit', 
-            14 : 'discussion', 
-            17 : 'upload_acl',
-            18 : 'all_view_acl'
+            1 : 'edit', 
+            2 : 'discussion', 
+            3 : 'upload_acl',
+            4 : 'all_view_acl',
+            5 : 'edit_req_acl'
         }
         n_list = {
-            6 : 'normal', 
-            14 : 'normal', 
-            17 : 'normal',
-            18 : 'normal'
+            1 : 'normal', 
+            2 : 'normal', 
+            3 : 'normal',
+            4 : 'normal',
+            5 : 'normal'
         }
         
         if flask.request.method == 'POST':
@@ -545,20 +547,11 @@ def setting_2(conn, num):
 
             conn.commit()
             
-            acl_div = ['', '', '', '']
+            acl_div = ['', '', '', '', '']
             acl_list = ['normal', 'user', 'admin', 'owner', '50_edit', 'email']
-            for i in range(0, 4):
-                if i == 0:
-                    acl_num = 6
-                elif i == 1:
-                    acl_num = 14
-                elif i == 2:
-                    acl_num = 17
-                else:
-                    acl_num = 18
-
+            for i in range(0, 5):
                 for acl_data in acl_list:
-                    if acl_data == d_list[acl_num]:
+                    if acl_data == d_list[i + 1]:
                         acl_div[i] = '<option value="' + acl_data + '">' + acl_data + '</option>' + acl_div[i]
                     else:
                         acl_div[i] += '<option value="' + acl_data + '">' + acl_data + '</option>'
@@ -567,11 +560,11 @@ def setting_2(conn, num):
                 imp = [load_lang('main_acl_setting'), wiki_set(), custom(), other2([0, 0])],
                 data = '''
                     <form method="post">
-                        <span>''' + load_lang('default_acl') + '</span> <a href="/acl/TEST">(' + load_lang('reference') + ''')</a>
+                        <span>''' + load_lang('document_acl') + '</span> <a href="/acl/TEST">(' + load_lang('reference') + ''')</a>
                         <hr class=\"main_hr\">
                         <select name="edit">''' + acl_div[0] + '''</select>
                         <hr class=\"main_hr\">
-                        <span>''' + load_lang('default_discussion_acl') + '''</span>
+                        <span>''' + load_lang('discussion_acl') + '''</span>
                         <hr class=\"main_hr\">
                         <select name="discussion">''' + acl_div[1] + '''</select>
                         <hr class=\"main_hr\">
@@ -579,10 +572,14 @@ def setting_2(conn, num):
                         <hr class=\"main_hr\">
                         <select name="upload_acl">''' + acl_div[2] + '''</select>
                         <hr class=\"main_hr\">
-                        <span>''' + load_lang('default_view_acl') + '''</span>
+                        <span>''' + load_lang('view_acl') + '''</span>
                         <hr class=\"main_hr\">
                         <select name="all_view_acl">''' + acl_div[3] + '''</select>
                         <hr class=\"main_hr\">
+                        <span>''' + load_lang('edit_req_acl') + '''</span>
+                        <hr class=\"main_hr\">
+                        <select name="edit_req_acl">''' + acl_div[4] + '''</select>
+                        <hr class=\"main_hr\">
                         <button id="save" type="submit">''' + load_lang('save') + '''</button>
                     </form>
                 ''',

+ 5 - 0
route/tool/func.py

@@ -830,6 +830,11 @@ def acl_check(name = 'test', tool = '', sub = 'test'):
             num = 3
         elif tool == 'upload':
             curs.execute(db_change("select data from other where name = 'upload_acl'"))
+            
+            num = 5
+        elif tool == 'edit_req':
+            curs.execute(db_change("select data from other where name = 'edit_req_acl'"))
+            
             num = 5
         else:
             if i == 0:

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.5-master-38",
+        "r_ver" : "v3.1.5-master-39",
         "c_ver" : "400007",
         "s_ver" : "7"
     }, "stable" : {