fix edit

route/edit.py

@@ -33,7 +33,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
                 return re_error('/error/24')
     
             today = get_time()
-            content = flask.request.form.get('content', '').replace('\r\n', '\n')
+            content = flask.request.form.get('content', '').replace('\r', '')
             send = flask.request.form.get('send', '')
             agree = flask.request.form.get('copyright_agreement', '')
             
@@ -47,9 +47,9 @@ def edit(name = 'Test', section = 0, do_type = ''):
                 return re_error('/error/29')
             
             curs.execute(db_change("select data from data where title = ?"), [name])
-            old = curs.fetchall()
-            if old:
-                o_data = old[0][0].replace('\r\n', '\n')
+            db_data = curs.fetchall()
+            if db_data:
+                o_data = db_data[0][0].replace('\r', '')
 
                 if section != '':
                     if flask.request.form.get('doc_section_edit_apply', 'X') != 'X':
@@ -71,11 +71,18 @@ def edit(name = 'Test', section = 0, do_type = ''):
                                     pass
     
                 leng = leng_check(len(o_data), len(content))
-                
-                curs.execute(db_change("update data set data = ? where title = ?"), [content, name])
             else:
                 leng = '+' + str(len(content))
-    
+
+            render_set(
+                doc_name = name,
+                doc_data = content,
+                data_in = ''
+            )
+                
+            if db_data:
+                curs.execute(db_change("update data set data = ? where title = ?"), [content, name])
+            else:    
                 curs.execute(db_change("insert into data (title, data) values (?, ?)"), [name, content])
     
                 curs.execute(db_change('select data from other where name = "count_all_title"'))
@@ -134,7 +141,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
                 curs.execute(db_change("select data from data where title = ?"), [load_title])
                 db_data = curs.fetchall()
                 data = db_data[0][0] if db_data else ''
-                data = data.replace('\r\n', '\n')
+                data = data.replace('\r', '')
 
                 if section != '':
                     curs.execute(db_change('select data from other where name = "markup"'))
@@ -177,7 +184,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
                             count += 1
             else:
                 data = flask.request.form.get('content', '')
-                data = data.replace('\r\n', '\n')
+                data = data.replace('\r', '')
                 
                 data_section_where = flask.request.form.get('doc_section_data_where', '')
                 doc_section_edit_apply = flask.request.form.get('doc_section_edit_apply', '')

route/edit_delete_multiple.py

@@ -19,7 +19,7 @@ def edit_delete_multiple():
             if do_edit_text_bottom_check_box_check(agree) == 1:
                 return re_error('/error/29')
             
-            all_title = re.findall(r'([^\n]+)\n', flask.request.form.get('content', '').replace('\r\n', '\n') + '\n')
+            all_title = re.findall(r'([^\n]+)\n', flask.request.form.get('content', '').replace('\r', '') + '\n')
             for name in all_title:
                 edit_delete.edit_delete(name)
 

route/give_user_ban.py

@@ -22,7 +22,7 @@ def give_user_ban(name = None, ban_type = ''):
             why = flask.request.form.get('why', '')
 
             if ban_type == 'multiple':
-                all_user = re.findall(r'([^\n]+)\n', flask.request.form.get('name', 'test').replace('\r\n', '\n') + '\n')
+                all_user = re.findall(r'([^\n]+)\n', flask.request.form.get('name', 'test').replace('\r', '') + '\n')
             else:
                 if name:
                     all_user = [name]

route/recent_history_add.py

@@ -40,7 +40,7 @@ def recent_history_add(name = 'Test', do_type = ''):
             data_preview = ''
             if do_type == 'preview':
                 data = flask.request.form.get('content', '')
-                data = data.replace('\r\n', '\n')
+                data = data.replace('\r', '')
 
                 send = flask.request.form.get('send', '')
                 get_ip = flask.request.form.get('get_ip', '')

route/vote_end.py

@@ -28,7 +28,7 @@ def vote_end(num = 1):
         data += '<b>' + data_list[0][1] + '</b><hr class="main_hr">' if data_list[0][1] != '' else ''
         data += '<span>~ ' + time_limit + '</span><hr class="main_hr">' if time_limit != '' else ''
 
-        vote_data = re.findall(r'([^\n]+)', data_list[0][2].replace('\r\n', '\n'))
+        vote_data = re.findall(r'([^\n]+)', data_list[0][2].replace('\r', ''))
         for i in range(0, len(vote_data)):
             data += '<h2>' + vote_data[i] + '</h2>'
             data += '<ul class="opennamu_ul">'

route/vote_select.py

@@ -33,7 +33,7 @@ def vote_select(num = 1):
             if time_today > time_db:
                 return redirect('/vote/end/' + num)
 
-        vote_data = re.findall(r'([^\n]+)', data_list[0][2].replace('\r\n', '\n'))
+        vote_data = re.findall(r'([^\n]+)', data_list[0][2].replace('\r', ''))
 
         if flask.request.method == 'POST':
             try: