From 992797f73c92b413a7fecff02c27c61b7db55b43 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 09:54:49 -0400
Subject: [PATCH] Copied files from svn 3.0.5 stable branch (git migration)

---
 interface/lib/classes/tform.inc.php | 1830 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 884 insertions(+), 946 deletions(-)

diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index f4ea0d7..7cefb22 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -7,14 +7,14 @@
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-	* Redistributions of source code must retain the above copyright notice,
-	  this list of conditions and the following disclaimer.
-	* Redistributions in binary form must reproduce the above copyright notice,
-	  this list of conditions and the following disclaimer in the documentation
-	  and/or other materials provided with the distribution.
-	* Neither the name of ISPConfig nor the names of its contributors
-	  may be used to endorse or promote products derived from this software without
-	  specific prior written permission.
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -60,250 +60,250 @@
 
 class tform {
 
-		/**
-		* Definition of the database table (array)
-		* @var tableDef
-		*/
-		var $tableDef;
+        /**
+        * Definition of the database table (array)
+        * @var tableDef
+        */
+        var $tableDef;
 
-		/**
-		* Private
-		* @var action
-		*/
-		var $action;
+        /**
+        * Private
+        * @var action
+        */
+        var $action;
 
-		/**
-		* Table name (String)
-		* @var table_name
-		*/
-		var $table_name;
+        /**
+        * Table name (String)
+        * @var table_name
+        */
+        var $table_name;
 
-		/**
-		* Debug Variable
-		* @var debug
-		*/
-		var $debug = 0;
+        /**
+        * Debug Variable
+        * @var debug
+        */
+        var $debug = 0;
 
-		/**
-		* name of the primary field of the database table (string)
-		* @var table_index
-		*/
-		var $table_index;
+        /**
+        * name of the primary field of the database table (string)
+        * @var table_index
+        */
+        var $table_index;
 
-		/**
-		* contains the error messages
-		* @var errorMessage
-		*/
-		var $errorMessage = '';
+        /**
+        * contains the error messages
+        * @var errorMessage
+        */
+        var $errorMessage = '';
 
-		var $dateformat = "d.m.Y";
-		var $formDef = array();
-		var $wordbook;
-		var $module;
-		var $primary_id;
+        var $dateformat = "d.m.Y";
+    	var $formDef = array();
+        var $wordbook;
+        var $module;
+        var $primary_id;
 		var $diffrec = array();
 
-		/**
-		* Loading of the table definition
-		*
-		* @param file: path to the form definition file
-		* @return true
-		*/
-		/*
-		function loadTableDef($file) {
-				global $app,$conf;
+        /**
+        * Loading of the table definition
+        *
+        * @param file: path to the form definition file
+        * @return true
+        */
+        /*
+        function loadTableDef($file) {
+                global $app,$conf;
 
-				include_once($file);
-				$this->tableDef = $table;
-				$this->table_name = $table_name;
-				$this->table_index = $table_index;
-				return true;
-		}
-		*/
+                include_once($file);
+                $this->tableDef = $table;
+                $this->table_name = $table_name;
+                $this->table_index = $table_index;
+                return true;
+        }
+        */
 
-	function loadFormDef($file,$module = '') {
-				global $app,$conf;
+    function loadFormDef($file,$module = '') {
+                global $app,$conf;
 
-				include($file);
-				$this->formDef = $form;
+                include($file);
+                $this->formDef = $form;
 
-				$this->module = $module;
+                $this->module = $module;
 				$wb = array();
-
+				
 				include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
-
+				
 				if(is_array($wb)) $wb_global = $wb;
-
-				if($module == '') {
+				
+                if($module == '') {
 					$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng";
 					if(!file_exists($lng_file)) $lng_file = "lib/lang/en_".$this->formDef["name"].".lng";
 					include($lng_file);
-				} else {
+                } else {
 					$lng_file = "../$module/lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng";
 					if(!file_exists($lng_file)) $lng_file = "../$module/lib/lang/en_".$this->formDef["name"].".lng";
 					include($lng_file);
-				}
+                }
 
 				if(is_array($wb_global)) {
 					$wb = $app->functions->array_merge($wb_global,$wb);
 				}
 				if(isset($wb_global)) unset($wb_global);
-
-				$this->wordbook = $wb;
-
+				
+                $this->wordbook = $wb;
+				
 				$this->dateformat = $app->lng('conf_format_dateshort');
 
-				return true;
-		}
+                return true;
+        }
 
 
-		/**
-		* Converts the data in the array to human readable format
-		* Datatype conversion e.g. to show the data in lists
-		*
-		* @param record
-		* @return record
-		*/
-		function decode($record,$tab) {
-				global $conf, $app;
+        /**
+        * Converts the data in the array to human readable format
+        * Datatype conversion e.g. to show the data in lists
+        *
+        * @param record
+        * @return record
+        */
+        function decode($record,$tab) {
+                global $conf, $app;
 				if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab does not exist or the tab is empty (TAB: $tab).");
-				$new_record = '';
+                $new_record = '';
 				$table_idx = $this->formDef['db_table_idx'];
 				if(isset($record[$table_idx])) $new_record[$table_idx] = $app->functions->intval($record[$table_idx ]);
-
+				
 				if(is_array($record)) {
 						foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
-
+                                
 								//* Apply filter to record value.
 								if(isset($field['filters']) && is_array($field['filters'])) {
 									$record[$key] = $this->filterField($key, (isset($record[$key]))?$record[$key]:'', $field['filters'], 'SHOW');
 								}
-
+								
 								switch ($field['datatype']) {
-								case 'VARCHAR':
-										$new_record[$key] = $record[$key];
-								break;
+                                case 'VARCHAR':
+                                        $new_record[$key] = $record[$key];
+                                break;
 
-								case 'TEXT':
-										$new_record[$key] = $record[$key];
-								break;
+                                case 'TEXT':
+                                        $new_record[$key] = $record[$key];
+                                break;
 
-								case 'DATETSTAMP':
-										if($record[$key] > 0) {
-												$new_record[$key] = date($this->dateformat,$record[$key]);
-										}
-								break;
-
+                                case 'DATETSTAMP':
+                                        if($record[$key] > 0) {
+                                                $new_record[$key] = date($this->dateformat,$record[$key]);
+                                        }
+                                break;
+								
 								case 'DATE':
-										if($record[$key] != '' && $record[$key] != '0000-00-00') {
+                                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
 												$tmp = explode('-',$record[$key]);
-												$new_record[$key] = date($this->dateformat,mktime(0, 0, 0, $tmp[1]  , $tmp[2], $tmp[0]));
-										}
-								break;
+                                                $new_record[$key] = date($this->dateformat,mktime(0, 0, 0, $tmp[1]  , $tmp[2], $tmp[0]));
+                                        }
+                                break;
 
-								case 'INTEGER':
-										$new_record[$key] = $app->functions->intval($record[$key]);
-								break;
+                                case 'INTEGER':
+                                        $new_record[$key] = $app->functions->intval($record[$key]);
+                                break;
 
-								case 'DOUBLE':
-										$new_record[$key] = $record[$key];
-								break;
+                                case 'DOUBLE':
+                                        $new_record[$key] = $record[$key];
+                                break;
 
-								case 'CURRENCY':
-										$new_record[$key] = $app->functions->currency_format($record[$key]);
-								break;
+                                case 'CURRENCY':
+                                        $new_record[$key] = $app->functions->currency_format($record[$key]);
+                                break;
 
-								default:
-										$new_record[$key] = $record[$key];
-								}
-						}
+                                default:
+                                        $new_record[$key] = $record[$key];
+                                }
+                        }
 
-				}
+                }
+				
+        return $new_record;
+        }
 
-		return $new_record;
-		}
+        /**
+        * Get the key => value array of a form filled from a datasource definitiom
+        *
+        * @param field = array with field definition
+        * @param record = Dataset as array
+        * @return key => value array for the value field of a form
+        */
 
