X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=11bb1ef4faf53c7cbb22a2949581efda04d3bd80;hb=fbf1a4e63bb82818dcebfa9b7a26a71c1c8de17e;hp=5c54331a1e53f5144f62b6da2eb544a8047c613b;hpb=933b760a1a2f81a454fd894950a80868b1ebd5de;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 5c54331..11bb1ef 100755
--- a/index.php
+++ b/index.php
@@ -20,7 +20,7 @@
 require_once('sklad.conf.php');
 set_include_path(DIR_LIB.PATH_SEPARATOR.get_include_path());
 
-require_once('Sklad_LMS-fake.class.php');
+require_once('Sklad_Auth.class/common.php');
 require_once('HTTP_Auth.class.php');
 require_once('Locale.class.php');
 require_once('Barcode.class.php');
@@ -151,23 +151,31 @@ class HTML {
 * @author   Tomas Mudrunka
 */
 class Sklad_HTML extends HTML { //TODO: Split into few more methods
-	function header($title='') {
+	function header($title='', $user=array()) {
 		$home = URL_HOME;
 		$script = $_SERVER['SCRIPT_NAME'];
 		$search = htmlspecialchars(@trim($_GET['q']));
 		$message = strip_tags(@trim($_GET['message']),'<a><b><u><i>');
 		$instance = INSTANCE_ID != '' ? '/'.INSTANCE_ID : '';
+		$user_id = htmlspecialchars($user['id']);
+		$user_gid = htmlspecialchars($user['gid']);
+		$user_name = htmlspecialchars($user['name']);
+		$time = date('r');
 		//$title = T($title); //TODO
 
 		$html = $this->head("SōkoMan$title");
 		$html .= <<<EOF
-<h1><a href="$script/">SōkoMan</a><small>$instance$title</small></h1>
+<h1 style="display: inline;"><a href="$script/">SōkoMan</a><small>$instance$title</small></h1>
+<div style="float:right; text-align:right;">
+	Logged in as <b>$user_name</b> [UID: <b>$user_id</b>; GID: <b>$user_gid</b>]<br />
+	Page loaded at $time
+</div>
 
 <style type="text/css">
 * { font-family: arial; }
 td,body { background-color: white; }
 table { background-color: orange; border: orange; }
-a { text-decoration:none; color: darkblue; }
+a, a img { text-decoration:none; color: darkblue; border:none; }
 li a, a:hover { text-decoration:underline; }
 
 .menu li {
@@ -322,21 +330,8 @@ EOF;
 		return $this->table($table);
 	}
 
-	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true) {
-		//echo('<pre>'); print_r($selectbox);
-		//echo('<pre>'); 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="<form$action method='POST'>"; //TODO: use $this->form()
-		if($multi_insert) $html.='<span><div name="input_set" style="float:left; border:1px solid grey; padding: 1px; margin: 1px;">';
-		//$html.=$this->input('table', $class, 'hidden');
+	function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
+		$html = '';
 		foreach($columns as $column)	{
 			$html.=T($class).':<b>'.T($column['Field']).'</b>: ';
 			$name="values[$class][".$column['Field'].'][]';
@@ -356,24 +351,71 @@ EOF;
 			}
 			$html.='<br />';
 		}
+		return $html;
+	}
 
-		if($multi_insert) { //TODO, move to separate JS file
-			$html.=<<<EOF
-			</div></span>
-			<br style="clear:both" />
-			<script>
-				function duplicate_element(what, where) {
-					var node = document.getElementsByName(what)[0];
-					node.parentNode.appendChild(node.cloneNode(true));
-				}
-			</script>
-			<a href='#' onClick="duplicate_element('input_set')">+</a>
-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 = '<hr />';
+			//$args[] = false;
+			$args[] = $parts;
+			$html .= call_user_func_array(array($this, 'render_insert_form'), $args);
+			$html .= $hr;
 		}
+		return $html;
+	}
 
-		$btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
-		$html.=$this->input(false, $btn, 'submit');
-		$html.='</form>';
+	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true, $parts=false) {
+		$html = '';
+		//print_r($parts);
+		//echo('<pre>'); print_r($selectbox);
+		//echo('<pre>'); 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.="<form$action method='POST'>"; //TODO: use $this->form()
+			$html.='<span><div name="input_set" style="float:left; border:1px solid grey; padding: 1px; margin: 1px;">';
+		}
+
+		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 .= '</div></span><br style="clear:both" />';
+			if($multi_insert) { //TODO, move to separate JS file
+				$html.=<<<EOF
+				<script>
+					function duplicate_element(what, where) {
+						var node = document.getElementsByName(what)[0];
+						node.parentNode.appendChild(node.cloneNode(true));
+					}
+				</script>
+				<a href='#' onClick="duplicate_element('input_set')">+</a>
+EOF;
+			}
+
+			$btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+			$html.=$this->input(false, $btn, 'submit');
+			$html.='</form>';
+		}
 		return $html;
 	}
 }
