lib/php/db/config.php

diff --git a/lib/php/db/config.php b/lib/php/db/config.php
index a1cc6087f8dd18a79fca46a1653cb23f730ce326..ef93521051a5958fca302cca8b72a45dc1231c24 100644 (file)
--- a/lib/php/db/config.php
+++ b/lib/php/db/config.php
@@ -1,14 +1,32 @@
 <?php
 require_once(realpath(dirname(__FILE__).'/../config.php'));
 require_once(NB_ROOT.'/lib/php/db.php');
+if (empty($_SERVER['HOME'])) $_SERVER['HOME'] = '';
 if (empty($DB_CONFS)) $DB_CONFS = [];
+$SEP = ' ';
 
+if (empty($_SERVER['DBQ_CONF_FILE'])) $_SERVER['DBQ_CONF_FILE'] = join($SEP,[
+       '/etc/dbq.yml',
+       '/etc/dbq.yaml',
+       '/etc/dbq.php',
+       $_SERVER['HOME'].'/.dbq.yml',
+       $_SERVER['HOME'].'/.dbq.yaml',
+       $_SERVER['HOME'].'/.dbq.php',
+]);
 if (!empty($_SERVER['DBQ_CONF_FILE'])) {
-       $DB_CONFS = array_merge($DB_CONFS,explode(' ',$_SERVER['DBQ_CONF_FILE']));
+       $DB_CONFS = array_merge($DB_CONFS,explode($SEP,$_SERVER['DBQ_CONF_FILE']));
+       foreach (explode(' ',$_SERVER['DBQ_CONF_FILE']) as $file) {
+               $DB_CONFS = array_merge($DB_CONFS,(array)glob($file));
+       }
 }
 
+if (empty($_SERVER['DBQ_CONF_DIR'])) $_SERVER['DBQ_CONF_DIR'] = join($SEP,[
+       Db::ROOT_DIR.'/etc/dbq',
+       '/etc/dbq',
+       $_SERVER['HOME'].'/.dbq',
+]);
 if (!empty($_SERVER['DBQ_CONF_DIR'])) {
-       foreach (explode(' ',$_SERVER['DBQ_CONF_DIR']) as $dir) {
+       foreach (explode($SEP,$_SERVER['DBQ_CONF_DIR']) as $dir) {
                $DB_CONFS = array_merge($DB_CONFS,
                        (array)glob($dir.'/*.yml'),
                        (array)glob($dir.'/*.yaml'),
@@ -17,7 +35,7 @@ if (!empty($_SERVER['DBQ_CONF_DIR'])) {
        }
 }
 
-if (empty($_SERVER['HOME'])) $_SERVER['HOME'] = '';
+# NB 08.01.18: TODEL 
 if (empty($DB_CONFS)) $DB_CONFS = array_merge([],
 
   # ::ROOT_DIR