Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv1375/functions
Modified Files:
ical_parser.php init.inc.php
Log Message:
Fixed the bug that displayed events from blacklisted cals in combined calendar view.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** ical_parser.php 15 Sep 2003 03:04:48 -0000 1.96
--- ical_parser.php 15 Sep 2003 03:18:24 -0000 1.97
***************
*** 954,958 ****
-
//If you want to see the values in the arrays, uncomment below.
/*
--- 954,957 ----
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** init.inc.php 15 Sep 2003 01:00:44 -0000 1.35
--- init.inc.php 15 Sep 2003 03:18:24 -0000 1.36
***************
*** 104,113 ****
$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
-
// build the array
while (false != ($file = readdir($dir_handle))) {
! if (preg_match("/^[^.].+\.ics$/", $file)) {
! $file = $calendar_path.'/'.$file;
! array_push($cal_filelist, $file);
}
}
--- 104,113 ----
$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
// build the array
while (false != ($file = readdir($dir_handle))) {
! if (preg_match("/^[^.].+\.ics$/", $file) &&
! !in_array(substr($file, 0, -4), $blacklisted_cals)) {
! $file = $calendar_path.'/'.$file;
! array_push($cal_filelist, $file);
}
}
|
