X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fpltableeditor.php;h=89c0b14b7cc186401e473627fcf5e3a0794ff61a;hb=571e48acadea9f5d2e5073fd993746ec33c369d1;hp=826faa5a767448359895bfffef399fd0d8875239;hpb=c700d16b2402b1d246383097f6f22f716e294eaf;p=platal.git diff --git a/classes/pltableeditor.php b/classes/pltableeditor.php index 826faa5..89c0b14 100644 --- a/classes/pltableeditor.php +++ b/classes/pltableeditor.php @@ -1,6 +1,6 @@ Selects rows with WHERE foo = 'bar' + * => Insertions are done with SET foo = 'bar' + */ + public $forced_values = array(); + // the field for sorting entries public $sortfield; public $sortdesc = false; @@ -55,11 +81,12 @@ 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) */ - public function __construct($plname, $table, $idfield, $editid=false) + public function __construct($plname, $table, $idfield, $editid = false, $idfield2 = false) { $this->pl = $plname; $this->table = $table; $this->idfield = $idfield; + $this->idfield2 = $idfield2; $this->sortfield = $idfield; $this->idfield_editable = $editid; $this->whereclause = '1'; @@ -68,7 +95,10 @@ class PLTableEditor while ($a = $r->next()) { // desc will be the title of the column $a['desc'] = $a['Field']; - $a['display'] = true; + // display_list decides whether to display the field in 'list' mode + $a['display_list'] = true; + // display_item decides whether a field is displayed in 'item edition' mode + $a['display_item'] = true; if (substr($a['Type'],0,8) == 'varchar(') { // limit editing box size @@ -141,6 +171,9 @@ class PLTableEditor $ip = long2ip($ip); } } + foreach ($this->forced_values as $field => $value) { + $entry[$field] = $value; + } return $entry; } @@ -151,10 +184,11 @@ class PLTableEditor } // change display of a field - public function describe($name, $desc, $display) + public function describe($name, $desc, $display_list, $display_item=true) { $this->vars[$name]['desc'] = $desc; - $this->vars[$name]['display'] = $display; + $this->vars[$name]['display_list'] = $display_list; + $this->vars[$name]['display_item'] = $display_item; } // add a join table, when deleting a row corresponding entries will be deleted in these tables @@ -164,6 +198,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) { @@ -174,12 +234,18 @@ class PLTableEditor } } + // force the value of a field in select and add + public function force_field_value($field, $value) + { + $this->forced_values[$field] = $value; + } + // add a where clause to limit table listing public function set_where_clause($whereclause="1") { $this->whereclause = $whereclause; } - + // set an action when trying to delete row public function on_delete($action = NULL, $message = NULL) { @@ -187,32 +253,55 @@ class PLTableEditor $this->delete_message = $message; } + /** Retrieve the 'WHERE' clause to use for this PlTableEditor. + * Takes into account $this->whereclause and $this->forced_values. + * + * @param $extra_clause optional extra clause to add to the WHERE + * @return The WHERE clause to use + */ + protected function get_where_clause($extra_clause=null) + { + $parts = array(); + $parts[] = $this->whereclause; + if ($extra_clause !== null) { + $parts[] = $extra_clause; + } + foreach ($this->forced_values as $field => $val) { + $parts[] = XDB::format("$field = {?}", $val); + } + return implode(' AND ', $parts); + } + // call when done - public function apply(PlatalPage &$page, $action, $id = false) + public function apply(PlPage $page, $action, $id = false, $id2 = 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."); + $where = XDB::format("{$this->idfield} = {?}", $id); + if ($this->idfield2) { + $where .= XDB::format(" AND {$this->idfield2} = {?}", $id2); + } + XDB::rawExecute("DELETE FROM {$this->table} WHERE " . $this->get_where_clause($where)); + $page->trigSuccess("L'entrée " . $id . (($id2) ? '-' . $id2 : '') . ' 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') { - $r = XDB::query("SELECT * FROM {$this->table} WHERE {$this->idfield} = {?} AND {$this->whereclause}",$id); + if ($action == 'edit' && $id !== false) { + $r = XDB::query("SELECT * FROM {$this->table} WHERE {$this->idfield} = {?} AND " . $this->get_where_clause(), $id); $entry = $r->fetchOneAssoc(); $page->assign('entry', $this->prepare_edit($entry)); $page->assign('id', $id); @@ -227,14 +316,15 @@ class PLTableEditor $importer->describe($field, @$descr['desc']); } } + foreach ($this->forced_values as $field => $value) { + $importer->forceValue($field, $value); + } $page->assign('massadd', true); $importer->apply($page, $this->pl . '/massadd', $fields); $list = false; } 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; @@ -242,51 +332,71 @@ class PLTableEditor if ($action == 'update') { S::assert_xsrf_token(); - $values = ""; $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 (array_key_exists($field, $this->forced_values)) { + $val = $this->forced_values[$field]; + } 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') { + } elseif ($descr['Type'] == 'ip_address') { $val = ip2long($val); } - $val = "'".addslashes($val)."'"; - } else { + } elseif ($descr['display_item']) { $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->get_where_clause()); + } 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 mettre à jour."); + } else { + $page->trigError("Impossible de mettre à jour."); + } if (!$this->auto_return) { return $this->apply($page, 'edit', $id); } @@ -310,10 +420,49 @@ 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->get_where_clause() . " $sort"); $this->nbfields = 0; foreach ($this->vars as $field => $descr) - if ($descr['display']) $this->nbfields++; + if ($descr['display_list']) $this->nbfields++; $page->assign('list', $it); } $page->assign('t', $this);