Merge pull request #1072 from 2du/dev

Dev

app.py

@@ -118,10 +118,10 @@ if set_data['db_type'] == 'mysql':
     curs = conn.cursor()
 
     try:
-        curs.execute(db_change('create database ? default character set utf8mb4;'), set_data['db'])
+        curs.execute(db_change('create database ' + set_data['db'] + ' default character set utf8mb4;'))
     except:
         pass
-
+    
     conn.select_db(set_data['db'])
 else:
     conn = sqlite3.connect(set_data['db'] + '.db')
@@ -158,7 +158,7 @@ for i in create_data:
         try:
             curs.execute(db_change('create table ' + i + '(test longtext)'))
         except:
-            curs.execute(db_change("alter table " + i + " add test longtext default ''"))
+            curs.execute(db_change("alter table " + i + " add test longtext"))
 
 setup_tool = 0
 try:
@@ -178,7 +178,10 @@ if setup_tool != 0:
             try:
                 curs.execute(db_change('select ' + create + ' from ' + create_table + ' limit 1'))
             except:
-                curs.execute(db_change("alter table " + create_table + " add " + create + " longtext default ''"))
+                try:
+                    curs.execute(db_change("alter table " + create_table + " add " + create + " longtext default ''"))
+                except:
+                    curs.execute(db_change("alter table " + create_table + " add " + create + " longtext"))
 
     if setup_tool == 1:
         update(int(ver_set_data[0][0]), set_data)
@@ -536,6 +539,10 @@ def login_pw_change():
 @app.route('/check/<name>')
 def give_user_check(name = None):
     return give_user_check_2(conn, name)
+    
+@app.route('/check_delete', methods=['POST', 'GET'])
+def give_user_check_delete():
+    return give_user_check_delete_2(conn)
 
 @app.route('/register', methods=['POST', 'GET'])
 def login_register():

route/edit_delete.py

@@ -7,6 +7,10 @@ def edit_delete_2(conn, name, app_var):
     if acl_check(name) == 1:
         return re_error('/ban')
 
+    curs.execute(db_change("select title from data where title = ?"), [name])
+    if not curs.fetchall():
+        return redirect('/w/' + url_pas(name))
+
     if flask.request.method == 'POST':
         if captcha_post(flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
             return re_error('/error/13')
@@ -56,20 +60,16 @@ def edit_delete_2(conn, name, app_var):
 
         return redirect('/w/' + url_pas(name))
     else:
-        curs.execute(db_change("select title from data where title = ?"), [name])
-        if not curs.fetchall():
-            return redirect('/w/' + url_pas(name))
-
         return easy_minify(flask.render_template(skin_check(),
             imp = [name, wiki_set(), custom(), other2(['(' + load_lang('delete') + ')', 0])],
             data = '''
                 <form method="post">
                     ''' + ip_warring() + '''
                     <input placeholder="''' + load_lang('why') + '''" name="send" type="text">
-                    <hr class=\"main_hr\">
+                    <hr class="main_hr">
                     ''' + captcha_get() + '''
                     <button type="submit">''' + load_lang('delete') + '''</button>
                 </form>
             ''',
             menu = [['w/' + url_pas(name), load_lang('return')]]
-        ))     
+        ))

route/give_user_check.py

@@ -117,7 +117,16 @@ def give_user_check_2(conn, name):
 
                 div += '''
                     <tr>
-                        <td><a href="/check/''' + url_pas(data[0]) + '''">''' + data[0] + '''</a></td>
+                        <td>
+                            <a href="/check/''' + url_pas(data[0]) + '''">''' + data[0] + '''</a>
+                            <a  href="/check_delete''' + \
+                                '''?name=''' + url_pas(data[0]) + \
+                                '''&ip=''' + url_pas(data[1]) + \
+                                '''&time=''' + url_pas(data[3].replace(' ', '').replace(':', '').replace('-', '')) + \
+                                '''&return_type=''' + ('0' if ip_or_user(name) == 0 else '1') + '''">
+                                (''' + load_lang('delete') + ''')
+                            </a>
+                        </td>
                         <td><a href="/check/''' + url_pas(data[1]) + '''">''' + data[1] + '''</a></td>
                         <td>''' + data[3] + '''</td>
                     </tr>
@@ -130,9 +139,7 @@ def give_user_check_2(conn, name):
                     </tbody>
                 </table>
             '''
