From a0b2891ea9eefe6f8c297ae890dcf5561a415817 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 06 Sep 2013 14:02:41 -0400
Subject: [PATCH] - Fixed: parameter count has to match between remoting_lib and base class
---
interface/lib/classes/remoting_lib.inc.php | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index dda49e6..f163a87 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -63,7 +63,7 @@
* Hint: The auto increment (ID) filed of the table has not be be definied separately.
*
*/
-
+global $app;
$app->load('tform_base');
class remoting_lib extends tform_base {
@@ -78,7 +78,8 @@
//* Load the form definition from file. - special version for remoting
- function loadFormDef($file) {
+ // module parameter is only for compatibility with base class
+ function loadFormDef($file, $module = '') {
global $app,$conf;
include($file);
@@ -156,23 +157,25 @@
/**
* 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) {
+ 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) {
+ function getDatasourceData($field, $record, $dummy = '') {
return $this->_getDatasourceData($field, $record, true);
}
@@ -180,11 +183,12 @@
/**
* Rewrite the record data to be stored in the database
* and check values with regular expressions.
- *
+ * dummy parameter is only there for compatibility with params of base class
+ *
* @param record = Datensatz als Array
* @return record
*/
- function encode($record,$dbencode = true) {
+ function encode($record,$dbencode = true, $dummy = '') {
$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!
@@ -193,13 +197,14 @@
/**
* 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 = '') {
+ function getSQL($record, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '', $dummy = '') {
global $app;
--
Gitblit v1.9.1