X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=f4fd40c3afb65ca18508675fab17a4890363a0ec;hb=5b0075faa84afd5c1ffda52926ef12fdff0cd74e;hp=493c92bc6b42cf1c3b4d7541f88b72337c088631;hpb=a25f85f843146cee8793228d2d2bec42ebc05016;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index 493c92b..f4fd40c 100755 --- a/index.php +++ b/index.php @@ -18,51 +18,33 @@ */ require_once('sklad.conf.php'); +set_include_path(DIR_LIB.PATH_SEPARATOR.get_include_path()); + require_once('Sklad_LMS-fake.class.php'); require_once('HTTP_Auth.class.php'); +require_once('Locale.class.php'); +require_once('Barcode.class.php'); /** -* Trida poskytuje podpurne funkce pro generovani HTML kodu specificke pro sklad +* Trida poskytuje vseobecne funkce pro generovani HTML kodu * * Tato trida by nemela sama nic vypisovat (vyjma chybovych a debugovacich hlasek)! * -* @package Sklad_HTML +* @package HTML * @author Tomas Mudrunka */ -class Sklad_HTML { - function header($title='') { - $home = URL_HOME; - $script = $_SERVER['SCRIPT_NAME']; - $search = @trim($_GET['q']); - return << - - -

SystémSklad$title

-
- -
  • Logout
    • -
  • Home
    • -     -
    - - -
    - -
    -EOF; - } - - function row($row) { - $html=''; +class HTML { + function row($row,$type=false) { + $html = ''; + if($type) $html.="<$type>"; + $html.=''; + $td = $type == 'thead' ? 'th' : 'td'; foreach($row as $var) { if(trim($var) == '') $var = ' '; - $html.="$var"; + $html.="<$td>$var"; } $html.=''; + if($type) $html.=""; return $html; } @@ -71,7 +53,7 @@ EOF; $header=true; foreach($table as $row) { if($header) { - $html.=$this->row(array_keys($row)); + $html.=$this->row(array_keys($row),'thead'); $header=false; } $html.=$this->row($row); @@ -80,13 +62,197 @@ EOF; return $html; } - function link($title='n/a', $link='#void', $internal=true) { - if($internal) $link = $_SERVER['SCRIPT_NAME'].'/'.$link; - return "$title"; + function link($title='n/a', $link='#void', $internal=true, $translate=true) { + if($internal && (!isset($link[0]) || $link[0] != '#')) $link = $this->internal_url($link); + if($translate) $title = T($title); + return "".$title.""; + } + + function img($src='#void', $title='img', $options='width=64') { + $options = $options ? " $options" : ''; + return "$title"; + } + + function input($name=false, $value=false, $type='text', $placeholder=false, $options=false, $prefix='') { + $html = T($prefix)."'); print_r($selectbox); + $html = ""; + return $html; + } + + function ul($items,$tag=ul,$head='',$class=false) { + $class = $class ? " class='$class'" : ''; + $html = "$head<$tag$class>"; + foreach($items as $key => $value) { + $html .= '
  • '; + if(is_numeric($key)) { + $html .= $value; + } else { + $html .= $this->link($key,$value); + } + $html .= '
    • '; + } + $html .= ""; + return $html; + } + + function div($html, $options) { + $options = $options ? " $options" : ''; + return "$html"; + } + + function head($title=false,$charset='UTF-8',$more='') { + $title = $title ? "\n$title" : ''; + $html= ''; + $html.= ''.$title.$more; + $html.= ''; + return $html; + } +} + +/** +* 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 extends HTML { //TODO: Split into few more methods + function header($title='') { + $home = URL_HOME; + $script = $_SERVER['SCRIPT_NAME']; + $search = htmlspecialchars(@trim($_GET['q'])); + $message = strip_tags(@trim($_GET['message']),''); + $instance = INSTANCE_ID != '' ? '/'.INSTANCE_ID : ''; + //$title = T($title); //TODO + + $html = $this->head("SōkoMan$title"); + $html .= <<SōkoMan$instance$title + + + +
    +EOF; + + $assistants=array(); + foreach(scandir(DIR_ASSISTANTS) as $item) { + if($item == '.' || $item == '..') continue; + $item = preg_replace('/\.inc\.php$/','',$item); + $assistants[$item] = "assistant/$item"; } - function img($src='#void', $title='img') { - return "$title"; + $tables=array('item','model','category','producer','vendor','room','status'); + + foreach($tables as $table) { + $listable[$table] = $table; + $insertable[$table] = "$table/new"; + } + + $html .= $this->ul(array( + 'Home' => '', + 'Logout' => '?logout', + 0 => $this->ul($assistants,'menu',$this->link('Assistants','#')), + 1 => $this->ul($insertable,'menu',$this->link('New','#')), + 2 => $this->ul($listable,'menu',$this->link('List','#')) + ),'menu', '', 'menu'); + + $html .= '
    '; + + $html .= $this->form("$script/assistant/go", 'GET', array( + array('q','','text','smart id...', 'autofocus'), + array(false,'go','submit') + ), 'style="float: left;"'); + + $html .= $this->form('?', 'GET', array( + array('q',$search,'text','regexp...'), + array(false,'filter','submit') + ), 'style="float: left;"'); + + $html .= '
    '; + + $html .= << +
    +
    + $message +
    +EOF; + + return $html; + } + + function internal_url($link) { + return $_SERVER['SCRIPT_NAME'].'/'.$link; } function table_add_images(&$table) { @@ -100,6 +266,19 @@ EOF; } } + function render_barcode($barcode,$opts=false) { + return $this->link($this->img($this->internal_url("barcode/$barcode"),$barcode,$opts),"barcode/$barcode",true,false); + } + + function table_add_barcodes(&$table) { + $image = array('model_barcode', 'item_serial'); + foreach($table as $id => $row) { + foreach($image as $column) if(isset($table[$id][$column])) { + $table[$id][$column]=$this->render_barcode($table[$id][$column]); + } + } + } + function table_collapse(&$table) { $collapse = array( 'item_id' => 'item_id', @@ -112,7 +291,7 @@ EOF; ); foreach($table as $id => $row) { foreach($collapse as $link => $title) - if(isset($table[$id][$link])) { + if(isset($table[$id][$link]) && isset($row[$title])) { $type = @array_shift(preg_split('/_/', $link)); if($link != $title) unset($table[$id][$link]); $table[$id][$title]=$this->link($row[$title], $type.'/'.$row[$link].'/'); @@ -126,48 +305,71 @@ EOF; foreach($table as $id => $row) { $table_sorted[$id] = array(); foreach($precedence as $column) if(isset($table[$id][$column])) { - $table_sorted[$id][$column]=$table[$id][$column]; + $table_sorted[$id][T($column)]=$table[$id][$column]; unset($table[$id][$column]); } - $table_sorted[$id]=array_merge($table_sorted[$id],$table[$id]); + //$table_sorted[$id]=array_merge($table_sorted[$id],$table[$id]); + foreach($table[$id] as $key => $val) $table_sorted[$id][T($key)] = $val; //array_merge with T() translating } $table = $table_sorted; } function render_item_table($table) { $this->table_add_images($table); + $this->table_add_barcodes($table); $this->table_collapse($table); $this->table_sort($table); return $this->table($table); } - function input($name=false, $value=false, $type='text', $placeholder=false, $options=false) { - $html = "'.T($column['Field']).'    : '; + $name="values[$class][".$column['Field'].'][]'; + $val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false; + switch(true) { + case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)): + if(!$val) $val = ''; + $html.=$this->input($name, $val, 'hidden'); + $html.=$val.'(AUTO)'; + break; + case isset($selectbox[$column['Field']]): + $html.=$this->select($name,$selectbox[$column['Field']],$val); + break; + default: + $html.=$this->input($name, $val); + break; + } + $html.='
    '; + } return $html; } - function select($name, $selectbox, $default=false) { - //echo('
    '); print_r($selectbox);
-		$html = "";
 		return $html;
 	}
 
-	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $multi_insert=true) {
+	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true, $parts=false) {
+		$html = '';
+		//print_r($parts);
 		//echo('
    '); print_r($selectbox);
 		//echo('
    '); print_r($current);
 		$update = false;
@@ -176,49 +378,36 @@ EOF;
 			$current = array_shift($current);
 		}
 
-		$html='
    ';
-		if($multi_insert) $html.='
    ';
-		$html.=$this->input('table', $class, 'hidden');
-		foreach($columns as $column)	{
-			$html.=$column['Field'].': ';
-			$name='value:'.$column['Field'].'[]';
-			switch(true) {
-				case preg_match('/auto_increment/', $column['Extra']):
-					$val = $update ? $current[$column['Field']] : ''; //opakuje se (skoro) zbytecne
-					$html.=$this->input($name, $val, 'hidden');
-					$html.=$val.'(AUTO)';
-					break;
-				case isset($selectbox[$column['Field']]):
-					$val = $update ? $current[$column['Field']] : false;
-					$html.=$this->select($name,$selectbox[$column['Field']],$val); //opakuje se
-					break;
-				default:
-					$val = $update ? $current[$column['Field']] : false; //opakuje se
-					$html.=$this->input($name, $val);
-					break;
-			}
-			$html.='
    ';
+		if(!is_array($hidecols)) $hidecols = array();
+		$hidecols = array_merge($hidecols, array('item_author', 'item_valid_from', 'item_valid_till')); //TODO Autodetect
+
+		if(!is_array($parts) || in_array('head', $parts)) {
+			$action = $action ? " action='$action'" : false;
+			$html.=""; //TODO: use $this->form()
+			$html.='
    ';
 		}
 
-		if($multi_insert) {
-			//TODO, move to separate JS file
-			$html.=<<
-			
    
-			
-			+
+		if(!is_array($parts) || in_array('inputs', $parts))
+			$html.=$this->render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update);
+
+		if(!is_array($parts) || in_array('foot', $parts)) {
+			$html .= '

    ';
+			if($multi_insert) { //TODO, move to separate JS file
+				$html.=<<
+					function duplicate_element(what, where) {
+						var node = document.getElementsByName(what)[0];
+						node.parentNode.appendChild(node.cloneNode(true));
+					}
+				
+				+
 EOF;
-		}
+			}
 
-		$btn = is_array($current) ? 'UPDATE' : 'INSERT';
-		$html.=$this->input(false, $btn, 'submit');
-		$html.='';
+			$btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+			$html.=$this->input(false, $btn, 'submit');
+			$html.='';
+		}
 		return $html;
 	}
 }
@@ -243,102 +432,211 @@ 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, $where=false, $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')
-		);
+			'item'	=> array('item_id','item_serial','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])) {
-				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";
+			if(!isset($search_fields[$class])) die(trigger_error(T("Can't search in $class table yet :-("))); //TODO: post_redirect_get
+			$sql_search = '';
+			foreach($search_fields[$class] as $column) $sql_search .= "OR $column REGEXP $search ";
+			$where[] = "FALSE $sql_search";
+		}	elseif($id) $where[] = "$class$suffix_id = $id";
+		if(!$history && $this->contains_history($class)) $where[] = $class.'_valid_till=0';
+
+		if($where) $sql .= 'WHERE ('.implode(') AND (', $where).")\n";
+		//ORDER
+		if(!$order) $order = $class.$suffix_id;
+		if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
+		$sql .= "ORDER BY $order\n";
+		//LIMIT/OFFSET
 		if($limit) {
 			$limit = $this->escape((int)$limit);
 			$offset = $this->escape((int)$offset);
 			$sql .= "LIMIT $offset,$limit\n";
 		}
+
 		return $sql;
 	}
 
-	function safe_query($sql) {
+	function safe_query($sql, $fatal=true) {
 		$result = $this->query($sql);
 		if(!$result) {
-			trigger_error('QUERY FAILED:
    '.$sql.'
    ');
-			die();
+			$error = $this->errorInfo();
+			trigger_error("QUERY FAILED ($error[0],$error[1]): $error[2]

    QUERY:\n
    $sql
    ");
+			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);
-		$result = $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+	function translate_query_results($result) {
+		$translate_cols = array('status_name', 'item_valid_till'); //TODO: Hardcoded
+		foreach($result as $key => $row) {
+			foreach($translate_cols as $col) if(isset($result[$key][$col])){
+				$result[$key][$col] = T($result[$key][$col]);
+			}
+		}
+		return $result;
+	}
+
+	function safe_query_fetch($sql, $fatal=true, $fetch_flags = PDO::FETCH_ASSOC, $translate=true) {
+		$result = $this->safe_query($sql, $fatal)->fetchAll($fetch_flags);
+		if($translate) $result = $this->translate_query_results($result);
+		return $result;
+	}
+
+
+	function get_listing($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false, $indexed=array(), $suffix_id='_id') {
+		$sql = $this->build_query_select($class, $id, $limit, $offset, $where, $search, $history);
+		$result = $this->safe_query_fetch($sql);
 		if(!$result || !is_array($indexed)) return $result;
 
 		foreach($result as $key => $row) $indexed[$row[$class.$suffix_id]]=$row;
 		return $indexed;
 	}
 
-	function get_columns($class) {
+	function get_columns($class,$disable_cols=array()) { //TODO: Not sure if compatible with non-MySQL DBs
 		$class = $this->escape($class);
 		$sql = "SHOW COLUMNS FROM $class;";
-		return $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+		$columns = $this->safe_query_fetch($sql);
+		/*foreach($columns as $colk => $col) foreach($col as $key => $val) {
+			if(in_array($col['Field'],$disable_cols)) $columns[$colk]['Extra']='auto_increment';
+		}*/
+		return $columns;
 	}
 
 	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);
+
+			$history = $this->contains_history($table) ? " WHERE ${table}_valid_till=0" : '';
+			$sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table$history;"; //TODO use build_query_select()!!!
+			$result = $this->safe_query_fetch($sql, false);
+			if(!$result) continue;
 			foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
 		}
 		//echo('
    '); print_r($selectbox);
-		return $selectbox;
+		return array_filter($selectbox, 'ksort');
+	}
+
+	function map_unique($key, $value, $select, $table, $fatal=true) { //TODO: Guess $select and $table if not passed
+		$history = $this->contains_history($table) ? " AND ${table}_valid_till=0" : '';
+		$value=$this->quote($value);
+		$sql = "SELECT $select FROM $table WHERE $key=$value$history LIMIT 1;"; //TODO use build_query_select()!!!
+		$result = $this->safe_query_fetch($sql);
+		if(isset($result[0][$select])) return $result[0][$select]; else if($fatal) die(trigger_error(T('Record not found!'))); //TODO post_redirect_get...
+	}
+
+	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])));
+		$columns_array = array_map(array($this,'escape'), array_keys($values[0]));
+		$columns = implode(',',$columns_array);
+
+		//Build query
+		$sql = '';
+		//echo('
    '); 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='.$this->quote($row[$table.'_id']);
+					$or = ' OR';
+				}
+				$sql .= " );\n\n";
+				$replace = false;
+			}
+		}
 
 		//Insert into table (columns)
