역사 코드 정리, 다양한 역사 기능 추가

app.py

@@ -656,7 +656,6 @@ def api_recent_change():
     return api_recent_change_2(conn)
     
 # File
-
 @app.route('/views/<everything:name>')
 def main_views(name = None):
     return main_views_2(conn, name)

route/recent_changes.py

@@ -9,55 +9,61 @@ def recent_changes_2(conn, name, tool):
             '?first=' + flask.request.form.get('b', '1') +
             '&second=' + flask.request.form.get('a', '1')
         )
-    else:
-        one_admin = admin_check(1)
-        six_admin = admin_check(6)
-        
+    else:        
         ban = ''
         select = ''
+        sub = ''
 
         div = '''
-            <hr class=\"main_hr\">
             <table id="main_table_set">
                 <tbody>
                     <tr>
         '''
         
-        if name:
-            num = int(number_check(flask.request.args.get('num', '1')))
-            if num * 50 > 0:
-                sql_num = num * 50 - 50
-            else:
-                sql_num = 0      
+        num = int(number_check(flask.request.args.get('num', '1')))
+        if num * 50 > 0:
+            sql_num = num * 50 - 50
+        else:
+            sql_num = 0   
 
+        if name:
             if tool == 'history':
+                sub += ' (' + load_lang('history') + ')'
+
                 div += '''
                     <td id="main_table_width">''' + load_lang('version') + '''</td>
                     <td id="main_table_width">''' + load_lang('editor') + '''</td>
-                    <td id="main_table_width">''' + load_lang('time') + '''</td></tr>
+                    <td id="main_table_width">''' + load_lang('time') + '''</td>
                 '''
                 
-                tool_select = flask.request.args.get('tool', None)
-                if tool_select and tool_select == 'move':
-                    curs.execute(db_change('' + \
-                        'select id, title, date, ip, send, leng from history ' + \
-                        'where (send like ? or send like ?) and type = "" ' + \
-                        'order by id + 0 desc ' + \
-                        "limit ?, 50" + \
-                    ''), ['%(<a>' + name +'</a>%', '%<a>' + name + '</a> move)', sql_num])
+                tool_select = flask.request.args.get('tool', '')
+                if tool_select == 'move':
+                    plus_sql = 'where (send like ? or send like ?) and type = "" '
+                    plus_list = ['%(<a>' + name +'</a>%', '%<a>' + name + '</a> move)', sql_num]    
+                    sub += ' (' + load_lang('move') + ')'
+                elif tool_select == 'delete':
+                    plus_sql = 'where (send like "%(delete)") and title = ? and type = "" '
+                    plus_list = [name, sql_num]    
+                    sub += ' (' + load_lang('revert') + ')'
+                elif tool_select == 'revert':
+                    plus_sql = 'where (send like ?) and title = ? and type = "" '
+                    plus_list = ['%(r%)', name, sql_num]    
+                    sub += ' (' + load_lang('revert') + ')'
                 else:
-                    curs.execute(db_change('' + \
-                        'select id, title, date, ip, send, leng from history ' + \
-                        'where title = ? and type = "" ' + \
-                        'order by id + 0 desc ' + \
-                        "limit ?, 50" + \
-                    ''), [name, sql_num])
+                    plus_sql = 'where title = ? and type = "" '
+                    plus_list = [name, sql_num]
+
+                curs.execute(db_change('' + \
+                    'select id, title, date, ip, send, leng from history ' + \
+                    plus_sql + \
+                    'order by id + 0 desc ' + \
+                    "limit ?, 50" + \
+                ''), plus_list)
             else:
                 div +=  '''
-                        <td id="main_table_width">''' + load_lang('document_name') + '''</td>
-                        <td id="main_table_width">''' + load_lang('editor') + '''</td>
-                        <td id="main_table_width">''' + load_lang('time') + '''</td>
-                    </tr>
+                    <td id="main_table_width">''' + load_lang('document_name') + '''</td>
+                    <td id="main_table_width">''' + load_lang('editor') + '''</td>
+                    <td id="main_table_width">''' + load_lang('time') + '''</td>
                 '''
 
                 div = '<a href="/topic_record/' + url_pas(name) + '">(' + load_lang('discussion') + ')</a><hr class=\"main_hr\">' + div
@@ -67,37 +73,35 @@ def recent_changes_2(conn, name, tool):
                     "where ip = ? and type = '' order by date desc limit ?, 50" + \
                 ''), [name, sql_num])
         else:
-            num = int(number_check(flask.request.args.get('num', '1')))
-            if num * 50 > 0:
-                sql_num = num * 50 - 50
-            else:
-                sql_num = 0            
-            
             div +=  '''
-                    <td id="main_table_width">''' + load_lang('document_name') + '''</td>
-                    <td id="main_table_width">''' + load_lang('editor') + '''</td>
-                    <td id="main_table_width">''' + load_lang('time') + '''</td>
-                </tr>
+                <td id="main_table_width">''' + load_lang('document_name') + '''</td>
+                <td id="main_table_width">''' + load_lang('editor') + '''</td>
+                <td id="main_table_width">''' + load_lang('time') + '''</td>
             '''
 
             set_type = flask.request.args.get('set', 'normal')
             if set_type == 'normal':
