Shout: Improve automatic selection of context

diff --git a/shout/lib/Application.php b/shout/lib/Application.php
index 2109961..eb4b0cd 100644 (file)
--- a/shout/lib/Application.php
+++ b/shout/lib/Application.php
@@ -80,18 +80,22 @@ class Shout_Application extends Horde_Registry_Application
             $contexts = false;
         }
 
-        if (count($contexts) == 1) {
-            // Default to the user's only context
-            if (!empty($context) && $context != $contexts[0]) {
-                $GLOBALS['notification']->push(_("You do not have permission to access that context."), 'horde.error');
-            }
-            $context = $contexts[0];
-        } elseif (!empty($context) && !in_array($context, $contexts)) {
+        $context = Horde_Util::getFormData('context');
+        if (!empty($context) && !in_array($context, $contexts)) {
+            // Requested context not available
             $GLOBALS['notification']->push(_("You do not have permission to access that context."), 'horde.error');
             $context = false;
-        } elseif (!empty($context)) {
-            $GLOBALS['notification']->push("Please select a context to continue.", 'horde.info');
-            $context = false;
+        }
+
+        if (empty($context)) {
+            if (count($contexts)) {
+                // Default to the user's first context
+                $context = reset($contexts);
+            } else {
+                // No context requested and/or no contexts available anyway
+                $GLOBALS['notification']->push("Please select a context to continue.", 'horde.info');
+                $context = false;
+            }
         }
 
         $_SESSION['shout']['context'] = $context;

diff --git a/shout/templates/menu.inc b/shout/templates/menu.inc
index 070329a..7c08e9e 100644 (file)
--- a/shout/templates/menu.inc
+++ b/shout/templates/menu.inc
@@ -9,6 +9,11 @@ $menu_view = $prefs->getValue('menu_view');
 
 <?php
 // Only show the context selector if there is more than one available context
+try {
+    $contexts = $shout->contexts->getContexts();
+} catch (Exception $e) {
+    $contexts = array();
+}
 if (count($contexts) > 1) { ?>
 <script language="JavaScript" type="text/javascript">
 <!--