X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=actions%2Fimsettings.php;h=f57933b43f28473ac4bca190559df4ccf29c1698;hb=5c428f8adf5d4686988f371e3de204ac6e70b99a;hp=3e578b307d8127a6fe2fbaf3b10efee9f71e57a5;hpb=98e8a24d88d19fb47b74e150e76efafb6e5e90ad;p=quix0rs-gnu-social.git

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 3e578b307d..f57933b43f 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Settings for Jabber/XMPP integration
  *
@@ -20,33 +20,33 @@
  * 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.
+ * @package   StatusNet
+ * @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://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/connectsettingsaction.php';
 require_once INSTALLDIR.'/lib/jabber.php';
 
 /**
  * Settings for Jabber/XMPP integration
  *
  * @category Settings
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      SettingsAction
  */
 
-class ImsettingsAction extends SettingsAction
+class ImsettingsAction extends ConnectSettingsAction
 {
     /**
      * Title of the page
@@ -84,38 +84,43 @@ class ImsettingsAction extends SettingsAction
 
     function showContent()
     {
+        if (!common_config('xmpp', 'enabled')) {
+            $this->element('div', array('class' => 'error'),
+                           _('IM is not available.'));
+            return;
+        }
+
         $user = common_current_user();
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'imsettings',
+                                          'id' => 'form_settings_im',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('imsettings')));
+        $this->elementStart('fieldset', array('id' => 'settings_im_address'));
+        $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
 
-        $this->element('h2', null, _('Address'));
-
         if ($user->jabber) {
-            $this->elementStart('p');
-            $this->element('span', 'address confirmed', $user->jabber);
-            $this->element('span', 'input_instructions',
+            $this->element('p', 'form_confirmed', $user->jabber);
+            $this->element('p', 'form_note',
                            _('Current confirmed Jabber/GTalk address.'));
             $this->hidden('jabber', $user->jabber);
-            $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
-                $this->elementStart('p');
-                $this->element('span', 'address unconfirmed', $confirm->address);
-                $this->element('span', 'input_instructions',
+                $this->element('p', 'form_unconfirmed', $confirm->address);
+                $this->element('p', 'form_note',
                                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()));
                 $this->hidden('jabber', $confirm->address);
-                $this->elementEnd('p');
                 $this->submit('cancel', _('Cancel'));
             } else {
+                $this->elementStart('ul', 'form_data');
+                $this->elementStart('li');
                 $this->input('jabber', _('IM Address'),
                              ($this->arg('jabber')) ? $this->arg('jabber') : null,
                              sprintf(_('Jabber or GTalk address, '.
@@ -123,27 +128,40 @@ class ImsettingsAction extends SettingsAction
                                        'First, make sure to add %s to your '.
                                        'buddy list in your IM client or on GTalk.'),
                                      jabber_daemon_address()));
+                $this->elementEnd('li');
+                $this->elementEnd('ul');
                 $this->submit('add', _('Add'));
             }
         }
-
-        $this->element('h2', null, _('Preferences'));
-
+        $this->elementEnd('fieldset');
+        
+        $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
+        $this->element('legend', null, _('Preferences'));
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
         $this->checkbox('jabbernotify',
                         _('Send me notices through Jabber/GTalk.'),
                         $user->jabbernotify);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('updatefrompresence',
                         _('Post a notice when my Jabber/GTalk status changes.'),
                         $user->updatefrompresence);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('jabberreplies',
                         _('Send me replies through Jabber/GTalk '.
                           'from people I\'m not subscribed to.'),
                         $user->jabberreplies);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('jabbermicroid',
                         _('Publish a MicroID for my Jabber/GTalk address.'),
                         $user->jabbermicroid);
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('save', _('Save'));
-
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }