From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 28 Jan 2010 08:57:21 +0000 (-0700)
Subject: Fully convert whups to Horde_Registry_Application
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6118ce66d1cf1881d8bd8b0fc17fd929e1f55d53;p=horde.git

Fully convert whups to Horde_Registry_Application
---

diff --git a/whups/README b/whups/README
index 6b33195e4..33ccbe54f 100644
--- a/whups/README
+++ b/whups/README
@@ -1,7 +1,7 @@
 What is Whups?
 ==============
 
-:Contact:       horde@lists.horde.org
+:Contact: horde@lists.horde.org
 
 .. contents:: Contents
 .. section-numbering::
diff --git a/whups/admin/index.php b/whups/admin/index.php
index 18e607ea7..3dc9cbaa6 100644
--- a/whups/admin/index.php
+++ b/whups/admin/index.php
@@ -8,8 +8,8 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-@define('WHUPS_BASE', dirname(dirname(__FILE__)));
-require_once WHUPS_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
 
 if (!Horde_Auth::isAdmin('whups:admin')) {
     Horde_Auth::authenticateFailure('whups', $e);
diff --git a/whups/data.php b/whups/data.php
index c638e2d52..32cd12122 100644
--- a/whups/data.php
+++ b/whups/data.php
@@ -8,9 +8,9 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-define('WHUPS_BASE', dirname(__FILE__));
-require_once WHUPS_BASE . '/lib/base.php';
-require_once 'Horde/Template.php';
+require_once dirname(__FILE__) . '/lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require WHUPS_BASE . '/config/templates.php';
 
 if (!Horde_Auth::getAuth()) {
diff --git a/whups/index.php b/whups/index.php
index f37abf469..d41869f5a 100644
--- a/whups/index.php
+++ b/whups/index.php
@@ -7,5 +7,7 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-require_once dirname(__FILE__) . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require basename($prefs->getValue('whups_default_view') . '.php');
diff --git a/whups/lib/Api.php b/whups/lib/Api.php
index a01d17aac..d7755f7da 100644
--- a/whups/lib/Api.php
+++ b/whups/lib/Api.php
@@ -18,7 +18,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function browse($path = '')
     {
-        require_once dirname(__FILE__) . '/base.php';
         global $whups_driver, $registry;
 
         if (substr($path, 0, 5) == 'whups') {
@@ -79,7 +78,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function addQueue($name)
     {
-        require_once dirname(__FILE__) . '/base.php';
         if (Horde_Auth::isAdmin('whups:admin')) {
             return $GLOBALS['whups_driver']->addQueue($name, '');
         } else {
@@ -94,7 +92,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function getAssignedTicketIds()
     {
-        require_once dirname(__FILE__) . '/base.php';
         global $whups_driver;
 
         $info = array('owner' => 'user:' . Horde_Auth::getAuth(), 'nores' => true);
@@ -116,7 +113,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function getRequestedTicketIds()
     {
-        require_once dirname(__FILE__) . '/base.php';
         global $whups_driver;
 
         $info = array('requester' => Horde_Auth::getAuth(), 'nores' => true);
@@ -142,7 +138,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function addTicket($ticket_info)
     {
-        require_once dirname(__FILE__) . '/base.php';
         require_once dirname(__FILE__) . '/Forms/CreateTicket.php';
         require_once dirname(__FILE__) . '/Ticket.php';
         global $whups_driver;
@@ -213,7 +208,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function updateTicket($ticket_id, $ticket_info)
     {
-        require_once dirname(__FILE__) . '/base.php';
         require_once dirname(__FILE__) . '/Ticket.php';
         require_once dirname(__FILE__) . '/Forms/EditTicket.php';
         global $whups_driver;
@@ -299,9 +293,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function addComment($ticket_id, $comment, $group = null)
     {
-        require_once dirname(__FILE__) . '/base.php';
-        require_once WHUPS_BASE . '/lib/Ticket.php';
-
         $ticket_id = (int)$ticket_id;
         if (empty($ticket_id)) {
             return PEAR::raiseError('Invalid ticket id');
@@ -344,9 +335,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function addAttachment($ticket_id, $name, $data)
     {
-        require_once dirname(__FILE__) . '/base.php';
-        require_once WHUPS_BASE . '/lib/Ticket.php';
-
         $ticket_id = (int)$ticket_id;
         if (empty($ticket_id)) {
             return PEAR::raiseError(_("Invalid Ticket Id"));
@@ -383,7 +371,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function setTicketAttributes($info)
     {
-        require_once dirname(__FILE__) . '/base.php';
         global $whups_driver;
 
         if (!isset($info['ticket_id']) || !isset($info['attributes'])) {
@@ -434,7 +421,6 @@ class Whups_Api extends Horde_Registry_Api
     {
         switch ($type) {
         case 'taskHash':
-            require_once dirname(__FILE__) . '/base.php';
             global $whups_driver;
             $info = array('owner' => 'user:' . Horde_Auth::getAuth(),
                           'nores' => true);
@@ -480,7 +466,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function listQueues()
     {
-        require_once dirname(__FILE__) . '/base.php';
         return Whups::permissionsFilter($GLOBALS['whups_driver']->getQueuesInternal(), 'queue', Horde_Perms::SHOW);
     }
 
@@ -493,7 +478,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function getQueueDetails($queue)
     {
-        require_once dirname(__FILE__) . '/base.php';
         if (is_array($queue)) {
             $queues = Whups::permissionsFilter($queue, 'queue_id');
             $details = array();
@@ -520,8 +504,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function listVersions($queue)
     {
-        require_once dirname(__FILE__) . '/base.php';
-
         $queues = Whups::permissionsFilter(array($queue), 'queue_id');
         if (!$queues) {
             return array();
@@ -566,7 +548,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function addVersion($queue, $name, $description, $active = true)
     {
-        require_once dirname(__FILE__) . '/base.php';
         return $GLOBALS['whups_driver']->addVersion($queue, $name, $description, $active);
     }
 
@@ -579,7 +560,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function getVersionDetails($version_id)
     {
-        require_once dirname(__FILE__) . '/base.php';
         return $GLOBALS['whups_driver']->getVersionInternal($version_id);
     }
 
@@ -593,7 +573,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function getTicketDetails($queue_id, $state = null)
     {
-        require_once dirname(__FILE__) . '/base.php';
         global $whups_driver;
 
         $info['queue_id'] = $queue_id;
@@ -647,7 +626,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function listCostObjects($criteria)
     {
-        require_once dirname(__FILE__) . '/base.php';
         global $whups_driver;
 
         $info = array();
@@ -717,8 +695,6 @@ class Whups_Api extends Horde_Registry_Api
      */
     public function listTimeObjects($categories, $start, $end)
     {
-        require_once dirname(__FILE__) . '/base.php';
-        require_once WHUPS_BASE . '/lib/Ticket.php';
         global $whups_driver;
 
         $start = new Horde_Date($start);
diff --git a/whups/lib/Application.php b/whups/lib/Application.php
index b46bea278..277056cfa 100644
--- a/whups/lib/Application.php
+++ b/whups/lib/Application.php
@@ -2,11 +2,68 @@
 /**
  * Whups application API.
  *
+ * This file defines Horde's core API interface. Other core Horde libraries
+ * can interact with Whups through this API.
+ *
+ * Copyright 2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
  * @package Whups
  */
+
+/* Determine the base directories. */
+if (!defined('WHUPS_BASE')) {
+    define('WHUPS_BASE', dirname(__FILE__) . '/..');
+}
+
+if (!defined('HORDE_BASE')) {
+    /* If Horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(WHUPS_BASE . '/config/horde.local.php')) {
+        include WHUPS_BASE . '/config/horde.local.php';
+    } else {
+        define('HORDE_BASE', WHUPS_BASE . '/..');
+    }
+}
+
+/* Load the Horde Framework core (needed to autoload
+ * Horde_Registry_Application::). */
+require_once HORDE_BASE . '/lib/core.php';
+
 class Whups_Application extends Horde_Registry_Application
 {
-    public $version = 'H3 (2.0-cvs)';
+    /**
+     * The application's version.
+     *
+     * @var string
+     */
+    public $version = 'H3 (2.0-git)';
+
+    /**
+     * Perms cache
+     *
+     * @var array
+     */
+    static protected $_permsCache = array();
+
+    /**
+     * Whups initialization.
+     *
+     * Global variables defined:
+     *   $whups_driver - The global Whups driver object.
+     */
+    protected function _init()
+    {
+        // TODO: Remove once they can be autoloaded
+        require_once 'Horde/Group.php';
+        require_once 'Horde/Form.php';
+        require_once 'Horde/Form/Renderer.php';
+
+        $GLOBALS['whups_driver'] = Whups_Driver::factory();
+        $GLOBALS['whups_driver']->initialise();
+    }
 
     /**
      * Returns a list of available permissions.
@@ -15,14 +72,10 @@ class Whups_Application extends Horde_Registry_Application
      */
     public function perms()
     {
-        static $perms = array();
-        if (!empty($perms)) {
-            return $perms;
+        if (!empty(self::$_permsCache)) {
+            return self::$_permsCache;
         }
 
-        require_once dirname(__FILE__) . '/base.php';
-        global $whups_driver;
-
         /* Available Whups permissions. */
         $perms['tree']['whups']['admin'] = false;
         $perms['title']['whups:admin'] = _("Administration");
@@ -34,7 +87,7 @@ class Whups_Application extends Horde_Registry_Application
         $perms['title']['whups:queues'] = _("Queues");
 
         /* Loop through queues and add their titles. */
-        $queues = $whups_driver->getQueues();
+        $queues = $GLOBALS['whups_driver']->getQueues();
         foreach ($queues as $id => $name) {
             $perms['tree']['whups']['queues'][$id] = false;
             $perms['title']['whups:queues:' . $id] = $name;
@@ -59,13 +112,15 @@ class Whups_Application extends Horde_Registry_Application
         $perms['title']['whups:replies'] = _("Form Replies");
 
         /* Loop through type and replies and add their titles. */
-        foreach ($whups_driver->getAllTypes() as $type_id => $type_name) {
-            foreach ($whups_driver->getReplies($type_id) as $reply_id => $reply) {
+        foreach ($GLOBALS['whups_driver']->getAllTypes() as $type_id => $type_name) {
+            foreach ($GLOBALS['whups_driver']->getReplies($type_id) as $reply_id => $reply) {
                 $perms['tree']['whups']['replies'][$reply_id] = false;
                 $perms['title']['whups:replies:' . $reply_id] = $type_name . ': ' . $reply['reply_name'];
             }
         }
 
+        self::$_permsCache = $perms;
+
         return $perms;
     }
 
diff --git a/whups/lib/Block/myqueries.php b/whups/lib/Block/myqueries.php
index 0a1388c20..12f3e3bff 100644
--- a/whups/lib/Block/myqueries.php
+++ b/whups/lib/Block/myqueries.php
@@ -29,9 +29,7 @@ class Horde_Block_Whups_myqueries extends Horde_Block {
      */
     function _content()
     {
-        require_once dirname(__FILE__) . '/../base.php';
         require_once WHUPS_BASE . '/lib/Query.php';
-        require_once WHUPS_BASE . '/lib/View.php';
 
         $qManager = new Whups_QueryManager();
         $queries = $qManager->listQueries(Horde_Auth::getAuth(), true);
diff --git a/whups/lib/Block/myrequests.php b/whups/lib/Block/myrequests.php
index 749ace61e..390bea240 100644
--- a/whups/lib/Block/myrequests.php
+++ b/whups/lib/Block/myrequests.php
@@ -29,7 +29,6 @@ class Horde_Block_Whups_myrequests extends Horde_Block {
      */
     function _content()
     {
-        require_once dirname(__FILE__) . '/../base.php';
         global $whups_driver, $prefs;
 
         $queue_ids = array_keys(Whups::permissionsFilter($whups_driver->getQueues(), 'queue', Horde_Perms::READ));
diff --git a/whups/lib/Block/mytickets.php b/whups/lib/Block/mytickets.php
index f313a07a2..398bf0978 100644
--- a/whups/lib/Block/mytickets.php
+++ b/whups/lib/Block/mytickets.php
@@ -29,7 +29,6 @@ class Horde_Block_Whups_mytickets extends Horde_Block {
      */
     function _content()
     {
-        require_once dirname(__FILE__) . '/../base.php';
         global $whups_driver, $prefs;
 
         $queue_ids = array_keys(Whups::permissionsFilter($whups_driver->getQueues(), 'queue', Horde_Perms::READ));
diff --git a/whups/lib/Block/query.php b/whups/lib/Block/query.php
index 66636726b..9175be0ac 100644
--- a/whups/lib/Block/query.php
+++ b/whups/lib/Block/query.php
@@ -14,7 +14,6 @@ class Horde_Block_Whups_query extends Horde_Block {
 
     function _params()
     {
-        require_once dirname(__FILE__) . '/../base.php';
         require_once WHUPS_BASE . '/lib/Query.php';
 
         $qManager = new Whups_QueryManager();
@@ -93,7 +92,6 @@ class Horde_Block_Whups_query extends Horde_Block {
             return false;
         }
 
-        require_once dirname(__FILE__) . '/../base.php';
         require_once WHUPS_BASE . '/lib/Query.php';
 
         $qManager = new Whups_QueryManager();
diff --git a/whups/lib/Block/queuecontents.php b/whups/lib/Block/queuecontents.php
index 5539ba49f..8e318dc48 100644
--- a/whups/lib/Block/queuecontents.php
+++ b/whups/lib/Block/queuecontents.php
@@ -14,7 +14,6 @@ class Horde_Block_Whups_queuecontents extends Horde_Block {
     function _params()
     {
         global $whups_driver;
-        require_once dirname(__FILE__) . '/../base.php';
 
         $qParams = array();
         $qDefault = null;
@@ -95,7 +94,6 @@ class Horde_Block_Whups_queuecontents extends Horde_Block {
     function _getQueue()
     {
         global $whups_driver;
-        require_once dirname(__FILE__) . '/../base.php';
 
         if (empty($this->_params['queue'])) {
             return false;
diff --git a/whups/lib/Block/queuesummary.php b/whups/lib/Block/queuesummary.php
index d9caadb82..11b05a9ce 100644
--- a/whups/lib/Block/queuesummary.php
+++ b/whups/lib/Block/queuesummary.php
@@ -29,7 +29,6 @@ class Horde_Block_Whups_queuesummary extends Horde_Block {
      */
     function _content()
     {
-        require_once dirname(__FILE__) . '/../base.php';
         global $whups_driver;
 
         $queues = Whups::permissionsFilter($whups_driver->getQueues(), 'queue', Horde_Perms::READ);
diff --git a/whups/lib/Block/unassigned.php b/whups/lib/Block/unassigned.php
index 473a34a46..cbf55b9a3 100644
--- a/whups/lib/Block/unassigned.php
+++ b/whups/lib/Block/unassigned.php
@@ -29,7 +29,6 @@ class Horde_Block_Whups_unassigned extends Horde_Block {
      */
     function _content()
     {
-        require_once dirname(__FILE__) . '/../base.php';
         global $whups_driver, $prefs;
 
         $queue_ids = array_keys(Whups::permissionsFilter($whups_driver->getQueues(), 'queue', Horde_Perms::READ));
diff --git a/whups/lib/base.load.php b/whups/lib/base.load.php
deleted file mode 100644
index 27ae19359..000000000
--- a/whups/lib/base.load.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Script to determine the correct *_BASE values.
- *
- * Copyright 2009-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @package Ansel
- */
-
-if (!defined('WHUPS_BASE')) {
-    define('WHUPS_BASE', dirname(__FILE__) . '/..');
-}
-
-if (!defined('HORDE_BASE')) {
-    /* If horde does not live directly under the app directory, the HORDE_BASE
-     * constant should be defined in config/horde.local.php. */
-    if (file_exists(WHUPS_BASE . '/config/horde.local.php')) {
-        include WHUPS_BASE . '/config/horde.local.php';
-    } else {
-        define('HORDE_BASE', WHUPS_BASE . '/..');
-    }
-}
diff --git a/whups/lib/base.php b/whups/lib/base.php
deleted file mode 100644
index 269be1c15..000000000
--- a/whups/lib/base.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Whups base inclusion file.
- *
- * This file brings in all of the dependencies that every Whups script will
- * need, and sets up objects that all scripts use.
- *
- * Copyright 2001-2002 Robert E. Coyle <robertecoyle@hotmail.com>
- * Copyright 2001-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file LICENSE for license information (BSD). If you
- * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
- *
- * @package Whups
- */
-
-// Determine BASE directories.
-require_once dirname(__FILE__) . '/base.load.php';
-
-// Load the Horde Framework core, and set up inclusion paths.
-require_once HORDE_BASE . '/lib/core.php';
-
-// Registry.
-$registry = Horde_Registry::singleton();
-
-// Determine whups authentication type.
-$authentication = Horde_Util::nonInputVar('whups_authentication');
-
-try {
-    $registry->pushApp('whups', array('check_perms' => ($authentication != 'none'), 'logintasks' => true));
-} catch (Horde_Exception $e) {
-    Horde_Auth::authenticateFailure('whups', $e);
-}
-
-$conf = &$GLOBALS['conf'];
-define('WHUPS_TEMPLATES', $registry->get('templates'));
-
-// Notification system.
-$notification = &Horde_Notification::singleton();
-$notification->attach('status');
-
-// Find the base file path of Whups.
-if (!defined('WHUPS_BASE')) {
-    define('WHUPS_BASE', dirname(__FILE__) . '/..');
-}
-
-// Whups base libraries.
-require_once WHUPS_BASE . '/lib/Whups.php';
-require_once WHUPS_BASE . '/lib/Driver.php';
-
-// Horde libraries.
-require_once 'Horde/Group.php';
-
-// Form libraries.
-require_once 'Horde/Form.php';
-require_once 'Horde/Form/Renderer.php';
-
-// Start output compression.
-Horde::compressOutput();
-
-// Whups backend.
-$GLOBALS['whups_driver'] = Whups_Driver::factory();
-$GLOBALS['whups_driver']->initialise();
diff --git a/whups/lib/tests/TestBase.php b/whups/lib/tests/TestBase.php
index 3131787f8..4c54ec2cf 100644
--- a/whups/lib/tests/TestBase.php
+++ b/whups/lib/tests/TestBase.php
@@ -12,22 +12,8 @@ class Whups_TestBase Extends PHPUnit_Framework_TestCase {
 
     function setUp()
     {
-        // TODO: Do we need to actually fake auth for any tests?
-        @define('AUTH_HANDLER', true);
-        @define('HORDE_BASE', dirname(__FILE__) . '/../../..');
-        @define('WHUPS_BASE', dirname(__FILE__) . '/../..');
-        require_once HORDE_BASE . '/lib/core.php';
-
-        // Need to ensure $browser is in the global scope.
-        $GLOBALS['browser'] = $browser;
-
-        // Set up the CLI enviroment.
-        Horde_Cli::init();
-
-        // Need to load registry. For some reason including base.php doesn't
-        // work properly yet. ($registry is not set when prefs.php loads)?
-        $GLOBALS['registry'] = Horde_Registry::singleton();
-        define('WHUPS_TEMPLATES', $GLOBALS['registry']->get('templates', 'whups'));
+        require_once dirname(__FILE__) . '/../Application.php';
+        Horde_Registry::appInit('whups', array('authentication' => 'none', 'cli' => true);
     }
 
     /**
diff --git a/whups/mybugs.php b/whups/mybugs.php
index 189d2ced2..a188ef9c9 100644
--- a/whups/mybugs.php
+++ b/whups/mybugs.php
@@ -8,7 +8,9 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-require_once dirname(__FILE__) . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once 'Horde/Block/Layout/View.php';
 
 // @TODO: remove this when there are blocks useful to guests
diff --git a/whups/mybugs_edit.php b/whups/mybugs_edit.php
index 5dd33fef9..9b182c35f 100644
--- a/whups/mybugs_edit.php
+++ b/whups/mybugs_edit.php
@@ -10,14 +10,12 @@
  * @author Mike Cochrane <mike@graftonhall.co.nz>
  */
 
-@define('WHUPS_BASE', dirname(__FILE__));
-require_once WHUPS_BASE . '/lib/base.php';
-require_once 'Horde/Block/Collection.php';
-require_once 'Horde/Block/Layout/Manager.php';
+require_once dirname(__FILE__) . '/lib/Application.php';
+Horde_Registry::appInit('whups');
 
 // Instantiate the blocks objects.
-$blocks = &Horde_Block_Collection::singleton('mybugs', array('whups'));
-$layout = &Horde_Block_Layout_Manager::singleton('mybugs', $blocks, @unserialize($prefs->getValue('mybugs_layout')));
+$blocks = Horde_Block_Collection::singleton('mybugs', array('whups'));
+$layout = Horde_Block_Layout_Manager::singleton('mybugs', $blocks, @unserialize($prefs->getValue('mybugs_layout')));
 
 // Handle requested actions.
 $layout->handle(Horde_Util::getFormData('action'),
diff --git a/whups/query/index.php b/whups/query/index.php
index 6179e5312..28b82a318 100644
--- a/whups/query/index.php
+++ b/whups/query/index.php
@@ -9,7 +9,9 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-require_once dirname(__FILE__) . '/../lib/base.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once WHUPS_BASE . '/lib/Query.php';
 require_once WHUPS_BASE . '/lib/Forms/Query.php';
 require_once WHUPS_BASE . '/lib/Renderer/Query.php';
diff --git a/whups/query/rss.php b/whups/query/rss.php
index dc1100bd5..49bd95271 100644
--- a/whups/query/rss.php
+++ b/whups/query/rss.php
@@ -10,10 +10,11 @@
  * @author Michael J. Rubinsky <mrubinsk@horde.org>
  * @author Jan Schneider <jan@horde.org>
  */
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
+
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once WHUPS_BASE . '/lib/Query.php';
-require_once 'Horde/Template.php';
 
 $qManager = new Whups_QueryManager();
 $vars = new Horde_Variables();
diff --git a/whups/query/run.php b/whups/query/run.php
index 28d892a3b..0faf2ee09 100644
--- a/whups/query/run.php
+++ b/whups/query/run.php
@@ -9,7 +9,9 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-require_once dirname(__FILE__) . '/../lib/base.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once WHUPS_BASE . '/lib/Query.php';
 require_once WHUPS_BASE . '/lib/Forms/QueryParameterForm.php';
 require WHUPS_BASE . '/lib/Renderer/Query.php';
diff --git a/whups/queue/index.php b/whups/queue/index.php
index 2794fce1a..ccffc79ca 100644
--- a/whups/queue/index.php
+++ b/whups/queue/index.php
@@ -10,9 +10,8 @@
  * @author Michael J. Rubinsk <mrubinsk@horde.org>
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once WHUPS_BASE . '/lib/View.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
 
 // See if we were passed a slug or id. Slug is tried first.
 $slug = Horde_Util::getFormData('slug');
diff --git a/whups/queue/rss.php b/whups/queue/rss.php
index d870c6afa..6c614564b 100644
--- a/whups/queue/rss.php
+++ b/whups/queue/rss.php
@@ -9,9 +9,9 @@
  *
  * @author Michael J. Rubinsky <mrubinsk@horde.org>
  */
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once 'Horde/Template.php';
+
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
 
 // See if we were passed a slug or id. Slug is tried first.
 $slug = Horde_Util::getFormData('slug');
@@ -31,7 +31,6 @@ if ($slug) {
 // open tickets.
 $state_category = Horde_Util::getFormData('state');
 if ($state_category) {
-    require_once 'Horde/String.php';
     $state_display = Horde_String::ucFirst($state_category);
     // When specifying an explicit state, limit the feed to 10.
     $limit = 10;
diff --git a/whups/reports.php b/whups/reports.php
index a67daedbe..58df4e3b4 100644
--- a/whups/reports.php
+++ b/whups/reports.php
@@ -8,9 +8,8 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-@define('WHUPS_BASE', dirname(__FILE__));
-require_once WHUPS_BASE . '/lib/base.php';
-require_once WHUPS_BASE . '/lib/Reports.php';
+require_once dirname(__FILE__) . '/lib/Application.php';
+Horde_Registry::appInit('whups');
 
 /* Supported graph types. Unused at the moment. */
 $graphs = array('open|queue_name' => array('chart', _("Open Tickets by Queue")),
diff --git a/whups/scripts/mail-filter.php b/whups/scripts/mail-filter.php
index b45e75906..dc1ed838d 100755
--- a/whups/scripts/mail-filter.php
+++ b/whups/scripts/mail-filter.php
@@ -56,17 +56,9 @@ function _dump($hash)
     return $dump;
 }
 
-$whups_authentication = 'none';
-require_once dirname(__FILE__) . '/../lib/base.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups', array('authentication' => 'none', 'cli' => true));
 
-// Make sure no one runs this from the web.
-if (!Horde_Cli::runningFromCLI()) {
-    exit("Must be run from the command line\n");
-}
-
-// Load the CLI environment - make sure there's no time limit, init some
-// variables, etc.
-Horde_Cli::init();
 $cli = Horde_Cli::singleton();
 
 // Set server name.
diff --git a/whups/scripts/reminders.php b/whups/scripts/reminders.php
index d400caaef..26b6033d9 100755
--- a/whups/scripts/reminders.php
+++ b/whups/scripts/reminders.php
@@ -9,24 +9,11 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-// Do CLI checks and environment setup first.
-require_once dirname(__FILE__) . '/../../lib/core.php';
-
-// Make sure no one runs this from the web.
-if (!Horde_Cli::runningFromCLI()) {
-    exit("Must be run from the command line\n");
-}
-
-// Load the CLI environment - make sure there's no time limit, init
-// some variables, etc.
-Horde_Cli::init();
-
-// Include needed libraries.
-$whups_authentication = 'none';
-require_once dirname(__FILE__) . '/../lib/base.php';
-require_once WHUPS_BASE . '/lib/Scheduler/whups.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups', array('authentication' => 'none'));
 
 // Get an instance of the Whups scheduler.
+require_once WHUPS_BASE . '/lib/Scheduler/whups.php';
 $reminder = Horde_Scheduler::unserialize('Horde_Scheduler_whups');
 
 // Check for and send reminders.
diff --git a/whups/search.php b/whups/search.php
index 22d913e58..15dcb1179 100644
--- a/whups/search.php
+++ b/whups/search.php
@@ -40,10 +40,11 @@ function _getSearchUrl($vars)
     return substr($qUrl, 1);
 }
 
-require_once dirname(__FILE__) . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once WHUPS_BASE . '/lib/Query.php';
 require_once WHUPS_BASE . '/lib/Forms/Search.php';
-require_once WHUPS_BASE . '/lib/View.php';
 
 $renderer = new Horde_Form_Renderer();
 $beendone = false;
diff --git a/whups/search/rss.php b/whups/search/rss.php
index 2ec915bbb..ca4327280 100644
--- a/whups/search/rss.php
+++ b/whups/search/rss.php
@@ -8,9 +8,10 @@
  * @author Duck <duck@obala.net>
  */
 
-require_once dirname(__FILE__) . '/../lib/base.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once WHUPS_BASE . '/lib/Forms/Search.php';
-require_once 'Horde/Template.php';
 
 $vars = Horde_Variables::getDefaultVariables();
 $limit = (int)$vars->get('limit');
diff --git a/whups/ticket/comment.php b/whups/ticket/comment.php
index 714df8a47..24f4be505 100644
--- a/whups/ticket/comment.php
+++ b/whups/ticket/comment.php
@@ -7,10 +7,9 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once WHUPS_BASE . '/lib/Forms/AddComment.php';
 
 $ticket = Whups::getCurrentTicket();
diff --git a/whups/ticket/create.php b/whups/ticket/create.php
index 1e9a28eb9..e87b21e1a 100644
--- a/whups/ticket/create.php
+++ b/whups/ticket/create.php
@@ -7,11 +7,11 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once WHUPS_BASE . '/lib/Forms/CreateTicket.php';
 require_once WHUPS_BASE . '/lib/Forms/VarRenderer.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
 
 $empty = '';
 $beendone = 0;
diff --git a/whups/ticket/delete.php b/whups/ticket/delete.php
index 5c9cdca8c..d0c65cf53 100644
--- a/whups/ticket/delete.php
+++ b/whups/ticket/delete.php
@@ -9,9 +9,8 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
 
 class DeleteTicketForm extends Horde_Form {
 
diff --git a/whups/ticket/deleteAttachment.php b/whups/ticket/deleteAttachment.php
index 0ace0619b..d9b0edb9c 100644
--- a/whups/ticket/deleteAttachment.php
+++ b/whups/ticket/deleteAttachment.php
@@ -9,9 +9,8 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
 
 $ticket = Whups::getCurrentTicket();
 if (!Whups::hasPermission($ticket->get('queue'), 'queue', Horde_Perms::DELETE)) {
diff --git a/whups/ticket/index.php b/whups/ticket/index.php
index 54bf78535..950a98767 100644
--- a/whups/ticket/index.php
+++ b/whups/ticket/index.php
@@ -9,8 +9,9 @@
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
 
-require_once dirname(__FILE__) . '/../lib/base.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once WHUPS_BASE . '/lib/Renderer/Comment.php';
 
 $ticket = Whups::getCurrentTicket();
diff --git a/whups/ticket/queue.php b/whups/ticket/queue.php
index b84b31773..eaf4555c3 100644
--- a/whups/ticket/queue.php
+++ b/whups/ticket/queue.php
@@ -9,9 +9,8 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
 
 /**
  * Queue editing forms.
diff --git a/whups/ticket/rss.php b/whups/ticket/rss.php
index 99d8b1f37..af5afa687 100644
--- a/whups/ticket/rss.php
+++ b/whups/ticket/rss.php
@@ -7,9 +7,8 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once 'Horde/Template.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
 
 $ticket = Horde_Util::getFormData('id');
 $ticket = preg_replace('|\D|', '', $ticket);
diff --git a/whups/ticket/type.php b/whups/ticket/type.php
index ab85174bc..51d845be1 100644
--- a/whups/ticket/type.php
+++ b/whups/ticket/type.php
@@ -9,9 +9,8 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
 
 class SetTypeStep1Form extends Horde_Form {
 
diff --git a/whups/ticket/update.php b/whups/ticket/update.php
index 7d4d04c97..23d6e7ac1 100644
--- a/whups/ticket/update.php
+++ b/whups/ticket/update.php
@@ -7,9 +7,9 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
+
 require_once WHUPS_BASE . '/lib/Forms/EditTicket.php';
 
 $ticket = Whups::getCurrentTicket();
diff --git a/whups/ticket/watch.php b/whups/ticket/watch.php
index 574be8f51..124f382b2 100644
--- a/whups/ticket/watch.php
+++ b/whups/ticket/watch.php
@@ -7,9 +7,8 @@
  * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
  */
 
-@define('WHUPS_BASE', dirname(__FILE__) . '/..');
-require_once WHUPS_BASE . '/lib/base.php';
-require_once WHUPS_BASE . '/lib/Ticket.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+Horde_Registry::appInit('whups');
 
 class AddListenerForm extends Horde_Form {
 
diff --git a/whups/view.php b/whups/view.php
index f35921a67..1698b28e1 100644
--- a/whups/view.php
+++ b/whups/view.php
@@ -8,8 +8,8 @@
  * @author Jan Schneider <jan@horde.org>
  */
 
-define('WHUPS_BASE', dirname(__FILE__));
-require_once WHUPS_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/lib/Application.php';
+Horde_Registry::appInit('whups');
 
 $actionID = Horde_Util::getFormData('actionID');
 $id = Horde_Util::getFormData('ticket');