Jelajahi Sumber

드디어 이 한 맺힌 패치를 끝냈군

Surplus_Up (2DU) 7 tahun lalu
induk
melakukan
7d9ad6cb9f
4 mengubah file dengan 22 tambahan dan 16 penghapusan
  1. 19 15
      app.py
  2. 1 1
      func.py
  3. 1 0
      language/en-US.json
  4. 1 0
      language/ko-KR.json

+ 19 - 15
app.py

@@ -1528,10 +1528,10 @@ def set_edit_filter(name = None):
         if admin_check(1, 'edit_filter edit') != 1:
             return re_error('/error/3')
 
-        if flask.request.form.get('ban', None):
+        if flask.request.form.get('limitless', '') != '':
             end = 'X'
         else:
-            end = ''
+            end = flask.request.form.get('second', 'X')
 
         curs.execute("select name from filter where name = ?", [name])
         if curs.fetchall():
@@ -1549,11 +1549,14 @@ def set_edit_filter(name = None):
             textarea = exist[0][0]
             
             if exist[0][1] == 'X':
-                time_data = 'checked="checked"'
-            else:
+                time_check = 'checked="checked"'
                 time_data = ''
+            else:
+                time_check = ''
+                time_data = exist[0][1]
         else:
             textarea = ''
+            time_check = ''
             time_data = ''
 
         if admin_check(1, None) != 1:
@@ -1565,10 +1568,11 @@ def set_edit_filter(name = None):
             imp = [name, wiki_set(), custom(), other2([' (' + load_lang('edit') + ' ' + load_lang('filter') + ')', 0])],
             data =  '''
                     <form method="post">
-                        <input ''' + stat + ''' placeholder="Regex" name="content" value="''' + html.escape(textarea) + '''" type="text">
+                        <input placeholder="''' + load_lang('second') + '''" name="second" type="text" value="''' + html.escape(time_data) + '''">
+                        <hr>
+                        <input ''' + stat + ''' type="checkbox" ''' + time_check + ''' name="limitless"> ''' + load_lang('limitless') + '''
                         <hr>
-                        <input ''' + stat + ''' type="checkbox" ''' + time_data + ''' name="ban">
-                        ''' + load_lang('ban') + '''
+                        <input ''' + stat + ''' placeholder="''' + load_lang('regex') + '''" name="content" value="''' + html.escape(textarea) + '''" type="text">
                         <hr>
                         <button ''' + stat + ''' id="save" type="submit">''' + load_lang('save') + '''</button>
                     </form>
@@ -1588,14 +1592,14 @@ def edit(name = None):
             for data_list in curs.fetchall():
                 match = re.compile(data_list[0])
                 if match.search(flask.request.form.get('content', None)):
-                    if data_list[1] == 'X':
-                        ban_insert(
-                            ip, 
-                            '', 
-                            load_lang('edit', 1) + ' ' + load_lang('filter', 1), 
-                            None, 
-                            load_lang('tool', 1) + ':' + load_lang('edit', 1) + ' ' + load_lang('filter', 1)
-                        )
+                    print(data_list[1])
+                    ban_insert(
+                        ip, 
+                        '0' if data_list[1] == 'X' else data_list[1], 
+                        load_lang('edit', 1) + ' ' + load_lang('filter', 1), 
+                        None, 
+                        load_lang('tool', 1) + ':' + load_lang('edit', 1) + ' ' + load_lang('filter', 1)
+                    )
                     
                     return re_error('/error/21')
 

+ 1 - 1
func.py

@@ -614,7 +614,7 @@ def re_error(data):
                         curs.execute("delete from ban where block = ?", [ip])
                         conn.commit()
 
-                        end += 'Re Try.'
+                        end += '<script>location.reload();</script>'
                     else:
                         end += load_lang('why') + ' : ' + end_data[0][0]
                 else:

+ 1 - 0
language/en-US.json

@@ -4,6 +4,7 @@
     "history" : "History",
     "delete" : "Delete",
     "logo" : "Logo",
+    "regex" : "Regex",
     "frontpage" : "Front page",
     "max_file_size" : "Max file size",
     "back_up_interval" : "Backup interval",

+ 1 - 0
language/ko-KR.json

@@ -5,6 +5,7 @@
     "easy": "간단",
     "skin": "스킨",
     "delete": "삭제",
+    "regex" : "정규표현식",
     "server": "서버",
     "filter": "필터",
     "move": "이동",