steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/iCalendar iCalendar.php, 1.6, 1.6.2.1
cvs at intevation.de
cvs at intevation.de
Tue Aug 30 01:53:21 CEST 2005
- Previous message: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.126.2.2, 1.126.2.3
- Next message: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView day.php, 1.4, 1.4.2.1 month.php, 1.3, 1.3.2.1 week.php, 1.5, 1.5.2.1 workweek.php, 1.5, 1.5.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/iCalendar
In directory doto:/tmp/cvs-serv11685/kolab-resource-handlers/fbview/fbview/framework/iCalendar
Modified Files:
Tag: kolab_2_0_branch
iCalendar.php
Log Message:
Backport from HAED of fix for Issue666 (fbview wrong) and Issue869 (insane freebusy...)
Index: iCalendar.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/iCalendar/iCalendar.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- iCalendar.php 26 Jan 2005 07:32:31 -0000 1.6
+++ iCalendar.php 29 Aug 2005 23:53:18 -0000 1.6.2.1
@@ -14,6 +14,7 @@
* @since Horde 3.0
* @package Horde_iCalendar
*/
+
class Horde_iCalendar {
var $_container = null;
@@ -288,12 +289,23 @@
// Unfold any folded lines.
$vCal = preg_replace ('/(\r|\n)+ /', '', $vCal);
+ // Unfold "quoted printable" folded lines like:
+ // BODY;ENCODING=QUOTED-PRINTABLE:=
+ // another=20line=
+ // last=20line
+ if (preg_match_all('/^([^:]+;\s*ENCODING=QUOTED-PRINTABLE(.*=\r?\n)+(.*[^=])?\r?\n)/mU', $vCal, $matches)) {
+ foreach ($matches[1] as $s) {
+ $r = preg_replace('/=\r?\n/', '', $s);
+ $vCal = str_replace($s, $r, $vCal);
+ }
+ }
+
// Parse the remaining attributes.
- if (preg_match_all('/(.*):(.*)(\r|\n)+/', $vCal, $matches)) {
+ if (preg_match_all('/(.*):([^\r\n]*)[\r\n]+/', $vCal, $matches)) {
foreach ($matches[0] as $attribute) {
- preg_match('/([^;^:]*)((;[^:]*)?):(.*)/', $attribute, $parts);
+ preg_match('/([^;^:]*)((;.*)?|(;[^:;=]+=(".*"|[^:;=]*))+):([^\r\n]*)[\r\n]*/', $attribute, $parts);
$tag = $parts[1];
- $value = $parts[4];
+ $value = $parts[6];
$params = array();
if (!empty($parts[2])) {
- Previous message: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.126.2.2, 1.126.2.3
- Next message: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView day.php, 1.4, 1.4.2.1 month.php, 1.3, 1.3.2.1 week.php, 1.5, 1.5.2.1 workweek.php, 1.5, 1.5.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list