summaryrefslogtreecommitdiff
path: root/lib/htmloutputter.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-11 16:59:39 -0500
committerEvan Prodromou <evan@status.net>2010-02-11 16:59:39 -0500
commitb96af33d978bddfa66aa893ff1d59f2d83903afa (patch)
tree68331224b792642757e4f5ba4801fd2dc6c31673 /lib/htmloutputter.php
parentd6869cde7ba7e577d54f0c6ecab3599dc85f0f67 (diff)
put Javascript files under SSL
Diffstat (limited to 'lib/htmloutputter.php')
-rw-r--r--lib/htmloutputter.php15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 317f5ea61..47e56fc8f 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -376,9 +376,20 @@ class HTMLOutputter extends XMLOutputter
$server = common_config('site', 'server');
}
- // XXX: protocol
+ $ssl = common_config('javascript', 'ssl');
+
+ if (is_null($ssl)) { // null -> guess
+ if (common_config('site', 'ssl') == 'always' &&
+ !common_config('javascript', 'server')) {
+ $ssl = true;
+ } else {
+ $ssl = false;
+ }
+ }
+
+ $protocol = ($ssl) ? 'https' : 'http';
- $src = 'http://'.$server.$path.$src . '?version=' . STATUSNET_VERSION;
+ $src = $protocol.'://'.$server.$path.$src . '?version=' . STATUSNET_VERSION;
}
$this->element('script', array('type' => $type,