X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=7d500bac22b08ee934ba60baff196e3a4a967d50;hb=9fb856bab300b54906a67da103573897cf7f70c7;hp=fa04f335198b64a3d021682a921ce6a3cc302fd7;hpb=d9384cb5a1877b05acfb87bbf12005f853965b11;p=mirrors%2FSokoMan.git
diff --git a/index.php b/index.php
index fa04f33..7d500ba 100755
--- a/index.php
+++ b/index.php
@@ -250,45 +250,61 @@ class Sklad_DB extends PDO {
return preg_replace('(^.|.$)', '', $this->quote($str)); //TODO HACK
}
- function build_query_select($class, $id=false, $limit=false, $offset=0, $search=false, $id_suffix='_id') {
- $class = $this->escape($class);
+ function build_query_select($class, $id=false, $limit=false, $offset=0, $search=false, $history=false, $order=false, $suffix_id='_id') {
+ //Configuration
$join = array(
'item' => array('model', 'category', 'producer', 'vendor', 'room', 'status'),
'model' => array('category', 'producer')
- );
+ ); //TODO Autodetect using foreign keys?
$search_fields = array(
'item' => array('item_id','model_name','model_barcode','model_descript','producer_name','vendor_name')
- );
+ ); //TODO Autodetect
+
+ //Escaping
+ $class = $this->escape($class);
+
+ //SELECT
$sql="SELECT * FROM $class\n";
- if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$id_suffix)\n";
+ //JOIN
+ if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$suffix_id)\n";
+ //WHERE/REGEXP
+ $where = false;
if($search) {
$search = $this->quote($search);
if(!isset($search_fields[$class])) {
trigger_error("Ve tride $class zatim vyhledavat nemozno :-(");
die();
}
- $sql .= 'WHERE FALSE ';
- foreach($search_fields[$class] as $column) $sql .= "OR $column REGEXP $search ";
- } elseif($id) $sql .= "WHERE $class$id_suffix = $id\n";
+ $where[0] = 'FALSE ';
+ foreach($search_fields[$class] as $column) $where[0] .= "OR $column REGEXP $search ";
+ } elseif($id) $where[1] = "$class$suffix_id = $id";
+ if(!$history && $this->contains_history($class)) $where[2] = $class.'_valid_till=0';
+ if($where) $sql .= 'WHERE '.implode(' AND ', $where)."\n";
+ //LIMIT/OFFSET
if($limit) {
$limit = $this->escape((int)$limit);
$offset = $this->escape((int)$offset);
$sql .= "LIMIT $offset,$limit\n";
}
+ //ORDER
+ if(!$order) $order = $class.$suffix_id;
+ $sql .= "ORDER BY $order";
+
return $sql;
}
- function safe_query($sql) {
+ function safe_query($sql, $fatal=true) {
$result = $this->query($sql);
if(!$result) {
- trigger_error('QUERY FAILED:'.$sql.'
');
- die();
+ $error = $this->errorInfo();
+ trigger_error("QUERY FAILED ($error[0],$error[1]): $error[2]
QUERY:\n$sql
");
+ if($fatal) die();
}
return $result;
}
- function get_listing($class, $id=false, $limit=false, $offset=0, $search=false, $indexed=array(), $suffix_id='_id') {
- $sql = $this->build_query_select($class, $id, $limit, $offset, $search);
+ function get_listing($class, $id=false, $limit=false, $offset=0, $search=false, $history=false, $indexed=array(), $suffix_id='_id') {
+ $sql = $this->build_query_select($class, $id, $limit, $offset, $search, $history);
$result = $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
if(!$result || !is_array($indexed)) return $result;
@@ -305,32 +321,81 @@ class Sklad_DB extends PDO {
function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') {
$selectbox=array();
foreach($columns as $column) {
+ if($column['Field'] == 'user_id') continue; //TODO HACK Blacklist: tabulka nemusi obsahovat *_name!!! momentalne se to tyka jen tabulky user (a item - u ty to nevadi)!
if($class && $column['Field'] == $class.$suffix_id) continue;
if(!preg_match('/'.$suffix_id.'$/', $column['Field'])) continue;
$table=preg_replace('/'.$suffix_id.'$/','',$column['Field']);
- $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table;";
- $result=$this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+
+ $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table;"; //TODO History
+ $result = $this->safe_query($sql, false);
+ if(!$result) continue;
+ $result = $result->fetchAll(PDO::FETCH_ASSOC);
foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
}
//echo(''); print_r($selectbox);
- return $selectbox;
+ return array_filter($selectbox, 'ksort');
+ }
+
+ function contains_history($table) {
+ $history_tables = array('item'); //TODO Autodetect
+ return in_array($table, $history_tables);
}
function build_query_insert($table, $values, $replace=true, $suffix_id='_id') {
+ //Init
+ $history = $this->contains_history($table);
+
+ //Escaping
$table = $this->escape($table);
//Get list of POSTed columns
$columns = implode(',',array_map(array($this,'escape'), array_keys($values[0])));
+ //Build query
+ $sql = '';
+ //echo(''); die(print_r($values));
+
+ if($history) {
+ $history_update=false; foreach($values as $row) if(is_numeric($row[$table.'_id'])) $history_update=true;
+ if($history_update) {
+ $sql .= "UPDATE $table";
+ $sql .= ' SET '.$table.'_valid_till=NOW()';
+ $sql .= ' WHERE '.$table.'_valid_till=0 AND (';
+ $or = '';
+ foreach($values as $row) {
+ $sql .= $or.' '.$table.'_id='.$row[$table.'_id'];
+ $or = ' OR';
+ }
+ $sql .= " );\n\n";
+ $replace = false;
+ }
+ }
+
//Insert into table (columns)
- $sql = 'INSERT';
- if($replace) $sql = 'REPLACE';
+ $sql .= $replace ? 'REPLACE' : 'INSERT';
$sql .= " INTO $table ($columns) VALUES ";
//Values (a,b,c),(d,e,f)
$comma='';
foreach($values as $row) {
- $sql .= $comma.'('.implode(',',array_map(array($this,'quote'), $row)).')';
+ $row_quoted = array_map(array($this,'quote'), $row); //Check
+ if($history) {
+ foreach($row as $column => $value) {
+ switch($column) {
+ case $table.'_valid_from':
+ $row_quoted[$column] = 'NOW()';
+ break;
+ case $table.'_valid_till':
+ $row_quoted[$column] = '0';
+ break;
+ case $table.'_author':
+ $row_quoted[$column] = $this->lms->get_authorized_user_id();
+ //die($this->lms->get_authorized_user_id().'=USER');
+ break;
+ }
+ }
+ }
+ $sql .= $comma.'('.implode(',',$row_quoted).')';
$comma = ',';
}
@@ -352,6 +417,7 @@ class Sklad_DB extends PDO {
}
function delete($table, $id, $suffix_id='_id') {
+ if($this->contains_history($table)) die(trigger_error("V tabulce $table jentak neco mazat nebudes chlapecku :-P")); //TODO post redirect get
$key = $this->escape($table.$suffix_id);
$table = $this->escape($table);
$id = $this->quote($id);
@@ -375,8 +441,8 @@ class Sklad_UI {
$this->html = new Sklad_HTML();
}
- function render_items($class, $id=false, $limit=false, $offset=0, $search=false) {
- return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $search));
+ function render_items($class, $id=false, $limit=false, $offset=0, $search=false, $history=false) {
+ return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $search, $history, false));
}
function render_form_add($class) {
@@ -402,6 +468,7 @@ class Sklad_UI {
$html.= $this->html->link('>>', "$class/$id_next/");
$html.= '
';
$html.= $this->html->link('edit', "$class/$id/edit/");
+ if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
return $html;
}
@@ -426,7 +493,7 @@ class Sklad_UI {
$html.=$this->render_listing_navigation($class, '*', $limit, $offset);
}
if($edit) {
- $html.='
TODO UPDATE FORM!
';
+ $html.='
TODO UPDATE FORM!
'; //TODO: Asi uz je hotovy...
$html.= $this->render_form_edit($class, $id);
$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
$html.= "