-		$sql = 'INSERT';
-		if($replace) $sql = 'REPLACE';
-		$sql .= " INTO $table ($columns) VALUES ";
+		$sql .= "INSERT 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 = ',';
 		}
 
+		//On duplicate key
+		if($replace) {
+			foreach($columns_array as $col) {
+				if($col == $table.'_id' || $col == $table.'_valid_till') continue;
+				$on_duplicate[] = "$col=VALUES($col)";
+			}
+			$sql .= "\nON DUPLICATE KEY UPDATE ".implode(',', $on_duplicate);
+		}
+
 		//Terminate
 		$sql .= ';';
 		return $sql;
 	}
 
-	function insert_or_update($table, $values) {
-		$sql = $this->build_query_insert($table, $values);
+	function insert_or_update($table, $values, $replace=true) {
+		$sql = $this->build_query_insert($table, $values, $replace);
 		$this->safe_query($sql);
 		return $this->lastInsertId();
 	}
 
+	function insert_or_update_multitab($values, $replace=true) {
+		$last=false;
+		foreach($values as $table => $rows) $last = $this->insert_or_update($table, $rows, $replace);
+		return $last;
+	}
+
 	function delete($table, $id, $suffix_id='_id') {
+		if($this->contains_history($table)) return false;
 		$key = $this->escape($table.$suffix_id);
 		$table = $this->escape($table);
 		$id = $this->quote($id);
@@ -346,6 +644,16 @@ class Sklad_DB extends PDO {
 	}
 }
 
+/**
+* Trida poskytuje high-level rozhrani k databazi skladu
+*
+* @package  Sklad_DB_Abstract
+* @author   Tomas Mudrunka
+*/
+class Sklad_DB_Abstract extends Sklad_DB {
+	//TODO Code
+}
+
 /**
 * Trida implementuje uzivatelske rozhrani skladu
 *
@@ -362,8 +670,8 @@ class Sklad_UI {
 		$this->html = new Sklad_HTML();
 	}
 
-	function render_items($class, $id=false, $limit=false, $offset=0, $search=false) {
-		return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $search));
+	function render_items($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false) {
+		return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $where, $search, $history, false));
 	}
 
 	function render_form_add($class) {
@@ -375,7 +683,7 @@ class Sklad_UI {
 	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);
+		$current = $this->db->get_listing($class, $id, 1);
 		return $this->html->render_insert_form($class, $columns, $selectbox, $current);
 	}
 
@@ -388,7 +696,9 @@ class Sklad_UI {
 		$html.= '-';
 		$html.= $this->html->link('>>', "$class/$id_next/");
 		$html.= '
    ';
+		$html.=''.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'';
 		$html.= $this->html->link('edit', "$class/$id/edit/");
+		if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
 		return $html;
 	}
 
@@ -413,18 +723,17 @@ class Sklad_UI {
 			$html.=$this->render_listing_navigation($class, '*', $limit, $offset);
 		}
 		if($edit)	{
-			$html.='
    TODO UPDATE FORM!
    ';
 			$html.= $this->render_form_edit($class, $id);
 			$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
-	    $html.= "
    ";
-			$html.= $this->html->input(false, 'DELETE', 'submit');
-			$html.= 'sure?'.$this->html->input('sure', false, 'checkbox');
-			$html.= '
    ';
+			$html.=$this->html->form($action,'POST',array(
+				array(false,'DELETE','submit'),
+				array('sure', false, 'checkbox', false, false, 'sure?')
+			));
 			$action = $_SERVER['SCRIPT_NAME']."/$class/$id/image";
-	    $html.= "
    ";
-			$html.= $this->html->input('image', false, 'file', false, 'size="30"');
-			$html.= $this->html->input(false, 'IMAGE', 'submit');
-			$html.='
    ';
+			$html.=$this->html->form($action,'POST',array(
+				array('image', false, 'file', false, 'size="30"'),
+				array(false, 'IMAGE', 'submit')
+			), "enctype='multipart/form-data'");
 		}
 		return $html;
 	}
@@ -433,56 +742,80 @@ class Sklad_UI {
 		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).'.
    '.
-		'Další záznam přidáte '.$this->html->link('zde', $next).'.';
-		die();
+	function post_redirect_get($location, $message='', $error=false) {
+		$url_args = $message != '' ? '?message='.urlencode(T($message)) : '';
+		$location = $this->html->internal_url($location).$url_args;
+		header('Location: '.$location);
+		if($error) trigger_error($message);
+		$location=htmlspecialchars($location);
+		die(
+			"".
+			T($message)."
    Location: $location"
+		);
 	}
 
-	function process_http_request_post($action=false, $class=false, $id=false) {
+	function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {
+		if(preg_match('/[^a-zA-Z0-9-]/',$name)) $this->post_redirect_get('', 'SAFE INCLUDE: Securityfuck.', true);
+		$filename="$dir/$name$ext";
+		if(!is_file($filename)) $this->post_redirect_get('', 'SAFE INCLUDE: Fuckfound.', true);
+		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, $force_redirect=false) {
 		if($_SERVER['REQUEST_METHOD'] != 'POST') return;
-		echo('
    '); //DEBUG (maybe todo remove)
+		//echo('
    '); //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':
+				$replace = false;
 			case 'edit':
-				if(!isset($_POST['table'])) die(trigger_error("Jest nutno specifikovat tabulku voe!"));
-				$table=$_POST['table'];
+				if(!isset($replace)) $replace = true;
+				$table = $class ? $class : '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, $replace);
+				$last = $force_redirect ? $force_redirect."?last=$last" : "$table/$last/";
+				$next = "$table/new/";
+				$message = $force_redirect ? '' : 'Hotovo. Další záznam přidáte '.$this->html->link('zde', $next).'.';
+				$this->post_redirect_get($last, $message);
 				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
+				if(!isset($_POST['sure']) || !$_POST['sure']) $this->post_redirect_get("$class/$id/edit", 'Sure user expected :-)');
+				$this->db->delete($class, $id) || $this->post_redirect_get("$class/$id/edit", "V tabulce $class jentak neco mazat nebudes chlapecku :-P");
+				$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
-				if(!in_array($class, $image_classes)) die(trigger_error("Nekdo nechce k DB Tride '$class' prirazovat obrazky!"));
+				if(!in_array($class, $image_classes)) $this->post_redirect_get("$class/$id/edit", "Nekdo nechce k DB Tride '$class' prirazovat obrazky!");
 				$image_destination = DIR_IMAGES."/$class/$id.jpg";
-				if($_FILES['image']['name'] == '') die(trigger_error('Kazde neco se musi nejak jmenovat!'));
+				if($_FILES['image']['name'] == '') $this->post_redirect_get("$class/$id/edit", 'Everything has to be called somehow!', true);
 				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", 'Image has been upbloated successfully :)');
+				} else $this->post_redirect_get("$class/$id/edit", 'File upload failed :(', true);
 				break;
 			default:
-				trigger_error('Nothin\' to do here my cutie :-*');
+				$this->post_redirect_get('', 'Nothin\' to do here my cutie :-*');
 				break;
 		}
 
@@ -498,16 +831,24 @@ class Sklad_UI {
 		}
 
 		$PATH_INFO=@trim($_SERVER[PATH_INFO]);
-		echo $this->html->header($PATH_INFO);
-
-
-		//Sephirot:
 		$PATH_CHUNKS = preg_split('/\//', $PATH_INFO);
+		//Sephirot:
 		if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
-		switch($PATH_CHUNKS[1]) {
+		if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcode') echo $this->html->header($PATH_INFO); //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+		switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
 			case 'test':	//test
 				die('Tell me why you cry');
 				break;
+			case 'assistant': //assistant
+				$PATH_CHUNKS[3] = isset($PATH_CHUNKS[3]) ? trim($PATH_CHUNKS[3]) : false;
+				$assistant_vars['SUBPATH'] = array_slice($PATH_CHUNKS, 3);
+				$assistant_vars['URL_INTERNAL'] = 'assistant/'.$PATH_CHUNKS[2];
+				$assistant_vars['URL'] = $_SERVER['SCRIPT_NAME'].'/'.$assistant_vars['URL_INTERNAL'];
+				echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
+				break;
+			case 'barcode': //barcode
+				Barcode::download_barcode(implode('/',array_slice($PATH_CHUNKS, 2)));
+				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';
@@ -523,14 +864,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');
-								echo $this->render_items($class, $id, $limit, $offset, $search);
+								$where = false; //TODO get from URL
+								echo $this->render_items($class, $id, $limit, $offset, $where, $search, $history);
 								echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit);
 								//print_r(array("
    ",$_SERVER));
 								break;
@@ -545,4 +888,4 @@ class Sklad_UI {
 $sklad = new Sklad_UI();
 $sklad->process_http_request();
 
-echo("
    ");
+echo('
    ');