Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
This commit is contained in:
Sarven Capadisli
commit
a9fd175994
@ -34,19 +34,37 @@ if (!defined('LACONICA')) {
|
||||
|
||||
require_once INSTALLDIR . '/lib/designsettings.php';
|
||||
|
||||
/**
|
||||
* Set a group's design
|
||||
*
|
||||
* Saves a design for a given group
|
||||
*
|
||||
* @category Settings
|
||||
* @package Laconica
|
||||
* @author Zach Copley <zach@controlyourself.ca>
|
||||
* @author Sarven Capadisli <csarven@controlyourself.ca>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://laconi.ca/
|
||||
*/
|
||||
|
||||
class GroupDesignSettingsAction extends DesignSettingsAction
|
||||
{
|
||||
var $group = null;
|
||||
|
||||
/**
|
||||
* Prepare to run
|
||||
* Sets the right action for the form, and passes request args into
|
||||
* the base action
|
||||
*
|
||||
* @param array $args misc. arguments
|
||||
*
|
||||
* @return boolean true
|
||||
*/
|
||||
|
||||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
|
||||
if (!common_config('inboxes','enabled')) {
|
||||
if (!common_config('inboxes', 'enabled')) {
|
||||
$this->serverError(_('Inboxes must be enabled for groups to work'));
|
||||
return false;
|
||||
}
|
||||
@ -57,7 +75,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
|
||||
}
|
||||
|
||||
$nickname_arg = $this->trimmed('nickname');
|
||||
$nickname = common_canonical_nickname($nickname_arg);
|
||||
$nickname = common_canonical_nickname($nickname_arg);
|
||||
|
||||
// Permanent redirect on non-canonical nickname
|
||||
|
||||
@ -158,7 +176,8 @@ class GroupDesignSettingsAction extends DesignSettingsAction
|
||||
* @return Design
|
||||
*/
|
||||
|
||||
function getWorkingDesign() {
|
||||
function getWorkingDesign()
|
||||
{
|
||||
|
||||
$design = null;
|
||||
|
||||
@ -273,9 +292,9 @@ class GroupDesignSettingsAction extends DesignSettingsAction
|
||||
return;
|
||||
}
|
||||
|
||||
$original = clone($this->group);
|
||||
$original = clone($this->group);
|
||||
$this->group->design_id = $id;
|
||||
$result = $this->group->update($original);
|
||||
$result = $this->group->update($original);
|
||||
|
||||
if (empty($result)) {
|
||||
common_log_db_error($original, 'UPDATE', __FILE__);
|
||||
|
||||
@ -34,8 +34,29 @@ if (!defined('LACONICA')) {
|
||||
|
||||
require_once INSTALLDIR . '/lib/designsettings.php';
|
||||
|
||||
/**
|
||||
* Set a user's design
|
||||
*
|
||||
* Saves a design for a given user
|
||||
*
|
||||
* @category Settings
|
||||
* @package Laconica
|
||||
* @author Zach Copley <zach@controlyourself.ca>
|
||||
* @author Sarven Capadisli <csarven@controlyourself.ca>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://laconi.ca/
|
||||
*/
|
||||
|
||||
class UserDesignSettingsAction extends DesignSettingsAction
|
||||
{
|
||||
/**
|
||||
* Sets the right action for the form, and passes request args into
|
||||
* the base action
|
||||
*
|
||||
* @param array $args misc. arguments
|
||||
*
|
||||
* @return boolean true
|
||||
*/
|
||||
|
||||
function prepare($args)
|
||||
{
|
||||
@ -73,9 +94,10 @@ class UserDesignSettingsAction extends DesignSettingsAction
|
||||
* @return Design
|
||||
*/
|
||||
|
||||
function getWorkingDesign() {
|
||||
function getWorkingDesign()
|
||||
{
|
||||
|
||||
$user = common_current_user();
|
||||
$user = common_current_user();
|
||||
$design = $user->getDesign();
|
||||
|
||||
if (empty($design)) {
|
||||
@ -106,14 +128,19 @@ class UserDesignSettingsAction extends DesignSettingsAction
|
||||
|
||||
function saveDesign()
|
||||
{
|
||||
try {
|
||||
foreach ($this->args as $key => $val) {
|
||||
if (preg_match('/(#ho|ho)Td.*g/i', $val)) {
|
||||
$this->sethd();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
@ -137,7 +164,7 @@ class UserDesignSettingsAction extends DesignSettingsAction
|
||||
$tile = true;
|
||||
}
|
||||
|
||||
$user = common_current_user();
|
||||
$user = common_current_user();
|
||||
$design = $user->getDesign();
|
||||
|
||||
if (!empty($design)) {
|
||||
@ -184,9 +211,9 @@ class UserDesignSettingsAction extends DesignSettingsAction
|
||||
return;
|
||||
}
|
||||
|
||||
$original = clone($user);
|
||||
$original = clone($user);
|
||||
$user->design_id = $id;
|
||||
$result = $user->update($original);
|
||||
$result = $user->update($original);
|
||||
|
||||
if (empty($result)) {
|
||||
common_log_db_error($original, 'UPDATE', __FILE__);
|
||||
@ -203,4 +230,56 @@ class UserDesignSettingsAction extends DesignSettingsAction
|
||||
|
||||
$this->showForm(_('Design preferences saved.'), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Alternate default colors
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function sethd()
|
||||
{
|
||||
|
||||
$user = common_current_user();
|
||||
$design = $user->getDesign();
|
||||
|
||||
$user->query('BEGIN');
|
||||
|
||||
// alternate colors
|
||||
$design = new Design();
|
||||
|
||||
$design->backgroundcolor = 16184329;
|
||||
$design->contentcolor = 16059904;
|
||||
$design->sidebarcolor = 16059904;
|
||||
$design->textcolor = 0;
|
||||
$design->linkcolor = 16777215;
|
||||
|
||||
$design->setDisposition(false, true, false);
|
||||
|
||||
$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->saveBackgroundImage($design);
|
||||
|
||||
$this->showForm(_('Enjoy your hotdog!'), true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -35,6 +35,20 @@ if (!defined('LACONICA')) {
|
||||
require_once INSTALLDIR . '/lib/accountsettingsaction.php';
|
||||
require_once INSTALLDIR . '/lib/webcolor.php';
|
||||
|
||||
/**
|
||||
* Base class for setting a user or group design
|
||||
*
|
||||
* Shows the design setting form and also handles some things like saving
|
||||
* background images, and fetching a default design
|
||||
*
|
||||
* @category Settings
|
||||
* @package Laconica
|
||||
* @author Zach Copley <zach@controlyourself.ca>
|
||||
* @author Sarven Capadisli <csarven@controlyourself.ca>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://laconi.ca/
|
||||
*/
|
||||
|
||||
class DesignSettingsAction extends AccountSettingsAction
|
||||
{
|
||||
|
||||
@ -63,6 +77,14 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
'with a background image and a colour palette of your choice.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows the design settings form
|
||||
*
|
||||
* @param Design $design a working design to show
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function showDesignForm($design)
|
||||
{
|
||||
|
||||
@ -94,7 +116,8 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
|
||||
if (!empty($design->backgroundimage)) {
|
||||
|
||||
$this->elementStart('li', array('id' => 'design_background-image_onoff'));
|
||||
$this->elementStart('li', array('id' =>
|
||||
'design_background-image_onoff'));
|
||||
|
||||
$this->element('img', array('src' =>
|
||||
Design::url($design->backgroundimage)));
|
||||
@ -136,7 +159,7 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
$this->elementStart('li');
|
||||
$this->checkbox('design_background-image_repeat',
|
||||
_('Tile background image'),
|
||||
($design->disposition & BACKGROUND_TILE) ? true : false );
|
||||
($design->disposition & BACKGROUND_TILE) ? true : false);
|
||||
$this->elementEnd('li');
|
||||
}
|
||||
|
||||
@ -212,18 +235,19 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
'maxlength' => '7',
|
||||
'size' => '7',
|
||||
'value' => '#' . $lcolor->hexValue()));
|
||||
$this->elementEnd('li');
|
||||
|
||||
$this->elementEnd('li');
|
||||
} catch (WebColorException $e) {
|
||||
common_log(LOG_ERR, 'Bad color values in design ID: ' .$design->id);
|
||||
}
|
||||
|
||||
} catch (WebColorException $e) {
|
||||
common_log(LOG_ERR, 'Bad color values in design ID: ' .
|
||||
$design->id);
|
||||
}
|
||||
$this->elementEnd('ul');
|
||||
$this->elementEnd('fieldset');
|
||||
|
||||
$this->elementEnd('ul');
|
||||
$this->elementEnd('fieldset');
|
||||
$this->submit('defaults', _('Use defaults'), 'submit form_action-default',
|
||||
'defaults', _('Restore default designs'));
|
||||
|
||||
$this->element('input', array('id' => 'settings_design_reset',
|
||||
$this->element('input', array('id' => 'settings_design_reset',
|
||||
'type' => 'reset',
|
||||
'value' => 'Reset',
|
||||
'class' => 'submit form_action-primary',
|
||||
@ -271,8 +295,8 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
|
||||
if ($this->arg('save')) {
|
||||
$this->saveDesign();
|
||||
} else if ($this->arg('reset')) {
|
||||
$this->resetDesign();
|
||||
} else if ($this->arg('defaults')) {
|
||||
$this->restoreDefaults();
|
||||
} else {
|
||||
$this->showForm(_('Unexpected form submission.'));
|
||||
}
|
||||
@ -316,7 +340,7 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a default user design
|
||||
* Get a default design
|
||||
*
|
||||
* @return Design design
|
||||
*/
|
||||
@ -358,7 +382,16 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
return $design;
|
||||
}
|
||||
|
||||
function saveBackgroundImage($design) {
|
||||
/**
|
||||
* Save the background image, if any, and set its disposition
|
||||
*
|
||||
* @param Design $design a working design to attach the img to
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function saveBackgroundImage($design)
|
||||
{
|
||||
|
||||
// Now that we have a Design ID we can add a file to the design.
|
||||
// XXX: This is an additional DB hit, but figured having the image
|
||||
@ -371,12 +404,12 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
$filepath = null;
|
||||
|
||||
try {
|
||||
$imagefile =
|
||||
ImageFile::fromUpload('design_background-image_file');
|
||||
} catch (Exception $e) {
|
||||
$this->showForm($e->getMessage());
|
||||
return;
|
||||
}
|
||||
$imagefile =
|
||||
ImageFile::fromUpload('design_background-image_file');
|
||||
} catch (Exception $e) {
|
||||
$this->showForm($e->getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
$filename = Design::filename($design->id,
|
||||
image_type_to_extension($imagefile->type),
|
||||
@ -386,7 +419,14 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
|
||||
move_uploaded_file($imagefile->filepath, $filepath);
|
||||
|
||||
// delete any old backround img laying around
|
||||
|
||||
if (isset($design->backgroundimage)) {
|
||||
@unlink(Design::path($design->backgroundimage));
|
||||
}
|
||||
|
||||
$original = clone($design);
|
||||
|
||||
$design->backgroundimage = $filename;
|
||||
|
||||
// default to on, no tile
|
||||
@ -403,4 +443,35 @@ class DesignSettingsAction extends AccountSettingsAction
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore the user or group design to system defaults
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function restoreDefaults()
|
||||
{
|
||||
$design = $this->getWorkingDesign();
|
||||
$default = $this->defaultDesign();
|
||||
$original = clone($design);
|
||||
|
||||
$design->backgroundcolor = $default->backgroundcolor;
|
||||
$design->contentcolor = $default->contentcolor;
|
||||
$design->sidebarcolor = $default->sidebarcolor;
|
||||
$design->textcolor = $default->textcolor;
|
||||
$design->linkcolor = $default->linkcolor;
|
||||
|
||||
$design->setDisposition(false, true, false);
|
||||
|
||||
$result = $design->update($original);
|
||||
|
||||
if ($result === false) {
|
||||
common_log_db_error($design, 'UPDATE', __FILE__);
|
||||
$this->showForm(_('Couldn\'t update your design.'));
|
||||
return;
|
||||
}
|
||||
|
||||
$this->showForm(_('Design defaults restored.'), true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -206,6 +206,10 @@ border-radius:4px;
|
||||
padding:0 7px;
|
||||
}
|
||||
|
||||
.form_settings input.form_action-default {
|
||||
margin-right:11px;
|
||||
}
|
||||
.form_settings input.form_action-default,
|
||||
.form_settings input.form_action-primary {
|
||||
padding:0;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user