차단 해제 메뉴 추가

language/en-US.json

@@ -117,7 +117,7 @@
         "_comment_1.3_" : "Ban",
             "ban" : "Block",
             "blocked" : "Blocked",
-            "release" : "Release",
+            "release" : "Unblock",
     "_comment_2_" : "Func",
         "wiki_restart" : "Restart wiki engine",
         "update" : "Update",
@@ -139,7 +139,6 @@
         "indexing" : "Database Indexing",
         "hide_release" : "Unhide",
         "pinned_release" : "Unpinned",
-        "ban_release" : "Unblock",
         "discussion_tool" : "Discussion tools",
         "discussion_raw" : "Discussion raw",
         "oauth_signin_facebook" : "Sign-in with Facebook",

language/ko-KR.json

@@ -26,7 +26,6 @@
     "close": "닫기",
     "closed": "닫힘",
     "start": "시작",
-    "ban_release": "차단 해제",
     "encryption_method": "비밀번호 암호화 방식",
     "why": "사유",
     "user_check_authority": "사용자 검사 권한",

route/main_manager.py

@@ -18,7 +18,8 @@ def main_manager_2(conn, num, r_ver):
         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')]
+        14 : [load_lang('document_name'), 'star_doc', load_lang('add_star_doc')],
+        15 : [load_lang('name_or_ip_or_regex'), 'ban', load_lang('release')]
     }
 
     if num == 1:
@@ -30,6 +31,7 @@ def main_manager_2(conn, num, r_ver):
                     <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="/ban">''' + load_lang('ban') + '''</a></li>
+                    <li><a href="/manager/17">''' + load_lang('release') + '''</a></li>
                     <li><a href="/manager/5">''' + load_lang('authorize') + '''</a></li>
                 </ul>
                 <br>
@@ -72,21 +74,30 @@ def main_manager_2(conn, num, r_ver):
     elif not num - 1 > len(title_list):
         if flask.request.method == 'POST':
             if flask.request.args.get('plus', None):
-                return redirect('/' + title_list[(num - 2)][1] + '/' + url_pas(flask.request.args.get('plus', None)) + '?plus=' + flask.request.form.get('name', None))
+                return redirect(
+                    '/' + title_list[(num - 2)][1] + '/' + url_pas(flask.request.args.get('plus', 'test')) + '?plus=' + flask.request.form.get('name', 'test')
+                )
+            elif flask.request.form.get('regex', None):
+                return redirect('/' + title_list[(num - 2)][1] + '/' + url_pas(flask.request.form.get('name', 'test')) + '?type=regex')
             else:
-                return redirect('/' + title_list[(num - 2)][1] + '/' + url_pas(flask.request.form.get('name', None)))
+                return redirect('/' + title_list[(num - 2)][1] + '/' + url_pas(flask.request.form.get('name', 'test')))
         else:
             if title_list[(num - 2)][0] == 0:
                 placeholder = load_lang('user_name')
             else:
                 placeholder = title_list[(num - 2)][0]
 
+            plus = ''
+            if num - 2 == 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)][2], wiki_set(), custom(), other2([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>
                 ''',

route/topic_admin.py

@@ -39,7 +39,7 @@ def topic_admin_2(conn, topic_num, num):
             <ul>
                 <li>
                     <a href="/ban/''' + url_pas(data[0][1]) + '''">
-                        ''' + (load_lang('ban_release') if user_ban_d else load_lang('ban')) + '''
+                        ''' + (load_lang('release') if user_ban_d else load_lang('ban')) + '''
                     </a>
                 </li>
                 <li>

route/user_tool.py

@@ -14,7 +14,7 @@ def user_tool_2(conn, name):
     if admin_check(1) == 1:
         curs.execute(db_change("select block from rb where block = ? and ongoing = '1'"), [name])
         if curs.fetchall():
-            ban_name = load_lang('ban_release')
+            ban_name = load_lang('release')
         else:
             ban_name = load_lang('ban')
 

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.9-master-42",
+        "r_ver" : "v3.1.9-master-43",
         "c_ver" : "3193200",
         "s_ver" : "9"
     }, "stable" : {