Update of /cvsroot/phpicalendar/phpicalendar/rss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11871/phpicalendar/rss
Modified Files:
index.php rss.php
Log Message:
changes to fix bugs in handling webcals
Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** index.php 30 Oct 2005 01:32:44 -0000 1.38
--- index.php 23 Nov 2005 07:51:01 -0000 1.39
***************
*** 25,30 ****
// $cal is a urlencoded version of $cal_filename
// $cal_displayname is $cal_filename with occurrences of "32" replaced with " "
! $cal_filename_tmp = getCalendarName($file);
! $cal_tmp = urlencode($cal_filename_tmp);
$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
$rss_list .= '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />';
--- 25,34 ----
// $cal is a urlencoded version of $cal_filename
// $cal_displayname is $cal_filename with occurrences of "32" replaced with " "
!
! if (substr($file, 0, 7) == 'http://' || substr($file, 0, 8) == 'https://' || substr($file, 0, 9) == 'webcal://') {
! $cal_tmp = urlencode($file);
! }else{
! $cal_tmp = getCalendarName($file);
! }
$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
$rss_list .= '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />';
Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** rss.php 23 Nov 2005 06:11:45 -0000 1.32
--- rss.php 23 Nov 2005 07:51:01 -0000 1.33
***************
*** 96,100 ****
//allow phpicalendar to use calendar subdirectories - see bbs
! $cal_displayname = str_replace("32", " ", $cal);
if ($cal == $ALL_CALENDARS_COMBINED) {
$temp = explode("/",$calendar_path);
--- 96,100 ----
//allow phpicalendar to use calendar subdirectories - see bbs
! $cal_displayname = getCalendarName(urldecode($cal));
if ($cal == $ALL_CALENDARS_COMBINED) {
$temp = explode("/",$calendar_path);
|
