추가 공사

route/api_skin_info.py

@@ -4,7 +4,7 @@ from .tool.func import *
 
 async def api_skin_info(name = ''):
     with get_db_connect() as conn:
-        name = await skin_check(conn) if name == '' else './views/' + name + '/index.html'
+        name = await skin_check() if name == '' else './views/' + name + '/index.html'
 
         if not flask.request.args.get('all', None):
             json_address = re.sub(r"(((?!\.|\/).)+)\.html$", "info.json", name)
@@ -25,7 +25,7 @@ async def api_skin_info(name = ''):
                 "Before Namu" : "https://raw.githubusercontent.com/openNAMU/openNAMU-Skin-Before_Namu/master/info.json"
             }
 
-            for i in await load_skin(await skin_check(conn, 1), 1):
+            for i in await load_skin(await skin_check(1), 1):
                 json_address = re.sub(r"(((?!\.|\/).)+)\.html$", "info.json", './views/' + i + '/index.html')
                 try:
                     json_data = json_loads(open(json_address, encoding='utf8').read())
@@ -33,7 +33,7 @@ async def api_skin_info(name = ''):
                     json_data = None
 
                 if json_data:
-                    if i == await skin_check(conn, 1):
+                    if i == await skin_check(1):
                         json_data = {**json_data, **{ "main" : "true" }}
 
                     if "info_link" in json_data:

route/bbs_delete.py

@@ -26,7 +26,7 @@ async def bbs_delete(bbs_num = ''):
             
             return redirect(conn, '/bbs/main')
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('bbs_delete'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')', 0])],
                 data = await render_simple_set('''
                     <form method="post">

route/bbs_make.py

@@ -21,7 +21,7 @@ async def bbs_make():
 
             return redirect(conn, '/bbs/main')
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('bbs_make'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/bbs_w.py

@@ -188,7 +188,7 @@ async def bbs_w(bbs_num = '', tool = 'bbs', page = 1, name = ''):
                 
         data += '</table>'
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [title_name, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = data,
             menu = menu

route/bbs_w_comment_tool.py

@@ -23,7 +23,7 @@ async def bbs_w_comment_tool(bbs_num = '', post_num = '', comment_num = ''):
                 </ul>
             '''
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('bbs_comment_tool'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = data,
             menu = [['bbs/w/' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '#' + url_pas(comment_num), await get_lang('return')]]

route/bbs_w_delete.py

@@ -53,7 +53,7 @@ async def bbs_w_delete(bbs_num = '', post_num = '', comment_num = ''):
             else:
                 sub += ' (' + comment_num + ')'
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
                 data = await render_simple_set('''
                     <form method="post">

route/bbs_w_edit.py

@@ -124,7 +124,7 @@ async def bbs_w_edit(bbs_num = '', post_num = '', comment_num = ''):
             else:
                 bbs_title = await get_lang('post_edit')
     
-            return easy_minify(flask.render_template(await skin_check(conn), 
+            return easy_minify(flask.render_template(await skin_check(), 
                 imp = [bbs_title, await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data =  editor_top_text + '''
                     <form method="post">                        

route/bbs_w_hide.py

@@ -20,7 +20,7 @@ async def bbs_w_hide(bbs_num = '', post_num = ''):
         if flask.request.method == 'POST':
             pass
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('bbs_post_hide'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')' + ' (' + post_num_str + ')', 0])],
                 data = await render_simple_set('''
                     <form method="post">

route/bbs_w_pinned.py

@@ -35,7 +35,7 @@ async def bbs_w_pinned(bbs_num = '', post_num = ''):
             curs.execute(db_change('select set_data from bbs_data where set_code = ? and set_id = ? and set_name = "pinned"'), [post_num_str, bbs_num_str])
             pinned = await get_lang('pinned') if not curs.fetchall() else await get_lang('pinned_release')
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('bbs_post_pinned'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')' + ' (' + post_num_str + ')', 0])],
                 data = await render_simple_set('''
                     <form method="post">

route/bbs_w_post.py

@@ -209,7 +209,7 @@ async def bbs_w_post(bbs_num = '', post_num = ''):
                     </form>
                 '''
 
-                return easy_minify(flask.render_template(await skin_check(conn),
+                return easy_minify(flask.render_template(await skin_check(),
                     imp = [bbs_name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('bbs') + ')', 0])],
                     data = data,
                     menu = [['bbs/in/' + bbs_num_str, await get_lang('return')], ['bbs/edit/' + bbs_num_str + '/' + post_num_str, await get_lang('edit')], ['bbs/tool/' + bbs_num_str + '/' + post_num_str, await get_lang('tool')]]

route/bbs_w_tool.py

@@ -35,7 +35,7 @@ async def bbs_w_tool(bbs_num = '', post_num = ''):
                 </ul>
             '''
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('bbs_post_tool'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = data,
             menu = [['bbs/w/' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str), await get_lang('return')]]

route/edit.py

@@ -354,7 +354,7 @@ async def edit(name = 'Test', section = 0, do_type = ''):
             sub_menu = ' (' + str(section) + ')' if section != '' else ''
             sub_title = '(' + await get_lang('edit_request') + ')' if edit_req_mode == 1 else '(' + await get_lang('edit') + ')'
 
-            return easy_minify(flask.render_template(await skin_check(conn), 
+            return easy_minify(flask.render_template(await skin_check(), 
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css([sub_title + sub_menu, 0])],
                 data = editor_top_text + '''
                     <form method="post">

route/edit_delete.py

@@ -53,7 +53,7 @@ async def edit_delete(name):
 
             return redirect(conn, '/w/' + url_pas(name))
         else:            
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('delete') + ')', 0])],
                 data = '''
                     <form method="post">

route/edit_delete_file.py

@@ -30,7 +30,7 @@ async def edit_delete_file(name = 'test.jpg'):
 
             return redirect(conn, '/w/' + url_pas(name))
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('file_delete') + ')', 0])],
                 data = '''
                     <form method="post">

route/edit_delete_multiple.py

@@ -23,7 +23,7 @@ async def edit_delete_multiple():
 
             return redirect(conn, '/recent_change')
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('many_delete'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/edit_move.py

@@ -213,7 +213,7 @@ async def edit_move(name):
             owner_auth = await acl_check(tool = 'owner_auth')
             owner_auth = 1 if owner_auth == 0 else 0
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('move') + ')', 0])],
                 data = '''
                     <form method="post">

route/edit_request.py

@@ -90,7 +90,7 @@ async def edit_request(name = 'Test', do_type = ''):
 
             result = view_diff_do(old_data, edit_request_data, 'r' + doc_ver, await get_lang('edit_request'))
 
-            return easy_minify(flask.render_template(await skin_check(conn), 
+            return easy_minify(flask.render_template(await skin_check(), 
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('edit_request_check') + ')', 0])],
                 data = '''
                     <div id="opennamu_get_user_info">''' + html.escape(edit_request_user) + '''</div>

route/edit_revert.py

@@ -74,7 +74,7 @@ async def edit_revert(name, num):
             else:
                 preview = ''
             
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(r' + str(num) + ') (' + await get_lang('revert') + ')', 0])],
                 data = '''
                     <form method="post">

route/edit_upload.py

@@ -135,7 +135,7 @@ async def edit_upload():
             db_data = curs.fetchall()
             upload_default = html.escape(db_data[0][0]) if db_data and db_data[0][0] != '' else ''
             
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('upload'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <a href="/filter/file_filter">(''' + await get_lang('file_filter_list') + ''')</a> <a href="/filter/extension_filter">(''' + await get_lang('extension_filter_list') + ''')</a>

route/filter_all.py

@@ -87,7 +87,7 @@ async def filter_all(tool):
             div += '<hr class="main_hr">'
             div += '<a href="/filter/' + tool + '/add">(' + await get_lang('add') + ')</a>'
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['manager/1', await get_lang('return')]]

route/filter_all_add.py

@@ -268,7 +268,7 @@ async def filter_all_add(tool, name = None):
                     <input value="''' + html.escape(value) + '''" type="text" name="markup">
                 '''
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([get_sub, 0])],
                 data =  '''
                         <form method="post">

route/give_admin_groups.py

@@ -108,7 +108,7 @@ async def give_admin_groups(name = 'test'):
 
             data += '</ul>'
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('admin_group') + ')', 0])],
                 data = '''
                     <form method="post">

route/give_delete_admin_group.py

@@ -21,7 +21,7 @@ async def give_delete_admin_group(name = 'test'):
             else:
                 return await re_error(conn, 47)
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang("delete_admin_group"), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + name + ')', 0])],
                 data = '' + \
                     '<form method="post">' + \

route/give_user_ban.py

@@ -131,7 +131,7 @@ async def give_user_ban(name = None, ban_type = ''):
             if await acl_check(tool = 'owner_auth', ip = ip) != 1:
                 owner_option = '<option value="private" ' + ('selected' if ban_type == 'private' else '') + '>' + await get_lang('private') + '</option>'
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [main_name, await wiki_set(), await wiki_custom(conn), wiki_css([now, 0])],
                 data = info_data + '''
                     <form method="post" ''' + action + '''>

