commit a696c5ffa2731de60a07f93ea2fa66c0087914ed
parent 72f33ade1652dbad49cf2524aaf71c5fc5dd9a18
Author: Jan Dankert <devnull@localhost>
Date: Fri, 8 Dec 2017 22:55:56 +0100
Prettify....
Diffstat:
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/modules/configuration/Configuration.class.php b/modules/configuration/Configuration.class.php
@@ -11,7 +11,7 @@
*/
class Configuration
{
- public static $defaultConfigFile = './config/config.yml';
+ public static $configFile = './config/config.yml';
/**
* Ermittelt den Zeitpunkt der letzten Ă„nderung der Konfigurationsdatei.
@@ -20,7 +20,7 @@ class Configuration
*/
public static function lastModificationTime()
{
- return filemtime(self::$defaultConfigFile);
+ return filemtime(self::$configFile);
}
@@ -31,7 +31,7 @@ class Configuration
*/
public static function load()
{
- $customConfig = Spyc::YAMLLoad(self::$defaultConfigFile);
+ $customConfig = Spyc::YAMLLoad(self::$configFile);
// Does we have includes?
if (isset($customConfig['include'])) {
@@ -92,8 +92,8 @@ class Configuration
// Den Dateinamen der Konfigurationsdatei in die Konfiguration schreiben.
- $customConfig['config']['last_modification_time'] = filemtime(self::$defaultConfigFile);
- $customConfig['config']['last_modification'] = date('r', filemtime(self::$defaultConfigFile));
+ $customConfig['config']['last_modification_time'] = filemtime(self::$configFile);
+ $customConfig['config']['last_modification'] = date('r', filemtime(self::$configFile));
$customConfig['config']['read'] = date('r');
@@ -127,12 +127,11 @@ class Configuration
return $_SERVER[strtoupper($value)];
break;
default:
+ return "";
}
},
$file);
-
- return $file;
}
}