-        else:
-            return re_error('/error/2')
-
+            
         div += next_fix(
             '/check/' + url_pas(name) + ('?plus=' + plus_id + '&num=' if plus_id else '?num='), 
             num, 

route/give_user_check_delete.py

@@ -0,0 +1,46 @@
+from .tool.func import *
+
+def give_user_check_delete_2(conn):
+    curs = conn.cursor()
+    
+    if admin_check() != 1:
+        return re_error('/error/4')
+
+    user_id = flask.request.args.get('name', None)
+    user_ip = flask.request.args.get('ip', None)
+    
+    time = flask.request.args.get('time', None)
+    time_set = re.search(r'([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', time)
+    if not time_set:
+        return redirect()
+    
+    time_set = time_set.groups()
+    time = time_set[0] + '-' + time_set[1] + '-' + time_set[2] + ' '
+    time += time_set[3] + ':' + time_set[4] + ':' + time_set[5]
+    
+    return_type = flask.request.args.get('return_type', '1')
+        
+    if user_id and user_ip and time:
+        if flask.request.method == 'POST':
+            curs.execute(db_change("delete from ua_d where name = ? and ip = ? and today = ?"), [user_id, user_ip, time])
+            conn.commit()
+            
+            return redirect('/check/' + url_pas(user_id if return_type == '0' else user_ip))
+        else:
+            return easy_minify(flask.render_template(skin_check(),
+                imp = [load_lang('check'), wiki_set(), custom(), other2(['(' + load_lang('delete') + ')', 0])],
+                data = '''
+                    ''' + load_lang('name') + ''' : ''' + user_id + '''
+                    <hr class="main_hr">
+                    ''' + load_lang('ip') + ''' : ''' + user_ip + '''
+                    <hr class="main_hr">
+                    ''' + load_lang('time') + ''' : ''' + time + '''
+                    <hr class="main_hr">
+                    <form method="post">
+                        <button type="submit">''' + load_lang('delete') + '''</button>
+                    </form>
+                ''',
+                menu = [['check/' + url_pas(user_id if return_type == '0' else user_ip), load_lang('return')]]
+            ))
+    else:
+        return redirect()

route/tool/func.py

@@ -578,7 +578,7 @@ def next_fix(link, num, page, end = 50):
 
 def other2(data):
     global req_list
-    main_css_ver = '60'
+    main_css_ver = '61'
     data += ['' for _ in range(0, 3 - len(data))]
 
     if req_list == '':

route/view_diff_data.py

@@ -15,50 +15,44 @@ def view_diff_data_2(conn, name):
 
     curs.execute(db_change("select data from history where id = ? and title = ?"), [first, name])
     first_raw_data = curs.fetchall()
-    if first_raw_data:
+        
+    curs.execute(db_change("select data from history where id = ? and title = ?"), [second, name])
+    second_raw_data = curs.fetchall()
+    if first_raw_data and second_raw_data:
         first_raw_data = first_raw_data[0][0].replace('\r', '')
-
-        curs.execute(db_change("select data from history where id = ? and title = ?"), [second, name])
-        second_raw_data = curs.fetchall()
-        if second_raw_data:
-            second_raw_data = second_raw_data[0][0].replace('\r', '')
-
-            if first == second:
-                result = ''
-            elif first_raw_data == second_raw_data:
-                result = ''
-            else:
-                i = 1
-                include_ins = 0
-                diff_data = diff_match_patch().diff_prettyHtml(diff_match_patch().diff_main(first_raw_data, second_raw_data))
-                end_data = ''
-
-                re_data = re.findall(r'(?:(?:(?:(?!&para;<br>).)*)(?:&para;<br>)|(?:(?:(?!&para;<br>).)+)$)', diff_data)
-                for re_in_data in re_data:
-                    re_in_data = re.sub(r'&para;<br>$', '', re_in_data)
-                    if re.search(r'<ins (((?!<\/ins>).)+)<\/ins>', re_in_data):
-                        end_data += str(i) + ' : ' + re_in_data + '\n'
-                        include_ins = 0
-                    elif re.search(r'(<ins |<del )', re_in_data) and re.search(r'(<\/ins>|<\/del>)', re_in_data):
-                        end_data += str(i) + ' : ' + re_in_data + '\n'
-                        include_ins = 1
-                    elif re.search(r'(<\/ins>|<\/del>)', re_in_data):
-                        end_data += str(i) + ' : ' + re_in_data + '\n'
-                        include_ins = 0
-                    elif re.search(r'(<ins |<del )', re_in_data) or include_ins == 1:
-                        end_data += str(i) + ' : ' + re_in_data + '\n'
-                        include_ins = 1
-                    else:
-                        include_ins = 0
-
-                    i += 1
-                    
-                result = '<pre>' + end_data + '</pre>'
-
-            return easy_minify(flask.render_template(skin_check(),
-                imp = [name, wiki_set(), custom(), other2(['(' + load_lang('compare') + ')', 0])],
-                data = result,
-                menu = [['history/' + url_pas(name), load_lang('return')]]
-            ))
-
-    return redirect('/history/' + url_pas(name))
+        second_raw_data = second_raw_data[0][0].replace('\r', '')
+
+        if first_raw_data == second_raw_data:
+            result = ''
+        else:
+            i = 1
+            change_count = 0
+            diff_data = diff_match_patch().diff_prettyHtml(
+                diff_match_patch().diff_main(first_raw_data, second_raw_data)
+            )
+            end_data = ''
+
+            diff_data = diff_data.replace('&para;<br>', '\n')
+            diff_data = diff_data.replace('<span>', '')
+            diff_data = diff_data.replace('</span>', '')
+            
+            re_data = re.findall(r'(?:(?:(?:(?!\n).)*)(?:\n)|(?:(?:(?!\n).)+)$)', diff_data)
+            for re_in_data in re_data:
+                change_find_start = len(re.findall(r'<(?:del|ins) ', re_in_data))
+                change_find_end = len(re.findall(r'<\/(?:del|ins)>', re_in_data))
+
+                change_count += (change_find_start - change_find_end)
+                if change_count != 0 or change_find_start != 0 or change_find_end != 0:
+                    end_data += str(i) + ' : ' + re_in_data
+                
+                i += 1
+                
+            result = '<pre>' + end_data + '</pre>'
+
+        return easy_minify(flask.render_template(skin_check(),
+            imp = [name, wiki_set(), custom(), other2(['(' + load_lang('compare') + ')', 0])],
+            data = result,
+            menu = [['history/' + url_pas(name), load_lang('return')]]
+        ))
+    else:
+        return redirect('/history/' + url_pas(name))

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.2.0-stable-13 (beta-53) (dev-2021-03-01-01)",
+        "r_ver" : "v3.2.0-stable-13 (beta-55) (dev-2021-03-06-01)",
         "c_ver" : "3203400",
         "s_ver" : "11"
     }

