편집 도구 추가 기능

app.py

@@ -163,7 +163,7 @@ if setup_tool != 0:
     create_data['scan'] = ['user', 'title']
     create_data['acl'] = ['title', 'decu', 'dis', 'view', 'why']
     create_data['inter'] = ['title', 'link']
-    create_data['html_filter'] = ['html', 'kind']
+    create_data['html_filter'] = ['html', 'kind', 'plus']
     create_data['oauth_conn'] = ['provider', 'wiki_id', 'sns_id', 'name', 'picture']
 
     for create_table in create_data['all_data']:
@@ -301,15 +301,15 @@ def alarm_del():
 def alarm():
     return alarm_2(conn)
 
-@app.route('/<regex("inter_wiki|(?:edit|email|file|name)_filter"):tools>')
+@app.route('/<regex("inter_wiki|edit_top|(?:edit|email|file|name)_filter"):tools>')
 def inter_wiki(tools = None):
     return inter_wiki_2(conn, tools)
 
-@app.route('/<regex("del_(?:inter_wiki|(?:edit|email|file|name)_filter)"):tools>/<name>')
+@app.route('/<regex("del_(?:inter_wiki|edit_top|(?:edit|email|file|name)_filter)"):tools>/<name>')
 def inter_wiki_del(tools = None, name = None):
     return inter_wiki_del_2(conn, tools, name)
 
-@app.route('/<regex("plus_(?:inter_wiki|(?:edit|email|file|name)_filter)"):tools>', methods=['POST', 'GET'])
+@app.route('/<regex("plus_(?:inter_wiki|edit_top|(?:edit|email|file|name)_filter)"):tools>', methods=['POST', 'GET'])
 @app.route('/<regex("plus_edit_filter"):tools>/<name>', methods=['POST', 'GET'])
 def inter_wiki_plus(tools = None, name = None):
     return inter_wiki_plus_2(conn, tools, name)

language/en-US.json

@@ -169,6 +169,8 @@
         "closed_discussion" : "Closed discussion",
         "agreed_discussion" : "Agreed discussion",
         "history_delete" : "History delete",
+        "markup" : "Markup",
+        "title" : "Title",
         "_comment_2.1_" : "Filter",
             "_comment_2.1.1_" : "List",
                 "interwiki_list" : "Interwiki(s) list",
@@ -176,12 +178,14 @@
                 "id_filter_list" : "ID filter(s) list",
                 "edit_filter_list" : "Contents filter(s) list",
                 "file_filter_list" : "File name filter(s) list",
+                "edit_tool_list" : "Edit tool(s) list",
             "_comment_2.1.2_" : "Add",
                 "interwiki_add" : "Interwiki add",
                 "edit_filter_add" : "Contents filter add",
                 "id_filter_add" : "ID filter add",
                 "email_filter_add" : "Email filter add",
                 "file_filter_add" : "File name filter add",
+                "edit_tool_add" : "Edit tool add",
         "_comment_2.2_" : "Setting",
             "setting" : "Setting",
             "restart_required" : "Restart required",

language/ko-KR.json

@@ -288,5 +288,9 @@
     "list": "목록",
     "release": "차단 해제",
     "category": "분류",
-    "history_delete": "역사 삭제"
+    "history_delete": "역사 삭제",
+    "markup": "문법",
+    "title": "제목",
+    "edit_tool_list": "편집 도구 목록",
+    "edit_tool_add": "편집 도구 추가"
 }

route/inter_wiki.py

@@ -42,13 +42,20 @@ def inter_wiki_2(conn, tools):
         div = ''
 
         curs.execute("select name from filter")
-    else:
+    elif tools == 'file_filter':
         del_link = 'del_file_filter'
         plus_link = 'plus_file_filter'
         title = load_lang('file_filter_list')
         div = ''
 
         curs.execute("select html from html_filter where kind = 'file'")
+    else:
+        del_link = 'del_edit_top'
+        plus_link = 'plus_edit_top'
+        title = load_lang('edit_tool_list')
+        div = ''
+
+        curs.execute("select html, plus from html_filter where kind = 'edit_top'")
 
     db_data = curs.fetchall()
     if db_data:
@@ -62,6 +69,9 @@ def inter_wiki_2(conn, tools):
             else:
                 div += '<li>' + data[0]
 