-		/**
-		* Get the key => value array of a form filled from a datasource definitiom
-		*
-		* @param field = array with field definition
-		* @param record = Dataset as array
-		* @return key => value array for the value field of a form
-		*/
+        function getDatasourceData($field, $record) {
+                global $app;
 
-		function getDatasourceData($field, $record) {
-				global $app;
+                $values = array();
 
-				$values = array();
+                if($field["datasource"]["type"] == 'SQL') {
 
-				if($field["datasource"]["type"] == 'SQL') {
-
-						// Preparing SQL string. We will replace some
-						// common placeholders
-						$querystring = $field["datasource"]["querystring"];
-						$querystring = str_replace("{USERID}",$_SESSION["s"]["user"]["userid"],$querystring);
-						$querystring = str_replace("{GROUPID}",$_SESSION["s"]["user"]["default_group"],$querystring);
-						$querystring = str_replace("{GROUPS}",$_SESSION["s"]["user"]["groups"],$querystring);
-						$table_idx = $this->formDef['db_table_idx'];
-
+                        // Preparing SQL string. We will replace some
+                        // common placeholders
+                        $querystring = $field["datasource"]["querystring"];
+                        $querystring = str_replace("{USERID}",$_SESSION["s"]["user"]["userid"],$querystring);
+                        $querystring = str_replace("{GROUPID}",$_SESSION["s"]["user"]["default_group"],$querystring);
+                        $querystring = str_replace("{GROUPS}",$_SESSION["s"]["user"]["groups"],$querystring);
+                        $table_idx = $this->formDef['db_table_idx'];
+						
 						$tmp_recordid = (isset($record[$table_idx]))?$record[$table_idx]:0;
-						$querystring = str_replace("{RECORDID}",$tmp_recordid,$querystring);
+                        $querystring = str_replace("{RECORDID}",$tmp_recordid,$querystring);
 						unset($tmp_recordid);
+						
+                        $querystring = str_replace("{AUTHSQL}",$this->getAuthSQL('r'),$querystring);
+						
+                        // Getting the records
+                        $tmp_records = $app->db->queryAllRecords($querystring);
+                        if($app->db->errorMessage != '') die($app->db->errorMessage);
+                        if(is_array($tmp_records)) {
+                                $key_field = $field["datasource"]["keyfield"];
+                                $value_field = $field["datasource"]["valuefield"];
+                                foreach($tmp_records as $tmp_rec) {
+                                        $tmp_id = $tmp_rec[$key_field];
+                                        $values[$tmp_id] = $tmp_rec[$value_field];
+                                }
+                        }
+                }
 
-						$querystring = str_replace("{AUTHSQL}",$this->getAuthSQL('r'),$querystring);
+                if($field["datasource"]["type"] == 'CUSTOM') {
+                        // Calls a custom class to validate this record
+                        if($field["datasource"]['class'] != '' and $field["datasource"]['function'] != '') {
+                                $datasource_class = $field["datasource"]['class'];
+                                $datasource_function = $field["datasource"]['function'];
+                                $app->uses($datasource_class);
+                                $values = $app->$datasource_class->$datasource_function($field, $record);
+                        } else {
+                                $this->errorMessage .= "Custom datasource class or function is empty<br />\r\n";
+                        }
+                }
+                
+                if(isset($field['filters']) && is_array($field['filters'])) {
+                    $new_values = array();
+                    foreach($values as $index => $value) {
+                        $new_index = $this->filterField($index, $index, $field['filters'], 'SHOW');
+                        $new_values[$new_index] = $this->filterField($index, (isset($values[$index]))?$values[$index]:'', $field['filters'], 'SHOW');
+                    }
+                    $values = $new_values;
+                    unset($new_values);
+                    unset($new_index);
+                }
 
-						// Getting the records
-						$tmp_records = $app->db->queryAllRecords($querystring);
-						if($app->db->errorMessage != '') die($app->db->errorMessage);
-						if(is_array($tmp_records)) {
-								$key_field = $field["datasource"]["keyfield"];
-								$value_field = $field["datasource"]["valuefield"];
-								foreach($tmp_records as $tmp_rec) {
-										$tmp_id = $tmp_rec[$key_field];
-										$values[$tmp_id] = $tmp_rec[$value_field];
-								}
-						}
-				}
+                return $values;
 
-				if($field["datasource"]["type"] == 'CUSTOM') {
-						// Calls a custom class to validate this record
-						if($field["datasource"]['class'] != '' and $field["datasource"]['function'] != '') {
-								$datasource_class = $field["datasource"]['class'];
-								$datasource_function = $field["datasource"]['function'];
-								$app->uses($datasource_class);
-								$values = $app->$datasource_class->$datasource_function($field, $record);
-						} else {
-								$this->errorMessage .= "Custom datasource class or function is empty<br />\r\n";
-						}
-				}
-
-				if(isset($field['filters']) && is_array($field['filters'])) {
-					$new_values = array();
-					foreach($values as $index => $value) {
-						$new_index = $this->filterField($index, $index, $field['filters'], 'SHOW');
-						$new_values[$new_index] = $this->filterField($index, (isset($values[$index]))?$values[$index]:'', $field['filters'], 'SHOW');
-					}
-					$values = $new_values;
-					unset($new_values);
-					unset($new_index);
-				}
-
-				return $values;
-
-		}
-
+        }
+		
 		//* If the parameter 'valuelimit' is set
 		function applyValueLimit($limit,$values) {
-
+			
 			global $app;
-
+			
 			$limit_parts = explode(':',$limit);
-
+			
 			//* values are limited to a comma separated list
 			if($limit_parts[0] == 'list') {
 				$allowed = explode(',',$limit_parts[1]);
 			}
-
+			
 			//* values are limited to a field in the client settings
 			if($limit_parts[0] == 'client') {
 				if($_SESSION["s"]["user"]["typ"] == 'admin') {
@@ -314,7 +314,7 @@
 					$allowed = explode(',',$client['lm']);
 				}
 			}
-
+			
 			//* values are limited to a field in the reseller settings
 			if($limit_parts[0] == 'reseller') {
 				if($_SESSION["s"]["user"]["typ"] == 'admin') {
@@ -326,12 +326,12 @@
 					//echo "SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id";
 					//* If the client belongs to a reseller, we will check against the reseller Limit too
 					if($client['parent_client_id'] != 0) {
-
+				
 						//* first we need to know the groups of this reseller
 						$tmp = $app->db->queryOneRecord("SELECT userid, groups FROM sys_user WHERE client_id = ".$client['parent_client_id']);
 						$reseller_groups = $tmp["groups"];
 						$reseller_userid = $tmp["userid"];
-
+				
 						// Get the limits of the reseller of the logged in client
 						$client_group_id = $_SESSION["s"]["user"]["default_group"];
 						$reseller = $app->db->queryOneRecord("SELECT ".$limit_parts[1]." as lm FROM client WHERE client_id = ".$client['parent_client_id']);
@@ -341,7 +341,7 @@
 					}
 				} // end if admin
 			} // end if reseller
-
+			
 			//* values are limited to a field in the system settings
 			if($limit_parts[0] == 'system') {
 				$app->uses('getconf');
@@ -349,296 +349,296 @@
 				$tmp_key = $limit_parts[2];
 				$allowed = $tmp_conf[$tmp_key];
 			}
-
+			
 			$values_new = array();
 			foreach($values as $key => $val) {
 				if(in_array($key,$allowed)) $values_new[$key] = $val;
 			}
-
+			
 			return $values_new;
 		}
 
 
-		/**
-		* Prepare the data record to show the data in a form.
-		*
-		* @param record = Datensatz als Array
-		* @param action = NEW oder EDIT
-		* @return record
-		*/
-		function getHTML($record, $tab, $action = 'NEW') {
+        /**
+        * Prepare the data record to show the data in a form.
+        *
+        * @param record = Datensatz als Array
+        * @param action = NEW oder EDIT
+        * @return record
+        */
+        function getHTML($record, $tab, $action = 'NEW') {
 
-				global $app;
+                global $app;
 
-				$this->action = $action;
+                $this->action = $action;
 
-				if(!is_array($this->formDef)) $app->error("No form definition found.");
-				if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab).");
+                if(!is_array($this->formDef)) $app->error("No form definition found.");
+                if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab).");
 
-				$new_record = array();
-				if($action == 'EDIT') {
-						$record = $this->decode($record,$tab);
-						if(is_array($record)) {
-								foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
-
-										if(isset($record[$key])) {
+                $new_record = array();
+                if($action == 'EDIT') {
+                        $record = $this->decode($record,$tab);
+                        if(is_array($record)) {
+                                foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
+								
+                                        if(isset($record[$key])) {
 											$val = $record[$key];
 										} else {
 											$val = '';
 										}
 
-										// If Datasource is set, get the data from there
-										if(isset($field['datasource']) && is_array($field['datasource'])) {
+                                        // If Datasource is set, get the data from there
+                                        if(isset($field['datasource']) && is_array($field['datasource'])) {
 												if(is_array($field["value"])) {
 													//$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
 													$field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record));
 												} else {
-													$field["value"] = $this->getDatasourceData($field, $record);
+                                                	$field["value"] = $this->getDatasourceData($field, $record);
 												}
-										}
-
+                                        }
+										
 										// If a limitation for the values is set
 										if(isset($field['valuelimit']) && is_array($field["value"])) {
 											$field["value"] = $this->applyValueLimit($field['valuelimit'],$field["value"]);
 										}
 
-										switch ($field['formtype']) {
-										case 'SELECT':
+                                        switch ($field['formtype']) {
+                                        case 'SELECT':
 												$out = '';
-												if(is_array($field['value'])) {
-														foreach($field['value'] as $k => $v) {
-																$selected = ($k == $val)?' SELECTED':'';
+                                                if(is_array($field['value'])) {
+                                                        foreach($field['value'] as $k => $v) {
+                                                                $selected = ($k == $val)?' SELECTED':'';
 																if(!empty($this->wordbook[$v]))
 																	$v = $this->wordbook[$v];
-																$out .= "<option value='$k'$selected>".$this->lng($v)."</option>\r\n";
-														}
-												}
-												$new_record[$key] = $out;
-										break;
-										case 'MULTIPLE':
-												if(is_array($field['value'])) {
+                                                                $out .= "<option value='$k'$selected>".$this->lng($v)."</option>\r\n";
+                                                        }
+                                                }
+                                                $new_record[$key] = $out;
+                                        break;
+                                        case 'MULTIPLE':
+                                                if(is_array($field['value'])) {
 
-														// Split
-														$vals = explode($field['separator'],$val);
+                                                        // Split
+                                                        $vals = explode($field['separator'],$val);
 
-														// write HTML
-														$out = '';
-														foreach($field['value'] as $k => $v) {
+                                                        // write HTML
+                                                        $out = '';
+                                                        foreach($field['value'] as $k => $v) {
 
-																$selected = '';
-																foreach($vals as $tvl) {
-																		if(trim($tvl) == trim($k)) $selected = ' SELECTED';
-																}
+                                                                $selected = '';
+                                                                foreach($vals as $tvl) {
+                                                                        if(trim($tvl) == trim($k)) $selected = ' SELECTED';
+                                                                }
 
-																$out .= "<option value='$k'$selected>$v</option>\r\n";
-														}
-												}
-												$new_record[$key] = $out;
-										break;
+                                                                $out .= "<option value='$k'$selected>$v</option>\r\n";
+                                                        }
+                                                }
+                                                $new_record[$key] = $out;
+                                        break;
 
-										case 'PASSWORD':
-												$new_record[$key] = '';
-										break;
+                                        case 'PASSWORD':
+                                                $new_record[$key] = '';
+                                        break;
 
-										case 'CHECKBOX':
-												$checked = ($val == $field['value'][1])?' CHECKED':'';
-												$new_record[$key] = "<input name=\"".$key."\" id=\"".$key."\" value=\"".$field['value'][1]."\" type=\"checkbox\" $checked />\r\n";
-										break;
+                                        case 'CHECKBOX':
+                                                $checked = ($val == $field['value'][1])?' CHECKED':'';
+                                                $new_record[$key] = "<input name=\"".$key."\" id=\"".$key."\" value=\"".$field['value'][1]."\" type=\"checkbox\" $checked />\r\n";
+                                        break;
 
-										case 'CHECKBOXARRAY':
-												if(is_array($field['value'])) {
+                                        case 'CHECKBOXARRAY':
+                                                if(is_array($field['value'])) {
 
-														// aufsplitten ergebnisse
-														$vals = explode($field['separator'],$val);
+                                                        // aufsplitten ergebnisse
+                                                        $vals = explode($field['separator'],$val);
 
-														// HTML schreiben
-														$out = '';
-														$elementNo = 0;
-														foreach($field['value'] as $k => $v) {
+                                                        // HTML schreiben
+                                                        $out = '';
+                                                        $elementNo = 0;
+                                                        foreach($field['value'] as $k => $v) {
 
-																$checked = '';
-																foreach($vals as $tvl) {
-																		if(trim($tvl) == trim($k)) $checked = ' CHECKED';
-																}
-																// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
+                                                                $checked = '';
+                                                                foreach($vals as $tvl) {
+                                                                        if(trim($tvl) == trim($k)) $checked = ' CHECKED';
+                                                                }
+                                                                // $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
 																$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label><br/>\r\n";
-																$elementNo++;
-														}
-												}
-												$new_record[$key] = $out;
-										break;
+                                                                $elementNo++;
+                                                        }
+                                                }
+                                                $new_record[$key] = $out;
+                                        break;
 
-										case 'RADIO':
-												if(is_array($field['value'])) {
+                                        case 'RADIO':
+                                                if(is_array($field['value'])) {
 
-														// HTML schreiben
-														$out = '';
-														$elementNo = 0;
-														foreach($field['value'] as $k => $v) {
-																$checked = ($k == $val)?' CHECKED':'';
-																//$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
+                                                        // HTML schreiben
+                                                        $out = '';
+                                                        $elementNo = 0;
+                                                        foreach($field['value'] as $k => $v) {
+                                                                $checked = ($k == $val)?' CHECKED':'';
+                                                                //$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
 																$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"radio\" $checked/> $v </label>\r\n";
-																$elementNo++;
-														}
-												}
-												$new_record[$key] = $out;
-										break;
+                                                                $elementNo++;
+                                                        }
+                                                }
+                                                $new_record[$key] = $out;
+                                        break;
+                                        
+                                        case 'DATETIME':
+                                        		if (strtotime($val) !== false) {
+                                        			$dt_value = $val;
+                                        		} elseif ( isset($field['default']) && (strtotime($field['default']) !== false) ) {
+                                        			$dt_value = $field['default'];
+                                        		} else {
+                                        			$dt_value = 0;
+                                        		}
+                                        		
+                                        		$display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false;
+		                              
+		                                        $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds);
+                                        break;
 
-										case 'DATETIME':
-												if (strtotime($val) !== false) {
-													$dt_value = $val;
-												} elseif ( isset($field['default']) && (strtotime($field['default']) !== false) ) {
-													$dt_value = $field['default'];
-												} else {
-													$dt_value = 0;
-												}
-
-												$display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false;
-
-												$new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds);
-										break;
-
-										default:
+                                        default:
 											if(isset($record[$key])) {
-												$new_record[$key] = htmlspecialchars($record[$key]);
+                                                $new_record[$key] = htmlspecialchars($record[$key]);
 											} else {
 												$new_record[$key] = '';
 											}
-										}
-								}
-						}
-				} else {
-						// Action: NEW
-						foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
+                                        }
+                                }
+                        }
+                } else {
+                        // Action: NEW
+                        foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
 
-								// If Datasource is set, get the data from there
-								if(@is_array($field['datasource'])) {
-									if(is_array($field["value"])) {
+                                // If Datasource is set, get the data from there
+                                if(@is_array($field['datasource'])) {
+                                	if(is_array($field["value"])) {
 										$field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record));
 									} else {
-										$field["value"] = $this->getDatasourceData($field, $record);
+                                    	$field["value"] = $this->getDatasourceData($field, $record);
 									}
-								}
-
+                                }
+								
 								// If a limitation for the values is set
 								if(isset($field['valuelimit']) && is_array($field["value"])) {
 									$field["value"] = $this->applyValueLimit($field['valuelimit'],$field["value"]);
 								}
 
