X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=db9921d1960afb4b9d6b7f14adb23b29ae01c7fa;hb=e9f6461f24218e72efea648c5f8c23159ca0f909;hp=404ad79addbc6f71d3ce496911f25ff6ecb203be;hpb=d9d47bd38e8c626e9c5db71a6db13a0ff0eb0ba1;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 404ad79..db9921d 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,17 +151,21 @@ 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']);
 		//$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">Loged in as <b>$user_name</b> [UID: <b>$user_id</b>; GID: <b>$user_gid</b>]</div>
 
 <style type="text/css">
 * { font-family: arial; }
@@ -420,7 +424,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,
@@ -432,6 +436,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(
@@ -449,9 +457,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);
@@ -602,8 +610,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;
 					}
 				}
@@ -742,7 +750,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) {
@@ -837,7 +845,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');