From 31230cb7cda673db7a96fb14d93dfaf9262c74cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 07:09:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5
---
interface/lib/classes/remoting.inc.php | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 9dd5dc7..3fe307d 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -331,7 +331,7 @@
return $all;
}
- //* Get server ip
+ //* Get server ips
public function server_ip_get($session_id, $primary_id)
{
global $app;
@@ -343,20 +343,6 @@
$app->uses('remoting_lib');
$app->remoting_lib->loadFormDef('../admin/form/server_ip.tform.php');
return $app->remoting_lib->getDataRecord($primary_id);
- }
-
- //* Get all server ips
- public function server_ip_get_by_server_id($session_id, $server_id)
- {
- global $app;
-
- if(!$this->checkPerm($session_id, 'server_ip_get_by_server_id')) {
- $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
- return false;
- }
- $sql = "SELECT * FROM server_ip WHERE server_id = $server_id";
- $all = $app->db->queryAllRecords($sql);
- return $all;
}
//* Add a IP address record
--
Gitblit v1.9.1