<?php
/*
* StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
+ * Copyright (C) 2009-2011, 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
$ccolor = Design::toWebColor($this->contentcolor);
if (!empty($ccolor)) {
- $css .= '#content, #site_nav_local_views .current a { background-color: #';
+ $css .= '#content { background-color: #';
$css .= $ccolor->hexValue() . '} '."\n";
}
$sbcolor = Design::toWebColor($this->sidebarcolor);
if (!empty($sbcolor)) {
- $css .= '#aside_primary { background-color: #'. $sbcolor->hexValue() . ' }' . "\n";
+ $css .= '#aside_primary_wrapper, #site_nav_local_views_wrapper { background-color: #'. $sbcolor->hexValue() . ' }' . "\n";
}
$tcolor = Design::toWebColor($this->textcolor);
static function toWebColor($color)
{
- if ($color == null) {
+ if ($color === null || $color === '') {
return null;
}
static function url($filename)
{
- $path = common_config('background', 'path');
-
- if ($path[strlen($path)-1] != '/') {
- $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');
+ }
+ }
- if ($path[0] != '/') {
- $path = '/'.$path;
- }
+ $protocol = 'https';
- $server = common_config('background', 'server');
+ } else {
- if (empty($server)) {
- $server = common_config('site', 'server');
- }
+ $path = common_config('background', 'path');
- $ssl = common_config('background', 'ssl');
+ $server = common_config('background', 'server');
- if (is_null($ssl)) { // null -> guess
- if (common_config('site', 'ssl') == 'always' &&
- !common_config('background', 'server')) {
- $ssl = true;
- } else {
- $ssl = false;
+ if (empty($server)) {
+ $server = common_config('site', 'server');
}
+
+ $protocol = 'http';
}
- $protocol = ($ssl) ? 'https' : 'http';
+ if ($path[strlen($path)-1] != '/') {
+ $path .= '/';
+ }
+
+ if ($path[0] != '/') {
+ $path = '/'.$path;
+ }
return $protocol.'://'.$server.$path.$filename;
}