From de77377e6fd58f2680074a5cf0b14494813d07ad Mon Sep 17 00:00:00 2001
From: Thomas Mudrunka <tomas@mudrunka.cz>
Date: Mon, 22 Aug 2011 21:29:31 +0200
Subject: [PATCH] Vylepseno (zjednoduseno) rozhrani pro assistanty

---
 assistants/dispose.inc.php      | 5 ++---
 assistants/go.inc.php           | 2 --
 assistants/sell.inc.php         | 5 ++---
 assistants/stats.inc.php        | 3 +--
 assistants/store-single.inc.php | 5 ++---
 assistants/store.inc.php        | 5 ++---
 index.php                       | 5 ++++-
 7 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/assistants/dispose.inc.php b/assistants/dispose.inc.php
index 56622bf..691b258 100644
--- a/assistants/dispose.inc.php
+++ b/assistants/dispose.inc.php
@@ -1,9 +1,8 @@
 <?php
-$script = $_SERVER['SCRIPT_NAME'].'/assistant/dispose';
-switch($step) {
+switch($SUBPATH[0]) {
 	default: case 1:
 ?>
-<form action="<?=$script?>/2" method="GET">
+<form action="<?=$URL?>/2" method="GET">
 	item_serial: <input type="text" name="serial" autofocus />
 	<input type="submit" value="DISPOSE" />
 </form>
diff --git a/assistants/go.inc.php b/assistants/go.inc.php
index c74bbae..d488e5e 100644
--- a/assistants/go.inc.php
+++ b/assistants/go.inc.php
@@ -1,6 +1,4 @@
 <?php
-//$script = $_SERVER['SCRIPT_NAME'].'/assistant/go';
-
 $id=$_GET['q'];
 $barcode_prefix_regexp = '/^'.preg_replace('/\//', '\/', BARCODE_PREFIX).'/';
 if(preg_match($barcode_prefix_regexp, $id)) $id=preg_replace($barcode_prefix_regexp, '', $id);
diff --git a/assistants/sell.inc.php b/assistants/sell.inc.php
index 0cd1d7d..af7ef8b 100644
--- a/assistants/sell.inc.php
+++ b/assistants/sell.inc.php
@@ -3,11 +3,10 @@
 //TODO: Highlight fields that should be filled (and maybe even check them when submited)
 //TODO: Add support for selling/disposing multiple items at once...
 //TODO: Reuse /item/$item_id/edit
-$script = $_SERVER['SCRIPT_NAME'].'/assistant/sell';
-switch($step) {
+switch($SUBPATH[0]) {
 	default: case 1:
 ?>
-<form action="<?=$script?>/2" method="GET">
+<form action="<?=$URL?>/2" method="GET">
 	item_serial: <input type="text" name="serial" autofocus />
 	<input type="submit" value="SELL" />
 </form>
diff --git a/assistants/stats.inc.php b/assistants/stats.inc.php
index bd84300..f295c76 100644
--- a/assistants/stats.inc.php
+++ b/assistants/stats.inc.php
@@ -1,5 +1,4 @@
 <?php
-$script = $_SERVER['SCRIPT_NAME'].'/assistant/stats';
 $month=date('Y-m');
 $month_sql='';
 if(isset($_GET['month'])) {
@@ -8,7 +7,7 @@ if(isset($_GET['month'])) {
 }
 ?>
 
-<form action="<?=$script?>/" method="GET">
+<form action="<?=$URL?>/" method="GET">
 	YYYY-MM: <input type="text" name="month" autofocus value="<?=$month?>" />
 	<input type="submit" value="SELECT BY MONTH" />
 </form>
diff --git a/assistants/store-single.inc.php b/assistants/store-single.inc.php
index 04bf684..dc550b8 100644
--- a/assistants/store-single.inc.php
+++ b/assistants/store-single.inc.php
@@ -1,7 +1,6 @@
 <?php
-$script = $_SERVER['SCRIPT_NAME'].'/assistant/store-single';
-$this->process_http_request_post('new', false, false, 'assistant/store-single/2');
-switch($step) {
+$this->process_http_request_post('new', false, false, "$URL_INTERNAL/2");
+switch($SUBPATH[0]) {
 	default: case 1:
 		echo $this->render_form_add('model');
 		break;
diff --git a/assistants/store.inc.php b/assistants/store.inc.php
index 8980c3b..3e05919 100644
--- a/assistants/store.inc.php
+++ b/assistants/store.inc.php
@@ -1,9 +1,8 @@
 <?php
-$script = $_SERVER['SCRIPT_NAME'].'/assistant/store';
-switch($step) {
+switch($SUBPATH[0]) {
 	default: case 1:
 ?>
-<form action="<?=$script?>/2" method="GET">
+<form action="<?=$URL?>/2" method="GET">
 	model_barcode: <input type="text" name="barcode" autofocus />
 	<input type="submit" value="STORE" />
 </form>
diff --git a/index.php b/index.php
index 6036ac0..931f06c 100755
--- a/index.php
+++ b/index.php
@@ -725,7 +725,10 @@ class Sklad_UI {
 				die('Tell me why you cry');
 				break;
 			case 'assistant': //assistant
-				$assistant_vars['step'] = isset($PATH_CHUNKS[3]) && is_numeric($PATH_CHUNKS[3]) ? trim($PATH_CHUNKS[3]) : false;
+				$PATH_CHUNKS[3] = isset($PATH_CHUNKS[3]) ? trim($PATH_CHUNKS[3]) : false;
+				$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'];
 				echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
 				break;
 			default:	//?
-- 
2.30.2