X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=931f06cbb582b2235467c0c3447a4dd913fe1a27;hb=de77377e6fd58f2680074a5cf0b14494813d07ad;hp=0b333376167f26dfbb8a90c2b6b6029d2791cb9e;hpb=623c65e2752fcb71295689eaea0b9c74cf810cc7;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index 0b33337..931f06c 100755 --- a/index.php +++ b/index.php @@ -22,40 +22,14 @@ require_once('Sklad_LMS-fake.class.php'); require_once('HTTP_Auth.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; - } - +class HTML { function row($row) { $html=''; foreach($row as $var) { @@ -81,7 +55,7 @@ EOF; } function link($title='n/a', $link='#void', $internal=true) { - if($internal) $link = $_SERVER['SCRIPT_NAME'].'/'.$link; + if($internal) $link = $this->internal_url($link); return "$title"; } @@ -89,6 +63,149 @@ EOF; return "$title"; } + function input($name=false, $value=false, $type='text', $placeholder=false, $options=false) { + $html = "'); print_r($selectbox); + $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 { + 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

    + + + +
    + +
  • Logout
  • +
  • Home
  • +
  • Assistants + +
  • stats
  • +
  • store
  • +
  • store-single
  • +
  • dispose
  • +
  • sell
  • +
  • ↓↓ BETA ↓↓
  • +
    +
  • +
  • List + +
  • item
  • +
  • model
  • +
  • category
  • +
  • producer
  • +
  • vendor
  • +
  • room
  • +
  • status
  • +
    +
  • +
  • New + +
  • item
  • +
  • model
  • +
  • category
  • +
  • producer
  • +
  • vendor
  • +
  • room
  • +
  • status
  • +
    +
  • +
    + +
    +
    + + +
    +
    + + +
    + +
    +
    +
    +
    + $message +
    +EOF; + } + + function internal_url($link) { + return $_SERVER['SCRIPT_NAME'].'/'.$link; + } + function table_add_images(&$table) { $image = array('model_id'); foreach($table as $id => $row) { @@ -112,7 +229,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].'/'); @@ -141,33 +258,7 @@ EOF; return $this->table($table); } - function input($name=false, $value=false, $type='text', $placeholder=false, $options=false) { - $html = "'); 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) { //echo('
    '); print_r($selectbox);
     		//echo('
    '); print_r($current);
     		$update = false;
    @@ -176,15 +267,18 @@ EOF;
     			$current = array_shift($current);
     		}
     
    -		$html='
    '; + 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'); foreach($columns as $column) { $html.=$class.':'.$column['Field'].': '; $name="values[$class][".$column['Field'].'][]'; - $val = $update ? $current[$column['Field']] : false; + $val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false; switch(true) { - case preg_match('/auto_increment/', $column['Extra']): + case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)): if(!$val) $val = ''; $html.=$this->input($name, $val, 'hidden'); $html.=$val.'(AUTO)'; @@ -215,7 +309,7 @@ EOF; EOF; } - $btn = is_array($current) ? 'UPDATE' : 'INSERT'; + $btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting... $html.=$this->input(false, $btn, 'submit'); $html.=''; return $html; @@ -242,45 +336,60 @@ 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])) $this->post_redirect_get($class, "Ve tride $class zatim vyhledavat nemozno :-("); + $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); + 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); if(!$result || !is_array($indexed)) return $result; @@ -297,53 +406,121 @@ class Sklad_DB extends PDO { function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') { $selectbox=array(); foreach($columns as $column) { + if($column['Field'] == 'user_id') continue; //TODO HACK Blacklist: tabulka nemusi obsahovat *_name!!! momentalne se to tyka jen tabulky user (a item - u ty to nevadi)! if($class && $column['Field'] == $class.$suffix_id) continue; if(!preg_match('/'.$suffix_id.'$/', $column['Field'])) continue; $table=preg_replace('/'.$suffix_id.'$/','',$column['Field']); - $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table;"; - $result=$this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC); + + $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); + 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 $selectbox;
    +		return array_filter($selectbox, 'ksort');
    +	}
    +
    +	function map_unique($key, $value, $select, $table) { //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...
    +	}
    +
    +	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='.$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) {
    +	function insert_or_update_multitab($values, $replace=true) {
     		$last=false;
    -		foreach($values as $table => $rows) $last = $this->insert_or_update($table, $rows);
    +		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);
    @@ -351,6 +528,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
     *
    @@ -367,8 +554,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) {
    @@ -380,7 +567,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);
     	}
     
    @@ -394,6 +581,7 @@ class Sklad_UI {
     		$html.= $this->html->link('>>', "$class/$id_next/");
     		$html.= '
    '; $html.= $this->html->link('edit', "$class/$id/edit/"); + if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/"); return $html; } @@ -418,7 +606,6 @@ 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.= "
    "; @@ -438,17 +625,22 @@ 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($message) : ''; + $location = $this->html->internal_url($location).$url_args; + header('Location: '.$location); + if($error) trigger_error($message); + $location=htmlspecialchars($location); + die( + "". + "Location: $location" + ); } function safe_include($dir,$name,$vars=array(),$ext='.inc.php') { - if(preg_match('/[^a-zA-Z0-9-]/',$name)) die(trigger_error('SAFE INCLUDE: Securityfuck.')); + if(preg_match('/[^a-zA-Z0-9-]/',$name)) $this->post_redirect_get('', 'SAFE INCLUDE: Securityfuck.', true); $filename="$dir/$name$ext"; - if(!is_file($filename)) die(trigger_error('SAFE INCLUDE: Fuckfound.')); + if(!is_file($filename)) $this->post_redirect_get('', 'SAFE INCLUDE: Fuckfound.', true); foreach($vars as $var => $val) $$var=$val; ob_start(); include($filename); @@ -457,9 +649,9 @@ 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)
    +		//echo('
    '); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
     
     		//SephirPOST:
     
    @@ -479,28 +671,31 @@ class Sklad_UI {
     
     		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'];
    -				$table='item';
    +				if(!isset($replace)) $replace = true;
    +				$table = $class ? $class : 'item';
     				//print_r($values); //debug
    -				$last = $this->db->insert_or_update_multitab($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 (pravdepodobne /$class/$id) bylo asi 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", 'Kazde neco se musi nejak jmenovat!', 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", 'Obrazek se naladoval :)');
    +				} else $this->post_redirect_get("$class/$id/edit", 'Soubor se nenahral :(', true);
     				break;
     			default:
     				trigger_error('Nothin\' to do here my cutie :-*');
    @@ -519,7 +714,7 @@ class Sklad_UI {
     		}
     
     		$PATH_INFO=@trim($_SERVER[PATH_INFO]);
    -		echo $this->html->header($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:
    @@ -530,7 +725,10 @@ class Sklad_UI {
     				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;
     			default:	//?
    @@ -548,14 +746,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;