2DU пре 8 година
родитељ
комит
29eb156161
2 измењених фајлова са 10 додато и 11 уклоњено
  1. 7 4
      app.py
  2. 3 7
      func.py

+ 7 - 4
app.py

@@ -3071,11 +3071,14 @@ def read_view(name = None, num = None, redirect = None):
         test = curs.fetchall()
         test = curs.fetchall()
         if(test and test[0][0] != 'user'):
         if(test and test[0][0] != 'user'):
             acl = ' (관리자)'
             acl = ' (관리자)'
+        else:
+            acl = ''
 
 
-        if(rows[0][0] == 'all'):
-            acl += ' (모두)'
-        elif(rows[0][0] == 'user'):
-            acl += ' (로그인)'
+        if(rows):
+            if(rows[0][0] == 'all'):
+                acl += ' (모두)'
+            elif(rows[0][0] == 'user'):
+                acl += ' (로그인)'
 
 
         curs.execute("select block from ban where block = ?", [g[0]])
         curs.execute("select block from ban where block = ?", [g[0]])
         user = curs.fetchall()
         user = curs.fetchall()

+ 3 - 7
func.py

@@ -184,7 +184,7 @@ def acl_check(name):
             if(acl_d[0][0] == 'user' and not re.search("(\.|:)", acl_n[0])):
             if(acl_d[0][0] == 'user' and not re.search("(\.|:)", acl_n[0])):
                 return(0)
                 return(0)
 
 
-            if(not ip == g[0] or re.search("(\.|:)", acl_n[0])):
+            if(not ip == acl_n[0] or re.search("(\.|:)", acl_n[0])):
                 return(1)
                 return(1)
         
         
         return(0)
         return(0)
@@ -200,14 +200,10 @@ def acl_check(name):
 
 
     curs.execute("select acl from user where id = ?", [ip])
     curs.execute("select acl from user where id = ?", [ip])
     user_d = curs.fetchall()
     user_d = curs.fetchall()
-    if(acl_d[0][0] == 'user' and user_d):
-        return(0)
-    else:
+    if(acl_d[0][0] == 'user' and not user_d):
         return(1)
         return(1)
 
 
-    if(acl_d[0][0] == 'admin' and user_d and admin_check(5, 'edit (' + name + ')') == 1):
-        return(0)
-    else:
+    if(acl_d[0][0] == 'admin' and (not user_d or not admin_check(5, 'edit (' + name + ')') == 1)):
         return(1)
         return(1)
 
 
     return(0)
     return(0)