X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fimsettings.php;h=14df3451a82850c7f5b6cbdfdbefd5e29a08b40c;hb=2f99a257a0d8bd773ea96249b13b134fcfbc99cd;hp=8f546f8e76f97aee0887c445bbe386abde20555b;hpb=eb2f9c98ac115ce67e9a740b200c832153ffa05c;p=quix0rs-gnu-social.git diff --git a/actions/imsettings.php b/actions/imsettings.php index 8f546f8e76..14df3451a8 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -22,82 +22,87 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/settingsaction.php'); require_once(INSTALLDIR.'/lib/jabber.php'); -class ImsettingsAction extends SettingsAction { +class ImsettingsAction extends SettingsAction +{ - function get_instructions() { + function get_instructions() + { return _('You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below.'); } - function show_form($msg=null, $success=false) { + function show_form($msg=null, $success=false) + { $user = common_current_user(); $this->form_header(_('IM Settings'), $msg, $success); - common_element_start('form', array('method' => 'post', + $this->elementStart('form', array('method' => 'post', 'id' => 'imsettings', 'action' => common_local_url('imsettings'))); - common_hidden('token', common_session_token()); + $this->hidden('token', common_session_token()); - common_element('h2', null, _('Address')); + $this->element('h2', null, _('Address')); if ($user->jabber) { - common_element_start('p'); - common_element('span', 'address confirmed', $user->jabber); - common_element('span', 'input_instructions', + $this->elementStart('p'); + $this->element('span', 'address confirmed', $user->jabber); + $this->element('span', 'input_instructions', _('Current confirmed Jabber/GTalk address.')); - common_hidden('jabber', $user->jabber); - common_element_end('p'); - common_submit('remove', _('Remove')); + $this->hidden('jabber', $user->jabber); + $this->elementEnd('p'); + $this->submit('remove', _('Remove')); } else { $confirm = $this->get_confirmation(); if ($confirm) { - common_element_start('p'); - common_element('span', 'address unconfirmed', $confirm->address); - common_element('span', 'input_instructions', + $this->elementStart('p'); + $this->element('span', 'address unconfirmed', $confirm->address); + $this->element('span', 'input_instructions', sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)'), jabber_daemon_address())); - common_hidden('jabber', $confirm->address); - common_element_end('p'); - common_submit('cancel', _('Cancel')); + $this->hidden('jabber', $confirm->address); + $this->elementEnd('p'); + $this->submit('cancel', _('Cancel')); } else { - common_input('jabber', _('IM Address'), + $this->input('jabber', _('IM Address'), ($this->arg('jabber')) ? $this->arg('jabber') : null, sprintf(_('Jabber or GTalk address, like "UserName@example.org". First, make sure to add %s to your buddy list in your IM client or on GTalk.'), jabber_daemon_address())); - common_submit('add', _('Add')); + $this->submit('add', _('Add')); } } - common_element('h2', null, _('Preferences')); + $this->element('h2', null, _('Preferences')); - common_checkbox('jabbernotify', + $this->checkbox('jabbernotify', _('Send me notices through Jabber/GTalk.'), $user->jabbernotify); - common_checkbox('updatefrompresence', + $this->checkbox('updatefrompresence', _('Post a notice when my Jabber/GTalk status changes.'), $user->updatefrompresence); - common_checkbox('jabberreplies', + $this->checkbox('jabberreplies', _('Send me replies through Jabber/GTalk from people I\'m not subscribed to.'), $user->jabberreplies); - common_checkbox('jabbermicroid', + $this->checkbox('jabbermicroid', _('Publish a MicroID for my Jabber/GTalk address.'), $user->jabbermicroid); - common_submit('save', _('Save')); + $this->submit('save', _('Save')); - common_element_end('form'); + $this->elementEnd('form'); common_show_footer(); } - function get_confirmation() { + function get_confirmation() + { $user = common_current_user(); $confirm = new Confirm_address(); $confirm->user_id = $user->id; $confirm->address_type = 'jabber'; - if ($confirm->find(TRUE)) { + if ($confirm->find(true)) { return $confirm; } else { return null; } } - function handle_post() { + function handle_post() + { # CSRF protection $token = $this->trimmed('token'); @@ -119,7 +124,8 @@ class ImsettingsAction extends SettingsAction { } } - function save_preferences() { + function save_preferences() + { $jabbernotify = $this->boolean('jabbernotify'); $updatefrompresence = $this->boolean('updatefrompresence'); @@ -141,9 +147,9 @@ class ImsettingsAction extends SettingsAction { $result = $user->update($original); - if ($result === FALSE) { + if ($result === false) { common_log_db_error($user, 'UPDATE', __FILE__); - common_server_error(_('Couldn\'t update user.')); + $this->serverError(_('Couldn\'t update user.')); return; } @@ -152,7 +158,8 @@ class ImsettingsAction extends SettingsAction { $this->show_form(_('Preferences saved.'), true); } - function add_address() { + function add_address() + { $user = common_current_user(); @@ -190,9 +197,9 @@ class ImsettingsAction extends SettingsAction { $result = $confirm->insert(); - if ($result === FALSE) { + if ($result === false) { common_log_db_error($confirm, 'INSERT', __FILE__); - common_server_error(_('Couldn\'t insert confirmation code.')); + $this->serverError(_('Couldn\'t insert confirmation code.')); return; } @@ -204,10 +211,11 @@ class ImsettingsAction extends SettingsAction { $msg = sprintf(_('A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you.'), jabber_daemon_address()); - $this->show_form($msg, TRUE); + $this->show_form($msg, true); } - function cancel_confirmation() { + function cancel_confirmation() + { $jabber = $this->arg('jabber'); $confirm = $this->get_confirmation(); if (!$confirm) { @@ -223,14 +231,15 @@ class ImsettingsAction extends SettingsAction { if (!$result) { common_log_db_error($confirm, 'DELETE', __FILE__); - $this->server_error(_('Couldn\'t delete email confirmation.')); + $this->serverError(_('Couldn\'t delete email confirmation.')); return; } - $this->show_form(_('Confirmation cancelled.'), TRUE); + $this->show_form(_('Confirmation cancelled.'), true); } - function remove_address() { + function remove_address() + { $user = common_current_user(); $jabber = $this->arg('jabber'); @@ -248,17 +257,18 @@ class ImsettingsAction extends SettingsAction { $result = $user->updateKeys($original); if (!$result) { common_log_db_error($user, 'UPDATE', __FILE__); - common_server_error(_('Couldn\'t update user.')); + $this->serverError(_('Couldn\'t update user.')); return; } $user->query('COMMIT'); # XXX: unsubscribe to the old address - $this->show_form(_('The address was removed.'), TRUE); + $this->show_form(_('The address was removed.'), true); } - function jabber_exists($jabber) { + function jabber_exists($jabber) + { $user = common_current_user(); $other = User::staticGet('jabber', $jabber); if (!$other) {