From d45ab4df43d10ffac9ad317617743f65400f5f8a Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 23 Jun 2009 14:43:27 -0600 Subject: [PATCH] Error message if Date_Holidays is not installed. --- kronolith/lib/prefs.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/kronolith/lib/prefs.php b/kronolith/lib/prefs.php index 760e6aa5a..0325db857 100644 --- a/kronolith/lib/prefs.php +++ b/kronolith/lib/prefs.php @@ -85,8 +85,8 @@ function handle_holiday_drivers($updated) $holiday_driversFiltered = array(); if (is_array($holiday_driversSelected)) { - foreach($holiday_driversSelected as $holiday_driver) { - $holiday_driversFiltered[] = $holiday_driver; + foreach ($holiday_driversSelected as $holiday_driver) { + $holiday_driversFiltered[] = $holiday_driver; } } @@ -185,13 +185,16 @@ foreach (($maint->exportIntervalPrefs()) as $val) { $$val = &$intervals; } -if (!empty($GLOBALS['conf']['holidays']['enable']) && - @include_once('Date/Holidays.php')) { - foreach (Date_Holidays::getInstalledDrivers() as $driver) { - if ($driver['id'] == 'Composite') { - continue; +if (!empty($GLOBALS['conf']['holidays']['enable'])) { + if (class_exists('Date_Holidays')) { + foreach (Date_Holidays::getInstalledDrivers() as $driver) { + if ($driver['id'] == 'Composite') { + continue; + } + $_prefs['holiday_drivers']['enum'][$driver['id']] = $driver['title']; } - $_prefs['holiday_drivers']['enum'][$driver['id']] = $driver['title']; + asort($_prefs['holiday_drivers']['enum']); + } else { + $notification->push(_("Holidays support is not available on this server."), 'horde.error'); } - asort($_prefs['holiday_drivers']['enum']); } -- 2.11.0