X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fpltableeditor.php;h=3e35d1a125d45bf6c961d38e495bed832d0dc30d;hb=8adfe9565eeb5d25c3f2ba91bb6632f3836b7a78;hp=7637238820c9a978374d6edf5b60f5e5a931a566;hpb=5f30b30e8b2657ade5c727e98de286386ee002d8;p=platal.git diff --git a/classes/pltableeditor.php b/classes/pltableeditor.php index 7637238..3e35d1a 100644 --- a/classes/pltableeditor.php +++ b/classes/pltableeditor.php @@ -1,6 +1,6 @@ sortfield = $idfield; $this->idfield_editable = $editid; $this->whereclause = '1'; - $r = XDB::iterator("SHOW COLUMNS FROM $table"); + $r = XDB::iterator("SHOW FULL COLUMNS FROM $table"); $this->vars = array(); while ($a = $r->next()) { // desc will be the title of the column @@ -97,6 +112,9 @@ class PLTableEditor elseif (substr($a['Type'],0,10) == 'timestamp(' || $a['Type'] == 'datetime') { $a['Type'] = 'timestamp'; } + elseif ($a['Comment'] == 'ip_address') { + $a['Type']='ip_address'; + } $this->vars[$a['Field']] = $a; } @@ -133,6 +151,10 @@ class PLTableEditor $date =& $entry[$field]; $date = preg_replace('/([0-9]{4})-?([0-9]{2})-?([0-9]{2})/', '\3/\2/\1', $date); } + if ($descr['Type'] == 'ip_address') { + $ip = & $entry[$field]; + $ip = long2ip($ip); + } } return $entry; } @@ -157,6 +179,32 @@ class PLTableEditor $this->jtables[$name] = array("joinid" => $joinid,"joinextra" => $joinextra?(" AND ".$joinextra):""); } + /** Add optional table + * @see add_option_field + * @param $name the table sql name + * @param $jointclause the full joint clause. Use t as main table alias + * name. + */ + public function add_option_table($name, $jointclause) + { + $this->otables[$name] = $jointclause; + } + + /** Add optional field + * These fields are used to display additionnal infos in listing (and only + * there). The additionnal infos are retreived from other tables. + * @param $sqlname is the full sql name (table.field) where table must be + * added with add_option_table + * @param $name the name used for sort (please make it different from + * other fields in main table or subtables) + * @param $desc the description displayed as column header + * @param $type the typed used for display + */ + public function add_option_field($sqlname, $name, $desc, $type = null, $nextvar = null) + { + $this->ofields[$sqlname] = array($name, $desc, $type, $nextvar); + } + // add a sort key public function add_sort_field($key, $desc = false, $default = false) { @@ -181,28 +229,30 @@ class PLTableEditor } // call when done - public function apply(PlatalPage &$page, $action, $id = false) + public function apply(PlPage &$page, $action, $id = false) { - $page->changeTpl('core/table-editor.tpl'); + $page->coreTpl('table-editor.tpl'); $list = true; - if ($action == 'delete') { + if ($action == 'delete' && $id !== false) { + S::assert_xsrf_token(); + if (!isset($this->delete_action)) { foreach ($this->jtables as $table => $j) XDB::execute("DELETE FROM {$table} WHERE {$j['joinid']} = {?}{$j['joinextra']}", $id); XDB::execute("DELETE FROM {$this->table} WHERE {$this->idfield} = {?}",$id); - $page->trig("L'entrée ".$id." a été supprimée."); + $page->trigSuccess("L'entrée ".$id." a été supprimée."); } else if ($this->delete_action) { XDB::execute($this->delete_action, $id); if (isset($this->delete_message)) { - $page->trig($this->delete_message); + $page->trigSuccess($this->delete_message); } else { - $page->trig("L'entrée ".$id." a été supprimée."); - } + $page->trigSuccess("L'entrée ".$id." a été supprimée."); + } } else { - $page->trig("Impossible de supprimer l'entrée."); + $page->trigError("Impossible de supprimer l'entrée."); } } - if ($action == 'edit') { + if ($action == 'edit' && $id !== false) { $r = XDB::query("SELECT * FROM {$this->table} WHERE {$this->idfield} = {?} AND {$this->whereclause}",$id); $entry = $r->fetchOneAssoc(); $page->assign('entry', $this->prepare_edit($entry)); @@ -224,20 +274,24 @@ class PLTableEditor } if ($action == 'new') { 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; } if ($action == 'update') { + S::assert_xsrf_token(); + $values = ""; $cancel = false; foreach ($this->vars as $field => $descr) { if ($values) $values .= ','; - if (($field == $this->idfield) && !$this->idfield_editable) - $val = "'".addslashes($id)."'"; - elseif ($descr['Type'] == 'set') { + if (($field == $this->idfield) && !$this->idfield_editable) { + if ($id === false || $id === null) { + $val = "'".addslashes(XDB::fetchOneCell("SELECT MAX( {$field} ) + 1 FROM {$this->table}"))."'"; + } else { + $val = "'".addslashes($id)."'"; + } + } elseif ($descr['Type'] == 'set') { $val = ""; if (Post::has($field)) foreach (Post::v($field) as $option) { if ($val) $val .= ','; @@ -254,25 +308,28 @@ class PLTableEditor elseif ($descr['Type'] == 'date') { $val = preg_replace('/([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4})/', '\3-\2-\1', $val); } + elseif ($descr['Type'] == 'ip_address') { + $val = ip2long($val); + } $val = "'".addslashes($val)."'"; } else { $cancel = true; - $page->trig("Il manque le champ ".$field); + $page->trigError("Il manque le champ ".$field); } $values .= $val; } if (!$cancel) { - if ($this->idfield_editable && ($id != Post::v($this->idfield)) && $action != 'new') + if ($this->idfield_editable && $id != Post::v($this->idfield)) XDB::execute("UPDATE {$this->table} SET {$this->idfield} = {?} WHERE {$this->idfield} = {?} AND {$this->whereclause}", Post::v($this->idfield), $id); XDB::execute("REPLACE INTO {$this->table} VALUES ($values)"); - if ($id !== false) - $page->trig("L'entrée ".$id." a été mise à jour."); - else { - $page->trig("Une nouvelle entrée a été créée."); + if ($id !== false && $id !== null) { + $page->trigSuccess("L'entrée ".$id." a été mise à jour."); + } else { + $page->trigSuccess("Une nouvelle entrée a été créée."); $id = XDB::insertId(); } } else - $page->trig("Impossible de mette à jour."); + $page->trigError("Impossible de mettre à jour."); if (!$this->auto_return) { return $this->apply($page, 'edit', $id); } @@ -296,7 +353,46 @@ class PLTableEditor if (count($this->sort) > 0) { $sort = 'ORDER BY ' . join($this->sort, ','); } - $it = XDB::iterator("SELECT * FROM {$this->table} WHERE {$this->whereclause} $sort"); + // optional infos columns + $optional_fields = ''; + if (count($this->ofields)) { + $order = array(); + foreach ($this->vars as $i => $aliasname) { + $order[sprintf('%f',count($order))] = $i; + } + // delta for indexing optional columns between existing ones + $changeorder = 0.5; + foreach ($this->ofields as $sqlname => $ofieldvalues) { + list($aliasname, $desc, $type, $nextvar) = $ofieldvalues; + $optional_fields .= ', '.$sqlname.' AS '.$aliasname; + $this->describe($aliasname, $desc, true); + $this->vars[$aliasname]['optional'] = true; + if (isset($type)) { + $this->vars[$aliasname]['Type'] = $type; + } + if (isset($nextvar) && isset($this->vars[$nextvar]) && $nextvar != $aliasname) { + $nextkey = array_search($nextvar, $order); + $order[sprintf('%f',$nextkey - $changeorder)] = $aliasname; + $changeorder = $changeorder / 2; + } else { + $order[sprintf('%f',count($order))] = $aliasname; + } + $this->vars[$aliasname]['Field'] = $aliasname; + } + if ($changeorder != 0.5) { + ksort($order); + $orderedvars = array(); + foreach ($order as $aliasname) { + $orderedvars[$aliasname] = $this->vars[$aliasname]; + } + $this->vars = $orderedvars; + } + } + $optional_joints = ''; + foreach ($this->otables as $tablename => $jointclause) { + $optional_joints .= ' LEFT JOIN '.$tablename.' ON ('.$jointclause.')'; + } + $it = XDB::iterator("SELECT t.* {$optional_fields} FROM {$this->table} AS t {$optional_joints} WHERE {$this->whereclause} $sort"); $this->nbfields = 0; foreach ($this->vars as $field => $descr) if ($descr['display']) $this->nbfields++;