X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=c1d366072753d374a9be4b8e8c349ac8d29970ac;hb=aaafc8b77f4965c7f8a011ca0f2f18341766e94a;hp=9e4a67d3ad7a03b954809ada83a66c9547c5b6ba;hpb=6d98215bad86f1b8e33e79e084e529e4a8dbf631;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 9e4a67d..c1d3660 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,18 +151,25 @@ class HTML {
 * @author   Tomas Mudrunka
 */
 class Sklad_HTML extends HTML { //TODO: Split into few more methods
-	function header($title='', $uid=0, $user='') {
+	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 style="display: inline;"><a href="$script/">SōkoMan</a><small>$instance$title</small></h1>
-<div style="float:right">Loged in as $user [UID $uid]</div>
+<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; }
@@ -280,6 +287,35 @@ EOF;
 		}
 	}
 
+	function table_add_relations(&$table, $class, $suffix_relations='_relations') {
+		$where_url = '%d/?where[%c]==%v';
+		$relations = array( //TODO: Autodetect???
+			'model' => array(
+				'model_id' => array(array('item',$where_url)),
+				'model_barcode' => array(array('store','assistant/%d?barcode=%v'))
+			),
+			'category' => array('category_id' => array(array('item',$where_url))),
+			'producer' => array('producer_id' => array(array('item',$where_url))),
+			'vendor' => array('vendor_id' => array(array('item',$where_url))),
+			'room' => array('room_id' => array(array('item',$where_url))),
+			'status' => array('status_id' => array(array('item',$where_url)))
+		);
+		foreach($table as $id => $row) {
+			foreach($row as $column => $value) {
+				if(isset($relations[$class][$column])) {
+					foreach($relations[$class][$column] as $destination) {
+						$destination_url = str_replace(
+							array('%d','%c','%v'),
+							array($destination[0],$column,$value),
+							$destination[1]
+						);
+						@$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url).',';
+					}
+				}
+			}
+		}
+	}
+
 	function table_collapse(&$table) {
 		$collapse = array(
 			'item_id' => 'item_id',
@@ -315,8 +351,9 @@ EOF;
 		$table = $table_sorted;
 	}
 
-	function render_item_table($table) {
+	function render_item_table($table,$class=false) {
 		$this->table_add_images($table);
+		if($class) $this->table_add_relations($table,$class);
 		$this->table_add_barcodes($table);
 		$this->table_collapse($table);
 		$this->table_sort($table);
@@ -421,7 +458,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,
@@ -433,6 +470,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(
@@ -450,9 +491,9 @@ class Sklad_DB extends PDO {
 		$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);
@@ -603,8 +644,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;
 					}
 				}
@@ -675,7 +716,7 @@ class Sklad_UI {
 	}
 
 	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));
+		return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $where, $search, $history, false),$class);
 	}
 
 	function render_form_add($class) {
@@ -743,7 +784,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) {
@@ -839,7 +880,7 @@ class Sklad_UI {
 		//Sephirot:
 		if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
 		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->lms->get_authorized_user_id());
+			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');