better error reporting in user authorization action

[quix0rs-gnu-social.git] / actions / imsettings.php

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 368cd8b9e6b26dd3f2dfd48460bb927b5806f647..034f6dc2b284518ef50e6e3bae1416403ef180be 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -52,10 +52,7 @@ class ImsettingsAction extends SettingsAction {
                                common_element_start('p');
                                common_element('span', 'address unconfirmed', $confirm->address);
                                common_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())));
+                                             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'));
@@ -75,6 +72,12 @@ class ImsettingsAction extends SettingsAction {
                common_checkbox('updatefrompresence',
                                _('Post a notice when my Jabber/GTalk status changes.'),
                                $user->updatefrompresence);
+               common_checkbox('jabberreplies',
+                               _('Send me replies through Jabber/GTalk from people I\'m not subscribed to.'),
+                               $user->jabberreplies);
+               common_checkbox('jabbermicroid',
+                               _('Publish a MicroID for my Jabber/GTalk address.'),
+                               $user->jabbermicroid);
                common_submit('save', _('Save'));
 
                common_element_end('form');
@@ -112,6 +115,8 @@ class ImsettingsAction extends SettingsAction {
 
                $jabbernotify = $this->boolean('jabbernotify');
                $updatefrompresence = $this->boolean('updatefrompresence');
+               $jabberreplies = $this->boolean('jabberreplies');
+               $jabbermicroid = $this->boolean('jabbermicroid');
 
                $user = common_current_user();
 
@@ -123,6 +128,8 @@ class ImsettingsAction extends SettingsAction {
 
                $user->jabbernotify = $jabbernotify;
                $user->updatefrompresence = $updatefrompresence;
+               $user->jabberreplies = $jabberreplies;
+               $user->jabbermicroid = $jabbermicroid;
 
                $result = $user->update($original);