-								switch ($field['formtype']) {
-								case 'SELECT':
-										if(is_array($field['value'])) {
-												$out = '';
-												foreach($field['value'] as $k => $v) {
-													$selected = ($k == $field["default"])?' SELECTED':'';
-													$out .= "<option value='$k'$selected>".$this->lng($v)."</option>\r\n";
-												}
-										}
-										if(isset($out)) $new_record[$key] = $out;
-								break;
-								case 'MULTIPLE':
-												if(is_array($field['value'])) {
+                                switch ($field['formtype']) {
+                                case 'SELECT':
+                                        if(is_array($field['value'])) {
+                                                $out = '';
+                                                foreach($field['value'] as $k => $v) {
+                                                    $selected = ($k == $field["default"])?' SELECTED':'';
+                                                    $out .= "<option value='$k'$selected>".$this->lng($v)."</option>\r\n";
+                                                }
+                                        }
+                                        if(isset($out)) $new_record[$key] = $out;
+                                break;
+                                case 'MULTIPLE':
+                                                if(is_array($field['value'])) {
 
-														// aufsplitten ergebnisse
-														$vals = explode($field['separator'],$val);
+                                                        // aufsplitten ergebnisse
+                                                        $vals = explode($field['separator'],$val);
 
-														// HTML schreiben
-														$out = '';
-														foreach($field['value'] as $k => $v) {
+                                                        // HTML schreiben
+                                                        $out = '';
+                                                        foreach($field['value'] as $k => $v) {
 
-																$out .= "<option value='$k'>$v</option>\r\n";
-														}
-												}
-												$new_record[$key] = $out;
-										break;
+                                                                $out .= "<option value='$k'>$v</option>\r\n";
+                                                        }
+                                                }
+                                                $new_record[$key] = $out;
+                                        break;
 
                                 case 'PASSWORD':
                                         //$new_record[$key] = '';
 										$new_record[$key] = htmlspecialchars($field['default']);
                                 break;
 
-								case 'CHECKBOX':
-										// $checked = (empty($field["default"]))?'':' CHECKED';
-															$checked = ($field["default"] == $field['value'][1])?' CHECKED':'';
-										$new_record[$key] = "<input name=\"".$key."\" id=\"".$key."\" value=\"".$field['value'][1]."\" type=\"checkbox\" $checked />\r\n";
-								break;
+                                case 'CHECKBOX':
+                                        // $checked = (empty($field["default"]))?'':' CHECKED';
+										                    $checked = ($field["default"] == $field['value'][1])?' CHECKED':'';
+                                        $new_record[$key] = "<input name=\"".$key."\" id=\"".$key."\" value=\"".$field['value'][1]."\" type=\"checkbox\" $checked />\r\n"; 
+                                break;
 
-								case 'CHECKBOXARRAY':
-										if(is_array($field['value'])) {
+                                case 'CHECKBOXARRAY':
+                                        if(is_array($field['value'])) {
 
-												// aufsplitten ergebnisse
-												$vals = explode($field['separator'],$field["default"]);
+                                                // aufsplitten ergebnisse
+                                                $vals = explode($field['separator'],$field["default"]);
 
-												// HTML schreiben
-												$out = '';
-												$elementNo = 0;
-												foreach($field['value'] as $k => $v) {
+                                                // HTML schreiben
+                                                $out = '';
+                                                $elementNo = 0;
+                                                foreach($field['value'] as $k => $v) {
 
-														$checked = '';
-														foreach($vals as $tvl) {
-																if(trim($tvl) == trim($k)) $checked = ' CHECKED';
-														}
-														// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
+                                                        $checked = '';
+                                                        foreach($vals as $tvl) {
+                                                                if(trim($tvl) == trim($k)) $checked = ' CHECKED';
+                                                        }
+                                                        // $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
 														$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label> &nbsp;\r\n";
-														$elementNo++;
-												}
-										}
-										$new_record[$key] = $out;
-								break;
+                                                        $elementNo++;
+                                                }
+                                        }
+                                        $new_record[$key] = $out;
+                                break;
 
-								case 'RADIO':
-										if(is_array($field['value'])) {
+                                case 'RADIO':
+                                        if(is_array($field['value'])) {
 
-												// HTML schreiben
-												$out = '';
-												$elementNo = 0;
-												foreach($field['value'] as $k => $v) {
-														$checked = ($k == $field["default"])?' CHECKED':'';
-														//$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
+                                                // HTML schreiben
+                                                $out = '';
+                                                $elementNo = 0;
+                                                foreach($field['value'] as $k => $v) {
+                                                        $checked = ($k == $field["default"])?' CHECKED':'';
+                                                        //$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
 														$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
-														$elementNo++;
-												}
-										}
-										$new_record[$key] = $out;
-								break;
+                                                        $elementNo++;
+                                                }
+                                        }
+                                        $new_record[$key] = $out;
+                                break;
+                                
+                                case 'DATETIME':
+                                        $dt_value = (isset($field['default'])) ? $field['default'] : 0;
+                                        $display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false;
+                              
+                                        $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds);
+                                break;
 
-								case 'DATETIME':
-										$dt_value = (isset($field['default'])) ? $field['default'] : 0;
-										$display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false;
+                                default:
+                                        $new_record[$key] = htmlspecialchars($field['default']);
+                                }
+                        }
 
-										$new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds);
-								break;
+                }
 
-								default:
-										$new_record[$key] = htmlspecialchars($field['default']);
-								}
-						}
+                if($this->debug == 1) $this->dbg($new_record);
 
-				}
+                return $new_record;
+        }
 
-				if($this->debug == 1) $this->dbg($new_record);
-
-				return $new_record;
-		}
-
-		/**
-		* Rewrite the record data to be stored in the database
-		* and check values with regular expressions.
-		*
-		* @param record = Datensatz als Array
-		* @return record
-		*/
-		function encode($record,$tab,$dbencode = true) {
+        /**
+        * Rewrite the record data to be stored in the database
+        * and check values with regular expressions.
+        *
+        * @param record = Datensatz als Array
+        * @return record
+        */
+        function encode($record,$tab,$dbencode = true) {
 			global $app;
+			
+                if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab is empty or does not exist (TAB: $tab).");
+                //$this->errorMessage = '';
 
-				if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab is empty or does not exist (TAB: $tab).");
-				//$this->errorMessage = '';
-
-				if(is_array($record)) {
-						foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
-
+                if(is_array($record)) {
+                        foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
+								
 								//* Apply filter to record value
-								if(isset($field['filters']) && is_array($field['filters'])) {
+                                if(isset($field['filters']) && is_array($field['filters'])) {
 									$record[$key] = $this->filterField($key, (isset($record[$key]))?$record[$key]:'', $field['filters'], 'SAVE');
 								}
 								//* Validate record value
@@ -646,31 +646,31 @@
 									$this->validateField($key, (isset($record[$key]))?$record[$key]:'', $field['validators']);
 								}
 
-								switch ($field['datatype']) {
-								case 'VARCHAR':
-										if(!@is_array($record[$key])) {
+                                switch ($field['datatype']) {
+                                case 'VARCHAR':
+                                        if(!@is_array($record[$key])) {
 												$new_record[$key] = (isset($record[$key]))?$record[$key]:'';
-										} else {
-												$new_record[$key] = implode($field['separator'],$record[$key]);
-										}
-								break;
-								case 'TEXT':
-										if(!is_array($record[$key])) {
-												$new_record[$key] = $record[$key];
-										} else {
-												$new_record[$key] = implode($field['separator'],$record[$key]);
-										}
-								break;
-								case 'DATETSTAMP':
-										if($record[$key] > 0) {
-												list($tag,$monat,$jahr) = explode('.',$record[$key]);
-												$new_record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
-										} else {
+                                        } else {
+                                                $new_record[$key] = implode($field['separator'],$record[$key]);
+                                        }
+                                break;
+                                case 'TEXT':
+                                        if(!is_array($record[$key])) {
+                                                $new_record[$key] = $record[$key];
+                                        } else {
+                                                $new_record[$key] = implode($field['separator'],$record[$key]);
+                                        }
+                                break;
+                                case 'DATETSTAMP':
+                                        if($record[$key] > 0) {
+                                                list($tag,$monat,$jahr) = explode('.',$record[$key]);
+                                                $new_record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
+                                        } else {
 											$new_record[$key] = 0;
 										}
-								break;
+                                break;
 								case 'DATE':
-										if($record[$key] != '' && $record[$key] != '0000-00-00') {
+                                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
 												if(function_exists('date_parse_from_format')) {
 													$date_parts = date_parse_from_format($this->dateformat,$record[$key]);
 													//list($tag,$monat,$jahr) = explode('.',$record[$key]);
@@ -683,67 +683,67 @@
 													$tmp = strtotime($record[$key]);
 													$new_record[$key] = date('Y-m-d',$tmp);
 												}
-										} else {
+                                        } else {
 											$new_record[$key] = '0000-00-00';
 										}
-								break;
-								case 'INTEGER':
+                                break;
+                                case 'INTEGER':
 										$new_record[$key] = (isset($record[$key]))?$app->functions->intval($record[$key]):0;
-										//if($new_record[$key] != $record[$key]) $new_record[$key] = $field['default'];
-										//if($key == 'refresh') die($record[$key]);
-								break;
-								case 'DOUBLE':
-										$new_record[$key] = $record[$key];
-								break;
-								case 'CURRENCY':
-										$new_record[$key] = str_replace(",",".",$record[$key]);
-								break;
+                                        //if($new_record[$key] != $record[$key]) $new_record[$key] = $field['default'];
+                                        //if($key == 'refresh') die($record[$key]);
+                                break;
+                                case 'DOUBLE':
+                                        $new_record[$key] = $record[$key];
+                                break;
+                                case 'CURRENCY':
+                                        $new_record[$key] = str_replace(",",".",$record[$key]);
+                                break;
+                                
+                                case 'DATETIME':
+                                		if (is_array($record[$key]))
+                                		{
+	                                		$filtered_values = array_map(create_function('$item','return (int)$item;'), $record[$key]);
+                                			extract($filtered_values, EXTR_PREFIX_ALL, '_dt');
+                                			
+                                			if ($_dt_day != 0 && $_dt_month != 0 && $_dt_year != 0) {
+	                                			$new_record[$key] = date( 'Y-m-d H:i:s', mktime($_dt_hour, $_dt_minute, $_dt_second, $_dt_month, $_dt_day, $_dt_year) );
+	                                		}
+                                		}
+                                break;
+                                }
 
-								case 'DATETIME':
-										if (is_array($record[$key]))
-										{
-											$filtered_values = array_map(create_function('$item','return (int)$item;'), $record[$key]);
-											extract($filtered_values, EXTR_PREFIX_ALL, '_dt');
-
-											if ($_dt_day != 0 && $_dt_month != 0 && $_dt_year != 0) {
-												$new_record[$key] = date( 'Y-m-d H:i:s', mktime($_dt_hour, $_dt_minute, $_dt_second, $_dt_month, $_dt_day, $_dt_year) );
-											}
-										}
-								break;
-								}
-
-								// The use of the field value is deprecated, use validators instead
-								if(isset($field['regex']) && $field['regex'] != '') {
-										// Enable that "." matches also newlines
-										$field['regex'] .= 's';
-										if(!preg_match($field['regex'], $record[$key])) {
-												$errmsg = $field['errmsg'];
-												$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
-										}
-								}
-
+                                // The use of the field value is deprecated, use validators instead
+                                if(isset($field['regex']) && $field['regex'] != '') {
+                                        // Enable that "." matches also newlines
+                                        $field['regex'] .= 's';
+                                        if(!preg_match($field['regex'], $record[$key])) {
+                                                $errmsg = $field['errmsg'];
+                                                $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                        }
+                                }
+								
 								//* Add slashes to all records, when we encode data which shall be inserted into mysql.
 								if($dbencode == true) $new_record[$key] = $app->db->quote($new_record[$key]);
-						}
-				}
-				return $new_record;
-		}
-
+                        }
+                }
+                return $new_record;
+        }
+		
 		/**
-		* process the filters for a given field.
-		*
-		* @param field_name = Name of the field
-		* @param field_value = value of the field
-		* @param filters = Array of filters
+        * process the filters for a given field.
+        *
+        * @param field_name = Name of the field
+        * @param field_value = value of the field
+        * @param filters = Array of filters
 		* @param filter_event = 'SAVE'or 'SHOW'
-		* @return record
-		*/
+        * @return record
+        */
 
-		function filterField($field_name, $field_value, $filters, $filter_event) {
+        function filterField($field_name, $field_value, $filters, $filter_event) {
 
 			global $app;
 			$returnval = $field_value;
-
+				
 			//* Loop trough all filters
 			foreach($filters as $filter) {
 				if($filter['event'] == $filter_event) {
@@ -766,177 +766,179 @@
 					}
 				}
 			}
-			return $returnval;
-		}
+            return $returnval;
+        }
 
-		/**
-		* process the validators for a given field.
-		*
-		* @param field_name = Name of the field
-		* @param field_value = value of the field
-		* @param validatoors = Array of validators
-		* @return record
-		*/
+        /**
+        * process the validators for a given field.
+        *
+        * @param field_name = Name of the field
+        * @param field_value = value of the field
+        * @param validatoors = Array of validators
+        * @return record
+        */
 
