관리자, 차단자 분별 전체 기능에 적용

route/api_topic_sub.py

@@ -55,28 +55,12 @@ def api_topic_sub_2(conn, name, sub, time):
                     t_color = 'toron_color'
                     
                 ip = ip_pas(i[3])
-                plus_ip = ''
-                
-                curs.execute('select acl from user where id = ?', [i[3]])
-                u_acl = curs.fetchall()
-                if u_acl and u_acl[0][0] != 'user':
-                    plus_ip = '<b>' + i[3] + '</b>'
 
                 if admin == 1 or b_color != 'toron_color_grey':
                     ip += ' <a href="/topic/' + url_pas(name) + '/sub/' + url_pas(sub) + '/admin/' + i[0] + '">(' + load_lang('discussion_tool') + ')</a>'
-
-                curs.execute("select end from ban where block = ?", [i[3]])
-                if curs.fetchall():
-                    if plus_ip != '':
-                        plus_ip = '<s>' + plus_ip + '</s>'
-                    else:
-                        plus_ip = '<s>' + i[3] + '</s>'
                     
                 if t_data_f == '':
                     t_data_f = '[br]'
-                    
-                if plus_ip != '':
-                    ip = ip.replace('>' + i[3] + '<', '>' + plus_ip + '<')
             
                 all_data = '''
                     <table id="toron">

route/list_give.py

@@ -18,5 +18,5 @@ def list_give_2(conn):
     return easy_minify(flask.render_template(skin_check(), 
         imp = [load_lang('admin_group_list'), wiki_set(), custom(), other2([0, 0])],
         data = list_data,
-        menu = [['other', load_lang('return')]]
+        menu = [['manager', load_lang('return')]]
     ))    

route/tool/func.py

@@ -528,8 +528,11 @@ def diff(seqm):
             
     return sub
            
-def admin_check(num = None, what = None):
-    ip = ip_check() 
+def admin_check(num = None, what = None, name = ''):
+    if name == '':
+        ip = ip_check()
+    else:
+        ip = name
 
     curs.execute("select acl from user where id = ?", [ip])
     user = curs.fetchall()
@@ -580,7 +583,7 @@ def admin_check(num = None, what = None):
 def ip_pas(raw_ip):
     hide = 0
 
-    if re.search("(\.|:)", raw_ip):    
+    if ip_or_user(raw_ip) != 0:    
         curs.execute("select data from other where name = 'ip_view'")
         data = curs.fetchall()
         if data and data[0][0] != '':
@@ -596,6 +599,12 @@ def ip_pas(raw_ip):
             ip = '<a href="/w/' + url_pas('user:' + raw_ip) + '">' + raw_ip + '</a>'
         else:
             ip = '<a id="not_thing" href="/w/' + url_pas('user:' + raw_ip) + '">' + raw_ip + '</a>'
+
+        if admin_check('all', None, raw_ip) == 1:
+            ip = '<b>' + ip + '</b>'
+
+    if ban_check(raw_ip) == 1:
+        ip = '<s>' + ip + '</s>'
          
     if hide == 0:
         ip += ' <a href="/tool/' + url_pas(raw_ip) + '">(' + load_lang('tool') + ')</a>'