Added a function to merge language files.

tbrehm

2008-09-21 8dd29e227f44e2379a0a72a4f60130b24e54a14b

 interface/lib/classes/tform_actions.inc.php

@@ -41,6 +41,7 @@
        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 +60,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();
            }

@@ -104,7 +107,7 @@
                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);
                  }
                  
                  // Save record in database
@@ -124,7 +127,7 @@
                  // 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);
                  }
@@ -165,7 +168,7 @@
      
      function onUpdateSave($sql) {
         global $app;
         if(!empty($sql)) {
         if(!empty($sql) && !$app->tform->isReadonlyTab($app->tform->getCurrentTab())) {
            $app->db->query($sql);
            if($app->db->errorMessage != '') die($app->db->errorMessage);
         }
@@ -299,6 +302,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') {
@@ -336,6 +341,10 @@

        }
      
      function onBeforeDelete() {
            global $app, $conf;
        }
		
      function onAfterDelete() {
            global $app, $conf;
        }