From 5f55358b111ea156ce191719cc80bac971e53be4 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Wed, 30 Mar 2016 00:21:54 +0100
Subject: [PATCH] rename DB_JUST_INIT, fix bugs

---
 lib/php/db/table.php | 75 ++++++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 31 deletions(-)

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index 15281c0d..99c06fbc 100644
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -1170,7 +1170,20 @@ Class Table extends nb {
 
     $r = '<form class="menu" method="get" action="?">'.NB_EOL;
 
+    //
+    // Hiddens
+    //
+    foreach (array(
+      'db',
+      'debug',
+    ) as $v) {
+      $r .= '<input type="hidden" name="'.$v.'" value="'.$this->p($v).'"/>';
+    }
+    $r .= '<input type="hidden" name="download" value="0"/>'; // Embed for no html format
+
+    //
     // Criterias
+    //
     $r .= '<div class="criterias">';
     foreach ( array_keys($this->fields()) as $k ) {
 
@@ -1187,31 +1200,11 @@ Class Table extends nb {
     }
     $r .= '</div>';
 
-    //
-    // Hiddens
-    //
-    foreach (array(
-      'db',
-      'debug',
-    ) as $v) {
-      $r .= '<input type="hidden" name="'.$v.'" value="'.$this->p($v).'"/>';
-    }
-    $r .= '<input type="hidden" name="download" value="0"/>'; // Embed for no html format
-
     //
     // Options
     //
     $r .= '<div class="options">';
 
-    // Tables
-    $r .= '<span class="label">';
-    $r .= '<label for="table">Tables</label>'.html_select_array(array_keys($this->db()->tables()),array(
-      'html'       => 'class="tables" name="table" id="table"',
-      'selected'   => $this->p('table'),
-      'prettyText' => true,
-    ));
-    $r .= '</span>';
-
     // Format
     $r .= '<span class="label">';
 
@@ -1225,29 +1218,49 @@ Class Table extends nb {
     ));
     $r .= '</span>';
 
-    // Limit
-    if (!empty($this->db()->limits)) {
+    // Dbs
+    if (!empty($this->db()->dbs) and count($this->db()->dbs)>1) {
       $r .= '<span class="label">';
-      $r .= '<label for="limit">Limit</label>'.html_select_array($this->db()->limits,array(
-        'html'       => 'class="limit" name="limit" id="limit"',
-        'selected'   => $this->p('limit'),
+      $r .= '<label for="db">Db</label>'.html_select_array($this->db()->dbs,array(
+        'html'       => 'class="dbs" onchange="document.location=\''.preg_replace('/\?.*$/','',$_SERVER['REQUEST_URI']).'?db=\'+this.value"',
+        'selected'   => $this->name,
         'prettyText' => true,
       ));
       $r .= '</span>';
     }
 
-    // Dbs
-    if (!empty($this->db()->dbs) and count($this->db()->dbs)>1) {
+    // Tables
+    $r .= '<span class="label">';
+    $r .= '<label for="table">Tables</label>'.html_select_array(array_keys($this->db()->tables()),array(
+      'html'       => 'class="tables" name="table" id="table"',
+      'selected'   => $this->p('table'),
+      'prettyText' => true,
+    ));
+    $r .= '</span>';
+
+    // Limit
+    if (!empty($this->db()->limits)) {
       $r .= '<span class="label">';
-      $r .= '<label for="db">Db</label>'.html_select_array($this->db()->dbs,array(
-        'html'       => 'class="dbs" onchange="document.location=\''.preg_replace('/\?.*$/','',$_SERVER['REQUEST_URI']).'?db=\'+this.value"',
-        'selected'   => $this->name,
+      $r .= '<label for="limit">Limit</label>'.html_select_array($this->db()->limits,array(
+        'html'       => 'class="limit" name="limit" id="limit"',
+        'selected'   => $this->p('limit'),
         'prettyText' => true,
       ));
       $r .= '</span>';
     }
 
-    $r .= '</div>';
+    // Order By
+    /*
+    $r .= '<span class="label">';
+    $r .= '<label for="limit">OrderBy</label>'.html_select_array(array_keys($this->fields()),array(
+      'html'       => 'class="orderby" name="orderby" id="orderby"',
+      'selected'   => $this->p('orderby'),
+      'prettyText' => true,
+    ));
+    $r .= '</span>';
+    */
+
+    $r .= '</div>'; # < options
 
     ///
     // Bye
-- 
2.47.3