From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Fri, 6 Sep 2024 20:06:49 +0000 (+0200)
Subject: bin/dbq-vi
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=547bac2590ec214931e05292ba0c31251e1ff9f2;p=nb.git

bin/dbq-vi
---

diff --git a/bin/dbq-vi b/bin/dbq-vi
index 4f98285c..238547c0 100755
--- a/bin/dbq-vi
+++ b/bin/dbq-vi
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/bash -l
+#/usr/bin/env bash
 tmp=/tmp/$USER-dbq-vi-$$.yaml
 
 main() {
@@ -19,6 +20,8 @@ EOF
 		sed -i -e 's/"//g' "$tmp"
 	else
 		echo "# UPDATE MODE" >> "$tmp"
+		id="$(urlencode "$id")"
+		#echo "$path/vi/$id.yaml"; return
 		dbq.php "$path/vi/$id.yaml" >> "$tmp" || return
 	fi
 
diff --git a/bin/dbq.php b/bin/dbq.php
index 306944fc..1c92b71c 100755
--- a/bin/dbq.php
+++ b/bin/dbq.php
@@ -29,7 +29,8 @@ if (isset($GLOBALS['argv']) and count($GLOBALS['argv'])>1) {
 			if (empty($data)) bye('No datas');
 			if (is_array($data[0])) $data = $data[0];
 
-			$_GET = $data;
+			# NB 06.09.24 $_GET = $data;
+			$_GET = array_merge($_GET,$data);
 
 		} elseif ($k == '__JSON__') {
 			$str = file_get_contents($v);
@@ -39,7 +40,8 @@ if (isset($GLOBALS['argv']) and count($GLOBALS['argv'])>1) {
 			if (empty($data)) bye('No datas');
 			if (is_array($data[0])) $data = $data[0];
 
-			$_GET = $data;
+			# NB 06.09.24 $_GET = $data;
+			$_GET = array_merge($_GET,$data);
 
 		} else {
 			$_GET[$k]= $v;
@@ -53,6 +55,8 @@ if (isset($GLOBALS['argv']) and count($GLOBALS['argv'])>1) {
 	# NB 05.09.24 if (!empty($_SERVER['QUERY_STRING'])) $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
 }
 
+#foreach ($_GET as $k => $v) { $_GET[$k] = urlencode($v); }
+
 #bye($_GET);
 $GLOBALS['argv'] = [$GLOBALS['argv'][0]]; # to cancel argv2request
 #$GLOBALS['argv'] = []; # to cancel argv2request