From 5ca959fa688255a8de61f89fe2751eb4d24a6912 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 22 Mar 2016 09:22:07 -0400
Subject: [PATCH] fixed typo

---
 interface/lib/classes/remoting_lib.inc.php | 1143 ++++++++++++--------------------------------------------
 1 files changed, 257 insertions(+), 886 deletions(-)

diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 47660f7..1299080 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -35,923 +35,294 @@
 */
 
 /**
-* Formularbehandlung
-*
-* Functions to validate, display and save form values
-*
-*        Database table field definitions
-*
-*        Datatypes:
-*        - INTEGER (Converts data to int automatically)
-*        - DOUBLE
-*        - CURRENCY (Formats digits in currency notation)
-*        - VARCHAR (No format check)
-*        - DATE (Date format, converts from and to UNIX timestamps automatically)
-*
-*        Formtype:
-*        - TEXT (Normal text field)
-*        - PASSWORD (password field, the content will not be displayed again to the user)
-*        - SELECT (Option fiield)
-*        - MULTIPLE (Allows selection of multiple values)
-*
-*        VALUE:
-*        - Value or array
-*
-*        SEPARATOR
-*        - separator char used for fileds with multiple values
-*
-*        Hint: The auto increment (ID) filed of the table has not be be definied separately.
-*
-*/
+ * Formularbehandlung
+ *
+ * Functions to validate, display and save form values
+ *
+ *        Database table field definitions
+ *
+ *        Datatypes:
+ *        - INTEGER (Converts data to int automatically)
+ *        - DOUBLE
+ *        - CURRENCY (Formats digits in currency notation)
+ *        - VARCHAR (No format check)
+ *        - DATE (Date format, converts from and to UNIX timestamps automatically)
+ *
+ *        Formtype:
+ *        - TEXT (Normal text field)
+ *        - PASSWORD (password field, the content will not be displayed again to the user)
+ *        - SELECT (Option fiield)
+ *        - MULTIPLE (Allows selection of multiple values)
+ *
+ *        VALUE:
+ *        - Value or array
+ *
+ *        SEPARATOR
+ *        - separator char used for fileds with multiple values
+ *
+ *        Hint: The auto increment (ID) filed of the table has not be be definied separately.
+ *
+ */
 
