X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=f4fd40c3afb65ca18508675fab17a4890363a0ec;hb=5b0075faa84afd5c1ffda52926ef12fdff0cd74e;hp=8f37200644000085749f7c776b3cf8c5e281608d;hpb=fff6ce4082b64db5d470acf63ecb2730ef2b5e8a;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index 8f37200..f4fd40c 100755 --- a/index.php +++ b/index.php @@ -18,8 +18,12 @@ */ 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 vseobecne funkce pro generovani HTML kodu @@ -30,13 +34,17 @@ require_once('HTTP_Auth.class.php'); * @author Tomas Mudrunka */ class HTML { - function row($row) { - $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; } @@ -45,7 +53,7 @@ class HTML { $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); @@ -54,25 +62,40 @@ class HTML { return $html; } - function link($title='n/a', $link='#void', $internal=true) { - if($internal) $link = $this->internal_url($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') { - 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) { - $html = "'); 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; + } } /** @@ -98,19 +150,26 @@ class HTML { * @package Sklad_HTML * @author Tomas Mudrunka */ -class Sklad_HTML extends HTML { +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']),''); - return << - - -

    SystémSklad$title

    + $instance = INSTANCE_ID != '' ? '/'.INSTANCE_ID : ''; + //$title = T($title); //TODO + + $html = $this->head("SōkoMan$title"); + $html .= <<SōkoMan$instance$title
    - -
  • Logout
  • -
  • Home
  • -
  • Assistants - -
  • stats
  • -
  • store
  • -
  • dispose
  • -
  • sell
  • -
  • ↓↓ BETA ↓↓
  • -
  • new-item
  • -
    -
  • -
  • List - -
  • item
  • -
  • model
  • -
  • category
  • -
  • producer
  • -
  • vendor
  • -
  • room
  • -
  • status
  • -
    -
  • -
  • New - -
  • item
  • -
  • model
  • -
  • category
  • -
  • producer
  • -
  • vendor
  • -
  • room
  • -
  • status
  • -
    -
  • -
    - -
    -
    - - -
    - -
    +EOF; + + $assistants=array(); + foreach(scandir(DIR_ASSISTANTS) as $item) { + if($item == '.' || $item == '..') continue; + $item = preg_replace('/\.inc\.php$/','',$item); + $assistants[$item] = "assistant/$item"; + } + + $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) { @@ -213,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', @@ -239,38 +305,27 @@ 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 render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true) { - //echo('
    '); print_r($selectbox);
    -		//echo('
    '); 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="";
    -		if($multi_insert) $html.='
    '; - //$html.=$this->input('table', $class, 'hidden'); + function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) { + $html = ''; foreach($columns as $column) { - $html.=$class.':'.$column['Field'].': '; + $html.=T($class).':'.T($column['Field']).': '; $name="values[$class][".$column['Field'].'][]'; $val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false; switch(true) { @@ -288,26 +343,71 @@ EOF; } $html.='
    '; } + return $html; + } - if($multi_insert) { - //TODO, move to separate JS file - $html.=<< -
    - - + -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 = '
    '; + //$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('
    '); print_r($selectbox);
    +		//echo('
    '); 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
    +
    +		if(!is_array($parts) || in_array('head', $parts)) {
    +			$action = $action ? " action='$action'" : false;
    +			$html.=""; //TODO: use $this->form()
    +			$html.='
    '; } - $btn = is_array($current) ? 'UPDATE' : 'INSERT'; - $html.=$this->input(false, $btn, 'submit'); - $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'; //TODO: $current may be set even when inserting... + $html.=$this->input(false, $btn, 'submit'); + $html.=''; + } return $html; } } @@ -352,7 +452,7 @@ class Sklad_DB extends PDO { //WHERE/REGEXP if($search) { $search = $this->quote($search); - if(!isset($search_fields[$class])) $this->post_redirect_get($class, "Ve tride $class zatim vyhledavat nemozno :-("); + 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"; @@ -384,19 +484,40 @@ class Sklad_DB extends PDO { return $result; } + 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($sql)->fetchAll(PDO::FETCH_ASSOC); + $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') { @@ -409,21 +530,20 @@ class Sklad_DB extends PDO { $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($sql, false); + $result = $this->safe_query_fetch($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('
    '); print_r($selectbox);
     		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($sql)->fetchAll(PDO::FETCH_ASSOC);
    -		if(isset($result[0][$select])) return $result[0][$select]; else die(trigger_error('Položka nenalezena!')); //TODO post_redirect_get...
    +		$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) {
    @@ -454,7 +574,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";
    @@ -576,6 +696,7 @@ 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; @@ -604,15 +725,15 @@ class Sklad_UI { if($edit) { $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; } @@ -622,13 +743,14 @@ class Sklad_UI { } function post_redirect_get($location, $message='', $error=false) { - $location = $this->html->internal_url($location).'?message='.urlencode($message); + $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( "". - "Location: $location" + T($message)."
    Location: $location" ); } @@ -644,7 +766,7 @@ class Sklad_UI { return $out; } - function process_http_request_post($action=false, $class=false, $id=false) { + 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), HEADERS ALREADY SENT!!!!
     
    @@ -672,9 +794,10 @@ class Sklad_UI {
     				$table = $class ? $class : 'item';
     				//print_r($values); //debug
     				$last = $this->db->insert_or_update_multitab($values, $replace);
    -				$last = "$table/$last/";
    +				$last = $force_redirect ? $force_redirect."?last=$last" : "$table/$last/";
     				$next = "$table/new/";
    -				$this->post_redirect_get($last, 'Hotovo. Další záznam přidáte '.$this->html->link('zde', $next).'.');
    +				$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']) $this->post_redirect_get("$class/$id/edit", 'Sure user expected :-)');
    @@ -685,14 +808,14 @@ class Sklad_UI {
     				$image_classes = array('model'); //TODO, use this more widely across the code
     				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'] == '') $this->post_redirect_get("$class/$id/edit", 'Kazde neco se musi nejak jmenovat!', true);
    +				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);
    -					$this->post_redirect_get("$class/$id", 'Obrazek se naladoval :)');
    -				} else $this->post_redirect_get("$class/$id/edit", 'Soubor se nenahral :(', true);
    +					$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;
     		}
     
    @@ -708,20 +831,24 @@ class Sklad_UI {
     		}
     
     		$PATH_INFO=@trim($_SERVER[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:
     		$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
    -				$assistant_vars['step'] = isset($PATH_CHUNKS[3]) && is_numeric($PATH_CHUNKS[3]) ? trim($PATH_CHUNKS[3]) : false;
    +				$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';
    @@ -761,4 +888,4 @@ class Sklad_UI {
     $sklad = new Sklad_UI();
     $sklad->process_http_request();
     
    -echo("
    "); +echo('

    ');