lib/php/db.php

diff --git a/lib/php/db/config.php b/lib/php/db/config.php
index ef93521051a5958fca302cca8b72a45dc1231c24..e44a9845c992290e7b1a93a79400fc23b956f439 100644 (file)
--- a/lib/php/db/config.php
+++ b/lib/php/db/config.php
@@ -38,16 +38,6 @@ if (!empty($_SERVER['DBQ_CONF_DIR'])) {
 # NB 08.01.18: TODEL 
 if (empty($DB_CONFS)) $DB_CONFS = array_merge([],
 
-  # ::ROOT_DIR
-# NB 04.01.18   [
-# NB 04.01.18     Db::ROOT_DIR.'/etc/dbq.yml',
-# NB 04.01.18     Db::ROOT_DIR.'/etc/dbq.yaml',
-# NB 04.01.18     Db::ROOT_DIR.'/etc/dbq.php',
-# NB 04.01.18   ],
-  (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yml'),
-  (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yaml'),
-  (array)glob(Db::ROOT_DIR.'/etc/dbq/*.php'),
-
   # /etc
   [
     '/etc/dbq.yml',
@@ -68,6 +58,12 @@ if (empty($DB_CONFS)) $DB_CONFS = array_merge([],
   (array)glob($_SERVER['HOME'].'/.dbq/*.yaml'),
   (array)glob($_SERVER['HOME'].'/.dbq/*.php'),
   #] ),
+
+  # ROOT_DIR
+  (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yml'),
+  (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yaml'),
+  (array)glob(Db::ROOT_DIR.'/etc/dbq/*.php'),
+
 []);
 
 #bye($DB_CONFS);

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index f70750e72053006a9e70130dde4030150b1274e8..d5e714802c03809b142b07722677e84f807f2c85 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -348,26 +348,7 @@ class DbQ extends nb {
                if (!empty($this->db)) return $this->db;
                require_once(NB_ROOT.'/lib/php/db.php');
 
-               // New
-               /*
-               global $DB_CONFS;
-               if(empty($DB_CONFS)) $DB_CONFS = [];
-
-               if (!empty($_SERVER['DBQ_CONF_FILE'])) {
-                       $DB_CONFS = array_merge($DB_CONFS,explode(' ',$_SERVER['DBQ_CONF_FILE']));
-               }
-
-               if (!empty($_SERVER['DBQ_CONF_DIR'])) {
-                       foreach (explode(' ',$_SERVER['DBQ_CONF_DIR']) as $dir) {
-                               $DB_CONFS = array_merge($DB_CONFS,
-                                       (array)glob($dir.'/*.yml'),
-                                       (array)glob($dir.'/*.yaml'),
-                                       (array)glob($dir.'/*.php'),
-                               []);
-                       }
-               }
-        */
-
+               // Load confs
                if (empty($DB_CONFS)) {
                        require_once(NB_ROOT.'/lib/php/db/config.php');
                } else {