-class remoting_lib {
-	
-        /**
-        * Definition of the database table (array)
-        * @var tableDef
-        */
-        private $tableDef;
 
-        /**
-        * Private
-        * @var action
-        */
-        private $action;
+global $app;
+$app->load('tform_base');
+class remoting_lib extends tform_base {
 
-        /**
-        * Table name (String)
-        * @var table_name
-        */
-        private $table_name;
 
-        /**
-        * Debug Variable
-        * @var debug
-        */
-        private $debug = 0;
+	// additional class variables
+	var $sys_username;
+	var $sys_userid;
+	var $sys_default_group;
+	var $sys_groups;
+	var $client_id;
+	var $dataRecord;
 
-        /**
-        * name of the primary field of the database table (string)
-        * @var table_index
-        */
-        var $table_index;
 
-        /**
-        * contains the error messages
-        * @var errorMessage
-        */
-        var $errorMessage = '';
+	//* Load the form definition from file. - special version for remoting
+	// module parameter is only for compatibility with base class
+	function loadFormDef($file, $module = '') {
+		global $app, $conf;
 
-        var $dateformat = "d.m.Y";
-    	var $formDef = array();
-        var $wordbook;
-        var $module;
-        var $primary_id;
-		var $diffrec = array();
-		
-		var $sys_username;
-		var $sys_userid;
-		var $sys_default_group;
-		var $sys_groups;
-		var $client_id;
+		include $file;
 
-		
-		//* Load the form definition from file.
-    	function loadFormDef($file) {
-			global $app,$conf;
-            
-			include($file);
-				
-			$this->formDef = $form;
-			unset($this->formDef['tabs']);
-                
-			//* Copy all fields from all tabs into one form definition
-			foreach($form['tabs'] as $tab) {
-				foreach($tab['fields'] as $key => $value) {
-					$this->formDef['fields'][$key] = $value;
-				}
+		$this->formDef = $form;
+		unset($this->formDef['tabs']);
+
+		//* Copy all fields from all tabs into one form definition
+		foreach($form['tabs'] as $tab) {
+			foreach($tab['fields'] as $key => $value) {
+				$this->formDef['fields'][$key] = $value;
 			}
-			unset($form);
-				
-            return true;
-        }
-		
-		//* Load the user profile
-		function loadUserProfile($client_id_param = 0) {
-			global $app,$conf;
+		}
+		unset($form);
 
-			$this->client_id = $app->functions->intval($client_id_param);
-            
-			if($this->client_id == 0) {
-				$this->sys_username         = 'admin';
-				$this->sys_userid            = 1;
-				$this->sys_default_group     = 1;
-				$this->sys_groups            = 1;
-				$_SESSION["s"]["user"]["typ"] = 'admin';
-			} else {
-				//* load system user - try with sysuser and before with userid (workarrond)
-				/*
-				$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE sysuser_id = $client_id");
-				if(empty($user["userid"])) {
-						$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = $client_id");		
-						if(empty($user["userid"])) {
-								$this->errorMessage .= "No sysuser with the ID $client_id found.";
-								return false;
-						}
-				}*/
-				
-				$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE client_id = $client_id");
-				$this->sys_username         = $user['username'];
-				$this->sys_userid            = $user['userid'];
-				$this->sys_default_group     = $user['default_group'];
-				$this->sys_groups             = $user['groups'];
-				// $_SESSION["s"]["user"]["typ"] = $user['typ'];
-				// we have to force admin priveliges for the remoting API as some function calls might fail otherwise.
-				$_SESSION["s"]["user"]["typ"] = 'admin';
-			}
+		$this->dateformat = $app->lng('conf_format_dateshort');
 
 		return true;
-	    }  
+	}
 
+	//* Load the user profile
+	function loadUserProfile($client_id_param = 0) {
+		global $app, $conf;
 
-        /**
-        * 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) {
-                $new_record = '';
-				if(is_array($record)) {
-                        foreach($this->formDef['fields'] as $key => $field) {
-                                switch ($field['datatype']) {
-                                case 'VARCHAR':
-                                        $new_record[$key] = stripslashes($record[$key]);
-                                break;
+		$client_login = false;
+		if(isset($_SESSION['client_login']) && isset($_SESSION['client_sys_userid']) && $_SESSION['client_login'] == 1) {
+			$client_sys_userid = $app->functions->intval($_SESSION['client_sys_userid']);
 
-                                case 'TEXT':
-                                        $new_record[$key] = stripslashes($record[$key]);
-                                break;
+			$client = $app->db->queryOneRecord("SELECT client.client_id FROM sys_user, client WHERE sys_user.client_id = client.client_id and sys_user.userid = ?", $client_sys_userid);
 
-                                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') {
-												$tmp = explode('-',$record[$key]);
-                                                $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 'DOUBLE':
-                                        $new_record[$key] = $record[$key];
-                                break;
-
-                                case 'CURRENCY':
-                                        $new_record[$key] = $app->functions->currency_format($record[$key]);
-                                break;
-
-                                default:
-                                        $new_record[$key] = stripslashes($record[$key]);
-                                }
-                        }
-
-                }
-				
-        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
-        */
-
-        function getDatasourceData($field, $record) {
-                global $app;
-
-                $values = array();
-
-                if($field["datasource"]["type"] == 'SQL') {
-
-                        // Preparing SQL string. We will replace some
-                        // common placeholders
-                        $querystring = $field["datasource"]["querystring"];
-                        $querystring = str_replace("{USERID}",$this->sys_userid,$querystring);
-                        $querystring = str_replace("{GROUPID}",$this->sys_default_group,$querystring);
-                        $querystring = str_replace("{GROUPS}",$this->sys_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);
-						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];
-                                }
-                        }
-                }
-
-                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";
-                        }
-                }
-
-                return $values;
-
-        }
-
-        /**
-        /**
-        * 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,$dbencode = true) {
-		global $app;
-                if(is_array($record)) {
-                        foreach($this->formDef['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'], 'SAVE');
-								}
-								
-								//* Validate record value
-								if(isset($field['validators']) && is_array($field['validators'])) {
-									$this->validateField($key, (isset($record[$key]))?$record[$key]:'', $field['validators']);
-								}
-
-                                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 {
-											$new_record[$key] = 0;
-										}
-                                break;
-								case 'DATE':
-                                        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]);
-													$new_record[$key] = $date_parts['year'].'-'.$date_parts['month'].'-'.$date_parts['day'];
-													//$tmp = strptime($record[$key],$this->dateformat);
-													//$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
-												} else {
-													//$tmp = strptime($record[$key],$this->dateformat);
-													//$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
-													$tmp = strtotime($record[$key]);
-													$new_record[$key] = date('Y-m-d',$tmp);
-												}
-                                        } else {
-											$new_record[$key] = '0000-00-00';
-										}
-                                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;
-                                
-                                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 .= $errmsg."\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;
-        }
-		
-		/**
-        * 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
-        */
-
-        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) {
-					switch ($filter['type']) {
-						case 'TOLOWER':
-							$returnval = strtolower($field_value);
-						break;
-						case 'TOUPPER':
-							$returnval = strtoupper($field_value);
-						break;
-						case 'IDNTOASCII':
-							$returnval = $app->functions->idn_encode($field_value);
-						break;
-						case 'IDNTOUTF8':
-							$returnval = $app->functions->idn_decode($field_value);
-						break;
-						default:
-							$this->errorMessage .= "Unknown Filter: ".$filter['type'];
-						break;
-					}
-				}
-			}
-
-			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
-        */
-
-        function validateField($field_name, $field_value, $validators) {
-
-                global $app;
-				
-				$escape = '`';
-				
-                // 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";
-												} else {
-													$this->errorMessage .= $errmsg."<br />\r\n";
-												}
-                                        }
-                                break;
-                                case 'UNIQUE':
-                                        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'];
-														if(isset($this->wordbook[$errmsg])) {
-                                                        	$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";
-														} 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";
-												} else {
-													$this->errorMessage .= $errmsg."<br />\r\n";
-												}
-                                        }
-                                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";
-											} 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";
-												} else {
-													$this->errorMessage .= $errmsg."<br />\r\n";
-												}
-                                        }
-									}
-                                break;
-                                case 'ISINT':
-									if(function_exists('filter_var')) {
-										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";
-											} 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";
-												} 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";
-										  } else {
-											 $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)){
-								$groups=explode(".",$field_value);
-								foreach($groups as $group){
-									if($group<0 OR $group>255)
-									$vip=0;
-								}
-								}else{$vip=0;}
-                                        if($vip==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 'ISIP':
-								//* Check if its a IPv4 or IPv6 address
-								if(function_exists('filter_var')) {
-									if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
-										$errmsg = $validator['errmsg'];
-										if(isset($this->wordbook[$errmsg])) {
-											$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
-										} else {
-											$this->errorMessage .= $errmsg."<br />\r\n";
-										}
-									}
-								} else {
-									//* Check content with regex, if we use php < 5.2
-									$ip_ok = 0;
-									if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
-										$ip_ok = 1;
-									}
-									if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
-										$ip_ok = 1;
-									}
-									if($ip_ok == 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 'RANGE':
-                                        //* 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]) {
-											$ok = false;
-										}
-										if($range_parts[1] != '' && $field_value > $range_parts[1]) {
-											$ok = false;
-										}
-										if($ok != true) {
-											$errmsg = $validator['errmsg'];
-											if(isset($this->wordbook[$errmsg])) {
-												$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
-											} 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;
-								default:
-									$this->errorMessage .= "Unknown Validator: ".$validator['type'];
-								break;
-                        }
-
-
-                }
-
-                return true;
-        }
-
-        /**
-        * Create SQL statement
-        *
-        * @param record = Datensatz als Array
-        * @param action = INSERT oder UPDATE
-        * @param primary_id
-        * @return record
-        */
-        function getSQL($record, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '') {
-
-                global $app;
-
-                $this->action = $action;
-                $this->primary_id = $primary_id;
-
-                $record = $this->encode($record,true);
-                $sql_insert_key = '';
-                $sql_insert_val = '';
-                $sql_update = '';
-
-                if(!is_array($this->formDef)) $app->error("Form definition not found.");
-
-                // go trough all fields of the tab
-                if(is_array($record)) {
-                foreach($this->formDef['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') {
-																$sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
-														} elseif ($field['encryption'] == 'CLEARTEXT') {
-																$sql_insert_val .= "'".$app->db->quote($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`, ";
-														if($record[$key] == '') {
-															// if a checkbox is not set, we set it to the unchecked value
-															$sql_insert_val .= "'".$field['value'][0]."', ";
-															$record[$key] = $field['value'][0];
-														} else {
-															$sql_insert_val .= "'".$record[$key]."', ";
-														}
-                                                } 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]));
-																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
-														} elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
-																$sql_update .= "`$key` = PASSWORD('".$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]));
-																$sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
-                                                        }
-                                                        
-                                                } 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]."', ";
-															$record[$key] = $field['value'][0];
-														} 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 
-									// that the password has not been changed
-								    unset($record[$key]);
-								}
-                        }
-        }
-
-
-                // 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"]."', ":"'".$this->sys_userid."', ";
-                                $sql_insert_key .= "`sys_groupid`, ";
-                                $sql_insert_val .= ($this->formDef["auth_preset"]["groupid"] > 0)?"'".$this->formDef["auth_preset"]["groupid"]."', ":"'".$this->sys_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($primary_id != 0) {
-                                // update client permissions only if client_id > 0
-								if($this->formDef['auth'] == 'yes' && $this->client_id > 0) {
-									$sql_update .= '`sys_userid` = '.$this->sys_userid.', ';
-									$sql_update .= '`sys_groupid` = '.$this->sys_default_group.', ';
-								}
-								$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 $sql;
-        }
-		
-		function getDeleteSQL($primary_id) {
-			
-			if(stristr($this->formDef['db_table'],'.')) {
-				$escape = '';
-			} else {
-				$escape = '`';
-			}
-			
-			$sql = "DELETE FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;
-			return $sql;
+			$this->client_id = $client['client_id'];
+			$client_login = true;
+		} else {
+			$this->client_id = $app->functions->intval($client_id_param);
 		}
 
+		if($this->client_id == 0) {
+			$this->sys_username         = 'admin';
+			$this->sys_userid            = 1;
+			$this->sys_default_group     = 1;
+			$this->sys_groups            = 1;
+			$_SESSION["s"]["user"]["typ"] = 'admin';
+		} else {
+			$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE client_id = ?", $this->client_id);
+			$this->sys_username         = $user['username'];
+			$this->sys_userid            = $user['userid'];
+			$this->sys_default_group     = $user['default_group'];
+			$this->sys_groups             = $user['groups'];
+			// we have to force admin priveliges for the remoting API as some function calls might fail otherwise.
+			if($client_login == false) $_SESSION["s"]["user"]["typ"] = 'admin';
+		}
 
-		function getDataRecord($primary_id) {
-			global $app;
+		$_SESSION["s"]["user"]["username"] = $this->sys_username;
+		$_SESSION["s"]["user"]["userid"] = $this->sys_userid;
+		$_SESSION["s"]["user"]["default_group"] = $this->sys_default_group;
+		$_SESSION["s"]["user"]["groups"] = $this->sys_groups;
+		$_SESSION["s"]["user"]["client_id"] = $this->client_id;
+
+		return true;
+	}
+
+
+	/**
+	 * Converts the data in the array to human readable format
+	 * Datatype conversion e.g. to show the data in lists
+	 * tab parameter is only there for compatibility with params of base class
+	 *
+	 * @param record
+	 * @return record
+	 */
+	function decode($record, $tab = '') {
+		return $this->_decode($record, '', true);
+	}
+
+
+	/**
+	 * Get the key => value array of a form filled from a datasource definitiom
+	 * dummy parameter is only there for compatibility with params of base class
+	 *
+	 * @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, $dummy = '') {
+		return $this->_getDatasourceData($field, $record, 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) {
+		$new_record = $this->_encode($record, '', $dbencode, true);
+		if(isset($record['_ispconfig_pw_crypted'])) $new_record['_ispconfig_pw_crypted'] = $record['_ispconfig_pw_crypted']; // this one is not in form definitions!
+
+		return $new_record;
+	}
+
+
+	/**
+	 * Create SQL statement
+	 * dummy parameter is only there for compatibility with params of base class
+	 *
+	 * @param record = Datensatz als Array
+	 * @param action = INSERT oder UPDATE
+	 * @param primary_id
+	 * @return record
+	 */
+	function getSQL($record, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '', $dummy = '') {
+
+		global $app;
+
+		if(!is_array($this->formDef)) $app->error("Form definition not found.");
+		$this->dataRecord = $record;
+
+		return $this->_getSQL($record, '', $action, $primary_id, $sql_ext_where, true);
+	}
+
+	function getDeleteSQL($primary_id) {
+
+		if(stristr($this->formDef['db_table'], '.')) {
+			$escape = '';
+		} else {
 			$escape = '`';
-			if(@is_numeric($primary_id)) {
-				$sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;
-            	return $app->db->queryOneRecord($sql);
-			} elseif (@is_array($primary_id)) {
-				$sql_where = '';
-				foreach($primary_id as $key => $val) {
-					$key = $app->db->quote($key);
-					$val = $app->db->quote($val);
-					if(stristr($val,'%')) {
-						$sql_where .= "$key like '$val' AND ";
-					} else {
-						$sql_where .= "$key = '$val' AND ";
-					}
-				}
-				$sql_where = substr($sql_where,0,-5);
-				$sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$sql_where;
-				return $app->db->queryAllRecords($sql);
+		}
+
+		$sql = "DELETE FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id. " AND " . $this->getAuthSQL('d', $this->formDef['db_table']);
+		return $sql;
+	}
+
+	function getDataRecord($primary_id) {
+		global $app;
+		$escape = '`';
+		$this->loadUserProfile();
+		if(@is_numeric($primary_id)) {
+			if($primary_id > 0) {
+				// Return a single record
+				return parent::getDataRecord($primary_id);
+			} elseif($primary_id == -1) {
+				// Return a array with all records
+				$sql = "SELECT * FROM ??";
+				return $app->db->queryAllRecords($sql, $this->formDef['db_table']);
 			} else {
-				$this->errorMessage = 'The ID must be either an integer or an array.';
+				throw new SoapFault('invalid_id', 'The ID has to be > 0 or -1.');
 				return array();
 			}
-			
-			
-		}
-
-		function ispconfig_sysuser_add($params,$insert_id){
-			global $conf,$app,$sql1;
-			$username = $app->db->quote($params["username"]);
-			$password = $app->db->quote($params["password"]);
-			if(!isset($params['modules'])) {
-				$modules = $conf['interface_modules_enabled'];
-			} else {
-				$modules = $app->db->quote($params['modules']);
-			}
-			if(!isset($params['startmodule'])) {			
-				$startmodule = 'dashboard';
-			} else {						
-				$startmodule = $app->db->quote($params["startmodule"]);
-				if(!preg_match('/'.$startmodule.'/',$modules)) {
-					$_modules = explode(',',$modules);
-					$startmodule=$_modules[0];
+		} elseif (@is_array($primary_id) || @is_object($primary_id)) {
+			if(@is_object($primary_id)) $primary_id = get_object_vars($primary_id); // do not use cast (array)xxx because it returns private and protected properties!
+			$sql_offset = 0;
+			$sql_limit = 0;
+			$sql_where = '';
+			$params = array($this->formDef['db_table']);
+			foreach($primary_id as $key => $val) {
+				if($key == '#OFFSET#') $sql_offset = $app->functions->intval($val);
+				elseif($key == '#LIMIT#') $sql_limit = $app->functions->intval($val);
+				elseif(stristr($val, '%')) {
+					$sql_where .= "?? like ? AND ";
+				} else {
+					$sql_where .= "?? = ? AND ";
 				}
+				$params[] = $key;
+				$params[] = $val;
 			}
-			$usertheme = $app->db->quote($params["usertheme"]);
-			$type = 'user';
-			$active = 1;
-			$insert_id = $app->functions->intval($insert_id);
-			$language = $app->db->quote($params["language"]);
-			$groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('$username','','$insert_id')", 'groupid');
-			$groups = $groupid;
-			$password = $app->auth->crypt_password(stripslashes($password));
-			$sql1 = "INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id)
-			VALUES ('$username','$password','$modules','$startmodule','$usertheme','$type','$active','$language',$groups,$groupid,$insert_id)";
-			$app->db->query($sql1);
+			$sql_where = substr($sql_where, 0, -5);
+			if($sql_where == '') $sql_where = '1';
+			$sql = "SELECT * FROM ?? WHERE ".$sql_where. " AND " . $this->getAuthSQL('r', $this->formDef['db_table']);
+			if($sql_offset >= 0 && $sql_limit > 0) $sql .= ' LIMIT ' . $sql_offset . ',' . $sql_limit;
+			return $app->db->queryAllRecords($sql, true, $params);
+		} else {
+			$this->errorMessage = 'The ID must be either an integer or an array.';
+			return array();
 		}
-		
-		function ispconfig_sysuser_update($params,$client_id){
-			global $app;
-			$username = $app->db->quote($params["username"]);
-			$clear_password = $app->db->quote($params["password"]);
-			$client_id = $app->functions->intval($client_id);
-			$password = $app->auth->crypt_password(stripslashes($clear_password));
-			if ($clear_password) $pwstring = ", passwort = '$password'"; else $pwstring ="" ;
-			$sql = "UPDATE sys_user set username = '$username' $pwstring WHERE client_id = $client_id";
-			$app->db->query($sql);
+	}
+
+	function ispconfig_sysuser_add($params, $insert_id){
+		global $conf, $app, $sql1;
+		$username = $params["username"];
+		$password = $params["password"];
+		if(!isset($params['modules'])) {
+			$modules = $conf['interface_modules_enabled'];
+		} else {
+			$modules = $params['modules'];
 		}
-		
-		function ispconfig_sysuser_delete($client_id){
-			global $app;
-			$client_id = $app->functions->intval($client_id);
-			$sql = "DELETE FROM sys_user WHERE client_id = $client_id";
-			$app->db->query($sql);
-			$sql = "DELETE FROM sys_group WHERE client_id = $client_id";
-			$app->db->query($sql);
+		if(isset($params['limit_client']) && $params['limit_client'] > 0) {
+			$modules .= ',client';
 		}
 
-        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;
-				
-				/*
-                // Add backticks for incomplete table names.
-                if(stristr($this->formDef['db_table'],'.')) {
-                        $escape = '';
-                } else {
-                        $escape = '`';
-                }
+		if(!isset($params['startmodule'])) {
+			$startmodule = 'dashboard';
+		} else {
+			$startmodule = $params["startmodule"];
+			if(!preg_match('/'.$startmodule.'/', $modules)) {
+				$_modules = explode(',', $modules);
+				$startmodule=$_modules[0];
+			}
+		}
+		$usertheme = $params["usertheme"];
+		$type = 'user';
+		$active = 1;
+		$insert_id = $app->functions->intval($insert_id);
+		$language = $params["language"];
+		$groupid = $app->db->datalogInsert('sys_group', array("name" => $username, "description" => "", "client_id" => $insert_id), 'groupid');
+		$groups = $groupid;
+		if(!isset($params['_ispconfig_pw_crypted']) || $params['_ispconfig_pw_crypted'] != 1) $password = $app->auth->crypt_password(stripslashes($password));
+		$sql1 = "INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id)
+			VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+		$app->db->query($sql1, $username,$password,$modules,$startmodule,$usertheme,$type,$active,$language,$groups,$groupid,$insert_id);
+	}
 
-                $diffrec = array();
-				
-                if(is_array($record_new) && count($record_new) > 0) {
-                        foreach($record_new as $key => $val) {
-                                if($record_old[$key] != $val) {
-										// Record has changed
-                                        $diffrec[$key] = array('old' => $record_old[$key],
-                                                               'new' => $val);
-                                }
-                        }
-                } elseif(is_array($record_old)) {
-                        foreach($record_old as $key => $val) {
-                                if($record_new[$key] != $val) {
-										// Record has changed
-                                        $diffrec[$key] = array('new' => $record_new[$key],
-                                                               'old' => $val);
-                                }
-                        }
-                }
-				$this->diffrec = $diffrec;
-				
-				
-				// Full diff records for ISPConfig, they have a different format then the simple diffrec
-				$diffrec_full = array();
+	function ispconfig_sysuser_update($params, $client_id){
+		global $app;
+		$username = $params["username"];
+		$clear_password = $params["password"];
+		$client_id = $app->functions->intval($client_id);
+		if(!isset($params['_ispconfig_pw_crypted']) || $params['_ispconfig_pw_crypted'] != 1) $password = $app->auth->crypt_password(stripslashes($clear_password));
+		else $password = $clear_password;
+		$params = array($username);
+		if ($clear_password) {
+			$pwstring = ", passwort = ?";
+			$params[] = $password;
+		} else {
+			$pwstring ="" ;
+		}
+		$params[] = $client_id;
+		$sql = "UPDATE sys_user set username = ? $pwstring WHERE client_id = ?";
+		$app->db->query($sql, true, $params);
+	}
 
-                if(is_array($record_old) && count($record_old) > 0) {
-                        foreach($record_old as $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];
-                                } 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];
-                                } else {
-									$diffrec_full['new'][$key] = $val;
-									$diffrec_full['old'][$key] = $val;
-								}
-                        }
-                }
-				
-				
-				// 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 = $app->db->quote(serialize($diffrec_full));
-                        $username = $app->db->quote($this->sys_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;
-				*/
-
-        }
+	function ispconfig_sysuser_delete($client_id){
+		global $app;
+		$client_id = $app->functions->intval($client_id);
+		$sql = "DELETE FROM sys_user WHERE client_id = ?";
+		$app->db->query($sql, $client_id);
+		$sql = "DELETE FROM sys_group WHERE client_id = ?";
+		$app->db->query($sql, $client_id);
+	}
 
 }
 

--
Gitblit v1.9.1