summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-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
9 files changed, 281 insertions, 293 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');