Menu:: -> Horde_Menu::

diff --git a/babel/lib/Babel.php b/babel/lib/Babel.php
index 0197732..cae684e 100644 (file)
--- a/babel/lib/Babel.php
+++ b/babel/lib/Babel.php
@@ -190,8 +190,7 @@ class Babel {
     {
         global $registry;
 
-       require_once 'Horde/Menu.php';
-       $menu = &new Menu();
+       $menu = &new Horde_Menu();
        
         $menu->addArray(array('url' => Horde::applicationUrl('index.php'),
                              'text' => _("_General"),

diff --git a/babel/lib/base.php b/babel/lib/base.php
index 65e324a..5f5c2a8 100644 (file)
--- a/babel/lib/base.php
+++ b/babel/lib/base.php
@@ -48,9 +48,6 @@ require_once BABEL_BASE . '/lib/Translate.php';
 require_once BABEL_BASE . '/lib/Translate_Help.php';
 require_once BABEL_BASE . '/lib/Display.php';
 
-/* Menu */
-require_once 'Horde/Menu.php';
-
 /* Gettext (PO) */
 require_once BABEL_BASE . '/lib/Gettext/PO.php';
 

diff --git a/chora/lib/Chora.php b/chora/lib/Chora.php
index 21ecfb8..fcecc83 100644 (file)
--- a/chora/lib/Chora.php
+++ b/chora/lib/Chora.php
@@ -437,8 +437,7 @@ class Chora
      */
     static public function getMenu()
     {
-        require_once 'Horde/Menu.php';
-        $menu = new Menu();
+        $menu = new Horde_Menu();
         $menu->add(self::url('browsedir'), _("_Browse"), 'chora.png');
         return $menu->render();
     }

diff --git a/crumb/lib/Crumb.php b/crumb/lib/Crumb.php
index 0876fd9..2c34253 100644 (file)
--- a/crumb/lib/Crumb.php
+++ b/crumb/lib/Crumb.php
@@ -21,9 +21,7 @@ class Crumb {
     {
         global $conf, $registry, $browser, $print_link;
 
-        require_once 'Horde/Menu.php';
-
-        $menu = new Menu(HORDE_MENU_MASK_ALL);
+        $menu = new Horde_Menu(Horde_Menu::MASK_ALL);
         $menu->add(Horde::applicationUrl('listclients.php'), _("List Clients"), 'user.png', $registry->getImageDir('horde'));
         $menu->add(Horde::applicationUrl('addclient.php'), _("Add Client"), 'user.png', $registry->getImageDir('horde'));
 

diff --git a/fima/lib/Fima.php b/fima/lib/Fima.php
index 1ec296e..4b4645f 100644 (file)
--- a/fima/lib/Fima.php
+++ b/fima/lib/Fima.php
@@ -753,8 +753,7 @@ class Fima {
         
         $actionID = Horde_Util::getFormData('actionID');
         
-        require_once 'Horde/Menu.php';
-        $menu = new Menu(HORDE_MENU_MASK_ALL);
+        $menu = new Horde_Menu(Horde_Menu::MASK_ALL);
         $menu->add(Horde::applicationUrl('postings.php'), _("_List Postings"), 'list.png', null, null, null, (basename($_SERVER['PHP_SELF']) == 'index.php' && basename(dirname($_SERVER['PHP_SELF'])) != 'ledgers') ? 'current' : ($actionID === null ? null : '__noselection'));
         $menu->add(Horde_Util::addParameter(Horde::applicationUrl('postings.php'), 'actionID', 'add_postings'), _("Add _Postings"), 'add.png', null, null, null, $actionID == 'add_postings' ? 'current' : '__noselection');
         $menu->add(Horde::applicationUrl('search.php'), _("Search"), 'search.png', $registry->getImageDir('horde'));

diff --git a/folks/lib/Folks.php b/folks/lib/Folks.php
index cca648e..6a3afd1 100644 (file)
--- a/folks/lib/Folks.php
+++ b/folks/lib/Folks.php
@@ -294,10 +294,8 @@ class Folks {
      */
     static function getMenu($returnType = 'object')
     {
-        require_once 'Horde/Menu.php';
-
         $img = $GLOBALS['registry']->getImageDir('horde');
-        $menu = new Menu(HORDE_MENU_MASK_ALL);
+        $menu = new Horde_Menu(Horde_Menu::MASK_ALL);
         $menu->add(self::getUrlFor('user', Auth::getAuth()), _("My profile"), 'myaccount.png', $img);
         $menu->add(self::getUrlFor('list', 'friends'), _("Friends"), 'group.png', $img);
         $menu->add(Horde::applicationUrl('edit/edit.php'), _("Edit profile"), 'edit.png', $img);

diff --git a/imp/compose.php b/imp/compose.php
index 48e4363..b4e82bf 100644 (file)
--- a/imp/compose.php
+++ b/imp/compose.php
@@ -29,8 +29,7 @@ function _mailboxReturnURL($encode, $url = null)
 
 function _popupSuccess()
 {
-    require_once 'Horde/Menu.php';
-    $menu = new Menu(HORDE_MENU_MASK_NONE);
+    $menu = new Horde_Menu(Horde_Menu::MASK_NONE);
     $menu->add(Horde::applicationUrl('compose.php'), _("New Message"), 'compose.png');
     $menu->add('', _("Close this window"), 'close.png', $GLOBALS['registry']->getImageDir('horde'), '', 'window.close();');
     require IMP_TEMPLATES . '/common-header.inc';

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 321f6fa..45b8303 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -564,14 +564,12 @@ class IMP
     {
         global $conf, $prefs, $registry;
 
-        require_once 'Horde/Menu.php';
-
         $menu_search_url = Horde::applicationUrl('search.php');
         $menu_mailbox_url = Horde::applicationUrl('mailbox.php');
 
         $spam_folder = self::folderPref($prefs->getValue('spam_folder'), true);
 
-        $menu = new Menu(HORDE_MENU_MASK_ALL & ~HORDE_MENU_MASK_LOGIN);
+        $menu = new Horde_Menu(Horde_Menu::MASK_ALL & ~Horde_Menu::MASK_LOGIN);
 
         $menu->add(self::generateIMPUrl($menu_mailbox_url, 'INBOX'), _("_Inbox"), 'folders/inbox.png');
 
@@ -650,7 +648,7 @@ class IMP
             $logout_url = self::getLogoutUrl();
 
             $id = $menu->add($logout_url, _("_Log out"), 'logout.png', $registry->getImageDir('horde'), $logout_target);
-            $menu->setPosition($id, HORDE_MENU_POS_LAST);
+            $menu->setPosition($id, Horde_Menu::POS_LAST);
         }
 
         return ($type == 'object') ? $menu : $menu->render();

diff --git a/imp/login.php b/imp/login.php
index 7f31e7d..8a3f442 100644 (file)
--- a/imp/login.php
+++ b/imp/login.php
@@ -273,8 +273,7 @@ foreach (IMP::getComposeArgs() as $arg => $value) {
 }
 $t->set('extra_hidden', $extra_hidden);
 
-require_once 'Horde/Menu.php';
-$menu = new Menu(HORDE_MENU_MASK_NONE);
+$menu = new Horde_Menu(Horde_Menu::MASK_NONE);
 $t->set('menu', $menu->render());
 $t->set('title', sprintf(_("Welcome to %s"), $registry->get('name', ($imp_auth) ? 'horde' : null)));
 

diff --git a/ingo/lib/Ingo.php b/ingo/lib/Ingo.php
index 30582fe..b6dbbe7 100644 (file)
--- a/ingo/lib/Ingo.php
+++ b/ingo/lib/Ingo.php
@@ -384,9 +384,7 @@ class Ingo
      */
     static public function getMenu($returnType = 'object')
     {
-        require_once 'Horde/Menu.php';
-
-        $menu = new Menu();
+        $menu = new Horde_Menu();
         $menu->add(Horde::applicationUrl('filters.php'), _("Filter _Rules"), 'ingo.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null);
         if (!is_a($whitelist_url = $GLOBALS['registry']->link('mail/showWhitelist'), 'PEAR_Error')) {
             $menu->add(Horde::url($whitelist_url), _("_Whitelist"), 'whitelist.png');

diff --git a/jeta/lib/Jeta.php b/jeta/lib/Jeta.php
index 70966b3..964afe6 100644 (file)
--- a/jeta/lib/Jeta.php
+++ b/jeta/lib/Jeta.php
@@ -17,8 +17,7 @@ class Jeta {
     {
         global $registry, $conf;
 
-        require_once 'Horde/Menu.php';
-        $menu = new Menu();
+        $menu = new Horde_Menu();
 
         /* Jeta Home. */
         $menu->addArray(array('url' => Horde::applicationUrl('main.php'), 'text' => _("_Shell"), 'icon' => 'jeta.png', 'class' => (basename($_SERVER['PHP_SELF']) == 'main.php' || basename($_SERVER['PHP_SELF']) == 'index.php') ? 'current' : ''));

diff --git a/koward/lib/Koward/Controller/Application.php b/koward/lib/Koward/Controller/Application.php
index f44de83..751def8 100644 (file)
--- a/koward/lib/Koward/Controller/Application.php
+++ b/koward/lib/Koward/Controller/Application.php
@@ -54,8 +54,7 @@ class Koward_Controller_Application extends Horde_Controller_Base
     {
         global $registry;
 
-        require_once 'Horde/Menu.php';
-        $menu = new Menu();
+        $menu = new Horde_Menu();
 
         if ($this->koward->hasAccess('object/listall')) {
             $menu->add($this->urlFor(array('controller' => 'object', 'action' => 'listall')),

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 29977ee..4f6e36b 100644 (file)
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -2235,8 +2235,7 @@ class Kronolith
             $GLOBALS['notification']->push(_("No calendars are available to guests."));
         }
 
-        require_once 'Horde/Menu.php';
-        $menu = new Menu();
+        $menu = new Horde_Menu();
 
         $menu->add(Horde::applicationUrl($prefs->getValue('defaultview') . '.php'), _("_Today"), 'today.png', null, null, null, '__noselection');
         if (self::getDefaultCalendar(PERMS_EDIT) &&

diff --git a/news/lib/News.php b/news/lib/News.php
index d031032..c3ad656 100644 (file)
--- a/news/lib/News.php
+++ b/news/lib/News.php
@@ -500,9 +500,7 @@ class News {
      */
     static public function getMenu($returnType = 'object')
     {
-        require_once 'Horde/Menu.php';
-
-        $menu = &new Menu();
+        $menu = new Horde_Menu();
         $img_dir = $GLOBALS['registry']->getImageDir('horde');
 
         if ($GLOBALS['prefs']->getValue('news_layout') != '') {

diff --git a/skoli/lib/Skoli.php b/skoli/lib/Skoli.php
index 3edf554..3cae93e 100644 (file)
--- a/skoli/lib/Skoli.php
+++ b/skoli/lib/Skoli.php
@@ -491,9 +491,7 @@ class Skoli {
     {
         global $conf, $registry, $browser, $print_link;
 
-        require_once 'Horde/Menu.php';
-
-        $menu = new Menu(HORDE_MENU_MASK_ALL);
+        $menu = new Horde_Menu(Horde_Menu::MASK_ALL);
         $menu->add(Horde::applicationUrl('list.php'), _("List Classes"), 'skoli.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null);
         if (count(Skoli::listClasses(false, PERMS_EDIT))) {
             $menu->add(Horde::applicationUrl('add.php'), _("_New Entry"), 'add.png', null, null, null, Horde_Util::getFormData('entry') ? '__noselection' : null);