From: Devops <sys@15gifts.com>
Date: Mon, 15 May 2017 16:19:53 +0000 (+0100)
Subject: lib/php/functions.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=3215f2e581eacfb40b13cdd416dde774972ce482;p=nb.git

lib/php/functions.php
---

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index d720fb84..29f408bc 100644
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -1995,6 +1995,7 @@ Class Table extends nb {
           'selected'   => $this->p('limit'),
           'prettyText' => true,
           'sort' => 'sort',
+          'default_value' => $this->db()->limits[0],
         ]);
         $r .= '</span>';
       }
diff --git a/lib/php/functions.php b/lib/php/functions.php
index d63ecbaa..3886fda5 100644
--- a/lib/php/functions.php
+++ b/lib/php/functions.php
@@ -188,7 +188,7 @@ function cmd2str($cmd,$write=null) {
 
 function argv2request($args=null) { return nb::argv2request($args); }
 
-function html_select_array($data,$opt=array()) {
+function html_select_array($data,$opt=[]) {
 
   $html = '<select';
   if (!empty($opt['html'])) $html .= ' '.preg_replace('/^\s+/','',$opt['html']);
@@ -207,6 +207,9 @@ function html_select_array($data,$opt=array()) {
     else $opt['sort']($data);
   }
 
+  $default = '';
+  if (!empty($opt['default_value'])) $default = $opt['default_value'];
+
   foreach ($data as $d) {
 
     if (is_array($d)) {
@@ -219,7 +222,7 @@ function html_select_array($data,$opt=array()) {
     $lib = htmlentities($lib);
     if (!empty($opt['prettyText'])) $lib = prettyText($lib);
 
-    $html .= '<option value="'.$val.'"'
+    $html .= '<option value="'.($default == $val ? '' : $val).'"'
       .( ($opt['selected']!==NULL and strcmp((string)$opt['selected'],$val)===0) ?' selected="selected"':'')
     .'>'.$lib.'</option>'.NB_EOL;
 
diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 4e1935f5..0d0466d7 100644
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -128,7 +128,7 @@ class DbQ extends nb {
   }
 
   public function limit($set=false) {
-    static $limit=false;
+    static $limit = false;
     if ($set !== false) return ($limit = $set);
 
     if ($limit !== false) return $limit;