[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.240, 1.241 init.inc.php, 1.121, 1.122

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5202/functions

Modified Files:
	ical_parser.php init.inc.php 
Log Message:
working on rss fixes

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.240
retrieving revision 1.241
diff -C2 -d -r1.240 -r1.241
*** ical_parser.php	2 Jan 2009 07:12:12 -0000	1.240
--- ical_parser.php	4 Jan 2009 21:58:18 -0000	1.241
***************
*** 152,155 ****
--- 152,156 ----
  					$other = '';
  					$wkst = 'MO';
+ 					$vtodo_categories = '';
  					
  					$except_dates 	= array();

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** init.inc.php	2 Jan 2009 07:12:12 -0000	1.121
--- init.inc.php	4 Jan 2009 21:58:18 -0000	1.122
***************
*** 35,39 ****
  // is always an array, because this makes it easier to deal with below.
  $cal_filenames = array();
! if (isset($_GET['cal'])) {
  	// If the cal value is not an array, split it into an array on
  	// commas.
--- 35,39 ----
  // is always an array, because this makes it easier to deal with below.
  $cal_filenames = array();
! if (isset($_GET['cal']) && $_GET['cal'] !='') {
  	// If the cal value is not an array, split it into an array on
  	// commas.
***************
*** 43,62 ****
  	// Grab the calendar filenames off the cal value array.
  	$cal_filenames = $_GET['cal'];
  } else {
! 	if (isset($default_cal_check)) {
! 		if ($default_cal_check != $phpiCal_config->ALL_CALENDARS_COMBINED) {
! 			$calcheck = $phpiCal_config->calendar_path.'/'.$default_cal_check.'.ics'; 
! 			$calcheckopen = @fopen($calcheck, "r");
! 			if ($calcheckopen == FALSE) {
! 				$cal_filenames = explode(',',$default_cal);
! 			} else {
! 				$cal_filenames[0] = $default_cal_check;
! 			}
! 		} else {
! 			$cal_filenames[0] = $phpiCal_config->ALL_CALENDARS_COMBINED;
! 		}
! 	} else {
! 		$cal_filenames = explode(',',$phpiCal_config->default_cal);
! 	}
  }
  
--- 43,50 ----
  	// Grab the calendar filenames off the cal value array.
  	$cal_filenames = $_GET['cal'];
+ } elseif ($phpiCal_config->default_cal != '') {
+ 	$cal_filenames = explode(',',$phpiCal_config->default_cal);
  } else {
! 	$cal_filenames[0] = $phpiCal_config->ALL_CALENDARS_COMBINED;
  }