X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=ad309f03ad493cd2387485e16bb62dc3d015a851;hb=ecdaa8cd1cac91037dcb953b6826a86f1bc585a8;hp=9ed67813974e1e65a410f59f77f92598666e51ec;hpb=ba30732d25e053969770906594528d46eb4bb9b0;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 9ed6781..ad309f0 100755
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * SkladovySystem - Storage management system compatible with LMS
- * Copyright (C) 2011  Tomas Mudrunka
+ * Copyright (C) 2011-2012  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
@@ -22,6 +22,7 @@ set_include_path(DIR_LIB.PATH_SEPARATOR.get_include_path());
 
 require_once('Sklad_Auth.class/common.php');
 require_once('HTTP_Auth.class.php');
+require_once('Query.class.php');
 require_once('Locale.class.php');
 require_once('Barcode.class.php');
 require_once('Fortune.php');
@@ -37,25 +38,25 @@ require_once('Fortune.php');
 class HTML {
 	function row($row,$type=false,$class=false,$parameters='',$colspan=array(),$rowspan=array(),$break_after=array()) {
 		$html = '';
-		$class = $class ? $class=" class='$class' " : '';
+		$class_br = $class ? " class='$class' " : '';
+		$class = $class ? " class='$class tr_nobr' " : '';
 		if($type) $html.="<$type>";
-		$tr="<tr$class$parameters>";
-		$html.=$tr;
+		$html.="<tr$class$parameters>";
 		$td = $type == 'thead' ? 'th' : 'td';
 		foreach($row as $id => $var) {
 			$tdclass = " class='cell_$id'";
 			if(trim($var) == '') $var = '&nbsp;';
 			$rs = isset($rowspan[$id]) ? " rowspan='$rowspan[$id]'" : '';
 			$cs = isset($colspan[$id]) ? " colspan='$colspan[$id]'" : '';
-			$html.="<$td$rs$cs$tdclass>$var</$td>";
-			if(in_array($id,$break_after,true)) $html.='</tr>'.$tr;
+			$html.="<$td$rs$cs$tdclass title='$id'>$var</$td>";
+			if(in_array($id,$break_after,true)) $html.='</tr>'."<tr$class_br$parameters>";
 		}
 		$html.='</tr>';
 		if($type) $html.="</$type>";
 		return $html;
 	}
 
-	function table(&$table,$colspan=array(),$rowspan=array(),$break_after=array(),$parity_class=array('tr_odd','tr_even'),$params='border=1',$row_classes_field='_row_classes') {
+	function table(&$table,$colspan=array(),$rowspan=array(),$break_after=array(),$orderby=false,$parity_class=array('tr_odd','tr_even'),$params='border=1',$row_classes_field='_row_classes') {
 		$html="<table $params>";
 		$header=true;
 		$even=false;
@@ -63,8 +64,13 @@ class HTML {
 			$params = isset($row[$row_classes_field]) ? $row[$row_classes_field] : '';
 			unset($row[$row_classes_field]);
 			if($header) {
-				$keys = array(); foreach($row as $key => $val) $keys[$key]=$key;
-				$html.=$this->row(T($keys),'thead',false,'',$colspan,$rowspan,$break_after);
+				$keys = array(); foreach($row as $key => $val) {
+					$order= $orderby ? '&nbsp;'.
+						$this->link('&uarr;', $orderby."[$key]=ASC").
+						$this->link('&darr;', $orderby."[$key]=DESC") : '';
+					$keys[$key]=T($key).$order;
+				}
+				$html.=$this->row($keys,'thead',false,'',$colspan,$rowspan,$break_after);
 				$header=false;
 			}
 			$class = $parity_class ? $parity_class[$even] : false;
@@ -82,6 +88,7 @@ class HTML {
 	}
 
 	function img($src='#void', $title='img', $options='height=64') {
+		if(isset($_GET['noimgs'])) return "<span title='$title'>".basename($src).'</span>';
 		$options = $options ? " $options" : '';
 		return "<img src='$src' alt='$title' title='$title'$options; />";
 	}
@@ -101,6 +108,8 @@ class 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);
+		if($type == 'select') return $this->select($name, $placeholder, $value, $prefix);
+		//select(vendor, $selectbox ,false, prefix:);
 		$html = T($prefix)."<input type='$type' ";
 		if($name) $html.= "name='$name' ";
 		if(!is_bool($value)) {
@@ -123,17 +132,17 @@ class HTML {
 		return $html;
 	}
 
-	function select($name, $selectbox, $default=false) {
+	function select($name, $selectbox, $default=false, $prefix='') {
 		//echo('<pre>'); print_r($selectbox);
-		$html = "<select name='$name'>";
+		$html = T($prefix)."<select name='$name'>";
 
 		if(!is_bool($default)) {
 			$value=$default; $title=$selectbox[$value];
-			$html .= "<option value='$value'>$value :: $title</option>";
+			$html .= "<option value='$value'>$title (($value))</option>";
 			unset($selectbox[$value]);
 		}
 		foreach($selectbox as $value => $title) {
-			$html .= "<option value='$value'>$value :: $title</option>";
+			$html .= "<option value='$value'>$title (($value))</option>";
 		}
 		$html .= "</select>";
 		return $html;
@@ -184,7 +193,7 @@ class HTML {
 * @author   Tomas Mudrunka
 */
 class Sklad_HTML extends HTML { //TODO: Split into few more methods
-	function header($title='', $user=array()) {
+	function header($title='', $user=array(), $headerhtml) {
 		$home = URL_HOME;
 		$script = $_SERVER['SCRIPT_NAME'];
 		$search = htmlspecialchars(@trim($_GET['q']));
@@ -207,19 +216,24 @@ class Sklad_HTML extends HTML { //TODO: Split into few more methods
 
 <style type="text/css">
 * { font-family: arial; }
-td,body { background-color: white; }
+td,body { background-color: white; border: orange; }
+.tr_nobr td { border-top: 3px solid orange; }
 table { background-color: orange; border: orange; }
+td textarea { width:100%; height:100%; }
 a, a img { text-decoration:none; color: darkblue; border:none; }
 li a, a:hover { text-decoration:underline; }
 .tr_even td { background-color: lemonchiffon; }
+.tr_nobr.tr_even td:first-child { border-left: 5px solid orange; }
+.tr_nobr.tr_odd td:first-child { border-left: 5px solid white; }
 .item_status_stored td { font-weight:bold; }
 .item_status_deleted td { text-decoration:line-through; }
 .item_status_destroyed td { font-style:italic; }
+.floating_barcode { margin: 5px; }
+.disabled { color: grey; }
 /* table, table * { table-layout:fixed; width:100%; overflow:hidden; word-wrap:break-word; } */
 /* td { position:absolute; } */
 /* .cell_model_name { float:left; } */
 
-
 .menu li {
 	float: left;
 	padding: 0.2em;
@@ -261,7 +275,7 @@ EOF;
 		if($count) $assistants[$item] = "assistant/$item";
 	}
 
-	$tables=array('item','model','category','producer','vendor','room','status');
+	$tables=array('item','barcode','model','category','producer','vendor','room','status','location');
 
 	foreach($tables as $table) {
 		$listable[$table] = $table;
@@ -293,7 +307,7 @@ EOF;
 
 	$html .= $this->form("$script/item", 'GET', array(
 		array('q',$search,'text','regexp...','autofocus'),
-		array(false,'search','submit')
+		array(false,'search item','submit')
 	), 'style="float: left;"');
 
 	$html .= '</div>';
@@ -302,7 +316,7 @@ EOF;
 </div>
 <hr style="clear: both;" />
 <div style="background-color:#FFDDDD;">
-	<font color="red">$message</font>
+	<font color="red">$headerhtml $message</font>
 </div>
 <div style="text-align:right; color:darkgreen;">
 $fortune
@@ -328,11 +342,11 @@ EOF;
 	}
 
 	function render_barcode($barcode,$opts=false) {
-		return $this->img_link($this->internal_url("barcode/$barcode"),$this->internal_url("barcode/$barcode"),$barcode,false,false,$opts);
+		return $this->img_link($this->internal_url("barcodeimg/$barcode"),$this->internal_url("barcodeimg/$barcode"),$barcode,false,false,$opts);
 	}
 
 	function table_add_barcodes(&$table) {
-		$image = array('model_barcode', 'item_serial');
+		$image = array('barcode_name', '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]);
@@ -351,11 +365,18 @@ EOF;
 
 	function table_add_relations(&$table, $class, $suffix_relations='_relations') {
 		$where_url = '%d/?where[%c]==%v';
-		$relations = array( //TODO: Autodetect???
+		$insert_url = '%d/new?insert[%c]=%v';
+		$relations = array( //TODO: Autodetect??? //TODO: Add [edit] link to all classes
 			'model' => array(
-				'model_id' => array(array('item',$where_url),array('edit','model/%v/edit/')),
+				'model_id' => array(array('item',$where_url),array('barcode',$where_url),array('edit','model/%v/edit/'),array('barcode',$insert_url,false,'add barcode')),
 				'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
+				'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
+				'model_name' => array(array('google','http://google.com/search?q=%v')) //TODO: add manufacturer to google query
+			),
+			'barcode' => array(
+				'model_id' => array(array('model',$where_url)),
+				'barcode_id' => array(array('item',$where_url),array('edit','barcode/%v/edit/')),
+				'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
 			),
 			'item' => array(
 				'item_serial' => array(array('dispose','assistant/%d?serial=%v','in_stock'),array('sell','assistant/%d?serial=%v','in_stock')),
@@ -365,12 +386,16 @@ EOF;
 			'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)))
+			'status' => array('status_id' => array(array('item',$where_url))),
+			'location' => array(
+				'location_id' => array(array('item',$where_url),array('edit','location/%v/edit/')),
+				'location_name' => array(array('smokeping','http://tartarus.brevnov.czf/cgi-bin/smokeping.cgi?filter=%v'))
+			)
 		);
 		$relations_conditions=array(
 			'in_stock' => 'return(@$table[$id]["status_name"] == "stored");',
-			'not_sold' => 'return(@$table[$id]["status_name"] != "saled");',
-			'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "saled" && @$table[$id]["status_name"] != "disposed");'
+			'not_sold' => 'return(@$table[$id]["status_name"] != "sold");',
+			'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "sold" && @$table[$id]["status_name"] != "disposed");'
 		);
 		foreach($table as $id => $row) {
 			foreach($row as $column => $value) {
@@ -385,7 +410,8 @@ EOF;
 							//$condition = $relations_conditions[$destination[2]]($table,$id);
 							if(!eval($relations_conditions[$destination[2]])) continue;
 						}
-						@$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url).',';
+						$destination_title = isset($destination[3]) ? $destination[3] : $destination[0];
+						@$table[$id][$class.$suffix_relations] .= $this->link($destination_title, $destination_url, !preg_match('/http/', $destination_url) ).',';
 					}
 				}
 			}
@@ -400,9 +426,11 @@ EOF;
 			'producer_id' => 'producer_name',
 			'vendor_id' => 'vendor_name',
 			'room_id' => 'room_name',
+			'location_id' => 'location_name',
 			'status_id' => 'status_name',
 			'item_author' => 'item_author_backend',
 			'item_customer' => 'item_customer',
+			'lock_id' => 'lock_name',
 		);
 
 		foreach($table as $id => $row) {
@@ -440,7 +468,11 @@ EOF;
 
 	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')
+			'model' => array('barcode_name'),
+			'barcode' => array('model_price_in','model_price_out','model_reserve','producer_name','producer_note','model_eshop_hide','category_name','model_countable','model_descript'),
+			'item' => array('model_descript','model_price_in','model_price_out','barcode_name','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note','location_author','location_gps','location_description'),
+			'lock' => array('lock_author'),
+			'transaction' => array('transaction_author')
 		);
 		//print_r($table); die();
 		if(isset($fields_hide[$class])) foreach($table as $id => $row) {
@@ -449,10 +481,9 @@ EOF;
 	}
 
 	function render_item_table($table,$class=false) {
-
 		$cellspan = array(
 			'break_after' => array(
-				'item' => array('model_name'),
+				'item' => array('category_name'),
 				'model'=> array('model_descript')
 			),
 			'rowspan' => array(
@@ -460,7 +491,7 @@ EOF;
 				'model'=> array('model_image'=>2)
 			),
 			'colspan' => array(
-				'item' => array('model_name'=>'100%'),
+				'item' => array('model_name'=>6,'category_name'=>'100%'),
 				'model'=> array('model_name'=>4,'model_descript'=>'100%')
 			)
 		);
@@ -476,7 +507,13 @@ EOF;
 		$this->table_collapse($table);
 		if($class) $this->table_hide_columns($table,$class);
 		$this->table_sort($table);
-		return $this->table($table,$colspan,$rowspan,$break_after);
+
+		//Orderby:
+		$path = $_GET;
+		unset($path['orderby']);
+		$path = $_SERVER['PATH_INFO'].'?'.Query::build($path).'orderby';
+
+		return $this->table($table,$colspan,$rowspan,$break_after,$path);
 	}
 
 	function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
@@ -484,16 +521,18 @@ EOF;
 			'item' => array('item_note'),
 			'model' => array('model_descript')
 		);
-		$html = '';
+		$html = '<table>';
+		$even=false;
 		foreach($columns as $column)	{
-			$html.=T($class).':<b>'.T($column['Field']).'</b>: ';
+			$html.='<tr class="'. ($even ? 'tr_even' : 'tr_odd') .'"><td>'.T($class).':<b>'.T($column['Field']).'</b>:&nbsp;</td><td>';
+			$even = !$even;
 			$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(is_bool($val) && !$val) $val = '';
 					$html.=$this->input($name, $val, 'hidden');
-					$html.=$val.'(AUTO)';
+					$html.='<span class="disabled"><i>[AUTO]</i> '.$val.'</span>';
 					break;
 				case isset($selectbox[$column['Field']]):
 					$html.=$this->select($name,$selectbox[$column['Field']],$val);
@@ -505,8 +544,9 @@ EOF;
 					$html.=$this->input($name, $val);
 					break;
 			}
-			$html.='<br />';
+			$html.='</td></tr>';
 		}
+		$html.='</table>';
 		return $html;
 	}
 
@@ -538,9 +578,14 @@ EOF;
 		//echo('<pre>'); print_r($selectbox);
 		//echo('<pre>'); print_r($current);
 		$update = false;
+		$current_new=array();
 		if(is_array($current)) {
 			$update = true;
-			$current = array_shift($current);
+			$current_new = array_merge($current_new,array_shift($current));
+		}
+		if(isset($_GET['insert']) && is_array($_GET['insert'])) {
+			$update = true;
+			$current_new = array_merge($current_new,$_GET['insert']);
 		}
 
 		if(!is_array($hidecols)) $hidecols = array();
@@ -553,7 +598,7 @@ EOF;
 		}
 
 		if(!is_array($parts) || in_array('inputs', $parts))
-			$html.=$this->render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update);
+			$html.=$this->render_insert_inputs($class,$columns,$selectbox,$current_new,$hidecols,$update);
 
 		if(!is_array($parts) || in_array('foot', $parts)) {
 			$html .= '</div></span><br style="clear:both" />';
@@ -569,7 +614,7 @@ EOF;
 EOF;
 			}
 
-			$btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+			$btn = count($current_new)>0 ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
 			$html.=$this->input(false, $btn, 'submit');
 			$html.='</form>';
 		}
@@ -604,13 +649,20 @@ class Sklad_DB extends PDO {
 	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'),
+			'barcode'	=> array('model', 'category', 'producer'),
+			'item'	=> array('barcode', 'model', 'category', 'producer', 'vendor', 'room', 'location', 'status'),
 			'model'	=> array('category', 'producer')
 		); //TODO Autodetect using foreign keys?
+		$join2 = array(
+			'model' => array('barcode'=>'model_id')
+		);
 		$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')
+			'item'	=> array('item_id','item_serial','model_name','barcode_name','model_descript','producer_name','vendor_name'),
+			'model' => array('model_id','model_name','barcode_name','model_descript','producer_name')
 		); //TODO Autodetect
+		$group_concat = array(
+			'model' => array('barcode_name'=>'model_id')
+		);
 
 		//Init
 		if(is_array($where)) foreach($where as $key => $value) $where[$key] = $key.' '.$value; //TODO: escape SQLi!!!
@@ -618,10 +670,19 @@ class Sklad_DB extends PDO {
 		//Escaping
 		$class = $this->escape($class);
 
+		//GROUP_CONCAT
+		$group_concat_query = '';
+		$group_by = '';
+		if(isset($group_concat[$class])) foreach($group_concat[$class] as $gc => $gb) {
+			$group_concat_query .= ",group_concat($gc separator ', ')";
+			$group_by .= "GROUP BY $gb\n";
+		}
+
 		//SELECT
-		$sql="SELECT * FROM `$class`\n";
+		$sql="SELECT *$group_concat_query FROM `$class`\n";
 		//JOIN
 		if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN `$j` USING($j$suffix_id)\n";
+		if(isset($join2[$class])) foreach($join2[$class] as $j => $c) $sql .= "LEFT JOIN `$j` USING($c)\n";
 		//WHERE/REGEXP
 		if($search) {
 			$search = $this->quote($search);
@@ -633,8 +694,17 @@ class Sklad_DB extends PDO {
 		if(!$history && $this->contains_history($class)) $where[] = $class.'_valid_till=0';
 
 		if($where) $sql .= 'WHERE ('.implode(') AND (', $where).")\n";
+
+		//GROUP BY
+		$sql.=$group_by;
+
 		//ORDER
-		if(!$order) $order = $class.$suffix_id.' DESC';
+		$orders=$order;
+		$order='';
+		if(is_array($orders)) foreach($orders as $column => $direction) {
+			$order="$column $direction,";
+		}
+		$order .= $class.$suffix_id.' DESC';
 		if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
 		$sql .= "ORDER BY $order\n";
 		//LIMIT/OFFSET
@@ -668,7 +738,9 @@ class Sklad_DB extends PDO {
 
 	function load_backend_data_to_query_results(&$result,$suffix_backend='_backend') {
 		$translate_cols = array(
-			'item_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
+			'item_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
+			'lock_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
+			'transaction_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
 		); //TODO: Hardcoded
 		foreach($result as $key => $row) {
 			foreach($translate_cols as $col => $backend) if(isset($result[$key][$col])){
@@ -678,14 +750,17 @@ class Sklad_DB extends PDO {
 	}
 
 	function safe_query_fetch($sql, $fatal=true, $fetch_flags = PDO::FETCH_ASSOC, $translate=true) {
-		$result = $this->safe_query($sql, $fatal)->fetchAll($fetch_flags);
+		$result = $this->safe_query($sql, $fatal);
+		if(!$fatal && !$result) return $result;
+		$result = $result->fetchAll($fetch_flags);
 		$this->load_backend_data_to_query_results($result);
 		if($translate) $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);
+		$order = isset($_GET['orderby']) ? $_GET['orderby'] : false;
+		$sql = $this->build_query_select($class, $id, $limit, $offset, $where, $search, $history, $order);
 		$result = $this->safe_query_fetch($sql);
 		if(!$result || !is_array($indexed)) return $result;
 
@@ -695,7 +770,7 @@ class Sklad_DB extends PDO {
 
 	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;";
+		$sql = "SHOW COLUMNS FROM `$class`;";
 		$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';
@@ -705,7 +780,7 @@ class Sklad_DB extends PDO {
 
 	function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') {
 		$selectbox=array( //TODO: Hardcoded...
-			'model_countable' => array(0 => 'no', 1 => 'yes'),
+			'model_countable' => array(1 => 'yes'),
 			'model_eshop_hide' => array(0 => 'no', 1 => 'yes'),
 			'vendor_id' => array('COMPULSORY' => 'select...')
 		);
@@ -722,7 +797,10 @@ class Sklad_DB extends PDO {
 			foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
 		}
 		//echo('<pre>'); print_r($selectbox);
-		return array_filter($selectbox, 'ksort');
+		//return $selectbox;
+		//return array_filter($selectbox, 'ksort');
+		return array_filter($selectbox, 'natcasesort');
+		//array_multisort($selectbox); return $selectbox;
 	}
 
 	function map_unique($key, $value, $select, $table, $fatal=true) { //TODO: Guess $select and $table if not passed
@@ -864,17 +942,21 @@ class Sklad_UI {
 	function render_form_add($class) {
 		$columns = $this->db->get_columns($class);
 		$selectbox = $this->db->columns_get_selectbox($columns, $class);
-		return $this->html->render_insert_form($class, $columns, $selectbox);
+		$current=array('default'=>array(
+			'model_eshop_hide'=>1
+		));
+		return $this->html->render_insert_form($class, $columns, $selectbox, $current);
 	}
 
 	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);
+		//echo('<pre>');print_r($current);die();
 		return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert);
 	}
 
-	function render_single_record_details($class, $id) {
+	function render_single_record_details($class, $id, $barcode=true) {
 		$id_next = $id + 1;
 		$id_prev = $id - 1 > 0 ? $id - 1 : 0;
 		$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
@@ -882,8 +964,8 @@ class Sklad_UI {
 		$html.= $this->html->link('<<', "$class/$id_prev/");
 		$html.= '-';
 		$html.= $this->html->link('>>', "$class/$id_next/");
-		$html.= '<br />';
-		$html.='<span style="float:right;">'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'</span>';
+		$html.= '&nbsp;&nbsp;&nbsp;';
+		$barcode && $html.='<span style="float:right;" class="floating_barcode">'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'</span>';
 		$html.= $this->html->link('edit', "$class/$id/edit/");
 		if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
 		return $html;
@@ -893,23 +975,26 @@ class Sklad_UI {
 		$offset_next = $offset + $limit;
 		$offset_prev = $offset - $limit > 0 ? $offset - $limit : 0;
 		$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
+		$moreget = isset($get[0]) ? '&' : '?';
 		$html='';
 		$html.= $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get");
 		$html.= '-';
+		$html.= $this->html->link('[*]', "$class/$id/0/0/$get$moreget".'noimgs');
+		$html.= '-';
 		$html.= $this->html->link('>>', "$class/$id/$limit/$offset_next/$get");
-		$html.= '<br />';
+		$html.= '&nbsp;&nbsp;&nbsp;';
 		$html.= $this->html->link('new', "$class/new/$get");
 		return $html;
 	}
 
-	function render_listing_extensions($class, $id, $limit, $offset, $edit=false) {
+	function render_listing_extensions($class, $id, $limit, $offset, $edit=false, $barcode=true) {
 		$html='';
 		if(is_numeric($id)) {
-			$html.=$this->render_single_record_details($class, $id);
+			$html.=$this->render_single_record_details($class, $id, $barcode);
 		} else {
 			$html.=$this->render_listing_navigation($class, '*', $limit, $offset);
 		}
-		if($edit)	{
+		if($edit && $barcode)	{
 			$html.= $this->render_form_edit($class, $id, false);
 			$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
 			$html.=$this->html->form($action,'POST',array(
@@ -931,7 +1016,8 @@ class Sklad_UI {
 
 	function post_redirect_get($location, $message='', $error=false, $translate=true) {
 		$messaget = $translate ? T($message) : $message;
-		$url_args = $messaget != '' ? '?message='.urlencode($messaget) : '';
+		$separator = preg_match('/\?/', $location) ? '&' : '?';
+		$url_args = $messaget != '' ? $separator.'message='.urlencode($messaget) : '';
 		$location = $this->html->internal_url($location).$url_args;
 		header('Location: '.$location);
 		if($error) trigger_error($message);
@@ -957,6 +1043,7 @@ class Sklad_UI {
 	function check_input_validity($field, $value='', $ruleset=0) {
 		$rules = array(0 => array(
 			'model_barcode' => '/./',
+			'barcode_name' => '/./',
 			'item_serial' => '/./',
 			'vendor_id' => '/^[0-9]*$/'
 		));
@@ -964,6 +1051,15 @@ class Sklad_UI {
 		return true;
 	}
 
+	function check_locks() {
+		$user = $this->db->quote($this->db->auth->get_user_id());
+		$result = $this->db->safe_query_fetch("SELECT * FROM `lock` WHERE `lock_author` != $user;");
+		if(!empty($result)) {
+			echo T('There are locks:').' '.$this->html->render_item_table($result, 'lock');
+			$this->post_redirect_get('', 'There are locks!', 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!!!!
@@ -975,6 +1071,7 @@ class Sklad_UI {
 		 * do:	$values[$table][$id][$column]
 		 */
 		if(isset($_POST['values'])) {
+			$this->check_locks();
 			$values=array();
 			foreach($_POST['values'] as $table => $columns) {
 				foreach($columns as $column => $ids) {
@@ -995,6 +1092,7 @@ class Sklad_UI {
 			case 'new':
 				$replace = false;
 			case 'edit':
+				$this->check_locks();
 				if(!isset($replace)) $replace = true;
 				$table = $class ? $class : 'item';
 				//print_r($values); //debug
@@ -1005,6 +1103,7 @@ class Sklad_UI {
 				$this->post_redirect_get($last, $message);
 				break;
 			case 'delete':
+				$this->check_locks();
 				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 :'-(");
@@ -1028,6 +1127,8 @@ class Sklad_UI {
 	}
 
 	function process_http_request() {
+		$listing_limit_classes = array('item','model');
+
 		$this->check_auth();
 
 		@ini_set('magic_quotes_gpc' , 'off');
@@ -1040,8 +1141,11 @@ class Sklad_UI {
 		$PATH_CHUNKS = preg_split('/\//', $PATH_INFO);
 		//Sephirot:
 		if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
-		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());
+		if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcodeimg' && $PATH_CHUNKS[1]!='api') { //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+			$result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+			$headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result, 'lock') : '';
+			echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
+		}
 		switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
 			case 'test':	//test
 				die('Tell me why you cry');
@@ -1058,7 +1162,7 @@ class Sklad_UI {
 				$assistant_vars['ASSISTANT'] = $PATH_CHUNKS[2];
 				echo $this->safe_include($incdirs[$PATH_CHUNKS[1]],$PATH_CHUNKS[2],$assistant_vars);
 				break;
-			case 'barcode': //barcode
+			case 'barcodeimg': //barcode
 				Barcode::download_barcode(implode('/',array_slice($PATH_CHUNKS, 2)));
 				break;
 			default:	//?
@@ -1082,9 +1186,10 @@ class Sklad_UI {
 								$edit=true;
 							default:	//?/?/?
 								$history = $PATH_CHUNKS[3] == 'history' ? true : false;
-								$limit	= is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : FRONTEND_LISTING_LIMIT;
+								$limit	= is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : (in_array($class, $listing_limit_classes) ? FRONTEND_LISTING_LIMIT : 0);
 								$offset	= isset($PATH_CHUNKS[4]) ? (int) $PATH_CHUNKS[4] : 0;
 								$where = @is_array($_GET['where']) ? $_GET['where'] : false;
+								echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit, 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));