+                if tools == 'edit_top':
+                    div += ' : ' + data[1]
+
             if admin == 1:
                 div += ' <a href="/' + del_link + '/' + url_pas(data[0]) + '">(' + load_lang('delete') + ')</a>'
 

route/inter_wiki_del.py

@@ -12,8 +12,10 @@ def inter_wiki_del_2(conn, tools, name):
             curs.execute("delete from html_filter where html = ? and kind = 'name'", [name])
         elif tools == 'del_file_filter':
             curs.execute("delete from html_filter where html = ? and kind = 'file'", [name])
-        else:
+        elif tools == 'del_email_filter':
             curs.execute("delete from html_filter where html = ? and kind = 'email'", [name])
+        else:
+            curs.execute("delete from html_filter where html = ? and kind = 'edit_top'", [name])
         
         conn.commit()
 

route/inter_wiki_plus.py

@@ -28,6 +28,8 @@ def inter_wiki_plus_2(conn, tools, name):
             except:
                 return re_error('/error/23')                
         else:
+            plus_d = ''
+
             if tools == 'plus_name_filter':
                 try:
                     re.compile(flask.request.form.get('title', 'test'))
@@ -46,12 +48,17 @@ def inter_wiki_plus_2(conn, tools, name):
                 admin_check(None, 'file_filter edit')
                 
                 type_d = 'file'
-            else:
+            elif tools == 'plus_email_filter':
                 admin_check(None, 'email_filter edit')
                 
                 type_d = 'email'
+            else:
+                admin_check(None, 'edit_top edit')
+                
+                type_d = 'edit_top'
+                plus_d = flask.request.form.get('markup', 'test')
             
-            curs.execute('insert into html_filter (html, kind) values (?, ?)', [flask.request.form.get('title', 'test'), type_d])
+            curs.execute('insert into html_filter (html, kind, plus) values (?, ?, ?)', [flask.request.form.get('title', 'test'), type_d, plus_d])
         
         conn.commit()
     
@@ -112,10 +119,16 @@ def inter_wiki_plus_2(conn, tools, name):
         elif tools == 'plus_file_filter':
             title = load_lang('file_filter_add')
             form_data = '<input placeholder="' + load_lang('regex') + '" type="text" name="title">'
-        else:
+        elif tools == 'plus_email_filter':
             title = load_lang('email_filter_add')
-            form_data = '<input placeholder="email" type="text" name="title">'
-
+            form_data = '<input placeholder="' + load_lang('email') + '" type="text" name="title">'
+        else:
+            title = load_lang('edit_tool_add')
+            form_data = '''
+                <input placeholder="''' + load_lang('title') + '''" type="text" name="title">
+                <hr class=\"main_hr\">
+                <input placeholder="''' + load_lang('markup') + '''" type="text" name="markup">
+            '''
 
         return easy_minify(flask.render_template(skin_check(), 
             imp = [title, wiki_set(), custom(), other2([0, 0])],

route/list_admin_use.py

@@ -35,6 +35,7 @@ def list_admin_use_2(conn):
                 <form method="post">
                     <input name="search" id="admin_log_search"> <button type="submit">''' + load_lang('search') + '''</button>
                 </form>
+                <hr class=\"main_hr\">
             ''' + list_data,
             menu = [['other', load_lang('return')]]
         ))

route/main_manager.py

@@ -42,6 +42,7 @@ def main_manager_2(conn, num, r_ver):
                     <h3>''' + load_lang('filter') + '''</h3>
                     <ul>
                         <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="/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>

route/tool/func.py

@@ -325,6 +325,11 @@ def edit_button():
         ["{{{+number data}}}", load_lang('edit_button_big')],
         ["== name ==", load_lang('edit_button_paragraph')]
     ]
+    
+    curs.execute("select html, plus from html_filter where kind = 'edit_top'")
+    db_data = curs.fetchall()
+    for get_data in db_data:
+        insert_list += [[get_data[1], get_data[0]]]
 
     data = ''
     for insert_data in insert_list:

version.json

@@ -1,7 +1,7 @@
 {
     "master" : {
-        "r_ver" : "v3.1.2-master-23",
-        "c_ver" : "400002",
+        "r_ver" : "v3.1.2-master-24",
+        "c_ver" : "400003",
         "s_ver" : "2"
     }, "stable" : {
         "r_ver" : "v3.1.1-stable-04",