LesLibres.org/Rss-Bridge
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[Configuration] Make file paths explicit

Browse source
This commit is contained in:
logmanoriginal 2018-11-18 15:41:28 +01:00
parent fd4124cda2
commit 4348119adf
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/Configuration.php
View file

@ -124,6 +124,8 @@ final class Configuration {
* - `config.ini.php`: The local configuration file that can be modified by * - `config.ini.php`: The local configuration file that can be modified by
* server administrators. * server administrators.
* *
* The files must be located at {@see PATH_ROOT}
*
* RSS-Bridge will first load `config.default.ini.php` into memory and then * RSS-Bridge will first load `config.default.ini.php` into memory and then
* replace parameters with the contents of `config.ini.php`. That way new * replace parameters with the contents of `config.ini.php`. That way new
* parameters are automatically initialized with default values and custom * parameters are automatically initialized with default values and custom
@ -137,21 +139,20 @@ final class Configuration {
* *
* @return void * @return void
* *
* @todo Use {@see PATH_ROOT} to locate configuration files.
* @todo Add documentation for constants defined by this function. * @todo Add documentation for constants defined by this function.
*/ */
public static function loadConfiguration() { public static function loadConfiguration() {
if(!file_exists('config.default.ini.php')) if(!file_exists(PATH_ROOT . 'config.default.ini.php'))
die('The default configuration file "config.default.ini.php" is missing!'); die('The default configuration file "config.default.ini.php" is missing!');
Configuration::$config = parse_ini_file('config.default.ini.php', true, INI_SCANNER_TYPED); Configuration::$config = parse_ini_file(PATH_ROOT . 'config.default.ini.php', true, INI_SCANNER_TYPED);
if(!Configuration::$config) if(!Configuration::$config)
die('Error parsing config.default.ini.php'); die('Error parsing config.default.ini.php');
if(file_exists('config.ini.php')) { if(file_exists(PATH_ROOT . 'config.ini.php')) {
// Replace default configuration with custom settings // Replace default configuration with custom settings
foreach(parse_ini_file('config.ini.php', true, INI_SCANNER_TYPED) as $header => $section) { foreach(parse_ini_file(PATH_ROOT . 'config.ini.php', true, INI_SCANNER_TYPED) as $header => $section) {
foreach($section as $key => $value) { foreach($section as $key => $value) {
// Skip unknown sections and keys // Skip unknown sections and keys
if(array_key_exists($header, Configuration::$config) && array_key_exists($key, Configuration::$config[$header])) { if(array_key_exists($header, Configuration::$config) && array_key_exists($key, Configuration::$config[$header])) {
@ -227,7 +228,7 @@ final class Configuration {
*/ */
public static function getVersion() { public static function getVersion() {
$headFile = '.git/HEAD'; $headFile = PATH_ROOT . '.git/HEAD';
// '@' is used to mute open_basedir warning // '@' is used to mute open_basedir warning
if(@is_readable($headFile)) { if(@is_readable($headFile)) {