add option to specify config file

[bdrem.git] / src / bdrem / Config.php

diff --git a/src/bdrem/Config.php b/src/bdrem/Config.php
index a79b1b3c5b53ec21799689f9903d057a1189d448..57d0cfd7d1995527cb8163b3bb0355756071e417 100644 (file)
--- a/src/bdrem/Config.php
+++ b/src/bdrem/Config.php
@@ -3,19 +3,26 @@ namespace bdrem;
 
 class Config
 {
 
 class Config
 {

-    public $source;

     public $date;
     public $date;

-    public $daysPrev = 3;
-    public $daysNext = 7;
+    public $daysPrev;
+    public $daysNext;

     public $locale;
     public $locale;

-    public $stopOnEmpty = false;
+    public $renderer;
+    public $source;
+    public $stopOnEmpty;

 
     public $cfgFiles = array();
     public $cfgFileExists;
 
 
     public $cfgFiles = array();
     public $cfgFileExists;
 

-    public function load()
+
+
+    public function __construct()

     {
         $this->loadConfigFilePaths();
     {
         $this->loadConfigFilePaths();

+    }
+
+    public function load()
+    {

         foreach ($this->cfgFiles as $file) {
             if (file_exists($file)) {
                 $this->cfgFileExists = true;
         foreach ($this->cfgFiles as $file) {
             if (file_exists($file)) {
                 $this->cfgFileExists = true;


@@ -45,7 +52,9 @@ class Config
         include $filename;
         $vars = get_defined_vars();
         foreach ($vars as $k => $value) {
         include $filename;
         $vars = get_defined_vars();
         foreach ($vars as $k => $value) {

-            $this->$k = $value;
+            if (!isset($this->$k) || $this->$k === null) {
+                $this->$k = $value;
+            }

         }
     }
 
         }
     }