This commit is contained in:
2026-11-04 00:04:52 +08:00
parent bee9e89ed5
commit 35e1ff2e96
3 changed files with 54 additions and 9 deletions

View File

@@ -1543,20 +1543,33 @@ def getDbUserAccessDiff(db_access, input_access):
add = []
delete = []
host_var = 'localhost'
local_ipvar = '127.0.0.1'
for ac in input_access:
if ac == "localhost":
if ac == host_var:
continue
if ac == local_ipvar:
continue
if mw.inArray(db_access,ac):
continue
add.append(ac)
if not mw.inArray(db_access, local_ipvar) and not mw.inArray(add, local_ipvar):
add.append(local_ipvar)
for ac in db_access:
if ac == "localhost":
if ac == host_var:
continue
if ac == local_ipvar:
continue
if mw.inArray(input_access,ac):
continue
delete.append(ac)
if mw.inArray(delete, local_ipvar):
delete.remove(local_ipvar)
return {"add":add,"delete":delete}
def getDbAccess():
@@ -1569,8 +1582,10 @@ def getDbAccess():
users = getDbUserAccess(username)
if len(users) == 1:
return mw.returnJson(True, "localhost")
userStr = ','.join(users)
if userStr == '127.0.0.1,localhost':
return mw.returnJson(True, 'localhost')
return mw.returnJson(True, userStr)
def setDbAccess():

View File

@@ -1710,20 +1710,33 @@ def getDbUserAccessDiff(db_access, input_access):
add = []
delete = []
host_var = 'localhost'
local_ipvar = '127.0.0.1'
for ac in input_access:
if ac == "localhost":
if ac == host_var:
continue
if ac == local_ipvar:
continue
if mw.inArray(db_access,ac):
continue
add.append(ac)
if not mw.inArray(db_access, local_ipvar) and not mw.inArray(add, local_ipvar):
add.append(local_ipvar)
for ac in db_access:
if ac == "localhost":
if ac == host_var:
continue
if ac == local_ipvar:
continue
if mw.inArray(input_access,ac):
continue
delete.append(ac)
if mw.inArray(delete, local_ipvar):
delete.remove(local_ipvar)
return {"add":add,"delete":delete}
def getDbAccess():
@@ -1736,8 +1749,10 @@ def getDbAccess():
users = getDbUserAccess(username)
if len(users) == 1:
return mw.returnJson(True, "localhost")
userStr = ','.join(users)
if userStr == '127.0.0.1,localhost':
return mw.returnJson(True, 'localhost')
return mw.returnJson(True, userStr)
def setDbAccess():

View File

@@ -1917,20 +1917,33 @@ def getDbUserAccessDiff(db_access, input_access):
add = []
delete = []
host_var = 'localhost'
local_ipvar = '127.0.0.1'
for ac in input_access:
if ac == "localhost":
if ac == host_var:
continue
if ac == local_ipvar:
continue
if mw.inArray(db_access,ac):
continue
add.append(ac)
if not mw.inArray(db_access, local_ipvar) and not mw.inArray(add, local_ipvar):
add.append(local_ipvar)
for ac in db_access:
if ac == "localhost":
if ac == host_var:
continue
if ac == local_ipvar:
continue
if mw.inArray(input_access,ac):
continue
delete.append(ac)
if mw.inArray(delete, local_ipvar):
delete.remove(local_ipvar)
return {"add":add,"delete":delete}
def getDbAccess():
@@ -1943,8 +1956,10 @@ def getDbAccess():
users = getDbUserAccess(username)
if len(users) == 1:
return mw.returnJson(True, "localhost")
userStr = ','.join(users)
if userStr == '127.0.0.1,localhost':
return mw.returnJson(True, 'localhost')
return mw.returnJson(True, userStr)
def setDbAccess():