+++ /dev/null
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Miscellaneous settings
- *
- * 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 Settings
- * @package StatusNet
- * @author Robin Millette <millette@status.net>
- * @author Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
-
-require_once INSTALLDIR.'/lib/accountsettingsaction.php';
-
-/**
- * Miscellaneous settings actions
- *
- * Currently this just manages URL shortening.
- *
- * @category Settings
- * @package StatusNet
- * @author Robin Millette <millette@status.net>
- * @author Zach Copley <zach@status.net>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- */
-
-class OthersettingsAction extends AccountSettingsAction
-{
- /**
- * Title of the page
- *
- * @return string Title of the page
- */
-
- function title()
- {
- return _('Other settings');
- }
-
- /**
- * Instructions for use
- *
- * @return instructions for use
- */
-
- function getInstructions()
- {
- return _('Manage various other options.');
- }
-
- function showScripts()
- {
- parent::showScripts();
- $this->autofocus('urlshorteningservice');
- }
-
- /**
- * Content area of the page
- *
- * Shows a form for uploading an avatar.
- *
- * @return void
- */
-
- function showContent()
- {
- $user = common_current_user();
-
- $this->elementStart('form', array('method' => 'post',
- 'id' => 'form_settings_other',
- 'class' => 'form_settings',
- 'action' =>
- common_local_url('othersettings')));
- $this->elementStart('fieldset');
- $this->hidden('token', common_session_token());
- $this->elementStart('ul', 'form_data');
-
- $shorteners = array(_('[none]') => array('freeService' => false));
-
- Event::handle('GetUrlShorteners', array(&$shorteners));
-
- $services = array();
- foreach($shorteners as $name=>$value)
- {
- $services[$name]=$name;
- if($value['freeService']){
- $services[$name].=_(' (free service)');
- }
- }
- if($services)
- {
- asort($services);
-
- $this->elementStart('li');
- $this->dropdown('urlshorteningservice', _('Shorten URLs with'),
- $services, _('Automatic shortening service to use.'),
- false, $user->urlshorteningservice);
- $this->elementEnd('li');
- }
- $this->elementStart('li');
- $this->input('maxurllength',
- _('URL longer than'),
- (!is_null($this->arg('maxurllength'))) ?
- $this->arg('maxurllength') : User_urlshortener_prefs::maxUrlLength($user),
- _('URLs longer than this will be shortened.'));
- $this->elementEnd('li');
- $this->elementStart('li');
- $this->input('maxnoticelength',
- _('Text longer than'),
- (!is_null($this->arg('maxnoticelength'))) ?
- $this->arg('maxnoticelength') : User_urlshortener_prefs::maxNoticeLength($user),
- _('URLs in notices longer than this will be shortened.'));
- $this->elementEnd('li');
- $this->elementStart('li');
- $this->checkbox('viewdesigns', _('View profile designs'),
- - $user->viewdesigns, _('Show or hide profile designs.'));
- $this->elementEnd('li');
- $this->elementEnd('ul');
- $this->submit('save', _('Save'));
- $this->elementEnd('fieldset');
- $this->elementEnd('form');
- }
-
- /**
- * Handle a post
- *
- * Saves the changes to url-shortening prefs and shows a success or failure
- * message.
- *
- * @return void
- */
-
- function handlePost()
- {
- // CSRF protection
- $token = $this->trimmed('token');
- if (!$token || $token != common_session_token()) {
- $this->showForm(_('There was a problem with your session token. '.
- 'Try again, please.'));
- return;
- }
-
- $urlshorteningservice = $this->trimmed('urlshorteningservice');
-
- if (!is_null($urlshorteningservice) && strlen($urlshorteningservice) > 50) {
- $this->showForm(_('URL shortening service is too long (max 50 chars).'));
- return;
- }
-
- $viewdesigns = $this->boolean('viewdesigns');
-
- $maxurllength = $this->trimmed('maxurllength');
-
- if (!Validate::number($maxurllength, array('min' => 0))) {
- throw new ClientException(_('Invalid number for max url length.'));
- }
-
- $maxnoticelength = $this->trimmed('maxnoticelength');
-
- if (!Validate::number($maxnoticelength, array('min' => 0))) {
- throw new ClientException(_('Invalid number for max notice length.'));
- }
-
- $user = common_current_user();
-
- assert(!is_null($user)); // should already be checked
-
- $user->query('BEGIN');
-
- $original = clone($user);
-
- $user->urlshorteningservice = $urlshorteningservice;
- $user->viewdesigns = $viewdesigns;
-
- $result = $user->update($original);
-
- if ($result === false) {
- common_log_db_error($user, 'UPDATE', __FILE__);
- $this->serverError(_('Couldn\'t update user.'));
- return;
- }
-
- $prefs = User_urlshortener_prefs::getPrefs($user);
- $orig = null;
-
- if (empty($prefs)) {
- $prefs = new User_urlshortener_prefs();
-
- $prefs->user_id = $user->id;
- $prefs->created = common_sql_now();
- } else {
- $orig = clone($prefs);
- }
-
- $prefs->urlshorteningservice = $urlshorteningservice;
- $prefs->maxurllength = $maxurllength;
- $prefs->maxnoticelength = $maxnoticelength;
-
- if (!empty($orig)) {
- $result = $prefs->update($orig);
- } else {
- $result = $prefs->insert();
- }
-
- if (!$result) {
- throw new ServerException(_('Error saving user URL shortening preferences.'));
- }
-
- $user->query('COMMIT');
-
- $this->showForm(_('Preferences saved.'), true);
- }
-}
--- /dev/null
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Miscellaneous settings
+ *
+ * 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 Settings
+ * @package StatusNet
+ * @author Robin Millette <millette@status.net>
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
+/**
+ * Miscellaneous settings actions
+ *
+ * Currently this just manages URL shortening.
+ *
+ * @category Settings
+ * @package StatusNet
+ * @author Robin Millette <millette@status.net>
+ * @author Zach Copley <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class UrlsettingsAction extends AccountSettingsAction
+{
+ /**
+ * Title of the page
+ *
+ * @return string Title of the page
+ */
+
+ function title()
+ {
+ return _('URL settings');
+ }
+
+ /**
+ * Instructions for use
+ *
+ * @return instructions for use
+ */
+
+ function getInstructions()
+ {
+ return _('Manage various other options.');
+ }
+
+ function showScripts()
+ {
+ parent::showScripts();
+ $this->autofocus('urlshorteningservice');
+ }
+
+ /**
+ * Content area of the page
+ *
+ * Shows a form for uploading an avatar.
+ *
+ * @return void
+ */
+
+ function showContent()
+ {
+ $user = common_current_user();
+
+ $this->elementStart('form', array('method' => 'post',
+ 'id' => 'form_settings_other',
+ 'class' => 'form_settings',
+ 'action' =>
+ common_local_url('urlsettings')));
+ $this->elementStart('fieldset');
+ $this->hidden('token', common_session_token());
+ $this->elementStart('ul', 'form_data');
+
+ $shorteners = array(_('[none]') => array('freeService' => false));
+
+ Event::handle('GetUrlShorteners', array(&$shorteners));
+
+ $services = array();
+ foreach($shorteners as $name=>$value)
+ {
+ $services[$name]=$name;
+ if($value['freeService']){
+ $services[$name].=_(' (free service)');
+ }
+ }
+ if($services)
+ {
+ asort($services);
+
+ $this->elementStart('li');
+ $this->dropdown('urlshorteningservice', _('Shorten URLs with'),
+ $services, _('Automatic shortening service to use.'),
+ false, $user->urlshorteningservice);
+ $this->elementEnd('li');
+ }
+ $this->elementStart('li');
+ $this->input('maxurllength',
+ _('URL longer than'),
+ (!is_null($this->arg('maxurllength'))) ?
+ $this->arg('maxurllength') : User_urlshortener_prefs::maxUrlLength($user),
+ _('URLs longer than this will be shortened, 0 means always shorten.'));
+ $this->elementEnd('li');
+ $this->elementStart('li');
+ $this->input('maxnoticelength',
+ _('Text longer than'),
+ (!is_null($this->arg('maxnoticelength'))) ?
+ $this->arg('maxnoticelength') : User_urlshortener_prefs::maxNoticeLength($user),
+ _('URLs in notices longer than this will be shortened, 0 means always shorten.'));
+ $this->elementEnd('li');
+ $this->elementEnd('ul');
+ $this->submit('save', _('Save'));
+ $this->elementEnd('fieldset');
+ $this->elementEnd('form');
+ }
+
+ /**
+ * Handle a post
+ *
+ * Saves the changes to url-shortening prefs and shows a success or failure
+ * message.
+ *
+ * @return void
+ */
+
+ function handlePost()
+ {
+ // CSRF protection
+ $token = $this->trimmed('token');
+ if (!$token || $token != common_session_token()) {
+ $this->showForm(_('There was a problem with your session token. '.
+ 'Try again, please.'));
+ return;
+ }
+
+ $urlshorteningservice = $this->trimmed('urlshorteningservice');
+
+ if (!is_null($urlshorteningservice) && strlen($urlshorteningservice) > 50) {
+ $this->showForm(_('URL shortening service is too long (max 50 chars).'));
+ return;
+ }
+
+ $maxurllength = $this->trimmed('maxurllength');
+
+ if (!Validate::number($maxurllength, array('min' => 0))) {
+ throw new ClientException(_('Invalid number for max url length.'));
+ }
+
+ $maxnoticelength = $this->trimmed('maxnoticelength');
+
+ if (!Validate::number($maxnoticelength, array('min' => 0))) {
+ throw new ClientException(_('Invalid number for max notice length.'));
+ }
+
+ $user = common_current_user();
+
+ assert(!is_null($user)); // should already be checked
+
+ $user->query('BEGIN');
+
+ $original = clone($user);
+
+ $user->urlshorteningservice = $urlshorteningservice;
+
+ $result = $user->update($original);
+
+ if ($result === false) {
+ common_log_db_error($user, 'UPDATE', __FILE__);
+ $this->serverError(_('Couldn\'t update user.'));
+ return;
+ }
+
+ $prefs = User_urlshortener_prefs::getPrefs($user);
+ $orig = null;
+
+ if (empty($prefs)) {
+ $prefs = new User_urlshortener_prefs();
+
+ $prefs->user_id = $user->id;
+ $prefs->created = common_sql_now();
+ } else {
+ $orig = clone($prefs);
+ }
+
+ $prefs->urlshorteningservice = $urlshorteningservice;
+ $prefs->maxurllength = $maxurllength;
+ $prefs->maxnoticelength = $maxnoticelength;
+
+ if (!empty($orig)) {
+ $result = $prefs->update($orig);
+ } else {
+ $result = $prefs->insert();
+ }
+
+ if (!$result) {
+ throw new ServerException(_('Error saving user URL shortening preferences.'));
+ }
+
+ $user->query('COMMIT');
+
+ $this->showForm(_('Preferences saved.'), true);
+ }
+}
$this->showDesignForm($design);
}
+ /**
+ * Shows the design settings form
+ *
+ * @param Design $design a working design to show
+ *
+ * @return nothing
+ */
+
+ function showDesignForm($design)
+ {
+ $form = new UserDesignForm($this, $design, $this->submitaction);
+ $form->show();
+ }
+
/**
* Save or update the user's design settings
*
function saveDesign()
{
+ $this->saveDesignPreferences();
+
foreach ($this->args as $key => $val) {
if (preg_match('/(#ho|ho)Td.*g/i', $val)) {
$this->sethd();
$tile = true;
}
- $user = common_current_user();
+ $user = common_current_user();
+
$design = $user->getDesign();
if (!empty($design)) {
$this->showForm(_('Enjoy your hotdog!'), true);
}
+ function saveDesignPreferences()
+ {
+ $viewdesigns = $this->boolean('viewdesigns');
+
+ $user = common_current_user();
+
+ $original = clone($user);
+
+ $user->viewdesigns = $viewdesigns;
+
+ $result = $user->update($original);
+
+ if ($result === false) {
+ common_log_db_error($user, 'UPDATE', __FILE__);
+ throw new ServerException(_('Couldn\'t update user.'));
+ }
+ }
+}
+
+class UserDesignForm extends DesignForm
+{
+ function __construct($out, $design, $actionurl)
+ {
+ parent::__construct($out, $design, $actionurl);
+ }
+
+ /**
+ * Legend of the Form
+ *
+ * @return void
+ */
+ function formLegend()
+ {
+ $this->out->element('legend', null, _('Design settings'));
+ }
+
+ /**
+ * Data elements of the form
+ *
+ * @return void
+ */
+
+ function formData()
+ {
+ $user = common_current_user();
+
+ $this->out->elementStart('ul', 'form_data');
+ $this->out->elementStart('li');
+ $this->out->checkbox('viewdesigns', _('View profile designs'),
+ - $user->viewdesigns, _('Show or hide profile designs.'));
+ $this->out->elementEnd('li');
+ $this->out->elementEnd('ul');
+
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart('fieldset');
+ $this->out->element('legend', null, _('Background file'));
+
+ parent::formData();
+ }
}
$this->showMenuItem('userdesignsettings',_('Design'),$title);
Event::handle('EndAccountSettingsDesignMenuItem', array($this, &$menu));
}
- if(Event::handle('StartAccountSettingsOtherMenuItem', array($this, &$menu))){
+ if(Event::handle('StartAccountSettingsUrlMenuItem', array($this, &$menu))){
// TRANS: Link title attribute in user account settings menu.
- $title = _('Other options');
+ $title = _('URL shortener settings');
// TRANS: Link description in user account settings menu.
- $this->showMenuItem('othersettings',_('Other'),$title);
- Event::handle('EndAccountSettingsOtherMenuItem', array($this, &$menu));
+ $this->showMenuItem('urlsettings',_('URL'),$title);
+ Event::handle('EndAccountSettingsUrlMenuItem', array($this, &$menu));
}
Event::handle('EndAccountSettingsNav', array(&$this->action));
*/
function formData()
+ {
+ $this->backgroundData();
+
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
+ $this->out->element('legend', null, _('Change colours'));
+ $this->colourData();
+ $this->out->elementEnd('fieldset');
+
+ $this->out->elementStart('fieldset');
+
+ $this->out->submit('defaults', _('Use defaults'), 'submit form_action-default',
+ 'defaults', _('Restore default designs'));
+
+ $this->out->element('input', array('id' => 'settings_design_reset',
+ 'type' => 'reset',
+ 'value' => 'Reset',
+ 'class' => 'submit form_action-primary',
+ 'title' => _('Reset back to default')));
+ }
+
+ function backgroundData()
{
$this->out->elementStart('ul', 'form_data');
$this->out->elementStart('li');
'value' => ImageFile::maxFileSizeInt()));
$this->out->elementEnd('li');
- if (!empty($design->backgroundimage)) {
+ if (!empty($this->design->backgroundimage)) {
$this->out->elementStart('li', array('id' =>
'design_background-image_onoff'));
$this->out->element('img', array('src' =>
- Design::url($design->backgroundimage)));
+ Design::url($this->design->backgroundimage)));
$attrs = array('name' => 'design_background-image_onoff',
'type' => 'radio',
'class' => 'radio',
'value' => 'on');
- if ($design->disposition & BACKGROUND_ON) {
+ if ($this->design->disposition & BACKGROUND_ON) {
$attrs['checked'] = 'checked';
}
'class' => 'radio',
'value' => 'off');
- if ($design->disposition & BACKGROUND_OFF) {
+ if ($this->design->disposition & BACKGROUND_OFF) {
$attrs['checked'] = 'checked';
}
$this->out->elementStart('li');
$this->out->checkbox('design_background-image_repeat',
_('Tile background image'),
- ($design->disposition & BACKGROUND_TILE) ? true : false);
+ ($this->design->disposition & BACKGROUND_TILE) ? true : false);
$this->out->elementEnd('li');
}
$this->out->elementEnd('ul');
- $this->out->elementEnd('fieldset');
+ }
- $this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
- $this->out->element('legend', null, _('Change colours'));
+ function colourData()
+ {
$this->out->elementStart('ul', 'form_data');
try {
- $bgcolor = new WebColor($design->backgroundcolor);
+ $bgcolor = new WebColor($this->design->backgroundcolor);
$this->out->elementStart('li');
$this->out->element('label', array('for' => 'swatch-1'), _('Background'));
'value' => ''));
$this->out->elementEnd('li');
- $ccolor = new WebColor($design->contentcolor);
+ $ccolor = new WebColor($this->design->contentcolor);
$this->out->elementStart('li');
$this->out->element('label', array('for' => 'swatch-2'), _('Content'));
'value' => ''));
$this->out->elementEnd('li');
- $sbcolor = new WebColor($design->sidebarcolor);
+ $sbcolor = new WebColor($this->design->sidebarcolor);
$this->out->elementStart('li');
$this->out->element('label', array('for' => 'swatch-3'), _('Sidebar'));
'value' => ''));
$this->out->elementEnd('li');
- $tcolor = new WebColor($design->textcolor);
+ $tcolor = new WebColor($this->design->textcolor);
$this->out->elementStart('li');
$this->out->element('label', array('for' => 'swatch-4'), _('Text'));
'value' => ''));
$this->out->elementEnd('li');
- $lcolor = new WebColor($design->linkcolor);
+ $lcolor = new WebColor($this->design->linkcolor);
$this->out->elementStart('li');
$this->out->element('label', array('for' => 'swatch-5'), _('Links'));
$this->out->elementEnd('li');
} catch (WebColorException $e) {
- common_log(LOG_ERR, 'Bad color values in design ID: ' .$design->id);
+ common_log(LOG_ERR, 'Bad color values in design ID: ' .$this->design->id);
}
$this->out->elementEnd('ul');
- $this->out->elementEnd('fieldset');
-
- $this->out->elementStart('fieldset');
-
- $this->out->submit('defaults', _('Use defaults'), 'submit form_action-default',
- 'defaults', _('Restore default designs'));
-
- $this->out->element('input', array('id' => 'settings_design_reset',
- 'type' => 'reset',
- 'value' => 'Reset',
- 'class' => 'submit form_action-primary',
- 'title' => _('Reset back to default')));
}
/**
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
// associated with the Design rather than the User was worth
// it. -- Zach
- if ($_FILES['design_background-image_file']['error'] ==
- UPLOAD_ERR_OK) {
+ if (array_key_exists('design_background-image_file', $_FILES) &&
+ $_FILES['design_background-image_file']['error'] == UPLOAD_ERR_OK) {
$filepath = null;
try {
- $imagefile =
- ImageFile::fromUpload('design_background-image_file');
+ $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),
- common_timestamp());
+ image_type_to_extension($imagefile->type),
+ common_timestamp());
$filepath = Design::path($filename);
// settings
foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
- 'oauthapps', 'email', 'sms', 'userdesign', 'other') as $s) {
+ 'oauthapps', 'email', 'sms', 'userdesign', 'url') as $s) {
$m->connect('settings/'.$s, array('action' => $s.'settings'));
}
projects / quix0rs-gnu-social.git / commitdiff