Surplus_Up (2DU) 6 лет назад
Родитель
Сommit
5fc162035e
3 измененных файлов с 18 добавлено и 19 удалено
  1. 0 16
      app.py
  2. 16 1
      route/tool/func.py
  3. 2 2
      version.json

+ 0 - 16
app.py

@@ -263,22 +263,6 @@ if back_time != 0:
 else:
 else:
     print('Back up state : Turn off')
     print('Back up state : Turn off')
 
 
-curs.execute('select data from other where name = "s_ver"')
-ver_set_data = curs.fetchall()
-if not ver_set_data:
-    curs.execute('insert into other (name, data) values ("s_ver", ?)', [s_ver])
-
-    if setup_tool == 0:
-        print('----')
-        print('Skin update required')
-else:
-    if int(ver_set_data[0][0]) < int(s_ver):
-        curs.execute('delete from other where name = "s_ver"')
-        curs.execute('insert into other (name, data) values ("s_ver", ?)', [s_ver])
-
-        print('----')
-        print('Skin update required')
-
 conn.commit()
 conn.commit()
 
 
 def count_all_title():
 def count_all_title():

+ 16 - 1
route/tool/func.py

@@ -634,8 +634,23 @@ def custom():
         
         
     if admin_check('all') == 1:
     if admin_check('all') == 1:
         user_admin = '1'
         user_admin = '1'
+
+        curs.execute("select acl from user where id = ?", [ip])
+        user_acl = curs.fetchall()
+
+        user_acl_list = []
+        curs.execute('select acl from alist where name = ?', [user_acl[0][0]])
+        user_acl = curs.fetchall()
+        for i in user_acl:
+            user_acl_list += [i[0]]
+
+        if user_acl != []:
+            user_acl_list = user_acl_list
+        else:
+            user_acl_list = '0'
     else:
     else:
         user_admin = '0'
         user_admin = '0'
+        user_acl_list = '0'
         
         
     if ban_check() == 1:
     if ban_check() == 1:
         user_ban = '1'
         user_ban = '1'
@@ -652,7 +667,7 @@ def custom():
     else:
     else:
         user_notice = '0'
         user_notice = '0'
 
 
-    return ['', '', user_icon, user_head, email, user_name, user_admin, user_ban, user_notice]
+    return ['', '', user_icon, user_head, email, user_name, user_admin, user_ban, user_notice, user_acl_list]
 
 
 def load_skin(data = '', set_n = 0):
 def load_skin(data = '', set_n = 0):
     div2 = ''
     div2 = ''

+ 2 - 2
version.json

@@ -1,8 +1,8 @@
 {
 {
     "master" : {
     "master" : {
-        "r_ver" : "v3.1.3-stable-01",
+        "r_ver" : "v3.1.4-master-01",
         "c_ver" : "400003",
         "c_ver" : "400003",
-        "s_ver" : "2"
+        "s_ver" : "3"
     }, "stable" : {
     }, "stable" : {
         "r_ver" : "v3.1.3-stable-01",
         "r_ver" : "v3.1.3-stable-01",
         "c_ver" : "400003",
         "c_ver" : "400003",