Throw exception when resources are disabled, like other optional cale…

…ndars. Also, fix some places where we assumed they were always available.
horde · Jan 13, 2014 · 24e9cec · 24e9cec
1 parent 3644f58
commit 24e9cec
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 21 deletions.
diff --git a/kronolith/attendees.php b/kronolith/attendees.php
@@ -165,9 +165,13 @@
 }
 
 /* Get list of resources for select list, and remove those we already added */
-$allResources = Kronolith::getDriver('Resource')->listResources(Horde_Perms::READ, array(), 'name');
-foreach (array_keys($resources) as $id) {
-    unset($allResources[$id]);
+if (!empty($conf['resource']['driver'])) {
+    $allResources = Kronolith::getDriver('Resource')->listResources(Horde_Perms::READ, array(), 'name');
+    foreach (array_keys($resources) as $id) {
+        unset($allResources[$id]);
+    }
+} else {
+    $allResources = array();
 }
 
 // Get the current Free/Busy view; default to the 'day' view if none specified.

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
@@ -5468,19 +5468,23 @@ KronolithCore = {
         }
 
         // Check that there are no conflicts.
-        HordeCore.doAction(
-            'checkResources',
-            {
-                s: this.getDate('start').toISOString(),
-                e: this.getDate('end').toISOString(),
-                i: $F('kronolithEventId'),
-                c: $F('kronolithEventCalendar'),
-                r: $F('kronolithEventResourceIds')
-            },
-            {
-                callback: this.validateEventCallback.curry(asnew).bind(this)
-            }
-        );
+        if (Kronolith.conf.has_resources && $F('kronolithEventResourceIds')) {
+            HordeCore.doAction(
+                'checkResources',
+                {
+                    s: this.getDate('start').toISOString(),
+                    e: this.getDate('end').toISOString(),
+                    i: $F('kronolithEventId'),
+                    c: $F('kronolithEventCalendar'),
+                    r: $F('kronolithEventResourceIds')
+                },
+                {
+                    callback: this.validateEventCallback.curry(asnew).bind(this)
+                }
+            );
+        } else {
+            this.validateEventCallback(asnew, {});
+        }
     },
 
     validateEventCallback: function(asnew, r)

diff --git a/kronolith/lib/Ajax.php b/kronolith/lib/Ajax.php
@@ -86,6 +86,7 @@ protected function _addBaseVars()
             'app_urls' => $app_urls,
             'name' => $registry->get('name'),
             'has_tasks' => intval($has_tasks),
+            'has_resources' => intval(!empty($conf['resource']['driver'])),
             'login_view' => ($prefs->getValue('defaultview') == 'workweek') ? 'week' : $prefs->getValue('defaultview'),
             'default_calendar' => 'internal|' . Kronolith::getDefaultCalendar(Horde_Perms::EDIT),
             'max_events' => intval($prefs->getValue('max_events')),
@@ -118,9 +119,9 @@ protected function _addBaseVars()
                 'edit' => Horde_Perms::EDIT,
                 'delete' => Horde_Perms::DELETE,
                 'delegate' => Kronolith::PERMS_DELEGATE
-             ),
-             'tasks' => $has_tasks ? $registry->tasks->ajaxDefaults() : null
-         ));
+            ),
+            'tasks' => $has_tasks ? $registry->tasks->ajaxDefaults() : null
+        ));
 
         /* Make sure this value is not optimized out by array_filter(). */
         $js_vars['conf']['week_start'] = intval($prefs->getValue('week_start_monday'));

diff --git a/kronolith/lib/Ajax/Application/Handler.php b/kronolith/lib/Ajax/Application/Handler.php
@@ -1419,6 +1419,10 @@ public function toTimeslice()
      */
     public function checkResources()
     {
+        if (empty($GLOBALS['conf']['resource']['driver'])) {
+            return array();
+        }
+
         if ($this->vars->i) {
             $event = $this->_getDriver($this->vars->c)->getEvent($this->vars->i);
         } else {

diff --git a/kronolith/lib/Factory/Driver.php b/kronolith/lib/Factory/Driver.php
@@ -71,6 +71,7 @@ public function create($driver, array $params = array())
         case 'Resource_Sql':
             if (!isset($GLOBALS['conf']['calendar']['driver']) ||
                 $GLOBALS['conf']['resource']['driver'] != 'sql') {
+                throw new Kronolith_Exception(_("Resources are disabled"));
                 return new Horde_Support_Stub();
             }
             $params = array_merge(Horde::getDriverConfig('resource', 'sql'), $params);

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
@@ -220,7 +220,9 @@ static public function listEvents(
         }
 
         // Resource calendars
-        if (count($GLOBALS['calendar_manager']->get(Kronolith::DISPLAY_RESOURCE_CALENDARS))) {
+        if (count($GLOBALS['calendar_manager']->get(Kronolith::DISPLAY_RESOURCE_CALENDARS) &&
+            !empty($GLOBALS['conf']['resource']['driver']))) {
+
             $driver = self::getDriver('Resource');
             foreach ($GLOBALS['calendar_manager']->get(Kronolith::DISPLAY_RESOURCE_CALENDARS) as $calendar) {
                 try {

diff --git a/kronolith/templates/dynamic/edit.inc b/kronolith/templates/dynamic/edit.inc
@@ -97,7 +97,7 @@
     <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkRecur"><?php echo _("Repeat") ?></a></li>
     <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkUrl"><?php echo _("URL") ?></a></li>
     <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkAttendees"><?php echo _("Attendees") ?></a></li>
-    <?php if (count(Kronolith::getDriver('Resource')->listResources())):?>
+    <?php if (!empty($GLOBALS['conf']['resource']['driver']) && count(Kronolith::getDriver('Resource')->listResources())):?>
     <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkResources"><?php echo _("Resources") ?></a></li>
     <?php endif; ?>
     <li><a href="#" class="kronolithTabLink" id="kronolithEventLinkTags"><?php echo _("Tags") ?></a></li>