bin/dbq-vi

diff --git a/bin/dbq-vi b/bin/dbq-vi
index 4f98285cd9d029927f95e546bb933f3c37c88b5a..238547c05bd8d3a83a201c63c2dbf05fd378b9b3 100755 (executable)
--- 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 306944fccdeab8294d90e9dda904102e1b81bde4..1c92b71cee01f8d9ac6651a2e8d154da82336b18 100755 (executable)
--- 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