@@ -386,7 +428,7 @@ EOF;
 */
 class Sklad_DB extends PDO {
 	function __construct() {
-		$this->lms = new Sklad_LMS();
+		$this->auth = new Sklad_Auth();
 
 		parent::__construct(
 			DB_DSN, DB_USER, DB_PASS,
@@ -398,6 +440,10 @@ class Sklad_DB extends PDO {
 		return preg_replace('(^.|.$)', '', $this->quote($str)); //TODO HACK
 	}
 
+	function quote_identifier($str) {
+		return '`'.$this->escape($str).'`'; //TODO HACK
+	}
+
 	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(
@@ -408,13 +454,16 @@ class Sklad_DB extends PDO {
 			'item'	=> array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name')
 		); //TODO Autodetect
 
+		//Init
+		if(is_array($where)) foreach($where as $key => $value) $where[$key] = $key.' '.$value; //TODO: escape SQLi!!!
+
 		//Escaping
 		$class = $this->escape($class);
 
 		//SELECT
-		$sql="SELECT * FROM $class\n";
+		$sql="SELECT * FROM `$class`\n";
 		//JOIN
-		if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$suffix_id)\n";
+		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);
@@ -476,10 +525,14 @@ class Sklad_DB extends PDO {
 		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_fetch($sql);
+		$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') {
@@ -500,12 +553,12 @@ 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
+	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_fetch($sql);
-		if(isset($result[0][$select])) return $result[0][$select]; else die(trigger_error(T('Record not found!'))); //TODO post_redirect_get...
+		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) {
@@ -536,7 +589,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";
@@ -561,8 +614,8 @@ class Sklad_DB extends PDO {
 							$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');
+							$row_quoted[$column] = $this->auth->get_user_id();
+							//die($this->auth->get_user_id().'=USER');
 							break;
 					}
 				}
@@ -701,7 +754,7 @@ class Sklad_UI {
 	}
 
 	function check_auth() {
-		new HTTP_Auth('SkladovejSystem', true, array($this->db->lms,'check_auth'));
+		new HTTP_Auth('SkladovejSystem', true, array($this->db->auth,'check_auth'));
 	}
 
 	function post_redirect_get($location, $message='', $error=false) {
@@ -796,7 +849,8 @@ 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') echo $this->html->header($PATH_INFO); //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+		if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcode') //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+			echo $this->html->header($PATH_INFO,$this->db->auth->get_user());
 		switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
 			case 'test':	//test
 				die('Tell me why you cry');
@@ -806,6 +860,7 @@ class Sklad_UI {
 				$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'];
+				$assistant_vars['ASSISTANT'] = $PATH_CHUNKS[2];
 				echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
 				break;
 			case 'barcode': //barcode
@@ -834,7 +889,7 @@ class Sklad_UI {
 								$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');
-								$where = false; //TODO get from URL
+								$where = @is_array($_GET['where']) ? $_GET['where'] : 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));