Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-11-14 7cf3e98090a3e9f0a9cc960d07c5f259adab6a19

 interface/lib/classes/tform_actions.inc.php

@@ -49,7 +49,7 @@
                $app->tform->loadFormDef($tform_def_file);
            
            // Importing ID
                $this->id = (isset($_REQUEST["id"]))?intval($_REQUEST["id"]):0;
                $this->id = (isset($_REQUEST["id"]))?$app->functions->intval($_REQUEST["id"]):0;
            
            // show print version of the form
            if(isset($_GET["print_form"]) && $_GET["print_form"] == 1) {
@@ -77,7 +77,16 @@

        function onSubmit() {
                global $app, $conf;

                
                // check if the client is locked - he may not change anything, then.
            if(!$app->auth->is_admin()) {
               $client_group_id = $_SESSION["s"]["user"]["default_group"];
               $client = $app->db->queryOneRecord("SELECT client.locked FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ".$app->functions->intval($client_group_id));
               if(is_array($client) && $client['locked'] == 'y') {
                  $app->tform->errorMessage .= $app->lng("client_you_are_locked")."<br />";
               }
            }
                
                // Calling the action functions
                if($this->id > 0) {
               $app->tform->action == 'EDIT';
@@ -291,7 +300,7 @@
                $app->tform->loadFormDef($tform_def_file);

                // importing ID
                $this->id = intval($_REQUEST["id"]);
                $this->id = $app->functions->intval($_REQUEST["id"]);

                if($this->id > 0) {

@@ -304,7 +313,8 @@
                  $this->dataRecord = $app->tform->getDataRecord($this->id);
                  
                  $this->onBeforeDelete();

                  $app->plugin->raiseEvent($_SESSION['s']['module']['name'].':'.$app->tform->formDef['name'].':'.'on_before_delete',$this);
						
                        // Saving record to datalog when db_history enabled
                        if($app->tform->formDef["db_history"] == 'yes') {
                     //$old_data_record = $app->tform->getDataRecord($this->id);
@@ -491,6 +501,14 @@
               $app->tpl->setVar('form_navibar',$navibar);
            }
            
                if(isset($_SESSION['show_info_msg'])) {
                    $app->tpl->setVar('show_info_msg', $_SESSION['show_info_msg']);
                    unset($_SESSION['show_info_msg']);
                }
                if(isset($_SESSION['show_error_msg'])) {
                    $app->tpl->setVar('show_error_msg', $_SESSION['show_error_msg']);
                    unset($_SESSION['show_error_msg']);
                }
            
            // loading plugins
                $this->loadPlugins($this->active_tab);