Fixed bug in tform_actions

Author: tbrehm

interface/lib/classes/plugin_listview.inc.php

@@ -77,6 +77,7 @@ function onShow() {
                 // 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_name"] = $app->tform->formDef["name"];
                 $_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;

interface/lib/classes/tform_actions.inc.php

@@ -115,8 +115,8 @@ function onUpdate() {
                         }
 
                         if($_REQUEST["next_tab"] == '') {
-                                if($_SESSION["s"]["form"]["return_to"] != '') {
-                                        $list_name = $_SESSION["s"]["form"]["return_to"];
+                                $list_name = $_SESSION["s"]["form"]["return_to"];
+								if($list_name != '' && $_SESSION["s"]["list"][$list_name]["parent_id"] != $this->id && $_SESSION["s"]["list"][$list_name]["parent_name"] != $app->tform->formDef["name"]) {
                                         $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"];
                                         $_SESSION["s"]["form"]["return_to"] = '';
                                         session_write_close();
@@ -153,8 +153,8 @@ function onInsert() {
                         }
 
                         if($_REQUEST["next_tab"] == '') {
-                            if($_SESSION["s"]["form"]["return_to"] != '') {
-                                        $list_name = $_SESSION["s"]["form"]["return_to"];
+                            $list_name = $_SESSION["s"]["form"]["return_to"];
+								if($list_name != '' && $_SESSION["s"]["list"][$list_name]["parent_id"] != $this->id && $_SESSION["s"]["list"][$list_name]["parent_name"] != $app->tform->formDef["name"]) {
                                         $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"];
                                         $_SESSION["s"]["form"]["return_to"] = '';
                                         session_write_close();
@@ -236,8 +236,8 @@ function onDelete() {
                 }
 
                 //header("Location: ".$liste["file"]."?PHPSESSID=".$_SESSION["s"]["id"]);
-                if($_SESSION["s"]["form"]["return_to"] != '') {
-                        $list_name = $_SESSION["s"]["form"]["return_to"];
+                $list_name = $_SESSION["s"]["form"]["return_to"];
+				if($list_name != '' && $_SESSION["s"]["list"][$list_name]["parent_id"] != $this->id && $_SESSION["s"]["list"][$list_name]["parent_name"] != $app->tform->formDef["name"]) {
                         $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"];
                         $_SESSION["s"]["form"]["return_to"] = '';
                         session_write_close();