diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 647ba8073c60e5ad382ca59fece325f367ea3f91..cbe693fed704eae7472855cf6eac488ac38841ed 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -479,17 +479,50 @@ class remoting {
 		}
 	}
 
-	// needed from inside the remoting plugins
-	public function server_get($session_id, $server_id, $section ='') {
+	public function server_get($session_id, $server_id = null, $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.');
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		if (!empty($session_id)) {
+			if(!empty($server_id)) {
+				$app->uses('remoting_lib , getconf');
+				$section_config =  $app->getconf->get_server_config($server_id, $section);
+				return $section_config;
+			} else {
+				$servers = array();
+				$sql = "SELECT server_id FROM server WHERE 1";
+				$all = $app->db->queryAllRecords($sql);
+				foreach($all as $s) {
+					$servers[$s['server_id']] = $app->getconf->get_server_config($s['server_id'], $section);
+				}
+				unset($all);
+				unset($s);
+				return $servers;
+			}
+		} else {
 			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;
+	}
+	
+	/**
+	    Gets a list of all servers
+	    @param int session_id
+	    @param int server_name
+	    @author Marius Cramer <m.cramer@pixcept.de> 2014
+    */
+	public function server_get_all($session_id)
+    {
+        global $app;
+		if(!$this->checkPerm($session_id, 'server_get')) {
+        	$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+            return false;
+		}
+		if (!empty($session_id)) {
+			$sql = "SELECT server_id, server_name FROM server WHERE 1";
+			$servers = $app->db->queryAllRecords($sql);
+			return $servers;
 		} else {
 			return false;
 		}