X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=1138613d9e158f4649b245150dce6af9a213d8bc;hb=eb5795b64941a6b7dfd1b1fdf92a85943302b2fe;hp=cb616f8560b1f4060edc0f4c3561319a8f1a15c2;hpb=2bedfdacef860a90851106332cb3e960ba1c3245;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index cb616f8..1138613 100755
--- a/index.php
+++ b/index.php
@@ -250,7 +250,7 @@ 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, $order=false, $id_suffix='_id') {
+	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'),
@@ -266,7 +266,7 @@ class Sklad_DB extends PDO {
 		//SELECT
 		$sql="SELECT * FROM $class\n";
 		//JOIN
-		if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$id_suffix)\n";
+		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);
@@ -276,7 +276,7 @@ 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);
@@ -284,7 +284,7 @@ class Sklad_DB extends PDO {
 			$sql .= "LIMIT $offset,$limit\n";
 		}
 		//ORDER
-		if(!$order) $order=$class.'_id';
+		if(!$order) $order = $class.$suffix_id;
 		$sql .= "ORDER BY $order";
 
 		return $sql;
@@ -294,7 +294,7 @@ class Sklad_DB extends PDO {
 		$result = $this->query($sql);
 		if(!$result) {
 			$error = $this->errorInfo();
-			die(trigger_error("<font color=red><b>QUERY FAILED ($error[0]): </b>$error[2]<br /><br /><b>QUERY:</b>\n<pre>$sql</pre></font>"));
+			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;
 	}
@@ -320,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];
 		}
@@ -542,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: