From 7fb09d922abe5d3c42bf7ac373c13fe2bcea6a8a Mon Sep 17 00:00:00 2001
From: Damien Churchill <damoc@gmail.com>
Date: Wed, 18 Feb 2009 23:40:24 +0000
Subject: [PATCH] don't return the username and password for the daemon

---
 deluge/ui/web/js/deluge-connections.js |  4 ++--
 deluge/ui/web/server.py                | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/deluge/ui/web/js/deluge-connections.js b/deluge/ui/web/js/deluge-connections.js
index 2fb7c6338..96799690e 100644
--- a/deluge/ui/web/js/deluge-connections.js
+++ b/deluge/ui/web/js/deluge-connections.js
@@ -43,10 +43,10 @@ Deluge.Connections = {
 
 Deluge.Connections.Store = new Ext.data.SimpleStore({
 	fields: [
-		{name: 'status', mapping: 5},
+		{name: 'status', mapping: 3},
 		{name: 'host', mapping: 1},
 		{name: 'port', mapping: 2},
-		{name: 'version', mapping: 6}
+		{name: 'version', mapping: 4}
 	],
 	id: 0
 });
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index 90e78a8d2..6205cb89d 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -240,7 +240,9 @@ class JSON(resource.Resource):
                 return self._exec_remote(method, params), request_id
         except Exception, e:
             log.exception(e)
-            raise JSONException(e)
+            d = Deferred()
+            d.callback(None)
+            return d, request_id
     
     def _on_rpc_request_finished(self, result, response, request):
         """
@@ -403,18 +405,18 @@ class JSON(resource.Resource):
         
         main_deferred = Deferred()
         def run_check():
-            if all(map(lambda x: x[5] is not None, hosts.values())):
+            if all(map(lambda x: x[3] is not None, hosts.values())):
                 main_deferred.callback(hosts.values())
         
         def on_connect(result, c, host_id):
             def on_info(info, c):
-                hosts[host_id][5] = _("Online")
-                hosts[host_id][6] = info
+                hosts[host_id][3] = _("Online")
+                hosts[host_id][4] = info
                 c.disconnect()
                 run_check()
             
             def on_info_fail(reason):
-                hosts[host_id][5] = _("Offline")
+                hosts[host_id][3] = _("Offline")
                 run_check()
             
             d = c.daemon.info()
@@ -423,17 +425,16 @@ class JSON(resource.Resource):
             
         def on_connect_failed(reason, host_id):
             log.exception(reason)
-            hosts[host_id][5] = _("Offline")
+            hosts[host_id][3] = _("Offline")
             run_check()
         
         for host in hosts.values():
             host_id, host, port, user, password = host[0:5]
-            hosts[host_id].append(None)
-            hosts[host_id].append(None)
+            hosts[host_id][3:4] = (None, None)
             
             if client.connected() and (host, port, user) == client.connection_info():
                 def on_info(info):
-                    hosts[host_id][6] = info
+                    hosts[host_id][4] = info
                     run_check()
                 host[5] = _("Connected")
                 client.daemon.info().addCallback(on_info)