lib/php/db/table.php

diff --git a/lib/php/nb.php b/lib/php/nb.php
index 748c7b2456a3c1919b466f46ea8fb32d4346a8e6..fb0aa914a34eda1cac70af31f7ad48198f54b4f3 100644 (file)
--- a/lib/php/nb.php
+++ b/lib/php/nb.php
@@ -12,6 +12,7 @@ require_once(NB_ROOT.'/lib/php/functions.php');
 
 if (class_exists('NB')) return; # protect against double include
 class NB {
+       #public static function test() { static $i=0; echo ($i++)."\n"; }
 
        const ROOT_DIR = NB_ROOT;
        const NB_ROOT = NB_ROOT;
@@ -38,8 +39,6 @@ class NB {
 # NB 19.01.18          'php'  => 'text/x-php',
 # NB 19.01.18  );
 
-       #public static function zaza() { return (is_object($this) ? 'TRUE' : 'FALSE'); }
-       #public static function test() { return 'TEST'; }
        public function __construct($opt = array()) {
 
                # Deep merge of vars

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 04140e3773988d28a76560282b7a0a5021e6d705..b0c8d261dfe34b9055d217a593cd4e07772661d5 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -1137,7 +1137,8 @@ EOF;
                } elseif ($action == 'logout') { $this->page($this,'logout'); 
                } elseif ($action == 'ssha_password') { $this->page($this,'ssha_password');
                } elseif ($action == 'ssha512_password') { $this->page($this,'ssha512_password');
-               } elseif ($action == 'cryptkey') { $this->page($this->db,'cryptkey',['key']);
+# NB 03.02.18          } elseif ($action == 'cryptkey') { $this->page($this,'cryptkey',['key']);
+               } elseif ($action == 'cryptkey') { $this->page($this->cryptkey());
                } elseif ($action == 'status') { $this->page($this,'status');
                } elseif ($action == 'conf') { $this->page($this,'conf');
                } elseif ($action == 'types') {