fix alarm bug

route/edit.py

@@ -63,7 +63,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
     
             curs.execute(db_change("select user from scan where title = ? and type = ''"), [name])
             for scan_user in curs.fetchall():
-                add_alarm(scan_user[0], ip + ' | <a href="/w/' + url_pas(name) + '">' + name + '</a> | Edit')
+                add_alarm(scan_user[0], ip + ' | <a href="/w/' + url_pas(name) + '">' + html.escape(name) + '</a> | Edit')
                     
             history_plus(
                 name,

route/tool/func.py

@@ -601,6 +601,9 @@ def update(ver_num, set_data):
             for for_b in db_table_list[for_a]:
                 curs.execute(db_change("update " + for_a + " set " + for_b + " = '' where " + for_b + " is null"))
 
+    if ver_num < 3500114:
+        curs.execute(db_change('delete from alarm'))
+
     conn.commit()
     
     # 아이피 상태인 이메일 제거 예정

route/topic.py

@@ -77,7 +77,7 @@ def topic(topic_num = 0):
                         y_check = 1
 
                 if y_check == 1:
-                    add_alarm(match, ip + ' | <a href="/thread/' + topic_num + '#' + num + '">' + name + ' | ' + sub + ' | #' + num + '</a>')
+                    add_alarm(match, ip + ' | <a href="/thread/' + topic_num + '#' + num + '">' + html.escape(name) + ' | ' + html.escape(sub) + ' | #' + num + '</a>')
 
             cate_re = re.compile(r'\[\[((?:분류|category):(?:(?:(?!\]\]).)*))\]\]', re.I)
             data = cate_re.sub('[br]', flask.request.form.get('content', 'Test').replace('\r', ''))
@@ -96,7 +96,7 @@ def topic(topic_num = 0):
                     curs.execute(db_change("select ip from topic where code = ? and id = ?"), [topic_num, rd_data[1]])
                     ip_data = curs.fetchall()
                     if ip_data and ip_or_user(ip_data[0][0]) == 0 and ip != ip_data[0][0]:
-                        add_alarm(ip_data[0][0], ip + ' | <a href="/thread/' + topic_num + '#' + num + '">' + name + ' | ' + sub + ' | #' + num + '</a>')
+                        add_alarm(ip_data[0][0], ip + ' | <a href="/thread/' + topic_num + '#' + num + '">' + html.escape(name) + ' | ' + html.escape(sub) + ' | #' + num + '</a>')
 
                     data = re.sub(call_thread_regex, rd_data[0] + '<topic_a>#' + rd_data[1] + '</topic_a>' + rd_data[2], data, 1)
 
@@ -120,7 +120,7 @@ def topic(topic_num = 0):
                         ip_data = curs.fetchall()
 
                     if ip_data and ip_or_user(ip_data[0][0]) == 0 and ip != ip_data[0][0]:
-                        add_alarm(ip_data[0][0], ip + ' | <a href="/thread/' + topic_num + '#' + num + '">' + name + ' | ' + sub + ' | #' + num + '</a>')
+                        add_alarm(ip_data[0][0], ip + ' | <a href="/thread/' + topic_num + '#' + num + '">' + html.escape(name) + ' | ' + html.escape(sub) + ' | #' + num + '</a>')
 
                     data = re.sub(call_user_regex, rd_data[0] + '<topic_call>@' + rd_data[1] + '</topic_call>' + rd_data[2], data, 1)
 

route/user_alarm.py

@@ -19,12 +19,7 @@ def user_alarm():
             ''
     
             for data_one in data_list:
-                data += '' + \
-                    '<li>' + \
-                        '<span class="opennamu_js_send_content">' + html.escape(data_one[0]) + '</span> ' + \
-                        '(' + data_one[1] + ')' + \
-                    '</li>' + \
-                ''
+                data += '<li>' + data_one[0] + ' (' + data_one[1] + ')</li>'
     
         data += '' + \
             '</ul>' + \

version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev51)",
-        "c_ver" : "3500113",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev52)",
+        "c_ver" : "3500114",
         "s_ver" : "3500110"
     }
 }