X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fpltableeditor.php;h=88a413309f304dce04c6db716b93010157e0f55d;hb=e05c0f5486db7ffb0fbd9ca7c0b20484a93c60c5;hp=7637238820c9a978374d6edf5b60f5e5a931a566;hpb=dd9bac8f7903e9924525ad8db3e38650ff5ad1b6;p=platal.git diff --git a/classes/pltableeditor.php b/classes/pltableeditor.php index 7637238..88a4133 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) { @@ -172,7 +220,7 @@ class PLTableEditor { $this->whereclause = $whereclause; } - + // set an action when trying to delete row public function on_delete($action = NULL, $message = NULL) { @@ -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,55 +274,76 @@ 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') { - $values = ""; + S::assert_xsrf_token(); + $cancel = false; + $values = array(); + $new = false; foreach ($this->vars as $field => $descr) { - if ($values) $values .= ','; - if (($field == $this->idfield) && !$this->idfield_editable) - $val = "'".addslashes($id)."'"; - elseif ($descr['Type'] == 'set') { - $val = ""; - if (Post::has($field)) foreach (Post::v($field) as $option) { - if ($val) $val .= ','; - $val .= $option; + $val = null; + $new = ($id === false || $id === null); + if ($field == $this->idfield && !$this->idfield_editable) { + if ($new) { + $val = XDB::fetchOneCell("SELECT MAX({$field}) + 1 + FROM {$this->table}"); + } else { + continue; + } + } elseif ($descr['Type'] == 'set') { + $val = new PlFlagset(); + if (Post::has($field)) { + foreach (Post::v($field) as $option) { + $val->addFlag($option); + } } - $val = "'".addslashes($val)."'"; } elseif ($descr['Type'] == 'checkbox') { - $val = Post::has($field)?"'".addslashes($descr['Value'])."'":"''"; + $val = Post::has($field)? $descr['Value'] : ""; } elseif (Post::has($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); - } - elseif ($descr['Type'] == 'date') { + } else if ($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; + $values[$field] = XDB::escape($val); } if (!$cancel) { - if ($this->idfield_editable && ($id != Post::v($this->idfield)) && $action != 'new') - 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 (!$new) { + $update = array(); + foreach ($values as $field => $value) { + $update[] = $field . ' = ' . $value; + } + $update = implode(', ', $update); + XDB::rawExecute("UPDATE {$this->table} + SET {$update} + WHERE {$this->idfield} = " . XDB::escape($id) . " + AND {$this->whereclause}"); + } else { + $fields = implode(', ', array_keys($values)); + $values = implode(', ', $values); + XDB::rawExecute("INSERT INTO {$this->table} ({$fields}) + VALUES ({$values})"); + } + 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."); + } else { + $page->trigError("Impossible de mettre à jour."); + } if (!$this->auto_return) { return $this->apply($page, 'edit', $id); } @@ -296,7 +367,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++;