잉여개발기 (SPDV) il y a 3 ans
Parent
commit
a911b22a8f
6 fichiers modifiés avec 27 ajouts et 20 suppressions
  1. 2 3
      app.py
  2. 21 13
      route/list_admin_use.py
  3. 1 1
      route/main_tool_other.py
  4. 1 1
      route/tool/func.py
  5. 1 1
      version.json
  6. 1 1
      views/main_css/js/route/thread.js

+ 2 - 3
app.py

@@ -348,9 +348,8 @@ def list_admin():
     return list_admin_2()
 
 # /list/admin/auth_use
-@app.route('/admin_log', methods = ['POST', 'GET'])
-def list_admin_use():
-    return list_admin_use_2()
+app.route('/list/admin/auth_use', methods = ['POST', 'GET'])(list_admin_use)
+app.route('/list/admin/auth_use/<arg_search>/<int:arg_num>', methods = ['POST', 'GET'])(list_admin_use)
 
 # /list/user
 @app.route('/user_log')

+ 21 - 13
route/list_admin_use.py

@@ -1,31 +1,39 @@
 from .tool.func import *
 
-def list_admin_use_2():
+def list_admin_use(arg_num = 1, arg_search = 'normal'):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
-        num = int(number_check(flask.request.args.get('num', '1')))
-        sql_num = (num * 50 - 50) if num * 50 > 0 else 0
+        sql_num = (arg_num * 50 - 50) if arg_num * 50 > 0 else 0
 
         if flask.request.method == 'POST':
-            return redirect('/admin_log?search=' + flask.request.form.get('search', 'normal'))
+            return redirect('/list/admin/auth_use/' + url_pas(flask.request.form.get('search', 'normal')) + '/1')
         else:
-            list_data = '<ul class="opennamu_ul">'
-
-            if flask.request.args.get('search', 'normal') == 'normal':
+            if arg_search == 'normal':
                 curs.execute(db_change("select who, what, time from re_admin order by time desc limit ?, 50"), [sql_num])
             else:
-                curs.execute(db_change("select who, what, time from re_admin where what like ? order by time desc limit ?, 50"), [
-                    flask.request.args.get('search', 'normal') + "%",
-                    sql_num
-                ])
+                curs.execute(
+                    db_change("select who, what, time from re_admin where what like ? order by time desc limit ?, 50"),
+                    [arg_search + "%", sql_num]
+                )
+
+            list_data = '<ul class="opennamu_ul">'
 
             get_list = curs.fetchall()
             for data in get_list:
-                list_data += '<li>' + ip_pas(data[0]) + ' / ' + html.escape(data[1]) + ' / ' + data[2] + '</li>'
+                do_data = data[1]
+
+                if ip_pas('127.0.0.1', 1) != '127.0.0.1': 
+                    do_data = do_data.split(' ')
+                    if do_data[0] in ('ban'):
+                        do_data = do_data[0]
+                    else:
+                        do_data = data[1]
+
+                list_data += '<li>' + ip_pas(data[0]) + ' | ' + html.escape(do_data) + ' | ' + data[2] + '</li>'
 
             list_data += '</ul>'
-            list_data += next_fix('/admin_log?num=', num, get_list)
+            list_data += next_fix('/list/admin/auth_use/' + url_pas(arg_search) + '/', arg_num, get_list)
 
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('authority_use_list'), wiki_set(), wiki_custom(), wiki_css([0, 0])],

+ 1 - 1
route/main_tool_other.py

@@ -15,7 +15,7 @@ def main_tool_other():
                     <h3>2.1. ''' + load_lang('admin') + '''</h3>
                     <ul class="opennamu_ul">               
                         <li><a href="/admin_list">''' + load_lang('admin_list') + '''</a></li>
-                        <li><a href="/admin_log">''' + load_lang('authority_use_list') + '''</a></li>
+                        <li><a href="/list/admin/auth_use">''' + load_lang('authority_use_list') + '''</a></li>
                     </ul>
                     <h3>2.2. ''' + load_lang('discussion') + '''</h3>
                     <ul class="opennamu_ul">

+ 1 - 1
route/tool/func.py

@@ -1042,7 +1042,7 @@ def wiki_css(data):
     data += ['' for _ in range(0, 3 - len(data))]
     
     data_css = ''
-    data_css_ver = '168'
+    data_css_ver = '169'
     
     # Func JS + Defer
     data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5-unstable (stable2) (beta6-91)",
+        "r_ver" : "v3.4.5-unstable (stable2) (beta6-92)",
         "c_ver" : "3500354",
         "s_ver" : "3500111"
     }

+ 1 - 1
views/main_css/js/route/thread.js

@@ -70,7 +70,7 @@ function opennamu_do_thread_make(topic_num, type_do = 'top', some = '', where =
                 }
                 
                 if(blind === 'O') {
-                    ip += ' <a href="/admin_log?search=blind%20(code%20' + topic_num + '#' + key + '">(B)</a>';
+                    ip += ' <a href="/list/admin/auth_use/' + opennamu_do_url_encode('blind (code ' + topic_num + '#' + key) + '/1">(B)</a>';
                     
                     if(admin === '1') {
                         ip += ' <a href="javascript:opennamu_do_open_comment(\'' + key + '\');">(O)</a>';