Merge pull request #619 from 2du/master

dd

route/edit.py

@@ -12,9 +12,6 @@ def edit_2(conn, name):
             return re_error('/error/13')
         else:
             captcha_post('', 0)
-            
-        if len(flask.request.form.get('send', None)) > 500:
-            return re_error('/error/15')
 
         if flask.request.form.get('otent', None) == flask.request.form.get('content', None):
             return redirect('/w/' + url_pas(name))

route/tool/func.py

@@ -832,8 +832,30 @@ def rd_plus(title, sub, date):
 def history_plus(title, data, date, ip, send, leng):
     curs.execute("select id from history where title = ? order by id + 0 desc limit 1", [title])
     id_data = curs.fetchall()
+
+    get_type = re.search('(\((?:(?:(?!\)).)+)\))$', send)
+    send = re.sub('(\((?:(?:(?!\)).)+)\))$', '', send)
+
+    send = re.sub('\(|\)|<|>', '', send)
+
+    if len(send) > 128:
+        send = send[:128]
+
+    if get_type:
+        if send == '':
+            send = get_type.groups()[0]
+        else:
+            send += ' ' + get_type.groups()[0]
     
-    curs.execute("insert into history (id, title, data, date, ip, send, leng, hide) values (?, ?, ?, ?, ?, ?, ?, '')", [str(int(id_data[0][0]) + 1) if id_data else '1', title, data, date, ip, send, leng])
+    curs.execute("insert into history (id, title, data, date, ip, send, leng, hide) values (?, ?, ?, ?, ?, ?, ?, '')", [
+        str(int(id_data[0][0]) + 1) if id_data else '1',
+        title,
+        data,
+        date,
+        ip,
+        send,
+        leng
+    ])
 
 def leng_check(first, second):
     if first < second: