Uppercase hex color values

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

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 8624803ac41705150a1d9d815bd89d0fc44648fa..17d3a2f64dcb1853190ee0064b6a224d01342be0 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -31,8 +31,6 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsgroupnav.php';
-
 /**
  * Base class for settings group of actions
  *
@@ -45,7 +43,7 @@ require_once INSTALLDIR.'/lib/settingsgroupnav.php';
  * @see      Widget
  */
 
-class SettingsAction extends Action
+class SettingsAction extends CurrentUserDesignAction
 {
     /**
      * A message for the user.
@@ -78,7 +76,12 @@ class SettingsAction extends Action
             // change important settings or see private info, and
             // _all_ our settings are important
             common_set_returnto($this->selfUrl());
-            common_redirect(common_local_url('login'));
+            $user = common_current_user();
+            if ($user->hasOpenID()) {
+                common_redirect(common_local_url('openidlogin'), 303);
+            } else {
+                common_redirect(common_local_url('login'), 303);
+            }
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->handlePost();
         } else {
@@ -149,17 +152,4 @@ class SettingsAction extends Action
         return '';
     }
 
-    /**
-     * Show the local navigation menu
-     *
-     * This is the same for all settings, so we show it here.
-     *
-     * @return void
-     */
-
-    function showLocalNav()
-    {
-        $menu = new SettingsGroupNav($this);
-        $menu->show();
-    }
 }