From a0b6b2db8ba6986508a7f249a0d5c7227957899f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 28 Feb 2020 13:18:01 +0100 Subject: [PATCH] add default value to config params --- flexisip-account-manager.spec | 2 +- src/database/database.php | 2 +- src/misc/utilities.php | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec index 0603ecc..794fba2 100644 --- a/flexisip-account-manager.spec +++ b/flexisip-account-manager.spec @@ -8,7 +8,7 @@ #%define _datadir %{_datarootdir} #%define _docdir %{_datadir}/doc -%define build_number 17 +%define build_number 18 %define var_dir /var/opt/belledonne-communications %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager %define env_file "$RPM_BUILD_ROOT/etc/flexisip-account-manager/flexiapi.env" diff --git a/src/database/database.php b/src/database/database.php index abe0d39..7593eaf 100644 --- a/src/database/database.php +++ b/src/database/database.php @@ -29,7 +29,7 @@ class Database $this->conn = null; try { - if(!empty(DB_ENABLE_SSL) && !empty(ROOT_CA_PATH)){ + if(!empty(get_config_value("DB_ENABLE_SSL","")) && !empty(get_config_value("ROOT_CA_PATH",""))){ if(!file_exists (ROOT_CA_PATH)){ Logger::getInstance()->error("MySQL connection error: the provided ROOT_CA_PATH does not exists!"); } diff --git a/src/misc/utilities.php b/src/misc/utilities.php index e63dd57..d73a1e6 100644 --- a/src/misc/utilities.php +++ b/src/misc/utilities.php @@ -188,3 +188,7 @@ function time_elapsed_as_string($secs) return join(' ', $ret); } +function get_config_value($param_name, $default_value) { + return defined($param_name) ? constant($param_name) : $default_value; +} +