clean code

diff --git a/etc/dbs/nb.php b/etc/dbs/nb.php
index bda5549b9e5397502d3f382298db91a338867151..d5f933f674c662f7cc4d3c8363ae74dfb83dc977 100644 (file)
--- a/etc/dbs/nb.php
+++ b/etc/dbs/nb.php
@@ -10,7 +10,7 @@ $CONF['nb'] = array(
 );
 if (strpos(php_uname("n"),'ovh.net')!==false) $CONF['nb']['order'] = 1;
 
-$CONF['nb-sqlite'] = array (
+if (!empty($DIR_SQLITE)) $CONF['nb-sqlite'] = array (
   'host' => "$DIR_SQLITE/nb.db",
   'type' => 'sqlite',
   '_import' => '_nb',

diff --git a/lib/php/db.php b/lib/php/db.php
index dc252677483226dedb34578f9b6cb0c2567cf79f..b8cf5bc520df52a5560d927626b9c472d1e8252a 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -527,7 +527,7 @@ class Db extends nb {
     # Load all files into a $h if #files is not a hash
 
     $h = [];
-      if (is_scalar($files)) $files = array($files);
+    if (is_scalar($files)) $files = array($files);
 
     foreach ($files as $file) {
       if (!is_readable($file)) continue;
@@ -590,9 +590,9 @@ class Db extends nb {
   * @copyright NB 12.08.16
   * Return a db hash to create a new instance from $conf
   */
-  public static function conf_search_db($conf) {
+  public static function conf_search_db($conf,$id=null) {
 
-    $id = self::p('db');
+    if (empty($id)) $id = self::p('db');
 
     # Load databases
     $conf = self::is_hash($conf) ? $conf : self::conf_load($conf);
@@ -631,9 +631,6 @@ class Db extends nb {
       'id'   => $id,
     ));
 
-    # Search table
-    #$table = Db::p('table');
-
     return $db;
   }