This is loaded on (almost) every page, so no need to load IMP_Auth ju…

…st to access it
horde · Feb 10, 2014 · f30d85f · f30d85f
1 parent 0c89f1f
commit f30d85f
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 61 deletions.
diff --git a/imp/index.php b/imp/index.php
@@ -17,4 +17,4 @@
 require_once __DIR__ . '/lib/Application.php';
 Horde_Registry::appInit('imp');
 
-IMP_Auth::getInitialPage()->url->redirect();
+IMP::getInitialPage()->url->redirect();
diff --git a/imp/lib/Application.php b/imp/lib/Application.php
@@ -153,7 +153,7 @@ protected function _init()
         if (($registry->initialApp == 'imp') &&
             !empty($this->initParams['impmode']) &&
             ($this->initParams['impmode'] != $registry->getView())) {
-            IMP_Auth::getInitialPage()->url->redirect();
+            IMP::getInitialPage()->url->redirect();
         }
     }
 
@@ -181,7 +181,7 @@ public function logout()
      */
     public function getInitialPage()
     {
-        return strval(IMP_Auth::getInitialPage()->url);
+        return strval(IMP::getInitialPage()->url);
     }
 
     /* Horde permissions. */

diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php
@@ -227,62 +227,6 @@ static protected function _canAutoLogin($server_key = null, $force = false)
         return false;
     }
 
-    /**
-     * Returns the initial page.
-     *
-     * @return object  Object with the following properties:
-     *   - mbox (IMP_Mailbox)
-     *   - url (Horde_Url)
-     */
-    static public function getInitialPage()
-    {
-        $init_url = $GLOBALS['prefs']->getValue('initial_page');
-        if (!$init_url ||
-            !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS)) {
-            $init_url = 'INBOX';
-        }
-
-        if ($init_url == IMP::INITIAL_FOLDERS) {
-            $mbox = null;
-        } else {
-            $mbox = IMP_Mailbox::get($init_url);
-            $GLOBALS['injector']->getInstance('Horde_Variables')->mailbox = $mbox->exists
-                ? $mbox->form_to
-                : IMP_Mailbox::get('INBOX')->form_to;
-        }
-
-        $result = new stdClass;
-        $result->mbox = $mbox;
-
-        switch ($GLOBALS['registry']->getView()) {
-        case Horde_Registry::VIEW_BASIC:
-            $result->url = is_null($mbox)
-                ? IMP_Basic_Folders::url()
-                : $mbox->url('mailbox');
-            break;
-
-        case Horde_Registry::VIEW_DYNAMIC:
-            $result->url = IMP_Dynamic_Mailbox::url(array(
-                'mailbox' => is_null($mbox) ? 'INBOX' : $mbox
-            ));
-            break;
-
-        case Horde_Registry::VIEW_MINIMAL:
-            $result->url = is_null($mbox)
-                ? IMP_Minimal_Folders::url()
-                : IMP_Minimal_Mailbox::url(array('mailbox' => $mbox));
-            break;
-
-        case Horde_Registry::VIEW_SMARTMOBILE:
-            $result->url = is_null($mbox)
-                ? Horde::url('smartmobile.php', true)
-                : $mbox->url('mailbox');
-            break;
-        }
-
-        return $result;
-    }
-
     /**
      * Perform post-login tasks. Session creation requires the full IMP
      * environment, which is not available until this callback.

diff --git a/imp/lib/Block/Summary.php b/imp/lib/Block/Summary.php
@@ -39,7 +39,7 @@ public function __construct($app, $params = array())
      */
     protected function _title()
     {
-        return Horde::link(IMP_Auth::getInitialPage()->url) . $GLOBALS['registry']->get('name') . '</a>';
+        return Horde::link(IMP::getInitialPage()->url) . $GLOBALS['registry']->get('name') . '</a>';
     }
 
     /**

diff --git a/imp/lib/Dynamic/Mailbox.php b/imp/lib/Dynamic/Mailbox.php
@@ -160,7 +160,7 @@ protected function _addMailboxVars()
             ),
             'filter_any' => intval($prefs->getValue('filter_any_mailbox')),
             'fsearchid' => IMP_Mailbox::formTo(IMP_Search::MBOX_PREFIX . IMP_Search::DIMP_FILTERSEARCH),
-            'initial_page' => is_null($initial_page = IMP_Auth::getInitialPage()->mbox) ? null : $initial_page->form_to,
+            'initial_page' => is_null($initial_page = IMP::getInitialPage()->mbox) ? null : $initial_page->form_to,
             'mbox_expand' => intval($prefs->getValue('nav_expanded') == 2),
             'name' => $registry->get('name', 'imp'),
             'poll_alter' => intval(!$prefs->isLocked('nav_poll') && !$prefs->getValue('nav_poll_all')),

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
@@ -134,4 +134,64 @@ static public function parseAddressList($in, array $opts = array())
         return $res;
     }
 
+    /**
+     * Returns the initial page for IMP.
+     *
+     * @return object  Object with the following properties:
+     * <pre>
+     *   - mbox (IMP_Mailbox)
+     *   - url (Horde_Url)
+     * </pre>
+     */
+    static public function getInitialPage()
+    {
+        global $injector, $prefs, $registry;
+
+        $init_url = $prefs->getValue('initial_page');
+        if (!$init_url ||
+            !$injector->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS)) {
+            $init_url = 'INBOX';
+        }
+
+        if ($init_url == IMP::INITIAL_FOLDERS) {
+            $mbox = null;
+        } else {
+            $mbox = IMP_Mailbox::get($init_url);
+            $injector->getInstance('Horde_Variables')->mailbox = $mbox->exists
+                ? $mbox->form_to
+                : IMP_Mailbox::get('INBOX')->form_to;
+        }
+
+        $result = new stdClass;
+        $result->mbox = $mbox;
+
+        switch ($registry->getView()) {
+        case Horde_Registry::VIEW_BASIC:
+            $result->url = is_null($mbox)
+                ? IMP_Basic_Folders::url()
+                : $mbox->url('mailbox');
+            break;
+
+        case Horde_Registry::VIEW_DYNAMIC:
+            $result->url = IMP_Dynamic_Mailbox::url(array(
+                'mailbox' => is_null($mbox) ? 'INBOX' : $mbox
+            ));
+            break;
+
+        case Horde_Registry::VIEW_MINIMAL:
+            $result->url = is_null($mbox)
+                ? IMP_Minimal_Folders::url()
+                : IMP_Minimal_Mailbox::url(array('mailbox' => $mbox));
+            break;
+
+        case Horde_Registry::VIEW_SMARTMOBILE:
+            $result->url = is_null($mbox)
+                ? Horde::url('smartmobile.php', true)
+                : $mbox->url('mailbox');
+            break;
+        }
+
+        return $result;
+    }
+
 }