From 63508b6bbacf7b42a61935f28b1d8d7168f0c0fe Mon Sep 17 00:00:00 2001
From: James Valleroy <james.valleroy@gmail.com>
Date: Thu, 14 Nov 2013 19:15:45 -0500
Subject: [PATCH] Fix some bugs in xmpp module.

---
 modules/installed/services/xmpp.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/installed/services/xmpp.py b/modules/installed/services/xmpp.py
index 8881a2bd0..7e1cb749f 100644
--- a/modules/installed/services/xmpp.py
+++ b/modules/installed/services/xmpp.py
@@ -53,9 +53,7 @@ class xmpp(PagePlugin):
         form.submit(_("Update setup"))
         main += form.render()
 
-        sidebar_right = """
-<strong><a href="/services/xmpp/register">Register XMPP Account</a></strong>
-"""
+        sidebar_right = '<strong><a href="'+cfg.server_dir+'/services/xmpp/register">Register XMPP Account</a></strong>'
         return self.fill_template(title="XMPP Server Configuration", main=main, sidebar_right=sidebar_right)
 
 class register(FormPlugin, PagePlugin):
@@ -88,7 +86,7 @@ class register(FormPlugin, PagePlugin):
             if "successfully registered" in output:
                 msg.add = _("Registered account for %s." % username)
             else:
-                msg.add = _("Failed to register account for %s: %o" % (username, output))
+                msg.add = _("Failed to register account for %s: %s" % (username, output))
 
         cfg.log(msg.text)
         main = self.main(username, msg=msg.text)