diff options
| author | Andrew Dolgov <[email protected]> | 2021-02-22 22:51:12 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-02-22 22:51:12 +0300 |
| commit | 445ac1213c52360046e87508d2060d1b3620a7a0 (patch) | |
| tree | e8ead7912891980e6b2fed130f1aaf4fa8676fc6 /classes | |
| parent | 6b7af973b2264ec643ae7b46113ee54d10451fd7 (diff) | |
finalize config:: migration; make config.php optional
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/config.php | 4 | ||||
| -rwxr-xr-x | classes/db.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/classes/config.php b/classes/config.php index 349706390..b154206da 100644 --- a/classes/config.php +++ b/classes/config.php @@ -2,7 +2,9 @@ class Config { private const _ENVVAR_PREFIX = "TTRSS_"; - /* overriding defaults (defined below in _DEFAULTS[]) via environment: DB_TYPE becomes TTRSS_DB_TYPE, etc */ + // TODO: this should be extensible so plugins could add their own global directives (with defaults) + + // overriding defaults (defined below in _DEFAULTS[]) via environment: DB_TYPE becomes TTRSS_DB_TYPE, etc const DB_TYPE = "DB_TYPE"; const DB_HOST = "DB_HOST"; diff --git a/classes/db.php b/classes/db.php index 5196e7c7d..cbfb9e598 100755 --- a/classes/db.php +++ b/classes/db.php @@ -17,8 +17,8 @@ class Db // normal usage is Db::pdo()->prepare(...) etc public function pdo_connect() { - $db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : ''; - $db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : ''; + $db_port = Config::get(Config::DB_PORT) ? ';port=' . Config::get(Config::DB_PORT) : ''; + $db_host = Config::get(Config::DB_HOST) ? ';host=' . Config::get(Config::DB_HOST) : ''; try { $pdo = new PDO(Config::get(Config::DB_TYPE) . ':dbname=' . Config::get(Config::DB_NAME) . $db_host . $db_port, |