route/give_user_fix.py

@@ -47,7 +47,7 @@ async def give_user_fix(user_name = ''):
 
             return redirect(conn, '/user/' + url_pas(user_name))
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('user_fix'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/go_main_func_easter_egg.py

@@ -12,7 +12,7 @@ async def main_func_easter_egg():
     
         data = ''
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = ['Easter Egg', await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = data,
             menu = 0

route/list_acl.py

@@ -32,7 +32,7 @@ async def list_acl(arg_num = 1):
         div += '</ul>'
         div += await get_next_page_bottom('/list/document/acl/{}', arg_num, list_data)
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('acl_document_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', await get_lang('return')]]

route/list_admin.py

@@ -19,7 +19,7 @@ async def list_admin():
 
         div += '</ul>'
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('admin_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', await get_lang('return')]]

route/list_admin_auth_use.py

@@ -39,7 +39,7 @@ async def list_admin_auth_use(arg_num = 1, arg_search = 'normal'):
 
             arg_search = html.escape(arg_search) if arg_search != 'normal' else ''
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('authority_use_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/list_admin_group.py

@@ -27,7 +27,7 @@ async def list_admin_group():
             '<a href="/manager/8">(' + await get_lang('add') + ')</a>' + \
         ''
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('admin_group_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = list_data,
             menu = [['manager', await get_lang('return')]]

route/list_history.py

@@ -159,7 +159,7 @@ async def list_history(tool = 'history', num = 1, set_type = 'normal', doc_name
             else:
                 data_html += await get_next_page_bottom(f'/recent_change/{{}}/{set_type}', num, data)
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
                 data = data_html,
                 menu = menu

route/list_image_file.py

@@ -58,7 +58,7 @@ async def list_image_file(arg_num = 1, do_type = 0):
         else:
             list_data += await get_next_page_bottom('/list/image/{}', arg_num, data_list)
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('image_file_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = list_data,
             menu = [['other', await get_lang('return')]]

route/list_long_page.py

@@ -25,7 +25,7 @@ async def list_long_page(tool = 'long_page', arg_num = 1):
 
         div += '</ul>' + await get_next_page_bottom('/list/document/' + ('long' if title == 'long_page' else 'short') + '/{}', arg_num, n_list)
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang(title), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', await get_lang('return')]]

route/list_no_link.py

@@ -23,7 +23,7 @@ async def list_no_link(num = 1):
         
         div += '</ul>' + await get_next_page_bottom('/list/document/no_link/{}', num, n_list)
         
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('no_link_document_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', await get_lang('return')]]

route/list_old_page.py

@@ -25,7 +25,7 @@ async def list_old_page(num = 1, set_type = 'old'):
 
         data_html += await get_next_page_bottom(f'/list/document/{set_type}/{{}}', int(num), data)
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = data_html,
             menu = [['other', await get_lang('return')]]

route/list_please.py

@@ -19,7 +19,7 @@ async def list_please(arg_num = 1):
 
         div += '</ul>' + await get_next_page_bottom('/list/document/need/{}', arg_num, data_list)
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('need_document'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['other', await get_lang('return')]]

route/list_title_index.py

@@ -58,7 +58,7 @@ async def list_title_index(num = 1):
         data += '</ul>' + await get_next_page_bottom('/list/document/all/{}', num, title_list)
         sub = ' (' + str(num) + ')'
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('all_document_list'), await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = data,
             menu = [['other', await get_lang('return')]]

route/list_user.py

@@ -18,7 +18,7 @@ async def list_user(arg_num = 1):
 
         list_data += '</ul>' + await get_next_page_bottom('/list/user/{}', arg_num, user_list)
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('member_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = list_data,
             menu = [['other', await get_lang('return')]]

route/list_user_check.py

@@ -155,7 +155,7 @@ async def list_user_check(name = 'test', plus_name = None, arg_num = 1, do_type
             if plus_id:
                 name += ', ' + plus_id
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('check') + ')', 0])],
                 data = div,
                 menu = [['manager', await get_lang('return')]]
@@ -184,7 +184,7 @@ async def list_user_check(name = 'test', plus_name = None, arg_num = 1, do_type
                 '<a href="/list/user/check/' + url_pas(name) + '/normal">(' + await get_lang('check') + ')</a>' + \
             '' + div
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('simple_check') + ')', 0])],
                 data = div,
                 menu = [['check/' + url_pas(name), await get_lang('return')]]

route/list_user_check_delete.py

@@ -17,7 +17,7 @@ async def list_user_check_delete(name = None, ip = None, time = None, do_type =
 
                 return redirect(conn, '/list/user/check/' + url_pas(user_id if return_type == '0' else user_ip))
             else:
-                return easy_minify(flask.render_template(await skin_check(conn),
+                return easy_minify(flask.render_template(await skin_check(),
                     imp = [await get_lang('check'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('delete') + ')', 0])],
                     data = '''
                         ''' + await get_lang('name') + ''' : ''' + user_id + '''

route/login_find.py

@@ -2,7 +2,7 @@ from .tool.func import *
 
 async def login_find():
     with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('password_search'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '''
                 <ul>

route/login_find_email.py

@@ -79,7 +79,7 @@ async def login_find_email(tool):
                 sql_d = curs.fetchall()
                 b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
-                return easy_minify(flask.render_template(await skin_check(conn),
+                return easy_minify(flask.render_template(await skin_check(),
                     imp = [await get_lang('password_search'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('email') + ')', 0])],
                     data = b_text + '''
                         <form method="post">
@@ -100,7 +100,7 @@ async def login_find_email(tool):
                 sql_d = curs.fetchall()
                 b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
-                return easy_minify(flask.render_template(await skin_check(conn),
+                return easy_minify(flask.render_template(await skin_check(),
                     imp = [await get_lang('email'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                     data = '''
                         <a href="/filter/email_filter">(''' + await get_lang('email_filter_list') + ''')</a>

route/login_find_email_check.py

@@ -30,7 +30,7 @@ async def login_find_email_check(tool):
                 sql_d = curs.fetchall()
                 b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
-                return easy_minify(flask.render_template(await skin_check(conn),
+                return easy_minify(flask.render_template(await skin_check(),
                     imp = [await get_lang('reset_user_ok'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                     data = '' + \
                         b_text + \
@@ -121,7 +121,7 @@ async def login_find_email_check(tool):
             sql_d = curs.fetchall()
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
         
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('check_key'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/login_find_key.py

@@ -29,7 +29,7 @@ async def login_find_key():
             sql_d = curs.fetchall()
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
             
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                     imp = [await get_lang('reset_user_ok'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                     data = '' + \
                         b_text + \
@@ -40,7 +40,7 @@ async def login_find_key():
                     menu = [['user', await get_lang('return')]]
                 ))
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('password_search'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/login_login.py

@@ -49,7 +49,7 @@ async def login_login():
 
                 return redirect(conn, '/user')
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('login'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data =  '''
                         <form method="post">

route/login_login_2fa.py

@@ -49,7 +49,7 @@ async def login_login_2fa():
 
             return redirect(conn, '/user')
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('login'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data =  '''
                         <form method="post">

route/login_login_2fa_email.py

@@ -44,7 +44,7 @@ async def login_login_2fa_email():
 
             return redirect(conn, '/user')
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('login'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data =  '''
                         <form method="post">

route/login_register.py

@@ -87,7 +87,7 @@ async def login_register():
             else:
                 password_min_length = ''
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('register'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/login_register_email.py

@@ -50,7 +50,7 @@ async def login_register_email():
             sql_d = curs.fetchall()
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('email'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <a href="/filter/email_filter">(''' + await get_lang('email_filter_list') + ''')</a>

route/login_register_email_check.py

@@ -34,7 +34,7 @@ async def login_register_email_check():
             sql_d = curs.fetchall()
             b_text = (sql_d[0][0] + '<hr class="main_hr">') if sql_d and sql_d[0][0] != '' else ''
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('check_key'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/login_register_submit.py

@@ -52,7 +52,7 @@ async def login_register_submit():
 
             return await re_error(conn, 43)
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('approval_question'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/main_func_error_404.py

@@ -23,7 +23,7 @@ async def main_func_error_404(e = ''):
                 db_data = db_data[0][0] if db_data and db_data[0][0] != '' else ''
 
                 if db_data != '':
-                    return easy_minify(flask.render_template(await skin_check(conn),
+                    return easy_minify(flask.render_template(await skin_check(),
                         imp = ['404', await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                         data = db_data,
                         menu = 0

route/main_search_deep.py

@@ -62,7 +62,7 @@ async def main_search_deep(name = 'Test', search_type = 'title', num = 1):
             else:
                 div += await get_next_page_bottom('/search_data_page/{}/' + url_pas(name), num, all_list)
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('search') + ')', 0])],
                 data = div,
                 menu = 0

route/main_setting.py

@@ -18,7 +18,7 @@ async def main_setting():
 
         li_data = ''.join(['<li><a href="/setting/' + str(li[0]) + '">' + li[1] + '</a></li>' for li in li_list])
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '<h2>' + await get_lang('list') + '</h2><ul>' + li_data + '</ul>',
             menu = [['manager', await get_lang('return')]]

route/main_setting_404_page.py

@@ -53,7 +53,7 @@ async def main_setting_404_page():
                 '</form>'
             )
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('404_page_setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = data_html,
                 menu = [['setting', await get_lang('return')]]

route/main_setting_email_test.py

@@ -14,13 +14,13 @@ async def main_setting_email_test():
             else:
                 data = await get_lang("error")
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang("email_test"), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = data,
                 menu = [["setting/external", await get_lang('return')]]
             ))
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang("email_test"), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/main_setting_external.py

@@ -65,7 +65,7 @@ async def main_setting_external():
                 else:
                     re_ver += '<option value="' + i + '">' + re_ver_list[i] + '</option>'
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('ext_api_req_set'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = await render_simple_set('''
                     <form method="post">

route/main_setting_head.py

@@ -97,7 +97,7 @@ async def main_setting_head(num, skin_name = '', set_preview = 0):
             else:
                 sub_plus = ''
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang(data = 'main' + title, safe = 1), await wiki_set(), await wiki_custom(conn), wiki_css(['(HTML)' + sub_plus, 0])],
                 data = '''
                     <form method="post">

route/main_setting_main.py

@@ -199,7 +199,7 @@ async def main_setting_main():
                 <hr class="main_hr">
             '''
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('main_setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = await render_simple_set('''
                     <form method="post">

route/main_setting_main_logo.py

@@ -44,7 +44,7 @@ async def main_setting_main_logo():
                     '<hr class="main_hr">' + \
                 ''
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('wiki_logo'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/main_setting_phrase.py

@@ -60,7 +60,7 @@ async def main_setting_phrase():
                     curs.execute(db_change('insert into other (name, data, coverage) values (?, ?, "")'), [i, ''])
                     d_list += ['']
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('text_setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = await render_simple_set('''
                     <form method="post">

route/main_setting_robot.py

@@ -36,7 +36,7 @@ async def main_setting_robot():
 
             return redirect(conn, '/setting/robot')
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = ['robots.txt', await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <a href="/robots.txt">(''' + await get_lang('view') + ''')</a>

route/main_setting_sitemap.py

@@ -94,7 +94,7 @@ async def main_setting_sitemap(do_type = 0):
             else:
                 return ''
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('sitemap_manual_create'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/main_setting_sitemap_set.py

@@ -56,7 +56,7 @@ async def main_setting_sitemap_set():
 
                     for_a += 1
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('sitemap_management'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     ''' + sitemap_list + '''

route/main_setting_skin_set.py

@@ -39,7 +39,7 @@ async def main_setting_skin_set():
 
             set_data_main = { for_b : '' for for_b in set_list }
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('main_skin_set_default'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('beta') + ')', 0])],
                 data = await render_simple_set('''
                     <form method="post">

route/main_setting_top_menu.py

@@ -22,7 +22,7 @@ async def main_setting_top_menu():
             db_data = curs.fetchall()
             db_data = db_data[0][0] if db_data else ''
             
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('top_menu_setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <span>

route/main_sys_restart.py

@@ -47,7 +47,7 @@ async def main_sys_restart(golang_process):
             threading.Thread(target = main_sys_restart_do).start()
             return flask.Response(await get_lang("warning_restart"), status = 200)
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('wiki_restart'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/main_sys_shutdown.py

@@ -12,7 +12,7 @@ async def main_sys_shutdown():
 
             sys.exit()
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('wiki_shutdown'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/main_sys_update.py

@@ -67,7 +67,7 @@ async def main_sys_update(golang_process):
 
             return await re_error(conn, 34)
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('update'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = await get_lang('update_warning') + '''
                     <hr class="main_hr">

route/main_tool_admin.py

@@ -2,7 +2,7 @@ from .tool.func import *
 
 async def main_tool_admin():
     with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('admin_tool'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = await render_simple_set('''
                 <h2>''' + await get_lang('admin') + '''</h2>

route/main_tool_other.py

@@ -2,7 +2,7 @@ from .tool.func import *
 
 async def main_tool_other():
     with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('other_tool'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = await render_simple_set('''
                 <h2>''' + await get_lang('user_tool') + '''</h2>

route/main_tool_redirect.py

@@ -57,7 +57,7 @@ async def main_tool_redirect(num = 1, add_2 = ''):
                         '<hr class="main_hr">' + \
                     ''
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [title_list[num][2], await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/n_bbs_in.py

@@ -15,7 +15,7 @@ async def bbs_in(bbs_num = 1, page = 1):
     
         bbs_name = db_data[0][0]
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [bbs_name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('bbs') + ') (' + str(page) + ')', 0])],
             data = '' + \
                 '<div id="opennamu_bbs_in"></div>' + \

route/n_bbs_main.py

@@ -2,7 +2,7 @@ from .tool.func import *
 
 async def bbs_main():
     with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('bbs_main'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '' + \
                 '<div id="opennamu_bbs_main"></div>' + \

route/n_bbs_w_set.py

@@ -13,7 +13,7 @@ async def bbs_w_set(bbs_num = ''):
 
         bbs_num_str = str(bbs_num)
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('bbs_set'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + bbs_name + ')', 0])],
             data = '' + \
                 '<div id="opennamu_bbs_w_set"></div>' + \

route/n_edit_move_all.py

@@ -2,7 +2,7 @@ from .tool.func import *
 
 async def edit_move_all():
     with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('multiple_move'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '' + \
                 '<div id="opennamu_edit_move_all"></div>' + \

route/n_give_auth.py

@@ -8,7 +8,7 @@ async def give_auth(user_name = ''):
         else:
             sub = '(' + await get_lang('authorize') + ')'
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [user_name, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = '' + \
                 '<div id="opennamu_give_auth"></div>' + \

route/n_list_recent_block.py

@@ -16,7 +16,7 @@ async def list_recent_block(user_name = 'Test', tool = 'all', num = 1, why = '')
         elif tool == 'admin':
             sub = '(' + await get_lang('admin') + ')'
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('recent_ban'), await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = '' + \
                 '<div id="opennamu_list_recent_block"></div>' + \

route/n_list_recent_discuss.py

@@ -8,7 +8,7 @@ async def list_recent_discuss(num = 1, tool = 'normal'):
         elif tool == 'open':
             m_sub = '(' + await get_lang('open_discussion') + ')'
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('recent_discussion'), await wiki_set(), await wiki_custom(conn), wiki_css([m_sub, 0])],
             data = '' + \
                 '<div id="opennamu_list_recent_discuss"></div>' + \

route/n_list_user_check_submit.py

@@ -2,7 +2,7 @@ from .tool.func import *
 
 async def list_user_check_submit(name = 'Test'):
     with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('check') + ')', 0])],
             data = '' + \
                 '<div id="opennamu_list_user_check_submit"></div>' + \

route/n_topic_list.py

@@ -2,7 +2,7 @@ from .tool.func import *
 
 async def topic_list(page = 1, name = 'Test'):
     with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('discussion_list') + ')', 0])],
             data = '' + \
                 '<div id="opennamu_topic_list"></div>' + \

route/n_w_watch_list.py

@@ -2,7 +2,7 @@ from .tool.func import *
 
 async def w_watch_list(name, num = 1, do_type = 'watch_list'):
     with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang(do_type if do_type == 'star_doc' else 'watchlist') + ')', 0])],
             data = '' + \
                 '<div id="opennamu_w_watch_list"></div>' + \

route/recent_app_submit.py

@@ -86,7 +86,7 @@ async def recent_app_submit():
             else:
                 div += await get_lang('no_applications_now')
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('application_list'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = div,
                 menu = [['other', await get_lang('return')]]

route/recent_change.py

@@ -241,7 +241,7 @@ async def recent_change(name = '', tool = '', num = 1, set_type = 'normal'):
             if sub == '':
                 sub = 0
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
                 data = div,
                 menu = menu

route/recent_edit_request.py

@@ -49,7 +49,7 @@ async def recent_edit_request():
             '</table>' + \
         ''
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('recent_edit_request'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = div,
             menu = [['recent_change', await get_lang('return')]]

route/recent_history_add.py

@@ -29,7 +29,7 @@ async def recent_history_add(name = 'Test', do_type = ''):
 
             return redirect(conn, '/history/' + url_pas(name))
         else:            
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('history_add'), await wiki_set(), await wiki_custom(conn), wiki_css(['(' + name + ')', 0])],
                 data = '''
                     <form method="post">

route/recent_history_delete.py

@@ -16,7 +16,7 @@ async def recent_history_delete(name = 'Test', rev = 1):
 
             return redirect(conn, '/history/' + url_pas(name))
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('history_delete') + ') (r' + num + ')', 0])],
                 data = '''
                     <form method="post">

route/recent_history_reset.py

@@ -14,7 +14,7 @@ async def recent_history_reset(name = 'Test'):
 
             return redirect(conn, '/history/' + url_pas(name))
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('history_reset') + ')', 0])],
                 data = '''
                     <form method="post">

route/recent_history_send.py

@@ -27,7 +27,7 @@ async def recent_history_send(name = 'Test', rev = 1):
             if send:
                 send = send[0][0]
 
-                return easy_minify(flask.render_template(await skin_check(conn),
+                return easy_minify(flask.render_template(await skin_check(),
                     imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('send_edit') + ') (r' + num + ')', 0])],
                     data = '''
                         <form method="post">

route/recent_history_tool.py

@@ -42,7 +42,7 @@ async def recent_history_tool(name = 'Test', rev = 1):
             data += '<li><a href="/history_send/' + num + '/' + url_pas(name) + '">' + await get_lang('send_edit') + '</a></li>'
             data += '</ul>'
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(r' + num + ')', 0])],
             data = data,
             menu = [['history/' + url_pas(name), await get_lang('return')]]

route/recent_record_reset.py

@@ -14,7 +14,7 @@ async def recent_record_reset(name = 'Test'):
 
             return redirect(conn, '/record/' + url_pas(name))
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('record_reset') + ')', 0])],
                 data = '''
                     <form method="post">

route/recent_record_topic.py

@@ -39,7 +39,7 @@ async def recent_record_topic(name = 'Test'):
         div += '</table>'
         div += await get_next_page_bottom('/record/topic/' + url_pas(name) + '?num={}', num, data_list)
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('discussion_record'), await wiki_set(), await wiki_custom(conn), wiki_css([sub, 0])],
             data = div,
             menu = [['other', await get_lang('other')], ['user/' + url_pas(name), await get_lang('user_tool')]]

route/tool/func.py

@@ -1179,39 +1179,12 @@ def load_lang(data, safe = 0):
     except RuntimeError:
         return asyncio.run(get_lang(data, safe))
 
-async def skin_check(conn, set_n = 0):
-    curs = conn.cursor()
-
-    # 개편 필요?
-    skin_list = await load_skin('ringo', 1)
-    skin = skin_list[0]
-    ip = ip_check()
-    
-    user_need_skin = ''
-    if ip_or_user(ip) == 0:
-        curs.execute(db_change('select data from user_set where name = "skin" and id = ?'), [ip])
-        skin_exist = curs.fetchall()
-        if skin_exist:
-            user_need_skin = skin_exist[0][0]            
-    else:
-        if 'skin' in flask.session:
-            user_need_skin = flask.session['skin']
-
-    user_need_skin = '' if user_need_skin == 'default' else user_need_skin
-
-    if user_need_skin == '':
-        curs.execute(db_change('select data from other where name = "skin"'))
-        skin_exist = curs.fetchall()
-        if skin_exist:
-            user_need_skin = skin_exist[0][0]
-    
-    if user_need_skin != '' and user_need_skin in skin_list:
-        skin = user_need_skin
+async def skin_check(set_n = 0):
+    other_set = {}
+    other_set["set_n"] = str(set_n)
 
-    if set_n == 0:
-        return './views/' + skin + '/index.html'
-    else:
-        return skin
+    res = await python_to_golang('api_func_skin_name', other_set)
+    return res["data"]
     
 def cache_v():
     return '.cache_v288'
@@ -1292,7 +1265,7 @@ async def wiki_custom(conn):
     curs = conn.cursor()
 
     ip = ip_check()
-    skin_name = '_' + await skin_check(conn, 1)
+    skin_name = '_' + await skin_check(1)
 
     if ip_or_user(ip) == 0:
         user_icon = 1
@@ -2216,7 +2189,7 @@ async def re_error(conn, data):
         else:
             end = '<ul><li>' + await get_lang('authority_error') + '</li></ul>'
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('error'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = '<h2>' + await get_lang('error') + '</h2>' + end,
             menu = 0
@@ -2356,7 +2329,7 @@ async def re_error(conn, data):
             if flask.request.path != '/skin_set':
                 data += '<br>' + await get_lang('error_skin_set_old') + ' <a href="/skin_set">(' + await get_lang('go') + ')</a>'
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('skin_set'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '' + \
                     '<div id="main_skin_set">' + \
@@ -2369,7 +2342,7 @@ async def re_error(conn, data):
                 menu = [['change', await get_lang('user_setting')], ['change/skin_set/main', await get_lang('main_skin_set')]]
             ))
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [title, await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '' + \
                     '<h2>' + sub_title + '</h2>' + \

route/topic.py

@@ -133,7 +133,7 @@ async def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
             
             shortcut += '</div>'
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + await get_lang('discussion') + ')', 0])],
                 data = '''
                     <script defer src="/views/main_css/js/route/topic.js''' + cache_v() + '''"></script>

route/topic_comment_delete.py

@@ -15,7 +15,7 @@ async def topic_comment_delete(topic_num = 1, num = 1):
 
             return redirect(conn, '/thread/' + topic_num)
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('topic_delete'), await wiki_set(), await wiki_custom(conn), wiki_css(['(#' + num + ')', 0])],
                 data = '''
                     <hr class="main_hr">

route/topic_comment_tool.py

@@ -55,7 +55,7 @@ async def topic_comment_tool(topic_num = 1, num = 1):
                 </ul>
             '''
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('discussion_tool'), await wiki_set(), await wiki_custom(conn), wiki_css(['(#' + num + ')', 0])],
             data = ban,
             menu = [['thread/' + topic_num + '#' + num, await get_lang('return')]]

route/topic_list.py

@@ -37,7 +37,7 @@ async def topic_list(name = 'Test'):
         if div == '':
             plus = re.sub(r'^<br>', '', plus)
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [name, await wiki_set(), await wiki_custom(conn), wiki_css(['(' + sub + ')', 0])],
             data = div + plus,
             menu = menu

route/topic_tool.py

@@ -76,7 +76,7 @@ async def topic_tool(topic_num = 1):
                 </ul>
             '''
 
-        return easy_minify(flask.render_template(await skin_check(conn),
+        return easy_minify(flask.render_template(await skin_check(),
             imp = [await get_lang('topic_tool'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
             data = data,
             menu = [['thread/' + topic_num, await get_lang('return')]]

route/topic_tool_acl.py

@@ -79,7 +79,7 @@ async def topic_tool_acl(topic_num = 1):
 
                 acl_html_list_view += '<option value="' + data_list + '" ' + check + '>' + (data_list if data_list != '' else 'normal') + '</option>'
 
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('topic_acl_setting'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">

route/topic_tool_change.py

@@ -28,7 +28,7 @@ async def topic_tool_change(topic_num = 1):
 
             return redirect(conn, '/thread/' + topic_num)
         else:
-            return easy_minify(flask.render_template(await skin_check(conn),
+            return easy_minify(flask.render_template(await skin_check(),
                 imp = [await get_lang('topic_name_change'), await wiki_set(), await wiki_custom(conn), wiki_css([0, 0])],
                 data = '''
                     <form method="post">