X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=caf25a0ef3039c92e95f2ea419b87abbc7565589;hb=042a49887f093945b7ef913556e506c30ce2bbda;hp=6f7392ce1b30b04443e55acec61947f3359f6715;hpb=5469411711b7ac51190a64bf252aecb6a3f43f89;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 6f7392c..caf25a0 100755
--- a/index.php
+++ b/index.php
@@ -20,7 +20,7 @@
 require_once('sklad.conf.php');
 set_include_path(DIR_LIB.PATH_SEPARATOR.get_include_path());
 
-require_once('Sklad_LMS-fake.class.php');
+require_once('Sklad_Auth.class/common.php');
 require_once('HTTP_Auth.class.php');
 require_once('Locale.class.php');
 require_once('Barcode.class.php');
@@ -34,25 +34,33 @@ require_once('Barcode.class.php');
 * @author   Tomas Mudrunka
 */
 class HTML {
-	function row($row) {
-		$html='<tr>';
+	function row($row,$type=false,$class=false) {
+		$html = '';
+		$class = $class ? $class=" class='$class' " : '';
+		if($type) $html.="<$type>";
+		$html.="<tr$class>";
+		$td = $type == 'thead' ? 'th' : 'td';
 		foreach($row as $var) {
 			if(trim($var) == '') $var = '&nbsp;';
-			$html.="<td>$var</td>";
+			$html.="<$td>$var</$td>";
 		}
 		$html.='</tr>';
+		if($type) $html.="</$type>";
 		return $html;
 	}
 
-	function table(&$table, $params='border=1') {
+	function table(&$table, $parity_class=array('tr_odd','tr_even'), $params='border=1') {
 		$html="<table $params>";
 		$header=true;
+		$even=false;
 		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);
+			$class = $parity_class ? $parity_class[$even] : false;
+			$html.=$this->row($row,false,$class);
+			$even = !$even;
 		}
 		$html.='</table>';
 		return $html;
@@ -69,7 +77,21 @@ class HTML {
 		return "<img src='$src' alt='$title' title='$title'$options; />";
 	}
 
+	function img_link($src, $link='#void', $title='img_link', $internal=true, $translate=true, $options='width=64') {
+		return $this->link($this->img($src,$title,$options),$link,$internal,$translate);
+	}
+
+	function textarea($name=false, $value='', $placeholder=false, $options=false, $prefix='') {
+		$html = T($prefix)."<textarea";
+		if($name) $html.= " name='$name'";
+		if($options) $html.= " $options";
+		if($placeholder) $html.= " placeholder='$placeholder'";
+		$html .= ">$value</textarea>";
+		return $html;
+	}
+
 	function input($name=false, $value=false, $type='text', $placeholder=false, $options=false, $prefix='') {
+		if($type == 'textarea') return $this->textarea($name, $value, $placeholder, $options, $prefix);
 		$html = T($prefix)."<input type='$type' ";
 		if($name) $html.= "name='$name' ";
 		if(!is_bool($value)) {
@@ -129,10 +151,16 @@ class HTML {
 		return "<div$options>$html</div>";
 	}
 
+	function favicon($url='/favicon.ico') {
+		return '<link rel="shortcut icon" href="'.$url.'" /><link href="'.$url.'" rel="icon" type="image/gif" />';
+
+	}
+
 	function head($title=false,$charset='UTF-8',$more='') {
 		$title = $title ? "\n<title>$title</title>" : '';
 		$html= '<head>';
 		$html.= '<meta http-equiv="Content-Type" content="text/html; charset='.$charset.'" />'.$title.$more;
+		$html.= $this->favicon(dirname($_SERVER['SCRIPT_NAME']).'/favicon.ico');
 		$html.= '</head>';
 		return $html;
 	}
@@ -147,20 +175,34 @@ class HTML {
 * @author   Tomas Mudrunka
 */
 class Sklad_HTML extends HTML { //TODO: Split into few more methods
-	function header($title='') {
+	function header($title='', $user=array()) {
 		$home = URL_HOME;
 		$script = $_SERVER['SCRIPT_NAME'];
 		$search = htmlspecialchars(@trim($_GET['q']));
-		$message = strip_tags(@trim($_GET['message']),'<a><b><u><i>');
+		$message = strip_tags(@trim($_GET['message']),'<a><b><u><i><br>');
+		$fortune = 'test';
 		$instance = INSTANCE_ID != '' ? '/'.INSTANCE_ID : '';
+		$user_id = htmlspecialchars($user['id']);
+		$user_gid = htmlspecialchars($user['gid']);
+		$user_name = htmlspecialchars($user['name']);
+		$time = date('r');
 		//$title = T($title); //TODO
 
 		$html = $this->head("SÅkoMan$title");
 		$html .= <<<EOF
-<h1><a href="$script/">SÅkoMan</a><small>$instance$title</small></h1>
+<h1 style="display: inline;"><a href="$script/">SÅkoMan</a><small>$instance$title</small></h1>
+<div style="float:right; text-align:right;">
+	Logged in as <b>$user_name</b> [UID: <b>$user_id</b>; GID: <b>$user_gid</b>]<br />
+	Page loaded at $time
+</div>
 
 <style type="text/css">
 * { font-family: arial; }
+td,body { background-color: white; }
+table { background-color: orange; border: orange; }
+a, a img { text-decoration:none; color: darkblue; border:none; }
+li a, a:hover { text-decoration:underline; }
+.tr_even td { background-color: lemonchiffon; }
 
 .menu li {
 	float: left;
@@ -199,8 +241,8 @@ EOF;
 	$assistants=array();
 	foreach(scandir(DIR_ASSISTANTS) as $item) {
 		if($item == '.' || $item == '..') continue;
-		$item = preg_replace('/\.inc\.php$/','',$item);
-		$assistants[$item] = "assistant/$item";
+		$item = preg_replace('/\.inc\.php$/','',$item,-1,$count);
+		if($count) $assistants[$item] = "assistant/$item";
 	}
 
 	$tables=array('item','model','category','producer','vendor','room','status');
@@ -220,7 +262,7 @@ EOF;
 
 	$html .= '<div style="float: right;">';
 
-	$html .= $this->form("$script/assistant/go", 'GET', array(
+	$html .= $this->form("$script/api/go", 'GET', array(
 		array('q','','text','smart id...', 'autofocus'),
 		array(false,'go','submit')
 	), 'style="float: left;"');
@@ -238,6 +280,9 @@ EOF;
 <div style="background-color:#FFDDDD;">
 	<font color="red">$message</font>
 </div>
+<div style="text-align:right;">
+$fortune
+</div>
 EOF;
 
 	return $html;
@@ -253,13 +298,13 @@ EOF;
 			foreach($image as $column) if(isset($table[$id][$column])) {
 				$type = @array_shift(preg_split('/_/', $column));
 				$src=URL_IMAGES."/$type/".$table[$id][$column].'.jpg';
-				$table[$id][$type.'_image']=$this->img($src, $table[$id][$column]);
+				$table[$id][$type.'_image']=$this->img_link($src, $src, $table[$id][$column], false, false);
 			}
 		}
 	}
 
 	function render_barcode($barcode,$opts=false) {
-		return $this->link($this->img($this->internal_url("barcode/$barcode"),$barcode,$opts),"barcode/$barcode",true,false);
+		return $this->img_link($this->internal_url("barcode/$barcode"),$this->internal_url("barcode/$barcode"),$barcode,false,false,$opts);
 	}
 
 	function table_add_barcodes(&$table) {
@@ -271,6 +316,39 @@ EOF;
 		}
 	}
 
+	function table_add_relations(&$table, $class, $suffix_relations='_relations') {
+		$where_url = '%d/?where[%c]==%v';
+		$relations = array( //TODO: Autodetect???
+			'model' => array(
+				'model_id' => array(array('item',$where_url)),
+				'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
+				'model_name' => array(array('google','http://google.com/search?q=%v',true)) //TODO: add manufacturer to google query
+			),
+			'item' => array(
+				'item_serial' => array(array('dispose','assistant/%d?serial=%v'),array('sell','assistant/%d?serial=%v'))
+			),
+			'category' => array('category_id' => array(array('item',$where_url), array('model',$where_url))),
+			'producer' => array('producer_id' => array(array('item',$where_url), array('model',$where_url))),
+			'vendor' => array('vendor_id' => array(array('item',$where_url))),
+			'room' => array('room_id' => array(array('item',$where_url))),
+			'status' => array('status_id' => array(array('item',$where_url)))
+		);
+		foreach($table as $id => $row) {
+			foreach($row as $column => $value) {
+				if(isset($relations[$class][$column])) {
+					foreach($relations[$class][$column] as $destination) {
+						$destination_url = str_replace(
+							array('%d','%c','%v'),
+							array(urlencode($destination[0]),urlencode($column),urlencode($value)),
+							$destination[1]
+						);
+						@$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !isset($destination[2])).',';
+					}
+				}
+			}
+		}
+	}
+
 	function table_collapse(&$table) {
 		$collapse = array(
 			'item_id' => 'item_id',
@@ -306,29 +384,33 @@ EOF;
 		$table = $table_sorted;
 	}
 
-	function render_item_table($table) {
+	function table_hide_columns(&$table, $class) { //TODO: Move to build_query_select() !!! :-)))
+		$fields_hide = array(
+			'item' => array('model_descript','model_price_in','model_price_out','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note')
+		);
+		//print_r($table); die();
+		if(isset($fields_hide[$class])) foreach($table as $id => $row) {
+			foreach($fields_hide[$class] as $field) unset($table[$id][$field]);
+		}
+	}
+
+	function render_item_table($table,$class=false) {
+		if(empty($table)) return '<h3>'.T('holy primordial emptiness is all you can find here...').'</h3><br />';
 		$this->table_add_images($table);
+		if($class) $this->table_add_relations($table,$class);
 		$this->table_add_barcodes($table);
 		$this->table_collapse($table);
+		if($class) $this->table_hide_columns($table,$class);
 		$this->table_sort($table);
 		return $this->table($table);
 	}
 
-	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true) {
-		//echo('<pre>'); print_r($selectbox);
-		//echo('<pre>'); print_r($current);
-		$update = false;
-		if(is_array($current)) {
-			$update = true;
-			$current = array_shift($current);
-		}
-
-		if(!is_array($hidecols)) $hidecols = array('item_author', 'item_valid_from', 'item_valid_till'); //TODO Autodetect
-
-		$action = $action ? " action='$action'" : false;
-		$html="<form$action method='POST'>"; //TODO: use $this->form()
-		if($multi_insert) $html.='<span><div name="input_set" style="float:left; border:1px solid grey; padding: 1px; margin: 1px;">';
-		//$html.=$this->input('table', $class, 'hidden');
+	function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
+		$textarea = array(
+			'item' => array('item_note'),
+			'model' => array('model_descript')
+		);
+		$html = '';
 		foreach($columns as $column)	{
 			$html.=T($class).':<b>'.T($column['Field']).'</b>: ';
 			$name="values[$class][".$column['Field'].'][]';
@@ -342,30 +424,81 @@ EOF;
 				case isset($selectbox[$column['Field']]):
 					$html.=$this->select($name,$selectbox[$column['Field']],$val);
 					break;
+				case isset($textarea[$class]) && in_array($column['Field'],$textarea[$class]):
+					$html.=$this->input($name, $val, 'textarea');
+					break;
 				default:
 					$html.=$this->input($name, $val);
 					break;
 			}
 			$html.='<br />';
 		}
+		return $html;
+	}
 
-		if($multi_insert) { //TODO, move to separate JS file
-			$html.=<<<EOF
-			</div></span>
-			<br style="clear:both" />
-			<script>
-				function duplicate_element(what, where) {
-					var node = document.getElementsByName(what)[0];
-					node.parentNode.appendChild(node.cloneNode(true));
-				}
-			</script>
-			<a href='#' onClick="duplicate_element('input_set')">+</a>
-EOF;
+	function render_insert_form_multi($array) {
+		$html = '';
+		$head=false;
+
+		foreach($array as $key => $args) {
+			$parts=array('inputs');
+			if(!$head) { $head = true;
+				$parts[]='head';
+			}
+			if(!isset($array[$key+1])) {
+				$parts[]='foot';
+				$hr = '';
+			} else $hr = '<hr />';
+			//$args[] = false;
+			$args[] = $parts;
+
+			$html .= call_user_func_array(array($this, 'render_insert_form'), $args);
+			$html .= $hr;
 		}
+		return $html;
+	}
+
+	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true, $parts=false) {
+		$html = '';
+		//print_r($parts);
+		//echo('<pre>'); print_r($selectbox);
+		//echo('<pre>'); print_r($current);
+		$update = false;
+		if(is_array($current)) {
+			$update = true;
+			$current = array_shift($current);
+		}
+
+		if(!is_array($hidecols)) $hidecols = array();
+		$hidecols = array_merge($hidecols, array('item_author', 'item_valid_from', 'item_valid_till')); //TODO Autodetect
 
-		$btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
-		$html.=$this->input(false, $btn, 'submit');
-		$html.='</form>';
+		if(!is_array($parts) || in_array('head', $parts)) {
+			$action = $action ? " action='$action'" : false;
+			$html.="<form$action method='POST'>"; //TODO: use $this->form()
+			$html.='<span><div name="input_set" style="float:left; border:1px solid grey; padding: 1px; margin: 1px;">';
+		}
+
+		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 .= '</div></span><br style="clear:both" />';
+			if($multi_insert) { //TODO, move to separate JS file
+				$html.=<<<EOF
+				<script>
+					function duplicate_element(what, where) {
+						var node = document.getElementsByName(what)[0];
+						node.parentNode.appendChild(node.cloneNode(true));
+					}
+				</script>
+				<a href='#' onClick="duplicate_element('input_set')">+</a>
+EOF;
+			}
+
+			$btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+			$html.=$this->input(false, $btn, 'submit');
+			$html.='</form>';
+		}
 		return $html;
 	}
 }
@@ -378,7 +511,7 @@ EOF;
 */
 class Sklad_DB extends PDO {
 	function __construct() {
-		$this->lms = new Sklad_LMS();
+		$this->auth = new Sklad_Auth();
 
 		parent::__construct(
 			DB_DSN, DB_USER, DB_PASS,
@@ -390,36 +523,44 @@ class Sklad_DB extends PDO {
 		return preg_replace('(^.|.$)', '', $this->quote($str)); //TODO HACK
 	}
 
+	function quote_identifier($str) {
+		return '`'.$this->escape($str).'`'; //TODO HACK
+	}
+
 	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','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name')
+		$fields_search = array(
+			'item'	=> array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name'),
+			'model' => array('model_id','model_name','model_barcode','model_descript','producer_name')
 		); //TODO Autodetect
 
+		//Init
+		if(is_array($where)) foreach($where as $key => $value) $where[$key] = $key.' '.$value; //TODO: escape SQLi!!!
+
 		//Escaping
 		$class = $this->escape($class);
 
 		//SELECT
-		$sql="SELECT * FROM $class\n";
+		$sql="SELECT * FROM `$class`\n";
 		//JOIN
-		if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$suffix_id)\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);
-			if(!isset($search_fields[$class])) die(trigger_error(T("Can't search in $class table yet :-("))); //TODO: post_redirect_get
+			if(!isset($fields_search[$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 ";
+			foreach($fields_search[$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(!$order) $order = $class.$suffix_id.' DESC';
 		if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
 		$sql .= "ORDER BY $order\n";
 		//LIMIT/OFFSET
@@ -468,14 +609,22 @@ class Sklad_DB extends PDO {
 		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_fetch($sql);
+		$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();
+		$selectbox=array( //TODO: Hardcoded...
+			'model_countable' => array(0 => 'no', 1 => 'yes'),
+			'model_eshop_hide' => array(0 => 'no', 1 => 'yes'),
+			'vendor_id' => array('COMPULSORY' => 'select...')
+		);
 		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;
@@ -492,12 +641,12 @@ class Sklad_DB extends PDO {
 		return array_filter($selectbox, 'ksort');
 	}
 
-	function map_unique($key, $value, $select, $table) { //TODO: Guess $select and $table if not passed
+	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 die(trigger_error(T('Record not found!'))); //TODO post_redirect_get...
+		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) {
@@ -528,7 +677,7 @@ class Sklad_DB extends PDO {
 				$sql .= " WHERE ${table}_valid_till=0 AND (";
 				$or = '';
 				foreach($values as $row) {
-					$sql .= $or.' '.$table.'_id='.$row[$table.'_id'];
+					$sql .= $or.' '.$table.'_id='.$this->quote($row[$table.'_id']);
 					$or = ' OR';
 				}
 				$sql .= " );\n\n";
@@ -553,8 +702,8 @@ class Sklad_DB extends PDO {
 							$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');
+							$row_quoted[$column] = $this->auth->get_user_id();
+							//die($this->auth->get_user_id().'=USER');
 							break;
 					}
 				}
@@ -625,7 +774,7 @@ class Sklad_UI {
 	}
 
 	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));
+		return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $where, $search, $history, false),$class);
 	}
 
 	function render_form_add($class) {
@@ -634,11 +783,11 @@ class Sklad_UI {
 		return $this->html->render_insert_form($class, $columns, $selectbox);
 	}
 
-	function render_form_edit($class, $id) {
+	function render_form_edit($class, $id, $multi_insert) {
 		$columns = $this->db->get_columns($class);
 		$selectbox = $this->db->columns_get_selectbox($columns, $class);
 		$current = $this->db->get_listing($class, $id, 1);
-		return $this->html->render_insert_form($class, $columns, $selectbox, $current);
+		return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert);
 	}
 
 	function render_single_record_details($class, $id) {
@@ -677,7 +826,7 @@ class Sklad_UI {
 			$html.=$this->render_listing_navigation($class, '*', $limit, $offset);
 		}
 		if($edit)	{
-			$html.= $this->render_form_edit($class, $id);
+			$html.= $this->render_form_edit($class, $id, false);
 			$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
 			$html.=$this->html->form($action,'POST',array(
 				array(false,'DELETE','submit'),
@@ -693,18 +842,19 @@ class Sklad_UI {
 	}
 
 	function check_auth() {
-		new HTTP_Auth('SkladovejSystem', true, array($this->db->lms,'check_auth'));
+		new HTTP_Auth('WareHouse ['.BACKEND_AUTH.']', true, array($this->db->auth,'check_auth'));
 	}
 
-	function post_redirect_get($location, $message='', $error=false) {
-		$url_args = $message != '' ? '?message='.urlencode(T($message)) : '';
+	function post_redirect_get($location, $message='', $error=false, $translate=true) {
+		$messaget = $translate ? T($message) : $message;
+		$url_args = $messaget != '' ? '?message='.urlencode($messaget) : '';
 		$location = $this->html->internal_url($location).$url_args;
 		header('Location: '.$location);
 		if($error) trigger_error($message);
 		$location=htmlspecialchars($location);
 		die(
 			"<meta http-equiv='refresh' content='0; url=$location'>".
-			T($message)."<br />Location: <a href='$location'>$location</a>"
+			$messaget."<br />Location: <a href='$location'>$location</a>"
 		);
 	}
 
@@ -720,6 +870,16 @@ class Sklad_UI {
 		return $out;
 	}
 
+	function check_input_validity($field, $value='', $ruleset=0) {
+		$rules = array(0 => array(
+			'model_barcode' => '/./',
+			'item_serial' => '/./',
+			'vendor_id' => '/^[0-9]*$/'
+		));
+		if(isset($rules[$ruleset][$field]) && !preg_match($rules[$ruleset][$field], trim($value))) return false;
+		return true;
+	}
+
 	function process_http_request_post($action=false, $class=false, $id=false, $force_redirect=false) {
 		if($_SERVER['REQUEST_METHOD'] != 'POST') return;
 		//echo('<pre>'); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
@@ -734,7 +894,14 @@ class Sklad_UI {
 			$values=array();
 			foreach($_POST['values'] as $table => $columns) {
 				foreach($columns as $column => $ids) {
-					foreach($ids as $id => $val) $values[$table][$id][$column] = $val;
+					foreach($ids as $id => $val) {
+						$values[$table][$id][$column] = trim($val);
+						if(!$this->check_input_validity($column,$val)) {
+							$message = "Spatny vstup: $column [$id] = \"$val\"; ". //XSS
+								$this->html->link('GO BACK', 'javascript:history.back()', false, false);
+			        $this->post_redirect_get('', $message, false, false);
+						}
+					}
 				}
 			}
 			//die(print_r($values));
@@ -785,20 +952,27 @@ class Sklad_UI {
 		}
 
 		$PATH_INFO=@trim($_SERVER[PATH_INFO]);
+		if($PATH_INFO == '' || $PATH_INFO == '/') $PATH_INFO = FRONTEND_PAGE_WELCOME;
 		$PATH_CHUNKS = preg_split('/\//', $PATH_INFO);
 		//Sephirot:
 		if(!isset($PATH_CHUNKS[1])) $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...
+		if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcode' && $PATH_CHUNKS[1]!='api') //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+			echo $this->html->header($PATH_INFO,$this->db->auth->get_user());
 		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
+			case 'assistant': case 'api': //assistant|api
+				$incdirs = array(
+					'assistant'	=> DIR_ASSISTANTS,
+					'api'	=> DIR_APIS
+				);
 				$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);
+				$assistant_vars['ASSISTANT'] = $PATH_CHUNKS[2];
+				echo $this->safe_include($incdirs[$PATH_CHUNKS[1]],$PATH_CHUNKS[2],$assistant_vars);
 				break;
 			case 'barcode': //barcode
 				Barcode::download_barcode(implode('/',array_slice($PATH_CHUNKS, 2)));
@@ -824,9 +998,9 @@ class Sklad_UI {
 								$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');
-								$where = false; //TODO get from URL
+								$limit	= is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : FRONTEND_LISTING_LIMIT;
+								$offset	= isset($PATH_CHUNKS[4]) ? (int) $PATH_CHUNKS[4] : 0;
+								$where = @is_array($_GET['where']) ? $_GET['where'] : false;
 								echo $this->render_items($class, $id, $limit, $offset, $where, $search, $history);
 								echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit);
 								//print_r(array("<pre>",$_SERVER));
