[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.251, 1.252 template.php, 1.118, 1.119

[<par...@us...>]

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

Modified Files:
	ical_parser.php template.php 
Log Message:
Fixed bugs with ALL_CALENDARS_COMBINED and saving parsed calendars

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.251
retrieving revision 1.252
diff -C2 -d -r1.251 -r1.252
*** ical_parser.php	29 May 2009 16:04:23 -0000	1.251
--- ical_parser.php	17 Jun 2009 17:35:10 -0000	1.252
***************
*** 12,16 ****
  if ($phpiCal_config->save_parsed_cals == 'yes') {	
  	if (sizeof ($cal_filelist) > 1) {
! 		$parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
  		if (file_exists($parsedcal)) {
  			$fd = fopen($parsedcal, 'r');
--- 12,16 ----
  if ($phpiCal_config->save_parsed_cals == 'yes') {	
  	if (sizeof ($cal_filelist) > 1) {
! 		$parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$phpiCal_config->ALL_CALENDARS_COMBINED).'-'.$this_year;
  		if (file_exists($parsedcal)) {
  			$fd = fopen($parsedcal, 'r');

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** template.php	29 May 2009 15:30:48 -0000	1.118
--- template.php	17 Jun 2009 17:35:10 -0000	1.119
***************
*** 6,11 ****
  	var $page;
  	function draw_subscribe($template_p) {
! 		global $phpiCal_config, $getdate, $cal, $ALL_CALENDARS_COMBINED, $subscribe_path, $download_filename;
! 		if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') {
  			$this->page 	= str_replace('{SUBSCRIBE_PATH}', $subscribe_path, $this->page);
  			$this->page 	= str_replace('{DOWNLOAD_FILENAME}', $download_filename, $this->page);
--- 6,11 ----
  	var $page;
  	function draw_subscribe($template_p) {
! 		global $phpiCal_config, $getdate, $cal, $subscribe_path, $download_filename;
! 		if ($cal != $phpiCal_config->ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') {
  			$this->page 	= str_replace('{SUBSCRIBE_PATH}', $subscribe_path, $this->page);
  			$this->page 	= str_replace('{DOWNLOAD_FILENAME}', $download_filename, $this->page);