X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FDesign.php;h=f4834c714e80038e928ab01c2067bf1f6e4c93e9;hb=f1a14ba8015b690a10099f5d1e41ff320d2b6b88;hp=0927fcda70e729ef70e6fa8c8132d38882a8dba2;hpb=dd705ddaf751ee8132cdd52e47aeef259477912c;p=quix0rs-gnu-social.git

diff --git a/classes/Design.php b/classes/Design.php
index 0927fcda70..f4834c714e 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - the distributed open-source microblogging tool
- * Copyright (C) 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -55,26 +55,38 @@ class Design extends Memcached_DataObject
 
     function showCSS($out)
     {
-        try {
+        $css = '';
 
-            $bgcolor = new WebColor($this->backgroundcolor);
-            $ccolor  = new WebColor($this->contentcolor);
-            $sbcolor = new WebColor($this->sidebarcolor);
-            $tcolor  = new WebColor($this->textcolor);
-            $lcolor  = new WebColor($this->linkcolor);
+        $bgcolor = Design::toWebColor($this->backgroundcolor);
 
-        } catch (WebColorException $e) {
-            // This shouldn't happen
-            common_log(LOG_ERR, "Unable to create color for design $id.",
-                __FILE__);
+        if (!empty($bgcolor)) {
+            $css .= 'body { background-color: #' . $bgcolor->hexValue() . ' }' . "\n";
         }
 
-        $css  = 'body { background-color: #' . $bgcolor->hexValue() . ' }' . "\n";
-        $css .= '#content, #site_nav_local_views .current a { background-color: #';
-        $css .= $ccolor->hexValue() . '} '."\n";
-        $css .= '#aside_primary { background-color: #'. $sbcolor->hexValue() . ' }' . "\n";
-        $css .= 'html body { color: #'. $tcolor->hexValue() . ' }'. "\n";
-        $css .= 'a { color: #' . $lcolor->hexValue() . ' }' . "\n";
+        $ccolor  = Design::toWebColor($this->contentcolor);
+
+        if (!empty($ccolor)) {
+            $css .= '#content, #site_nav_local_views .current a { background-color: #';
+            $css .= $ccolor->hexValue() . '} '."\n";
+        }
+
+        $sbcolor = Design::toWebColor($this->sidebarcolor);
+
+        if (!empty($sbcolor)) {
+            $css .= '#aside_primary { background-color: #'. $sbcolor->hexValue() . ' }' . "\n";
+        }
+
+        $tcolor  = Design::toWebColor($this->textcolor);
+
+        if (!empty($tcolor)) {
+            $css .= 'html body { color: #'. $tcolor->hexValue() . ' }'. "\n";
+        }
+
+        $lcolor  = Design::toWebColor($this->linkcolor);
+
+        if (!empty($lcolor)) {
+            $css .= 'a { color: #' . $lcolor->hexValue() . ' }' . "\n";
+        }
 
         if (!empty($this->backgroundimage) &&
             $this->disposition & BACKGROUND_ON) {
@@ -88,8 +100,25 @@ class Design extends Memcached_DataObject
                 '); ' . $repeat . ' background-attachment:fixed; }' . "\n";
         }
 
-        $out->element('style', array('type' => 'text/css'), $css);
+        if (0 != mb_strlen($css)) {
+            $out->style($css);
+        }
+    }
+
+    static function toWebColor($color)
+    {
+        if ($color === null || $color === '') {
+            return null;
+        }
 
+        try {
+            return new WebColor($color);
+        } catch (WebColorException $e) {
+            // This shouldn't happen
+            common_log(LOG_ERR, "Unable to create web color for $color",
+                __FILE__);
+            return null;
+        }
     }
 
     static function filename($id, $extension, $extra=null)
@@ -110,7 +139,42 @@ class Design extends Memcached_DataObject
 
     static function url($filename)
     {
-        $path = common_config('background', 'path');
+        if (StatusNet::isHTTPS()) {
+
+            $sslserver = common_config('background', 'sslserver');
+
+            if (empty($sslserver)) {
+                // XXX: this assumes that background dir == site dir + /background/
+                // not true if there's another server
+                if (is_string(common_config('site', 'sslserver')) &&
+                    mb_strlen(common_config('site', 'sslserver')) > 0) {
+                    $server = common_config('site', 'sslserver');
+                } else if (common_config('site', 'server')) {
+                    $server = common_config('site', 'server');
+                }
+                $path   = common_config('site', 'path') . '/background/';
+            } else {
+                $server = $sslserver;
+                $path   = common_config('background', 'sslpath');
+                if (empty($path)) {
+                    $path = common_config('background', 'path');
+                }
+            }
+
+            $protocol = 'https';
+
+        } else {
+
+            $path = common_config('background', 'path');
+
+            $server = common_config('background', 'server');
+
+            if (empty($server)) {
+                $server = common_config('site', 'server');
+            }
+
+            $protocol = 'http';
+        }
 
         if ($path[strlen($path)-1] != '/') {
             $path .= '/';
@@ -120,15 +184,7 @@ class Design extends Memcached_DataObject
             $path = '/'.$path;
         }
 
-        $server = common_config('background', 'server');
-
-        if (empty($server)) {
-            $server = common_config('site', 'server');
-        }
-
-        // XXX: protocol
-
-        return 'http://'.$server.$path.$filename;
+        return $protocol.'://'.$server.$path.$filename;
     }
 
     function setDisposition($on, $off, $tile)
@@ -152,4 +208,36 @@ class Design extends Memcached_DataObject
         }
     }
 
+    /**
+     * Return a design object based on the configured site design.
+     *
+     * @return Design a singleton design object for the site.
+     */
+
+    static function siteDesign()
+    {
+        static $siteDesign = null;
+
+        if (empty($siteDesign)) {
+
+            $siteDesign = new Design();
+
+            $attrs = array('backgroundcolor',
+                           'contentcolor',
+                           'sidebarcolor',
+                           'textcolor',
+                           'linkcolor',
+                           'backgroundimage',
+                           'disposition');
+
+            foreach ($attrs as $attr) {
+                $val = common_config('design', $attr);
+                if ($val !== false) {
+                    $siteDesign->$attr = $val;
+                }
+            }
+        }
+
+        return $siteDesign;
+    }
 }