목록 개선, 알림 개선

app.py

@@ -336,7 +336,7 @@ def inter_wiki_del(tools = None, name = None):
     return inter_wiki_del_2(conn, tools, name)
 
 @app.route('/<regex("plus_(?:inter_wiki|edit_top|image_license|(?:edit|email|file|name)_filter)"):tools>', methods=['POST', 'GET'])
-@app.route('/<regex("plus_edit_filter"):tools>/<name>', methods=['POST', 'GET'])
+@app.route('/<regex("plus_(?:inter_wiki|edit_top|image_license|(?:edit|email|file|name|edit)_filter)"):tools>/<name>', methods=['POST', 'GET'])
 def inter_wiki_plus(tools = None, name = None):
     return inter_wiki_plus_2(conn, tools, name)
 

route/alarm.py

@@ -3,9 +3,15 @@ from .tool.func import *
 def alarm_2(conn):
     curs = conn.cursor()
 
+    num = int(number_check(flask.request.args.get('num', '1')))
+    if num * 50 > 0:
+        sql_num = num * 50 - 50
+    else:
+        sql_num = 0
+
     data = '<ul>'    
     
-    curs.execute(db_change("select data, date from alarm where name = ? order by date desc"), [ip_check()])
+    curs.execute(db_change("select data, date from alarm where name = ? order by date desc limit ?, 50"), [ip_check(), sql_num])
     data_list = curs.fetchall()
     if data_list:
         data = '<a href="/del_alarm">(' + load_lang('delete') + ')</a><hr class=\"main_hr\">' + data
@@ -13,7 +19,7 @@ def alarm_2(conn):
         for data_one in data_list:
             data += '<li>' + data_one[0] + ' (' + data_one[1] + ')</li>'
     
