X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=7d500bac22b08ee934ba60baff196e3a4a967d50;hb=9fb856bab300b54906a67da103573897cf7f70c7;hp=89a221032d2c7698abdf7949fd08f5bc2be0a26c;hpb=cdfce7c291830a69e3e91aac21f75c4fd3f09448;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 89a2210..7d500ba 100755
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * SkladovySystem - Storage management system compatible with LMS
- * Copyright (C) 2011  Thomas Mudrunka
+ * Copyright (C) 2011  Tomas Mudrunka
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,12 +21,24 @@ require_once('sklad.conf.php');
 require_once('Sklad_LMS-fake.class.php');
 require_once('HTTP_Auth.class.php');
 
+/**
+* Trida poskytuje podpurne funkce pro generovani HTML kodu specificke pro sklad
+*
+* Tato trida by nemela sama nic vypisovat (vyjma chybovych a debugovacich hlasek)!
+*
+* @package  Sklad_HTML
+* @author   Tomas Mudrunka
+*/
 class Sklad_HTML {
-	function header_print($title='') {
+	function header($title='') {
 		$home = URL_HOME;
 		$script = $_SERVER['SCRIPT_NAME'];
-		$search = @trim($_GET['q']);
-		echo <<<EOF
+		$search = htmlspecialchars(@trim($_GET['q']));
+		$message = htmlspecialchars(@trim($_GET['message']));
+		return <<<EOF
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
 <h1><a href="$script/">SystÃ©mSklad</a><small>$title</small></h1>
 <div>
 	<menu>
@@ -42,33 +54,42 @@ class Sklad_HTML {
 		<input type="submit" value="search items" />
 	</form -->
 </div>
+<div style="background-color:#FFDDDD;">
+	<font color="red">$message</font>
+</div>
 EOF;
 	}
 
-	function row_print($row) {
-		echo('<tr>');
+	function row($row) {
+		$html='<tr>';
 		foreach($row as $var) {
 			if(trim($var) == '') $var = '&nbsp;';
-			echo("<td>$var</td>");
+			$html.="<td>$var</td>";
 		}
-		echo('</tr>');
+		$html.='</tr>';
+		return $html;
 	}
 
-	function table_print(&$table, $params='border=1') {
-		echo("<table $params>");
+	function table(&$table, $params='border=1') {
+		$html="<table $params>";
 		$header=true;
 		foreach($table as $row) {
 			if($header) {
-				$this->row_print(array_keys($row));
+				$html.=$this->row(array_keys($row));
 				$header=false;
 			}
-			$this->row_print($row);
+			$html.=$this->row($row);
 		}
-		echo('</table>');
+		$html.='</table>';
+		return $html;
+	}
+
+	function internal_url($link) {
+		return $_SERVER['SCRIPT_NAME'].'/'.$link;
 	}
 
 	function link($title='n/a', $link='#void', $internal=true) {
-		if($internal) $link = $_SERVER['SCRIPT_NAME'].'/'.$link;
+		if($internal) $link = $this->internal_url($link);
 		return "<a href='$link'>$title</a>";
 	}
 
@@ -121,11 +142,11 @@ EOF;
 		$table = $table_sorted;
 	}
 
-	function print_item_table($table) {
+	function render_item_table($table) {
 		$this->table_add_images($table);
 		$this->table_collapse($table);
 		$this->table_sort($table);
-		return $this->table_print($table);
+		return $this->table($table);
 	}
 
 	function input($name=false, $value=false, $type='text', $placeholder=false, $options=false) {
@@ -154,7 +175,7 @@ EOF;
 		return $html;
 	}
 
-	function print_insert_form($class, $columns, $selectbox=array(), $current=false, $multi_insert=true) {
+	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $multi_insert=true) {
 		//echo('<pre>'); print_r($selectbox);
 		//echo('<pre>'); print_r($current);
 		$update = false;
@@ -163,33 +184,32 @@ EOF;
 			$current = array_shift($current);
 		}
 
-		echo('<form method="POST">');
-		if($multi_insert) echo('<div name="input_set" style="float:left; border:1px solid grey;">');
-		echo $this->input('table', $class, 'hidden');
+		$html='<form method="POST">';
+		if($multi_insert) $html.='<div name="input_set" style="float:left; border:1px solid grey;">';
+		//$html.=$this->input('table', $class, 'hidden');
 		foreach($columns as $column)	{
-			echo($column['Field'].': ');
-			$name='value:'.$column['Field'].'[]';
+			$html.=$class.':<b>'.$column['Field'].'</b>: ';
+			$name="values[$class][".$column['Field'].'][]';
+			$val = $update ? $current[$column['Field']] : false;
 			switch(true) {
 				case preg_match('/auto_increment/', $column['Extra']):
-					$val = $update ? $current[$column['Field']] : ''; //opakuje se (skoro) zbytecne
-					echo $this->input($name, $val, 'hidden');
-					echo($val.'(AUTO)');
+					if(!$val) $val = '';
+					$html.=$this->input($name, $val, 'hidden');
+					$html.=$val.'(AUTO)';
 					break;
 				case isset($selectbox[$column['Field']]):
-					$val = $update ? $current[$column['Field']] : false;
-					echo $this->select($name,$selectbox[$column['Field']],$val); //opakuje se
+					$html.=$this->select($name,$selectbox[$column['Field']],$val);
 					break;
 				default:
-					$val = $update ? $current[$column['Field']] : false; //opakuje se
-					echo $this->input($name, $val);
+					$html.=$this->input($name, $val);
 					break;
 			}
-			echo('<br />');
+			$html.='<br />';
 		}
 
 		if($multi_insert) {
 			//TODO, move to separate JS file
-			echo <<<EOF
+			$html.=<<<EOF
 			</div>
 			<span name="input_set_next"></span><br style="clear:both" />
 			<script>
@@ -204,11 +224,18 @@ EOF;
 		}
 
 		$btn = is_array($current) ? 'UPDATE' : 'INSERT';
-		echo($this->input(false, $btn, 'submit'));
-		echo('</form>');
+		$html.=$this->input(false, $btn, 'submit');
+		$html.='</form>';
+		return $html;
 	}
 }
 
+/**
+* Trida poskytuje rozhrani k databazi skladu
+*
+* @package  Sklad_DB
+* @author   Tomas Mudrunka
+*/
 class Sklad_DB extends PDO {
 	function __construct() {
 		$this->lms = new Sklad_LMS();
@@ -223,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('<font color=red><b>QUERY FAILED:</b><pre>'.$sql.'</pre></font>');
-			die();
+			$error = $this->errorInfo();
+			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>");
+			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;
 
@@ -278,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('<pre>'); 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('<pre>'); 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 = ',';
 		}
 
@@ -318,7 +410,14 @@ class Sklad_DB extends PDO {
 		return $this->lastInsertId();
 	}
 
+	function insert_or_update_multitab($values) {
+		$last=false;
+		foreach($values as $table => $rows) $last = $this->insert_or_update($table, $rows);
+		return $last;
+	}
+
 	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);
@@ -326,114 +425,150 @@ class Sklad_DB extends PDO {
 	}
 }
 
+/**
+* Trida implementuje uzivatelske rozhrani skladu
+*
+* Example usage:
+* $sklad = new Sklad_UI();
+* $sklad->process_http_request();
+*
+* @package  Sklad_UI
+* @author   Tomas Mudrunka
+*/
 class Sklad_UI {
 	function __construct() {
 		$this->db = new Sklad_DB();
 		$this->html = new Sklad_HTML();
 	}
 
-	function show_items($class, $id=false, $limit=false, $offset=0, $search=false) {
-		$this->html->print_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 show_form_add($class) {
+	function render_form_add($class) {
 		$columns = $this->db->get_columns($class);
 		$selectbox = $this->db->columns_get_selectbox($columns, $class);
-		$this->html->print_insert_form($class, $columns, $selectbox);
+		return $this->html->render_insert_form($class, $columns, $selectbox);
 	}
 
-	function show_form_edit($class, $id) {
+	function render_form_edit($class, $id) {
 		$columns = $this->db->get_columns($class);
 		$selectbox = $this->db->columns_get_selectbox($columns, $class);
 		$current = $this->db->get_listing($class, $id);
-		$this->html->print_insert_form($class, $columns, $selectbox, $current);
+		return $this->html->render_insert_form($class, $columns, $selectbox, $current);
 	}
 
-	function show_single_record_details($class, $id) {
+	function render_single_record_details($class, $id) {
 		$id_next = $id + 1;
 		$id_prev = $id - 1 > 0 ? $id - 1 : 0;
 		$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
-		echo $this->html->link('<<', "$class/$id_prev/");
-		echo '-';
-		echo $this->html->link('>>', "$class/$id_next/");
-		echo ('<br />');
-		echo $this->html->link('edit', "$class/$id/edit/");
+		$html='';
+		$html.= $this->html->link('<<', "$class/$id_prev/");
+		$html.= '-';
+		$html.= $this->html->link('>>', "$class/$id_next/");
+		$html.= '<br />';
+		$html.= $this->html->link('edit', "$class/$id/edit/");
+		if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
+		return $html;
 	}
 
-	function show_listing_navigation($class, $id, $limit, $offset) {
+	function render_listing_navigation($class, $id, $limit, $offset) {
 		$offset_next = $offset + $limit;
 		$offset_prev = $offset - $limit > 0 ? $offset - $limit : 0;
 		$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
-		echo $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get");
-		echo '-';
-		echo $this->html->link('>>', "$class/$id/$limit/$offset_next/$get");
-		echo ('<br />');
-		echo $this->html->link('new', "$class/new/$get");
+		$html='';
+		$html.= $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get");
+		$html.= '-';
+		$html.= $this->html->link('>>', "$class/$id/$limit/$offset_next/$get");
+		$html.= '<br />';
+		$html.= $this->html->link('new', "$class/new/$get");
+		return $html;
 	}
 
-	function show_listing_extensions($class, $id, $limit, $offset, $edit=false) {
+	function render_listing_extensions($class, $id, $limit, $offset, $edit=false) {
+		$html='';
 		if(is_numeric($id)) {
-			$this->show_single_record_details($class, $id);
+			$html.=$this->render_single_record_details($class, $id);
 		} else {
-			$this->show_listing_navigation($class, '*', $limit, $offset);
+			$html.=$this->render_listing_navigation($class, '*', $limit, $offset);
 		}
 		if($edit)	{
-			echo('<br />TODO UPDATE FORM!<br />');
-			$this->show_form_edit($class, $id);
+			$html.='<br />TODO UPDATE FORM!<br />'; //TODO: Asi uz je hotovy...
+			$html.= $this->render_form_edit($class, $id);
 			$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
-	    echo("<form action='$action' method='POST'>");
-			echo $this->html->input(false, 'DELETE', 'submit');
-			echo 'sure?'.$this->html->input('sure', false, 'checkbox');
-			echo('</form>');
+	    $html.= "<form action='$action' method='POST'>";
+			$html.= $this->html->input(false, 'DELETE', 'submit');
+			$html.= 'sure?'.$this->html->input('sure', false, 'checkbox');
+			$html.= '</form>';
 			$action = $_SERVER['SCRIPT_NAME']."/$class/$id/image";
-	    echo("<form action='$action' method='POST' enctype='multipart/form-data'>");
-			echo $this->html->input('image', false, 'file', false, 'size="30"');
-			echo $this->html->input(false, 'IMAGE', 'submit');
-			echo('</form>');
+	    $html.= "<form action='$action' method='POST' enctype='multipart/form-data'>";
+			$html.= $this->html->input('image', false, 'file', false, 'size="30"');
+			$html.= $this->html->input(false, 'IMAGE', 'submit');
+			$html.='</form>';
 		}
+		return $html;
 	}
 
 	function check_auth() {
 		new HTTP_Auth('SkladovejSystem', true, array($this->db->lms,'check_auth'));
 	}
 
-	function post_redirect_get($last, $next) { //TODO prepracovat, tohle je uplna picovina...
-		//header('Location: '.$_SERVER['REQUEST_URI']); //TODO redirect (need templating system or ob_start() first!!!)
-		echo 'Hotovo. PoslednÃ­ vloÅ¾enÃ½ zÃ¡znam naleznete '.$this->html->link('zde', $last).'.<br />'.
-		'DalÅ¡Ã­ zÃ¡znam pÅidÃ¡te '.$this->html->link('zde', $next).'.';
-		die();
+	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') {
+		if(preg_match('/[^a-zA-Z0-9-]/',$name)) die(trigger_error('SAFE INCLUDE: Securityfuck.'));
+		$filename="$dir/$name$ext";
+		if(!is_file($filename)) die(trigger_error('SAFE INCLUDE: Fuckfound.'));
+		foreach($vars as $var => $val) $$var=$val;
+		ob_start();
+		include($filename);
+		$out=ob_get_contents();
+		ob_end_clean();
+		return $out;
 	}
 
 	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:
-		$values=array();
-		foreach($_POST as $key => $value) {
-			$name = preg_split('/:/',$key);
-			if(isset($name[0])) switch($name[0]) {
-				case 'value':
-					foreach($value as $id => $val) $values[$id][$name[1]]=$value[$id];
-					break;
-				default:
-					break;
+
+		/* Tenhle foreach() prekopiruje promenne
+		 * z:		$_POST['values'][$table][$column][$id];
+		 * do:	$values[$table][$id][$column]
+		 */
+		if(isset($_POST['values'])) {
+			$values=array();
+			foreach($_POST['values'] as $table => $columns) {
+				foreach($columns as $column => $ids) {
+					foreach($ids as $id => $val) $values[$table][$id][$column] = $val;
+				}
 			}
+			//die(print_r($values));
 		}
 
 		if($action) switch($action) {
 			case 'new':
 			case 'edit':
-				if(!isset($_POST['table'])) die(trigger_error("Jest nutno specifikovat tabulku voe!"));
-				$table=$_POST['table'];
+				//if(!isset($_POST['table'])) die(trigger_error("Jest nutno specifikovat tabulku voe!"));
+				//$table=$_POST['table'];
+				$table='item';
 				//print_r($values); //debug
-				$last = $this->db->insert_or_update($table, $values);
-				$this->post_redirect_get("$table/$last/", "$table/new/");
+				$last = $this->db->insert_or_update_multitab($values);
+				$last = "$table/$last/";
+				$next = "$table/new/";
+				echo 'Hotovo. PoslednÃ­ vloÅ¾enÃ½ zÃ¡znam naleznete '.$this->html->link('zde', $last).'.<br />'.
+					'DalÅ¡Ã­ zÃ¡znam pÅidÃ¡te '.$this->html->link('zde', $next).'.';
+				die();
 				break;
 			case 'delete':
 				if(!isset($_POST['sure']) || !$_POST['sure']) die(trigger_error('Sure user expected :-)'));
-				//$this->db->delete($class, $id);
-				die('Neco asi bylo smazano. Fnuk :\'-('); //TODO REDIRECT
+				$this->db->delete($class, $id);
+				$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
@@ -441,9 +576,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 :-*');
@@ -462,7 +597,7 @@ class Sklad_UI {
 		}
 
 		$PATH_INFO=@trim($_SERVER[PATH_INFO]);
-		$this->html->header_print($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:
@@ -472,6 +607,10 @@ class Sklad_UI {
 			case 'test':	//test
 				die('Tell me why you cry');
 				break;
+			case 'assistant': //assistant
+				$assistant_vars['step'] = isset($PATH_CHUNKS[3]) && is_numeric($PATH_CHUNKS[3]) ? trim($PATH_CHUNKS[3]) : false;
+				echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
+				break;
 			default:	//?
 				$search	= (isset($_GET['q']) && trim($_GET['q']) != '') ? trim($_GET['q']) : false;
 				$class	= (isset($PATH_CHUNKS[1]) && $PATH_CHUNKS[1] != '') ? $PATH_CHUNKS[1] : 'item';
@@ -479,7 +618,7 @@ class Sklad_UI {
 				switch($PATH_CHUNKS[2]) {
 					case 'new':	//?/new
 						$this->process_http_request_post($PATH_CHUNKS[2], $class);
-						$this->show_form_add($class);
+						echo $this->render_form_add($class);
 						break;
 					default:	//?/?
 						$id	= (isset($PATH_CHUNKS[2]) && is_numeric($PATH_CHUNKS[2]) ? (int) $PATH_CHUNKS[2] : false);
@@ -487,15 +626,16 @@ class Sklad_UI {
 						$edit=false;
 						switch($PATH_CHUNKS[3]) {
 							case 'edit':	//?/?/edit
-							case 'image':	//?/image
-							case 'delete':	//?/delete
+							case 'image':	//?/?/image
+							case 'delete':	//?/?/delete
 								$this->process_http_request_post($PATH_CHUNKS[3], $class, $id);
 								$edit=true;
 							default:	//?/?/?
+								$history = $PATH_CHUNKS[3] == 'history' ? true : false;
 								$limit	= (int) (isset($PATH_CHUNKS[3]) ? $PATH_CHUNKS[3] : '0');
 								$offset	= (int) (isset($PATH_CHUNKS[4]) ? $PATH_CHUNKS[4] : '0');
-								$this->show_items($class, $id, $limit, $offset, $search);
-								$this->show_listing_extensions($class, $id, $limit, $offset, $edit);
+								echo $this->render_items($class, $id, $limit, $offset, $search, $history);
+								echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit);
 								//print_r(array("<pre>",$_SERVER));
 								break;
 						}