-		function validateField($field_name, $field_value, $validators) {
+        function validateField($field_name, $field_value, $validators) {
 
-				global $app;
-
+                global $app;
+				
 				$escape = '`';
+				
+                // loop trough the validators
+                foreach($validators as $validator) {
 
-				// loop trough the validators
-				foreach($validators as $validator) {
-
-						switch ($validator['type']) {
-								case 'REGEX':
-										$validator['regex'] .= 's';
-										if(!preg_match($validator['regex'], $field_value)) {
-												$errmsg = $validator['errmsg'];
-												if(isset($this->wordbook[$errmsg])) {
-													$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                        switch ($validator['type']) {
+                                case 'REGEX':
+                                        $validator['regex'] .= 's';
+                                        if(!preg_match($validator['regex'], $field_value)) {
+                                                $errmsg = $validator['errmsg'];
+                                                if(isset($this->wordbook[$errmsg])) {
+                                                	$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 												} else {
 													$this->errorMessage .= $errmsg."<br />\r\n";
 												}
-										}
-								break;
-								case 'UNIQUE':
+                                        }
+                                break;
+                                case 'UNIQUE':
 										if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
 										if($validator['allowempty'] == 'n' || ($validator['allowempty'] == 'y' && $field_value != '')){
 											if($this->action == 'NEW') {
-												$num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."'");
-												if($num_rec["number"] > 0) {
-														$errmsg = $validator['errmsg'];
+                                                $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."'");
+                                                if($num_rec["number"] > 0) {
+                                                        $errmsg = $validator['errmsg'];
 														if(isset($this->wordbook[$errmsg])) {
-															$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                                        	$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 														} else {
 															$this->errorMessage .= $errmsg."<br />\r\n";
 														}
-												}
+                                                }
 											} else {
-												$num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."' AND ".$this->formDef['db_table_idx']." != ".$this->primary_id);
-												if($num_rec["number"] > 0) {
-														$errmsg = $validator['errmsg'];
-														if(isset($this->wordbook[$errmsg])) {
-															$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                                $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."' AND ".$this->formDef['db_table_idx']." != ".$this->primary_id);
+                                                if($num_rec["number"] > 0) {
+                                                        $errmsg = $validator['errmsg'];
+                                                        if(isset($this->wordbook[$errmsg])) {
+                                                        	$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 														} else {
 															$this->errorMessage .= $errmsg."<br />\r\n";
 														}
-												}
+                                                }
 											}
 										}
-								break;
-								case 'NOTEMPTY':
-										if(empty($field_value)) {
-												$errmsg = $validator['errmsg'];
-												if(isset($this->wordbook[$errmsg])) {
-													$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                break;
+                                case 'NOTEMPTY':
+                                        if(empty($field_value)) {
+                                                $errmsg = $validator['errmsg'];
+                                                if(isset($this->wordbook[$errmsg])) {
+                                                    $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 												} else {
 													$this->errorMessage .= $errmsg."<br />\r\n";
 												}
-										}
-								break;
-								case 'ISEMAIL':
-									if(function_exists('filter_var')) {
+                                        }
+                                break;
+                                case 'ISEMAIL':
+                                    if(function_exists('filter_var')) {
 										if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) {
 											$errmsg = $validator['errmsg'];
-											if(isset($this->wordbook[$errmsg])) {
-												$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                            if(isset($this->wordbook[$errmsg])) {
+                                                $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 											} else {
 												$this->errorMessage .= $errmsg."<br />\r\n";
 											}
-										}
+                                        }
 									} else {
 										if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-zA-Z0-9\-]{2,30}$/i", $field_value)) {
-												$errmsg = $validator['errmsg'];
-												if(isset($this->wordbook[$errmsg])) {
-													$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                                $errmsg = $validator['errmsg'];
+                                                if(isset($this->wordbook[$errmsg])) {
+                                                    $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 												} else {
 													$this->errorMessage .= $errmsg."<br />\r\n";
 												}
-										}
+                                        }
 									}
-								break;
-								case 'ISINT':
+                                break;
+                                case 'ISINT':
 									if(function_exists('filter_var') && $field_value < 2147483647) {
 										if($field_value != '' && filter_var($field_value, FILTER_VALIDATE_INT) === false) {
 											$errmsg = $validator['errmsg'];
 											if(isset($this->wordbook[$errmsg])) {
-												$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                                $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 											} else {
 												$this->errorMessage .= $errmsg."<br />\r\n";
 											}
-										}
+                                        }
 									} else {
-										$tmpval = $app->functions->intval($field_value);
-										if($tmpval === 0 and !empty($field_value)) {
-												$errmsg = $validator['errmsg'];
-												if(isset($this->wordbook[$errmsg])) {
-													$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                        $tmpval = $app->functions->intval($field_value);
+                                        if($tmpval === 0 and !empty($field_value)) {
+                                                $errmsg = $validator['errmsg'];
+                                                if(isset($this->wordbook[$errmsg])) {
+                                                    $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 												} else {
 													$this->errorMessage .= $errmsg."<br />\r\n";
 												}
-										}
+                                        }
 									}
-								break;
-								case 'ISPOSITIVE':
-										if(!is_numeric($field_value) || $field_value <= 0){
-										  $errmsg = $validator['errmsg'];
-										  if(isset($this->wordbook[$errmsg])) {
-											 $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                break;
+                                case 'ISPOSITIVE':
+                                        if(!is_numeric($field_value) || $field_value <= 0){
+                                          $errmsg = $validator['errmsg'];
+                                          if(isset($this->wordbook[$errmsg])) {
+                                             $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 										  } else {
 											 $this->errorMessage .= $errmsg."<br />\r\n";
-										  }
-										}
-								break;
-				case 'ISV6PREFIX':
-					$v6_prefix_ok = 0;
-					$explode_field_value = explode(':',$field_value);
-					if ($explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]=='' ){
-							if ( count($explode_field_value) <= 9 ) {
-									if(filter_var(substr($field_value,0,strlen($field_value)-2),FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).'::0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).':0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) ) {
-											$v6_prefix_ok = 1;
-									}
-							}
-					} else {
-						$v6_prefix_ok = 2;
-					}
-					// check subnet against defined server-ipv6
-					$sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' LIMIT 0,1");
-					$sql_v6_explode=explode(':',$sql_v6['ip_address']);
-					if ( count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address']) )  {
-						$v6_prefix_ok = 3;
-					}
-					if($v6_prefix_ok == 0) {
-						$errmsg = $validator['errmsg'];
-					}
-					if($v6_prefix_ok == 2) {
-						$errmsg = 'IPv6 Prefix must end with ::';
-					}
-					if($v6_prefix_ok == 3) {
-						$errmsg = 'IPv6 Prefix too long (according to Server IP Addresses)';
-					}
-					if($v6_prefix_ok <> 1){
-						$this->errorMessage .= $errmsg."<br />\r\n";
-					}
+										  }
+                                        }
+                                break;
+				/*
+				case 'ISV6PREFIX':
+					$v6_prefix_ok = 0;
+					$explode_field_value = explode(':',$field_value);
+					if ($explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]=='' ){
+					        if ( count($explode_field_value) <= 9 ) {
+					                if(filter_var(substr($field_value,0,strlen($field_value)-2),FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).'::0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).':0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) ) {
+					                        $v6_prefix_ok = 1;
+                					}
+        					}
+					} else { 
+						$v6_prefix_ok = 2; 
+					}
+					// check subnet against defined server-ipv6
+					$sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' LIMIT 0,1");
+					$sql_v6_explode=explode(':',$sql_v6['ip_address']);
+					if ( count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address']) )  { 
+						$v6_prefix_ok = 3; 
+					}
+					if($v6_prefix_ok == 0) { 
+						$errmsg = $validator['errmsg']; 
+					}
+					if($v6_prefix_ok == 2) { 
+						$errmsg = 'IPv6 Prefix must end with ::'; 
+					}
+					if($v6_prefix_ok == 3) { 
+						$errmsg = 'IPv6 Prefix too long (according to Server IP Addresses)'; 
+					}
+					if($v6_prefix_ok <> 1){
+						$this->errorMessage .= $errmsg."<br />\r\n"; 
+					}
 				break;
-								case 'ISIPV4':
-								$vip=1;
-								if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+				*/
+								case 'ISIPV4':
+								$vip=1;
+								if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
 								$groups=explode(".",$field_value);
 								foreach($groups as $group){
 									if($group<0 OR $group>255)
 									$vip=0;
 								}
 								}else{$vip=0;}
-										if($vip==0) {
+                                        if($vip==0) {
 										$errmsg = $validator['errmsg'];
-										  if(isset($this->wordbook[$errmsg])) {
-											 $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+                                          if(isset($this->wordbook[$errmsg])) {
+                                             $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
 										  } else {
 											 $this->errorMessage .= $errmsg."<br />\r\n";
 										  }
 										}
-								break;
+                                break;
 								case 'ISIP':
 								if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
 								if($validator['allowempty'] == 'y' && $field_value == '') {
@@ -980,13 +982,13 @@
 										}
 									}
 								}
-								break;
+                                break;
 								case 'RANGE':
-										//* Checks if the value is within the given range or above / below a value
+                                        //* Checks if the value is within the given range or above / below a value
 										//* Range examples: < 10 = ":10", between 2 and 10 = "2:10", above 5 = "5:".
 										$range_parts = explode(':',trim($validator['range']));
 										$ok = true;
-										if($range_parts[0] != '' && $field_value < $range_parts[0]) {
+                                        if($range_parts[0] != '' && $field_value < $range_parts[0]) {
 											$ok = false;
 										}
 										if($range_parts[1] != '' && $field_value > $range_parts[1]) {
@@ -999,76 +1001,76 @@
 											} else {
 												$this->errorMessage .= $errmsg."<br />\r\n";
 											}
-										}
+                                        }
 										unset($range_parts);
-								break;
-								case 'CUSTOM':
-										// Calls a custom class to validate this record
-										if($validator['class'] != '' and $validator['function'] != '') {
-												$validator_class = $validator['class'];
-												$validator_function = $validator['function'];
-												$app->uses($validator_class);
-												$this->errorMessage .= $app->$validator_class->$validator_function($field_name, $field_value, $validator);
-										} else {
-												$this->errorMessage .= "Custom validator class or function is empty<br />\r\n";
-										}
-								break;
+                                break;
+                                case 'CUSTOM':
+                                        // Calls a custom class to validate this record
+                                        if($validator['class'] != '' and $validator['function'] != '') {
+                                                $validator_class = $validator['class'];
+                                                $validator_function = $validator['function'];
+                                                $app->uses($validator_class);
+                                                $this->errorMessage .= $app->$validator_class->$validator_function($field_name, $field_value, $validator);
+                                        } else {
+                                                $this->errorMessage .= "Custom validator class or function is empty<br />\r\n";
+                                        }
+                                break;
 								default:
 									$this->errorMessage .= "Unknown Validator: ".$validator['type'];
 								break;
-						}
+                        }
 
 
-				}
+                }
 
-				return true;
-		}
+                return true;
+        }
 
-		/**
-		* Create SQL statement
-		*
-		* @param record = Datensatz als Array
-		* @param action = INSERT oder UPDATE
-		* @param primary_id
-		* @return record
-		*/
-		function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '') {
+        /**
+        * Create SQL statement
+        *
+        * @param record = Datensatz als Array
+        * @param action = INSERT oder UPDATE
+        * @param primary_id
+        * @return record
+        */
+        function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '') {
 
-				global $app;
+                global $app;
 
-				// If there are no data records on the tab, return empty sql string
-				if(count($this->formDef['tabs'][$tab]['fields']) == 0) return '';
+                // If there are no data records on the tab, return empty sql string
+                if(count($this->formDef['tabs'][$tab]['fields']) == 0) return '';
 
-				// checking permissions
-				if($this->formDef['auth'] == 'yes' && $_SESSION["s"]["user"]["typ"] != 'admin') {
-						if($action == "INSERT") {
-								if(!$this->checkPerm($primary_id,'i')) $this->errorMessage .= "Insert denied.<br />\r\n";
-						} else {
-								if(!$this->checkPerm($primary_id,'u')) $this->errorMessage .= "Update denied.<br />\r\n";
-						}
-				}
+                // checking permissions
+                if($this->formDef['auth'] == 'yes' && $_SESSION["s"]["user"]["typ"] != 'admin') {
+                        if($action == "INSERT") {
+                                if(!$this->checkPerm($primary_id,'i')) $this->errorMessage .= "Insert denied.<br />\r\n";
+                        } else {
+                                if(!$this->checkPerm($primary_id,'u')) $this->errorMessage .= "Update denied.<br />\r\n";
+                        }
+                }
 
-				$this->action = $action;
-				$this->primary_id = $primary_id;
+                $this->action = $action;
+                $this->primary_id = $primary_id;
 
-				$record = $this->encode($record,$tab,true);
-				$sql_insert_key = '';
-				$sql_insert_val = '';
-				$sql_update = '';
+                $record = $this->encode($record,$tab,true);
+                $sql_insert_key = '';
+                $sql_insert_val = '';
+                $sql_update = '';
 
-				if(!is_array($this->formDef)) $app->error("Form definition not found.");
-				if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab).");
+                if(!is_array($this->formDef)) $app->error("Form definition not found.");
+                if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab).");
 
-				// go trough all fields of the tab
-				if(is_array($record)) {
-				foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
-								// Wenn es kein leeres Passwortfeld ist
-								if (!($field['formtype'] == 'PASSWORD' and $record[$key] == '')) {
-										// Erzeuge Insert oder Update Quelltext
-										if($action == "INSERT") {
-												if($field['formtype'] == 'PASSWORD') {
-														$sql_insert_key .= "`$key`, ";
-														if($field['encryption'] == 'CRYPT') {
+                // go trough all fields of the tab
+                if(is_array($record)) {
+                foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
+                                // Wenn es kein leeres Passwortfeld ist
+                                if (!($field['formtype'] == 'PASSWORD' and $record[$key] == '')) {
+                                        // Erzeuge Insert oder Update Quelltext
+                                        if($action == "INSERT") {
+                                                if($field['formtype'] == 'PASSWORD') {
+                                                        $sql_insert_key .= "`$key`, ";
+                                                        if($field['encryption'] == 'CRYPT') {
 																$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
 																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
 														} elseif ($field['encryption'] == 'MYSQL') {
@@ -1077,13 +1079,13 @@
 																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
 														} elseif ($field['encryption'] == 'CLEARTEXT') {
 																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
-														} else {
-																$record[$key] = md5(stripslashes($record[$key]));
+                                                        } else {
+                                                                $record[$key] = md5(stripslashes($record[$key]));
 																$sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
-														}
-
-												} elseif ($field['formtype'] == 'CHECKBOX') {
-														$sql_insert_key .= "`$key`, ";
+                                                        }
+														
+                                                } elseif ($field['formtype'] == 'CHECKBOX') {
+                                                        $sql_insert_key .= "`$key`, ";
 														if($record[$key] == '') {
 															// if a checkbox is not set, we set it to the unchecked value
 															$sql_insert_val .= "'".$field['value'][0]."', ";
@@ -1091,14 +1093,14 @@
 														} else {
 															$sql_insert_val .= "'".$record[$key]."', ";
 														}
-												} else {
-														$sql_insert_key .= "`$key`, ";
-														$sql_insert_val .= "'".$record[$key]."', ";
-												}
-										} else {
-												if($field['formtype'] == 'PASSWORD') {
+                                                } else {
+                                                        $sql_insert_key .= "`$key`, ";
+                                                        $sql_insert_val .= "'".$record[$key]."', ";
+                                                }
+                                        } else {
+                                                if($field['formtype'] == 'PASSWORD') {
 														if(isset($field['encryption']) && $field['encryption'] == 'CRYPT') {
-																$record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
+                                                                $record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
 																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
 														} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
 																$tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
@@ -1106,12 +1108,12 @@
 																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
 														} elseif (isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') {
 																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
-														} else {
-																$record[$key] = md5(stripslashes($record[$key]));
+                                                        } else {
+                                                                $record[$key] = md5(stripslashes($record[$key]));
 																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
-														}
-
-												} elseif ($field['formtype'] == 'CHECKBOX') {
+                                                        }
+                                                        
+                                                } elseif ($field['formtype'] == 'CHECKBOX') {
 														if($record[$key] == '') {
 															// if a checkbox is not set, we set it to the unchecked value
 															$sql_update .= "`$key` = '".$field['value'][0]."', ";
@@ -1119,343 +1121,279 @@
 														} else {
 															$sql_update .= "`$key` = '".$record[$key]."', ";
 														}
-												} else {
-														$sql_update .= "`$key` = '".$record[$key]."', ";
-												}
-										}
-								} else {
-									// we unset the password filed, if empty to tell the datalog function
+                                                } else {
+                                                        $sql_update .= "`$key` = '".$record[$key]."', ";
+                                                }
+                                        }
+                                } else {
+									// we unset the password filed, if empty to tell the datalog function 
 									// that the password has not been changed
-									unset($record[$key]);
+								    unset($record[$key]);
 								}
-						}
-		}
+                        }
+        }
 
 
-				// Add backticks for incomplete table names
-				if(stristr($this->formDef['db_table'],'.')) {
-						$escape = '';
-				} else {
-						$escape = '`';
-				}
+                // Add backticks for incomplete table names
+                if(stristr($this->formDef['db_table'],'.')) {
+                        $escape = '';
+                } else {
+                        $escape = '`';
+                }
 
 
-				if($action == "INSERT") {
-						if($this->formDef['auth'] == 'yes') {
-								// Set user and group
-								$sql_insert_key .= "`sys_userid`, ";
-								$sql_insert_val .= ($this->formDef["auth_preset"]["userid"] > 0)?"'".$this->formDef["auth_preset"]["userid"]."', ":"'".$_SESSION["s"]["user"]["userid"]."', ";
-								$sql_insert_key .= "`sys_groupid`, ";
-								$sql_insert_val .= ($this->formDef["auth_preset"]["groupid"] > 0)?"'".$this->formDef["auth_preset"]["groupid"]."', ":"'".$_SESSION["s"]["user"]["default_group"]."', ";
-								$sql_insert_key .= "`sys_perm_user`, ";
-								$sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_user"]."', ";
-								$sql_insert_key .= "`sys_perm_group`, ";
-								$sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_group"]."', ";
-								$sql_insert_key .= "`sys_perm_other`, ";
-								$sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_other"]."', ";
-						}
-						$sql_insert_key = substr($sql_insert_key,0,-2);
-						$sql_insert_val = substr($sql_insert_val,0,-2);
-						$sql = "INSERT INTO ".$escape.$this->formDef['db_table'].$escape." ($sql_insert_key) VALUES ($sql_insert_val)";
-				} else {
+                if($action == "INSERT") {
+                        if($this->formDef['auth'] == 'yes') {
+                                // Set user and group
+                                $sql_insert_key .= "`sys_userid`, ";
+                                $sql_insert_val .= ($this->formDef["auth_preset"]["userid"] > 0)?"'".$this->formDef["auth_preset"]["userid"]."', ":"'".$_SESSION["s"]["user"]["userid"]."', ";
+                                $sql_insert_key .= "`sys_groupid`, ";
+                                $sql_insert_val .= ($this->formDef["auth_preset"]["groupid"] > 0)?"'".$this->formDef["auth_preset"]["groupid"]."', ":"'".$_SESSION["s"]["user"]["default_group"]."', ";
+                                $sql_insert_key .= "`sys_perm_user`, ";
+                                $sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_user"]."', ";
+                                $sql_insert_key .= "`sys_perm_group`, ";
+                                $sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_group"]."', ";
+                                $sql_insert_key .= "`sys_perm_other`, ";
+                                $sql_insert_val .= "'".$this->formDef["auth_preset"]["perm_other"]."', ";
+                        }
+                        $sql_insert_key = substr($sql_insert_key,0,-2);
+                        $sql_insert_val = substr($sql_insert_val,0,-2);
+                        $sql = "INSERT INTO ".$escape.$this->formDef['db_table'].$escape." ($sql_insert_key) VALUES ($sql_insert_val)";
+                } else {
 					if($this->formDef['auth'] == 'yes') {
-						if($primary_id != 0) {
-								$sql_update = substr($sql_update,0,-2);
-								$sql = "UPDATE ".$escape.$this->formDef['db_table'].$escape." SET ".$sql_update." WHERE ".$this->getAuthSQL('u')." AND ".$this->formDef['db_table_idx']." = ".$primary_id;
-								if($sql_ext_where != '') $sql .= " and ".$sql_ext_where;
-						} else {
-								$app->error("Primary ID fehlt!");
-						}
+                        if($primary_id != 0) {
+                                $sql_update = substr($sql_update,0,-2);
+                                $sql = "UPDATE ".$escape.$this->formDef['db_table'].$escape." SET ".$sql_update." WHERE ".$this->getAuthSQL('u')." AND ".$this->formDef['db_table_idx']." = ".$primary_id;
+                                if($sql_ext_where != '') $sql .= " and ".$sql_ext_where;
+                        } else {
+                                $app->error("Primary ID fehlt!");
+                        }
 					} else {
 						if($primary_id != 0) {
-								$sql_update = substr($sql_update,0,-2);
-								$sql = "UPDATE ".$escape.$this->formDef['db_table'].$escape." SET ".$sql_update." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;
-								if($sql_ext_where != '') $sql .= " and ".$sql_ext_where;
-						} else {
-								$app->error("Primary ID fehlt!");
-						}
+                                $sql_update = substr($sql_update,0,-2);
+                                $sql = "UPDATE ".$escape.$this->formDef['db_table'].$escape." SET ".$sql_update." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;
+                                if($sql_ext_where != '') $sql .= " and ".$sql_ext_where;
+                        } else {
+                                $app->error("Primary ID fehlt!");
+                        }
 					}
 					//* return a empty string if there is nothing to update
 					if(trim($sql_update) == '') $sql = '';
-				}
+                }
 
-				return $sql;
-		}
+                return $sql;
+        }
 
-		/**
-		* Debugging arrays.
-		*
-		* @param array_data
-		*/
-		function dbg($array_data) {
+        /**
+        * Debugging arrays.
+        *
+        * @param array_data
+        */
+        function dbg($array_data) {
 
-				echo "<pre>";
-				print_r($array_data);
-				echo "</pre>";
+                echo "<pre>";
+                print_r($array_data);
+                echo "</pre>";
 
-		}
+        }
 
 
-	function showForm() {
-			global $app,$conf;
+    function showForm() {
+            global $app,$conf;
 
-		if(!is_array($this->formDef)) die("Form Definition wurde nicht geladen.");
+        if(!is_array($this->formDef)) die("Form Definition wurde nicht geladen.");
 
-				$active_tab = $this->getNextTab();
+                $active_tab = $this->getNextTab();
 
-		// go trough the tabs
-		foreach( $this->formDef["tabs"] as $key => $tab) {
+        // go trough the tabs
+        foreach( $this->formDef["tabs"] as $key => $tab) {
 
-			$tab['name'] = $key;
+            $tab['name'] = $key;
 			// Translate the title of the tab
 			$tab['title'] = $this->lng($tab['title']);
+			
+            if($tab['name'] == $active_tab) {
 
-			if($tab['name'] == $active_tab) {
+                // If module is set, then set the template path relative to the module..
+                if($this->module != '') $tab["template"] = "../".$this->module."/".$tab["template"];
 
-				// If module is set, then set the template path relative to the module..
-				if($this->module != '') $tab["template"] = "../".$this->module."/".$tab["template"];
+                // Generate the template if it does not exist yet.
+				
+				
+								
+                if(!is_file($tab["template"])) {
+                     $app->uses('tform_tpl_generator');
+                     $app->tform_tpl_generator->buildHTML($this->formDef,$tab['name']);
+                }
+                $app->tpl->setVar('readonly_tab', (isset($tab['readonly']) && $tab['readonly'] == true));
+                $app->tpl->setInclude('content_tpl',$tab["template"]);
+                $tab["active"] = 1;
+                $_SESSION["s"]["form"]["tab"] = $tab['name'];
+            } else {
+                    $tab["active"] = 0;
+            }
 
-				// Generate the template if it does not exist yet.
+                        // Unset unused variables.
+                        unset($tab["fields"]);
+                        unset($tab["plugins"]);
 
+            $frmTab[] = $tab;
+        }
 
+        // setting form tabs
+        $app->tpl->setLoop("formTab", $frmTab);
 
-				if(!is_file($tab["template"])) {
-					 $app->uses('tform_tpl_generator');
-					 $app->tform_tpl_generator->buildHTML($this->formDef,$tab['name']);
-				}
-				$app->tpl->setVar('readonly_tab', (isset($tab['readonly']) && $tab['readonly'] == true));
-				$app->tpl->setInclude('content_tpl',$tab["template"]);
-				$tab["active"] = 1;
-				$_SESSION["s"]["form"]["tab"] = $tab['name'];
-			} else {
-					$tab["active"] = 0;
-			}
+                // Set form action
+                $app->tpl->setVar('form_action',$this->formDef["action"]);
+                $app->tpl->setVar('form_active_tab',$active_tab);
 
-						// Unset unused variables.
-						unset($tab["fields"]);
-						unset($tab["plugins"]);
+                // Set form title
+                $form_hint = $this->lng($this->formDef["title"]);
+                if($this->formDef["description"] != '') $form_hint .= '<div class="pageForm_description">'.$this->lng($this->formDef["description"]).'</div>';
+                $app->tpl->setVar('form_hint',$form_hint);
 
-			$frmTab[] = $tab;
-		}
+                // Set Wordbook for this form
 
-		// setting form tabs
-		$app->tpl->setLoop("formTab", $frmTab);
-
-				// Set form action
-				$app->tpl->setVar('form_action',$this->formDef["action"]);
-				$app->tpl->setVar('form_active_tab',$active_tab);
-
-				// Set form title
-				$form_hint = $this->lng($this->formDef["title"]);
-				if($this->formDef["description"] != '') $form_hint .= '<div class="pageForm_description">'.$this->lng($this->formDef["description"]).'</div>';
-				$app->tpl->setVar('form_hint',$form_hint);
-
-				// Set Wordbook for this form
-
-				$app->tpl->setVar($this->wordbook);
-		}
+                $app->tpl->setVar($this->wordbook);
+    	}
 
 		function getDataRecord($primary_id) {
 			global $app;
 			$escape = '`';
 			$sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id." AND ".$this->getAuthSQL('r',$this->formDef['db_table']);
-			return $app->db->queryOneRecord($sql);
+            return $app->db->queryOneRecord($sql);
 		}
+		
 
-
-		function datalogSave($action,$primary_id, $record_old, $record_new) {
-				global $app,$conf;
-
+        function datalogSave($action,$primary_id, $record_old, $record_new) {
+                global $app,$conf;
+				
 				$app->db->datalogSave($this->formDef['db_table'], $action, $this->formDef['db_table_idx'], $primary_id, $record_old, $record_new);
 				return true;
-<<<<<<< .mine
-				/*
-				// Add backticks for incomplete table names.
-				if(stristr($this->formDef['db_table'],'.')) {
-						$escape = '';
-				} else {
-						$escape = '`';
-				}
+        }
 
-				$this->diffrec = array();
-
-				// Full diff records for ISPConfig, they have a different format then the simple diffrec
-				$diffrec_full = array();
-
-				if(is_array($record_old) && count($record_old) > 0) {
-						foreach($record_old as $key => $val) {
-								//if(isset($record_new[$key]) && $record_new[$key] != $val) {
-								if(!isset($record_new[$key]) || $record_new[$key] != $val) {
-									// Record has changed
-									$diffrec_full['old'][$key] = $val;
-									$diffrec_full['new'][$key] = $record_new[$key];
-									$this->diffrec[$key] = array(	'new' => $record_new[$key],
-															   		'old' => $val);
-								} else {
-									$diffrec_full['old'][$key] = $val;
-									$diffrec_full['new'][$key] = $val;
-								}
-						}
-				} elseif(is_array($record_new)) {
-						foreach($record_new as $key => $val) {
-								if(isset($record_new[$key]) && $record_old[$key] != $val) {
-									// Record has changed
-									$diffrec_full['new'][$key] = $val;
-									$diffrec_full['old'][$key] = $record_old[$key];
-									$this->diffrec[$key] = array(	'old' => @$record_old[$key],
-															   		'new' => $val);
-								} else {
-									$diffrec_full['new'][$key] = $val;
-									$diffrec_full['old'][$key] = $val;
-								}
-						}
-				}
-
-				//$this->diffrec = $diffrec;
-				// Insert the server_id, if the record has a server_id
-				$server_id = (isset($record_old["server_id"]) && $record_old["server_id"] > 0)?$record_old["server_id"]:0;
-				if(isset($record_new["server_id"])) $server_id = $record_new["server_id"];
-
-				if(count($this->diffrec) > 0) {
-						$diffstr = addslashes(serialize($diffrec_full));
-						$username = $app->db->quote($_SESSION["s"]["user"]["username"]);
-						$dbidx = $this->formDef['db_table_idx'].":".$primary_id;
-						// $action = ($action == 'INSERT')?'i':'u';
-
-						if($action == 'INSERT') $action = 'i';
-						if($action == 'UPDATE') $action = 'u';
-						if($action == 'DELETE') $action = 'd';
-						$sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('".$this->formDef['db_table']."','$dbidx','$server_id','$action','".time()."','$username','$diffstr')";
-						$app->db->query($sql);
-				}
-
-				return true;
-				*/
-
-=======>>>>>>> .theirs		}
-
-		function getAuthSQL($perm, $table = '') {
+        function getAuthSQL($perm, $table = '') {
 				if($_SESSION["s"]["user"]["typ"] == 'admin') {
 					return '1';
 				} else {
 					if ($table != ''){
 						$table = ' ' . $table . '.';
 					}
-					$groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0;
+                	$groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0;
 					$sql = '(';
-					$sql .= "(" . $table . "sys_userid = ".$_SESSION["s"]["user"]["userid"]." AND " . $table . "sys_perm_user like '%$perm%') OR  ";
-					$sql .= "(" . $table . "sys_groupid IN (".$groups.") AND " . $table ."sys_perm_group like '%$perm%') OR ";
-					$sql .= $table . "sys_perm_other like '%$perm%'";
-					$sql .= ')';
+                	$sql .= "(" . $table . "sys_userid = ".$_SESSION["s"]["user"]["userid"]." AND " . $table . "sys_perm_user like '%$perm%') OR  ";
+                	$sql .= "(" . $table . "sys_groupid IN (".$groups.") AND " . $table ."sys_perm_group like '%$perm%') OR ";
+                	$sql .= $table . "sys_perm_other like '%$perm%'";
+                	$sql .= ')';
 
-					return $sql;
+                	return $sql;
 				}
-		}
+        }
 
-		/*
-		This function checks if a user has the parmissions $perm for the data record with the ID $record_id
-		If record_id = 0, the the permissions are tested against the defaults of the form file.
-		*/
-		function checkPerm($record_id,$perm) {
-				global $app;
+        /*
+        This function checks if a user has the parmissions $perm for the data record with the ID $record_id
+        If record_id = 0, the the permissions are tested against the defaults of the form file.
+        */
+        function checkPerm($record_id,$perm) {
+                global $app;
 
-				if($record_id > 0) {
-						// Add backticks for incomplete table names.
-						if(stristr($this->formDef['db_table'],'.')) {
-								$escape = '';
-						} else {
-								$escape = '`';
-						}
+                if($record_id > 0) {
+                        // Add backticks for incomplete table names.
+                        if(stristr($this->formDef['db_table'],'.')) {
+                                $escape = '';
+                        } else {
+                                $escape = '`';
+                        }
 
-						$sql = "SELECT ".$this->formDef['db_table_idx']." FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$record_id." AND ".$this->getAuthSQL($perm);
-						if($record = $app->db->queryOneRecord($sql)) {
-								return true;
-						} else {
-								return false;
-						}
-				} else {
-						$result = false;
-						if(@$this->formDef["auth_preset"]["userid"] == $_SESSION["s"]["user"]["userid"] && stristr($perm,$this->formDef["auth_preset"]["perm_user"])) $result = true;
-						if(@$this->formDef["auth_preset"]["groupid"] == $_SESSION["s"]["user"]["groupid"] && stristr($perm,$this->formDef["auth_preset"]["perm_group"])) $result = true;
-						if(@stristr($this->formDef["auth_preset"]["perm_other"],$perm)) $result = true;
+                        $sql = "SELECT ".$this->formDef['db_table_idx']." FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$record_id." AND ".$this->getAuthSQL($perm);
+                        if($record = $app->db->queryOneRecord($sql)) {
+                                return true;
+                        } else {
+                                return false;
+                        }
+                } else {
+                        $result = false;
+                        if(@$this->formDef["auth_preset"]["userid"] == $_SESSION["s"]["user"]["userid"] && stristr($perm,$this->formDef["auth_preset"]["perm_user"])) $result = true;
+                        if(@$this->formDef["auth_preset"]["groupid"] == $_SESSION["s"]["user"]["groupid"] && stristr($perm,$this->formDef["auth_preset"]["perm_group"])) $result = true;
+                        if(@stristr($this->formDef["auth_preset"]["perm_other"],$perm)) $result = true;
 
-						// if preset == 0, everyone can insert a record of this type
-						if($this->formDef["auth_preset"]["userid"] == 0 AND $this->formDef["auth_preset"]["groupid"] == 0 AND (@stristr($this->formDef["auth_preset"]["perm_user"],$perm) OR @stristr($this->formDef["auth_preset"]["perm_group"],$perm))) $result = true;
+                        // if preset == 0, everyone can insert a record of this type
+                        if($this->formDef["auth_preset"]["userid"] == 0 AND $this->formDef["auth_preset"]["groupid"] == 0 AND (@stristr($this->formDef["auth_preset"]["perm_user"],$perm) OR @stristr($this->formDef["auth_preset"]["perm_group"],$perm))) $result = true;
 
-						return $result;
+                        return $result;
 
-				}
+                }
 
-		}
+        }
 
-		function getNextTab() {
-				// Which tab is shown
-				if($this->errorMessage == '') {
-					// If there is no error
-					if(isset($_REQUEST["next_tab"]) && $_REQUEST["next_tab"] != '') {
-								// If the next tab is known
-								$active_tab = $_REQUEST["next_tab"];
-					} else {
-						// else use the default tab
-						$active_tab = $this->formDef['tab_default'];
-					}
-				} else {
-					// Show the same tab again in case of an error
-					$active_tab = $_SESSION["s"]["form"]["tab"];
-				}
+        function getNextTab() {
+                // Which tab is shown
+                if($this->errorMessage == '') {
+                    // If there is no error
+                    if(isset($_REQUEST["next_tab"]) && $_REQUEST["next_tab"] != '') {
+                                // If the next tab is known
+                                $active_tab = $_REQUEST["next_tab"];
+                    } else {
+                        // else use the default tab
+                        $active_tab = $this->formDef['tab_default'];
+                    }
+                } else {
+                    // Show the same tab again in case of an error
+                    $active_tab = $_SESSION["s"]["form"]["tab"];
+                }
 
-				return $active_tab;
-		}
+                return $active_tab;
+        }
 
-		function getCurrentTab() {
-				return $_SESSION["s"]["form"]["tab"];
-		}
-
+        function getCurrentTab() {
+                return $_SESSION["s"]["form"]["tab"];
+        }
+		
 		function isReadonlyTab($tab, $primary_id) {
 			global $app, $conf;
-
+			
 			// Add backticks for incomplete table names.
-			if(stristr($this->formDef['db_table'],'.')) {
-				$escape = '';
-			} else {
-				$escape = '`';
-			}
-
+            if(stristr($this->formDef['db_table'],'.')) {
+                $escape = '';
+            } else {
+                $escape = '`';
+            }
+			
 			$sql = "SELECT sys_userid FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;
-			$record = $app->db->queryOneRecord($sql);
-
+            $record = $app->db->queryOneRecord($sql);
+			
 			// return true if the readonly flag of the form is set and the current loggedin user is not the owner of the record.
 			if(isset($this->formDef['tabs'][$tab]['readonly']) && $this->formDef['tabs'][$tab]['readonly'] == true && $record['sys_userid'] != $_SESSION["s"]["user"]["userid"]) {
 				return true;
 			} else {
 				return false;
 			}
-		}
-
-
+        }
+		
+		
 		// translation function for forms, tries the form wordbook first and if this fails, it tries the global wordbook
 		function lng($msg) {
 			global $app,$conf;
-
+			
 			if(isset($this->wordbook[$msg])) {
 				return $this->wordbook[$msg];
 			} else {
 				return $app->lng($msg);
 			}
-
+			
 		}
