Changeset 623:6012fe93f78c in documentViewer for SrvTxtUtils.py

Timestamp:

Dec 15, 2014, 3:10:05 PM (9 years ago)

Author:

casties

Branch:

default

Message:

better scheme-less URL code.

File:

• SrvTxtUtils.py (modified) (3 diffs)

SrvTxtUtils.py

@@ -8 +8 @@
 import stat
 import urllib
+from urlparse import urlparse, urlunparse
 import logging
 import time
@@ -22 +23 @@
 import xml.etree.ElementTree as ET
 
-srvTxtUtilsVersion = "1.12.3"
+srvTxtUtilsVersion = "1.13"
 
 map_months = {'en': [u"",
@@ -371 +372 @@
 
 
+def sslifyUrl(url, app=None, force=False):
+    """returns URL with http or https scheme.
+    
+    Looks at app.REQUEST.URL to find the scheme of the current page.
+    Changes only schemeless (starting with //) URLs unless force=True.  
+    """
+    thatUrl = urlparse(url) 
+    if hasattr(app, 'REQUEST'):
+        # get current page URL
+        thisUrl = urlparse(app.REQUEST['URL'])
+        if thatUrl.scheme == '':
+            # schemeless URL -> use this scheme
+            return "%s:%s"%(thisUrl.scheme, url)
+        elif force:
+            # use this scheme
+            if thisUrl.scheme != thatUrl.scheme:
+                return urlunparse((thisUrl.scheme,)+thatUrl[1:])
+            else:
+                # keep scheme
+                return url
+            
+        else:
+            # keep scheme
+            return url
+        
+    else:
+        # no current page URL
+        if force:
+            # use https for force
+            return urlunparse(('https',)+thatUrl[1:])
+        
+    return url