User design setting save now
This commit is contained in:
Zach Copley
parent
807d84d448
commit
20d9350877
@ -32,7 +32,8 @@ if (!defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
require_once INSTALLDIR.'/lib/accountsettingsaction.php';
|
||||
require_once INSTALLDIR . '/lib/accountsettingsaction.php';
|
||||
require_once INSTALLDIR . '/lib/WebColor.php';
|
||||
|
||||
class DesignsettingsAction extends AccountSettingsAction
|
||||
{
|
||||
@ -105,61 +106,79 @@ class DesignsettingsAction extends AccountSettingsAction
|
||||
$design = $this->defaultDesign();
|
||||
}
|
||||
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-0'), _('Background'));
|
||||
$this->element('input', array('name' => 'design_background',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-0',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => $design->backgroundcolor));
|
||||
$this->elementEnd('li');
|
||||
try {
|
||||
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-1'), _('Content'));
|
||||
$this->element('input', array('name' => 'design_content',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-1',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => $design->contentcolor));
|
||||
$this->elementEnd('li');
|
||||
$bgcolor = new WebColor($design->backgroundcolor);
|
||||
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-2'), _('Sidebar'));
|
||||
$this->element('input', array('name' => 'design_sidebar',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-2',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => $design->sidebarcolor));
|
||||
$this->elementEnd('li');
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-0'), _('Background'));
|
||||
$this->element('input', array('name' => 'design_background',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-0',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => '#' . $bgcolor->hexValue()));
|
||||
$this->elementEnd('li');
|
||||
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-3'), _('Text'));
|
||||
$this->element('input', array('name' => 'design_text',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-3',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => $design->textcolor));
|
||||
$this->elementEnd('li');
|
||||
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-4'), _('Links'));
|
||||
$this->element('input', array('name' => 'design_links',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-4',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => $design->linkcolor));
|
||||
$ccolor = new WebColor($design->contentcolor);
|
||||
|
||||
$this->elementEnd('li');
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-1'), _('Content'));
|
||||
$this->element('input', array('name' => 'design_content',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-1',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => '#' . $ccolor->hexValue()));
|
||||
$this->elementEnd('li');
|
||||
|
||||
$sbcolor = new WebColor($design->sidebarcolor);
|
||||
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-2'), _('Sidebar'));
|
||||
$this->element('input', array('name' => 'design_sidebar',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-2',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => '#' . $sbcolor->hexValue()));
|
||||
$this->elementEnd('li');
|
||||
|
||||
$tcolor = new WebColor($design->textcolor);
|
||||
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-3'), _('Text'));
|
||||
$this->element('input', array('name' => 'design_text',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-3',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => '#' . $tcolor->hexValue()));
|
||||
$this->elementEnd('li');
|
||||
|
||||
$lcolor = new WebColor($design->linkcolor);
|
||||
|
||||
$this->elementStart('li');
|
||||
$this->element('label', array('for' => 'swatch-4'), _('Links'));
|
||||
$this->element('input', array('name' => 'design_links',
|
||||
'type' => 'text',
|
||||
'id' => 'swatch-4',
|
||||
'class' => 'swatch',
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => '#' . $lcolor->hexValue()));
|
||||
|
||||
$this->elementEnd('li');
|
||||
|
||||
} catch (WebColorException $e) {
|
||||
common_log(LOG_ERR, 'Bad color values in design ID: ' .
|
||||
$design->id);
|
||||
}
|
||||
|
||||
$this->elementEnd('ul');
|
||||
$this->elementEnd('fieldset');
|
||||
@ -253,18 +272,38 @@ class DesignsettingsAction extends AccountSettingsAction
|
||||
$defaults = common_config('site', 'design');
|
||||
|
||||
$design = new Design();
|
||||
$design->backgroundcolor = $defaults['backgroundcolor'];
|
||||
$design->contentcolor = $defaults['contentcolor'];
|
||||
$design->sidebarcolor = $defaults['sidebarcolor'];
|
||||
$design->textcolor = $defaults['textcolor'];
|
||||
$design->linkcolor = $defaults['linkcolor'];
|
||||
$design->backgroundimage = $defaults['backgroundimage'];
|
||||
|
||||
try {
|
||||
|
||||
$color = new WebColor();
|
||||
|
||||
$color->parseColor($defaults['backgroundcolor']);
|
||||
$design->backgroundcolor = $color->intValue();
|
||||
|
||||
$color->parseColor($defaults['contentcolor']);
|
||||
$design->contentcolor = $color->intValue();
|
||||
|
||||
$color->parseColor($defaults['sidebarcolor']);
|
||||
$design->sidebarcolor = $color->intValue();
|
||||
|
||||
$color->parseColor($defaults['textcolor']);
|
||||
$design->sidebarcolor = $color->intValue();
|
||||
|
||||
$color->parseColor($defaults['linkcolor']);
|
||||
$design->linkcolor = $color->intValue();
|
||||
|
||||
$design->backgroundimage = $defaults['backgroundimage'];
|
||||
|
||||
} catch (WebColorException $e) {
|
||||
common_log(LOG_ERR, _('Bad default color settings: ' .
|
||||
$e->getMessage()));
|
||||
}
|
||||
|
||||
return $design;
|
||||
}
|
||||
|
||||
/**
|
||||
* Save the user's design settings
|
||||
* Save or update the user's design settings
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
@ -273,7 +312,76 @@ class DesignsettingsAction extends AccountSettingsAction
|
||||
{
|
||||
$user = common_current_user();
|
||||
|
||||
try {
|
||||
|
||||
$bgcolor = new WebColor($this->trimmed('design_background'));
|
||||
$ccolor = new WebColor($this->trimmed('design_content'));
|
||||
$sbcolor = new WebColor($this->trimmed('design_sidebar'));
|
||||
$tcolor = new WebColor($this->trimmed('design_text'));
|
||||
$lcolor = new WebColor($this->trimmed('design_links'));
|
||||
|
||||
} catch (WebColorException $e) {
|
||||
$this->showForm($e->getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
$design = User::getDesign();
|
||||
|
||||
if (!isset($design)) {
|
||||
|
||||
$original = clone($design);
|
||||
|
||||
$original->backgroundcolor = $bgcolor->intValue();
|
||||
$original->contentcolor = $ccolor->intValue();
|
||||
$original->sidebarcolor = $sbcolor->intValue();
|
||||
$original->textcolor = $tcolor->intValue();
|
||||
$original->linkcolor = $lcolor->intValue();
|
||||
|
||||
$result = $design->update($original);
|
||||
|
||||
if ($result === false) {
|
||||
common_log_db_error($design, 'UPDATE', __FILE__);
|
||||
$this->showForm(_('Couldn\'t update your design.'));
|
||||
return;
|
||||
}
|
||||
|
||||
// update design
|
||||
} else {
|
||||
|
||||
$user->query('BEGIN');
|
||||
|
||||
// save new design
|
||||
$design = new Design();
|
||||
|
||||
$design->backgroundcolor = $bgcolor->intValue();
|
||||
$design->contentcolor = $ccolor->intValue();
|
||||
$design->sidebarcolor = $sbcolor->intValue();
|
||||
$design->textcolor = $tcolor->intValue();
|
||||
$design->linkcolor = $lcolor->intValue();
|
||||
$design->backgroundimage = $defaults['backgroundimage'];
|
||||
|
||||
$id = $design->insert();
|
||||
|
||||
if (empty($id)) {
|
||||
common_log_db_error($id, 'INSERT', __FILE__);
|
||||
$this->showForm(_('Unable to save your design settings!'));
|
||||
return;
|
||||
}
|
||||
|
||||
$original = clone($user);
|
||||
$user->design_id = $id;
|
||||
$result = $user->update($original);
|
||||
|
||||
if (empty($result)) {
|
||||
common_log_db_error($original, 'UPDATE', __FILE__);
|
||||
$this->showForm(_('Unable to save your design settings!'));
|
||||
$user->query('ROLLBACK');
|
||||
return;
|
||||
}
|
||||
|
||||
$user->query('COMMIT');
|
||||
|
||||
}
|
||||
|
||||
$this->showForm(_('Design preferences saved.'), true);
|
||||
}
|
||||
|
||||
191
lib/webcolor.php
Normal file
191
lib/webcolor.php
Normal file
@ -0,0 +1,191 @@
|
||||
<?php
|
||||
/**
|
||||
* Laconica, the distributed open-source microblogging tool
|
||||
*
|
||||
* Base class for deleting things
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
* LICENCE: 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/>.
|
||||
*
|
||||
* @category Personal
|
||||
* @package Laconica
|
||||
* @author Zach Copley <zach@controlyourself.ca>
|
||||
* @copyright 2009 Control Yourself, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://laconi.ca/
|
||||
*/
|
||||
|
||||
if (!defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
class WebColor {
|
||||
|
||||
// XXX: Maybe make getters and setters for r,g,b values and tuples,
|
||||
// e.g.: to support this kinda CSS representation: rgb(255,0,0)
|
||||
// http://www.w3.org/TR/CSS21/syndata.html#color-units
|
||||
|
||||
var $red = 0;
|
||||
var $green = 0;
|
||||
var $blue = 0;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function __construct($color = null)
|
||||
{
|
||||
if (isset($color)) {
|
||||
$this->parseColor($color);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses input to and tries to determine whether the color
|
||||
* is being specified via an integer or hex tuple and sets
|
||||
* the RGB instance variables accordingly.
|
||||
*
|
||||
* XXX: Maybe support (r,g,b) style, and array?
|
||||
*
|
||||
* @param mixed $color
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function parseColor($color) {
|
||||
|
||||
if (is_numeric($color)) {
|
||||
$this->setIntColor($color);
|
||||
} else {
|
||||
|
||||
// XXX named colors
|
||||
|
||||
// XXX: probably should do even more validation
|
||||
|
||||
if (preg_match('/(#([0-9A-Fa-f]{3,6})\b)/u', $color) > 0) {
|
||||
$this->setHexColor($color);
|
||||
} else {
|
||||
$errmsg = _('%s is not a valid color!');
|
||||
throw new WebColorException(sprintf($errmsg, $color));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $name
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function setNamedColor($name)
|
||||
{
|
||||
// XXX Implement this
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Sets the RGB color values from a a hex tuple
|
||||
*
|
||||
* @param string $hexcolor
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function setHexColor($hexcolor) {
|
||||
|
||||
if ($hexcolor[0] == '#') {
|
||||
$hexcolor = substr($hexcolor, 1);
|
||||
}
|
||||
|
||||
if (strlen($hexcolor) == 6) {
|
||||
list($r, $g, $b) = array($hexcolor[0].$hexcolor[1],
|
||||
$hexcolor[2].$hexcolor[3],
|
||||
$hexcolor[4].$hexcolor[5]);
|
||||
} elseif (strlen($hexcolor) == 3) {
|
||||
list($r, $g, $b) = array($hexcolor[0].$hexcolor[0],
|
||||
$hexcolor[1].$hexcolor[1],
|
||||
$hexcolor[2].$hexcolor[2]);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
$this->red = hexdec($r);
|
||||
$this->green = hexdec($g);
|
||||
$this->blue = hexdec($b);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the RGB color values from a 24-bit integer
|
||||
*
|
||||
* @param int $intcolor
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function setIntColor($intcolor)
|
||||
{
|
||||
// We could do 32 bit and have an alpha channel because
|
||||
// Sarven wants one real bad, but nah.
|
||||
|
||||
$this->red = $intcolor >> 16;
|
||||
$this->green = $intcolor >> 8 & 0xFF;
|
||||
$this->blue = $intcolor & 0xFF;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a hex tuple of the RGB color useful for output in HTML
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
|
||||
function hexValue() {
|
||||
|
||||
$hexcolor = (strlen(dechex($this->red)) < 2 ? '0' : '' ) .
|
||||
dechex($this->red);
|
||||
$hexcolor .= (strlen(dechex($this->green)) < 2 ? '0' : '') .
|
||||
dechex($this->green);
|
||||
$hexcolor .= (strlen(dechex($this->blue)) < 2 ? '0' : '') .
|
||||
dechex($this->blue);
|
||||
|
||||
return $hexcolor;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a 24-bit packed integer representation of the RGB color
|
||||
* for convenient storage in the DB
|
||||
*
|
||||
* XXX: probably could just use hexdec() instead
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
|
||||
function intValue()
|
||||
{
|
||||
$intcolor = 256 * 256 * $this->red + 256 * $this->green + $this->blue;
|
||||
return $intcolor;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class WebColorException extends Exception
|
||||
{
|
||||
}
|
||||
|
||||
?>
|
||||
Loading…
Reference in New Issue
Block a user