Changeset 63bc1c in indico

Timestamp:

03/16/11 18:44:26 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

84506a

Parents:

9f305e

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (03/16/11 18:25:21)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (03/16/11 18:44:26)

Message:

[FIX] SSLify all URLs in Indico.Urls when using SSL

File:

• indico/htdocs/js/indico/Core/Components.js (modified) (1 diff)

indico/htdocs/js/indico/Core/Components.js

@@ -19 +19 @@
     indicoRequest = curry(jsonRpc, Indico.Urls.SecureJsonRpcService);
     imageSrc = imageFunctionGenerator(Indico.Urls.SecureImagesBase);
-    Indico.Urls.JsonRpcService = Indico.Urls.SecureJsonRpcService;
+
+    function fixUrls(urls) {
+        for(var key in urls) {
+            // not a string -> assume object and recurse
+            if(urls[key].replace === undefined) {
+                fixUrls(urls[key]);
+                continue;
+            }
+
+            // skip if the url starts with https
+            if(urls[key].indexOf('https:') === 0) {
+                continue;
+            }
+
+            urls[key] = urls[key].replace(/^http:/, 'https:');
+        }
+    }
+
+    fixUrls(Indico.Urls);
 } else {
     indicoSource = curry(jsonRpcValue, Indico.Urls.JsonRpcService);