From 8ede575bb828efc9d8b380410021b13da1402d6e Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 8 Jan 2010 10:02:28 -0700 Subject: [PATCH] configFilesMissing() is not used anymore --- agora/index.php | 12 +----------- beatnik/index.php | 12 +----------- hylax/index.php | 14 +------------- shout/lib/Application.php | 6 ------ vilma/index.php | 13 +------------ whups/index.php | 21 +-------------------- wicked/index.php | 12 +----------- 7 files changed, 6 insertions(+), 84 deletions(-) diff --git a/agora/index.php b/agora/index.php index 27f5cd40f..081127395 100755 --- a/agora/index.php +++ b/agora/index.php @@ -3,14 +3,4 @@ * $Horde: agora/index.php,v 1.13 2008/01/05 11:37:12 duck Exp $ */ -define('AGORA_BASE', dirname(__FILE__)); -$agora_configured = (is_readable(AGORA_BASE . '/config/conf.php') && - is_readable(AGORA_BASE . '/config/prefs.php')); - -if (!$agora_configured) { - require AGORA_BASE . '/../lib/Test.php'; - Horde_Test::configFilesMissing('Agora', AGORA_BASE, - array('conf.php', 'prefs.php')); -} - -require AGORA_BASE . '/forums.php'; +require dirname(__FILE__) . '/forums.php'; diff --git a/beatnik/index.php b/beatnik/index.php index 379846053..8934944a7 100644 --- a/beatnik/index.php +++ b/beatnik/index.php @@ -6,14 +6,4 @@ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. */ -define('BEATNIK_BASE', dirname(__FILE__)); -$beatnik_configured = (is_readable(BEATNIK_BASE . '/config/conf.php') && - is_readable(BEATNIK_BASE . '/config/prefs.php')); - -if (!$beatnik_configured) { - require BEATNIK_BASE . '/../lib/Test.php'; - Horde_Test::configFilesMissing('Beatnik', BEATNIK_BASE, - array('conf.php', 'prefs.php')); -} - -require BEATNIK_BASE . '/listzones.php'; +require dirname(__FILE__) . '/listzones.php'; diff --git a/hylax/index.php b/hylax/index.php index 9e3320994..2bf10683c 100644 --- a/hylax/index.php +++ b/hylax/index.php @@ -10,16 +10,4 @@ * @author Marko Djukic */ -@define('HYLAX_BASE', dirname(__FILE__)); -$hylax_configured = (is_readable(HYLAX_BASE . '/config/conf.php') && - is_readable(HYLAX_BASE . '/config/prefs.php') && - is_readable(HYLAX_BASE . '/config/covers.php')); - -if (!$hylax_configured) { - require HYLAX_BASE . '/../lib/Test.php'; - Horde_Test::configFilesMissing('Hylax', HYLAX_BASE, - array('conf.php', 'prefs.php'), - array('covers.php' => 'This file defines the templates for Cover Sheets.')); -} - -require HYLAX_BASE . '/folder.php'; +require dirname(__FILE__) . '/folder.php'; diff --git a/shout/lib/Application.php b/shout/lib/Application.php index ae3e5812c..bebae9f84 100644 --- a/shout/lib/Application.php +++ b/shout/lib/Application.php @@ -50,12 +50,6 @@ class Shout_Application extends Horde_Registry_Application Horde_Auth::authenticateFailure('shout', $e); } - // Ensure Shout is properly configured before use - $shout_configured = (@is_readable(SHOUT_BASE . '/config/conf.php')); - if (!$shout_configured) { - Horde_Test::configFilesMissing('Shout', SHOUT_BASE, array('conf.php')); - } - define('SHOUT_TEMPLATES', $registry->get('templates')); $this->contexts = Shout_Driver::factory('storage'); diff --git a/vilma/index.php b/vilma/index.php index 8d48804a4..8192af094 100644 --- a/vilma/index.php +++ b/vilma/index.php @@ -8,15 +8,4 @@ * @author Marko Djukic */ -@define('VILMA_BASE', dirname(__FILE__)); -require_once VILMA_BASE . '/lib/base.php'; - -$vilma_configured = (@is_readable(VILMA_BASE . '/config/conf.php') && - @is_readable(VILMA_BASE . '/config/prefs.php')); - -if (!$vilma_configured) { - require VILMA_BASE . '/../lib/Test.php'; - Horde_Test::configFilesMissing('Vilma', VILMA_BASE, array('conf.php', 'prefs.php')); -} - -require VILMA_BASE . '/domains/index.php'; +require dirname(__FILE__) . '/domains/index.php'; diff --git a/whups/index.php b/whups/index.php index 18834b344..f47136c6e 100644 --- a/whups/index.php +++ b/whups/index.php @@ -7,24 +7,5 @@ * did not receive this file, see http://www.horde.org/licenses/bsdl.php. */ -// Determine BASE directories. -require_once dirname(__FILE__) . '/lib/base.load.php'; -$whups_configured = (is_readable(WHUPS_BASE . '/config/conf.php') && - is_readable(WHUPS_BASE . '/config/create_email.txt') && - is_readable(WHUPS_BASE . '/config/mime_drivers.php') && - is_readable(WHUPS_BASE . '/config/notify_email.txt') && - is_readable(WHUPS_BASE . '/config/prefs.php') && - is_readable(WHUPS_BASE . '/config/templates.php')); - -if (!$whups_configured) { - require HORDE_BASE . '/lib/Test.php'; - Horde_Test::configFilesMissing('Whups', WHUPS_BASE, - array('conf.php', 'mime_drivers.php', 'prefs.php'), - array('templates.php' => 'This file defines the templates that various parts of Whups use to format data.', - 'create_email.txt' => 'This is the template for ticket creation emails', - 'notify_email.txt' => 'This is the template for ticket notification emails', - )); -} - -require_once WHUPS_BASE . '/lib/base.php'; +require_once dirname(__FILE__) . '/lib/base.php'; require basename($prefs->getValue('whups_default_view') . '.php'); diff --git a/wicked/index.php b/wicked/index.php index 88de5bb04..2442f5b6c 100644 --- a/wicked/index.php +++ b/wicked/index.php @@ -8,14 +8,4 @@ * @author Tyler Colbert */ -@define('WICKED_BASE', dirname(__FILE__)); -$wicked_configured = (is_readable(WICKED_BASE . '/config/conf.php') && - is_readable(WICKED_BASE . '/config/prefs.php')); - -if (!$wicked_configured) { - require WICKED_BASE . '/../lib/Test.php'; - Horde_Test::configFilesMissing('Wicked', WICKED_BASE, - array('conf.php', 'prefs.php')); -} - -require WICKED_BASE . '/display.php'; +require dirname(__FILE__) . '/display.php'; -- 2.11.0