From cdda6b98d785f103d9be6643a99a882c0d65b64c Mon Sep 17 00:00:00 2001 From: fantu <fantu@ispconfig3> Date: Sun, 21 Dec 2008 04:51:07 -0500 Subject: [PATCH] fix parse error --- interface/lib/classes/tform_actions.inc.php | 67 ++++++++++++++++++++++----------- 1 files changed, 45 insertions(+), 22 deletions(-) diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php index 0ef8ec0..c779865 100644 --- a/interface/lib/classes/tform_actions.inc.php +++ b/interface/lib/classes/tform_actions.inc.php @@ -1,7 +1,7 @@ <?php /* -Copyright (c) 2005, Till Brehm, projektfarm Gmbh +Copyright (c) 2007, Till Brehm, projektfarm Gmbh All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -28,19 +28,13 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** -* Action framework for the tform library. -* -* @author Till Brehm <t.brehm@scrigo.org> -* @copyright Copyright © 2005, Till Brehm -*/ - class tform_actions { var $id; var $activeTab; var $dataRecord; var $plugins = array(); + var $oldDataRecord; // This array is only filled during updates and when db_history is enabled. function onLoad() { global $app, $conf, $tform_def_file; @@ -59,11 +53,13 @@ // show print version of the form if(isset($_GET["print_form"]) && $_GET["print_form"] == 1) { + die('Function disabled.'); $this->onPrintForm(); } // send this form by email if(isset($_GET["send_form_by_mail"]) && $_GET["send_form_by_mail"] == 1) { + die('Function disabled.'); $this->onMailSendForm(); } @@ -98,19 +94,17 @@ global $app, $conf; $this->onBeforeUpdate(); - + $ext_where = ''; $sql = $app->tform->getSQL($this->dataRecord,$app->tform->getCurrentTab(),'UPDATE',$this->id,$ext_where); if($app->tform->errorMessage == '') { if($app->tform->formDef['db_history'] == 'yes') { - $old_data_record = $app->tform->getDataRecord($this->id); + $this->oldDataRecord = $app->tform->getDataRecord($this->id); } - - if(!empty($sql)) { - $app->db->query($sql); - if($app->db->errorMessage != '') die($app->db->errorMessage); - } + + // Save record in database + $this->onUpdateSave($sql); // loading plugins $next_tab = $app->tform->getCurrentTab(); @@ -120,13 +114,13 @@ foreach($this->plugins as $plugin) { $plugin->onInsert(); } - - $this->onAfterUpdate(); + + $this->onAfterUpdate(); // Write data history (sys_datalog) if($app->tform->formDef['db_history'] == 'yes') { $new_data_record = $app->tform->getDataRecord($this->id); - $app->tform->datalogSave('UPDATE',$this->id,$old_data_record,$new_data_record); + $app->tform->datalogSave('UPDATE',$this->id,$this->oldDataRecord,$new_data_record); unset($new_data_record); unset($old_data_record); } @@ -160,6 +154,19 @@ $this->onError(); } } + + /* + Save record in database + */ + + function onUpdateSave($sql) { + global $app; + if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab())) { + $app->db->query($sql); + if($app->db->errorMessage != '') die($app->db->errorMessage); + } + } + /** * Function called on data insert @@ -173,9 +180,8 @@ $ext_where = ''; $sql = $app->tform->getSQL($this->dataRecord,$app->tform->getCurrentTab(),'INSERT',$this->id,$ext_where); if($app->tform->errorMessage == '') { - $app->db->query($sql); - if($app->db->errorMessage != '') die($app->db->errorMessage); - $this->id = $app->db->insertID(); + + $this->id = $this->onInsertSave($sql); // loading plugins $next_tab = $app->tform->getCurrentTab(); @@ -221,6 +227,17 @@ $this->onError(); } } + + /* + Save record in database + */ + + function onInsertSave($sql) { + global $app, $conf; + $app->db->query($sql); + if($app->db->errorMessage != '') die($app->db->errorMessage); + return $app->db->insertID(); + } function onBeforeUpdate() { global $app, $conf; @@ -246,7 +263,7 @@ function onError() { global $app, $conf; - $app->tpl->setVar("error","<b>".$app->lng('Error').":</b><br>".$app->tform->errorMessage); + $app->tpl->setVar("error","<b>".$app->lng('Error').":</b><br />".$app->tform->errorMessage); $app->tpl->setVar($this->dataRecord); $this->onShow(); } @@ -278,6 +295,8 @@ //$this->dataRecord = $app->db->queryOneRecord("SELECT * FROM ".$liste["table"]." WHERE ".$liste["table_idx"]." = ".$this->id); $this->dataRecord = $app->tform->getDataRecord($this->id); + + $this->onBeforeDelete(); // Saving record to datalog when db_history enabled if($app->tform->formDef["db_history"] == 'yes') { @@ -315,6 +334,10 @@ } + function onBeforeDelete() { + global $app, $conf; + } + function onAfterDelete() { global $app, $conf; } -- Gitblit v1.9.1