valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finalize config:: migration; make config.php optional

This commit is contained in:
Andrew Dolgov 2021-02-22 22:51:12 +03:00
parent 6b7af973b2
commit 445ac1213c
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/config.php
View File

@ -2,7 +2,9 @@
class Config { class Config {
private const _ENVVAR_PREFIX = "TTRSS_"; 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_TYPE = "DB_TYPE";
const DB_HOST = "DB_HOST"; const DB_HOST = "DB_HOST";

4
classes/db.php
View File

@ -17,8 +17,8 @@ class Db
// normal usage is Db::pdo()->prepare(...) etc // normal usage is Db::pdo()->prepare(...) etc
public function pdo_connect() { public function pdo_connect() {
$db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : ''; $db_port = Config::get(Config::DB_PORT) ? ';port=' . Config::get(Config::DB_PORT) : '';
$db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : ''; $db_host = Config::get(Config::DB_HOST) ? ';host=' . Config::get(Config::DB_HOST) : '';
try { try {
$pdo = new PDO(Config::get(Config::DB_TYPE) . ':dbname=' . Config::get(Config::DB_NAME) . $db_host . $db_port, $pdo = new PDO(Config::get(Config::DB_TYPE) . ':dbname=' . Config::get(Config::DB_NAME) . $db_host . $db_port,

5
include/functions.php
View File

@ -30,7 +30,10 @@
ini_set('display_errors', "false"); ini_set('display_errors', "false");
ini_set('display_startup_errors', "false"); ini_set('display_startup_errors', "false");
require_once "config.php"; // config.php is optional
if (stream_resolve_include_path("config.php"))
require_once "config.php";
require_once "autoload.php"; require_once "autoload.php";
if (Config::get(Config::DB_TYPE) == "pgsql") { if (Config::get(Config::DB_TYPE) == "pgsql") {