Module: deluge
Branch: master
Commit: c03f519f9afebc6dc9fda24e7f6a59911c3c3784

Author: Damien Churchill <[email protected]>
Date:   Sun Mar 21 10:33:02 2010 +0000

add some base parameter validation

---

 deluge/ui/web/server.py |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index 02ff436..4164f34 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -318,7 +318,6 @@ class TopLevel(resource.Resource):
         "js/ext-extensions/TreeGridColumns.js",
         "js/ext-extensions/TreeGridRenderColumn.js",
         "js/ext-extensions/TreeGrid.js",
-        #"config.js",
         "gettext.js",
         "js/deluge-all/Deluge.js",
         "js/deluge-all/Deluge.Formatters.js",
@@ -467,6 +466,16 @@ class TopLevel(resource.Resource):
         else:
             base = component.get("DelugeWeb").base
 
+        # validate the base parameter
+        if not base:
+            base = '/'
+
+        if base[0] != '/':
+            base = '/' + base
+
+        if base[-1] != '/':
+            base += '/'
+
         web_config = component.get("Web").get_config()
         web_config["base"] = base
         config = dict([(key, web_config[key]) for key in UI_CONFIG_KEYS])

-- 
You received this message because you are subscribed to the Google Groups 
"deluge-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/deluge-commit?hl=en.

Reply via email to