name criteria as regexp

diff --git a/lib/php/db.php b/lib/php/db.php
index 05596e46c79fdb9e6a8d6810eb39d1f89d27fdfb..95da7c9b3de224569deaa6a3c9e7bb44cb867bc6 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -399,11 +399,14 @@ class Db extends nb {
           # Filters
           $name = self::p('name','');
           $type = self::p('type','');
+
           foreach ($this->tables() as $t) {
-            if (!empty($name) and strpos($t->name,$name) === false) continue;
+# NB 27.06.16             if (!empty($name) and strpos($t->name,$name) === false) continue;
+            if (!empty($name) and !preg_match('/'.$name.'/',$t->name)) continue;
             if (!empty($type) and strpos($t->type,$type) === false) continue;
             $rows[] = $t->infos();
           }
+
           $return = $this->out($rows);
 
         } elseif ($action == 'db.conf') {
@@ -423,7 +426,8 @@ class Db extends nb {
               foreach ($fields as $k) {
                 if (!isset($d->$k)) continue; $db[$k] = $d->$k;
               }
-            if (!empty($name) and strpos($db['name'],$name) === false) continue;
+# NB 27.06.16             if (!empty($name) and strpos($db['name'],$name) === false) continue;
+            if (!empty($name) and !preg_match('/'.$name.'/',$db['name'])) continue;
             if (!empty($type) and strpos($db['type'],$type) === false) continue;
               $dbs[] = $db;
             }
@@ -623,7 +627,8 @@ class Db extends nb {
     foreach ($tables as $t) {
       if (!empty($tables) and empty($tables[$t->name])) continue;
       if (!empty($type) and strpos($t->type,$type) === false) continue;
-      if (!empty($name) and strpos($t->name,$name) === false) continue;
+# NB 27.06.16       if (!empty($name) and strpos($t->name,$name) === false) continue;
+      if (!empty($name) and !preg_match('/'.$name.'/',$t->name)) continue;
 
       if ($insert) {
         echo "\n-- Table: ".$t->name."\n";