add main acl

route/main_func_setting_acl.py

@@ -65,43 +65,49 @@ def main_func_setting_acl():
 
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('main_acl_setting'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
-                data = '''
+                data = render_simple_set('''
                     <form method="post">
-                        <a href="/acl/TEST#exp">(''' + load_lang('reference') + ''')</a>
                         <hr class="main_hr">
+                        <a href="/acl/TEST#exp">(''' + load_lang('reference') + ''')</a>
                         
-                        <span>''' + load_lang('document_acl') + '''</span> 
-                        <hr class="main_hr">
+                        <h2>''' + load_lang('document_acl') + '''</h2>
                         <select ''' + disable + ''' name="edit">''' + acl_div[0] + '''</select>
                         <hr class="main_hr">
-                        
-                        <span>''' + load_lang('discussion_acl') + '''</span>
+
+                        <h3>''' + load_lang('document_edit_acl') + '''</h3>
+                        <select ''' + disable + ''' name="document_edit_acl">''' + acl_div[6] + '''</select>
                         <hr class="main_hr">
-                        <select ''' + disable + ''' name="discussion">''' + acl_div[1] + '''</select>
+
+                        <h3>''' + load_lang('document_move_acl') + '''</h3>
+                        <select ''' + disable + ''' name="document_move_acl">''' + acl_div[7] + '''</select>
+                        <hr class="main_hr">
+
+                        <h3>''' + load_lang('document_delete_acl') + '''</h3>
+                        <select ''' + disable + ''' name="document_delete_acl">''' + acl_div[8] + '''</select>
                         <hr class="main_hr">
                         
-                        <span>''' + load_lang('upload_acl') + '''</span>
+                        <h2>''' + load_lang('discussion_acl') + '''</h2>
+                        <select ''' + disable + ''' name="discussion">''' + acl_div[1] + '''</select>
                         <hr class="main_hr">
+                        
+                        <h2>''' + load_lang('upload_acl') + '''</h2>
                         <select ''' + disable + ''' name="upload_acl">''' + acl_div[2] + '''</select>
                         <hr class="main_hr">
                         
-                        <span>''' + load_lang('view_acl') + '''</span>
-                        <hr class="main_hr">
+                        <h2>''' + load_lang('view_acl') + '''</h2>
                         <select ''' + disable + ''' name="all_view_acl">''' + acl_div[3] + '''</select>
                         <hr class="main_hr">
                         
-                        <span>''' + load_lang('many_upload_acl') + '''</span>
-                        <hr class="main_hr">
+                        <h2>''' + load_lang('many_upload_acl') + '''</h2>
                         <select ''' + disable + ''' name="many_upload_acl">''' + acl_div[4] + '''</select>
                         <hr class="main_hr">
                         
-                        <span>''' + load_lang('vote_acl') + '''</span>
-                        <hr class="main_hr">
+                        <h2>''' + load_lang('vote_acl') + '''</h2>
                         <select ''' + disable + ''' name="vote_acl">''' + acl_div[5] + '''</select>
-                        <hr class="main_hr">
                         
+                        <hr class="main_hr">
                         <button id="opennamu_save_button" type="submit">''' + load_lang('save') + '''</button>
                     </form>
-                ''',
+                '''),
                 menu = [['setting', load_lang('return')]]
             ))

route/tool/func.py

@@ -1699,7 +1699,7 @@ def acl_check(name = 'test', tool = '', topic_num = '1'):
                 return 0
     
             return 1
-    elif tool == 'document_edit' or tool == 'document_move' or tool == 'document_delete':
+    elif tool in ['document_edit', 'document_move', 'document_delete']:
         if acl_check(name, '') == 1:
             return 1
     elif tool == 'topic':
@@ -1709,7 +1709,7 @@ def acl_check(name = 'test', tool = '', topic_num = '1'):
 
     if tool in ['topic']:
         end = 3
-    elif tool in ['render', 'vote', '']:
+    elif tool in ['render', 'vote', '', 'document_edit', 'document_move', 'document_delete']:
         end = 2
     else:
         end = 1
@@ -1733,21 +1733,36 @@ def acl_check(name = 'test', tool = '', topic_num = '1'):
 
             num = 5
         elif tool == 'document_move':
-            curs.execute(db_change(
-                "select data from acl where title = ? and type = 'document_move_acl'"
-            ), [name])
+            if i == 0:
+                curs.execute(db_change(
+                    "select data from acl where title = ? and type = 'document_move_acl'"
+                ), [name])
+            else:
+                curs.execute(db_change(
+                    'select data from other where name = "document_move_acl"'
+                ))
 
             num = 5
         elif tool == 'document_edit':
-            curs.execute(db_change(
-                "select data from acl where title = ? and type = 'document_edit_acl'"
-            ), [name])
+            if i == 0:
+                curs.execute(db_change(
+                    "select data from acl where title = ? and type = 'document_edit_acl'"
+                ), [name])
+            else:
+                curs.execute(db_change(
+                    'select data from other where name = "document_edit_acl"'
+                ))
 
             num = 5
         elif tool == 'document_delete':
-            curs.execute(db_change(
-                "select data from acl where title = ? and type = 'document_delete_acl'"
-            ), [name])
+            if i == 0:
+                curs.execute(db_change(
+                    "select data from acl where title = ? and type = 'document_delete_acl'"
+                ), [name])
+            else:
+                curs.execute(db_change(
+                    'select data from other where name = "document_delete_acl"'
+                ))
 
             num = 5
         elif tool == 'topic':

route/topic_tool_setting.py

@@ -91,26 +91,26 @@ def topic_tool_setting(topic_num = 1):
 
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('topic_setting'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
-                data = '''
+                data = render_simple_set('''
                     <form method="post">
-                        <h2>1. ''' + load_lang('topic_progress') + '''</h2>
+                        <h2>''' + load_lang('topic_progress') + '''</h2>
                         <select name="stop_d">
                             ''' + stop_d_list + '''
                         </select>
                         <hr class="main_hr">
                         <input type="checkbox" name="agree" value="O" ''' + agree_check + '''> ''' + load_lang('topic_change_agree') + '''
 
-                        <h2>2. ''' + load_lang('topic_associate') + '''</h2>
+                        <h2>''' + load_lang('topic_associate') + '''</h2>
                         ''' + load_lang('topic_link_vote') + ''' (''' + load_lang('not_working') + ''')
                         <hr class="main_hr">
                         <input placeholder="''' + load_lang('topic_insert_vote_number') + '''" name="vote_number" type="number">
 
-                        <h2>3. ''' + load_lang('why') + '''</h2>
+                        <h2>''' + load_lang('why') + '''</h2>
                         <input placeholder="''' + load_lang('why') + ''' (''' + load_lang('markup_enabled') + ''')" name="why" type="text">
+                        
                         <hr class="main_hr">
-
                         <button type="submit">''' + load_lang('save') + '''</button>
                     </form>
-                ''',
+                '''),
                 menu = [['thread/' + topic_num + '/tool', load_lang('return')]]
             ))

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC2-dev126",
+        "r_ver" : "v3.4.6-RC2-dev127",
         "c_ver" : "3500358",
         "s_ver" : "3500111"
     }