X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=8f37200644000085749f7c776b3cf8c5e281608d;hb=b4c58cd09ff3251041d9cd6f946f7875608a132c;hp=4dd22d60ced6683311cebaf616afad8ab74a22c0;hpb=df4079a613ffa047f701c6b1dc1d69f37eef787a;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 4dd22d6..8f37200 100755
--- a/index.php
+++ b/index.php
@@ -111,14 +111,18 @@ class Sklad_HTML extends HTML {
 <h1><a href="$script/">SystémSklad</a><small>$title</small></h1>
 
 <style type="text/css">
-.menu li, .menu * li {
+.menu li {
 	float: left;
-	margin: 0.2em;
+	padding: 0.2em;
+}
+
+.menu * li {
+	float: none;
 }
 
 .menu * menu {
 	position: absolute;
-	background-color: yellow;
+	padding: 0.2em;
 }
 
 .menu, .menu * menu {
@@ -126,22 +130,29 @@ class Sklad_HTML extends HTML {
 }
 
 .menu * menu {
+	border: 1px solid orange;
 	display: none;
 	margin: 0;
 }
 
-.menu li:hover menu {
+.menu li:hover menu, .menu li:hover {
 	display: block;
+	background-color: yellow;
 }
+
 </style>
 
 <div>
 	<menu class="menu">
 		<li><a href="?logout">Logout</a></li>
 		<li><a href="$script/">Home</a></li>
-		<li><a href="#">Assistants</A>
+		<li><a href="#">Assistants</a>
 			<menu>
+				<li><a href="$script/assistant/stats">stats</a></li>
 				<li><a href="$script/assistant/store">store</a></li>
+				<li><a href="$script/assistant/dispose">dispose</a></li>
+				<li><a href="$script/assistant/sell">sell</a></li>
+				<li>&darr;&darr; BETA &darr;&darr;</li>
 				<li><a href="$script/assistant/new-item">new-item</a></li>
 			</menu>
 		</li>
@@ -214,7 +225,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].'/');
@@ -614,7 +625,11 @@ class Sklad_UI {
 		$location = $this->html->internal_url($location).'?message='.urlencode($message);
 		header('Location: '.$location);
 		if($error) trigger_error($message);
-		die("Location: <a href='$location'>$location</a>");
+		$location=htmlspecialchars($location);
+		die(
+			"<meta http-equiv='refresh' content='0; url=$location'>".
+			"Location: <a href='$location'>$location</a>"
+		);
 	}
 
 	function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {