#558: In case of 404, try to propose the nearest valid address

[platal.git] / classes / pltableeditor.php

diff --git a/classes/pltableeditor.php b/classes/pltableeditor.php
index a2ea533..3fe9dce 100644 (file)
--- a/classes/pltableeditor.php
+++ b/classes/pltableeditor.php
@@ -38,6 +38,7 @@ class PLTableEditor {
     var $nbfields;
     // the field for sorting entries
     var $sortfield;
+    var $sortdesc = false;
     // action to do to delete row:
        // null => delete effectively, false => no deletion, SQL
     var $delete_action;
@@ -48,7 +49,8 @@ class PLTableEditor {
      * $idfield : the field of the table which is the id, ex: id
      * $editid : is the id editable or not (if not, it is considered as an int)
      */
-    function PLTableEditor($plname, $table, $idfield, $editid=false) {
+    function PLTableEditor($plname, $table, $idfield, $editid=false)
+    {
         $this->pl = $plname;
         $this->table = $table;
         $this->idfield = $idfield;
@@ -60,7 +62,7 @@ class PLTableEditor {
             // desc will be the title of the column
             $a['desc'] = $a['Field'];
             $a['display'] = true;
-            
+
             if (substr($a['Type'],0,8) == 'varchar(') {
                 // limit editing box size
                 $a['Size'] = $a['Maxlength'] = substr($a['Type'], 8, strlen($a['Type']) - 9);
@@ -73,7 +75,12 @@ class PLTableEditor {
             elseif (substr($a['Type'],0,4) == 'set(') {
                 // get the list of options
                 $a['List'] = explode('§',str_replace("','","§",substr($a['Type'], 5, strlen($a['Type']) - 7)));
-                $a['Type'] = 'set';
+                if (count($a['List']) == 1) {
+                    $a['Type'] = 'checkbox';
+                    $a['Value'] = $a['List'][0];
+                } else {
+                    $a['Type'] = 'set';
+                } 
             }
             elseif (substr($a['Type'],0,5) == 'enum(') {
                 // get the list of options
@@ -88,6 +95,15 @@ class PLTableEditor {
         }
         $this->vars[$idfield]['desc'] = 'id';
     }
+    // called before creating a new entry
+    function prepare_new()
+    {
+        $entry = array();
+        foreach ($this->vars as $field => $descr) {
+            $entry[$field] = $descr['Default'];
+        }
+        return $this->prepare_edit($entry);
+    }
     // called before editing $entry
     function prepare_edit(&$entry) {
         foreach ($this->vars as $field => $descr) {
@@ -101,7 +117,7 @@ class PLTableEditor {
             if ($descr['Type'] == 'timestamp') {
                 // set readable timestamp
                 $date =& $entry[$field];
-                $date = preg_replace('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', '\3/\2/\1 \4:\5:\6', $date); 
+                $date = preg_replace('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', '\3/\2/\1 \4:\5:\6', $date);
             }
             if ($descr['Type'] == 'date') {
                 $date =& $entry[$field];
@@ -115,7 +131,7 @@ class PLTableEditor {
         $this->vars[$name]['desc'] = $desc;
         $this->vars[$name]['display'] = $display;
     }
-    // add a join table, when deleting a row corresponding entries will be deleted in these tables 
+    // add a join table, when deleting a row corresponding entries will be deleted in these tables
     function add_join_table($name,$joinid,$joindel,$joinextra="") {
         if ($joindel)
             $this->jtables[$name] = array("joinid" => $joinid,"joinextra" => $joinextra?(" AND ".$joinextra):"");
@@ -167,6 +183,7 @@ class PLTableEditor {
             if (!$this->idfield_editable) {
                 $r = XDB::query("SELECT MAX({$this->idfield})+1 FROM {$this->table}");
                 $page->assign('id', $r->fetchOneCell());
+                $page->assign('entry', $this->prepare_new());
             }
             $list = false;
         }
@@ -184,10 +201,12 @@ class PLTableEditor {
                         $val .= $option;
                     }
                     $val = "'".addslashes($val)."'";
+                } elseif ($descr['Type'] == 'checkbox') {
+                    $val = Post::has($field)?"'".addslashes($descr['Value'])."'":"''";
                 } elseif (Post::has($field)) {
-                    $val = Post::v($field);                    
+                    $val = Post::v($field);
                     if ($descr['Type'] == 'timestamp') {
-                        $val = preg_replace('/([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/', '\3\2\1\4\5\6', $val); 
+                        $val = preg_replace('/([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/', '\3\2\1\4\5\6', $val);
                     }
                     elseif ($descr['Type'] == 'date') {
                         $val = preg_replace('/([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4})/', '\3-\2-\1', $val);
@@ -195,7 +214,7 @@ class PLTableEditor {
                     $val = "'".addslashes($val)."'";
                 } else {
                     $cancel = true;
-                    $page->trig("Il manque le champ ".$field); 
+                    $page->trig("Il manque le champ ".$field);
                 }
                 $values .= $val;
             }
@@ -221,6 +240,10 @@ class PLTableEditor {
             if (isset($this->sortfield)) {
                 // add this sort order after the others (chosen by dev)
                 $this->add_sort_field($this->sortfield);
+                if (substr($this->sortfield,-5) == ' DESC') {
+                    $this->sortfield = substr($this->sortfield,0,-5);
+                    $this->sortdesc = true;
+                }
             }
             if (count($this->sort) > 0) {
                 $sort = 'ORDER BY ' . join($this->sort, ',');