X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=63633b022bcbb411401e5a2e02bc86e89d66af45;hb=8acef003f115dedfe9d130cf306f63f5a0da08c3;hp=eeb4408a89639c9a7587c3ff9a5a5b509410094c;hpb=b66fadbba26b71659895fb69a3d6193932ad1daf;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index eeb4408..63633b0 100755 --- a/index.php +++ b/index.php @@ -22,44 +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 = htmlspecialchars(@trim($_GET['q'])); - $message = htmlspecialchars(@trim($_GET['message'])); - return << - - -

SystémSklad$title

-
- -
  • Logout
    • -
  • Home
    • -     -
    - - -
    - -
    -
    - $message -
    -EOF; - } - +class HTML { function row($row) { $html=''; foreach($row as $var) { @@ -84,10 +54,6 @@ EOF; return $html; } - function internal_url($link) { - return $_SERVER['SCRIPT_NAME'].'/'.$link; - } - function link($title='n/a', $link='#void', $internal=true) { if($internal) $link = $this->internal_url($link); return "$title"; @@ -97,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
    • +
  • dispose
    • +
  • sell
    • +
  • ↓↓ BETA ↓↓
    • +
  • new-item
    • +     +
    • +
  • 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) { @@ -120,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].'/'); @@ -149,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;
@@ -184,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)';
@@ -250,14 +336,14 @@ 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, $order=false, $suffix_id='_id') {
+	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
@@ -270,22 +356,24 @@ class Sklad_DB extends PDO {
 		//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$suffix_id = $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";
 		}
-		//ORDER
-		if(!$order) $order = $class.$suffix_id;
-		$sql .= "ORDER BY $order";
 
 		return $sql;
 	}
@@ -300,8 +388,8 @@ class Sklad_DB extends PDO {
 		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;
 
@@ -323,7 +411,8 @@ class Sklad_DB extends PDO {
 			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;"; //TODO History
+			$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);
@@ -333,6 +422,14 @@ 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
+		$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);
@@ -346,18 +443,19 @@ class Sklad_DB extends PDO {
 		$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 (';
+				$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'];
@@ -369,15 +467,13 @@ class Sklad_DB extends PDO {
 		}
 
 		//Insert into table (columns)
-		$sql .= $replace ? 'REPLACE' : 'INSERT';
-		$sql .= " INTO $table ($columns) VALUES ";
+		$sql .= "INSERT INTO $table ($columns) VALUES ";
 
 		//Values (a,b,c),(d,e,f)
 		$comma='';
 		foreach($values as $row) {
-			if(!$history) {
-				 $row_quoted = array_map(array($this,'quote'), $row); //Check
-			} else {
+			$row_quoted = array_map(array($this,'quote'), $row); //Check
+			if($history) {
 				foreach($row as $column => $value) {
 					switch($column) {
 						case $table.'_valid_from':
@@ -386,13 +482,10 @@ class Sklad_DB extends PDO {
 						case $table.'_valid_till':
 							$row_quoted[$column] = '0';
 							break;
-						case 'user_id': //TODO HACK: conflict s tabulkami, ktery user_id pouzivaji k necemu jinymu!!!
-							$row_quoted[$column] = $this->lms->get_authorized_user_id(); //TODO: Zjistit proc to nefunguje!!!
+						case $table.'_author':
+							$row_quoted[$column] = $this->lms->get_authorized_user_id();
 							//die($this->lms->get_authorized_user_id().'=USER');
 							break;
-						default:
-							$row_quoted[$column] = $this->quote($value);
-							break;
 					}
 				}
 			}
@@ -400,25 +493,34 @@ class Sklad_DB extends PDO {
 			$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)) die(trigger_error("V tabulce $table jentak neco mazat nebudes chlapecku :-P")); //TODO post redirect get
+		if($this->contains_history($table)) return false;
 		$key = $this->escape($table.$suffix_id);
 		$table = $this->escape($table);
 		$id = $this->quote($id);
@@ -426,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
 *
@@ -442,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, false));
+	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) {
@@ -455,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);
 	}
 
@@ -469,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;
 	}
 
@@ -493,7 +606,6 @@ class Sklad_UI {
 			$html.=$this->render_listing_navigation($class, '*', $limit, $offset);
 		}
 		if($edit)	{
-			$html.='
    TODO UPDATE FORM!
    '; //TODO: Asi uz je hotovy...
 			$html.= $this->render_form_edit($class, $id);
 			$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
 	    $html.= "";
@@ -513,16 +625,22 @@ class Sklad_UI {
 		new HTTP_Auth('SkladovejSystem', true, array($this->db->lms,'check_auth'));
 	}
 
-	function post_redirect_get($location, $message='') {
-		$location = $this->html->internal_url($location).'?message='.urlencode($message);
+	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);
-		die("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);
@@ -553,32 +671,30 @@ 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);
+				$last = $this->db->insert_or_update_multitab($values, $replace);
 				$last = "$table/$last/";
 				$next = "$table/new/";
-				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();
+				$this->post_redirect_get($last, 'Hotovo. Další záznam přidáte '.$this->html->link('zde', $next).'.');
 				break;
 			case 'delete':
-				if(!isset($_POST['sure']) || !$_POST['sure']) die(trigger_error('Sure user expected :-)'));
-				$this->db->delete($class, $id);
+				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);
 					$this->post_redirect_get("$class/$id", 'Obrazek se naladoval :)');
-				} else die(trigger_error('Soubor se nenahral :('));
+				} else $this->post_redirect_get("$class/$id/edit", 'Soubor se nenahral :(', true);
 				break;
 			default:
 				trigger_error('Nothin\' to do here my cutie :-*');
@@ -626,14 +742,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;