-                div = '<a href="?set=user">(' + load_lang('user_document') + ')</a> <a href="?set=req">(' + load_lang('edit_req') + ')</a>' + div
+                div = '' + \
+                    '<a href="?set=user">(' + load_lang('user_document') + ')</a> ' + \
+                    '<a href="?set=req">(' + load_lang('edit_req') + ')</a>' + \
+                    '<hr class="main_hr">' + div + \
+                ''
 
             if set_type == 'req':
-                curs.execute(db_change('' + \
-                    'select id, title, date, ip, send, leng from history ' + \
-                    "where type = 'req' " + \
-                    'order by date desc ' + \
-                    'limit ?, 50' + \
-                ''), [sql_num])
+                plus_sql = "where type = 'req' "
+            elif set_type == 'user':
+                plus_sql = "where title like 'user:%' and type = '' "
             else:
-                curs.execute(db_change('' + \
-                    'select id, title, date, ip, send, leng from history ' + \
-                    "where " + ('' if set_type == 'user' else 'not ') + "title like 'user:%' and type = '' " + \
-                    'order by date desc ' + \
-                    'limit ?, 50' + \
-                ''), [sql_num])
+                plus_sql = "where not title like 'user:%' and type = '' "
+
+            curs.execute(db_change('' + \
+                'select id, title, date, ip, send, leng from history ' + \
+                plus_sql + \
+                'order by date desc ' + \
+                'limit ?, 50' + \
+            ''), [sql_num])
+
+        div += '</tr>'
 
         data_list = curs.fetchall()
         for data in data_list:    
@@ -130,15 +134,12 @@ def recent_changes_2(conn, name, tool):
             '''), [data[1], data[0]])
             hide = curs.fetchall()
             
-            if six_admin == 1:
+            if admin_check(6) == 1:
                 if hide:                    
                     style[0] = 'id="toron_color_grey"'
                     style[1] = 'id="toron_color_grey"'
                     
-                    if send == '<br>':
-                        send = '(' + load_lang('hide') + ')'
-                    else:
-                        send += ' (' + load_lang('hide') + ')'
+                    send += ' (' + load_lang('hide') + ')'
             elif not hide:
                 pass
             else:
@@ -175,16 +176,21 @@ def recent_changes_2(conn, name, tool):
                 </tbody>
             </table>
         '''
-        sub = ''
 
         if name:
             if tool == 'history':
                 if not tool_select:
-                    div = '''
-                        <a href="?tool=move">(''' + load_lang('move') + ''')</a>
-                        <hr class=\"main_hr\">
-                    ''' + div
-                    
+                    div = '' + \
+                        '<a href="?tool=move">(' + load_lang('move') + ')</a> ' + \
+                        '<a href="?tool=delete">(' + load_lang('delete') + ')</a> ' + \
+                        '<a href="?tool=revert">(' + load_lang('revert') + ')</a>' + \
+                        '<hr class="main_hr">' + div + \
+                    ''
+
+                    menu = [['w/' + url_pas(name), load_lang('document')], ['raw/' + url_pas(name), load_lang('raw')]]
+                else:
+                    menu = [['history/' + url_pas(name), load_lang('return')]]
+
                 div = '''
                     <form method="post">
                         <select name="a">''' + select + '''</select> <select name="b">''' + select + '''</select>
@@ -193,9 +199,7 @@ def recent_changes_2(conn, name, tool):
                     <hr class=\"main_hr\">
                 ''' + div
                 title = name
-                sub += ' (' + load_lang('history') + ')'
-                menu = [['w/' + url_pas(name), load_lang('document')], ['raw/' + url_pas(name), load_lang('raw')]]
-                div += next_fix('/history/' + url_pas(name) + '?num=', num, data_list)
+                div += next_fix('/history/' + url_pas(name) + '?tool=' + tool_select + '&num=', num, data_list)
             else:
                 title = load_lang('edit_record')
                 menu = [['other', load_lang('other')], ['user', load_lang('user')], ['count/' + url_pas(name), load_lang('count')]]
@@ -203,7 +207,7 @@ def recent_changes_2(conn, name, tool):
         else:
             menu = 0
             title = load_lang('recent_change')
-            div += next_fix('/recent_changes?num=', num, data_list)
+            div += next_fix('/recent_changes?tool=' + tool_select + '&num=', num, data_list)
 
             if set_type == 'user':
                 sub = ' (' + load_lang('user') + ')'

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.5-master-35",
+        "r_ver" : "v3.1.5-master-36",
         "c_ver" : "400007",
         "s_ver" : "7"
     }, "stable" : {