let backgrounds be put under SSL

diff --git a/README b/README
index 7531df997101751d02b377ff65a8f60e7226fcf8..3b2baaeebf01e328d9c8023d2af86e5bc069d23d 100644 (file)
--- a/README
+++ b/README
@@ -1521,6 +1521,8 @@ dir: directory to write backgrounds too. Default is '/background/'
      subdir of install dir.
 path: path to backgrounds. Default is sub-path of install path; note
       that you may need to change this if you change site-path too.
+ssl: Whether or not to use HTTPS for background files. Defaults to
+     null, meaning to guess from site-wide SSL settings.
 
 ping
 ----

diff --git a/classes/Design.php b/classes/Design.php
index 4e7d7dfb257854a4a898ae44524b9a0739671e72..ff44e010964042f0d6e8b18de603668c2c71d496 100644 (file)
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -155,9 +155,20 @@ class Design extends Memcached_DataObject
             $server = common_config('site', 'server');
         }
 
-        // XXX: protocol
+        $ssl = common_config('background', 'ssl');
+
+        if (is_null($ssl)) { // null -> guess
+            if (common_config('site', 'ssl') == 'always' &&
+                !common_config('background', 'server')) {
+                $ssl = true;
+            } else {
+                $ssl = false;
+            }
+        }
+
+        $protocol = ($ssl) ? 'https' : 'http';
 
-        return 'http://'.$server.$path.$filename;
+        return $protocol.'://'.$server.$path.$filename;
     }
 
     function setDisposition($on, $off, $tile)

diff --git a/lib/default.php b/lib/default.php
index 8a21271b8f90c4c0fac1443dc04a20737c24b904..0822654f6253d066075b23ab546a282f53e6c300 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -116,7 +116,8 @@ $default =
         'background' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/background/',
-              'path' => $_path . '/background/'),
+              'path' => $_path . '/background/',
+              'ssl' => null),
         'public' =>
         array('localonly' => true,
               'blacklist' => array(),