views/main_css/js/load_onmark_render.js

@@ -393,7 +393,8 @@ function do_onmark_middle_render(data, data_js, name_include) {
                 data = data.replace(middle_re, '<span id="' + name_include + 'render_contect_' + String(html_n) + '">');
                 middle_stack.push('</span>');
             } else if(middle_data[1] === '#!folding') {
-                                
+                data = data.replace(middle_re, '<div>');
+                middle_stack.push('</div>');
             } else {
                 data = data.replace(middle_re, '<middle_start>' + middle_data[1]);   
             }
@@ -508,8 +509,71 @@ function do_onmark_render(test_mode = 1, name_id = '', name_include = '', name_d
         var data = '\n' + document.getElementById(name_id).innerHTML.replace(/\r/g, '') + '\n';
     } else {
     	var data = '\n' + (
-            '== namu ==\n' +
-            'test'
+`[Include(틀:SCP)]
+
+||<-2><table align=center> {{{+2 [[객체 등급]]}}} [br] Safe (안전) ||
+|| 주소 || [[http://www.scp-wiki.net/object-classes|원문]], [[http://ko.scp-wiki.net/object-classes|한국어]] ||
+
+>안전 등급 SCP들은 변칙적이지만 쉽고 안전하게 격리가 가능하다. 이것은 주로 재단이 해당 SCP를 잘 충분히 연구하여 격리에 특별한 자원이 더 필요하지 않은 경지에 이르렀거나, 또는 변칙성이 특수한 작동기제에 의해서만 발현되는 경우에 해당한다. 하지만 SCP를 안전 등급으로 분류하는 것은, 그것을 다루거나 활성화시키는 것이 위협적이지 않다는 의미가 아니다.
+
+== 설명 ==
+[[SCP 재단]]의 SCP 분류 등급 중 하나. 일종의 최하위 등급으로, 여기에도 속하지 못한 SCP는 [[http://ko.scp-wiki.net/log-of-anomalous-items|변칙 개체]]로 취급받는다. [[유클리드 등급]]이나 [[케테르 등급]]과 비교하면 상대적으로 안전하지만, 이는 어디까지나 상대적으로 새로운 변칙성이나 위험성이 발견되면 유클리드나 케테르로 상향될 수 있다. 물론 반대로 유클리드 등급이나 케테르 등급이었던 SCP가 안전 등급이 되는 일도 있다.
+
+등급의 부여는 격리 난이도에 따라 결정되기에 위험성과는 별개지만, 특별히 재단을 잘 아는 사람이 아니라면 대부분은 안전은 안전, 유클리드는 좀 위험, 케테르는 매우 위험 정도로 이해하는 경우가 대부분이며, 실제로 특별한 경우가 아닌 이상 위험성과 격리 난이도는 정비례하기에 일부 예외를 제외한다면 큰 문제는 없다.
+
+== 목록 ==
+{{{#!folding 펼치기
+* [[SCP-005]]
+* [[SCP-006]]
+* [[SCP-010]]
+* [[SCP-011]]
+* [[SCP-013]]
+* [[SCP-014]]
+* [[SCP-021]]
+* [[SCP-025]]
+* [[SCP-028]]
+* [[SCP-030]]
+* [[SCP-031]]
+* [[SCP-034]]
+* [[SCP-036]]
+* [[SCP-038]]
+* [[SCP-041]]
+* [[SCP-042]]
+* [[SCP-043]]
+* [[SCP-044]]
+* [[SCP-045]]
+* [[SCP-051]]
+* [[SCP-054]]
+* [[SCP-057]]
+* [[SCP-061]]
+* [[SCP-063]]
+* [[SCP-064]]
+* [[SCP-067]]
+* [[SCP-068]]
+* [[SCP-069]]
+* [[SCP-070]]
+* [[SCP-072]]
+* [[SCP-085]]
+* [[SCP-086]]
+* [[SCP-088]]
+* [[SCP-091]]
+* [[SCP-092]]
+* [[SCP-095]]
+* [[SCP-098]]
+* [[SCP-099]]
+* [[SCP-105]]
+* [[SCP-107]]
+* [[SCP-108]]
+* [[SCP-111]]
+* [[SCP-113]]
+* [[SCP-115]]
+* [[SCP-120]]
+* [[SCP-127]]
+* [[SCP-131]]
+* [[SCP-132]]
+* [[SCP-133]]
+* [[SCP-134]]
+}}}`
         ) + '\n';
     }
     var data_js = '';
@@ -563,4 +627,4 @@ function do_onmark_render(test_mode = 1, name_id = '', name_include = '', name_d
     }
 }
 
-// do_onmark_render();
+do_onmark_render();