X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=d47bbbc490c92802c05ac5a3c53c08f5b69d2a91;hb=8fd613d60d58c1811bde2b73184794609784550b;hp=68c81d71c43528f9116cd7f26301e488adbeb547;hpb=fc5c5b8bde0f069e5d1e496d32f476d73463816f;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index 68c81d7..d47bbbc 100755 --- a/index.php +++ b/index.php @@ -33,7 +33,8 @@ class Sklad_HTML { function header($title='') { $home = URL_HOME; $script = $_SERVER['SCRIPT_NAME']; - $search = @trim($_GET['q']); + $search = htmlspecialchars(@trim($_GET['q'])); + $message = htmlspecialchars(@trim($_GET['message'])); return << @@ -53,6 +54,9 @@ class Sklad_HTML { +
+ $message +
EOF; } @@ -80,8 +84,12 @@ EOF; return $html; } + function internal_url($link) { + return $_SERVER['SCRIPT_NAME'].'/'.$link; + } + 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"; } @@ -178,22 +186,21 @@ EOF; $html='
'; if($multi_insert) $html.='
'; - $html.=$this->input('table', $class, 'hidden'); + //$html.=$this->input('table', $class, 'hidden'); foreach($columns as $column) { - $html.=$column['Field'].': '; - $name='value:'.$column['Field'].'[]'; + $html.=$class.':'.$column['Field'].': '; + $name="values[$class][".$column['Field'].'][]'; + $val = $update ? $current[$column['Field']] : false; switch(true) { case preg_match('/auto_increment/', $column['Extra']): - $val = $update ? $current[$column['Field']] : ''; //opakuje se (skoro) zbytecne + if(!$val) $val = ''; $html.=$this->input($name, $val, 'hidden'); $html.=$val.'(AUTO)'; break; case isset($selectbox[$column['Field']]): - $val = $update ? $current[$column['Field']] : false; - $html.=$this->select($name,$selectbox[$column['Field']],$val); //opakuje se + $html.=$this->select($name,$selectbox[$column['Field']],$val); break; default: - $val = $update ? $current[$column['Field']] : false; //opakuje se $html.=$this->input($name, $val); break; } @@ -243,8 +250,8 @@ 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, $search=false, $order=false, $suffix_id='_id') { + //Configuration $join = array( 'item' => array('model', 'category', 'producer', 'vendor', 'room', 'status'), 'model' => array('category', 'producer') @@ -252,8 +259,15 @@ class Sklad_DB extends PDO { $search_fields = array( 'item' => array('item_id','model_name','model_barcode','model_descript','producer_name','vendor_name') ); + + //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])) { @@ -262,20 +276,25 @@ class Sklad_DB extends PDO { } $sql .= 'WHERE FALSE '; foreach($search_fields[$class] as $column) $sql .= "OR $column REGEXP $search "; - } elseif($id) $sql .= "WHERE $class$id_suffix = $id\n"; + } elseif($id) $sql .= "WHERE $class$suffix_id = $id\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; } function safe_query($sql) { $result = $this->query($sql); if(!$result) { - trigger_error('QUERY FAILED:
'.$sql.'
'); - die(); + $error = $this->errorInfo(); + die(trigger_error("QUERY FAILED ($error[0]): $error[2]

