Correct way of ensuring default share values are remembered when auto…

…-created.
horde · Jul 29, 2014 · dd60e63 · dd60e63
1 parent 39a2af6
commit dd60e63
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 12 deletions.
diff --git a/mnemo/lib/Mnemo.php b/mnemo/lib/Mnemo.php
@@ -237,13 +237,14 @@ public static function getDefaultNotepad($permission = Horde_Perms::SHOW)
             ->getInstance('Mnemo_Factory_Notepads')
             ->create()
             ->getDefaultShare();
-        if (isset($notepads[$default_notepad])) {
-            $GLOBALS['prefs']->setValue('default_notepad', $default_notepad);
-            return $default_notepad;
+
+        if (!isset($notepads[$default_notepad])) {
+            reset($notepads);
+            $default_notepad = key($notepads);
         }
 
-        reset($notepads);
-        return key($notepads);
+        $GLOBALS['prefs']->setValue('default_notepad', $default_notepad);
+        return $default_notepad;
     }
 
     /**

diff --git a/mnemo/lib/Notepads/Base.php b/mnemo/lib/Notepads/Base.php
@@ -129,7 +129,6 @@ abstract protected function _getDefaultShareName();
      */
     protected function _prepareDefaultShare($share)
     {
-        $share->set('default', true);
     }
 
 }
diff --git a/mnemo/lib/Notepads/Kolab.php b/mnemo/lib/Notepads/Kolab.php
@@ -58,4 +58,14 @@ protected function _getDefaultShareName()
         return _("Notes");
     }
 
+    /**
+     * Add any modifiers required to the share in order to mark it as default.
+     *
+     * @param Horde_Share_Object $share The new default share.
+     */
+    protected function _prepareDefaultShare($share)
+    {
+        $share->set('default', true);
+    }
+
 }
diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php
@@ -562,13 +562,14 @@ static public function getDefaultTasklist($permission = Horde_Perms::SHOW)
             ->getInstance('Nag_Factory_Tasklists')
             ->create()
             ->getDefaultShare();
-        if (isset($tasklists[$default_tasklist])) {
-            $GLOBALS['prefs']->setValue('default_tasklist', $default_tasklist);
-            return $default_tasklist;
+
+        if (!isset($tasklists[$default_tasklist])) {
+            reset($tasklists);
+            $default_tasklist = key($tasklists);
         }
 
-        reset($tasklists);
-        return key($tasklists);
+        $GLOBALS['prefs']->setValue('default_tasklist', $default_tasklist);
+        return $default_tasklist;
     }
 
     /**

diff --git a/nag/lib/Tasklists/Base.php b/nag/lib/Tasklists/Base.php
@@ -111,7 +111,6 @@ abstract protected function _getDefaultShareName();
      */
     protected function _prepareDefaultShare($share)
     {
-        $share->set('default', true);
     }
 
 }
diff --git a/nag/lib/Tasklists/Kolab.php b/nag/lib/Tasklists/Kolab.php
@@ -41,4 +41,14 @@ protected function _getDefaultShareName()
         return _("Tasks");
     }
 
+    /**
+     * Add any modifiers required to the share in order to mark it as default.
+     *
+     * @param Horde_Share_Object $share The new default share.
+     */
+    protected function _prepareDefaultShare($share)
+    {
+        $share->set('default', true);
+    }
+
 }