Skip to content

Commit a0b2891

Browse files
author
mcramer
committed
- Fixed: parameter count has to match between remoting_lib and base class
1 parent 5bff398 commit a0b2891

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

interface/lib/classes/remoting_lib.inc.php

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
* Hint: The auto increment (ID) filed of the table has not be be definied separately.
6464
*
6565
*/
66-
66+
global $app;
6767
$app->load('tform_base');
6868
class remoting_lib extends tform_base {
6969

@@ -78,7 +78,8 @@ class remoting_lib extends tform_base {
7878

7979

8080
//* Load the form definition from file. - special version for remoting
81-
function loadFormDef($file) {
81+
// module parameter is only for compatibility with base class
82+
function loadFormDef($file, $module = '') {
8283
global $app,$conf;
8384

8485
include($file);
@@ -156,35 +157,38 @@ function loadUserProfile($client_id_param = 0) {
156157
/**
157158
* Converts the data in the array to human readable format
158159
* Datatype conversion e.g. to show the data in lists
160+
* tab parameter is only there for compatibility with params of base class
159161
*
160162
* @param record
161163
* @return record
162164
*/
163-
function decode($record) {
165+
function decode($record, $tab = '') {
164166
return $this->_decode($record, '', true);
165167
}
166168

167169
/**
168170
* Get the key => value array of a form filled from a datasource definitiom
169-
*
171+
* dummy parameter is only there for compatibility with params of base class
172+
*
170173
* @param field = array with field definition
171174
* @param record = Dataset as array
172175
* @return key => value array for the value field of a form
173176
*/
174177

175-
function getDatasourceData($field, $record) {
178+
function getDatasourceData($field, $record, $dummy = '') {
176179
return $this->_getDatasourceData($field, $record, true);
177180
}
178181

179182
/**
180183
/**
181184
* Rewrite the record data to be stored in the database
182185
* and check values with regular expressions.
183-
*
186+
* dummy parameter is only there for compatibility with params of base class
187+
*
184188
* @param record = Datensatz als Array
185189
* @return record
186190
*/
187-
function encode($record,$dbencode = true) {
191+
function encode($record,$dbencode = true, $dummy = '') {
188192
$new_record = $this->_encode($record, '', $dbencode, true);
189193
if(isset($record['_ispconfig_pw_crypted'])) $new_record['_ispconfig_pw_crypted'] = $record['_ispconfig_pw_crypted']; // this one is not in form definitions!
190194

@@ -193,13 +197,14 @@ function encode($record,$dbencode = true) {
193197

194198
/**
195199
* Create SQL statement
196-
*
200+
* dummy parameter is only there for compatibility with params of base class
201+
*
197202
* @param record = Datensatz als Array
198203
* @param action = INSERT oder UPDATE
199204
* @param primary_id
200205
* @return record
201206
*/
202-
function getSQL($record, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '') {
207+
function getSQL($record, $action = 'INSERT', $primary_id = 0, $sql_ext_where = '', $dummy = '') {
203208

204209
global $app;
205210

interface/lib/classes/tform.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* Hint: The auto increment (ID) filed of the table has not be be definied separately.
5858
*
5959
*/
60-
60+
global $app;
6161
$app->load('tform_base');
6262
class tform extends tform_base {
6363
/*

0 commit comments

Comments
 (0)