lib/db/shell.php

diff --git a/lib/php/db/shell.php b/lib/php/db/shell.php
index 0f517375a139c72b9e61ec75e1eab20ad15e4b63..517dadf06012c19e0cf4515e2081a3307f06064b 100755 (executable)
--- a/lib/php/db/shell.php
+++ b/lib/php/db/shell.php
@@ -15,7 +15,7 @@ Db::pdef('format','human');
 $Db = null;
 $Table = null;
 
-$no_reset_params = [
+$NO_RESET_PARAMS = [
   'db',
   'table',
   'format',
@@ -48,7 +48,7 @@ action,a=[ls,reset]
   # Status
   if ($line == 'status' or $line == 's') {
     $line = str_repeat('-',20)."\n";
-    print_r(DB::p());
+    print_r(Db::p());
     continue;
   }
 
@@ -67,7 +67,7 @@ action,a=[ls,reset]
 }
 
 function db_shell_action($k,$v) {
-  global $DB_CONFS, $Db, $Table;
+  global $DB_CONFS, $Db, $Table, $NO_RESET_PARAMS;
   Db::pset($k,$v);
   $changed = [];
   Db::pinit($changed);
@@ -79,7 +79,7 @@ function db_shell_action($k,$v) {
 
       if ($v == 'reset') {
         $keep = [];
-        foreach (Db::p() as $k => $v) { if (in_array($k,$no_reset_params)) $keep[$k] = $v; }
+        foreach (Db::p() as $k => $v) { if (in_array($k,$NO_RESET_PARAMS)) $keep[$k] = $v; }
         $_REQUEST = [];
         $_POST = [];
         foreach ($keep as $k => $v) { Db::pset($k,$v); }
@@ -89,6 +89,7 @@ function db_shell_action($k,$v) {
 
       #bye($Db::p());
       if (Db::p('debug') == 'shell') {
+        #debug(['action'=>$v,Db::p()]);
         debug(Db::p());
         break;
       }
@@ -101,6 +102,7 @@ function db_shell_action($k,$v) {
         echo "!Database is missing, use db= or try help\n";
         break;
       }
+
       $Db->action($Db->p('action'),$Table);
       break;
 
@@ -120,7 +122,7 @@ function db_shell_action($k,$v) {
       break;
 
     case 'format':
-      if (isset($Db)) $DB->format = $v;
+      if (isset($Db)) $Db->format = $v;
       break;
 
     default: