Don't store default_horde_view cookie if it is auto (the default)

horde · Jun 12, 2014 · 713d009 · 713d009
1 parent 0935219
commit 713d009
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/framework/Core/lib/Horde/Core/Auth/Application.php b/framework/Core/lib/Horde/Core/Auth/Application.php
@@ -672,7 +672,14 @@ protected function _setView()
             if (empty($conf['user']['select_view'])) {
                 $mode = 'auto';
             } else {
-                setcookie('default_horde_view', $mode, time() + 30 * 86400, $conf['cookie']['path'], $conf['cookie']['domain']);
+                /* 'auto' is default, so don't store in cookie. */
+                setcookie(
+                    'default_horde_view',
+                    ($mode == 'auto') ? '' : $mode,
+                    time() + (($mode == 'auto') ? -3600 : (30 * 86400)),
+                    $conf['cookie']['path'],
+                    $conf['cookie']['domain']
+                );
             }
         } else {
             // Forcing mode as per config.