summaryrefslogtreecommitdiff
path: root/php-kolab/Kolab_Filter
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2008-02-26 21:35:02 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2008-02-26 21:35:02 (GMT)
commitdd20548073d8cdfdba67300a46216f2e7399d535 (patch)
treedfe2e33eacc7e6ddc26d5aa8a7d0e2a3f892cb0a /php-kolab/Kolab_Filter
parent079e975b047a2bd0d8c5039db45bbd0638e4b990 (diff)
downloadserver-dd20548073d8cdfdba67300a46216f2e7399d535.tar.gz
Fix undefined variables.
Diffstat (limited to 'php-kolab/Kolab_Filter')
-rw-r--r--php-kolab/Kolab_Filter/ChangeLog2
-rw-r--r--php-kolab/Kolab_Filter/Filter/Resource.php37
2 files changed, 18 insertions, 21 deletions
diff --git a/php-kolab/Kolab_Filter/ChangeLog b/php-kolab/Kolab_Filter/ChangeLog
index 1af0ab1..422a52b 100644
--- a/php-kolab/Kolab_Filter/ChangeLog
+++ b/php-kolab/Kolab_Filter/ChangeLog
@@ -1,5 +1,7 @@
2008-02-26 Gunnar Wrobel <p@rdus.de>
+ * Filter/Resource.php: Fix undefined variables.
+
* Filter/Filter.php: Fix some minor issues with the option
handling.
diff --git a/php-kolab/Kolab_Filter/Filter/Resource.php b/php-kolab/Kolab_Filter/Filter/Resource.php
index ab3d4a4..5f40400 100644
--- a/php-kolab/Kolab_Filter/Filter/Resource.php
+++ b/php-kolab/Kolab_Filter/Filter/Resource.php
@@ -435,26 +435,21 @@ function &internalGetFreeBusy($resource, $url)
return $result;
}
- // If this call is purely to cache the f/b list then we don't need to
- // bother parsing the VFB file
- if (!$cache) {
- $iCalendar = &new Horde_iCalendar();
- $iCalendar->parsevCalendar($text);
- $vfb = &$iCalendar->findComponent('VFREEBUSY');
-
- if ($vfb === false) {
- Horde::logMessage(sprintf(_("Invalid or no free/busy information available for %s"),
- $resource),
- __FILE__, __LINE__, PEAR_LOG_ERR);
- //shutdown();
- $result = false;
- return $result;
- }
-
- $vfb->simplify();
-
- return $vfb;
+ $iCalendar = &new Horde_iCalendar();
+ $iCalendar->parsevCalendar($text);
+ $vfb = &$iCalendar->findComponent('VFREEBUSY');
+
+ if ($vfb === false) {
+ Horde::logMessage(sprintf(_("Invalid or no free/busy information available for %s"),
+ $resource),
+ __FILE__, __LINE__, PEAR_LOG_ERR);
+ //shutdown();
+ $result = false;
+ return $result;
}
+ $vfb->simplify();
+
+ return $vfb;
}
function sendITipReply($cn,$resource, $itip, $type = RM_ITIP_ACCEPT)
@@ -832,8 +827,8 @@ function &buildKolabEvent(&$itip)
$recurrence = false;
- $kolab_xml = Horde_DOM_Document::factory(array('xml' => $xml_text));
- if (is_a($result, 'PEAR_Error')) {
+ $kolab_xml = Horde_DOM_Document::factory();
+ if (is_a($kolab_xml, 'PEAR_Error')) {
// There were errors building the xml document
Horde::logMessage(sprintf(_("Error building xml document: %s"),
$result->getMessage()),