Procházet zdrojové kódy

버그 수정 및 편집 필터 확인 기능 추가

잉여개발기 (SPDV) před 2 roky
rodič
revize
faebe090dd

+ 1 - 1
route/bbs_w.py

@@ -43,7 +43,7 @@ def bbs_w(bbs_num = '', tool = 'bbs', page = 1, name = ''):
             curs.execute(db_change('select set_data, set_id from bbs_set where set_name = "bbs_name"'))
             db_data = curs.fetchall()
             if db_data:
-                data += '<ul class="opennamu_ul">'
+                data += '<ul>'
                 for for_a in db_data:
                     bbs_name_dict[for_a[1]] = for_a[0]
 

+ 2 - 2
route/bbs_w_comment_tool.py

@@ -9,7 +9,7 @@ def bbs_w_comment_tool(bbs_num = '', post_num = '', comment_num = ''):
         
         data += '''
             <h2>''' + get_lang(conn, 'tool') + '''</h2>
-            <ul class="opennamu_ul">
+            <ul>
                 <li><a href="/bbs/raw/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '/' + url_pas(comment_num) + '">' + get_lang(conn, 'raw') + '''</a></li>
                 <li><a href="/bbs/edit/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '/' + url_pas(comment_num) + '">' + get_lang(conn, 'edit') + '''</a></li>
             </ul>
@@ -18,7 +18,7 @@ def bbs_w_comment_tool(bbs_num = '', post_num = '', comment_num = ''):
         if admin_check(conn) == 1:
             data += '''
                 <h3>''' + get_lang(conn, 'owner') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/bbs/delete/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '/' + url_pas(comment_num) + '">' + get_lang(conn, 'delete') + '''</a></li>
                 </ul>
             '''

+ 3 - 3
route/bbs_w_tool.py

@@ -11,7 +11,7 @@ def bbs_w_tool(bbs_num = '', post_num = ''):
         
         data += '''
             <h2>''' + get_lang(conn, 'tool') + '''</h2>
-            <ul class="opennamu_ul">
+            <ul>
                 <li><a href="/bbs/raw/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '">' + get_lang(conn, 'raw') + '''</a></li>
             </ul>
         '''
@@ -22,7 +22,7 @@ def bbs_w_tool(bbs_num = '', post_num = ''):
 
             data += '''
                 <h3>''' + get_lang(conn, 'admin') + '''</h3>
-                <ul class="opennamu_ul">
+                <ul>
                     <!-- <li><a href="/bbs/blind/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '">' + get_lang(conn, 'hide') + '''</a></li> -->
                     <li><a href="/bbs/pinned/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '">' + pinned + '''</a></li>
                 </ul>
@@ -30,7 +30,7 @@ def bbs_w_tool(bbs_num = '', post_num = ''):
 
             data += '''
                 <h3>''' + get_lang(conn, 'owner') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/bbs/delete/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '">' + get_lang(conn, 'delete') + '''</a></li>
                 </ul>
             '''

+ 1 - 1
route/give_admin_groups.py

@@ -57,7 +57,7 @@ def give_admin_groups(name = 'test'):
             state = 'disabled' if admin_check(conn) != 1 else ''
             state = 'disabled' if name in get_default_admin_group() else ''
 
-            data = '<ul class="opennamu_ul">'
+            data = '<ul>'
             for for_a in acl_name_list:
                 curs.execute(db_change('select acl from alist where name = ?'), [name])
                 acl_list = curs.fetchall()

+ 1 - 1
route/list_acl.py

@@ -6,7 +6,7 @@ def list_acl(arg_num = 1):
 
         sql_num = (arg_num * 50 - 50) if arg_num * 50 > 0 else 0
 
