From 87077bc57ebac466431554555675917990bc4289 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Wed, 29 Jul 2009 09:40:41 +0200 Subject: [PATCH] Allow autoloading of Kronolith_View classes. --- kronolith/lib/Kronolith.php | 9 --------- kronolith/lib/{Views => View}/Day.php | 0 kronolith/lib/{Views => View}/DeleteEvent.php | 2 -- kronolith/lib/{Views => View}/EditEvent.php | 2 -- kronolith/lib/{Views => View}/Event.php | 2 -- kronolith/lib/{Views => View}/ExportEvent.php | 0 kronolith/lib/{Views => View}/Month.php | 0 kronolith/lib/{Views => View}/Week.php | 0 kronolith/lib/{Views => View}/WorkWeek.php | 0 kronolith/lib/{Views => View}/Year.php | 0 10 files changed, 15 deletions(-) rename kronolith/lib/{Views => View}/Day.php (100%) rename kronolith/lib/{Views => View}/DeleteEvent.php (93%) rename kronolith/lib/{Views => View}/EditEvent.php (96%) rename kronolith/lib/{Views => View}/Event.php (96%) rename kronolith/lib/{Views => View}/ExportEvent.php (100%) rename kronolith/lib/{Views => View}/Month.php (100%) rename kronolith/lib/{Views => View}/Week.php (100%) rename kronolith/lib/{Views => View}/WorkWeek.php (100%) rename kronolith/lib/{Views => View}/Year.php (100%) diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index 964cb408d..eecebff1f 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -1988,13 +1988,10 @@ class Kronolith case 'Week': case 'WorkWeek': case 'Year': - require_once KRONOLITH_BASE . '/lib/Views/' . basename($view) . '.php'; $class = 'Kronolith_View_' . $view; return new $class(self::currentDate()); case 'Event': - require_once KRONOLITH_BASE . '/lib/Views/Event.php'; - if (Horde_Util::getFormData('calendar') == '**remote') { $event = self::getDriver('Ical', Horde_Util::getFormData('remoteCal')) ->getEvent(Horde_Util::getFormData('eventID')); @@ -2012,8 +2009,6 @@ class Kronolith return new Kronolith_View_Event($event); case 'EditEvent': - require_once KRONOLITH_BASE . '/lib/Views/EditEvent.php'; - if (Horde_Util::getFormData('calendar') == '**remote') { $event = self::getDriver('Ical', Horde_Util::getFormData('remoteCal')) ->getEvent(Horde_Util::getFormData('eventID')); @@ -2029,8 +2024,6 @@ class Kronolith return new Kronolith_View_EditEvent($event); case 'DeleteEvent': - require_once KRONOLITH_BASE . '/lib/Views/DeleteEvent.php'; - $event = self::getDriver(null, Horde_Util::getFormData('calendar')) ->getEvent(Horde_Util::getFormData('eventID')); if (!is_a($event, 'PEAR_Error') && @@ -2041,8 +2034,6 @@ class Kronolith return new Kronolith_View_DeleteEvent($event); case 'ExportEvent': - require_once KRONOLITH_BASE . '/lib/Views/ExportEvent.php'; - if (Horde_Util::getFormData('calendar') == '**remote') { $event = self::getDriver('Ical', Horde_Util::getFormData('remoteCal')) ->getEvent(Horde_Util::getFormData('eventID')); diff --git a/kronolith/lib/Views/Day.php b/kronolith/lib/View/Day.php similarity index 100% rename from kronolith/lib/Views/Day.php rename to kronolith/lib/View/Day.php diff --git a/kronolith/lib/Views/DeleteEvent.php b/kronolith/lib/View/DeleteEvent.php similarity index 93% rename from kronolith/lib/Views/DeleteEvent.php rename to kronolith/lib/View/DeleteEvent.php index 6a7cbcf1d..9624707eb 100644 --- a/kronolith/lib/Views/DeleteEvent.php +++ b/kronolith/lib/View/DeleteEvent.php @@ -61,12 +61,10 @@ class Kronolith_View_DeleteEvent { if ($active && $GLOBALS['browser']->hasFeature('dom')) { if ($this->event->hasPermission(PERMS_READ)) { - require_once KRONOLITH_BASE . '/lib/Views/Event.php'; $view = new Kronolith_View_Event($this->event); $view->html(false); } if ($this->event->hasPermission(PERMS_EDIT)) { - require_once KRONOLITH_BASE . '/lib/Views/EditEvent.php'; $edit = new Kronolith_View_EditEvent($this->event); $edit->html(false); } diff --git a/kronolith/lib/Views/EditEvent.php b/kronolith/lib/View/EditEvent.php similarity index 96% rename from kronolith/lib/Views/EditEvent.php rename to kronolith/lib/View/EditEvent.php index ea48df665..0c6c6fda9 100644 --- a/kronolith/lib/Views/EditEvent.php +++ b/kronolith/lib/View/EditEvent.php @@ -111,12 +111,10 @@ class Kronolith_View_EditEvent { if ($active && $GLOBALS['browser']->hasFeature('dom')) { if ($this->event->hasPermission(PERMS_READ)) { - require_once KRONOLITH_BASE . '/lib/Views/Event.php'; $view = new Kronolith_View_Event($this->event); $view->html(false); } if ($this->event->hasPermission(PERMS_DELETE)) { - require_once KRONOLITH_BASE . '/lib/Views/DeleteEvent.php'; $delete = new Kronolith_View_DeleteEvent($this->event); $delete->html(false); } diff --git a/kronolith/lib/Views/Event.php b/kronolith/lib/View/Event.php similarity index 96% rename from kronolith/lib/Views/Event.php rename to kronolith/lib/View/Event.php index 49cf7cc50..cebe7df2e 100644 --- a/kronolith/lib/Views/Event.php +++ b/kronolith/lib/View/Event.php @@ -102,12 +102,10 @@ class Kronolith_View_Event { if ($active && $GLOBALS['browser']->hasFeature('dom')) { if ($this->event->hasPermission(PERMS_EDIT)) { - require_once KRONOLITH_BASE . '/lib/Views/EditEvent.php'; $edit = new Kronolith_View_EditEvent($this->event); $edit->html(false); } if ($this->event->hasPermission(PERMS_DELETE)) { - require_once KRONOLITH_BASE . '/lib/Views/DeleteEvent.php'; $delete = new Kronolith_View_DeleteEvent($this->event); $delete->html(false); } diff --git a/kronolith/lib/Views/ExportEvent.php b/kronolith/lib/View/ExportEvent.php similarity index 100% rename from kronolith/lib/Views/ExportEvent.php rename to kronolith/lib/View/ExportEvent.php diff --git a/kronolith/lib/Views/Month.php b/kronolith/lib/View/Month.php similarity index 100% rename from kronolith/lib/Views/Month.php rename to kronolith/lib/View/Month.php diff --git a/kronolith/lib/Views/Week.php b/kronolith/lib/View/Week.php similarity index 100% rename from kronolith/lib/Views/Week.php rename to kronolith/lib/View/Week.php diff --git a/kronolith/lib/Views/WorkWeek.php b/kronolith/lib/View/WorkWeek.php similarity index 100% rename from kronolith/lib/Views/WorkWeek.php rename to kronolith/lib/View/WorkWeek.php diff --git a/kronolith/lib/Views/Year.php b/kronolith/lib/View/Year.php similarity index 100% rename from kronolith/lib/Views/Year.php rename to kronolith/lib/View/Year.php -- 2.11.0