From fe48757928762d259d5e2f1871cec4b6b1951fb6 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 7 Mar 2015 16:04:08 +0100
Subject: [PATCH] Made settings listing from launcher alphabetical. Fixed bug
 in mxp-to-html for the webclient.

---
 evennia/server/evennia_launcher.py | 4 ++--
 evennia/utils/text2html.py         | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 00ce6e16ee..ce5ff03453 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -758,9 +758,9 @@ def list_settings(keys):
         # show a list of all keys
         # a specific key
         table = evtable.EvTable()
-        confs = dict((key,var) for key, var in evsettings.__dict__.items() if key.isupper())
+        confs = [key for key in sorted(evsettings.__dict__) if key.isupper()]
         for i in range(0, len(confs), 4):
-            table.add_row(*confs.keys()[i:i+4])
+            table.add_row(*confs[i:i+4])
     else:
         # a specific key
         table = evtable.EvTable(width=131)
diff --git a/evennia/utils/text2html.py b/evennia/utils/text2html.py
index cc430d427b..48545f8516 100644
--- a/evennia/utils/text2html.py
+++ b/evennia/utils/text2html.py
@@ -124,8 +124,9 @@ class TextToHTMLparser(object):
         """
         Replaces links with HTML code
         """
-        html = "<a href='#' onclick='websocket.send(\"\\1\"); return false;'>\\2</a>"
-        return self.re_link.sub(html, text)
+        html = "<a href='#' onclick='websocket.send(\"CMD\\1\"); return false;'>\\2</a>"
+        repl = self.re_link.sub(html, text)
+        return repl
 
     def do_sub(self, m):
         "Helper method to be passed to re.sub."