-        div = '<ul class="opennamu_ul">'
+        div = '<ul>'
 
         curs.execute(db_change(
             "select distinct title, data, type from acl where data != '' and not title like 'user:%' order by title desc limit ?, 50"

+ 1 - 1
route/list_admin.py

@@ -4,7 +4,7 @@ def list_admin():
     with get_db_connect() as conn:
         curs = conn.cursor()
 
-        div = '<ul class="opennamu_ul">'
+        div = '<ul>'
 
         curs.execute(db_change(
             "select id, data from user_set where name = 'acl' and not data = 'user'"

+ 1 - 1
route/list_admin_auth_use.py

@@ -16,7 +16,7 @@ def list_admin_auth_use(arg_num = 1, arg_search = 'normal'):
             else:
                 curs.execute(db_change("select who, what, time from re_admin where what like ? order by time desc limit ?, 50"), [arg_search + "%", sql_num])
 
-            list_data = '<ul class="opennamu_ul">'
+            list_data = '<ul>'
 
             get_list = curs.fetchall()
             for data in get_list:

+ 1 - 1
route/list_admin_group.py

@@ -4,7 +4,7 @@ def list_admin_group_2():
     with get_db_connect() as conn:
         curs = conn.cursor()
 
-        list_data = '<ul class="opennamu_ul">'
+        list_data = '<ul>'
         org_acl_list = get_default_admin_group()
 
         curs.execute(db_change("select distinct name from alist order by name asc"))

+ 1 - 1
route/list_image_file.py

@@ -44,7 +44,7 @@ def list_image_file(arg_num = 1, do_type = 0):
             )
             list_data += end_data
         else:
-            list_data += '<ul class="opennamu_ul">'
+            list_data += '<ul>'
 
             curs.execute(db_change("select title from data where title like 'file:%' limit ?, 50"), [sql_num])
             data_list = curs.fetchall()

+ 1 - 1
route/list_long_page.py

@@ -6,7 +6,7 @@ def list_long_page(tool = 'long_page', arg_num = 1):
 
         sql_num = (arg_num * 50 - 50) if arg_num * 50 > 0 else 0
 
-        div = '<ul class="opennamu_ul">'
+        div = '<ul>'
         select_data = 'desc' if tool == 'long_page' else 'asc'
         title = 'long_page' if tool == 'long_page' else 'short_page'
 

+ 1 - 1
route/list_no_link.py

@@ -6,7 +6,7 @@ def list_no_link(num = 1):
         
         sql_num = (num * 50 - 50) if num * 50 > 0 else 0
         
-        div = '<ul class="opennamu_ul">'
+        div = '<ul>'
         
         curs.execute(db_change("select doc_name, set_data from data_set where set_name = 'link_count' and doc_rev = '' and set_data = '0' limit ?, 50"), [sql_num])
         n_list = curs.fetchall()

+ 1 - 1
route/list_please.py

@@ -6,7 +6,7 @@ def list_please(arg_num = 1):
 
         sql_num = (arg_num * 50 - 50) if arg_num * 50 > 0 else 0
 
-        div = '<ul class="opennamu_ul">'
+        div = '<ul>'
 
         curs.execute(db_change("select distinct title from back where type = 'no' limit ?, 50"), [sql_num])
         data_list = curs.fetchall()

+ 4 - 4
route/list_title_index.py

@@ -12,7 +12,7 @@ def list_title_index(num = 1):
         curs.execute(db_change("select title from data order by title asc limit ?, 50"), [sql_num])
         title_list = curs.fetchall()
         if title_list:
-            data += '<hr class="main_hr"><ul class="opennamu_ul">'
+            data += '<hr class="main_hr"><ul>'
 
         for list_data in title_list:
             data += '<li>' + str(all_list) + '. <a href="/w/' + url_pas(list_data[0]) + '">' + html.escape(list_data[0]) + '</a></li>'
@@ -39,10 +39,10 @@ def list_title_index(num = 1):
 
                 data += '''
                     </ul>
-                    <ul class="opennamu_ul">
+                    <ul>
                         <li>''' + get_lang(conn, 'all') + ' : ' + str(count_end[0]) + '''</li>
                     </ul>
-                    <ul class="opennamu_ul">
+                    <ul>
                         <li>''' + get_lang(conn, 'category') + ' : ' + str(count_end[1]) + '''</li>
                         <li>''' + get_lang(conn, 'user_document') + ' : ' + str(count_end[2]) + '''</li>
                         <li>''' + get_lang(conn, 'file') + ' : ' + str(count_end[3]) + '''</li>
@@ -51,7 +51,7 @@ def list_title_index(num = 1):
             else:
                 data += '''
                     </ul>
-                    <ul class="opennamu_ul">
+                    <ul>
                         <li>''' + get_lang(conn, 'all') + ' : ' + all_title[0][0] + '''</li>
                 '''
 

+ 1 - 1
route/list_user.py

@@ -6,7 +6,7 @@ def list_user(arg_num = 1):
 
         sql_num = (arg_num * 50 - 50) if arg_num * 50 > 0 else 0
 
-        list_data = '<ul class="opennamu_ul">'
+        list_data = '<ul>'
 
         curs.execute(db_change("select id, data from user_set where name = 'date' order by data desc limit ?, 50"), [sql_num])
         user_list = curs.fetchall()

+ 1 - 1
route/list_user_check.py

@@ -173,7 +173,7 @@ def list_user_check(name = 'test', plus_name = None, arg_num = 1, do_type = 'nor
                 div += '<li><a href="/list/user/check/' + url_pas(for_a[0]) + '/simple">' + for_a[0] + '</a></li>'
 
             if div != '':
-                div = '<ul class="opennamu_ul">' + div + '</ul>'
+                div = '<ul>' + div + '</ul>'
                 div += next_fix(conn, 
                     '/list/user/check/' + url_pas(name) + '/' + check_type + '/', 
                     num, 

+ 1 - 1
route/login_find.py

@@ -5,7 +5,7 @@ def login_find():
         return easy_minify(conn, flask.render_template(skin_check(conn),
             imp = [get_lang(conn, 'password_search'), wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
             data = '''
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/login/find/email">''' + get_lang(conn, 'email') + '''</a></li>
                     <li><a href="/login/find/key">''' + get_lang(conn, 'key') + '''</a></li>
                 </ul>

+ 2 - 2
route/main_search_deep.py

@@ -43,12 +43,12 @@ async def main_search_deep(name = 'Test', search_type = 'title', num = 1):
             link_id = '' if curs.fetchall() else 'class="opennamu_not_exist_link"'
 
             div += '''
-                <ul class="opennamu_ul">
+                <ul>
                     <li>
                         ''' + get_lang(conn, 'go') + ''' : <a ''' + link_id + ' href="/w/' + url_pas(name) + '">' + html.escape(name) + '''</a>
                     </li>
                 </ul>
-                <ul class="opennamu_ul">
+                <ul>
             '''
 
             all_list = json.loads((await api_search(name, search_type, num)).get_data(as_text = True))

+ 1 - 1
route/main_setting.py

@@ -21,6 +21,6 @@ def main_setting():
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
             imp = [get_lang(conn, 'setting'), wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
-            data = '<h2>' + get_lang(conn, 'list') + '</h2><ul class="opennamu_ul">' + li_data + '</ul>',
+            data = '<h2>' + get_lang(conn, 'list') + '</h2><ul>' + li_data + '</ul>',
             menu = [['manager', get_lang(conn, 'return')]]
         ))

+ 1 - 1
route/main_sys_update.py

@@ -54,7 +54,7 @@ def main_sys_update():
                 imp = [get_lang(conn, 'update'), wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
                 data = get_lang(conn, 'update_warning') + '''
                     <hr class="main_hr">
-                    <ul class="opennamu_ul">
+                    <ul>
                         <li id="ver_send_2">''' + get_lang(conn, 'version') + ''' : </li>
                         <li id="ver_send">''' + get_lang(conn, 'lastest') + ''' : </li>
                     </ul>

+ 6 - 6
route/main_tool_admin.py

@@ -6,7 +6,7 @@ def main_tool_admin():
             imp = [get_lang(conn, 'admin_tool'), wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
             data = render_simple_set(conn, '''
                 <h2>''' + get_lang(conn, 'admin') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/manager/2">''' + get_lang(conn, 'document_setting') + '''</a></li>
                     <li><a href="/acl_multiple">''' + get_lang(conn, 'mutiple_document_setting') + '''</a></li>
                     <li><a href="/manager/3">''' + get_lang(conn, 'check_user') + '''</a></li>
@@ -15,7 +15,7 @@ def main_tool_admin():
                     <li><a href="/manager/5">''' + get_lang(conn, 'authorize') + '''</a></li>
                 </ul>
                 <h2>''' + get_lang(conn, 'owner') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/auth/list">''' + get_lang(conn, 'admin_group_list') + '''</a></li>
                     <li><a href="/delete_multiple">''' + get_lang(conn, 'many_delete') + '''</a></li>
                     <li><a href="/app_submit">''' + get_lang(conn, 'application_list') + '''</a></li>
@@ -24,7 +24,7 @@ def main_tool_admin():
                     <li><a href="/manager/18">''' + get_lang(conn, 'user_fix') + '''</a></li>
                 </ul>
                 <h3>''' + get_lang(conn, 'filter') + '''</h3>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/filter/edit_filter">''' + get_lang(conn, 'edit_filter_list') + '''</a></li>
                     <li><a href="/filter/inter_wiki">''' + get_lang(conn, 'interwiki_list') + '''</a></li>
                     <li><a href="/filter/edit_top">''' + get_lang(conn, 'edit_tool_list') + '''</a></li>
@@ -38,18 +38,18 @@ def main_tool_admin():
                     <li><a href="/filter/template">''' + get_lang(conn, 'template_document_list') + '''</a> (''' + get_lang(conn, 'beta') + ''')
                 </ul>
                 <h3>''' + get_lang(conn, 'server') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/restart">''' + get_lang(conn, 'wiki_restart') + '''</a></li>
                     <li><a href="/shutdown">''' + get_lang(conn, 'wiki_shutdown') + '''</a></li>
                     <li><a href="/update">''' + get_lang(conn, 'update') + '''</a></li>
                 </ul>
                 <h2>''' + get_lang(conn, 'version') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li id="ver_send_2">''' + get_lang(conn, 'version') + ''' : </li>
                     <li id="ver_send">''' + get_lang(conn, 'lastest') + ''' : </li>
                 </ul>
                 <h3>''' + get_lang(conn, 'skin_info') + '''</h3>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/api/skin_info?all=true">''' + get_lang(conn, 'skin_info') + '''</a></li>
                     <div id="ver_send_3"></div>
                 </ul>

+ 8 - 8
route/main_tool_other.py

@@ -6,21 +6,21 @@ def main_tool_other():
             imp = [get_lang(conn, 'other_tool'), wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
             data = render_simple_set(conn, '''
                 <h2>''' + get_lang(conn, 'user_tool') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/manager/6">''' + get_lang(conn, 'user_tool') + '''</a></li>
                 </ul>
                 <h2>''' + get_lang(conn, 'list') + '''</h2>
                 <h3>''' + get_lang(conn, 'admin') + '''</h3>
-                <ul class="opennamu_ul">               
+                <ul>               
                     <li><a href="/list/admin">''' + get_lang(conn, 'admin_list') + '''</a></li>
                     <li><a href="/list/admin/auth_use">''' + get_lang(conn, 'authority_use_list') + '''</a></li>
                 </ul>
                 <h3>''' + get_lang(conn, 'discussion') + '''</h3>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/recent_discuss">''' + get_lang(conn, 'recent_discussion') + '''</a></li>
                 </ul>
                 <h3>''' + get_lang(conn, 'document') + '''</h3>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/recent_change">''' + get_lang(conn, 'recent_change') + '''</a></li>
                     <li><a href="/list/document/all">''' + get_lang(conn, 'all_document_list') + '''</a></li>
                     <li><a href="/list/document/acl">''' + get_lang(conn, 'acl_document_list') + '''</a></li>
@@ -32,23 +32,23 @@ def main_tool_other():
                     <li><a href="/list/document/no_link">''' + get_lang(conn, 'no_link_document_list') + '''</a></li>
                 </ul>
                 <h3>''' + get_lang(conn, 'user') + '''</h3>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/recent_block">''' + get_lang(conn, 'recent_ban') + '''</a></li>
                     <li><a href="/list/user">''' + get_lang(conn, 'member_list') + '''</a></li>
                 </ul>
                 <h3>''' + get_lang(conn, 'other') + '''</h3>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/list/file">''' + get_lang(conn, 'image_file_list') + '''</a></li>
                     <li><a href="/vote">''' + get_lang(conn, 'vote_list') + '''</a></li>
                     <li><a href="/bbs/main">''' + get_lang(conn, 'bbs_main') + '''</a></li>
                 </ul>
                 <h2>''' + get_lang(conn, 'other') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/upload">''' + get_lang(conn, 'upload') + '''</a></li>
                     <li><a href="/manager/10">''' + get_lang(conn, 'search') + '''</a></li>
                 </ul>
                 <h2>''' + get_lang(conn, 'admin') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/manager/1">''' + get_lang(conn, 'admin_tool') + '''</a></li>
                 </ul>
             '''),

+ 3 - 3
route/recent_history_tool.py

@@ -8,7 +8,7 @@ def recent_history_tool(name = 'Test', rev = 1):
 
         data = '' + \
             '<h2>' + get_lang(conn, 'tool') + '</h2>' + \
-            '<ul class="opennamu_ul">' + \
+            '<ul>' + \
                 '<li><a href="/raw_rev/' + num + '/' + url_pas(name) + '">' + get_lang(conn, 'raw') + '</a></li>' + \
         ''
 
@@ -24,7 +24,7 @@ def recent_history_tool(name = 'Test', rev = 1):
 
         if admin_check(conn, 6) == 1:
             data += '<h3>' + get_lang(conn, 'admin') + '</h3>'
-            data += '<ul class="opennamu_ul">'
+            data += '<ul>'
             curs.execute(db_change('select title from history where title = ? and id = ? and hide = "O"'), [name, num])
             data += '<li><a href="/history_hidden/' + num + '/' + url_pas(name) + '">'
             if curs.fetchall():
@@ -37,7 +37,7 @@ def recent_history_tool(name = 'Test', rev = 1):
 
         if admin_check(conn) == 1:
             data += '<h3>' + get_lang(conn, 'owner') + '</h3>'
-            data += '<ul class="opennamu_ul">'
+            data += '<ul>'
             data += '<li><a href="/history_delete/' + num + '/' + url_pas(name) + '">' + get_lang(conn, 'history_delete') + '</a></li>'
             data += '<li><a href="/history_send/' + num + '/' + url_pas(name) + '">' + get_lang(conn, 'send_edit') + '</a></li>'
             data += '</ul>'

+ 4 - 4
route/tool/func.py

@@ -1206,7 +1206,7 @@ def skin_check(conn, set_n = 0):
         return skin
     
 def cache_v():
-    return '.cache_v266'
+    return '.cache_v267'
 
 def wiki_css(data):
     with class_temp_db() as m_conn:
@@ -2360,7 +2360,7 @@ def re_error(conn, data):
         if ban_check()[0] == 1:
             end = '<div id="opennamu_get_user_info">' + html.escape(ip_check()) + '</div>'
         else:
-            end = '<ul class="opennamu_ul"><li>' + get_lang(conn, 'authority_error') + '</li></ul>'
+            end = '<ul><li>' + get_lang(conn, 'authority_error') + '</li></ul>'
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
             imp = [get_lang(conn, 'error'), wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
@@ -2501,7 +2501,7 @@ def re_error(conn, data):
                 data = '' + \
                     '<div id="main_skin_set">' + \
                         '<h2>' + get_lang(conn, 'error') + '</h2>' + \
-                        '<ul class="opennamu_ul">' + \
+                        '<ul>' + \
                             '<li>' + data + '</a></li>' + \
                         '</ul>' + \
                     '</div>' + \
@@ -2513,7 +2513,7 @@ def re_error(conn, data):
                 imp = [title, wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
                 data = '' + \
                     '<h2>' + sub_title + '</h2>' + \
-                    '<ul class="opennamu_ul">' + \
+                    '<ul>' + \
                         '<li>' + data + '</li>' + \
                     '</ul>' + \
                 '',

+ 1 - 1
route/tool/func_render_namumark.py

@@ -2290,7 +2290,7 @@ class class_do_render_namumark:
                 list_class = do_render_list_int_to(list_view_set)
                 list_data_str = re.sub(list_sub_regex, list_class, list_data)
 
-                self.render_data = re.sub(list_regex, lambda x : ('\n<front_br><ul class="opennamu_ul">' + list_data_str + '</ul><back_br>\n'), self.render_data, 1)
+                self.render_data = re.sub(list_regex, lambda x : ('\n<front_br><ul>' + list_data_str + '</ul><back_br>\n'), self.render_data, 1)
 
             list_count_max -= 1
 

+ 3 - 3
route/topic_comment_tool.py

@@ -17,12 +17,12 @@ def topic_comment_tool(topic_num = 1, num = 1):
 
         ban = '''
             <h2>''' + get_lang(conn, 'state') + '''</h2>
-            <ul class="opennamu_ul">
+            <ul>
                 <li>''' + get_lang(conn, 'writer') + ' : ''' + ip_pas(data[0][1]) + '''</li>
                 <li>''' + get_lang(conn, 'time') + ' : ' + data[0][2] + '''</li>
             </ul>
             <h2>''' + get_lang(conn, 'other_tool') + '''</h2>
-            <ul class="opennamu_ul">
+            <ul>
                 <li>
                     <a href="/thread/''' + topic_num + '/comment/' + num + '''/raw">''' + get_lang(conn, 'raw') + '''</a>
                 </li>
@@ -32,7 +32,7 @@ def topic_comment_tool(topic_num = 1, num = 1):
         if admin_check(conn, 3) == 1:
             ban += '''
                 <h2>''' + get_lang(conn, 'admin_tool') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li>
                         <a href="/auth/ban/''' + url_pas(data[0][1]) + '''">
                             ''' + (get_lang(conn, 'ban') + ' | ' + get_lang(conn, 'release')) + '''

+ 3 - 3
route/topic_tool.py

@@ -45,14 +45,14 @@ def topic_tool(topic_num = 1):
         if admin_check(conn, 3) == 1:
             data = '''
                 <h2>''' + get_lang(conn, 'admin_tool') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/thread/''' + topic_num + '/setting">' + get_lang(conn, 'topic_setting') + '''</a></li>
                     <li><a href="/thread/''' + topic_num + '/acl">' + get_lang(conn, 'topic_acl_setting') + '''</a></li>
                 </ul>
             '''
         data += '''
             <h2>''' + get_lang(conn, 'tool') + '''</h2>
-            <ul class="opennamu_ul">
+            <ul>
                 <li>''' + get_lang(conn, 'topic_state') + ''' : ''' + t_state + '''</li>
                 <li>''' + get_lang(conn, 'topic_acl') + ''' : <a href="/acl/TEST#exp">''' + acl_state + '''</a></li>
                 <li>''' + get_lang(conn, 'topic_view_acl') + ''' : <a href="/acl/TEST#exp">''' + acl_view_state + '''</a></li>
@@ -62,7 +62,7 @@ def topic_tool(topic_num = 1):
         if admin_check(conn, None) == 1:
             data += '''
                 <h2>''' + get_lang(conn, 'owner') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li>
                         <a href="/thread/''' + topic_num + '''/delete">
                             ''' + get_lang(conn, 'topic_delete') + '''

+ 1 - 1
route/user_alarm.py

@@ -7,7 +7,7 @@ def user_alarm():
         num = int(number_check(flask.request.args.get('num', '1')))
         sql_num = (num * 50 - 50) if num * 50 > 0 else 0
     
-        data = '<ul class="opennamu_ul">'
+        data = '<ul>'
 
         ip = ip_check()
     

+ 1 - 1
route/user_count.py

@@ -61,7 +61,7 @@ def user_count(name = None):
         return easy_minify(conn, flask.render_template(skin_check(conn),
             imp = [get_lang(conn, 'count'), wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
             data = '''
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/record/''' + url_pas(that) + '''">''' + get_lang(conn, 'edit_record') + '''</a> : ''' + str(data) + '''</li>
                     <li><a href="/record/topic/''' + url_pas(that) + '''">''' + get_lang(conn, 'discussion_record') + '''</a> : ''' + str(data_topic) + '''</a></li>
                     <hr>

+ 32 - 9
route/user_edit_filter.py

@@ -4,8 +4,10 @@ def user_edit_filter(name = ''):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
-        if admin_check(conn, 1, None) != 1:
-            return redirect(conn, '/recent_block')
+        owner_auth = admin_check(conn, 1, None)
+        if ip_check() != name:
+            if owner_auth != 1:
+                return redirect(conn, '/recent_block')
 
         if flask.request.method == 'POST':
             curs.execute(db_change('delete from user_set where name = "edit_filter" and id = ?'), [name])
@@ -17,13 +19,34 @@ def user_edit_filter(name = ''):
             p_data = db_data[0][0] if db_data else ''
             p_data = '<textarea readonly class="opennamu_textarea_500">' + html.escape(p_data) + '</textarea>'
 
+            search_list = '<ul>'
+
+            curs.execute(db_change("select plus, plus_t from html_filter where kind = 'regex_filter' and plus != ''"))
+            for data_list in curs.fetchall():
+                match = re.compile(data_list[0], re.I)
+                search = match.search(p_data)
+                if search:
+                    search = search.group()
+                    search_list += '<li>' + html.escape(search) + '</li>'
+
+            search_list += '</ul>'
+            search_list += '<hr class="main_hr">'
+
+            delete = ''
+            if owner_auth == 1:
+                delete = '' + \
+                    '<form method="post">' + \
+                        '<button type="submit">' + get_lang(conn, 'delete') + '</button>' + \
+                    '</form>' + \
+                    '<hr class="main_hr">' + \
+                ''
+
             return easy_minify(conn, flask.render_template(skin_check(conn),
                 imp = [name, wiki_set(conn), wiki_custom(conn), wiki_css(['(' + get_lang(conn, 'edit_filter') + ')', 0])],
-                data = p_data + '''
-                    <hr class="main_hr">
-                    <form method="post">
-                        <button type="submit">''' + get_lang(conn, 'delete') + '''</button>
-                    </form>
-                ''',
-                menu = [['recent_block', get_lang(conn, 'return')]]
+                data = '' + \
+                    '<a href="/filter/edit_filter">(' + get_lang(conn, 'edit_filter_rule') + ')</a>' + \
+                    '<hr class="main_hr">' + \
+                    p_data + search_list + delete + \
+                '',
+                menu = [['recent_block', get_lang(conn, 'return')], ]
             ))

+ 4 - 4
route/user_info.py

@@ -38,8 +38,8 @@ def user_info(name = ''):
                     <li><a href="/login/find">''' + get_lang(conn, 'password_search') + '''</a></li>
                 '''
                 
-            login_menu = '<h2>' + get_lang(conn, 'login') + '</h2><ul class="opennamu_ul">' + login_menu + '</ul>'
-            tool_menu = '<h2>' + get_lang(conn, 'tool') + '</h2><ul class="opennamu_ul">' + tool_menu + '</ul>'
+            login_menu = '<h2>' + get_lang(conn, 'login') + '</h2><ul>' + login_menu + '</ul>'
+            tool_menu = '<h2>' + get_lang(conn, 'tool') + '</h2><ul>' + tool_menu + '</ul>'
     
         if admin_check(conn, 1) == 1:
             curs.execute(db_change("select block from rb where block = ? and ongoing = '1'"), [ip])
@@ -47,7 +47,7 @@ def user_info(name = ''):
             
             admin_menu = '''
                 <h2>''' + get_lang(conn, 'admin') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/auth/ban/''' + url_pas(ip) + '''">''' + ban_name + '''</a></li>
                     <li><a href="/list/user/check_submit/''' + url_pas(ip) + '''">''' + get_lang(conn, 'check') + '''</a></li>
                 </ul>
@@ -63,7 +63,7 @@ def user_info(name = ''):
                 ''' + login_menu + '''
                 ''' + tool_menu + '''
                 <h2>''' + get_lang(conn, 'other') + '''</h2>
-                <ul class="opennamu_ul">
+                <ul>
                     <li><a href="/record/''' + url_pas(ip) + '''">''' + get_lang(conn, 'edit_record') + '''</a></li>
                     <li><a href="/record/topic/''' + url_pas(ip) + '''">''' + get_lang(conn, 'discussion_record') + '''</a></li>
                     <li><a href="/record/bbs/''' + url_pas(ip) + '''">''' + get_lang(conn, 'bbs_record') + '''</a></li>

+ 1 - 1
route/user_watch_list.py

@@ -37,7 +37,7 @@ def user_watch_list(tool):
 
         if data:
             div = '' + \
-                '<ul class="opennamu_ul">' + div + '</ul>' + \
+                '<ul>' + div + '</ul>' + \
                 '<hr class="main_hr">' + \
             ''
 

+ 1 - 1
route/view_down.py

@@ -4,7 +4,7 @@ def view_down(name = 'Test'):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
-        div = '<ul class="opennamu_ul">'
+        div = '<ul>'
 
         curs.execute(db_change("select title from data where title like ?"), [name + '/%'])
         for data in curs.fetchall():

+ 1 - 1
route/view_set.py

@@ -197,7 +197,7 @@ def view_set(name = 'Test', multiple = False):
             data += '''
                 <h3>''' + get_lang(conn, 'explanation') + '''</h3>
                 <span id="exp"></span>
-                <ul class="opennamu_ul">
+                <ul>
                     <li>normal : ''' + get_lang(conn, 'unset') + '''</li>
                     <li>admin : ''' + get_lang(conn, 'admin_acl') + '''</li>
                     <li>user : ''' + get_lang(conn, 'member_acl') + '''</li>

+ 6 - 6
route/view_w.py

@@ -68,7 +68,7 @@ def view_w(name = 'Test', do_type = ''):
             if category_sub != '':
                 category_total += '' + \
                     '<h2 id="cate_under">' + get_lang(conn, 'under_category') + '</h2>' + \
-                    '<ul class="opennamu_ul">' + \
+                    '<ul>' + \
                         '<li>' + get_lang(conn, 'all') + ' : ' + str(count_sub_category) + '</li>' + \
                         category_sub + \
                     '</ul>' + \
@@ -77,7 +77,7 @@ def view_w(name = 'Test', do_type = ''):
             if category_doc != '':
                 category_total += '' + \
                     '<h2 id="cate_normal">' + get_lang(conn, 'category_title') + '</h2>' + \
-                    '<ul class="opennamu_ul">' + \
+                    '<ul>' + \
                         '<li>' + get_lang(conn, 'all') + ' : ' + str(count_category) + '</li>' + \
                         category_doc + \
                     '</ul>' + \
@@ -194,18 +194,18 @@ def view_w(name = 'Test', do_type = ''):
             curs.execute(db_change('select data from other where name = "error_401"'))
             sql_d = curs.fetchall()
             if sql_d and sql_d[0][0] != '':
-                end_data = '<h2>' + get_lang(conn, 'error') + '</h2><ul class="opennamu_ul"><li>' + sql_d[0][0] + '</li></ul>'
+                end_data = '<h2>' + get_lang(conn, 'error') + '</h2><ul><li>' + sql_d[0][0] + '</li></ul>'
             else:
-                end_data = '<h2>' + get_lang(conn, 'error') + '</h2><ul class="opennamu_ul"><li>' + get_lang(conn, 'authority_error') + '</li></ul>'
+                end_data = '<h2>' + get_lang(conn, 'error') + '</h2><ul><li>' + get_lang(conn, 'authority_error') + '</li></ul>'
         elif not data:
             response_data = 404
 
             curs.execute(db_change('select data from other where name = "error_404"'))
             db_data = curs.fetchall()
             if db_data and db_data[0][0] != '':
-                end_data = '<h2>' + get_lang(conn, 'error') + '</h2><ul class="opennamu_ul"><li>' + db_data[0][0] + '</li></ul>'
+                end_data = '<h2>' + get_lang(conn, 'error') + '</h2><ul><li>' + db_data[0][0] + '</li></ul>'
             else:
-                end_data = '<h2>' + get_lang(conn, 'error') + '</h2><ul class="opennamu_ul"><li>' + get_lang(conn, 'decument_404_error') + '</li></ul>'
+                end_data = '<h2>' + get_lang(conn, 'error') + '</h2><ul><li>' + get_lang(conn, 'decument_404_error') + '</li></ul>'
 
             curs.execute(db_change('select ip from history where title = ? limit 1'), [name])
             db_data = curs.fetchall()

+ 1 - 1
route/view_xref.py

@@ -16,7 +16,7 @@ def view_xref(name = 'Test', xref_type = 1, num = 1):
             div = '<a href="/xref/' + url_pas(name) + '">(' + get_lang(conn, 'normal') + ')</a><hr class="main_hr">'
             data_sub = '(' + get_lang(conn, 'link_in_this') + ')'
 
-        div += '<ul class="opennamu_ul">'
+        div += '<ul>'
 
         curs.execute(db_change('select data from other where name = "link_case_insensitive"'))
         db_data = curs.fetchall()

+ 1 - 1
route/vote_end.py

@@ -30,7 +30,7 @@ def vote_end(num = 1):
         vote_data = re.findall(r'([^\n]+)', data_list[0][2].replace('\r', ''))
         for i in range(0, len(vote_data)):
             data += '<h2>' + vote_data[i] + '</h2>'
-            data += '<ul class="opennamu_ul">'
+            data += '<ul>'
 
             curs.execute(db_change('select user from vote where id = ? and user != "" and data = ?'), [num, str(i)])
             data_list_2 = curs.fetchall()

+ 1 - 1
route/vote_list.py

@@ -16,7 +16,7 @@ def vote_list(list_type = 'normal', num = 1):
             sub = '(' + get_lang(conn, 'closed') + ')'
             curs.execute(db_change('select name, id, type from vote where type = "close" or type = "n_close" limit ?, 50'), [sql_num])
 
-        data += '<ul class="opennamu_ul">'
+        data += '<ul>'
 
         data_list = curs.fetchall()
         for i in data_list:

+ 0 - 2
route_go/route/tool/markdown.go

@@ -139,8 +139,6 @@ func Markdown(db *sql.DB, data map[string]string) map[string]interface{} {
 		}
 	})
 
-	string_data = strings.Replace(string_data, "<ul>", "<ul class=\"opennamu_ul\">", -1)
-
 	end_backlink := [][]string{}
 	for k1, v1 := range backlink {
 		for k2, v2 := range v1 {

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-v151",
+        "r_ver" : "v3.5.0-v152",
         "c_ver" : "20240513",
         "s_ver" : "20240426"
     }

+ 2 - 2
views/main_css/css/main.css

@@ -75,11 +75,11 @@
 }
 
 /* list */
-.opennamu_main .opennamu_ul {
+.opennamu_main ul {
     padding-left: 20px;
 }
 
-.opennamu_main .opennamu_ul li {
+.opennamu_main ul li {
     margin-left: 20px;
 
     margin-top: 5px;

+ 1 - 1
views/main_css/js/func/insert_user_info.js

@@ -31,7 +31,7 @@ function do_insert_user_info() {
                 get_data_ban += '<br>';
                 
                 get_data_ban += lang_data['type'] + ' : ';
-                if(data['data']['ban'][1].match(/^[0-9]+$/)) {
+                if(data['data']['ban'][1].match(/^[0-9]+$/) || data['data']['ban'][1] == '') {
                     get_data_ban += '<a href="/recent_block/user/' + opennamu_do_url_encode(name) + '">' + lang_data['normal'] + '</a>'; 
                 } else if(data['data']['ban'][1] === 'c') {
                     get_data_ban += lang_data['normal']; 

+ 1 - 1
views/main_css/js/route/bbs_main.js

@@ -12,7 +12,7 @@ function opennamu_bbs_main() {
         }).then(function(data) {
             data = data["data"];
 
-            let data_html = '<ul class="opennamu_ul">';
+            let data_html = '<ul>';
             let bbs_id_to_name = {};
 
             for(let key in bbs_list) {

+ 1 - 1
views/main_css/js/route/w_watch_list.js

@@ -17,7 +17,7 @@ function opennamu_w_watch_list() {
         let data_html = '<a href="/doc_watch_list/1/' + doc_name + '">(' + lang['watchlist'] + ')</a> <a href="/doc_star_doc/1/' + doc_name + '">(' + lang['star_doc'] + ')</a>';
         data_html += '<hr class="main_hr">'
 
-        data_html += '<ul class="opennamu_ul">';
+        data_html += '<ul>';
         for(let for_a = 0; for_a < data.length; for_a++) {
             data_html += '<li>' + data[for_a][1] + '</li>';
         }