af1cbc6fe3
It seems to have actually been saving correctly, but the update of the colors on the form success page wasn't working properly. When a design object is pulled out of the database, the numeric fields are read in as strings, so black comes back as "0". But, when we populate the new object and then stick it live, we've populated it with actual integers; with memcache on these might live for a while in the cache... The fallback code in Design::toWebColor() did a check ($color == null) which would be false for the string "0", but counts as true for the *integer* 0. Thus, the display code would initially interpret the correctly-saved black color as "use default". Changing the check to === against null and "" empty string avoids the false positive on integers, and lets us see our nice black text immediately after save.
244 lines
7.1 KiB
PHP
244 lines
7.1 KiB
PHP
<?php
|
|
/*
|
|
* 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
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Affero General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Affero General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|
exit(1);
|
|
}
|
|
|
|
define('BACKGROUND_ON', 1);
|
|
define('BACKGROUND_OFF', 2);
|
|
define('BACKGROUND_TILE', 4);
|
|
|
|
/**
|
|
* Table Definition for design
|
|
*/
|
|
|
|
require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
|
|
require_once INSTALLDIR . '/lib/webcolor.php';
|
|
|
|
class Design extends Memcached_DataObject
|
|
{
|
|
###START_AUTOCODE
|
|
/* the code below is auto generated do not remove the above tag */
|
|
|
|
public $__table = 'design'; // table name
|
|
public $id; // int(4) primary_key not_null
|
|
public $backgroundcolor; // int(4)
|
|
public $contentcolor; // int(4)
|
|
public $sidebarcolor; // int(4)
|
|
public $textcolor; // int(4)
|
|
public $linkcolor; // int(4)
|
|
public $backgroundimage; // varchar(255)
|
|
public $disposition; // tinyint(1) default_1
|
|
|
|
/* Static get */
|
|
function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Design',$k,$v); }
|
|
|
|
/* the code above is auto generated do not remove the tag below */
|
|
###END_AUTOCODE
|
|
|
|
function showCSS($out)
|
|
{
|
|
$css = '';
|
|
|
|
$bgcolor = Design::toWebColor($this->backgroundcolor);
|
|
|
|
if (!empty($bgcolor)) {
|
|
$css .= 'body { background-color: #' . $bgcolor->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) {
|
|
|
|
$repeat = ($this->disposition & BACKGROUND_TILE) ?
|
|
'background-repeat:repeat;' :
|
|
'background-repeat:no-repeat;';
|
|
|
|
$css .= 'body { background-image:url(' .
|
|
Design::url($this->backgroundimage) .
|
|
'); ' . $repeat . ' background-attachment:fixed; }' . "\n";
|
|
}
|
|
|
|
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)
|
|
{
|
|
return $id . (($extra) ? ('-' . $extra) : '') . $extension;
|
|
}
|
|
|
|
static function path($filename)
|
|
{
|
|
$dir = common_config('background', 'dir');
|
|
|
|
if ($dir[strlen($dir)-1] != '/') {
|
|
$dir .= '/';
|
|
}
|
|
|
|
return $dir . $filename;
|
|
}
|
|
|
|
static function url($filename)
|
|
{
|
|
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 .= '/';
|
|
}
|
|
|
|
if ($path[0] != '/') {
|
|
$path = '/'.$path;
|
|
}
|
|
|
|
return $protocol.'://'.$server.$path.$filename;
|
|
}
|
|
|
|
function setDisposition($on, $off, $tile)
|
|
{
|
|
if ($on) {
|
|
$this->disposition |= BACKGROUND_ON;
|
|
} else {
|
|
$this->disposition &= ~BACKGROUND_ON;
|
|
}
|
|
|
|
if ($off) {
|
|
$this->disposition |= BACKGROUND_OFF;
|
|
} else {
|
|
$this->disposition &= ~BACKGROUND_OFF;
|
|
}
|
|
|
|
if ($tile) {
|
|
$this->disposition |= BACKGROUND_TILE;
|
|
} else {
|
|
$this->disposition &= ~BACKGROUND_TILE;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* 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;
|
|
}
|
|
}
|