podrobnejsi hlaseni db chyb, TODO

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index cee0e79a61c9bc3a0b9bd168e371c714cfb3c7e4..1138613d9e158f4649b245150dce6af9a213d8bc 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -250,8 +250,8 @@ 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')
@@ -259,8 +259,15 @@ class Sklad_DB extends PDO {
                $search_fields = array(
                        'item'  => array('item_id','model_name','model_barcode','model_descript','producer_name','vendor_name')
                );
+
+               //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('<font color=red><b>QUERY FAILED:</b><pre>'.$sql.'</pre></font>');
-                       die();
+                       $error = $this->errorInfo();
+                       die(trigger_error("<font color=red><b>QUERY FAILED ($error[0],$error[1]): </b>$error[2]<br /><br /><b>QUERY:</b>\n<pre>$sql</pre></font>"));
                }
                return $result;
        }
@@ -308,7 +320,7 @@ 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];
                }
@@ -530,7 +542,7 @@ class Sklad_UI {
                }
 
                $PATH_INFO=@trim($_SERVER[PATH_INFO]);
-               if($_SERVER['REQUEST_METHOD'] != 'POST') echo $this->html->header($PATH_INFO);
+               if($_SERVER['REQUEST_METHOD'] != 'POST') echo $this->html->header($PATH_INFO); //TODO tahle podminka naznacuje ze je v navrhu nejaka drobna nedomyslenost...
 
 
                //Sephirot: