no more SQL_NAME_FORCE_QUOTE_EXP

diff --git a/etc/profile.d/puppet.sh b/etc/profile.d/puppet.sh
index 6b4fb5fa62a17a3cb002abe24bc61b480abbb258..16ae15b4d49ac99160b2e0b124f0654425062fb3 100644 (file)
--- a/etc/profile.d/puppet.sh
+++ b/etc/profile.d/puppet.sh
@@ -9,6 +9,10 @@ s/\s*\}\s*//;
 
 puppet_upgrade_modules() {
   local m
+  for m in $(puppet module list|perl -ne '/([\w-]+).*?v[\.\d]+/ and print "$1\n"'); do
+    puppet module upgrade "$m"
+  done
+  return
   local pwd=$PWD
   cd /etc/puppet/modules
   for m in $(puppet module list | awk '/\(.*v/ {print $2}'); do

diff --git a/lib/php/db.php b/lib/php/db.php
index a9c5611264e04437f340776c00caf7b62514f3c4..6fc708ad83894ae3c3bc733f131c5ccdcdc0fec1 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -8,7 +8,7 @@
 *****************************************************************************/
 require_once(dirname(__FILE__).'/nb.php');
 require_once(dirname(__FILE__).'/db/table.php');
-define('SQL_NAME_FORCE_QUOTE_EXP','^(range)$');
+# NB 29.12.15 define('SQL_NAME_FORCE_QUOTE_EXP','^(range)$');
 if (!defined('DB_HTML_FORM_BUTTONS')) define('DB_HTML_FORM_BUTTONS',''
   #.'<input type="button" class="button" value="Add" onclick="this.setAttribute(\'type\',\'submit\');this.setAttribute(\'name\',\'edit\')?1:1"/>'
   #.'<input type="button" class="button" value="Add" onclick="this.setAttribute(\'name\',\'edit\');this.parentElement.submit()?0:0"/>'
@@ -358,12 +358,12 @@ EOF;
   }
 
   function sql_name($value) {
-    if (preg_match('/^\w+$/',$value) and
-      (
-        !SQL_NAME_FORCE_QUOTE_EXP or
-        !preg_match('/'.SQL_NAME_FORCE_QUOTE_EXP.'/',$value)
-      )
-    ) return $value;
+# NB 29.12.15     if (preg_match('/^\w+$/',$value) and
+# NB 29.12.15       (
+# NB 29.12.15         !SQL_NAME_FORCE_QUOTE_EXP or
+# NB 29.12.15         !preg_match('/'.SQL_NAME_FORCE_QUOTE_EXP.'/',$value)
+# NB 29.12.15       )
+# NB 29.12.15     ) return $value;
     if ($this->type == 'mysql') return '`'.$value.'`';
     return '"'.$value.'"';
   }