Fix a couple of errors in PublicGroupNav

[quix0rs-gnu-social.git] / lib / settingsaction.php

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 00bec4274b85c6287fb99d40ca3cf403e7351dc5..03bac3a93b0173f9ffcf1a6dc5fbc78162bd809a 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -19,17 +19,19 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SettingsAction extends Action {
+class SettingsAction extends Action
+{
 
-    function handle($args) {
+    function handle($args)
+    {
         parent::handle($args);
         if (!common_logged_in()) {
             common_user_error(_('Not logged in.'));
             return;
         } else if (!common_is_real_login()) {
-               # Cookie theft means that automatic logins can't
-               # change important settings or see private info, and
-               # _all_ our settings are important
+            # Cookie theft means that automatic logins can't
+            # change important settings or see private info, and
+            # _all_ our settings are important
             common_set_returnto($this->self_url());
             common_redirect(common_local_url('login'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -40,71 +42,93 @@ class SettingsAction extends Action {
     }
 
     # override!
-    function handle_post() {
+    function handle_post()
+    {
         return false;
     }
 
-    function show_form($msg=NULL, $success=false) {
+    function show_form($msg=null, $success=false)
+    {
         return false;
     }
 
-    function message($msg, $success) {
+    function message($msg, $success)
+    {
         if ($msg) {
             common_element('div', ($success) ? 'success' : 'error',
                            $msg);
         }
     }
 
-       function form_header($title, $msg=NULL, $success=false) {
-               common_show_header($title,
-                                  NULL,
-                                  array($msg, $success),
-                                                  array($this, 'show_top'));
-       }
+    function form_header($title, $msg=NULL, $success=false) 
+    {
+        common_show_header($title,
+                           array($this, 'show_header'),
+                           array($msg, $success),
+                           array($this, 'show_top'));
+    }
+
+    function show_header() 
+    {
+        common_element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => common_path('js/jcrop/jquery.Jcrop.css?version='.LACONICA_VERSION),
+                                     'media' => 'screen, projection, tv'));
+        common_element('script', array('type' => 'text/javascript',
+                                       'src' => common_path('js/jcrop/jquery.Jcrop.pack.js')));
+        common_element('script', array('type' => 'text/javascript',
+                                       'src' => common_path('js/jcrop/jquery.Jcrop.go.js')));
+    }
 
-       function show_top($arr) {
-               $msg = $arr[0];
-               $success = $arr[1];
-               if ($msg) {
-                       $this->message($msg, $success);
-               } else {
-                       $inst = $this->get_instructions();
-                       $output = common_markup_to_html($inst);
-                       common_element_start('div', 'instructions');
-                       common_raw($output);
-                       common_element_end('div');
-               }
-               $this->settings_menu();
-       }
+    function show_top($arr)
+    {
+        $msg = $arr[0];
+        $success = $arr[1];
+        if ($msg) {
+            $this->message($msg, $success);
+        } else {
+            $inst = $this->get_instructions();
+            $output = common_markup_to_html($inst);
+            common_element_start('div', 'instructions');
+            common_raw($output);
+            common_element_end('div');
+        }
+        $this->settings_menu();
+    }
 
-    function settings_menu() {
+    function settings_menu()
+    {
         # action => array('prompt', 'title')
-               $menu =
-                 array('profilesettings' =>
-                               array(_('Profile'),
-                                         _('Change your profile settings')),
-                               'emailsettings' =>
-                               array(_('Email'),
-                                         _('Change email handling')),
-                               'password' =>
-                               array(_('Password'),
-                                         _('Change your password')),
-                               'openidsettings' =>
-                               array(_('OpenID'),
-                                         _('Add or remove OpenIDs')),
-                               'smssettings' =>
-                               array(_('SMS'),
-                                         _('Updates by SMS')),
-                               'imsettings' =>
-                               array(_('IM'),
-                                         _('Updates by instant messenger (IM)')),
-                               'twittersettings' =>
-                               array(_('Twitter'),
-                                         _('Twitter integration options')));
-               
+        $menu =
+          array('profilesettings' =>
+                array(_('Profile'),
+                      _('Change your profile settings')),
+                'emailsettings' =>
+                array(_('Email'),
+                      _('Change email handling')),
+                'openidsettings' =>
+                array(_('OpenID'),
+                      _('Add or remove OpenIDs')),
+                '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')));
+        
         $action = $this->trimmed('action');
         common_element_start('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
+            if ($menuaction == 'imsettings' &&
+                !common_config('xmpp', 'enabled')) {
+                continue;
+            }
             common_menu_item(common_local_url($menuaction),
                     $menudesc[0],
                     $menudesc[1],