From a75d10d7548e69fb6fd3b9dcf14d357febcc72f4 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Tue, 21 Aug 2007 19:32:35 -0400
Subject: [PATCH] Removed globals and created private vars

---
 interface/lib/classes/tform_actions.inc.php |   53 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php
index 89d974a..0ef8ec0 100644
--- a/interface/lib/classes/tform_actions.inc.php
+++ b/interface/lib/classes/tform_actions.inc.php
@@ -55,15 +55,15 @@
                 $app->tform->loadFormDef($tform_def_file);
 				
 				// Importing ID
-                $this->id = intval($_REQUEST["id"]);
+                $this->id = (isset($_REQUEST["id"]))?intval($_REQUEST["id"]):0;
 				
 				// show print version of the form
-				if($_GET["print_form"] == 1) {
+				if(isset($_GET["print_form"]) && $_GET["print_form"] == 1) {
 					$this->onPrintForm();
 				}
 				
 				// send this form by email
-				if($_GET["send_form_by_mail"] == 1) {
+				if(isset($_GET["send_form_by_mail"]) && $_GET["send_form_by_mail"] == 1) {
 					$this->onMailSendForm();
 				}
 
@@ -141,19 +141,19 @@
                                 $_SESSION["s"]["form"]["return_to"] = '';
                                 session_write_close();
                                 header($redirect);
-						// When a returnto variable is set
-						} 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: ".$redirect);
-							exit;
-						// Use the default list of the form
-                        } else {
-                            header("Location: ".$app->tform->formDef['list_default']);
-                        }
-                        exit;
-                    } else {
+							// When a returnto variable is set
+							} 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: ".$redirect);
+								exit;
+								// Use the default list of the form
+                        	} else {
+                            	header("Location: ".$app->tform->formDef['list_default']);
+                        	}
+                        	exit;
+                    	} else {
                                 $this->onShow();
                         }
                 } else {
@@ -276,16 +276,17 @@
                                 if($app->tform->checkPerm($this->id,'d') == false) $app->error($app->lng('error_no_delete_permission'));
                         }
 
-                        $record_old = $app->db->queryOneRecord("SELECT * FROM ".$liste["table"]." WHERE ".$liste["table_idx"]." = ".$this->id);
+                        //$this->dataRecord = $app->db->queryOneRecord("SELECT * FROM ".$liste["table"]." WHERE ".$liste["table_idx"]." = ".$this->id);
+						$this->dataRecord = $app->tform->getDataRecord($this->id);
 
                         // Saving record to datalog when db_history enabled
                         if($app->tform->formDef["db_history"] == 'yes') {
-							$old_data_record = $app->tform->getDataRecord($this->id);
-							$app->tform->datalogSave('DELETE',$this->id,$old_data_record,array());
-							unset($old_data_record);
+							//$old_data_record = $app->tform->getDataRecord($this->id);
+							$app->tform->datalogSave('DELETE',$this->id,$this->dataRecord,array());
                         }
 
-                        $app->db->query("DELETE FROM ".$liste["table"]." WHERE ".$liste["table_idx"]." = ".$this->id);
+                        $app->db->query("DELETE FROM ".$app->tform->formDef['db_table']." WHERE ".$app->tform->formDef['db_table_idx']." = ".$this->id." LIMIT 1");
+						
 						
 						// loading plugins
 						$next_tab = $app->tform->getCurrentTab();
@@ -296,6 +297,8 @@
                         foreach($this->plugins as $plugin) {
                                 $plugin->onDelete();
                         }
+						
+						$this->onAfterDelete();
                 }
 
                 		//header("Location: ".$liste["file"]."?PHPSESSID=".$_SESSION["s"]["id"]);
@@ -310,6 +313,10 @@
                 }
                 exit;
 
+        }
+		
+		function onAfterDelete() {
+            global $app, $conf;
         }
 		
 		/**
@@ -442,7 +449,7 @@
                 $app->tpl_defaults();
 				
 				// Show the navigation bar of the form
-				if($app->tform->formDef['navibar'] == 'yes') {
+				if(isset($app->tform->formDef['navibar']) && $app->tform->formDef['navibar'] == 'yes') {
 					$navibar = '';
 					if($app->tform->formDef['template_print'] != '') {
 						$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> &nbsp;';
@@ -523,7 +530,7 @@
 		
 		function loadPlugins($next_tab) {
 			global $app;
-			if(is_array($app->tform->formDef["tabs"][$next_tab]["plugins"])) {
+			if(@is_array($app->tform->formDef["tabs"][$next_tab]["plugins"])) {
                  $app->load('plugin_base');
                  foreach($app->tform->formDef["tabs"][$next_tab]["plugins"] as $plugin_name => $plugin_settings) {
                       $plugin_class = $plugin_settings["class"];

--
Gitblit v1.9.1