phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.

[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.24, 1.25

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

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

Modified Files:
	end_vevent.php 
Log Message:
for bug 2525176 require sequence to increment for modified events.  Also fix uid handling

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** end_vevent.php	2 Jan 2009 07:12:12 -0000	1.24
--- end_vevent.php	26 Jan 2009 05:07:38 -0000	1.25
***************
*** 30,35 ****
  	$uid_valid = false;
  }elseif(in_array($uid, $uid_list)) {
! 	$uid .= $uid_counter;
! 	$uid_counter++;
  }else{
  	$uid_valid = true;
--- 30,35 ----
  	$uid_valid = false;
  }elseif(in_array($uid, $uid_list)) {
! 	#$uid .= $uid_counter;
! 	#$uid_counter++;
  }else{
  	$uid_valid = true;
***************
*** 321,349 ****
  		}
  		if($this_date_tmp == $end_date_tmp && ($end_time == '0000')) continue;
! 		$master_array[$this_date_tmp][$time_key][$uid] = array (
! 			'event_start' => $start_time,                	# hhmm
! 			'event_end' => $end_time,                    	# hhmm
! 			'display_end' => $display_end_tmp,            	# hhmm display_start is $time_key
! 			'start_unixtime' => $start_unixtime_tmp,      	# start unixtime for this recurrence
! 			'end_unixtime' => $end_unixtime_tmp,          	# end unixtime for this recurrence
! 			'event_text' => $summary,                    	#
! 			'event_length' => $length,                    	# length in seconds
! 			'event_overlap' => 0,                        	# checkOverlap modifies this
! 			'description' => $description, 
! 			'status' => $status, 
! 			'class' => $class, 
! 			'spans_day' => $spans_day, 
! 			'location' => $location, 
! 			'categories' => $vtodo_categories, 
! 			'organizer' => serialize($organizer), 
! 			'attendee' => serialize($attendee), 
! 			'calnumber' => $calnumber, 
! 			'calname' => $actual_calname,
! 			'timezone' => $start_tz,
! 			'other' => trim($other),
! 			'geo' => $geo,
! 			'url' => $url, 
! 			'recur' => $recur
! 			);
  		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
  	}
--- 321,353 ----
  		}
  		if($this_date_tmp == $end_date_tmp && ($end_time == '0000')) continue;
! 		if(!isset($master_array[$this_date_tmp][$time_key][$uid]['sequence']) || 
! 			$sequence >  $master_array[$this_date_tmp][$time_key][$uid]['sequence']){
! 			$master_array[$this_date_tmp][$time_key][$uid] = array (
! 				'event_start' => $start_time,                	# hhmm
! 				'event_end' => $end_time,                    	# hhmm
! 				'display_end' => $display_end_tmp,            	# hhmm display_start is $time_key
! 				'start_unixtime' => $start_unixtime_tmp,      	# start unixtime for this recurrence
! 				'end_unixtime' => $end_unixtime_tmp,          	# end unixtime for this recurrence
! 				'event_text' => $summary,                    	#
! 				'event_length' => $length,                    	# length in seconds
! 				'event_overlap' => 0,                        	# checkOverlap modifies this
! 				'description' => $description, 
! 				'status' => $status, 
! 				'class' => $class, 
! 				'spans_day' => $spans_day, 
! 				'location' => $location, 
! 				'categories' => $vtodo_categories, 
! 				'organizer' => serialize($organizer), 
! 				'attendee' => serialize($attendee), 
! 				'calnumber' => $calnumber, 
! 				'calname' => $actual_calname,
! 				'timezone' => $start_tz,
! 				'other' => trim($other),
! 				'geo' => $geo,
! 				'url' => $url, 
! 				'sequence' => $sequence, 
! 				'recur' => $recur
! 				);
! 		}	
  		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
  	}

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.244, 1.245

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

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

Modified Files:
	ical_parser.php 
Log Message:
for bug 2525176 require sequence to increment for modified events.  Also fix uid handling

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.244
retrieving revision 1.245
diff -C2 -d -r1.244 -r1.245
*** ical_parser.php	26 Jan 2009 03:51:52 -0000	1.244
--- ical_parser.php	26 Jan 2009 05:07:38 -0000	1.245
***************
*** 27,31 ****
  					$wcalc = $master_array['-4'][$z]['webcal'];	
  					if ($wcalc == 'no') $realcal_mtime = filemtime($fname);
