X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=d47bbbc490c92802c05ac5a3c53c08f5b69d2a91;hb=8fd613d60d58c1811bde2b73184794609784550b;hp=fa04f335198b64a3d021682a921ce6a3cc302fd7;hpb=d9384cb5a1877b05acfb87bbf12005f853965b11;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index fa04f33..d47bbbc 100755
--- 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]): </b>$error[2]<br /><br /><b>QUERY:</b>\n<pre>$sql</pre></font>"));
 		}
 		return $result;
 	}
@@ -446,10 +458,10 @@ class Sklad_UI {
 		new HTTP_Auth('SkladovejSystem', true, array($this->db->lms,'check_auth'));
 	}
 
-	function post_redirect_get($last, $next) {
-		//header('Location: '.$_SERVER['REQUEST_URI']); //TODO redirect (need templating system or ob_start() first!!!)
-		header('Location: '.$this->html->internal_url($dest));
-		die("Redirect: $dest");
+	function post_redirect_get($location, $message='') {
+		$location = $this->html->internal_url($location).'?message='.urlencode($message);
+		header('Location: '.$location);
+		die("Location: $location");
 	}
 
 	function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {
@@ -466,7 +478,7 @@ class Sklad_UI {
 
 	function process_http_request_post($action=false, $class=false, $id=false) {
 		if($_SERVER['REQUEST_METHOD'] != 'POST') return;
-		echo('<pre>'); //DEBUG (maybe todo remove)
+		//echo('<pre>'); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
 
 		//SephirPOST:
 
@@ -501,7 +513,7 @@ class Sklad_UI {
 			case 'delete':
 				if(!isset($_POST['sure']) || !$_POST['sure']) die(trigger_error('Sure user expected :-)'));
 				$this->db->delete($class, $id);
-				die("Neco (pravdepodobne /$class/$id) bylo asi smazano. Fnuk :'-("); //TODO REDIRECT
+				$this->post_redirect_get("$class", "Neco (pravdepodobne /$class/$id) bylo asi smazano. Fnuk :'-(");
 				break;
 			case 'image':
 				$image_classes = array('model'); //TODO, use this more widely across the code
@@ -509,9 +521,9 @@ class Sklad_UI {
 				$image_destination = DIR_IMAGES."/$class/$id.jpg";
 				if($_FILES['image']['name'] == '') die(trigger_error('Kazde neco se musi nejak jmenovat!'));
 				if(move_uploaded_file($_FILES['image']['tmp_name'], $image_destination)) {
-	        chmod ($image_destination, 0664);
-  	      die('Obrazek se naladoval :)'); //TODO REDIRECT
-        } else die(trigger_error('Soubor se nenahral :('));
+					chmod ($image_destination, 0664);
+					$this->post_redirect_get("$class/$id", 'Obrazek se naladoval :)');
+				} else die(trigger_error('Soubor se nenahral :('));
 				break;
 			default:
 				trigger_error('Nothin\' to do here my cutie :-*');
@@ -530,7 +542,7 @@ class Sklad_UI {
 		}
 
 		$PATH_INFO=@trim($_SERVER[PATH_INFO]);
-		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: