diff options
| author | Evan Prodromou <evan@status.net> | 2010-02-11 16:59:39 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-02-11 16:59:39 -0500 |
| commit | b96af33d978bddfa66aa893ff1d59f2d83903afa (patch) | |
| tree | 68331224b792642757e4f5ba4801fd2dc6c31673 /lib | |
| parent | d6869cde7ba7e577d54f0c6ecab3599dc85f0f67 (diff) | |
put Javascript files under SSL
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.php | 3 | ||||
| -rw-r--r-- | lib/htmloutputter.php | 15 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lib/default.php b/lib/default.php index d19e04036..8a21271b8 100644 --- a/lib/default.php +++ b/lib/default.php @@ -128,7 +128,8 @@ $default = 'ssl' => null), 'javascript' => array('server' => null, - 'path'=> null), + 'path'=> null, + 'ssl' => null), 'throttle' => array('enabled' => false, // whether to throttle edits; false by default 'count' => 20, // number of allowed messages in timespan 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, |