aliases

diff --git a/lib/php/db/index.php b/lib/php/db/index.php
index 6a528f7d6c94959223e650e897db64dcdb0db42c..2ff262f04e5bfcb4ee21ae375a56c2dc9ecec3e6 100755 (executable)
--- a/lib/php/db/index.php
+++ b/lib/php/db/index.php
@@ -10,16 +10,17 @@ require_once(dirname(__FILE__).'/../config.php');
 require_once(dirname(__FILE__).'/../db.php');
 /*
 # TODO - NB 08.04.16
-$aliases = array(
+*/
+Db::paliases(array(
   'd' => 'db',
   't' => 'table',
   'f' => 'format',
   'l' => 'limit',
   'a' => 'action',
   'h' => 'header',
-);
-*/
+));
 
+# Set format from client Accept if != html
 #bye(out::client_type());
 Db::pdef('format',out::client_type());
 #if($format = out::client_type()) Db::pset('format',$format);
@@ -30,11 +31,11 @@ if (preg_match('/^(\w+)\.(.*?)$/',Db::p('table'),$m)) {
   Db::pset('table',$m[2]);
 }
 
-if(defined('DB_NO_INIT')) return true;
+if(defined('DB_NO_INIT') and DB_NO_INIT) return true;
 #bye(Db::conf_dbs(array( Db::ROOT_DIR.'/etc/dbs.yaml','/etc/dbs.yaml' )));
 #$conf = Db::conf_dbs(array( Db::ROOT_DIR.'/etc/dbs.yaml','/etc/dbs.yaml' )); Db::init($conf);
 Db::init(array( Db::ROOT_DIR.'/etc/dbs.yaml',Db::ROOT_DIR.'/etc/dbs.php','/etc/dbs.yaml' ));
 
-if(defined('DB_NO_ACTION')) return true;
+if(defined('DB_NO_ACTION') and DB_NO_ACTION) return true;
 return $Db->action($Table);
 ?>