-    data += '</ul>'
+    data += '</ul>' + next_fix('/alarm?num=', num, data_list)
 
     return easy_minify(flask.render_template(skin_check(), 
         imp = [load_lang('notice'), wiki_set(), custom(), other2([0, 0])],

route/inter_wiki.py

@@ -87,6 +87,7 @@ def inter_wiki_2(conn, tools):
                     div += ' : ' + data[1]
 
             if admin == 1:
+                div += ' <a href="/' + plus_link + '/' + url_pas(data[0]) + '">(' + load_lang('edit') + ')</a>'
                 div += ' <a href="/' + del_link + '/' + url_pas(data[0]) + '">(' + load_lang('delete') + ')</a>'
 
             div += '</li>'
@@ -102,5 +103,5 @@ def inter_wiki_2(conn, tools):
     return easy_minify(flask.render_template(skin_check(), 
         imp = [title, wiki_set(), custom(), other2([0, 0])],
         data = div,
-        menu = [['other', load_lang('return')]]
+        menu = [['manager/1', load_lang('return')]]
     ))

route/inter_wiki_plus.py

@@ -5,10 +5,13 @@ def inter_wiki_plus_2(conn, tools, name):
     
     if flask.request.method == 'POST':
         if tools == 'plus_inter_wiki':
+            if name:
+                curs.execute(db_change("delete from inter where title = ?"), [name])
+                
             curs.execute(db_change('insert into inter (title, link, icon) values (?, ?, ?)'), [
-                flask.request.form.get('title', None), 
-                flask.request.form.get('link', None),
-                flask.request.form.get('icon', None)
+                flask.request.form.get('title', 'test'), 
+                flask.request.form.get('link', 'test'),
+                flask.request.form.get('icon', '')
             ])
             
             admin_check(None, 'inter_wiki_plus')
@@ -24,11 +27,12 @@ def inter_wiki_plus_2(conn, tools, name):
             try:
                 re.compile(flask.request.form.get('content', 'test'))
 
-                curs.execute(db_change("select name from filter where name = ?"), [name])
-                if curs.fetchall():
-                    curs.execute(db_change("update filter set regex = ?, sub = ? where name = ?"), [flask.request.form.get('content', 'test'), end, name])
-                else:
-                    curs.execute(db_change("insert into filter (name, regex, sub) values (?, ?, ?)"), [name, flask.request.form.get('content', 'test'), end])
+                curs.execute(db_change("delete from filter where name = ?"), [name])
+                curs.execute(db_change("insert into filter (name, regex, sub) values (?, ?, ?)"), [
+                    name, 
+                    flask.request.form.get('content', 'test'), 
+                    end
+                ])
             except:
                 return re_error('/error/23')                
         else:
@@ -66,7 +70,17 @@ def inter_wiki_plus_2(conn, tools, name):
                 type_d = 'edit_top'
                 plus_d = flask.request.form.get('markup', 'test')
             
-            curs.execute(db_change('insert into html_filter (html, kind, plus) values (?, ?, ?)'), [flask.request.form.get('title', 'test'), type_d, plus_d])
+            if name:
+                curs.execute(db_change("delete from html_filter where html = ? and kind = ?"), [
+                    name,
+                    type_d
+                ])
+
+            curs.execute(db_change('insert into html_filter (html, kind, plus) values (?, ?, ?)'), [
+                flask.request.form.get('title', 'test'), 
+                type_d, 
+                plus_d
+            ])
         
         conn.commit()
     
@@ -78,13 +92,29 @@ def inter_wiki_plus_2(conn, tools, name):
             stat = ''
 
         if tools == 'plus_inter_wiki':
+            if name:
+                curs.execute(db_change("select title, link, icon from inter where title = ?"), [name])
+                exist = curs.fetchall()
+                if exist:
+                    value = exist[0]
+                else:
+                    value = ['', '', '']
+            else:
+                value = ['', '', '']
+
             title = load_lang('interwiki_add')
             form_data = '''
-                <input placeholder="''' + load_lang('name') + '''" type="text" name="title">
+                ''' + load_lang('name') + '''
+                <hr class=\"main_hr\">
+                <input value="''' + value[0] + '''" type="text" name="title">
                 <hr class=\"main_hr\">
-                <input placeholder="''' + load_lang('link') + '''" type="text" name="link">
+                ''' + load_lang('link') + '''
                 <hr class=\"main_hr\">
-                <input placeholder="''' + load_lang('icon') + ''' (HTML)" type="text" name="icon">
+                <input value="''' + value[1] + '''" type="text" name="link">
+                <hr class=\"main_hr\">
+                ''' + load_lang('icon') + ''' (HTML)
+                <hr class=\"main_hr\">
+                <input value="''' + value[2] + '''" type="text" name="icon">
             '''
         elif tools == 'plus_edit_filter':
             curs.execute(db_change("select regex, sub from filter where name = ?"), [name])
@@ -125,22 +155,52 @@ def inter_wiki_plus_2(conn, tools, name):
             '''
         elif tools == 'plus_name_filter':
             title = load_lang('id_filter_add')
-            form_data = '<input placeholder="' + load_lang('regex') + '" type="text" name="title">'
+            form_data = '' + \
+                load_lang('regex') + \
+                '<hr class=\"main_hr\">' + \
+                '<input value="' + (name if name else '') + '" type="text" name="title">' + \
+            ''
         elif tools == 'plus_file_filter':
             title = load_lang('file_filter_add')
-            form_data = '<input placeholder="' + load_lang('regex') + '" type="text" name="title">'
+            form_data = '' + \
+                load_lang('regex') + \
+                '<hr class=\"main_hr\">' + \
+                '<input value="' + (name if name else '') + '" type="text" name="title">' + \
+            ''
         elif tools == 'plus_email_filter':
             title = load_lang('email_filter_add')
-            form_data = '<input placeholder="' + load_lang('email') + '" type="text" name="title">'
+            form_data = '' + \
+                load_lang('email') + \
+                '<hr class=\"main_hr\">' + \
+                '<input value="' + (name if name else '') + '" type="text" name="title">' + \
+            ''
         elif tools == 'plus_image_license':
             title = load_lang('image_license_add')
-            form_data = '<input placeholder="' + load_lang('license') + '" type="text" name="title">'
+            form_data = '' + \
+                load_lang('license') + \
+                '<hr class=\"main_hr\">' + \
+                '<input value="' + (name if name else '') + '" type="text" name="title">' + \
+            ''
         else:
             title = load_lang('edit_tool_add')
+            if name:
+                curs.execute(db_change("select plus from html_filter where html = ? and kind = 'edit_top'"), [name])
+                exist = curs.fetchall()
+                if exist:
+                    value = exist[0][0]
+                else:
+                    value = ''
+            else:
+                value = ''
+
             form_data = '''
-                <input placeholder="''' + load_lang('title') + '''" type="text" name="title">
+                ''' + load_lang('title') + '''
+                <hr class=\"main_hr\">
+                <input value="''' + (name if name else '') + '''" type="text" name="title">
+                <hr class=\"main_hr\">
+                ''' + load_lang('markup') + '''
                 <hr class=\"main_hr\">
-                <input placeholder="''' + load_lang('markup') + '''" type="text" name="markup">
+                <input value="''' + value + '''" type="text" name="markup">
             '''
 
         return easy_minify(flask.render_template(skin_check(), 

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.5-master-40",
+        "r_ver" : "v3.1.5-master-41",
         "c_ver" : "400007",
         "s_ver" : "7"
     }, "stable" : {