X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=0ac7c4f003f58cfafc733d6c63df3bd360a3e846;hb=9ea191cb37aaf21d6c7b688687fce1baf4027674;hp=fa04f335198b64a3d021682a921ce6a3cc302fd7;hpb=d9384cb5a1877b05acfb87bbf12005f853965b11;p=mirrors%2FSokoMan.git
diff --git a/index.php b/index.php
index fa04f33..0ac7c4f 100755
--- a/index.php
+++ b/index.php
@@ -250,17 +250,24 @@ 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, $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
if($search) {
$search = $this->quote($search);
if(!isset($search_fields[$class])) {
@@ -269,20 +276,25 @@ class Sklad_DB extends PDO {
}
$sql .= 'WHERE FALSE ';
foreach($search_fields[$class] as $column) $sql .= "OR $column REGEXP $search ";
- } elseif($id) $sql .= "WHERE $class$id_suffix = $id\n";
+ } elseif($id) $sql .= "WHERE $class$suffix_id = $id\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) {
$result = $this->query($sql);
if(!$result) {
- trigger_error('QUERY FAILED:'.$sql.'
');
- die();
+ $error = $this->errorInfo();
+ die(trigger_error("QUERY FAILED ($error[0],$error[1]): $error[2]
QUERY:\n$sql
"));
}
return $result;
}
@@ -308,15 +320,21 @@ class Sklad_DB extends PDO {
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;";
+ $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table;"; //TODO: tabulka nemusi obsahovat *_name!!! momentalne se to tyka jen tabulky user (a item - u ty to nevadi)!
$result=$this->safe_query($sql)->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 ksort($selectbox);
+ }
+
+ 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') {
+ //Escaping
$table = $this->escape($table);
//Get list of POSTed columns
@@ -426,7 +444,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.= "