From 4ad9487deff3af54455ac87479dacea014ef9fae Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 18 May 2014 15:09:47 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/lib/classes/remoting_lib.inc.php | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 5d1b23d..d85612b 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -233,8 +233,19 @@
function getDataRecord($primary_id) {
global $app;
$escape = '`';
+ $this->loadUserProfile();
if(@is_numeric($primary_id)) {
- return parent::getDataRecord($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 ".$escape.$this->formDef['db_table'].$escape;
+ return $app->db->queryAllRecords($sql);
+ } else {
+ throw new SoapFault('invalid_id', 'The ID has to be > 0 or -1.');
+ return array();
+ }
} 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;
--
Gitblit v1.9.1