www/dbq/dbq.php

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 51776000d1001bf15d91bb9140cdc019678c6f36..66a6528bf738d1387a1dd7d4bc3b4cf623f6a41a 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -450,14 +450,14 @@ class DbQ extends nb {
                        'row_parse_post' => function(&$r){
 
                                $args = $GLOBALS['dbq_args'];
-                               $_r = $r;
+                               $hidden = $this->form_hidden($r);
 
-                               $r = array_merge(['view' => ''
+                               $r = $this->ar_unshift($r,'view',''
                                        .'<form action="'.$this->table->base.'/vi'.'" method="post">'
                                        .'<a class="button select vi" href="'.$this->table->base.'/vi'.'" onclick="parentNode.submit();return false;">View</a>'
-                                       .$this->form_hidden($_r)
+                                       .$hidden
                                        .'</form>'
-                               ],$r);
+                               );
 
                                if ($this->perm < self::DELETE) return;
                                if ($this->db->type == 'sqlite' and !is_writeable($this->db->host)) return;
@@ -466,7 +466,7 @@ class DbQ extends nb {
                                $r['delete'] = ''
                                        .'<form action="'.$rm.'" method="post" class="rm">'
                                        .'<a class="button rm" href="'.$rm.'" onclick="parentNode.submit();return false;">Delete</a>'
-                                       .$this->form_hidden($_r)
+                                       .$hidden
                                        .'</form>'
                                ;
 
@@ -477,8 +477,19 @@ class DbQ extends nb {
                unset($GLOBALS['dbq_args']);
        }
 
+       private function ar_unshift( array & $array, $key, $val) {
+# NB 05.01.18: Escape html ??????? we use reverse
+# NB 05.01.18          return $array + [ $key => $val ];
+    $array = array_reverse($array, 1);
+    $array[$key] = $val;
+    $array = array_reverse($array, 1);
+
+    return $array;
+       }
 
        public static function uri_add_referer($rm) {
+
+
                if (isset($_SERVER['REQUEST_URI'])) {
                        $rm .= (strpos($rm,'?') ? '' : '?') . 'referer=' . urlencode($_SERVER['REQUEST_URI']);
                }

diff --git a/www/dbq/html/default.css b/www/dbq/html/default.css
index d9d555c03192ea68b591d3c6b37a016d982bb534..3242108b64e8774dad0e6c759ec69bff360eed8b 100644 (file)
--- a/www/dbq/html/default.css
+++ b/www/dbq/html/default.css
@@ -273,6 +273,7 @@ form.menu .criterias span.label {
        margin: 0.2em 0.2em 0 0;
        border-radius: 3px;
 }
+
 form.menu .criterias span.label:last-child {
        border-right: none;
 }