From b889edb33e4a09cc1f65d2fb9ad9f9ea16b1eae9 Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Tue, 04 Sep 2012 11:42:42 -0400 Subject: [PATCH] - Ported changes from Apache plugin to nginx plugin. - Fixed errors in system.inc.php- --- interface/lib/classes/tform_actions.inc.php | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php index 84e997b..d536f4b 100644 --- a/interface/lib/classes/tform_actions.inc.php +++ b/interface/lib/classes/tform_actions.inc.php @@ -107,7 +107,8 @@ // Save record in database $this->onUpdateSave($sql); - + $app->plugin->raiseEvent($_SESSION['s']['module']['name'].':'.$app->tform->formDef['name'].':'.'on_update_save',array('page_form'=>$this, 'sql'=>$sql)); + // loading plugins $next_tab = $app->tform->getCurrentTab(); $this->loadPlugins($next_tab); @@ -139,7 +140,7 @@ session_write_close(); header($redirect); // When a returnto variable is set - } elseif ($_SESSION["s"]["form"]["return_to_url"] != '') { + } elseif (isset($_SESSION["s"]["form"]["return_to_url"]) && $_SESSION["s"]["form"]["return_to_url"] != '') { $redirect = $_SESSION["s"]["form"]["return_to_url"]; $_SESSION["s"]["form"]["return_to_url"] = ''; session_write_close(); @@ -185,7 +186,8 @@ if($app->tform->errorMessage == '') { $this->id = $this->onInsertSave($sql); - + $app->plugin->raiseEvent($_SESSION['s']['module']['name'].':'.$app->tform->formDef['name'].':'.'on_insert_save',array('page_form'=>$this, 'sql'=>$sql)); + // loading plugins $next_tab = $app->tform->getCurrentTab(); $this->loadPlugins($next_tab); @@ -216,9 +218,10 @@ header($redirect); exit; } elseif ($_SESSION["s"]["form"]["return_to_url"] != '') { + $redirect = $_SESSION["s"]["form"]["return_to_url"]; $_SESSION["s"]["form"]["return_to_url"] = ''; session_write_close(); - header("Location: ".$_SESSION["s"]["form"]["return_to_url"]); + header("Location: ".$redirect); exit; } else { header("Location: ".$app->tform->formDef['list_default']); @@ -483,7 +486,7 @@ $navibar .= '<a href="'.$app->tform->formDef['action'].'?id='.$this->id.'&print_form=1" target="_blank"><img src="../themes/iprg/icons/printer.png" border="0" alt="Drucken" /></a> '; } if($app->tform->formDef['template_mailsend'] != '') { - $navibar .= "<a href=\"#\" onClick=\"window.open('".$app->tform->formDef['action'].'?id='.$this->id."&send_form_by_mail=1','send','width=370,height=240')\"><img src=\"../themes/iprg/icons/mail.png\" border=\"0\" alt=\"Als E-Mail versenden\" /></a>"; + $navibar .= "<a href=\"#\" onclick=\"window.open('".$app->tform->formDef['action'].'?id='.$this->id."&send_form_by_mail=1','send','width=370,height=240')\"><img src=\"../themes/iprg/icons/mail.png\" border=\"0\" alt=\"Als E-Mail versenden\" /></a>"; } $app->tpl->setVar('form_navibar',$navibar); } -- Gitblit v1.9.1