From 10ec1b929c69ef9367dad6a41430e7f64555a7fe Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 30 Aug 2013 07:14:04 -0400
Subject: [PATCH] - Moved server_get function to parent class because it is needed from inside some remoting classes
---
interface/lib/classes/remote.d/server.inc.php | 14 --------------
interface/lib/classes/remoting.inc.php | 15 +++++++++++++++
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/interface/lib/classes/remote.d/server.inc.php b/interface/lib/classes/remote.d/server.inc.php
index 96f8ff7..023d1a9 100644
--- a/interface/lib/classes/remote.d/server.inc.php
+++ b/interface/lib/classes/remote.d/server.inc.php
@@ -46,20 +46,6 @@
@param string section of the config field in the server table. Could be 'web', 'dns', 'mail', 'dns', 'cron', etc
@author Julio Montoya <gugli100@gmail.com> BeezNest 2010
*/
- public function server_get($session_id, $server_id, $section ='') {
- global $app;
- if(!$this->checkPerm($session_id, 'server_get')) {
- throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
- return false;
- }
- if (!empty($session_id) && !empty($server_id)) {
- $app->uses('remoting_lib , getconf');
- $section_config = $app->getconf->get_server_config($server_id,$section);
- return $section_config;
- } else {
- return false;
- }
- }
public function server_get_serverid_by_ip($session_id, $ipaddress)
{
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 4c910c7..ec5e82b 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -420,6 +420,21 @@
}
}
+ // needed from inside the remoting plugins
+ public function server_get($session_id, $server_id, $section ='') {
+ global $app;
+ if(!$this->checkPerm($session_id, 'server_get')) {
+ throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+ if (!empty($session_id) && !empty($server_id)) {
+ $app->uses('remoting_lib , getconf');
+ $section_config = $app->getconf->get_server_config($server_id,$section);
+ return $section_config;
+ } else {
+ return false;
+ }
+ }
/**
* Get a list of functions
--
Gitblit v1.9.1