inter_wiki 파트 조금 수정

app.py

@@ -268,44 +268,44 @@ db_set_str = json.dumps(data_db_set)
 
 # Func
 # Func-inter_wiki
-app.route('/inter_wiki', defaults = { 'tool' : 'inter_wiki' })(filter_inter_wiki)
-app.route('/inter_wiki/del/<everything:name>', defaults = { 'tool' : 'del_inter_wiki' })(filter_inter_wiki_delete)
-app.route('/inter_wiki/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_inter_wiki' })(filter_inter_wiki_add)
-app.route('/inter_wiki/add/<everything:name>', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_inter_wiki' })(filter_inter_wiki_add)
+app.route('/filter/inter_wiki', defaults = { 'tool' : 'inter_wiki' })(filter_all)
+app.route('/filter/inter_wiki/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'inter_wiki' })(filter_all_add)
+app.route('/filter/inter_wiki/add/<everything:name>', methods = ['POST', 'GET'], defaults = { 'tool' : 'inter_wiki' })(filter_all_add)
+app.route('/filter/inter_wiki/del/<everything:name>', defaults = { 'tool' : 'inter_wiki' })(filter_all_delete)
 
-app.route('/filter/document/list')(filter_document)
-app.route('/filter/document/add/<everything:name>', methods = ['POST', 'GET'])(filter_document_add)
-app.route('/filter/document/add', methods = ['POST', 'GET'])(filter_document_add)
-app.route('/filter/document/del/<name>')(filter_document_delete)
+app.route('/filter/document', defaults = { 'tool' : 'document' })(filter_all)
+app.route('/filter/document/add/<everything:name>', methods = ['POST', 'GET'], defaults = { 'tool' : 'document' })(filter_all_add)
+app.route('/filter/document/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'document' })(filter_all_add)
+app.route('/filter/document/del/<everything:name>', defaults = { 'tool' : 'document' })(filter_all_delete)
 
-app.route('/edit_top', defaults = { 'tool' : 'edit_top' })(filter_inter_wiki)
-app.route('/edit_top/del/<everything:name>', defaults = { 'tool' : 'del_edit_top' })(filter_inter_wiki_delete)
-app.route('/edit_top/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_edit_top' })(filter_inter_wiki_add)
+app.route('/filter/edit_top', defaults = { 'tool' : 'edit_top' })(filter_all)
+app.route('/filter/edit_top/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'edit_top' })(filter_all_add)
+app.route('/filter/edit_top/del/<everything:name>', defaults = { 'tool' : 'edit_top' })(filter_all_delete)
 
-app.route('/image_license', defaults = { 'tool' : 'image_license' })(filter_inter_wiki)
-app.route('/image_license/del/<everything:name>', defaults = { 'tool' : 'del_image_license' })(filter_inter_wiki_delete)
-app.route('/image_license/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_image_license' })(filter_inter_wiki_add)
+app.route('/filter/image_license', defaults = { 'tool' : 'image_license' })(filter_all)
+app.route('/filter/image_license/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'image_license' })(filter_all_add)
+app.route('/filter/image_license/del/<everything:name>', defaults = { 'tool' : 'image_license' })(filter_all_delete)
 
-app.route('/edit_filter', defaults = { 'tool' : 'edit_filter' })(filter_inter_wiki)
-app.route('/edit_filter/del/<everything:name>', defaults = { 'tool' : 'del_edit_filter' })(filter_inter_wiki_delete)
-app.route('/edit_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_edit_filter' })(filter_inter_wiki_add)
-app.route('/edit_filter/add/<everything:name>', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_edit_filter' })(filter_inter_wiki_add)
+app.route('/filter/edit_filter', defaults = { 'tool' : 'edit_filter' })(filter_all)
+app.route('/filter/edit_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'edit_filter' })(filter_all_add)
+app.route('/filter/edit_filter/add/<everything:name>', methods = ['POST', 'GET'], defaults = { 'tool' : 'edit_filter' })(filter_all_add)
+app.route('/filter/edit_filter/del/<everything:name>', defaults = { 'tool' : 'edit_filter' })(filter_all_delete)
 
-app.route('/email_filter', defaults = { 'tool' : 'email_filter' })(filter_inter_wiki)
-app.route('/email_filter/del/<everything:name>', defaults = { 'tool' : 'del_email_filter' })(filter_inter_wiki_delete)
-app.route('/email_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_email_filter' })(filter_inter_wiki_add)
+app.route('/filter/email_filter', defaults = { 'tool' : 'email_filter' })(filter_all)
+app.route('/filter/email_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'email_filter' })(filter_all_add)
+app.route('/filter/email_filter/del/<everything:name>', defaults = { 'tool' : 'email_filter' })(filter_all_delete)
 
-app.route('/file_filter', defaults = { 'tool' : 'file_filter' })(filter_inter_wiki)
-app.route('/file_filter/del/<everything:name>', defaults = { 'tool' : 'del_file_filter' })(filter_inter_wiki_delete)
-app.route('/file_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_file_filter' })(filter_inter_wiki_add)
+app.route('/filter/file_filter', defaults = { 'tool' : 'file_filter' })(filter_all)
+app.route('/filter/file_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'file_filter' })(filter_all_add)
+app.route('/filter/file_filter/del/<everything:name>', defaults = { 'tool' : 'file_filter' })(filter_all_delete)
 
-app.route('/name_filter', defaults = { 'tool' : 'name_filter' })(filter_inter_wiki)
-app.route('/name_filter/del/<everything:name>', defaults = { 'tool' : 'del_name_filter' })(filter_inter_wiki_delete)
-app.route('/name_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_name_filter' })(filter_inter_wiki_add)
+app.route('/filter/name_filter', defaults = { 'tool' : 'name_filter' })(filter_all)
+app.route('/filter/name_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'name_filter' })(filter_all_add)
+app.route('/filter/name_filter/del/<everything:name>', defaults = { 'tool' : 'name_filter' })(filter_all_delete)
 
-app.route('/extension_filter', defaults = { 'tool' : 'extension_filter' })(filter_inter_wiki)
-app.route('/extension_filter/del/<everything:name>', defaults = { 'tool' : 'del_extension_filter' })(filter_inter_wiki_delete)
-app.route('/extension_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_extension_filter' })(filter_inter_wiki_add)
+app.route('/filter/extension_filter', defaults = { 'tool' : 'extension_filter' })(filter_all)
+app.route('/filter/extension_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'extension_filter' })(filter_all_add)
+app.route('/filter/extension_filter/del/<everything:name>', defaults = { 'tool' : 'extension_filter' })(filter_all_delete)
 
 # Func-list
 app.route('/list/document/old')(list_old_page)
@@ -527,6 +527,8 @@ app.route('/vote/add', methods = ['POST', 'GET'])(vote_add)
 app.route('/bbs/main', defaults = { 'tool' : 'main' })(bbs_w)
 app.route('/bbs/make', methods = ['POST', 'GET'])(bbs_make)
 # app.route('/bbs/main/set')
+app.route('/bbs/hide/<int:bbs_num>', methods = ['POST', 'GET'])(bbs_hide)
+app.route('/bbs/delete/<int:bbs_num>', methods = ['POST', 'GET'])(bbs_delete)
 app.route('/bbs/w/<int:bbs_num>')(bbs_w)
 app.route('/bbs/set/<int:bbs_num>', methods = ['POST', 'GET'])(bbs_w_set)
 app.route('/bbs/edit/<int:bbs_num>', methods = ['POST', 'GET'])(bbs_w_edit)

route/__init__.py

@@ -34,12 +34,9 @@ from route.edit_move import edit_move
 from route.edit_revert import edit_revert
 from route.edit_upload import edit_upload
 
-from route.filter_document import filter_document
-from route.filter_document_add import filter_document_add
-from route.filter_document_delete import filter_document_delete
-from route.filter_inter_wiki import filter_inter_wiki
-from route.filter_inter_wiki_add import filter_inter_wiki_add
-from route.filter_inter_wiki_delete import filter_inter_wiki_delete
+from route.filter_all import filter_all
+from route.filter_all_add import filter_all_add
+from route.filter_all_delete import filter_all_delete
 
 from route.give_admin_groups import give_admin_groups_2
 from route.give_auth import give_auth

route/filter_inter_wiki.py → route/filter_all.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def filter_inter_wiki(tool):
+def filter_all(tool):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
@@ -17,35 +17,30 @@ def filter_inter_wiki(tool):
 
         if tool == 'inter_wiki':
             title = load_lang('interwiki_list')
-
             curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'inter_wiki'"))
         elif tool == 'email_filter':
             title = load_lang('email_filter_list')
-
             curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'email'"))
         elif tool == 'name_filter':
             title = load_lang('id_filter_list')
-
             curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'name'"))
         elif tool == 'edit_filter':
             title = load_lang('edit_filter_list')
-
             curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'regex_filter'"))
         elif tool == 'file_filter':
             title = load_lang('file_filter_list')
-
             curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'file'"))
         elif tool == 'image_license':
             title = load_lang('image_license_list')
-
             curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'image_license'"))
         elif tool == 'extension_filter':
             title = load_lang('extension_filter_list')
-
             curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'extension'"))
+        elif tool == 'document':
+            title = load_lang('document_filter_list')
+            curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'document'"))
         else:
             title = load_lang('edit_tool_list')
-
             curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'edit_top'"))
 
         db_data = curs.fetchall()
@@ -55,21 +50,18 @@ def filter_inter_wiki(tool):
 
             div += html.escape(data[0])
             if admin == 1:
-                if tool in ('inter_wiki', 'edit_filter'):
-                    div += ' <a href="/' + tool + '/add/' + url_pas(data[0]) + '">(' + load_lang('edit') + ')</a>'
+                if tool in ('inter_wiki', 'edit_filter', 'document'):
+                    div += ' <a href="/filter/' + tool + '/add/' + url_pas(data[0]) + '">(' + load_lang('edit') + ')</a>'
                     
-                div += ' <a href="/' + tool + '/del/' + url_pas(data[0]) + '">(' + load_lang('delete') + ')</a>'
+                div += ' <a href="/filter/' + tool + '/del/' + url_pas(data[0]) + '">(' + load_lang('delete') + ')</a>'
 
             div += '</td>'
 
             if tool == 'inter_wiki':
                 div += '<td><a class="opennamu_link_out" href="' + html.escape(data[1]) + '">' + html.escape(data[1]) + '</a></td>'
-            else:
-                div += '<td>' + html.escape(data[1]) + '</td>'
-
-            if tool == 'inter_wiki':
                 div += '<td>' + data[2] + '</td>'
             else:
+                div += '<td>' + html.escape(data[1]) + '</td>'
                 div += '<td>' + html.escape(data[2]) + '</td>'
             
             div += '</tr>'

route/filter_inter_wiki_add.py → route/filter_all_add.py

@@ -1,121 +1,103 @@
 from .tool.func import *
 
-def filter_inter_wiki_add(tool, name = None):
+def filter_all_add(tool, name = None):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
-        if not name and tool == 'plus_edit_filter':
+        if not name and tool == 'edit_filter':
             return redirect('/manager/9')
 
         if flask.request.method == 'POST':
             if admin_check() != 1:
                 return re_error('/error/3')
 
-            if tool == 'plus_inter_wiki':
-                if name:
-                    curs.execute(db_change("delete from html_filter where html = ? and kind = 'inter_wiki'"), [name])
-
-                curs.execute(db_change("delete from html_filter where html = ? and kind = 'inter_wiki'"), [
-                    flask.request.form.get('title', 'test')
-                ])
-                curs.execute(db_change('insert into html_filter (html, plus, plus_t, kind) values (?, ?, ?, "inter_wiki")'), [
-                    flask.request.form.get('title', 'test'),
-                    flask.request.form.get('link', 'test'),
-                    flask.request.form.get('icon', '')
-                ])
+            title = flask.request.form.get('title', 'test')
+            if tool == 'inter_wiki':
+                link = flask.request.form.get('link', 'test')
+                icon = flask.request.form.get('icon', '')
 
+                curs.execute(db_change("delete from html_filter where html = ? and kind = 'inter_wiki'"), [title])
+                curs.execute(db_change('insert into html_filter (html, plus, plus_t, kind) values (?, ?, ?, "inter_wiki")'), [title, link, icon])
                 admin_check(None, 'inter_wiki_plus')
-            elif tool == 'plus_edit_filter':
+            elif tool == 'edit_filter':
                 if admin_check(None, 'edit_filter edit') != 1:
                     return re_error('/error/3')
 
-                if flask.request.form.get('second', '0') == '0':
-                    end = 'X'
-                else:
-                    end = flask.request.form.get('second', 'X')
+                sec = flask.request.form.get('second', '0')
+                end = 'X' if sec == '0' else sec
 
+                content = flask.request.form.get('content', 'test')
                 try:
-                    re.compile(flask.request.form.get('content', 'test'))
-
-                    curs.execute(db_change("delete from html_filter where html = ? and kind = 'regex_filter'"), [name])
-                    curs.execute(db_change("insert into html_filter (html, plus, plus_t, kind) values (?, ?, ?, 'regex_filter')"), [
-                        name,
-                        flask.request.form.get('content', 'test'),
-                        end
-                    ])
+                    re.compile(content)
                 except:
                     return re_error('/error/23')
+                
+                curs.execute(db_change("delete from html_filter where html = ? and kind = 'regex_filter'"), [name])
+                curs.execute(db_change("insert into html_filter (html, plus, plus_t, kind) values (?, ?, ?, 'regex_filter')"), [name, content, end])
+            elif tool == 'document':
+                post_name = flask.request.form.get('name', '')
+                if post_name == '':
+                    return redirect('/filter/document/list')
+            
+                post_acl = flask.request.form.get('acl', '')
+                post_regex = flask.request.form.get('regex', '')
+                try:
+                    re.compile(post_regex)
+                except:
+                    return re_error('/error/23')
+                
+                curs.execute(db_change('insert into html_filter (html, kind, plus, plus_t) values (?, "document", ?, ?)'), [post_name, post_regex, post_acl])
             else:
                 plus_d = ''
-
-                if tool == 'plus_name_filter':
+                if tool == 'name_filter':
                     try:
-                        re.compile(flask.request.form.get('title', 'test'))
+                        re.compile(title)
                     except:
                         return re_error('/error/23')
 
                     admin_check(None, 'name_filter edit')
-
                     type_d = 'name'
-                elif tool == 'plus_file_filter':
+                elif tool == 'file_filter':
                     try:
-                        re.compile(flask.request.form.get('title', 'test'))
+                        re.compile(title)
                     except:
                         return re_error('/error/23')
 
                     admin_check(None, 'file_filter edit')
-
                     type_d = 'file'
-                elif tool == 'plus_email_filter':
+                elif tool == 'email_filter':
                     admin_check(None, 'email_filter edit')
-
                     type_d = 'email'
-                elif tool == 'plus_image_license':
+                elif tool == 'image_license':
                     admin_check(None, 'image_license edit')
-
                     type_d = 'image_license'
-                elif tool == 'plus_extension_filter':
+                elif tool == 'extension_filter':
                     admin_check(None, 'extension_filter edit')
-
                     type_d = 'extension'
                 else:
                     admin_check(None, 'edit_top edit')
-
                     type_d = 'edit_top'
                     plus_d = flask.request.form.get('markup', 'test')
 
                 if name:
-                    curs.execute(db_change("delete from html_filter where html = ? and kind = ?"), [
-                        name,
-                        type_d
-                    ])
-
-                curs.execute(db_change('insert into html_filter (html, kind, plus, plus_t) values (?, ?, ?, ?)'), [
-                    flask.request.form.get('title', 'test'),
-                    type_d,
-                    plus_d,
-                    ''
-                ])
+                    curs.execute(db_change("delete from html_filter where html = ? and kind = ?"), [name, type_d])
+
+                curs.execute(db_change('insert into html_filter (html, kind, plus, plus_t) values (?, ?, ?, ?)'), [title, type_d, plus_d, ''])
 
             conn.commit()
 
-            return redirect('/' + re.sub(r'^plus_', '', tool))
+            return redirect('/filter/' + tool)
         else:
-            # 추가 편집 구분 필요
-            # 각 파일 별로 분리 필요
             get_sub = 0
             stat = 'disabled' if admin_check() != 1 else ''
+            name = name if name else ''
 
-            if tool == 'plus_inter_wiki':
-                if name:
+            if tool == 'inter_wiki':
+                value = ['', '', '']
+                if name != '':
                     curs.execute(db_change("select html, plus, plus_t from html_filter where html = ? and kind = 'inter_wiki'"), [name])
                     exist = curs.fetchall()
-                    if exist:
-                        value = exist[0]
-                    else:
-                        value = ['', '', '']
-                else:
-                    value = ['', '', '']
+                    value = exist[0] if exist else value
 
                 title = load_lang('interwiki_add')
                 form_data = '''
@@ -131,21 +113,14 @@ def filter_inter_wiki_add(tool, name = None):
                     <hr class="main_hr">
                     <input value="''' + html.escape(value[2]) + '''" type="text" name="icon">
                 '''
-            elif tool == 'plus_edit_filter':            
+            elif tool == 'edit_filter':            
                 curs.execute(db_change("select plus, plus_t from html_filter where html = ? and kind = 'regex_filter'"), [name])
                 exist = curs.fetchall()
                 if exist:
                     textarea = exist[0][0]
-
-                    if exist[0][1] == 'X':
-                        time_check = 'checked="checked"'
-                        time_data = ''
-                    else:
-                        time_check = ''
-                        time_data = exist[0][1]
+                    time_data = '' if exist[0][1] == 'X' else exist[0][1]
                 else:
                     textarea = ''
-                    time_check = ''
                     time_data = ''
 
                 insert_data = ''
@@ -169,41 +144,64 @@ def filter_inter_wiki_add(tool, name = None):
                     <hr class="main_hr">
                     <input placeholder="''' + load_lang('regex') + '''" name="content" value="''' + html.escape(textarea) + '''" type="text">
                 '''
-            elif tool == 'plus_name_filter':
+            elif tool == 'name_filter':
                 title = load_lang('id_filter_add')
                 form_data = '' + \
                     load_lang('regex') + \
                     '<hr class="main_hr">' + \
-                    '<input value="' + html.escape(name if name else '') + '" type="text" name="title">' + \
+                    '<input value="' + html.escape(name) + '" type="text" name="title">' + \
                 ''
-            elif tool == 'plus_file_filter':
+            elif tool == 'file_filter':
                 title = load_lang('file_filter_add')
                 form_data = '' + \
                     load_lang('regex') + \
                     '<hr class="main_hr">' + \
-                    '<input value="' + html.escape(name if name else '') + '" type="text" name="title">' + \
+                    '<input value="' + html.escape(name) + '" type="text" name="title">' + \
                 ''
-            elif tool == 'plus_email_filter':
+            elif tool == 'email_filter':
                 title = load_lang('email_filter_add')
                 form_data = '' + \
                     load_lang('email') + \
                     '<hr class="main_hr">' + \
-                    '<input value="' + html.escape(name if name else '') + '" type="text" name="title">' + \
+                    '<input value="' + html.escape(name) + '" type="text" name="title">' + \
                 ''
-            elif tool == 'plus_image_license':
+            elif tool == 'image_license':
                 title = load_lang('image_license_add')
                 form_data = '' + \
                     load_lang('license') + \
                     '<hr class="main_hr">' + \
-                    '<input value="' + html.escape(name if name else '') + '" type="text" name="title">' + \
+                    '<input value="' + html.escape(name) + '" type="text" name="title">' + \
                 ''
-            elif tool == 'plus_extension_filter':
+            elif tool == 'extension_filter':
                 title = load_lang('extension_filter_add')
                 form_data = '' + \
                     load_lang('extension') + \
                     '<hr class="main_hr">' + \
-                    '<input value="' + html.escape(name if name else '') + '" type="text" name="title">' + \
+                    '<input value="' + html.escape(name) + '" type="text" name="title">' + \
                 ''
+            elif tool == 'document':
+                acl_list = get_acl_list()
+                
+                curs.execute(db_change("select plus, plus_t from html_filter where html = ? and kind = 'document'"), [name])
+                db_data = curs.fetchall()
+                acl_list = [['selected' if db_data and db_data[0][1] == for_a else '', for_a] for for_a in acl_list]
+
+                title = load_lang('document_filter_add')
+                form_data = '''
+                    ''' + load_lang('name') + '''
+                    <hr class="main_hr">
+                    <input value="''' + html.escape(name) + '''" type="text" name="name">
+                    <hr class="main_hr">
+                    ''' + load_lang('regex') + '''
+                    <hr class="main_hr">
+                    <input value="''' + (html.escape(db_data[0][0]) if db_data else '') + '''" type="text" name="regex">
+                    <hr class="main_hr">
+                    <a href="/acl/Test#exp">''' + load_lang('acl') + '''</a>
+                    <hr class="main_hr">
+                    <select name="acl">
+                        ''' + ''.join(['<option ' + for_a[0] + ' value=' + for_a[1] + '>' + ('normal' if for_a[1] == '' else for_a[1]) + '</option>' for for_a in acl_list]) + '''
+                    </select>
+                '''
             else:
                 title = load_lang('edit_tool_add')
                 if name:
@@ -219,7 +217,7 @@ def filter_inter_wiki_add(tool, name = None):
                 form_data = '''
                     ''' + load_lang('title') + '''
                     <hr class="main_hr">
-                    <input value="''' + html.escape(name if name else '') + '''" type="text" name="title">
+                    <input value="''' + html.escape(name) + '''" type="text" name="title">
                     <hr class="main_hr">
                     ''' + load_lang('markup') + '''
                     <hr class="main_hr">
@@ -235,5 +233,5 @@ def filter_inter_wiki_add(tool, name = None):
                             <button ''' + stat + ''' type="submit">''' + load_lang('add') + '''</button>
                         </form>
                         ''',
-                menu = [[re.sub('^plus_', '', tool), load_lang('return')]]
+                menu = [['filter/' + tool, load_lang('return')]]
             ))

route/filter_inter_wiki_delete.py → route/filter_all_delete.py

@@ -1,29 +1,31 @@
 from .tool.func import *
 
-def filter_inter_wiki_delete(tool, name = 'Test'):
+def filter_all_delete(tool, name = 'Test'):
     with get_db_connect() as conn:
         curs = conn.cursor()
         
-        if admin_check(None, tool) != 1:
+        if admin_check(None, 'del_' + tool) != 1:
             return re_error('/error/3')
 
-        if tool == 'del_inter_wiki':
+        if tool == 'inter_wiki':
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'inter_wiki'"), [name])
-        elif tool == 'del_edit_filter':
+        elif tool == 'edit_filter':
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'regex_filter'"), [name])
-        elif tool == 'del_name_filter':
+        elif tool == 'name_filter':
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'name'"), [name])
-        elif tool == 'del_file_filter':
+        elif tool == 'file_filter':
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'file'"), [name])
-        elif tool == 'del_email_filter':
+        elif tool == 'email_filter':
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'email'"), [name])
-        elif tool == 'del_image_license':
+        elif tool == 'image_license':
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'image_license'"), [name])
-        elif tool == 'del_extension_filter':
+        elif tool == 'extension_filter':
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'extension'"), [name])
+        elif tool == 'document':
+            curs.execute(db_change("delete from html_filter where html = ? and kind = 'document'"), [name])
         else:
             curs.execute(db_change("delete from html_filter where html = ? and kind = 'edit_top'"), [name])
 
         conn.commit()
 
-        return redirect('/' + re.sub(r'^del_', '', tool))
+        return redirect('/filter/' + tool)

route/filter_document.py

@@ -1,41 +0,0 @@
-from .tool.func import *
-
-def filter_document():
-    with get_db_connect() as conn:
-        curs = conn.cursor()
-
-        div = '<table id="main_table_set">'
-        div += '<tr id="main_table_top_tr">'
-        div += '<td id="main_table_width">A</td>'
-        div += '<td id="main_table_width">B</td>'
-        div += '<td id="main_table_width">C</td>'
-        div += '</tr>'
-
-        admin = admin_check()
-        title = load_lang('document_filter_list')
-        
-        curs.execute(db_change("select html, plus, plus_t from html_filter where kind = 'document'"))
-        db_data = curs.fetchall()
-        for data in db_data:
-            div += '<tr>'
-            div += '<td>' + html.escape(data[0])
-            if admin == 1:
-                div += ' <a href="/filter/document/add/' + url_pas(data[0]) + '">(' + load_lang('edit') + ')</a>'
-                div += ' <a href="/filter/document/del/' + url_pas(data[0]) + '">(' + load_lang('delete') + ')</a>'
-
-            div += '</td>'
-            div += '<td>' + html.escape(data[1]) + '</td>'
-            div += '<td>' + html.escape(data[2]) + '</td>'
-            div += '</tr>'
-
-        div += '</table>'
-
-        if admin == 1:
-            div += '<hr class="main_hr">'
-            div += '<a href="/filter/document/add">(' + load_lang('add') + ')</a>'
-
-        return easy_minify(flask.render_template(skin_check(),
-            imp = [title, wiki_set(), wiki_custom(), wiki_css([0, 0])],
-            data = div,
-            menu = [['manager/1', load_lang('return')]]
-        ))

route/filter_document_add.py

@@ -1,62 +0,0 @@
-from .tool.func import *
-
-def filter_document_add(name = ''):
-    with get_db_connect() as conn:
-        curs = conn.cursor()
-
-        if flask.request.method == 'POST':
-            if admin_check(None, 'plus_document_filter') != 1:
-                return re_error('/error/3')
-
-            post_name = flask.request.form.get('name', '')
-            if post_name == '':
-                return redirect('/filter/document/list')
-            
-            post_acl = flask.request.form.get('acl', '')
-            post_regex = flask.request.form.get('regex', '')
-            try:
-                re.compile(post_regex)
-            except:
-                return re_error('/error/23')
-
-            curs.execute(db_change('insert into html_filter (html, kind, plus, plus_t) values (?, ?, ?, ?)'), [
-                post_name,
-                'document',
-                post_regex,
-                post_acl
-            ])
-
-            conn.commit()
-
-            return redirect('/filter/document/list')
-        else:
-            stat = 'disabled' if admin_check() != 1 else ''
-            acl_list = get_acl_list()
-            
-            curs.execute(db_change("select plus, plus_t from html_filter where html = ? and kind = 'document'"), [name])
-            db_data = curs.fetchall()
-            acl_list = [['selected' if db_data and db_data[0][1] == i else '', i] for i in acl_list]
-
-            return easy_minify(flask.render_template(skin_check(),
-                imp = [load_lang('document_filter_add'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
-                data =  '''
-                        <form method="post">
-                            ''' + load_lang('name') + '''
-                            <hr class="main_hr">
-                            <input value="''' + html.escape(name) + '''" type="text" name="name">
-                            <hr class="main_hr">
-                            ''' + load_lang('regex') + '''
-                            <hr class="main_hr">
-                            <input value="''' + (html.escape(db_data[0][0]) if db_data else '') + '''" type="text" name="regex">
-                            <hr class="main_hr">
-                            <a href="/acl/Test#exp">''' + load_lang('acl') + '''</a>
-                            <hr class="main_hr">
-                            <select name="acl">
-                                ''' + ''.join(['<option ' + i[0] + ' value=' + i[1] + '>' + ('normal' if i[1] == '' else i[1]) + '</option>' for i in acl_list]) + '''
-                            </select>
-                            <hr class="main_hr">
-                            <button ''' + stat + ''' type="submit">''' + load_lang('add') + '''</button>
-                        </form>
-                        ''',
-                menu = [['filter/document/list', load_lang('return')]]
-            ))

route/filter_document_delete.py

@@ -1,13 +0,0 @@
-from .tool.func import *
-
-def filter_document_delete(name = ''):
-    with get_db_connect() as conn:
-        curs = conn.cursor()
-
-        if admin_check(None, 'del_document_filter') != 1:
-            return re_error('/error/3')
-
-        curs.execute(db_change("delete from html_filter where html = ? and kind = 'document'"), [name])
-        conn.commit()
-
-        return redirect('/filter/document/list')

route/main_tool_admin.py

@@ -33,7 +33,7 @@ def main_tool_admin():
                     <li><a href="/name_filter">''' + load_lang('id_filter_list') + '''</a></li>
                     <li><a href="/file_filter">''' + load_lang('file_filter_list') + '''</a></li>
                     <li><a href="/extension_filter">''' + load_lang('extension_filter_list') + '''</a></li>
-                    <li><a href="/filter/document/list">''' + load_lang('document_filter_list') + ''' (''' + load_lang('beta') + ''')</a></li>
+                    <li><a href="/filter/document">''' + load_lang('document_filter_list') + '''</a></li>
                 </ul>
                 <h3>''' + load_lang('server') + '''</h2>
                 <ul class="opennamu_ul">