bin/dbq.php

diff --git a/bin/dbq.php b/bin/dbq.php
index 353bbf09d766c25aa7cd0ce508cea7968483ddf2..12d91a09df217a3255e2463ae0e8f05c255afce6 100755 (executable)
--- a/bin/dbq.php
+++ b/bin/dbq.php
@@ -8,5 +8,22 @@
 * Fix confusion between nb_api and bin/dbq
 * use instead directly what is used by nginx and do the query localy, otherwise just use curl
 */
+$_SERVER['REQUEST_URI'] = '/';
+$_SERVER['QUERY_STRING'] = '';
+
+# NB 30.08.24: argv 2 query  
+if (isset($GLOBALS['argv']) and count($GLOBALS['argv'])>1) {
+
+       $_SERVER['REQUEST_URI'] = $GLOBALS['argv'][1];
+
+       for($i=2;$i<count($GLOBALS['argv']);$i++) {
+               list($k,$v) = explode('=',trim($GLOBALS['argv'][$i]));  
+               $_GET[$k]= $v;
+               $_SERVER['QUERY_STRING'] .= (empty($_SERVER['QUERY_STRING']) ? '' : '&').trim($GLOBALS['argv'][$i]);
+       }
+
+       if (!empty($_SERVER['QUERY_STRING'])) $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
+}
+
 require(realpath(dirname(__FILE__).'/../www/dbq/dbq.php'));
 ?>

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 934d5be5302e7a064749a6ad88586c47dec382f4..41ab6e69e6c245e8056a1ac232a900968cd9e4a6 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -785,7 +785,9 @@ class DbQ extends nb {
                $path = '';
                $args = '';
 
-               if (empty($_SERVER['REQUEST_URI'])) $_SERVER['REQUEST_URI'] = join('/',( count($GLOBALS['argv'])>0 ) ? array_slice($GLOBALS['argv'],1) : []);
+               #bye($GLOBALS['argv']);
+               # NB 30.08.24: Done in bin/dbq.php 
+               //if (empty($_SERVER['REQUEST_URI'])) $_SERVER['REQUEST_URI'] = join('/',( count($GLOBALS['argv'])>0 ) ? array_slice($GLOBALS['argv'],1) : []);
 
                list ($path,$args) = strpos($_SERVER['REQUEST_URI'],'?') ? explode('?',$_SERVER['REQUEST_URI']) : [$_SERVER['REQUEST_URI'],''];
                $this->uri = $path;