! 					if (($mtime == $realcal_mtime) && ($wcalc == 'no')) {
  						$y++;
  					} elseif (($wcalc == 'yes') && ($mtime > $webcal_mtime)) {
--- 27,31 ----
  					$wcalc = $master_array['-4'][$z]['webcal'];	
  					if ($wcalc == 'no') $realcal_mtime = filemtime($fname);
! 					if (isset($realcal_mtime) && ($mtime == $realcal_mtime) && ($wcalc == 'no')) {
  						$y++;
  					} elseif (($wcalc == 'yes') && ($mtime > $webcal_mtime)) {
***************
*** 143,146 ****
--- 143,147 ----
  	
  					$interval = 1;				
+ 					$sequence = 0;				
  					$summary = '';
  					$description = '';
***************
*** 389,392 ****
--- 390,396 ----
  							break;
  							
+ 						case 'SEQUENCE':
+ 							$sequence = $data;
+ 							break;
  						case 'UID':
  							$uid = $data;

[PHPiCalendar-Commits] phpicalendar/calendars test.ics,1.16,1.17

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

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

Modified Files:
	test.ics 
Log Message:
fix multiline descriptions

Index: test.ics
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test.ics	31 Dec 2008 11:16:34 -0000	1.16
--- test.ics	26 Jan 2009 03:51:52 -0000	1.17
***************
*** 103,106 ****
--- 103,109 ----
  DTSTAMP:20020918T224617Z
  SUMMARY:Earlier overlap
+ DESCRIPTION:this is a test 
+  multiline 
+  description
  STATUS:CONFIRMED
  DURATION:P3D

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.243, 1.244

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

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

Modified Files:
	ical_parser.php 
Log Message:
fix multiline descriptions

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.243
retrieving revision 1.244
diff -C2 -d -r1.243 -r1.244
*** ical_parser.php	26 Jan 2009 03:27:30 -0000	1.243
--- ical_parser.php	26 Jan 2009 03:51:52 -0000	1.244
***************
*** 126,129 ****
--- 126,130 ----
  				$nextline = ereg_replace("[\r\n]", "", $nextline);
  			}
+ 			$line = str_replace('\n',"\n",$line);
  			$line = trim(stripslashes($line));
  			switch ($line) {
***************
*** 334,340 ****
  							
  						case 'DESCRIPTION':
! 							$data = str_replace("\\n", "<br />", $data);
  							$data = str_replace("\\t", "&nbsp;", $data);
! 							$data = str_replace("\\r", "<br />", $data);
  							$data = str_replace('$', '&#36;', $data);
  							$data = stripslashes($data);
--- 335,341 ----
  							
  						case 'DESCRIPTION':
! 							$data = str_replace("\n", "<br />", $data);
  							$data = str_replace("\\t", "&nbsp;", $data);
! 							$data = str_replace("\r", "<br />", $data);
  							$data = str_replace('$', '&#36;', $data);
  							$data = stripslashes($data);

[PHPiCalendar-Commits] phpicalendar/includes event.php,1.50,1.51

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

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

Modified Files:
	event.php 
Log Message:
fix multiline descriptions

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** event.php	26 Jan 2009 03:27:30 -0000	1.50
--- event.php	26 Jan 2009 03:51:52 -0000	1.51
***************
*** 109,113 ****
  	'event_text' 		=> $event['event_text'],
  	'event_times' 		=> $event_times,
! 	'description' 		=> nl2br($event['description']),
  	'organizer' 		=> $organizer,
  	'attendee'	 		=> $attendee,
--- 109,113 ----
  	'event_text' 		=> $event['event_text'],
  	'event_times' 		=> $event_times,
! 	'description' 		=> str_replace('\n',"<br />",$event['description']),
  	'organizer' 		=> $organizer,
  	'attendee'	 		=> $attendee,

[PHPiCalendar-Commits] phpicalendar default_config.php,1.19,1.20

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

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

Modified Files:
	default_config.php 
Log Message:
misc changes for 2.31

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** default_config.php	7 Jan 2009 20:20:03 -0000	1.19
--- default_config.php	26 Jan 2009 03:27:29 -0000	1.20
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.31rc4';
  	// Configuration file for PHP iCalendar 2.31
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.31';
  	// Configuration file for PHP iCalendar 2.31
  	//

[PHPiCalendar-Commits] phpicalendar/functions/init set_error_reporting.php, 1.2, 1.3

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

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

Modified Files:
	set_error_reporting.php 
Log Message:
misc changes for 2.31

Index: set_error_reporting.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/set_error_reporting.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** set_error_reporting.php	15 Dec 2008 17:25:27 -0000	1.2
--- set_error_reporting.php	26 Jan 2009 03:27:30 -0000	1.3
***************
*** 5,10 ****
  */
  // uncomment when developing, comment for shipping version
! error_reporting (E_ALL);
  #error_reporting (E_ERROR | E_WARNING | E_PARSE);
! #error_reporting(0);
  // Older versions of PHP do not define $_SERVER. Define it here instead.
--- 5,10 ----
  */
  // uncomment when developing, comment for shipping version
! #error_reporting (E_ALL);
  #error_reporting (E_ERROR | E_WARNING | E_PARSE);
! error_reporting(0);
  // Older versions of PHP do not define $_SERVER. Define it here instead.

[PHPiCalendar-Commits] phpicalendar/includes event.php,1.49,1.50

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

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

Modified Files:
	event.php 
Log Message:
misc changes for 2.31

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** event.php	2 Jan 2009 07:12:12 -0000	1.49
--- event.php	26 Jan 2009 03:27:30 -0000	1.50
***************
*** 109,113 ****
  	'event_text' 		=> $event['event_text'],
  	'event_times' 		=> $event_times,
! 	'description' 		=> $event['description'],
  	'organizer' 		=> $organizer,
  	'attendee'	 		=> $attendee,
--- 109,113 ----
  	'event_text' 		=> $event['event_text'],
  	'event_times' 		=> $event_times,
! 	'description' 		=> nl2br($event['description']),
  	'organizer' 		=> $organizer,
  	'attendee'	 		=> $attendee,

[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php, 1.35, 1.36 ical_parser.php, 1.242, 1.243

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

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

Modified Files:
	calendar_functions.php ical_parser.php 
Log Message:
misc changes for 2.31

Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** calendar_functions.php	31 Dec 2008 11:16:34 -0000	1.35
--- calendar_functions.php	26 Jan 2009 03:27:30 -0000	1.36
***************
*** 102,105 ****
--- 102,107 ----
  			// Remove any php files.
  			if (preg_match("/^.*\.php$/i", $file)) continue;
+ 			# remove publish log file 
+ 			if ($file == 'publish_log.txt') continue;
  			// Make sure this is not a blacklisted calendar.
  			$cal_name = getCalendarName($file); 

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.242
retrieving revision 1.243
diff -C2 -d -r1.242 -r1.243
*** ical_parser.php	7 Jan 2009 21:11:39 -0000	1.242
--- ical_parser.php	26 Jan 2009 03:27:30 -0000	1.243
***************
*** 20,24 ****
  			$z=1;
  			$y=0;
! 			$webcal_mtime = time() - ($webcal_hours * 3600);
  			if (sizeof($master_array['-4']) == (sizeof($cal_filelist))) {
  				foreach ($master_array['-4'] as $temp_array) {
--- 20,24 ----
  			$z=1;
  			$y=0;
! 			$webcal_mtime = time() - ($phpiCal_config->webcal_hours * 3600);
  			if (sizeof($master_array['-4']) == (sizeof($cal_filelist))) {
  				foreach ($master_array['-4'] as $temp_array) {

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.241, 1.242

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

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

Modified Files:
	ical_parser.php 
Log Message:
add cal_displaynames sort customization example (commented out) to ical_parser.php

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.241
retrieving revision 1.242
diff -C2 -d -r1.241 -r1.242
*** ical_parser.php	4 Jan 2009 21:58:18 -0000	1.241
--- ical_parser.php	7 Jan 2009 21:11:39 -0000	1.242
***************
*** 487,493 ****
--- 487,501 ----
  	$calendar_name = $all_cal_comb_lang;
  }
+ /* example of how to customize the display name sort order
+ if(in_array('US Holidays',$cal_displaynames)){
+ 	unset($cal_displaynames[array_search('US Holidays',$cal_displaynames)]);
+ 	array_unshift($cal_displaynames, 'US Holidays');
+ }
+ */
  $cal_displayname = urldecode(implode(', ', $cal_displaynames)); #reset this with the correct names
  $template_started = getmicrotime();
  
+ 
+ 
  //If you want to see the values in the arrays, uncomment below.
  #print '<pre>';

[PHPiCalendar-Commits] phpicalendar month.php,1.151,1.152

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

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

Modified Files:
	month.php 
Log Message:
add cal_displaynames sort customization example (commented out) to ical_parser.php

Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** month.php	7 Jan 2009 20:20:03 -0000	1.151
--- month.php	7 Jan 2009 21:11:39 -0000	1.152
***************
*** 86,90 ****
  	'username'			=> $username,
  	'logout_querys'		=> $logout_querys,
! #	'list_jumps' 		=> $list_jumps,
  	'list_icals' 		=> $list_icals,
  	'list_icals_pick'	=> $list_icals_pick,
--- 86,90 ----
  	'username'			=> $username,
  	'logout_querys'		=> $logout_querys,
! 	'list_jumps' 		=> $list_jumps,
  	'list_icals' 		=> $list_icals,
  	'list_icals_pick'	=> $list_icals_pick,

[PHPiCalendar-Commits] phpicalendar default_config.php, 1.18, 1.19 month.php, 1.150, 1.151 preferences.php, 1.71, 1.72

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

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

Modified Files:
	default_config.php month.php preferences.php 
Log Message:
timeformat serialization needed urlencode/decode?

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** default_config.php	2 Jan 2009 07:20:20 -0000	1.18
--- default_config.php	7 Jan 2009 20:20:03 -0000	1.19
***************
*** 15,19 ****
  		$this->minical_view 			= 'current';		// Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
  		$this->default_cal 				= $this->ALL_CALENDARS_COMBINED;		// Exact filename of calendar without .ics. Or set to $this->ALL_CALENDARS_COMBINED to open all calenders combined into one.
- 		#$this->default_cal 			= 'Other_racing';		// Exact filename of calendar without .ics. Or set to $this->ALL_CALENDARS_COMBINED to open all calenders combined into one.
  		$this->language 				= 'English';		// Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean'
  		$this->week_start_day 			= 'Sunday';			// Day of the week your week starts on
--- 15,18 ----

Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** month.php	28 Dec 2008 10:50:57 -0000	1.150
--- month.php	7 Jan 2009 20:20:03 -0000	1.151
***************
*** 86,90 ****
  	'username'			=> $username,
  	'logout_querys'		=> $logout_querys,
! 	'list_jumps' 		=> $list_jumps,
  	'list_icals' 		=> $list_icals,
  	'list_icals_pick'	=> $list_icals_pick,
--- 86,90 ----
  	'username'			=> $username,
  	'logout_querys'		=> $logout_querys,
! #	'list_jumps' 		=> $list_jumps,
  	'list_icals' 		=> $list_icals,
  	'list_icals_pick'	=> $list_icals_pick,

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** preferences.php	4 Jan 2009 21:58:18 -0000	1.71
--- preferences.php	7 Jan 2009 20:20:03 -0000	1.72
***************
*** 160,164 ****
  foreach ($timeformat_arr as $i => $s) {
  	$s = date($timeformat_arr[$i], $example_time)."/".date($timeformat_arr[$i], ($example_time + 12*60*60));
! 	$timeformat_select .= '<option value="'.$timeformat_arr[$i].'"';
  	if ($timeformat_arr[$i] == $cookie_timeformat) {
  		$timeformat_select .= ' selected="selected"';
--- 160,164 ----
  foreach ($timeformat_arr as $i => $s) {
  	$s = date($timeformat_arr[$i], $example_time)."/".date($timeformat_arr[$i], ($example_time + 12*60*60));
! 	$timeformat_select .= '<option value="'.urlencode($timeformat_arr[$i]).'"';
  	if ($timeformat_arr[$i] == $cookie_timeformat) {
  		$timeformat_select .= ' selected="selected"';

[PHPiCalendar-Commits] phpicalendar/functions/init configs.php, 1.12, 1.13

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

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

Modified Files:
	configs.php 
Log Message:
timeformat serialization needed urlencode/decode?

Index: configs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/configs.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** configs.php	4 Jan 2009 21:58:18 -0000	1.12
--- configs.php	7 Jan 2009 20:20:03 -0000	1.13
***************
*** 41,45 ****
  	if (isset($phpicalendar['cookie_startday'])) 	$phpiCal_config->setProperty('week_start_day', 		$phpicalendar['cookie_startday']);
  	if (isset($phpicalendar['cookie_time']))		$phpiCal_config->setProperty('day_start', 			$phpicalendar['cookie_time']); 
! 	if (isset($phpicalendar['cookie_endtime']))	$phpiCal_config->setProperty('day_end', 			$phpicalendar['cookie_endtime']); 
  	if (isset($phpicalendar['cookie_timezone']))	$phpiCal_config->setProperty('timezone', 			$phpicalendar['cookie_timezone']); 
  }
--- 41,45 ----
  	if (isset($phpicalendar['cookie_startday'])) 	$phpiCal_config->setProperty('week_start_day', 		$phpicalendar['cookie_startday']);
  	if (isset($phpicalendar['cookie_time']))		$phpiCal_config->setProperty('day_start', 			$phpicalendar['cookie_time']); 
! 	if (isset($phpicalendar['cookie_endtime']))		$phpiCal_config->setProperty('day_end', 			$phpicalendar['cookie_endtime']); 
  	if (isset($phpicalendar['cookie_timezone']))	$phpiCal_config->setProperty('timezone', 			$phpicalendar['cookie_timezone']); 
  }
***************
*** 56,60 ****
  
  if (isset($phpicalendar['cookie_timeformat']) && $phpicalendar['cookie_timeformat'] !=''){
! 	$timeFormat = $phpicalendar['cookie_timeformat'];
  	switch($timeFormat){
  		case 'h:i':
--- 56,60 ----
  
  if (isset($phpicalendar['cookie_timeformat']) && $phpicalendar['cookie_timeformat'] !=''){
! 	$timeFormat = urldecode($phpicalendar['cookie_timeformat']);
  	switch($timeFormat){
  		case 'h:i':
***************
*** 90,99 ****
  
  if (!isset($current_view)) $current_view = $phpiCal_config->default_view;
! 
  $tz_array=array();
! #echo "<pre>xx";
  #print_r($configs);
! #print_r($phpicalendar);
! #print_r($phpiCal_config);
! #echo "</pre>";
  #die;
--- 90,99 ----
  
  if (!isset($current_view)) $current_view = $phpiCal_config->default_view;
! /*
  $tz_array=array();
! echo "<pre>xx";
  #print_r($configs);
! print_r($phpiCal_config);
! echo "</pre>";
  #die;
+ */
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar/functions date_functions.php, 1.48, 1.49

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

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

Modified Files:
	date_functions.php 
Log Message:
timeformat serialization needed urlencode/decode?

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** date_functions.php	29 Dec 2008 03:07:34 -0000	1.48
--- date_functions.php	7 Jan 2009 20:20:03 -0000	1.49
***************
*** 99,102 ****
--- 99,103 ----
  	$day = date("j", $timestamp);
  	$dayofweek = date("w", $timestamp);	
+ 	$weeknumber = date("W", $timestamp);
   	$replacements = array(
   		'%Y' =>	$year,
***************
*** 106,109 ****
--- 107,111 ----
   		'%A' => $daysofweek_lang[$dayofweek],
   		'%a' => $daysofweekshort_lang[$dayofweek],
+  		'%W' => $weeknumber,
   		'%d' => sprintf("%02d", $day)
   	);

[PHPiCalendar-Commits] phpicalendar/functions/init configs.php, 1.11, 1.12

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

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

Modified Files:
	configs.php 
Log Message:
working on rss fixes

Index: configs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/configs.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configs.php	31 Dec 2008 11:16:34 -0000	1.11
--- configs.php	4 Jan 2009 21:58:18 -0000	1.12
***************
*** 30,37 ****
  }
  $cookie_name = 'phpicalendar_'.basename($phpiCal_config->default_path);
! if (isset($_COOKIE[$cookie_name]) && !isset($_POST['unset'])) {
  	$phpicalendar = unserialize(stripslashes($_COOKIE[$cookie_name]));
  	if (isset($phpicalendar['cookie_language'])) 	$phpiCal_config->setProperty('language', 			$phpicalendar['cookie_language']);
! 	if (isset($phpicalendar['cookie_calendar'])) 	$phpiCal_config->setProperty('default_cal_check', 	$phpicalendar['cookie_calendar']);
  	if (isset($phpicalendar['cookie_cpath']) && strpos($phpicalendar['cookie_cpath'],'../') === false) 		$phpiCal_config->setProperty('default_cpath_check', $phpicalendar['cookie_cpath']);
  	if (isset($phpicalendar['cookie_view'])) 		$phpiCal_config->setProperty('default_view', 		$phpicalendar['cookie_view']);
--- 30,37 ----
  }
  $cookie_name = 'phpicalendar_'.basename($phpiCal_config->default_path);
! if (isset($_COOKIE[$cookie_name]) && !isset($_POST['unset']) && $current_view != 'rss') {
  	$phpicalendar = unserialize(stripslashes($_COOKIE[$cookie_name]));
  	if (isset($phpicalendar['cookie_language'])) 	$phpiCal_config->setProperty('language', 			$phpicalendar['cookie_language']);
! 	if (isset($phpicalendar['cookie_calendar'])) 	$phpiCal_config->setProperty('default_cal', 	$phpicalendar['cookie_calendar']);
  	if (isset($phpicalendar['cookie_cpath']) && strpos($phpicalendar['cookie_cpath'],'../') === false) 		$phpiCal_config->setProperty('default_cpath_check', $phpicalendar['cookie_cpath']);
  	if (isset($phpicalendar['cookie_view'])) 		$phpiCal_config->setProperty('default_view', 		$phpicalendar['cookie_view']);
***************
*** 41,45 ****
  	if (isset($phpicalendar['cookie_startday'])) 	$phpiCal_config->setProperty('week_start_day', 		$phpicalendar['cookie_startday']);
  	if (isset($phpicalendar['cookie_time']))		$phpiCal_config->setProperty('day_start', 			$phpicalendar['cookie_time']); 
! 	if (isset($phpicalendar['cookie_endtime']))		$phpiCal_config->setProperty('day_end', 			$phpicalendar['cookie_endtime']); 
  	if (isset($phpicalendar['cookie_timezone']))	$phpiCal_config->setProperty('timezone', 			$phpicalendar['cookie_timezone']); 
  }
--- 41,45 ----
  	if (isset($phpicalendar['cookie_startday'])) 	$phpiCal_config->setProperty('week_start_day', 		$phpicalendar['cookie_startday']);
  	if (isset($phpicalendar['cookie_time']))		$phpiCal_config->setProperty('day_start', 			$phpicalendar['cookie_time']); 
! 	if (isset($phpicalendar['cookie_endtime']))	$phpiCal_config->setProperty('day_end', 			$phpicalendar['cookie_endtime']); 
  	if (isset($phpicalendar['cookie_timezone']))	$phpiCal_config->setProperty('timezone', 			$phpicalendar['cookie_timezone']); 
  }
***************
*** 75,78 ****
--- 75,79 ----
  $fillTime = $phpiCal_config->day_start;
  $day_array = array ();
+ 
  while ($fillTime < $phpiCal_config->day_end) {
  	array_push ($day_array, $fillTime);
***************
*** 91,98 ****
  
  $tz_array=array();
! /*echo "<pre>xx";
! print_r($configs);
! print_r($phpiCal_config);
! echo "</pre>";
  #die;
- */
\ No newline at end of file
--- 92,99 ----
  
  $tz_array=array();
! #echo "<pre>xx";
! #print_r($configs);
! #print_r($phpicalendar);
! #print_r($phpiCal_config);
! #echo "</pre>";
  #die;

[PHPiCalendar-Commits] phpicalendar/rss rss_common.php,1.5,1.6

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

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

Modified Files:
	rss_common.php 
Log Message:
working on rss fixes

Index: rss_common.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss_common.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rss_common.php	29 Dec 2008 06:00:42 -0000	1.5
--- rss_common.php	4 Jan 2009 21:58:18 -0000	1.6
***************
*** 33,37 ****
  
  //set the range of days to return based on the view chosen
! $rssview = $_GET['rssview'];
  if (isset($_GET['getdate']) && $_GET['getdate'] !=''){
  	$getdate = $_GET['getdate'];
--- 33,38 ----
  
  //set the range of days to return based on the view chosen
! $rssview = $phpiCal_config->default_view;
! if (isset($_GET['rssview'])) $rssview = $_GET['rssview'];
  if (isset($_GET['getdate']) && $_GET['getdate'] !=''){
  	$getdate = $_GET['getdate'];

[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;
  }
  

[PHPiCalendar-Commits] phpicalendar preferences.php,1.70,1.71

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

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

Modified Files:
	preferences.php 
Log Message:
working on rss fixes

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** preferences.php	31 Dec 2008 07:14:34 -0000	1.70
--- preferences.php	4 Jan 2009 21:58:18 -0000	1.71
***************
*** 46,51 ****
  		"cookie_timezone"   => "$cookie_timezone"
  		);
! 	$the_cookie 		= serialize($the_cookie);
! 	if ($cookie_unset) { 
  		setcookie("$cookie_name","$the_cookie",time()-(60*60*24*7) ,"/","$phpiCal_config->cookie_uri",0);
  	} else {
--- 46,51 ----
  		"cookie_timezone"   => "$cookie_timezone"
  		);
! 	$the_cookie 		= addslashes(serialize($the_cookie));
! 	if (isset($cookie_unset)) { 
  		setcookie("$cookie_name","$the_cookie",time()-(60*60*24*7) ,"/","$phpiCal_config->cookie_uri",0);
  	} else {
***************
*** 79,83 ****
  }
  
! if ((!isset($_COOKIE[$cookie_name])) || ($cookie_unset)) {
  	# No cookie set -> use defaults from config file.
  	$cookie_language 	= ucfirst($language);
--- 79,83 ----
  }
  
! if ((!isset($_COOKIE[$cookie_name])) || isset($cookie_unset)) {
  	# No cookie set -> use defaults from config file.
  	$cookie_language 	= ucfirst($language);
***************
*** 147,150 ****
--- 147,152 ----
  	$endtime_select .= ">$s</option>\n";
  }
+ 
+ $timeformat_select = '';
  $timeformat_arr = array(
  	'g:i',
***************
*** 156,160 ****
  );
  $example_time = strtotime("19700101 08:00:00");
- $timeformat_select = '';
  foreach ($timeformat_arr as $i => $s) {
  	$s = date($timeformat_arr[$i], $example_time)."/".date($timeformat_arr[$i], ($example_time + 12*60*60));
--- 158,161 ----

[PHPiCalendar-Commits] phpicalendar/rss rss2.0.php,1.8,1.9

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

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

Modified Files:
	rss2.0.php 
Log Message:
fix mising phpiCal_config global in rss2.0.php

Index: rss2.0.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss2.0.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rss2.0.php	20 Dec 2008 03:22:54 -0000	1.8
--- rss2.0.php	3 Jan 2009 07:26:20 -0000	1.9
***************
*** 25,29 ****
  require(BASE.'rss/rss_common.php');
  function rss_top(){
! 	global $cal_displayname, $theview, $default_path, $cpath, $lang, $rss_link, $rss_language;
  
  	$rss = 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"."\n";
--- 25,29 ----
  require(BASE.'rss/rss_common.php');
  function rss_top(){
! 	global $cal_displayname, $theview, $phpiCal_config, $cpath, $lang, $rss_link, $rss_language;
  
  	$rss = 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"."\n";

[PHPiCalendar-Commits] phpicalendar README, 1.114, 1.115 config.inc.php, 1.200, 1.201

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

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

Modified Files:
	README config.inc.php 
Log Message:
fix mising phpiCal_config global in rss2.0.php

Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** README	20 Dec 2008 00:11:55 -0000	1.114
--- README	3 Jan 2009 07:26:20 -0000	1.115
***************
*** 89,92 ****
--- 89,97 ----
  Changes:
  --------
+ 2.31 Fix events ending at midnight bug in day view
+ 	Fix publish.php for 2.3 config system
+ 	add option to hide location in month view
+ 	add option to make individual events downloadable from event view
+ 	
  2.3 Major changes to recurrence handling
  	Added more languages

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** config.inc.php	2 Jan 2009 07:12:12 -0000	1.200
--- config.inc.php	3 Jan 2009 07:26:20 -0000	1.201
***************
*** 51,55 ****
  #     'language'             => 'Spanish',
  #     'default_cal'          => 'US Holidays',	   // Exact filename of calendar without .ics.
! #     'template'             => 'green';           // Template support: change this to have a different "skin" for your installation.     
  #    'default_view'         => 'year',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
  #      'printview_default'    => 'yes',	           // Set print view as the default view. Uses'default_view (listed above).
--- 51,55 ----
  #     'language'             => 'Spanish',
  #     'default_cal'          => 'US Holidays',	   // Exact filename of calendar without .ics.
! #     'template'             => 'green',           // Template support: change this to have a different "skin" for your installation.     
  #    'default_view'         => 'year',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
  #      'printview_default'    => 'yes',	           // Set print view as the default view. Uses'default_view (listed above).

[PHPiCalendar-Commits] phpicalendar default_config.php,1.17,1.18

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

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

Modified Files:
	default_config.php 
Log Message:
bump rc version

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** default_config.php	2 Jan 2009 07:12:12 -0000	1.17
--- default_config.php	2 Jan 2009 07:20:20 -0000	1.18
***************
*** 3,8 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.31rc3';
! 	// Configuration file for PHP iCalendar 2.25rc1
  	//
  	// To set values, change the text between the single quotes
--- 3,8 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.31rc4';
! 	// Configuration file for PHP iCalendar 2.31
  	//
  	// To set values, change the text between the single quotes

[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.23, 1.24 parse_tzs.php, 1.9, 1.10

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

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

Modified Files:
	end_vevent.php parse_tzs.php 
Log Message:
add download event to event popup

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** end_vevent.php	30 Dec 2008 03:48:13 -0000	1.23
--- end_vevent.php	2 Jan 2009 07:12:12 -0000	1.24
***************
*** 335,342 ****
--- 335,345 ----
  			'spans_day' => $spans_day, 
  			'location' => $location, 
+ 			'categories' => $vtodo_categories, 
  			'organizer' => serialize($organizer), 
  			'attendee' => serialize($attendee), 
  			'calnumber' => $calnumber, 
  			'calname' => $actual_calname,
+ 			'timezone' => $start_tz,
+ 			'other' => trim($other),
  			'geo' => $geo,
  			'url' => $url, 

Index: parse_tzs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/parse_tzs.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** parse_tzs.php	28 Dec 2008 19:30:41 -0000	1.9
--- parse_tzs.php	2 Jan 2009 07:12:12 -0000	1.10
***************
*** 44,50 ****
  			break;
  		case 'END:VTIMEZONE':
  			$tz_array[$tz_id] = array(
! 				0	=> $offset_s, 
! 				1	=> $offset_d,
  				'dt_start' => @$begin_daylight,
  				'st_start' => @$begin_std,
--- 44,51 ----
  			break;
  		case 'END:VTIMEZONE':
+ 			if (!isset($offset_d) && isset($offset_s)) $offset_d = $offset_s;
  			$tz_array[$tz_id] = array(
! 				0	=> @$offset_s, 
! 				1	=> @$offset_d,
  				'dt_start' => @$begin_daylight,
  				'st_start' => @$begin_std,

[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.199, 1.200 default_config.php, 1.16, 1.17

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

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

Modified Files:
	config.inc.php default_config.php 
Log Message:
add download event to event popup

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** config.inc.php	31 Dec 2008 11:20:19 -0000	1.199
--- config.inc.php	2 Jan 2009 07:12:12 -0000	1.200
***************
*** 66,69 ****
--- 66,84 ----
  #     'day_start'            => '0600',	           // Start time for day grid
  #     'day_end'              => '2000',	           // End time for day grid
+ #      'event_download' => 'yes',
+ 
+ 
+ /*     ========= CALENDAR PUBLISHING =========
+ 
+ 	This section is not needed if your calendars directory is accessible via WebDAV or CalDAV.  These settings 
+ 	control the publish.php script provided in the calendars directory.  For more information, please see that
+ 	file.
+ */
+ 
+ 	'phpicalendar_publishing'=> 1,
+ 
+ 
+ 
+ 
  
  );

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** default_config.php	31 Dec 2008 11:16:33 -0000	1.16
--- default_config.php	2 Jan 2009 07:12:12 -0000	1.17
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.31rc2';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.31rc3';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
***************
*** 48,51 ****
--- 48,52 ----
  		$this->show_todos				= 'yes';			// Show your todo list on the side of day and week view.
  		$this->show_completed			= 'yes';				// Show completed todos on your todo list.
+ 		$this->event_download			= 'no';				// Show completed todos on your todo list.
  		$this->allow_login				= 'no';				// Set to yes to prompt for login to unlock calendars.
  		$this->login_cookies			= 'no';			// Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions.

[PHPiCalendar-Commits] phpicalendar/languages english.inc.php, 1.72, 1.73

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

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

Modified Files:
	english.inc.php 
Log Message:
add download event to event popup

Index: english.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** english.inc.php	31 Dec 2008 07:14:35 -0000	1.72
--- english.inc.php	2 Jan 2009 07:12:12 -0000	1.73
***************
*** 99,102 ****
--- 99,103 ----
  $lang['l_attendee']			= 'Attendee';
  $lang['l_location']			= 'Location';
+ $lang['l_download_event']	= 'Download event';
  $lang['l_url']   			= 'URL';
  $lang['l_admin_header']		= 'PHP iCalendar Administration';
***************
*** 207,211 ****
  $lang['l_error_window'] 		= 'There was an error!';
  $lang['l_error_calendar'] 		= 'The calendar "%s" was being processed when this error occurred.';
- $lang['l_php_version_required']	= 'PHP version "%s" detected.  PHP 5.1 or greater is required to run this version of phpicalendar.';
  $lang['l_error_path'] 			= 'Unable to open the path: "%s"';
  $lang['l_error_back'] 			= 'Please use the "Back" button to return.';
--- 208,211 ----

[PHPiCalendar-Commits] phpicalendar/includes event.php,1.48,1.49

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

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

Modified Files:
	event.php 
Log Message:
add download event to event popup

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** event.php	29 Dec 2008 03:07:34 -0000	1.48
--- event.php	2 Jan 2009 07:12:12 -0000	1.49
***************
*** 12,15 ****
--- 12,16 ----
  $organizer 		= unserialize($event['organizer']);
  $attendee 		= unserialize($event['attendee']);
+ $uid    		= stripslashes($_POST['uid']);
  
  // Format event time
***************
*** 72,75 ****
--- 73,105 ----
  }
  
+ $event_download = '';
+ if($phpiCal_config->event_download == 'yes') $event_download = "
+ <form action='' method='post'>
+ <input type=hidden name='event_data' value = '".$_POST['event_data']."' />
+ <input type=hidden name='uid' value = '".$_POST['uid']."' />
+ <input type='submit' name='submit' value='".$lang['l_download_event']."' />
+ <form>";
+ 
+ if (isset($_POST['submit'])){
+ header("Content-Type: text/calendar; charset=utf-8; name=$uid");
+ header("Content-Disposition: attachment; filename=$uid");
+ echo 
+ "BEGIN:VCALENDAR
+ VERSION:2.0
+ X-WR-CALNAME:".$event['calname']."
+ BEGIN:VEVENT
+ UID:$uid
+ SUMMARY:".$event['event_text']."
+ CATEGORIES:".$event['calname']."
+ DTSTART;TZID=".$event['timezone'].":".date("Ymd\THis",$event['start_unixtime'])."
+ DTEND;TZID=".$event['timezone'].":".date("Ymd\THis",$event['start_unixtime'])."
+ CLASS:".$event['class']."
+ ".$event['other']."
+ SEQUENCE:1
+ CREATED:20081128T075152
+ END:VEVENT
+ END:VCALENDAR
+ ";exit;
+ }
  $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/event.tpl');
  
***************
*** 84,87 ****
--- 114,118 ----
  	'status'	 		=> $event['status'],
  	'location' 			=> $event['location'],
+ 	'event_download'	=> $event_download,
  	'url'      			=> $event['url'],
  	'cal_title_full'	=> $event['calname'].' '.$lang['l_calendar'],