GitHub/iRedAdmin-Pro-SQL
1
0
Fork 0
mirror of https://github.com/marcus-alicia/iRedAdmin-Pro-SQL.git synced 2026-05-30 08:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to 5.4

Browse Source
This commit is contained in:
Copium-Snorter
2023-06-20 20:23:44 +01:00
parent 2991096ba7
commit 7b6f07ed6e
47 changed files with 138 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/sqllib/user.py
View File

@@ -1129,7 +1129,7 @@ def update(conn, mail, profile_type, form):
# If marked as normal domain admin, allow to create new domains
#
if 'allowed_to_create_domain' in form:
_new_settings = {'create_new_domains': 'yes'}
_new_settings['create_new_domains'] = 'yes'
for i in ['create_max_domains',
'create_max_quota',
@@ -2257,14 +2257,17 @@ def get_basic_user_profiles(domain,
for row in rows:
email = row.username
used_bytes = 0
used_messages = 0
_bytes = 0
_messages = 0
if email in used_quota_info:
used_bytes = used_quota_info[email]["bytes"]
used_messages = used_quota_info[email]["messages"]
_bytes = used_quota_info[email]["bytes"]
_messages = used_quota_info[email]["messages"]
row["used_quota"] = {"bytes": used_bytes, "messages": used_messages}
row["used_quota"] = {
"bytes": _bytes,
"messages": _messages,
}
return True, rows
except Exception as e:

4
libs/sqllib/utils.py
View File

@@ -264,7 +264,7 @@ def search(search_string,
# Add new, remove duplicate records.
for i in _records:
if not (i in result['user']):
if i not in result['user']:
result['user'] += [i]
if qr_user_forwarding:
@@ -272,7 +272,7 @@ def search(search_string,
# Add new, remove duplicate records.
for i in _records:
if not (i in result['user']):
if i not in result['user']:
result['user'] += [i]
# Get email addresses of returned user accounts