-
+		
 		function checkClientLimit($limit_name,$sql_where = '') {
 			global $app;
-
+			
 			$check_passed = true;
 			$limit_name = $app->db->quote($limit_name);
 			if($limit_name == '') $app->error('Limit name missing in function checkClientLimit.');
-
+			
 			// Get the limits of the client that is currently logged in
 			$client_group_id = $_SESSION["s"]["user"]["default_group"];
 			$client = $app->db->queryOneRecord("SELECT $limit_name as number, parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
+			
 			// Check if the user may add another item
 			if($client["number"] >= 0) {
 				$sql = "SELECT count(".$this->formDef['db_table_idx'].") as number FROM ".$this->formDef['db_table']." WHERE ".$this->getAuthSQL('u');
@@ -1463,33 +1401,33 @@
 				$tmp = $app->db->queryOneRecord($sql);
 				if($tmp["number"] >= $client["number"]) $check_passed = false;
 			}
-
+			
 			return $check_passed;
 		}
-
+		
 		function checkResellerLimit($limit_name,$sql_where = '') {
 			global $app;
-
+			
 			$check_passed = true;
 			$limit_name = $app->db->quote($limit_name);
 			if($limit_name == '') $app->error('Limit name missing in function checkClientLimit.');
-
+			
 			// Get the limits of the client that is currently logged in
 			$client_group_id = $_SESSION["s"]["user"]["default_group"];
 			$client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
+			
 			//* If the client belongs to a reseller, we will check against the reseller Limit too
 			if($client['parent_client_id'] != 0) {
-
+				
 				//* first we need to know the groups of this reseller
 				$tmp = $app->db->queryOneRecord("SELECT userid, groups FROM sys_user WHERE client_id = ".$client['parent_client_id']);
 				$reseller_groups = $tmp["groups"];
 				$reseller_userid = $tmp["userid"];
-
+				
 				// Get the limits of the reseller of the logged in client
 				$client_group_id = $_SESSION["s"]["user"]["default_group"];
 				$reseller = $app->db->queryOneRecord("SELECT $limit_name as number FROM client WHERE client_id = ".$client['parent_client_id']);
-
+			
 				// Check if the user may add another item
 				if($reseller["number"] >= 0) {
 					$sql = "SELECT count(".$this->formDef['db_table_idx'].") as number FROM ".$this->formDef['db_table']." WHERE (sys_groupid IN (".$reseller_groups.") or sys_userid = ".$reseller_userid.")";
@@ -1498,13 +1436,13 @@
 					if($tmp["number"] >= $reseller["number"]) $check_passed = false;
 				}
 			}
-
+			
 			return $check_passed;
 		}
-
+		
 		//* get the difference record of two arrays
 		function getDiffRecord($record_old,$record_new) {
-
+			
 			if(is_array($record_new) && count($record_new) > 0) {
 			foreach($record_new as $key => $val) {
 				if(@$record_old[$key] != $val) {
@@ -1523,17 +1461,17 @@
 					}
 				}
 			return $diffrec;
-
+		
 		}
-
+		
 		/**
 		 * Generate HTML for DATETIME fields.
-		 *
+		 * 
 		 * @access private
 		 * @param string $form_element Name of the form element.
 		 * @param string $default_value Selected value for fields.
 		 * @param bool $display_secons Include seconds selection.
-		 * @return string HTML
+		 * @return string HTML	
 		 */
 		function _getDateTimeHTML($form_element, $default_value, $display_seconds=false)
 		{
@@ -1541,54 +1479,54 @@
 			$_showdate = ($_datetime === false) ? false : true;
 
 			$dselect = array('day','month','year','hour','minute');
-			if ($display_seconds === true) {
+            if ($display_seconds === true) {
 			 	$dselect[] = 'second';
 			}
-
+			 
 			$out = '';
-
+			 
 			foreach ($dselect as $dt_element)
 			{
 			 	$dt_options = array();
 			 	$dt_space = 1;
-
+			 	
 			 	switch ($dt_element) {
 			 		case 'day':
 					 	for ($i = 1; $i <= 31; $i++) {
-							$dt_options[] = array('name' =>  sprintf('%02d', $i),
-												  'value' => sprintf('%d', $i));
-						}
-						$selected_value = date('d', $_datetime);
+				            $dt_options[] = array('name' =>  sprintf('%02d', $i),
+				            					  'value' => sprintf('%d', $i));
+				        }
+				        $selected_value = date('d', $_datetime);
 			 			break;
-
+			 			
 			 		case 'month':
 				 		for ($i = 1; $i <= 12; $i++) {
-							$dt_options[] = array('name' => strftime('%b', mktime(0, 0, 0, $i, 1, 2000)),
-												  'value' => strftime('%m', mktime(0, 0, 0, $i, 1, 2000)));
-						}
-						$selected_value = date('n', $_datetime);
+				            $dt_options[] = array('name' => strftime('%b', mktime(0, 0, 0, $i, 1, 2000)),
+				            					  'value' => strftime('%m', mktime(0, 0, 0, $i, 1, 2000)));
+				        }
+				        $selected_value = date('n', $_datetime);
 			 			break;
-
+			 			
 			 		case 'year':
 					 	$start_year = strftime("%Y");
 						$years = range((int)$start_year, (int)($start_year+3));
-
-						foreach ($years as $year) {
-							$dt_options[] = array('name' => $year,
-												 'value' => $year);
-						}
-						$selected_value = date('Y', $_datetime);
-						$dt_space = 2;
+				        
+				        foreach ($years as $year) {
+				        	$dt_options[] = array('name' => $year,
+				            					 'value' => $year);
+				        }
+				        $selected_value = date('Y', $_datetime);
+				        $dt_space = 2;
 			 			break;
-
+			 			
 			 		case 'hour':
 			 			foreach(range(0, 23) as $hour) {
 			 				$dt_options[] = array('name' =>  sprintf('%02d', $hour),
-												  'value' => sprintf('%d', $hour));
+            			    					  'value' => sprintf('%d', $hour));
 			 			}
 			 			$selected_value = date('G', $_datetime);
 			 			break;
-
+			 			
 			 		case 'minute':
 			 			foreach(range(0, 59) as $minute) {
 			 				if (($minute % 5) == 0) {
@@ -1598,23 +1536,23 @@
 			 			}
 			 			$selected_value = (int)floor(date('i', $_datetime));
 			 			break;
-
-			 		case 'second':
+			 			
+			 		case 'second':	
 			 			foreach(range(0, 59) as $second) {
 			 				$dt_options[] = array('name' =>  sprintf('%02d', $second),
-								  				  'value' => sprintf('%d', $second));
+							      				  'value' => sprintf('%d', $second));
 			 			}
 			 			$selected_value = (int)floor(date('s', $_datetime));
 			 			break;
 			 	}
-
+					 	
 				$out .= "<select name=\"".$form_element."[$dt_element]\" id=\"".$form_element."_$dt_element\" class=\"selectInput\" style=\"width: auto; float: none;\">";
 				if (!$_showdate) {
 					$out .= "<option value=\"-\" selected=\"selected\">--</option>" . PHP_EOL;
 				} else {
 					$out .= "<option value=\"-\">--</option>" . PHP_EOL;
 				}
-
+				 
 				foreach ($dt_options as $dt_opt) {
 					if ( $_showdate && ($selected_value == $dt_opt['value']) ) {
 						$out .= "<option value=\"{$dt_opt['value']}\" selected=\"selected\">{$dt_opt['name']}</option>" . PHP_EOL;
@@ -1622,10 +1560,10 @@
 						$out .= "<option value=\"{$dt_opt['value']}\">{$dt_opt['name']}</option>" . PHP_EOL;
 					}
 				}
-
+												        
 				$out .= '</select>' . str_repeat('&nbsp;', $dt_space);
 			}
-
+			
 			return $out;
 		}
 }

--
Gitblit v1.9.1