Vylepsena podpora carovych kodu

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index c2ffb64d242e70f108db455368826f2657745168..63633b022bcbb411401e5a2e02bc86e89d66af45 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -148,6 +148,7 @@ class Sklad_HTML extends HTML {
                <li><a href="$script/">Home</a></li>
                <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>
@@ -180,7 +181,11 @@ class Sklad_HTML extends HTML {
        </menu>
 
        <div style="float: right;">
-               <form action="?" method="GET">
+               <form action="$script/assistant/go" method="GET" style="float: left;"><!-- TODO: Display only when go plugin available -->
+                       <input type="text" name="q" placeholder="smart id..." />
+                       <input type="submit" value="go" />
+               </form>
+               <form action="?" method="GET" style="float: left;">
                        <input type="text" name="q" placeholder="regexp..." value="$search" />
                        <input type="submit" value="filter" />
                </form>
@@ -224,7 +229,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].'/');
@@ -621,10 +626,15 @@ class Sklad_UI {
        }
 
        function post_redirect_get($location, $message='', $error=false) {
-               $location = $this->html->internal_url($location).'?message='.urlencode($message);
+               $url_args = $message != '' ? '?message='.urlencode($message) : '';
+               $location = $this->html->internal_url($location).$url_args;
                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') {