mod other tool part

app.py

@@ -612,8 +612,8 @@ app.route('/api/sitemap.xml')(api_sitemap)
 # 여기도 전반적인 조정 시행 예정
 app.route('/other')(main_tool_other)
 app.route('/manager', methods = ['POST', 'GET'])(main_tool_admin)
-app.route('/manager/<int:num>', methods = ['POST', 'GET'])(main_tool_admin)
-app.route('/manager/<int:num>/<add_2>', methods = ['POST', 'GET'])(main_tool_admin)
+app.route('/manager/<int:num>', methods = ['POST', 'GET'])(main_tool_redirect)
+app.route('/manager/<int:num>/<add_2>', methods = ['POST', 'GET'])(main_tool_redirect)
 
 app.route('/search', methods=['POST'])(main_search)
 app.route('/search/<everything:name>')(main_search_deep)

route/main_tool_admin.py

@@ -1,117 +1,61 @@
 from .tool.func import *
 
-def main_tool_admin(num = 1, add_2 = ''):
+def main_tool_admin():
     with get_db_connect() as conn:
-        title_list = {
-            0 : [load_lang('document_name'), 'acl', load_lang('acl')],
-            1 : [0, 'check', load_lang('check')],
-            2 : [load_lang('file_name'), 'file_filter/add', load_lang('file_filter_add')],
-            3 : [0, 'admin', load_lang('authorize')],
-            4 : [0, 'record', load_lang('edit_record')],
-            5 : [0, 'record/topic', load_lang('discussion_record')],
-            6 : [load_lang('name'), 'admin_plus', load_lang('add_admin_group')],
-            7 : [load_lang('name'), 'edit_filter/add', load_lang('edit_filter_add')],
-            8 : [load_lang('document_name'), 'search', load_lang('search')],
-            9 : [0, 'block_log/user', load_lang('blocked_user')],
-            10 : [0, 'block_log/admin', load_lang('blocked_admin')],
-            11 : [load_lang('document_name'), 'watch_list', load_lang('add_watchlist')],
-            12 : [load_lang('compare_target'), 'check', load_lang('compare_target')],
-            13 : [load_lang('document_name'), 'edit', load_lang('load')],
-            14 : [load_lang('document_name'), 'star_doc', load_lang('add_star_doc')],
-            15 : [load_lang('name_or_ip_or_regex'), 'auth/give/ban', load_lang('release')]
-        }
-
-        if num == 1:
-            return easy_minify(flask.render_template(skin_check(),
-                imp = [load_lang('admin_tool'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
-                data = '''
-                    <div id="opennamu_simple_render">
-                        <h2>1. ''' + load_lang('admin') + '''</h2>
-                        <ul class="inside_ul">
-                            <li><a href="/manager/2">''' + load_lang('acl_change') + '''</a></li>
-                            <li><a href="/manager/3">''' + load_lang('check_user') + '''</a></li>
-                            <li><a href="/auth/give/ban">''' + load_lang('ban') + '''</a></li>
-                            <li><a href="/auth/give/ban_multiple">''' + load_lang('multiple_ban') + '''</a></li>
-                            <li><a href="/manager/17">''' + load_lang('release') + '''</a></li>
-                            <li><a href="/manager/5">''' + load_lang('authorize') + '''</a></li>
-                        </ul>
-                        <h2>2. ''' + load_lang('owner') + '''</h2>
-                        <ul class="inside_ul">
-                            <li><a href="/admin_group">''' + load_lang('admin_group_list') + '''</a></li>
-                            <li><a href="/delete_multiple">''' + load_lang('many_delete') + '''</a></li>
-                            <li><a href="/app_submit">''' + load_lang('application_list') + '''</a></li>
-                            <li><a href="/api/sitemap.xml">''' + load_lang('get_sitemap') + '''</a></li>
-                            <li><a href="/register">''' + load_lang('add_user') + '''</a></li>
-                            <li><a href="/setting">''' + load_lang('setting') + '''</a></li>
-                        </ul>
-                        <h3>2.1. ''' + load_lang('filter') + '''</h3>
-                        <ul class="inside_ul">
-                            <li><a href="/edit_filter">''' + load_lang('edit_filter_list') + '''</a></li>
-                            <li><a href="/inter_wiki">''' + load_lang('interwiki_list') + '''</a></li>
-                            <li><a href="/edit_top">''' + load_lang('edit_tool_list') + '''</a></li>
-                            <li><a href="/image_license">''' + load_lang('image_license_list') + '''</a></li>
-                            <li><a href="/email_filter">''' + load_lang('email_filter_list') + '''</a></li>
-                            <li><a href="/name_filter">''' + load_lang('id_filter_list') + '''</a></li>
-                            <li><a href="/file_filter">''' + load_lang('file_filter_list') + '''</a></li>
-                            <li><a href="/extension_filter">''' + load_lang('extension_filter_list') + '''</a></li>
-                            <li><a href="/filter/document/list">''' + load_lang('document_filter_list') + '''</a></li>
-                        </ul>
-                        <h3>2.2. ''' + load_lang('server') + '''</h2>
-                        <ul class="inside_ul">
-                            <li><a href="/restart">''' + load_lang('wiki_restart') + '''</a></li>
-                            <li><a href="/shutdown">''' + load_lang('wiki_shutdown') + '''</a></li>
-                            <li><a href="/update">''' + load_lang('update') + '''</a></li>
-                        </ul>
-                        <h2>3. ''' + load_lang('version') + '''</h2>
-                        <ul class="inside_ul">
-                            <li id="ver_send_2">''' + load_lang('version') + ''' : </li>
-                            <li id="ver_send">''' + load_lang('lastest') + ''' : </li>
-                        </ul>
-                        <h3>3.1. ''' + load_lang('skin_info') + '''</h3>
-                        <ul class="inside_ul">
-                            <li><a href="/api/skin_info?all=true">''' + load_lang('skin_info') + '''</a></li>
-                            <div id="ver_send_3"></div>
-                        </ul>
-                    </div>
-                    <!-- JS : opennamu_do_insert_version -->
-                    <!-- JS : opennamu_do_insert_version_skin -->
-                    <!-- JS : opennamu_do_render_simple -->
-                ''',
-                menu = [['other', load_lang('return')]]
-            ))
-        elif not num - 1 > len(title_list):
-            num -= 2
-
-            add_1 = flask.request.form.get('name', 'test')
-            if flask.request.method == 'POST':
-                if add_2 != '':
-                    flask.session['edit_load_document'] = add_1
-                    return redirect('/edit_from/' + url_pas(add_2))
-                elif flask.request.form.get('regex', '') != '':
-                    return redirect('/auth/give/ban_regex/' + url_pas(add_1))
-                else:
-                    return redirect('/' + title_list[num][1] + '/' + url_pas(add_1))
-            else:
-                if title_list[num][0] == 0:
-                    placeholder = load_lang('user_name')
-                else:
-                    placeholder = title_list[num][0]
-
-                plus = ''
-                if num == 15:
-                    plus = '<input type="checkbox" name="regex"> ' + load_lang('regex') + '<hr class="main_hr">'
-
-                return easy_minify(flask.render_template(skin_check(),
-                    imp = [title_list[num][2], wiki_set(), wiki_custom(), wiki_css([0, 0])],
-                    data = '''
-                        <form method="post">
-                            <input placeholder="''' + placeholder + '''" name="name" type="text">
-                            <hr class="main_hr">
-                            ''' + plus + '''
-                            <button type="submit">''' + load_lang('go') + '''</button>
-                        </form>
-                    ''',
-                    menu = [['manager', load_lang('return')]]
-                ))
-        else:
-            return redirect()
+        return easy_minify(flask.render_template(skin_check(),
+            imp = [load_lang('admin_tool'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
+            data = '''
+                <div id="opennamu_simple_render">
+                    <h2>1. ''' + load_lang('admin') + '''</h2>
+                    <ul class="inside_ul">
+                        <li><a href="/manager/2">''' + load_lang('acl_change') + '''</a></li>
+                        <li><a href="/manager/3">''' + load_lang('check_user') + '''</a></li>
+                        <li><a href="/auth/give/ban">''' + load_lang('ban') + '''</a></li>
+                        <li><a href="/auth/give/ban_multiple">''' + load_lang('multiple_ban') + '''</a></li>
+                        <li><a href="/manager/17">''' + load_lang('release') + '''</a></li>
+                        <li><a href="/manager/5">''' + load_lang('authorize') + '''</a></li>
+                    </ul>
+                    <h2>2. ''' + load_lang('owner') + '''</h2>
+                    <ul class="inside_ul">
+                        <li><a href="/admin_group">''' + load_lang('admin_group_list') + '''</a></li>
+                        <li><a href="/delete_multiple">''' + load_lang('many_delete') + '''</a></li>
+                        <li><a href="/app_submit">''' + load_lang('application_list') + '''</a></li>
+                        <li><a href="/api/sitemap.xml">''' + load_lang('get_sitemap') + '''</a></li>
+                        <li><a href="/register">''' + load_lang('add_user') + '''</a></li>
+                        <li><a href="/setting">''' + load_lang('setting') + '''</a></li>
+                    </ul>
+                    <h3>2.1. ''' + load_lang('filter') + '''</h3>
+                    <ul class="inside_ul">
+                        <li><a href="/edit_filter">''' + load_lang('edit_filter_list') + '''</a></li>
+                        <li><a href="/inter_wiki">''' + load_lang('interwiki_list') + '''</a></li>
+                        <li><a href="/edit_top">''' + load_lang('edit_tool_list') + '''</a></li>
+                        <li><a href="/image_license">''' + load_lang('image_license_list') + '''</a></li>
+                        <li><a href="/email_filter">''' + load_lang('email_filter_list') + '''</a></li>
+                        <li><a href="/name_filter">''' + load_lang('id_filter_list') + '''</a></li>
+                        <li><a href="/file_filter">''' + load_lang('file_filter_list') + '''</a></li>
+                        <li><a href="/extension_filter">''' + load_lang('extension_filter_list') + '''</a></li>
+                        <li><a href="/filter/document/list">''' + load_lang('document_filter_list') + '''</a></li>
+                    </ul>
+                    <h3>2.2. ''' + load_lang('server') + '''</h2>
+                    <ul class="inside_ul">
+                        <li><a href="/restart">''' + load_lang('wiki_restart') + '''</a></li>
+                        <li><a href="/shutdown">''' + load_lang('wiki_shutdown') + '''</a></li>
+                        <li><a href="/update">''' + load_lang('update') + '''</a></li>
+                    </ul>
+                    <h2>3. ''' + load_lang('version') + '''</h2>
+                    <ul class="inside_ul">
+                        <li id="ver_send_2">''' + load_lang('version') + ''' : </li>
+                        <li id="ver_send">''' + load_lang('lastest') + ''' : </li>
+                    </ul>
+                    <h3>3.1. ''' + load_lang('skin_info') + '''</h3>
+                    <ul class="inside_ul">
+                        <li><a href="/api/skin_info?all=true">''' + load_lang('skin_info') + '''</a></li>
+                        <div id="ver_send_3"></div>
+                    </ul>
+                </div>
+                <!-- JS : opennamu_do_insert_version -->
+                <!-- JS : opennamu_do_insert_version_skin -->
+                <!-- JS : opennamu_do_render_simple -->
+            ''',
+            menu = [['other', load_lang('return')]]
+        ))

route/main_tool_redirect.py

@@ -0,0 +1,61 @@
+from .tool.func import *
+
+def main_tool_redirect(num = 1, add_2 = ''):
+    with get_db_connect() as conn:
+        title_list = {
+            0 : [load_lang('document_name'), 'acl', load_lang('acl')],
+            1 : [0, 'check', load_lang('check')],
+            2 : [load_lang('file_name'), 'file_filter/add', load_lang('file_filter_add')],
+            3 : [0, 'admin', load_lang('authorize')],
+            4 : [0, 'record', load_lang('edit_record')],
+            5 : [0, 'record/topic', load_lang('discussion_record')],
+            6 : [load_lang('name'), 'admin_plus', load_lang('add_admin_group')],
+            7 : [load_lang('name'), 'edit_filter/add', load_lang('edit_filter_add')],
+            8 : [load_lang('document_name'), 'search', load_lang('search')],
+            9 : [0, 'block_log/user', load_lang('blocked_user')],
+            10 : [0, 'block_log/admin', load_lang('blocked_admin')],
+            11 : [load_lang('document_name'), 'watch_list', load_lang('add_watchlist')],
+            12 : [load_lang('compare_target'), 'check', load_lang('compare_target')],
+            13 : [load_lang('document_name'), 'edit', load_lang('load')],
+            14 : [load_lang('document_name'), 'star_doc', load_lang('add_star_doc')],
+            15 : [load_lang('name_or_ip_or_regex'), 'auth/give/ban', load_lang('release')]
+        }
+        
+        if num == 1:
+            return redirect('/manager')
+        elif not num - 1 > len(title_list):
+            num -= 2
+
+            add_1 = flask.request.form.get('name', 'test')
+            if flask.request.method == 'POST':
+                if add_2 != '':
+                    flask.session['edit_load_document'] = add_1
+                    return redirect('/edit_from/' + url_pas(add_2))
+                elif flask.request.form.get('regex', '') != '':
+                    return redirect('/auth/give/ban_regex/' + url_pas(add_1))
+                else:
+                    return redirect('/' + title_list[num][1] + '/' + url_pas(add_1))
+            else:
+                if title_list[num][0] == 0:
+                    placeholder = load_lang('user_name')
+                else:
+                    placeholder = title_list[num][0]
+
+                plus = ''
+                if num == 15:
+                    plus = '<input type="checkbox" name="regex"> ' + load_lang('regex') + '<hr class="main_hr">'
+
+                return easy_minify(flask.render_template(skin_check(),
+                    imp = [title_list[num][2], wiki_set(), wiki_custom(), wiki_css([0, 0])],
+                    data = '''
+                        <form method="post">
+                            <input placeholder="''' + placeholder + '''" name="name" type="text">
+                            <hr class="main_hr">
+                            ''' + plus + '''
+                            <button type="submit">''' + load_lang('go') + '''</button>
+                        </form>
+                    ''',
+                    menu = [['manager', load_lang('return')]]
+                ))
+        else:
+            return redirect()

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev40)",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev41)",
         "c_ver" : "3500113",
         "s_ver" : "3500110"
     }