summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/avatarsettings.php4
-rw-r--r--actions/emailsettings.php7
-rw-r--r--actions/imsettings.php4
-rw-r--r--actions/openidsettings.php4
-rw-r--r--actions/othersettings.php4
-rw-r--r--actions/passwordsettings.php161
-rw-r--r--actions/profilesettings.php378
-rw-r--r--actions/smssettings.php5
-rw-r--r--actions/twittersettings.php7
-rw-r--r--lib/accountsettingsaction.php134
-rw-r--r--lib/action.php82
-rw-r--r--lib/connectsettingsaction.php (renamed from lib/settingsgroupnav.php)67
-rw-r--r--lib/rssaction.php97
-rw-r--r--lib/settingsaction.php15
-rw-r--r--lib/util.php4
15 files changed, 578 insertions, 395 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index de5473d9f..a9b381b0a 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
/**
* Upload an avatar
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
* @link http://laconi.ca/
*/
-class AvatarsettingsAction extends SettingsAction
+class AvatarsettingsAction extends AccountSettingsAction
{
/**
* Title of the page
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 355470815..b1f13c18c 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
/**
* Settings for email
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
* @see Widget
*/
-class EmailsettingsAction extends SettingsAction
+class EmailsettingsAction extends AccountSettingsAction
{
/**
* Title of the page
@@ -103,7 +103,7 @@ class EmailsettingsAction extends SettingsAction
$confirm = $this->getConfirmation();
if ($confirm) {
$this->element('p', array('id' => 'email_unconfirmed'), $confirm->address);
- $this->element('p', array('class' => 'form_note'),
+ $this->element('p', array('class' => 'form_note'),
_('Awaiting confirmation on this address. '.
'Check your inbox (and spam box!) for a message '.
'with further instructions.'));
@@ -143,7 +143,6 @@ class EmailsettingsAction extends SettingsAction
$this->elementEnd('fieldset');
}
-
$this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
$this->element('legend', null, _('Preferences'));
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 3e578b307..98951ac30 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -31,7 +31,7 @@ if (!defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/connectsettingsaction.php';
require_once INSTALLDIR.'/lib/jabber.php';
/**
@@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/jabber.php';
* @see SettingsAction
*/
-class ImsettingsAction extends SettingsAction
+class ImsettingsAction extends ConnectSettingsAction
{
/**
* Title of the page
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 6f17f154c..257aac8d0 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -31,7 +31,7 @@ if (!defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
require_once INSTALLDIR.'/lib/openid.php';
/**
@@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/openid.php';
* @link http://laconi.ca/
*/
-class OpenidsettingsAction extends SettingsAction
+class OpenidsettingsAction extends AccountSettingsAction
{
/**
* Title of the page
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 51f6f8197..a7664d74e 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -19,9 +19,9 @@
if (!defined('LACONICA')) { exit(1); }
-require_once(INSTALLDIR.'/lib/settingsaction.php');
+require_once(INSTALLDIR.'/lib/accountsettingsaction.php');
-class OthersettingsAction extends SettingsAction
+class OthersettingsAction extends AccountSettingsAction
{
function get_instructions()
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
new file mode 100644
index 000000000..f96da13bd
--- /dev/null
+++ b/actions/passwordsettings.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Change user password
+ *
+ * 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 Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-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);
+}
+
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
+/**
+ * Change password
+ *
+ * @category Settings
+ * @package Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Zach Copley <zach@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 PasswordsettingsAction extends AccountSettingsAction
+{
+ /**
+ * Title of the page
+ *
+ * @return string Title of the page
+ */
+
+ function title()
+ {
+ return _('Change password');
+ }
+
+ /**
+ * Instructions for use
+ *
+ * @return instructions for use
+ */
+
+ function getInstructions()
+ {
+ return _('Change your password.');
+ }
+
+ /**
+ * Content area of the page
+ *
+ * Shows a form for changing the password
+ *
+ * @return void
+ */
+
+ function showContent()
+ {
+ $user = common_current_user();
+ $this->elementStart('form', array('method' => 'POST',
+ 'id' => 'password',
+ 'action' =>
+ common_local_url('profilesettings')));
+
+ $this->hidden('token', common_session_token());
+
+ // Users who logged in with OpenID won't have a pwd
+ if ($user->password) {
+ $this->password('oldpassword', _('Old password'));
+ }
+ $this->password('newpassword', _('New password'),
+ _('6 or more characters'));
+ $this->password('confirm', _('Confirm'),
+ _('same as password above'));
+ $this->submit('changepass', _('Change'));
+ $this->elementEnd('form');
+ }
+
+ /**
+ * Handle a post
+ *
+ * Validate input and save changes. Reload the form with a success
+ * or error 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;
+ }
+
+ $user = common_current_user();
+ assert(!is_null($user)); // should already be checked
+
+ // FIXME: scrub input
+
+ $newpassword = $this->arg('newpassword');
+ $confirm = $this->arg('confirm');
+
+ if (0 != strcmp($newpassword, $confirm)) {
+ $this->showForm(_('Passwords don\'t match.'));
+ return;
+ }
+
+ if ($user->password) {
+ $oldpassword = $this->arg('oldpassword');
+
+ if (!common_check_user($user->nickname, $oldpassword)) {
+ $this->showForm(_('Incorrect old password'));
+ return;
+ }
+ }
+
+ $original = clone($user);
+
+ $user->password = common_munge_password($newpassword, $user->id);
+
+ $val = $user->validate();
+ if ($val !== true) {
+ $this->showForm(_('Error saving user; invalid.'));
+ return;
+ }
+
+ if (!$user->update($original)) {
+ $this->serverError(_('Can\'t save new password.'));
+ return;
+ }
+
+ $this->showForm(_('Password saved.'), true);
+ }
+} \ No newline at end of file
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 6ad3f2ef5..c31f76227 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -1,9 +1,12 @@
<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
*
- * This program is free software: you can redistribute it and/or modify
+ * Change profile 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.
@@ -15,62 +18,68 @@
*
* 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 Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-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); }
+if (!defined('LACONICA')) {
+ exit(1);
+}
+
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
-require_once(INSTALLDIR.'/lib/settingsaction.php');
+/**
+ * Change profile settings
+ *
+ * @category Settings
+ * @package Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Zach Copley <zach@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 ProfilesettingsAction extends SettingsAction
+class ProfilesettingsAction extends AccountSettingsAction
{
+ /**
+ * Title of the page
+ *
+ * @return string Title of the page
+ */
- function get_instructions()
+ function title()
{
- return _('You can update your personal profile info here '.
- 'so people know more about you.');
+ return _('Profile settings');
}
- function show_form($msg=null, $success=false)
- {
- $this->form_header(_('Profile settings'), $msg, $success);
- $this->show_settings_form();
- $this->element('h2', null, _('Avatar'));
- $this->show_avatar_form();
- $this->element('h2', null, _('Change password'));
- $this->show_password_form();
-// $this->element('h2', null, _('Delete my account'));
-// $this->show_delete_form();
- common_show_footer();
- }
+ /**
+ * Instructions for use
+ *
+ * @return instructions for use
+ */
- function handle_post()
+ function getInstructions()
{
-
- # CSRF protection
-
- $token = $this->trimmed('token');
- if (!$token || $token != common_session_token()) {
- $this->show_form(_('There was a problem with your session token. Try again, please.'));
- return;
- }
-
- if ($this->arg('save')) {
- $this->save_profile();
- } else if ($this->arg('upload')) {
- $this->upload_avatar();
- } else if ($this->arg('crop')) {
- $this->crop_avatar();
- } else if ($this->arg('changepass')) {
- $this->change_password();
- } else {
- $this->show_form(_('Unexpected form submission.'));
- }
-
+ return _('You can update your personal profile info here '.
+ 'so people know more about you.');
}
- function show_settings_form()
- {
+ /**
+ * Content area of the page
+ *
+ * Shows a form for uploading an avatar.
+ *
+ * @return void
+ */
+ function showContent()
+ {
$user = common_current_user();
$profile = $user->getProfile();
@@ -78,9 +87,9 @@ class ProfilesettingsAction extends SettingsAction
'id' => 'profilesettings',
'action' => common_local_url('profilesettings')));
$this->hidden('token', common_session_token());
-
+
# too much common patterns here... abstractable?
-
+
$this->input('nickname', _('Nickname'),
($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
_('1-64 lowercase letters or numbers, no punctuation or spaces'));
@@ -100,16 +109,24 @@ class ProfilesettingsAction extends SettingsAction
_('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
$language = common_language();
- $this->dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), true, $language);
+ $this->dropdown('language', _('Language'),
+ get_nice_language_list(), _('Preferred language'),
+ true, $language);
+
$timezone = common_timezone();
$timezones = array();
foreach(DateTimeZone::listIdentifiers() as $k => $v) {
$timezones[$v] = $v;
}
- $this->dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), true, $timezone);
+ $this->dropdown('timezone', _('Timezone'),
+ $timezones, _('What timezone are you normally in?'),
+ true, $timezone);
- $this->checkbox('autosubscribe', _('Automatically subscribe to whoever subscribes to me (best for non-humans)'),
- ($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe);
+ $this->checkbox('autosubscribe',
+ _('Automatically subscribe to whoever '.
+ 'subscribes to me (best for non-humans)'),
+ ($this->arg('autosubscribe')) ?
+ $this->boolean('autosubscribe') : $user->autosubscribe);
$this->submit('save', _('Save'));
@@ -117,105 +134,26 @@ class ProfilesettingsAction extends SettingsAction
}
- function show_avatar_form()
- {
-
- $user = common_current_user();
- $profile = $user->getProfile();
-
- if (!$profile) {
- common_log_db_error($user, 'SELECT', __FILE__);
- $this->serverError(_('User without matching profile'));
- return;
- }
-
- $original = $profile->getOriginalAvatar();
-
-
- $this->elementStart('form', array('enctype' => 'multipart/form-data',
- 'method' => 'POST',
- 'id' => 'avatar',
- 'action' =>
- common_local_url('profilesettings')));
- $this->hidden('token', common_session_token());
-
- if ($original) {
- $this->elementStart('div', array('id'=>'avatar_original', 'class'=>'avatar_view'));
- $this->element('h3', null, _("Original:"));
- $this->elementStart('div', array('id'=>'avatar_original_view'));
- $this->element('img', array('src' => $original->url,
- 'class' => 'avatar original',
- 'width' => $original->width,
- 'height' => $original->height,
- 'alt' => $user->nickname));
- $this->elementEnd('div');
- $this->elementEnd('div');
- }
-
- $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-
- if ($avatar) {
- $this->elementStart('div', array('id'=>'avatar_preview', 'class'=>'avatar_view'));
- $this->element('h3', null, _("Preview:"));
- $this->elementStart('div', array('id'=>'avatar_preview_view'));
- $this->element('img', array('src' => $original->url,//$avatar->url,
- 'class' => 'avatar profile',
- 'width' => AVATAR_PROFILE_SIZE,
- 'height' => AVATAR_PROFILE_SIZE,
- 'alt' => $user->nickname));
- $this->elementEnd('div');
- $this->elementEnd('div');
-
- foreach(array('avatar_crop_x', 'avatar_crop_y', 'avatar_crop_w', 'avatar_crop_h') as $crop_info) {
- $this->element('input', array('name' => $crop_info,
- 'type' => 'hidden',
- 'id' => $crop_info));
- }
- $this->submit('crop', _('Crop'));
- }
-
- $this->element('input', array('name' => 'MAX_FILE_SIZE',
- 'type' => 'hidden',
- 'id' => 'MAX_FILE_SIZE',
- 'value' => MAX_AVATAR_SIZE));
-
- $this->elementStart('p');
-
- $this->element('input', array('name' => 'avatarfile',
- 'type' => 'file',
- 'id' => 'avatarfile'));
- $this->elementEnd('p');
+ /**
+ * Handle a post
+ *
+ * Validate input and save changes. Reload the form with a success
+ * or error message.
+ *
+ * @return void
+ */
- $this->submit('upload', _('Upload'));
- $this->elementEnd('form');
-
- }
-
- function show_password_form()
+ function handlePost()
{
+ # CSRF protection
- $user = common_current_user();
- $this->elementStart('form', array('method' => 'POST',
- 'id' => 'password',
- 'action' =>
- common_local_url('profilesettings')));
-
- $this->hidden('token', common_session_token());
-
- # Users who logged in with OpenID won't have a pwd
- if ($user->password) {
- $this->password('oldpassword', _('Old password'));
+ $token = $this->trimmed('token');
+ if (!$token || $token != common_session_token()) {
+ $this->showForm(_('There was a problem with your session token. '.
+ 'Try again, please.'));
+ return;
}
- $this->password('newpassword', _('New password'),
- _('6 or more characters'));
- $this->password('confirm', _('Confirm'),
- _('same as password above'));
- $this->submit('changepass', _('Change'));
- $this->elementEnd('form');
- }
- function save_profile()
- {
$nickname = $this->trimmed('nickname');
$fullname = $this->trimmed('fullname');
$homepage = $this->trimmed('homepage');
@@ -225,38 +163,38 @@ class ProfilesettingsAction extends SettingsAction
$language = $this->trimmed('language');
$timezone = $this->trimmed('timezone');
$tagstring = $this->trimmed('tags');
-
+
# Some validation
if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
- $this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
+ $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.'));
return;
} else if (!User::allowed_nickname($nickname)) {
- $this->show_form(_('Not a valid nickname.'));
+ $this->showForm(_('Not a valid nickname.'));
return;
} else if (!is_null($homepage) && (strlen($homepage) > 0) &&
!Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
- $this->show_form(_('Homepage is not a valid URL.'));
+ $this->showForm(_('Homepage is not a valid URL.'));
return;
} else if (!is_null($fullname) && strlen($fullname) > 255) {
- $this->show_form(_('Full name is too long (max 255 chars).'));
+ $this->showForm(_('Full name is too long (max 255 chars).'));
return;
} else if (!is_null($bio) && strlen($bio) > 140) {
- $this->show_form(_('Bio is too long (max 140 chars).'));
+ $this->showForm(_('Bio is too long (max 140 chars).'));
return;
} else if (!is_null($location) && strlen($location) > 255) {
- $this->show_form(_('Location is too long (max 255 chars).'));
+ $this->showForm(_('Location is too long (max 255 chars).'));
return;
} else if (is_null($timezone) || !in_array($timezone, DateTimeZone::listIdentifiers())) {
- $this->show_form(_('Timezone not selected.'));
+ $this->showForm(_('Timezone not selected.'));
return;
- } else if ($this->nickname_exists($nickname)) {
- $this->show_form(_('Nickname already in use. Try another one.'));
+ } else if ($this->nicknameExists($nickname)) {
+ $this->showForm(_('Nickname already in use. Try another one.'));
return;
} else if (!is_null($language) && strlen($language) > 50) {
- $this->show_form(_('Language is too long (max 50 chars).'));
+ $this->showForm(_('Language is too long (max 50 chars).'));
return;
}
@@ -265,14 +203,14 @@ class ProfilesettingsAction extends SettingsAction
} else {
$tags = array();
}
-
+
foreach ($tags as $tag) {
if (!common_valid_profile_tag($tag)) {
- $this->show_form(sprintf(_('Invalid tag: "%s"'), $tag));
+ $this->showForm(sprintf(_('Invalid tag: "%s"'), $tag));
return;
}
}
-
+
$user = common_current_user();
$user->query('BEGIN');
@@ -346,139 +284,29 @@ class ProfilesettingsAction extends SettingsAction
}
# Set the user tags
-
+
$result = $user->setSelfTags($tags);
if (!$result) {
$this->serverError(_('Couldn\'t save tags.'));
return;
}
-
+
$user->query('COMMIT');
common_broadcast_profile($profile);
- $this->show_form(_('Settings saved.'), true);
+ $this->showForm(_('Settings saved.'), true);
}
-
- function upload_avatar()
- {
- switch ($_FILES['avatarfile']['error']) {
- case UPLOAD_ERR_OK: # success, jump out
- break;
- case UPLOAD_ERR_INI_SIZE:
- case UPLOAD_ERR_FORM_SIZE:
- $this->show_form(_('That file is too big.'));
- return;
- case UPLOAD_ERR_PARTIAL:
- @unlink($_FILES['avatarfile']['tmp_name']);
- $this->show_form(_('Partial upload.'));
- return;
- default:
- $this->show_form(_('System error uploading file.'));
- return;
- }
-
- $info = @getimagesize($_FILES['avatarfile']['tmp_name']);
-
- if (!$info) {
- @unlink($_FILES['avatarfile']['tmp_name']);
- $this->show_form(_('Not an image or corrupt file.'));
- return;
- }
-
- switch ($info[2]) {
- case IMAGETYPE_GIF:
- case IMAGETYPE_JPEG:
- case IMAGETYPE_PNG:
- break;
- default:
- $this->show_form(_('Unsupported image file format.'));
- return;
- }
-
- $user = common_current_user();
- $profile = $user->getProfile();
-
- if ($profile->setOriginal($_FILES['avatarfile']['tmp_name'])) {
- $this->show_form(_('Avatar updated.'), true);
- } else {
- $this->show_form(_('Failed updating avatar.'));
- }
-
- @unlink($_FILES['avatarfile']['tmp_name']);
- }
-
- function crop_avatar() {
-
- $user = common_current_user();
- $profile = $user->getProfile();
-
- $x = $this->arg('avatar_crop_x');
- $y = $this->arg('avatar_crop_y');
- $w = $this->arg('avatar_crop_w');
- $h = $this->arg('avatar_crop_h');
-
- if ($profile->crop_avatars($x, $y, $w, $h)) {
- $this->show_form(_('Avatar updated.'), true);
- } else {
- $this->show_form(_('Failed updating avatar.'));
- }
- }
-
- function nickname_exists($nickname)
+ function nicknameExists($nickname)
{
$user = common_current_user();
$other = User::staticGet('nickname', $nickname);
if (!$other) {
- return false;
+ return false;
} else {
return $other->id != $user->id;
}
}
-
- function change_password()
- {
-
- $user = common_current_user();
- assert(!is_null($user)); # should already be checked
-
- # FIXME: scrub input
-
- $newpassword = $this->arg('newpassword');
- $confirm = $this->arg('confirm');
- $token = $this->arg('token');
-
- if (0 != strcmp($newpassword, $confirm)) {
- $this->show_form(_('Passwords don\'t match.'));
- return;
- }
-
- if ($user->password) {
- $oldpassword = $this->arg('oldpassword');
-
- if (!common_check_user($user->nickname, $oldpassword)) {
- $this->show_form(_('Incorrect old password'));
- return;
- }
- }
-
- $original = clone($user);
-
- $user->password = common_munge_password($newpassword, $user->id);
-
- $val = $user->validate();
- if ($val !== true) {
- $this->show_form(_('Error saving user; invalid.'));
- return;
- }
-
- if (!$user->update($original)) {
- $this->serverError(_('Can\'t save new password.'));
- return;
- }
-
- $this->show_form(_('Password saved.'), true);
- }
}
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 6d3c54942..845266d18 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -31,7 +31,7 @@ if (!defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/connectsettingsaction.php';
/**
* Settings for SMS
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
* @see SettingsAction
*/
-class SmssettingsAction extends SettingsAction
+class SmssettingsAction extends ConnectSettingsAction
{
/**
* Title of the page
@@ -151,7 +151,6 @@ class SmssettingsAction extends SettingsAction
$this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
$this->element('legend', null, _('Preferences'));
-
$this->elementStart('ul', 'form_datas');
$this->elementStart('li');
$this->checkbox('smsnotify',
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index cd070cb45..597623c80 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -31,7 +31,7 @@ if (!defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/connectsettingsaction.php';
define('SUBSCRIPTIONS', 80);
@@ -47,7 +47,7 @@ define('SUBSCRIPTIONS', 80);
* @see SettingsAction
*/
-class TwittersettingsAction extends SettingsAction
+class TwittersettingsAction extends ConnectSettingsAction
{
/**
* Title of the page
@@ -129,7 +129,8 @@ class TwittersettingsAction extends SettingsAction
$this->elementEnd('ul');
$this->elementEnd('fieldset');
- $this->elementStart('fieldset', array('id' => 'settings_twitter_preferences'));
+ $this->elementStart('fieldset',
+ array('id' => 'settings_twitter_preferences'));
$this->element('legend', null, _('Preferences'));
$this->elementStart('ul');
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
new file mode 100644
index 000000000..46090b8c1
--- /dev/null
+++ b/lib/accountsettingsaction.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for account settings actions
+ *
+ * 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 Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-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);
+}
+
+require_once INSTALLDIR.'/lib/settingsaction.php';
+
+/**
+ * Base class for account settings actions
+ *
+ * @category Settings
+ * @package Laconica
+ * @author Evan Prodromou <evan@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/
+ *
+ * @see Widget
+ */
+
+class AccountSettingsAction extends SettingsAction
+{
+ /**
+ * Show the local navigation menu
+ *
+ * This is the same for all settings, so we show it here.
+ *
+ * @return void
+ */
+
+ function showLocalNav()
+ {
+ $menu = new AccountSettingsNav($this);
+ $menu->show();
+ }
+}
+
+/**
+ * A widget for showing the settings group local nav menu
+ *
+ * @category Widget
+ * @package Laconica
+ * @author Evan Prodromou <evan@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/
+ *
+ * @see HTMLOutputter
+ */
+
+class AccountSettingsNav extends Widget
+{
+ var $action = null;
+
+ /**
+ * Construction
+ *
+ * @param Action $action current action, used for output
+ */
+
+ function __construct($action=null)
+ {
+ parent::__construct($action);
+ $this->action = $action;
+ }
+
+ /**
+ * Show the menu
+ *
+ * @return void
+ */
+
+ function show()
+ {
+ # action => array('prompt', 'title')
+ $menu =
+ array('profilesettings' =>
+ array(_('Profile'),
+ _('Change your profile settings')),
+ 'avatarsettings' =>
+ array(_('Avatar'),
+ _('Upload an avatar')),
+ 'passwordsettings' =>
+ array(_('Password'),
+ _('Change your password')),
+ 'emailsettings' =>
+ array(_('Email'),
+ _('Change email handling')),
+ 'openidsettings' =>
+ array(_('OpenID'),
+ _('Add or remove OpenIDs')),
+ 'othersettings' =>
+ array(_('Other'),
+ _('Other options')));
+
+ $action_name = $this->action->trimmed('action');
+ $this->action->elementStart('ul', array('class' => 'nav'));
+
+ foreach ($menu as $menuaction => $menudesc) {
+ $this->action->menuItem(common_local_url($menuaction),
+ $menudesc[0],
+ $menudesc[1],
+ $action_name === $menuaction);
+ }
+
+ $this->action->elementEnd('ul');
+ }
+}
diff --git a/lib/action.php b/lib/action.php
index 71520b84e..e62a032b6 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -208,20 +208,20 @@ class Action extends HTMLOutputter // lawsuit
$this->showLogo();
$this->showPrimaryNav();
$this->showSiteNotice();
- if (common_logged_in()) {
- $this->showNoticeForm();
- } else {
- $this->showAnonymousMessage();
- }
+ if (common_logged_in()) {
+ $this->showNoticeForm();
+ } else {
+ $this->showAnonymousMessage();
+ }
$this->elementEnd('div');
}
function showLogo()
{
$this->elementStart('address', array('id' => 'site_contact',
- 'class' => 'vcard'));
+ 'class' => 'vcard'));
$this->elementStart('a', array('class' => 'url home bookmark',
- 'href' => common_local_url('public')));
+ 'href' => common_local_url('public')));
if (common_config('site', 'logo') || file_exists(theme_file('logo.png')))
{
$this->element('img', array('class' => 'logo photo',
@@ -237,21 +237,21 @@ class Action extends HTMLOutputter // lawsuit
{
$this->elementStart('dl', array('id' => 'site_nav_global_primary'));
$this->element('dt', null, _('Primary site navigation'));
- $this->elementStart('dd');
+ $this->elementStart('dd');
$user = common_current_user();
$this->elementStart('ul', array('class' => 'nav'));
if ($user) {
$this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
- _('Home'));
+ _('Home'));
}
$this->menuItem(common_local_url('peoplesearch'), _('Search'));
if ($user) {
$this->menuItem(common_local_url('profilesettings'),
- _('Settings'));
- $this->menuItem(common_local_url('invite'),
- _('Invite'));
+ _('Account'));
+ $this->menuItem(common_local_url('imsettings'),
+ _('Connect'));
$this->menuItem(common_local_url('logout'),
- _('Logout'));
+ _('Logout'));
} else {
$this->menuItem(common_local_url('login'), _('Login'));
if (!common_config('site', 'closed')) {
@@ -260,25 +260,25 @@ class Action extends HTMLOutputter // lawsuit
$this->menuItem(common_local_url('openidlogin'), _('OpenID'));
}
$this->menuItem(common_local_url('doc', array('title' => 'help')),
- _('Help'));
+ _('Help'));
$this->elementEnd('ul');
- $this->elementEnd('dd');
+ $this->elementEnd('dd');
$this->elementEnd('dl');
}
// Revist. Should probably do an hAtom pattern here
function showSiteNotice()
{
- $text = common_config('site', 'notice');
- if ($text) {
- $this->elementStart('dl', array('id' => 'site_notice',
- 'class' => 'system_notice'));
- $this->element('dt', null, _('Site notice'));
- $this->element('dd', null, $text);
- $this->elementEnd('dl');
- }
+ $text = common_config('site', 'notice');
+ if ($text) {
+ $this->elementStart('dl', array('id' => 'site_notice',
+ 'class' => 'system_notice'));
+ $this->element('dt', null, _('Site notice'));
+ $this->element('dd', null, $text);
+ $this->elementEnd('dl');
+ }
}
-
+
// MAY overload if no notice form needed... or direct message box????
function showNoticeForm()
@@ -289,9 +289,9 @@ class Action extends HTMLOutputter // lawsuit
function showAnonymousMessage()
{
- // needs to be defined by the class
+ // needs to be defined by the class
}
-
+
function showCore()
{
$this->elementStart('div', array('id' => 'core'));
@@ -331,13 +331,13 @@ class Action extends HTMLOutputter // lawsuit
function showPageNoticeBlock()
{
- $this->elementStart('dl', array('id' => 'page_notice',
- 'class' => 'system_notice'));
- $this->element('dt', null, _('Page notice'));
- $this->elementStart('dd');
- $this->showPageNotice();
- $this->elementEnd('dd');
- $this->elementEnd('dl');
+ $this->elementStart('dl', array('id' => 'page_notice',
+ 'class' => 'system_notice'));
+ $this->element('dt', null, _('Page notice'));
+ $this->elementStart('dd');
+ $this->showPageNotice();
+ $this->elementEnd('dd');
+ $this->elementEnd('dl');
}
// SHOULD overload (unless there's not a notice)
@@ -345,7 +345,7 @@ class Action extends HTMLOutputter // lawsuit
function showPageNotice()
{
}
-
+
// MUST overload
function showContent()
@@ -391,17 +391,17 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('dd', null);
$this->elementStart('ul', array('class' => 'nav'));
$this->menuItem(common_local_url('doc', array('title' => 'help')),
- _('Help'));
+ _('Help'));
$this->menuItem(common_local_url('doc', array('title' => 'about')),
- _('About'));
+ _('About'));
$this->menuItem(common_local_url('doc', array('title' => 'faq')),
- _('FAQ'));
+ _('FAQ'));
$this->menuItem(common_local_url('doc', array('title' => 'privacy')),
- _('Privacy'));
+ _('Privacy'));
$this->menuItem(common_local_url('doc', array('title' => 'source')),
- _('Source'));
+ _('Source'));
$this->menuItem(common_local_url('doc', array('title' => 'contact')),
- _('Contact'));
+ _('Contact'));
$this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
@@ -567,7 +567,7 @@ class Action extends HTMLOutputter // lawsuit
}
(is_null($id)) ? $lattrs : $lattrs['id'] = $id;
-
+
$this->elementStart('li', $lattrs);
$attrs['href'] = $url;
if ($title) {
diff --git a/lib/settingsgroupnav.php b/lib/connectsettingsaction.php
index bd66c65a6..30629680e 100644
--- a/lib/settingsgroupnav.php
+++ b/lib/connectsettingsaction.php
@@ -2,7 +2,7 @@
/**
* Laconica, the distributed open-source microblogging tool
*
- * Navigation widget for the settings group
+ * Base class for connection settings actions
*
* PHP version 5
*
@@ -19,10 +19,10 @@
* 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 Widget
+ * @category Settings
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @copyright 2008-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/
*/
@@ -31,10 +31,39 @@ if (!defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/widget.php';
+require_once INSTALLDIR.'/lib/settingsaction.php';
/**
- * A widget for showing the settings group local nav menu
+ * Base class for connection settings actions
+ *
+ * @category Settings
+ * @package Laconica
+ * @author Evan Prodromou <evan@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/
+ *
+ * @see Widget
+ */
+
+class ConnectSettingsAction extends SettingsAction
+{
+ /**
+ * Show the local navigation menu
+ *
+ * This is the same for all settings, so we show it here.
+ *
+ * @return void
+ */
+
+ function showLocalNav()
+ {
+ $menu = new ConnectSettingsNav($this);
+ $menu->show();
+ }
+}
+
+/**
+ * A widget for showing the connect group local nav menu
*
* @category Widget
* @package Laconica
@@ -45,7 +74,7 @@ require_once INSTALLDIR.'/lib/widget.php';
* @see HTMLOutputter
*/
-class SettingsGroupNav extends Widget
+class ConnectSettingsNav extends Widget
{
var $action = null;
@@ -71,31 +100,19 @@ class SettingsGroupNav extends Widget
{
# action => array('prompt', 'title')
$menu =
- array('profilesettings' =>
- array(_('Profile'),
- _('Change your profile settings')),
- 'emailsettings' =>
- array(_('Email'),
- _('Change email handling')),
- 'openidsettings' =>
- array(_('OpenID'),
- _('Add or remove OpenIDs')),
+ array('imsettings' =>
+ array(_('IM'),
+ _('Updates by instant messenger (IM)')),
'smssettings' =>
array(_('SMS'),
_('Updates by SMS')),
- 'imsettings' =>
- array(_('IM'),
- _('Updates by instant messenger (IM)')),
'twittersettings' =>
array(_('Twitter'),
- _('Twitter integration options')),
- 'othersettings' =>
- array(_('Other'),
- _('Other options')));
-
+ _('Twitter integration options')));
+
$action_name = $this->action->trimmed('action');
$this->action->elementStart('ul', array('class' => 'nav'));
-
+
foreach ($menu as $menuaction => $menudesc) {
if ($menuaction == 'imsettings' &&
!common_config('xmpp', 'enabled')) {
@@ -106,7 +123,7 @@ class SettingsGroupNav extends Widget
$menudesc[1],
$action_name === $menuaction);
}
-
+
$this->action->elementEnd('ul');
}
}
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 9564cfb46..2c532912b 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -1,9 +1,12 @@
<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
*
- * This program is free software: you can redistribute it and/or modify
+ * Base class for RSS 1.0 feed actions
+ *
+ * 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.
@@ -15,6 +18,14 @@
*
* 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 Mail
+ * @package Laconica
+ * @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Earle Martin <earle@downlode.org>
+ * @copyright 2008-9 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); }
@@ -23,35 +34,84 @@ define('DEFAULT_RSS_LIMIT', 48);
class Rss10Action extends Action
{
-
# This will contain the details of each feed item's author and be used to generate SIOC data.
+
var $creators = array();
+ var $limit = DEFAULT_RSS_LIMIT;
+
+ /**
+ * Constructor
+ *
+ * Just wraps the Action constructor.
+ *
+ * @param string $output URI to output to, default = stdout
+ * @param boolean $indent Whether to indent output, default true
+ *
+ * @see Action::__construct
+ */
- function is_readonly()
+ function __construct($output='php://output', $indent=true)
+ {
+ parent::__construct($output, $indent);
+ }
+
+ /**
+ * Do we need to write to the database?
+ *
+ * @return boolean true
+ */
+
+ function isReadonly()
{
return true;
}
+ /**
+ * Read arguments and initialize members
+ *
+ * @param array $args Arguments from $_REQUEST
+ * @return boolean success
+ */
+
+ function prepare($args)
+ {
+ $this->limit = (int) $this->trimmed('limit');
+ if ($this->limit == 0) {
+ $this->limit = DEFAULT_RSS_LIMIT;
+ }
+ return true;
+ }
+
+ /**
+ * Handle a request
+ *
+ * @param array $args Arguments from $_REQUEST
+ *
+ * @return void
+ */
+
function handle($args)
{
parent::handle($args);
- $limit = (int) $this->trimmed('limit');
- if ($limit == 0) {
- $limit = DEFAULT_RSS_LIMIT;
- }
$this->show_rss($limit);
}
- function init()
- {
- return true;
- }
-
- function get_notices()
+ /**
+ * Get the notices to output in this stream
+ *
+ * @return array an array of Notice objects sorted in reverse chron
+ */
+
+ function getNotices()
{
return array();
}
+ /**
+ * Get a description of the channel
+ *
+ * Returns an array with the following
+ * @return array
function get_channel()
{
return array('url' => '',
@@ -67,11 +127,6 @@ class Rss10Action extends Action
function show_rss($limit=0)
{
-
- if (!$this->init()) {
- return;
- }
-
$notices = $this->get_notices($limit);
$this->init_rss();
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 8624803ac..dfe1f114b 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -31,8 +31,6 @@ if (!defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/settingsgroupnav.php';
-
/**
* Base class for settings group of actions
*
@@ -149,17 +147,4 @@ class SettingsAction extends Action
return '';
}
- /**
- * Show the local navigation menu
- *
- * This is the same for all settings, so we show it here.
- *
- * @return void
- */
-
- function showLocalNav()
- {
- $menu = new SettingsGroupNav($this);
- $menu->show();
- }
}
diff --git a/lib/util.php b/lib/util.php
index 9ca817eab..d67c64972 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -770,6 +770,8 @@ function common_fancy_url($action, $args=null)
return common_path('main/openid');
case 'profilesettings':
return common_path('settings/profile');
+ case 'passwordsettings':
+ return common_path('settings/password');
case 'emailsettings':
return common_path('settings/email');
case 'openidsettings':
@@ -852,6 +854,8 @@ function common_fancy_url($action, $args=null)
return common_path($path);
case 'imsettings':
return common_path('settings/im');
+ case 'avatarsettings':
+ return common_path('settings/avatar');
case 'peoplesearch':
return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : ''));
case 'noticesearch':
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-01 08:09:14 +0000