added return to infos for lists

interface/lib/classes/plugin_listview.inc.php

@@ -73,6 +73,13 @@ class plugin_listview extends plugin_base {
 		$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$app->listform->listDef['name']."_list.lng";
 		include($lng_file);
 		$listTpl->setVar($wb);
+		
+		// Setting Returnto information in the session
+		$list_name = $app->listform->listDef["name"];
+		$_SESSION["s"]["list"][$list_name]["parent_id"] = $app->tform_actions->id;
+		$_SESSION["s"]["list"][$list_name]["parent_tab"] = $_SESSION["s"]["form"]["tab"];
+		$_SESSION["s"]["list"][$list_name]["parent_script"] = $app->tform->formDef["action"];
+		$_SESSION["s"]["form"]["return_to"] = $list_name;
 
 		return $listTpl->grab();
 		

interface/lib/classes/tform_actions.inc.php

@@ -115,7 +115,14 @@ class tform_actions {
 			}
 			
 			if($_REQUEST["next_tab"] == '') {
-    			header("Location: ".$app->tform->formDef['list_default']);
+				if($_SESSION["s"]["form"]["return_to"] != '') {
+					$list_name = $_SESSION["s"]["form"]["return_to"];
+					$redirect = "Location: ".$_SESSION["s"]["list"][$list_name]["parent_script"]."?id=".$_SESSION["s"]["list"][$list_name]["parent_id"]."&next_tab=".$_SESSION["s"]["list"][$list_name]["parent_tab"];
+					unset($_SESSION["s"]["form"]["return_to"]);
+					header($redirect);
+				} else {
+    				header("Location: ".$app->tform->formDef['list_default']);
+				}
         		exit;
     		} else {
 				$this->onShow();
@@ -145,7 +152,14 @@ class tform_actions {
 			}
 			
 			if($_REQUEST["next_tab"] == '') {
-    			header("Location: ".$app->tform->formDef['list_default']);
+    			if($_SESSION["s"]["form"]["return_to"] != '') {
+					$list_name = $_SESSION["s"]["form"]["return_to"];
+					$redirect = "Location: ".$_SESSION["s"]["list"][$list_name]["parent_script"]."?id=".$_SESSION["s"]["list"][$list_name]["parent_id"]."&next_tab=".$_SESSION["s"]["list"][$list_name]["parent_tab"];
+					unset($_SESSION["s"]["form"]["return_to"]);
+					header($redirect);
+				} else {
+    				header("Location: ".$app->tform->formDef['list_default']);
+				}
         		exit;
     		} else {
 				$this->onShow();

interface/web/sites/mail_box_edit.php

@@ -51,6 +51,8 @@ if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"]))
 $app->uses('tpl,tform,tform_actions');
 $app->load('tform_actions');
 
+die(print_r($_SESSION));
+
 class page_action extends tform_actions {
 	
 	function onShowEnd() {