librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix variable being ignored instead of saved inside the database when the value is empty

This commit is contained in:
Théophile Diot 2023-05-25 18:10:41 -04:00
parent 8dad7a0b79
commit 6e80c7b8de
No known key found for this signature in database
GPG Key ID: E752C80DB72BB014
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/db/Database.py
View File

@ -459,7 +459,6 @@ class Database:
if key != "SERVER_NAME" and (
(key not in config and value == setting.default)
or (key in config and value == config[key])
or (not value.strip() and not setting.default)
):
continue
@ -479,7 +478,6 @@ class Database:
if key != "SERVER_NAME" and (
(key not in config and value == setting.default)
or (key in config and value == config[key])
or (not value.strip() and not setting.default)
):
session.query(Services_settings).filter(
Services_settings.service_id == server_name,
@ -513,9 +511,7 @@ class Database:
)
if not global_value:
if value == setting.default or (
not value.strip() and not setting.default
):
if value == setting.default:
continue
to_put.append(
@ -530,9 +526,7 @@ class Database:
method in (global_value.method, "autoconf")
and global_value.value != value
):
if value == setting.default or (
not value.strip() and not setting.default
):
if value == setting.default:
session.query(Global_values).filter(
Global_values.setting_id == key,
Global_values.suffix == suffix,
@ -591,9 +585,7 @@ class Database:
)
if not global_value:
if value == setting.default or (
not value.strip() and not setting.default
):
if value == setting.default:
continue
to_put.append(
@ -608,9 +600,7 @@ class Database:
global_value.method == method
and value != global_value.value
):
if value == setting.default or (
not value.strip() and not setting.default
):
if value == setting.default:
session.query(Global_values).filter(
Global_values.setting_id == key,
Global_values.suffix == suffix,