QUERY:\n
$sql
")); } return $result; } @@ -338,6 +357,12 @@ class Sklad_DB extends PDO { return $this->lastInsertId(); } + function insert_or_update_multitab($values) { + $last=false; + foreach($values as $table => $rows) $last = $this->insert_or_update($table, $rows); + return $last; + } + function delete($table, $id, $suffix_id='_id') { $key = $this->escape($table.$suffix_id); $table = $this->escape($table); @@ -362,108 +387,133 @@ class Sklad_UI { $this->html = new Sklad_HTML(); } - function show_items($class, $id=false, $limit=false, $offset=0, $search=false) { - echo $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $search)); + 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 show_form_add($class) { + function render_form_add($class) { $columns = $this->db->get_columns($class); $selectbox = $this->db->columns_get_selectbox($columns, $class); - echo $this->html->render_insert_form($class, $columns, $selectbox); + return $this->html->render_insert_form($class, $columns, $selectbox); } - function show_form_edit($class, $id) { + 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); - echo $this->html->render_insert_form($class, $columns, $selectbox, $current); + return $this->html->render_insert_form($class, $columns, $selectbox, $current); } - function show_single_record_details($class, $id) { + function render_single_record_details($class, $id) { $id_next = $id + 1; $id_prev = $id - 1 > 0 ? $id - 1 : 0; $get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : ''; - echo $this->html->link('<<', "$class/$id_prev/"); - echo '-'; - echo $this->html->link('>>', "$class/$id_next/"); - echo ('
'); - echo $this->html->link('edit', "$class/$id/edit/"); + $html=''; + $html.= $this->html->link('<<', "$class/$id_prev/"); + $html.= '-'; + $html.= $this->html->link('>>', "$class/$id_next/"); + $html.= '
'; + $html.= $this->html->link('edit', "$class/$id/edit/"); + return $html; } - function show_listing_navigation($class, $id, $limit, $offset) { + function render_listing_navigation($class, $id, $limit, $offset) { $offset_next = $offset + $limit; $offset_prev = $offset - $limit > 0 ? $offset - $limit : 0; $get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : ''; - echo $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get"); - echo '-'; - echo $this->html->link('>>', "$class/$id/$limit/$offset_next/$get"); - echo ('
'); - echo $this->html->link('new', "$class/new/$get"); + $html=''; + $html.= $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get"); + $html.= '-'; + $html.= $this->html->link('>>', "$class/$id/$limit/$offset_next/$get"); + $html.= '
'; + $html.= $this->html->link('new', "$class/new/$get"); + return $html; } - function show_listing_extensions($class, $id, $limit, $offset, $edit=false) { + function render_listing_extensions($class, $id, $limit, $offset, $edit=false) { + $html=''; if(is_numeric($id)) { - $this->show_single_record_details($class, $id); + $html.=$this->render_single_record_details($class, $id); } else { - $this->show_listing_navigation($class, '*', $limit, $offset); + $html.=$this->render_listing_navigation($class, '*', $limit, $offset); } if($edit) { - echo('
TODO UPDATE FORM!
'); - $this->show_form_edit($class, $id); + $html.='
TODO UPDATE FORM!
'; + $html.= $this->render_form_edit($class, $id); $action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete"; - echo(""); - echo $this->html->input(false, 'DELETE', 'submit'); - echo 'sure?'.$this->html->input('sure', false, 'checkbox'); - echo(''); + $html.= "
"; + $html.= $this->html->input(false, 'DELETE', 'submit'); + $html.= 'sure?'.$this->html->input('sure', false, 'checkbox'); + $html.= '
'; $action = $_SERVER['SCRIPT_NAME']."/$class/$id/image"; - echo("
"); - echo $this->html->input('image', false, 'file', false, 'size="30"'); - echo $this->html->input(false, 'IMAGE', 'submit'); - echo('
'); + $html.= "
"; + $html.= $this->html->input('image', false, 'file', false, 'size="30"'); + $html.= $this->html->input(false, 'IMAGE', 'submit'); + $html.='
'; } + return $html; } function check_auth() { 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='') { + $location = $this->html->internal_url($location).'?message='.urlencode($message); + header('Location: '.$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.')); + $filename="$dir/$name$ext"; + if(!is_file($filename)) die(trigger_error('SAFE INCLUDE: Fuckfound.')); + foreach($vars as $var => $val) $$var=$val; + ob_start(); + include($filename); + $out=ob_get_contents(); + ob_end_clean(); + return $out; } function process_http_request_post($action=false, $class=false, $id=false) { if($_SERVER['REQUEST_METHOD'] != 'POST') return; - echo('
'); //DEBUG (maybe todo remove)
+		//echo('
'); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
 
 		//SephirPOST:
-		$values=array();
-		foreach($_POST as $key => $value) {
-			$name = preg_split('/:/',$key);
-			if(isset($name[0])) switch($name[0]) {
-				case 'value':
-					foreach($value as $id => $val) $values[$id][$name[1]]=$value[$id];
-					break;
-				default:
-					break;
+
+		/* Tenhle foreach() prekopiruje promenne
+		 * z:		$_POST['values'][$table][$column][$id];
+		 * do:	$values[$table][$id][$column]
+		 */
+		if(isset($_POST['values'])) {
+			$values=array();
+			foreach($_POST['values'] as $table => $columns) {
+				foreach($columns as $column => $ids) {
+					foreach($ids as $id => $val) $values[$table][$id][$column] = $val;
+				}
 			}
+			//die(print_r($values));
 		}
 
 		if($action) switch($action) {
 			case 'new':
 			case 'edit':
-				if(!isset($_POST['table'])) die(trigger_error("Jest nutno specifikovat tabulku voe!"));
-				$table=$_POST['table'];
+				//if(!isset($_POST['table'])) die(trigger_error("Jest nutno specifikovat tabulku voe!"));
+				//$table=$_POST['table'];
+				$table='item';
 				//print_r($values); //debug
-				$last = $this->db->insert_or_update($table, $values);
-				$this->post_redirect_get("$table/$last/", "$table/new/");
+				$last = $this->db->insert_or_update_multitab($values);
+				$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();
 				break;
 			case 'delete':
 				if(!isset($_POST['sure']) || !$_POST['sure']) die(trigger_error('Sure user expected :-)'));
-				//$this->db->delete($class, $id);
-				die('Neco asi bylo smazano. Fnuk :\'-('); //TODO REDIRECT
+				$this->db->delete($class, $id);
+				$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
@@ -471,9 +521,9 @@ class Sklad_UI {
 				$image_destination = DIR_IMAGES."/$class/$id.jpg";
 				if($_FILES['image']['name'] == '') die(trigger_error('Kazde neco se musi nejak jmenovat!'));
 				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 die(trigger_error('Soubor se nenahral :('));
 				break;
 			default:
 				trigger_error('Nothin\' to do here my cutie :-*');
@@ -492,7 +542,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:
@@ -502,6 +552,10 @@ class Sklad_UI {
 			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;
+				echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
+				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';
@@ -509,7 +563,7 @@ class Sklad_UI {
 				switch($PATH_CHUNKS[2]) {
 					case 'new':	//?/new
 						$this->process_http_request_post($PATH_CHUNKS[2], $class);
-						$this->show_form_add($class);
+						echo $this->render_form_add($class);
 						break;
 					default:	//?/?
 						$id	= (isset($PATH_CHUNKS[2]) && is_numeric($PATH_CHUNKS[2]) ? (int) $PATH_CHUNKS[2] : false);
@@ -524,8 +578,8 @@ class Sklad_UI {
 							default:	//?/?/?
 								$limit	= (int) (isset($PATH_CHUNKS[3]) ? $PATH_CHUNKS[3] : '0');
 								$offset	= (int) (isset($PATH_CHUNKS[4]) ? $PATH_CHUNKS[4] : '0');
-								$this->show_items($class, $id, $limit, $offset, $search);
-								$this->show_listing_extensions($class, $id, $limit, $offset, $edit);
+								echo $this->render_items($class, $id, $limit, $offset, $search);
+								echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit);
 								//print_r(array("
",$_SERVER));
 								break;
 						}