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

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.117,1.118

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv7488/functions

Modified Files:
	ical_parser.php 
Log Message:
Corrected mistaken duration handling.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** ical_parser.php	14 Nov 2003 05:47:26 -0000	1.117
--- ical_parser.php	14 Nov 2003 09:30:38 -0000	1.118
***************
*** 117,123 ****
  			} elseif ($line == 'END:VEVENT') {
  				
! 				$end_unixtime 	= $start_unixtime + $the_duration;
! 				$end_time 		= date ('Hi', $end_unixtime);
! 				
  				// CLASS support
  				if (isset($class)) {
--- 117,126 ----
  			} elseif ($line == 'END:VEVENT') {
  				
! 				// Handle DURATION
! 				if (!isset($end_unixtime) && isset($the_duration)) {
! 					$end_unixtime 	= $start_unixtime + $the_duration;
! 					$end_time 	= date ('Hi', $end_unixtime);
! 				}
! 					
  				// CLASS support
  				if (isset($class)) {
***************
*** 147,155 ****
  					if (!isset($start_time)) $start_time = $master_array[$old_start_date][$old_start_time][$uid]['event_start'];
  					if (!isset($start_unixtime)) $start_unixtime = $master_array[$old_start_date][$old_start_time][$uid]['start_unixtime'];
- 					// Handle DURATION
- 					if (!isset($end_unixtime) && isset($the_duration)) {
- 						$end_unixtime 	= $start_unixtime + $the_duration;
- 						$end_time 	= date ('Hi', $end_unixtime);
- 					}
  					if (!isset($end_unixtime)) $end_unixtime = $master_array[$old_start_date][$old_start_time][$uid]['end_unixtime'];
  					if (!isset($end_time)) $end_time = $master_array[$old_start_date][$old_start_time][$uid]['event_end'];
--- 150,153 ----
***************
*** 873,877 ****
  							$end_time = $regs[4] . $regs[5];
  							$end_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]);
! 			
  							$dlst = date('I', $end_unixtime);
  							$server_offset_tmp = chooseOffset($end_unixtime);
--- 871,875 ----
  							$end_time = $regs[4] . $regs[5];
  							$end_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]);
! 																	
  							$dlst = date('I', $end_unixtime);
  							$server_offset_tmp = chooseOffset($end_unixtime);

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.116,1.117

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv6848/functions

Modified Files:
	ical_parser.php 
Log Message:
Moved duration figuring out to the beginning of END:VEVENT.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** ical_parser.php	14 Nov 2003 05:15:21 -0000	1.116
--- ical_parser.php	14 Nov 2003 05:47:26 -0000	1.117
***************
*** 117,120 ****
--- 117,123 ----
  			} elseif ($line == 'END:VEVENT') {
  				
+ 				$end_unixtime 	= $start_unixtime + $the_duration;
+ 				$end_time 		= date ('Hi', $end_unixtime);
+ 				
  				// CLASS support
  				if (isset($class)) {

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.115,1.116

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv2655/functions

Modified Files:
	ical_parser.php 
Log Message:
Added a condition to WEEKLY RRULE to set dates that do not have a BYDAY.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** ical_parser.php	14 Nov 2003 04:59:15 -0000	1.115
--- ical_parser.php	14 Nov 2003 05:15:21 -0000	1.116
***************
*** 436,440 ****
  													break;
  												case 'WEEKLY':
! 													if (is_array($byday)) {
  														// loop through the days on which this event happens
  														foreach($byday as $day) {
--- 436,444 ----
  													break;
  												case 'WEEKLY':
! 													if (!isset($byday)) {
! 														$next_date = date('Ymd', $next_range_time);
! 														$next_date_time = strtotime($next_date);
! 														$recur_data[] = $next_date_time;
! 													} elseif (is_array($byday)) {
  														// loop through the days on which this event happens
  														foreach($byday as $day) {

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

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv32617

Modified Files:
	config.inc.php 
Log Message:
Fix for [ 831524 ] ghost events displayed, changed config to not save 
parsed cals, and took the double getdate out of list_icals.



Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** config.inc.php	13 Nov 2003 17:33:22 -0000	1.114
--- config.inc.php	14 Nov 2003 04:59:15 -0000	1.115
***************
*** 32,36 ****
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'yes';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $use_sessions 			= 'no';				// This has not yet been implemented.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
--- 32,36 ----
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'no';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $use_sessions 			= 'no';				// This has not yet been implemented.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.114,1.115 list_icals.php,1.18,1.19

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv32617/functions

Modified Files:
	ical_parser.php list_icals.php 
Log Message:
Fix for [ 831524 ] ghost events displayed, changed config to not save 
parsed cals, and took the double getdate out of list_icals.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** ical_parser.php	13 Nov 2003 06:02:47 -0000	1.114
--- ical_parser.php	14 Nov 2003 04:59:15 -0000	1.115
***************
*** 259,265 ****
  						if (!$write_processed) $master_array[$start_date][($hour.$minute)][$uid]['exception'] = true;
  					} else {
! 						$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid);
! 						$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
! 						if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
  					}
  				}
--- 259,268 ----
  						if (!$write_processed) $master_array[$start_date][($hour.$minute)][$uid]['exception'] = true;
  					} else {
! 						// This if statement should prevent writing of an excluded date if its the first recurrance - CL
! 						if (!in_array($start_date, $except_dates)) {
! 							$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid);
! 							$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
! 							if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
! 						}
  					}
  				}
***************
*** 567,571 ****
  											$recur_data_day = date('d', $recur_data_time);
  											$recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day;
! 											
  											if (($recur_data_time > $start_date_time) && ($recur_data_time <= $end_date_time) && ($count_to != $count) && !in_array($recur_data_date, $except_dates)) {
  												if (isset($allday_start) && $allday_start != '') {
--- 570,574 ----
  											$recur_data_day = date('d', $recur_data_time);
  											$recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day;
! 
  											if (($recur_data_time > $start_date_time) && ($recur_data_time <= $end_date_time) && ($count_to != $count) && !in_array($recur_data_date, $except_dates)) {
  												if (isset($allday_start) && $allday_start != '') {
***************
*** 617,623 ****
  				}
  
!                                // Clear event data now that it's been saved.
!                                unset($start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee);
! 			
  			// Begin VTODO Support
  			} elseif ($line == 'END:VTODO') {
--- 620,642 ----
  				}
  
! 				// This should remove any exdates that were missed.
! 				// Added for version 0.9.5
! 				if (is_array($except_dates)) {
! 					foreach ($except_dates as $key => $value) {
! 						$time = $except_times[$key];
! 						unset($master_array[$value][$time][$uid]);
! 						if (count($master_array[$value][$time]) < 1) {
! 							unset($master_array[$value][$time]);
! 							if (count($master_array[$value]) < 1) {
! 								unset($master_array[$value]);	
! 							}
! 						}
! 					}
! 				}
! 				
! 			   // Clear event data now that it's been saved.
! 			   unset($start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee);
! 
! 
  			// Begin VTODO Support
  			} elseif ($line == 'END:VTODO') {

Index: list_icals.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_icals.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** list_icals.php	13 Nov 2003 06:02:47 -0000	1.18
--- list_icals.php	14 Nov 2003 04:59:15 -0000	1.19
***************
*** 3,11 ****
  
  	// start of <select> tag
- 	if (isset($getdate)) {
- 		$query="&amp;getdate=$getdate";
- 	} else {
- 		$query="";
- 	}	
  	echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'";
  	if (isset($query)) echo $query;
--- 3,6 ----

[PHPiCalendar-Commits] phpicalendar/calendars publish.php,NONE,1.1

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/calendars
In directory sc8-pr-cvs1:/tmp/cvs-serv1442/calendars

Added Files:
	publish.php 
Log Message:
Added a way to publish as webdav without a webdav server.



--- NEW FILE: publish.php ---
<?php

/*
Extension to PHP iCalendar for supporting publishing from Apple iCal
Date: 11.12.2003
Author: Dietrich Ayala
Copyright 2003 Dietrich Ayala

Description:
This allows iCal to publish to your PHP iCalendar site *without* WebDAV support.
This helps with commercial hosts where WebDAV is not available.

Features:
- supports publishing and deleting calendars
- does not require WebDAV

Installation:
1. place this file in your PHP iCalendar calendars directory (or anywhere else)
2. configure path to PHP iCalendar config file (below)
3. make sure that PHP has write access to the calendars directory (or whatever you set $calendar_path to)
4. set up directory security on your calendars directory

Usage:
1. Open iCal, select a calendar for publishing
2. Select "Publish" from the "Calendar" menu
3. Configure to your liking, and set the URL to (eg): http://localhost/~dietricha/calendar/calendars/publish.php
4. Click the "Publish" button

Security:
The calendars directory should be configured to require authentication. This can be done via any methods
supported by your webserver. There is much documentation available on the web for doing per-directory
authentication for Apache. This protects any private calendar data, and prevents unauthorized users
from updating or deleting your calendar data.
There's also code below that forwards any GET requests to the PHP iCalendar front page.

Troubleshooting:
You can turn on logging by setting the PHPICALENDAR_LOG_PUBLISHING constant to 1 below.
This will write out a log file to the same directory as this script.
Don't forget to turn off logging when done!!

*/

// include PHP iCalendar configuration variables
include('../config.inc.php');

// set calendar path, or just use current directory
$calendar_path = (isset($calendar_path) && $calendar_path != '') ? $calendar_path : '';

// toggle logging
define( 'PHPICALENDAR_LOG_PUBLISHING', 0 );

// viewing
if($_SERVER['REQUEST_METHOD'] == 'GET')
{
	header('Location: '.$default_path);
	return;
}

// unpublishing
if($_SERVER['REQUEST_METHOD'] == 'DELETE')
{
	// get calendar filename
	$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
	
	logmsg('received request to delete '.$calendar_file);
	
	// remove calendar file
	if(!unlink($calendar_file))
	{
		logmsg('unable to delete the calendar file');
	}
	else
	{
		logmsg('deleted');
	}
	return;
}

// publishing
if($_SERVER['REQUEST_METHOD'] == 'PUT')
{
	// get calendar data
	$fp = fopen('php://input','r');
	
	while(!feof($fp))
	{
		$data .= fgets($fp,4096);
	}
	
	fclose($fp);
	
	if(isset($data))
	{
		
		// get calendar name
		$cal_arr = explode("\n",$data);
		
		foreach($cal_arr as $k => $v)
		{
			if(strstr($v,'X-WR-CALNAME:'))
			{
				$arr = explode(':',$v);
				$calendar_name = trim($arr[1]);
				break;
			}
		}
		
		$calendar_name = isset($calendar_name) ? $calendar_name : 'default';
		
		// write to file
		if($fp = fopen($calendar_path.$calendar_name.'.ics','w+'))
		{
			fputs($fp, $data, strlen($data) );
			fclose($fp);
		}
		else
		{
			logmsg( 'couldnt open file '.$calendar_path.$calendar_name.'.ics' );
		}
	}
}

// for logging
function logmsg($str){
	if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1)
	{
		if($fp = fopen('publish_log.txt','a+'))
		{
			$str .= "\n";
			fputs($fp, $str, strlen($str) );
			fclose($fp);
		}
	}
}
?>

[PHPiCalendar-Commits] phpicalendar/languages brazilian.inc.php,1.5,1.6 catalan.inc.php,1.5,1.6 czech.inc.php,1.5,1.6 danish.inc.php,1.23,1.24 dutch.inc.php,1.20,1.21 english.inc.php,1.46,1.47 esperanto.inc.php,1.2,1.3 finnish.inc.php,1.7,1.8 french.inc.php,1.22,1.23 german.inc.php,1.23,1.24 italian.inc.php,1.23,1.24 japanese.inc.php,1.29,1.30 korean.inc.php,1.1,1.2 norwegian.inc.php,1.24,1.25 polish.inc.php,1.24,1.25 portuguese.inc.php,1.11,1.12 spanish.inc.php,1.13,1.14 swedish.inc.php,1.12,1.13 traditional_chinese.inc.php,1.5,1.6

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv1039/languages

Modified Files:
	brazilian.inc.php catalan.inc.php czech.inc.php danish.inc.php 
	dutch.inc.php english.inc.php esperanto.inc.php 
	finnish.inc.php french.inc.php german.inc.php italian.inc.php 
	japanese.inc.php korean.inc.php norwegian.inc.php 
	polish.inc.php portuguese.inc.php spanish.inc.php 
	swedish.inc.php traditional_chinese.inc.php 
Log Message:
Changed all instances of 0.9.4 to 0.9.5.



Index: brazilian.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/brazilian.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** brazilian.inc.php	21 Sep 2003 05:33:58 -0000	1.5
--- brazilian.inc.php	13 Nov 2003 17:33:22 -0000	1.6
***************
*** 2,6 ****
  
  // Brazilian Portuguese language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Wilton, Bennet (su...@be...) 
--- 2,6 ----
  
  // Brazilian Portuguese language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Wilton, Bennet (su...@be...) 
***************
*** 115,119 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 115,119 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: catalan.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/catalan.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** catalan.inc.php	21 Sep 2003 05:33:58 -0000	1.5
--- catalan.inc.php	13 Nov 2003 17:33:22 -0000	1.6
***************
*** 2,6 ****
  
  // Catalan language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Oriol Ferrer Mesia; (tm...@sa...)
--- 2,6 ----
  
  // Catalan language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Oriol Ferrer Mesia; (tm...@sa...)
***************
*** 114,118 ****
  $delete_lang			= 'Esborra';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 114,118 ----
  $delete_lang			= 'Esborra';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: czech.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/czech.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** czech.inc.php	21 Sep 2003 05:33:58 -0000	1.5
--- czech.inc.php	13 Nov 2003 17:33:22 -0000	1.6
***************
*** 2,6 ****
  
  // Czech language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Whit, studio jižák (wh...@st...)
--- 2,6 ----
  
  // Czech language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Whit, studio jižák (wh...@st...)

Index: danish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/danish.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** danish.inc.php	21 Sep 2003 05:33:58 -0000	1.23
--- danish.inc.php	13 Nov 2003 17:33:22 -0000	1.24
***************
*** 2,6 ****
  
  // Danish language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Henrik H�jmark (st...@wo...)
--- 2,6 ----
  
  // Danish language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Henrik H�jmark (st...@wo...)
***************
*** 115,119 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 115,119 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: dutch.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/dutch.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** dutch.inc.php	21 Sep 2003 05:33:58 -0000	1.20
--- dutch.inc.php	13 Nov 2003 17:33:22 -0000	1.21
***************
*** 2,6 ****
  
  // Dutch language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Lieven Gekiere (Li...@ge...)
--- 2,6 ----
  
  // Dutch language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Lieven Gekiere (Li...@ge...)
***************
*** 115,119 ****
  $delete_lang			= 'Verwijder';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 115,119 ----
  $delete_lang			= 'Verwijder';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: english.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** english.inc.php	21 Sep 2003 05:33:58 -0000	1.46
--- english.inc.php	13 Nov 2003 17:33:22 -0000	1.47
***************
*** 2,6 ****
  
  // English language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Chad Little (ch...@ch...)
--- 2,6 ----
  
  // English language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Chad Little (ch...@ch...)
***************
*** 115,119 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 115,119 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: esperanto.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/esperanto.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** esperanto.inc.php	21 Sep 2003 05:33:58 -0000	1.2
--- esperanto.inc.php	13 Nov 2003 17:33:23 -0000	1.3
***************
*** 2,6 ****
  
  // Esperanto language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Sjoerd Bosga (sj...@es...)
--- 2,6 ----
  
  // Esperanto language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Sjoerd Bosga (sj...@es...)
***************
*** 115,119 ****
  $delete_lang			= 'Forigi';
  
! // ----- New after 0.9.4
  $all_cal_comb_lang		= 'Ĉiuj kalendaroj kune';
  
--- 115,119 ----
  $delete_lang			= 'Forigi';
  
! // ----- New after 0.9.5
  $all_cal_comb_lang		= 'Ĉiuj kalendaroj kune';
  

Index: finnish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/finnish.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** finnish.inc.php	21 Sep 2003 05:33:58 -0000	1.7
--- finnish.inc.php	13 Nov 2003 17:33:23 -0000	1.8
***************
*** 2,6 ****
  
  // Finnish language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Kari Somby (kar...@ra...)
--- 2,6 ----
  
  // Finnish language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Kari Somby (kar...@ra...)
***************
*** 115,119 ****
  $delete_lang			= 'Tuhoa';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 115,119 ----
  $delete_lang			= 'Tuhoa';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: french.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/french.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** french.inc.php	21 Sep 2003 05:33:58 -0000	1.22
--- french.inc.php	13 Nov 2003 17:33:23 -0000	1.23
***************
*** 112,116 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 112,116 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: german.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/german.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** german.inc.php	21 Sep 2003 05:33:58 -0000	1.23
--- german.inc.php	13 Nov 2003 17:33:23 -0000	1.24
***************
*** 2,6 ****
  
  // German language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by David Reindl (dr...@an...)
--- 2,6 ----
  
  // German language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by David Reindl (dr...@an...)
***************
*** 118,122 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 118,122 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: italian.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/italian.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** italian.inc.php	21 Sep 2003 05:33:58 -0000	1.23
--- italian.inc.php	13 Nov 2003 17:33:23 -0000	1.24
***************
*** 2,6 ****
  
  // Italian language include
! // For version 0.9.4 PHP iCalendar
  //
  // First translation by Luca Cacciagrano (cl...@cl...)
--- 2,6 ----
  
  // Italian language include
! // For version 0.9.5 PHP iCalendar
  //
  // First translation by Luca Cacciagrano (cl...@cl...)
***************
*** 116,120 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 116,120 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: japanese.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/japanese.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** japanese.inc.php	21 Sep 2003 05:33:58 -0000	1.29
--- japanese.inc.php	13 Nov 2003 17:33:23 -0000	1.30
***************
*** 120,124 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 120,124 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: korean.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/korean.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** korean.inc.php	24 Sep 2003 14:37:52 -0000	1.1
--- korean.inc.php	13 Nov 2003 17:33:23 -0000	1.2
***************
*** 115,119 ****
  $delete_lang			= '삭제';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= '모든 달력이 통합되었습니다';
  
--- 115,119 ----
  $delete_lang			= '삭제';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= '모든 달력이 통합되었습니다';
  

Index: norwegian.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/norwegian.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** norwegian.inc.php	21 Sep 2003 05:33:58 -0000	1.24
--- norwegian.inc.php	13 Nov 2003 17:33:23 -0000	1.25
***************
*** 114,118 ****
  $delete_lang			= 'Slett';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 114,118 ----
  $delete_lang			= 'Slett';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: polish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/polish.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** polish.inc.php	21 Sep 2003 05:33:58 -0000	1.24
--- polish.inc.php	13 Nov 2003 17:33:23 -0000	1.25
***************
*** 2,6 ****
  
  // Polish language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Stanisław Cieślicki (st...@po...)
--- 2,6 ----
  
  // Polish language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Stanisław Cieślicki (st...@po...)
***************
*** 115,119 ****
  $delete_lang			= 'Wymaż';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 115,119 ----
  $delete_lang			= 'Wymaż';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: portuguese.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/portuguese.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** portuguese.inc.php	21 Sep 2003 05:33:58 -0000	1.11
--- portuguese.inc.php	13 Nov 2003 17:33:24 -0000	1.12
***************
*** 2,6 ****
  
  // Portuguese language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Rui Costa (rui...@ub...)
--- 2,6 ----
  
  // Portuguese language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Rui Costa (rui...@ub...)
***************
*** 114,118 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 114,118 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: spanish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/spanish.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** spanish.inc.php	21 Sep 2003 05:33:58 -0000	1.13
--- spanish.inc.php	13 Nov 2003 17:33:24 -0000	1.14
***************
*** 2,6 ****
  
  // Spanish language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Javier Navarro from XIPS (jna...@xi...)
--- 2,6 ----
  
  // Spanish language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Javier Navarro from XIPS (jna...@xi...)
***************
*** 114,118 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 114,118 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

Index: swedish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/swedish.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
Binary files /tmp/cvsMaq5ah and /tmp/cvsKIrN7n differ

Index: traditional_chinese.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/traditional_chinese.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** traditional_chinese.inc.php	21 Sep 2003 05:33:58 -0000	1.5
--- traditional_chinese.inc.php	13 Nov 2003 17:33:24 -0000	1.6
***************
*** 2,6 ****
  
  // Trad. Chinese language include
! // For version 0.9.4 PHP iCalendar
  //
  // Translation by Kevin Fyure (di...@ma...)
--- 2,6 ----
  
  // Trad. Chinese language include
! // For version 0.9.5 PHP iCalendar
  //
  // Translation by Kevin Fyure (di...@ma...)
***************
*** 117,121 ****
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.4
  $all_cal_comb_lang		= 'All calendars combined';
  
--- 117,121 ----
  $delete_lang			= 'Delete';
  
! // ----- New for 0.9.5
  $all_cal_comb_lang		= 'All calendars combined';
  

[PHPiCalendar-Commits] phpicalendar/includes footer.inc.php,1.9,1.10

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv1039/includes

Modified Files:
	footer.inc.php 
Log Message:
Changed all instances of 0.9.4 to 0.9.5.



Index: footer.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/footer.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** footer.inc.php	20 Sep 2003 21:46:17 -0000	1.9
--- footer.inc.php	13 Nov 2003 17:33:22 -0000	1.10
***************
*** 1,5 ****
  <?php 
  
! echo "<center class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.4</a>";
  if ($enable_rss == 'yes') {
  	echo "<br>\n";
--- 1,5 ----
  <?php 
  
! echo "<center class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.5</a>";
  if ($enable_rss == 'yes') {
  	echo "<br>\n";

[PHPiCalendar-Commits] phpicalendar README,1.50,1.51 config.inc.php,1.113,1.114

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv1039

Modified Files:
	README config.inc.php 
Log Message:
Changed all instances of 0.9.4 to 0.9.5.



Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** README	21 Sep 2003 18:33:02 -0000	1.50
--- README	13 Nov 2003 17:33:22 -0000	1.51
***************
*** 79,83 ****
  Older Browser Support:
  ----------------------
! Starting with 0.9.4, PHP iCalendar is moving away from supporting 4.x browsers.
  If you still need support for these browers, 0.9.3 is still available for
  download. To get the latest ical support, simply download the latest version
--- 79,83 ----
  Older Browser Support:
  ----------------------
! Starting with 0.9.5, PHP iCalendar is moving away from supporting 4.x browsers.
  If you still need support for these browers, 0.9.3 is still available for
  download. To get the latest ical support, simply download the latest version
***************
*** 87,90 ****
--- 87,94 ----
  Changes:
  --------
+ 0.9.5
+ 	-Fixed many bugs.
+ 	-Added a method to publish without Webdav in iCal. calendars/publish.php
+ 
  0.9.4
  	-Vastly improved BYDAY, BYMONTHDAY, BYYEARDAY support.

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** config.inc.php	23 Sep 2003 00:15:44 -0000	1.113
--- config.inc.php	13 Nov 2003 17:33:22 -0000	1.114
***************
*** 1,5 ****
  <?php
  
! // Configuration file for PHP iCalendar 0.9.4
  //
  // To set values, change the text between the single quotes
--- 1,5 ----
  <?php
  
! // Configuration file for PHP iCalendar 0.9.5
  //
  // To set values, change the text between the single quotes

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.113,1.114 list_icals.php,1.17,1.18

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv3320/functions

Modified Files:
	ical_parser.php list_icals.php 
Log Message:
Moved select to list icals, changed ical_parser back to previous.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** ical_parser.php	5 Nov 2003 06:07:20 -0000	1.113
--- ical_parser.php	13 Nov 2003 06:02:47 -0000	1.114
***************
*** 396,400 ****
  							// if $until isn't set yet, we set it to the end of our range we're looking at
  							// The FREQ switch array will always kick our early, so lets try this workaround.
! 							if (isset($until)) $until = strtotime('+'.$interval.' '.$freq_type, $until);;
  							
  							if (!isset($until)) $until = $end_range_time;
--- 396,400 ----
  							// if $until isn't set yet, we set it to the end of our range we're looking at
  							// The FREQ switch array will always kick our early, so lets try this workaround.
! 							// if (isset($until)) $until = strtotime('+'.$interval.' '.$freq_type, $until);;
  							
  							if (!isset($until)) $until = $end_range_time;

Index: list_icals.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_icals.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** list_icals.php	20 Sep 2003 19:13:13 -0000	1.17
--- list_icals.php	13 Nov 2003 06:02:47 -0000	1.18
***************
*** 8,11 ****
--- 8,14 ----
  		$query="";
  	}	
+ 	echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'";
+ 	if (isset($query)) echo $query;
+ 	echo "');\">";
  	// open file
  	$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));

[PHPiCalendar-Commits] phpicalendar/includes sidebar.php,1.23,1.24

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv3320/includes

Modified Files:
	sidebar.php 
Log Message:
Moved select to list icals, changed ical_parser back to previous.



Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** sidebar.php	16 Oct 2003 19:02:52 -0000	1.23
--- sidebar.php	13 Nov 2003 06:02:47 -0000	1.24
***************
*** 52,58 ****
  			echo '<div style="padding: 5px;">';
  			echo '<form style="margin-bottom:0;" action="day.php" method="GET">';
- 			echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'";
- 			if (isset($query)) echo $query;
- 			echo "');\">";
  			include('./functions/list_icals.php');
  			include('./functions/list_years.php');
--- 52,55 ----

[PHPiCalendar-Commits] phpicalendar/includes calendar_nav.php,1.12,1.13

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv11612/includes

Modified Files:
	calendar_nav.php 
Log Message:




Index: calendar_nav.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** calendar_nav.php	16 Oct 2003 19:01:49 -0000	1.12
--- calendar_nav.php	5 Nov 2003 06:17:25 -0000	1.13
***************
*** 103,106 ****
--- 103,107 ----
  									<?php 
  									
+ 									if (!isset($query)) $query = '';
  									echo '<b>'.$jump_lang.'</b><br>';
  									echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.112,1.113

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv10190

Modified Files:
	ical_parser.php 
Log Message:
Fix for [ 829861 ] Yearly Recurrence Showing two events.


Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** ical_parser.php	5 Nov 2003 05:31:03 -0000	1.112
--- ical_parser.php	5 Nov 2003 06:07:20 -0000	1.113
***************
*** 525,529 ****
  														} else {
  															$day 	= date('d', $start_date_time);
! 															$next_date_time = mktime(0,0,0,$month,$day,$this_year);
  														}
  														$recur_data[] = $next_date_time;
--- 525,529 ----
  														} else {
  															$day 	= date('d', $start_date_time);
! 															$next_date_time = mktime(0,0,0,$month,$day,$year);
  														}
  														$recur_data[] = $next_date_time;

[PHPiCalendar-Commits] phpicalendar/calendars 831527.ics,NONE,1.1

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/calendars
In directory sc8-pr-cvs1:/tmp/cvs-serv9360

Added Files:
	831527.ics 
Log Message:
Added calendar for testing.



--- NEW FILE: 831527.ics ---
BEGIN:VCALENDAR
VERSION:2.0
X-WR-CALNAME:NVFolkDance
PRODID:-//Apple Computer\, Inc//iCal 1.5//EN
X-WR-RELCALID:A169304A-0F54-11D8-BAB4-000A957CBED4
X-WR-TIMEZONE:US/Pacific
CALSCALE:GREGORIAN
METHOD:PUBLISH
X-WR-CALDESC:Folk Dancing in Nevada: Contra\, English Country\, Israeli\
 , International Folk\, Dances of Universal Peace\, Sacred Circle Dancing
 
BEGIN:VTIMEZONE
TZID:US/Pacific
LAST-MODIFIED:20031105T055516Z
BEGIN:DAYLIGHT
DTSTART:20030406T100000
TZOFFSETTO:-0700
TZOFFSETFROM:+0000
TZNAME:PDT
END:DAYLIGHT
BEGIN:STANDARD
DTSTART:20031026T020000
TZOFFSETTO:-0800
TZOFFSETFROM:-0700
TZNAME:PST
END:STANDARD
BEGIN:DAYLIGHT
DTSTART:20040404T010000
TZOFFSETTO:-0700
TZOFFSETFROM:-0800
TZNAME:PDT
END:DAYLIGHT
BEGIN:STANDARD
DTSTART:20041031T020000
TZOFFSETTO:-0800
TZOFFSETFROM:-0700
TZNAME:PST
END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
LOCATION:Las Vegas
DTSTAMP:20031105T055426Z
UID:A168EB3E-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:6
URL;VALUE=URI:http://raincloudpub.com/snocd/
DTSTART;TZID=US/Pacific:20031025T183000
SUMMARY:LAS Contra Dance
DTEND;TZID=US/Pacific:20031025T220000
DESCRIPTION:Charleston Heights Art Center\n800 Brush St\, Las Vegas NV\n
 $6
RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=-1SA
END:VEVENT
BEGIN:VEVENT
LOCATION:Las Vegas
DTSTAMP:20031105T055426Z
UID:A168F268-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:3
URL;VALUE=URI:http://raincloudpub.com/snocd/
DTSTART;TZID=US/Pacific:20031025T140000
SUMMARY:LAS Dance Workshop
DTEND;TZID=US/Pacific:20031025T170000
DESCRIPTION:Dance Workshop with Rich Albanese\nCharleston Heights Art Ce
 nter\n800 Brush St\, Las Vegas NV\n$6
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20031122T183000
DTEND;TZID=US/Pacific:20031122T220000
UID:A168EB3E-0F54-11D8-BAB4-000A957CBED4
DTSTAMP:20031105T055426Z
RECURRENCE-ID;TZID=US/Pacific:20031129T183000
END:VEVENT
BEGIN:VEVENT
LOCATION:Carson City
DTSTAMP:20031105T055426Z
UID:A168F4BE-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:4
URL;VALUE=URI:http://members.aol.com/PopOuts/pfd.html
DTSTART;TZID=US/Pacific:20031231T200000
SUMMARY:CC New Years Eve Dance (Pioneer Family Dance)
DTEND;TZID=US/Pacific:20031231T235900
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$12 (kids
  $6)\n\"New Years Eve Dance\"
END:VEVENT
BEGIN:VEVENT
LOCATION:Carson City
EXDATE;TZID=US/Pacific:20031227T190000
UID:A168F666-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:10
DTSTAMP:20031105T055426Z
URL;VALUE=URI:http://members.aol.com/PopOuts/pfd.html
STATUS:CONFIRMED
DTSTART;TZID=US/Pacific:20031227T190000
SUMMARY:Pioneer Family Dance
DTEND;TZID=US/Pacific:20031227T220000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$7 (kids 
 free)
RRULE:FREQ=MONTHLY;INTERVAL=1;UNTIL=20040124T075959Z;BYDAY=4SA
END:VEVENT
BEGIN:VEVENT
LOCATION:Carson City
EXDATE;TZID=US/Pacific:20031122T190000
UID:A168F818-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:6
DTSTAMP:20031105T055426Z
URL;VALUE=URI:http://members.aol.com/PopOuts/pfd.html
STATUS:CONFIRMED
DTSTART;TZID=US/Pacific:20031122T190000
SUMMARY:Pioneer Family Dance
DTEND;TZID=US/Pacific:20031122T220000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$7 (kids 
 free)
RRULE:FREQ=MONTHLY;INTERVAL=1;UNTIL=20031227T075959Z;BYDAY=4SA
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20031220T183000
DTEND;TZID=US/Pacific:20031220T220000
SUMMARY:LAS Holiday Ball Contra Dance
UID:A168EB3E-0F54-11D8-BAB4-000A957CBED4
DTSTAMP:20031105T055426Z
RECURRENCE-ID;TZID=US/Pacific:20031227T183000
END:VEVENT
BEGIN:VEVENT
LOCATION:Las Vegas
DTSTAMP:20031105T055426Z
UID:A168FA30-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:6
DTSTART;TZID=US/Pacific:20031013T183000
SUMMARY:LAS English Country Dance
DTEND;TZID=US/Pacific:20031013T210000
DESCRIPTION:Jewel Box Theatre\, Clark County (Flamingo) Library\n1401 E 
 Flamingo Ave\nfree
RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=2MO
END:VEVENT
BEGIN:VEVENT
DURATION:PT2H30M
LOCATION:Las Vegas
DTSTAMP:20031105T055426Z
UID:A168FBE2-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:2
DTSTART;TZID=US/Pacific:20031020T183000
SUMMARY:LAS English Country Dance
DESCRIPTION:Jewel Box Theatre\, Clark County (Flamingo) Library\n1401 E 
 Flamingo Ave\nfree
RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=3MO
END:VEVENT
BEGIN:VEVENT
LOCATION:Las Vegas
DTSTAMP:20031105T055426Z
UID:A168FD90-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:6
DTSTART;TZID=US/Pacific:20031014T183000
SUMMARY:LAS Contra Dance Evening
DTEND;TZID=US/Pacific:20031014T210000
DESCRIPTION:Jewel Box Theatre\, Clark County (Flamingo) Library\n1401 E 
 Flamingo Ave\nfree
RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=2TU
END:VEVENT



BEGIN:VEVENT
LOCATION:Las Vegas
EXDATE;TZID=US/Pacific:20031224T183000
EXDATE;TZID=US/Pacific:20031126T183000
UID:A168FF4D-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:9
DTSTAMP:20031105T055426Z
URL;VALUE=URI:http://www.physics.unlv.edu/~jeffery/folk/lasvegas/
DTSTART;TZID=US/Pacific:20031008T183000
SUMMARY:LAS Ethnic Express Folk Dance
DTEND;TZID=US/Pacific:20031008T210000
DESCRIPTION:Charleston Heights Art Center\n800 Brush St\, Las Vegas NV\n
 $3
RRULE:FREQ=WEEKLY;INTERVAL=1
END:VEVENT



BEGIN:VEVENT
LOCATION:Las Vegas
EXDATE;TZID=US/Pacific:20031226T190000
UID:A1690100-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:5
DTSTAMP:20031105T055426Z
URL;VALUE=URI:http://raincloudpub.com/dupsn/
DTSTART;TZID=US/Pacific:20031024T190000
SUMMARY:LAS Dances of Universal Peace
DTEND;TZID=US/Pacific:20031024T213000
DESCRIPTION:Church of Religious Science                        5317 Smok
 e Ranch Rd\, Las Vegas NV\n$10
RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=4FR
END:VEVENT
BEGIN:VEVENT
LOCATION:Pahrump NV
DTSTAMP:20031105T055426Z
UID:A16902B2-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:4
URL;VALUE=URI:http://raincloudpub.com/dupsn/
DTSTART;TZID=US/Pacific:20030927T180000
SUMMARY:PAH Dances of Universal Peace
DTEND;TZID=US/Pacific:20030927T200000
DESCRIPTION:Haven Selah\n1680 N Blagg\, Pahrump NV\n$10
RRULE:FREQ=MONTHLY;INTERVAL=2;BYDAY=4SA
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20031122T140000
DTEND;TZID=US/Pacific:20031122T160000
UID:A16902B2-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:4
RECURRENCE-ID;TZID=US/Pacific:20031122T180000
DTSTAMP:20031105T055426Z
END:VEVENT
BEGIN:VEVENT
LOCATION:Reno
DTSTAMP:20031105T055426Z
UID:A169069E-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:2
URL;VALUE=URI:http://unr.edu/homepage/louie/ifd.html
DTSTART;TZID=US/Pacific:20031007T190000
SUMMARY:RNO Israeli Folk Dance
DTEND;TZID=US/Pacific:20031007T210000
DESCRIPTION:Temple Emanu-el\,\nLakeside and Manzanita\, Reno NV\n$3
END:VEVENT
BEGIN:VEVENT
LOCATION:Reno
EXDATE;TZID=US/Pacific:20031127T193000
EXDATE;TZID=US/Pacific:20031225T193000
UID:A1690852-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:11
DTSTAMP:20031105T055426Z
DTSTART;TZID=US/Pacific:20031009T193000
SUMMARY:RNO International Folk Dance
DTEND;TZID=US/Pacific:20031009T210000
DESCRIPTION:Presbyterian Church at the end of Sunnyside Dr\, Reno NV
RRULE:FREQ=WEEKLY;INTERVAL=1
END:VEVENT
BEGIN:VEVENT
LOCATION:Reno
DTSTAMP:20031105T055426Z
UID:A1690A06-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:6
DTSTART;TZID=US/Pacific:20031004T193000
SUMMARY:RNO International Folk Dance
DTEND;TZID=US/Pacific:20031004T210000
DESCRIPTION:Studio 214\,\n214 California St\, Reno NV
RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1SA
END:VEVENT
BEGIN:VEVENT
EXDATE;TZID=US/Pacific:20031227T190000
LOCATION:Carson City
UID:A1690BB6-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:6
DTSTAMP:20031105T055426Z
URL;VALUE=URI:http://members.aol.com/PopOuts/pfd.html
DTSTART;TZID=US/Pacific:20031025T190000
SUMMARY:CC Pioneer Family Dance
DTEND;TZID=US/Pacific:20031025T220000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV
RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=4SA
END:VEVENT
BEGIN:VEVENT
LOCATION:Carson City
EXDATE;TZID=US/Pacific:20031227T190000
EXDATE;TZID=US/Pacific:20031122T190000
UID:A1691942-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:8
DTSTAMP:20031105T055426Z
URL;VALUE=URI:http://members.aol.com/PopOuts/pfd.html
DTSTART;TZID=US/Pacific:20031122T190000
SUMMARY:Pioneer Family Dance
DTEND;TZID=US/Pacific:20031122T220000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV
RRULE:FREQ=MONTHLY;INTERVAL=1;UNTIL=20040124T075959Z;BYDAY=4SA
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20031122T190000
DTEND;TZID=US/Pacific:20031122T220000
UID:A1690BB6-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:8
RECURRENCE-ID;TZID=US/Pacific:20031122T190000
DTSTAMP:20031105T055426Z
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$7 (kids 
 free)\n\"Turkey Dance\"
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20040124T190000
UID:A1690BB6-0F54-11D8-BAB4-000A957CBED4
DTSTAMP:20031105T055426Z
RECURRENCE-ID;TZID=US/Pacific:20040124T190000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$10 (kids
  free)\n\"Hot Cocoa Dance\"
DURATION:PT3H
END:VEVENT
BEGIN:VEVENT
DURATION:PT1H
LOCATION:Reno NV
DTSTAMP:20031105T055426Z
UID:A1691BC8-0F54-11D8-BAB4-000A957CBED4
SEQUENCE:3
URL;VALUE=URI:http://members.aol.com/SierraContra/
DTSTART;TZID=US/Pacific:20031011T190000
SUMMARY:RNO Contra Dance
DESCRIPTION:Plumas Park  Gym\n475 Monroe St\, Reno NV\n$8\nHot Cider & J
 oyce Miller
RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=2SA
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20031025T190000
UID:A1690BB6-0F54-11D8-BAB4-000A957CBED4
DTSTAMP:20031105T055426Z
RECURRENCE-ID;TZID=US/Pacific:20031025T190000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$12 ($6 k
 ids)\n\"Masked Ball / Mad Hatter Dance\"\n6:00 potluck\, 7:00 dance
DURATION:PT3H
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20040228T190000
UID:A1690BB6-0F54-11D8-BAB4-000A957CBED4
DTSTAMP:20031105T055426Z
RECURRENCE-ID;TZID=US/Pacific:20040228T190000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$10 (kids
  free)\n\"Warming Up Dance\"
DURATION:PT3H
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20040327T190000
UID:A1690BB6-0F54-11D8-BAB4-000A957CBED4
DTSTAMP:20031105T055426Z
RECURRENCE-ID;TZID=US/Pacific:20040327T190000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$10 (kids
  free)\n\"Danita's Birthday Dance\"
DURATION:PT3H
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20040424T190000
UID:A1690BB6-0F54-11D8-BAB4-000A957CBED4
DTSTAMP:20031105T055426Z
RECURRENCE-ID;TZID=US/Pacific:20040424T190000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$10 (kids
  free)\n\"Earth Day Dance\"
DURATION:PT3H
END:VEVENT
BEGIN:VEVENT
DTSTART;TZID=US/Pacific:20040522T190000
UID:A1690BB6-0F54-11D8-BAB4-000A957CBED4
DTSTAMP:20031105T055426Z
RECURRENCE-ID;TZID=US/Pacific:20040522T190000
DESCRIPTION:Brewery Arts Center\n449 King St\, Carson City NV\n$10 (kids
  free)
DURATION:PT3H
END:VEVENT
END:VCALENDAR

[PHPiCalendar-Commits] phpicalendar/functions init.inc.php,1.39,1.40

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv6472/functions

Modified Files:
	init.inc.php 
Log Message:
https support for webcals.



Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** init.inc.php	16 Oct 2003 19:01:49 -0000	1.39
--- init.inc.php	5 Nov 2003 05:40:15 -0000	1.40
***************
*** 72,84 ****
  }
  
! if (substr($cal_filename, 0, 7) == 'http://' || substr($cal_filename, 0, 9) == 'webcal://') {
  	$is_webcal = TRUE;
  	$cal_webcalPrefix = str_replace('http://','webcal://',$cal_filename);
  	$cal_httpPrefix = str_replace('webcal://','http://',$cal_filename);
  	$cal_filename = $cal_httpPrefix;
  }
  
  if ($is_webcal) {
! 	if ($allow_webcals == 'yes' || in_array($cal_webcalPrefix, $list_webcals) || in_array($cal_httpPrefix, $list_webcals)) {
  		$cal_displayname = substr(str_replace('32', ' ', basename($cal_filename)), 0, -4);
  		$cal = urlencode($cal_filename);
--- 72,86 ----
  }
  
! if (substr($cal_filename, 0, 7) == 'http://' || substr($cal_filename, 0, 8) == 'https://' || substr($cal_filename, 0, 9) == 'webcal://') {
  	$is_webcal = TRUE;
  	$cal_webcalPrefix = str_replace('http://','webcal://',$cal_filename);
  	$cal_httpPrefix = str_replace('webcal://','http://',$cal_filename);
+ 	$cal_httpsPrefix = str_replace('webcal://','https://',$cal_filename);
+ 	$cal_httpsPrefix = str_replace('http://','https://',$cal_httpsPrefix);
  	$cal_filename = $cal_httpPrefix;
  }
  
  if ($is_webcal) {
! 	if ($allow_webcals == 'yes' || in_array($cal_webcalPrefix, $list_webcals) || in_array($cal_httpPrefix, $list_webcals) || in_array($cal_httpsPrefix, $list_webcals)) {
  		$cal_displayname = substr(str_replace('32', ' ', basename($cal_filename)), 0, -4);
  		$cal = urlencode($cal_filename);

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.111,1.112

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv5271/functions

Modified Files:
	ical_parser.php 
Log Message:
Applied 2 patches.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** ical_parser.php	24 Sep 2003 04:18:33 -0000	1.111
--- ical_parser.php	5 Nov 2003 05:31:03 -0000	1.112
***************
*** 144,147 ****
--- 144,152 ----
  					if (!isset($start_time)) $start_time = $master_array[$old_start_date][$old_start_time][$uid]['event_start'];
  					if (!isset($start_unixtime)) $start_unixtime = $master_array[$old_start_date][$old_start_time][$uid]['start_unixtime'];
+ 					// Handle DURATION
+ 					if (!isset($end_unixtime) && isset($the_duration)) {
+ 						$end_unixtime 	= $start_unixtime + $the_duration;
+ 						$end_time 	= date ('Hi', $end_unixtime);
+ 					}
  					if (!isset($end_unixtime)) $end_unixtime = $master_array[$old_start_date][$old_start_time][$uid]['end_unixtime'];
  					if (!isset($end_time)) $end_time = $master_array[$old_start_date][$old_start_time][$uid]['event_end'];
***************
*** 658,661 ****
--- 663,668 ----
  							$allday_start = $data;
  							$start_date = $allday_start;
+ 							$start_unixtime = strtotime($data);
+                             $due_date = date('Ymd', $start_unixtime);
  						} else {
  							if (preg_match("/^DUE;TZID=/i", $field)) {
***************
*** 955,960 ****
  							$seconds 		= ereg_replace('S', '', $duration[6]); 
  							$the_duration 	= ($weeks * 60 * 60 * 24 * 7) + ($days * 60 * 60 * 24) + ($hours * 60 * 60) + ($minutes * 60) + ($seconds);
! 							$end_unixtime 	= $start_unixtime + $the_duration;
! 							$end_time 		= date ('Hi', $end_unixtime);
  							$first_duration = FALSE;
  						}	
--- 962,968 ----
  							$seconds 		= ereg_replace('S', '', $duration[6]); 
  							$the_duration 	= ($weeks * 60 * 60 * 24 * 7) + ($days * 60 * 60 * 24) + ($hours * 60 * 60) + ($minutes * 60) + ($seconds);
! 							// Do this in the END:VEVENT now so that it doesn't have to come after DTSTART
! 							//$end_unixtime 	= $start_unixtime + $the_duration;
! 							//$end_time 		= date ('Hi', $end_unixtime);
  							$first_duration = FALSE;
  						}	

[PHPiCalendar-Commits] phpicalendar/includes calendar_nav.php,1.11,1.12 sidebar.php,1.21,1.22

[<jo...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv13795/includes

Modified Files:
	calendar_nav.php sidebar.php 
Log Message:
Do not include subscribe and download links for calendars referenced
by an absolute path or with a relative path going up (i.e. ../).


Index: calendar_nav.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** calendar_nav.php	21 Sep 2003 17:13:46 -0000	1.11
--- calendar_nav.php	16 Oct 2003 19:01:49 -0000	1.12
***************
*** 141,145 ****
  												echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
  												if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
! 												if ($cal != $ALL_CALENDARS_COMBINED) echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
  											 ?>
  											</td>
--- 141,145 ----
  												echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
  												if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
! 												if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
  											 ?>
  											</td>

Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** sidebar.php	21 Sep 2003 17:13:46 -0000	1.21
--- sidebar.php	16 Oct 2003 19:01:49 -0000	1.22
***************
*** 35,39 ****
  				echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
  				if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
! 				if ($cal != $ALL_CALENDARS_COMBINED) echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
  				echo '</span></div>';
  			 ?>
--- 35,39 ----
  				echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
  				if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
! 				if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
  				echo '</span></div>';
  			 ?>

[PHPiCalendar-Commits] phpicalendar/functions init.inc.php,1.38,1.39

[<jo...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv13795/functions

Modified Files:
	init.inc.php 
Log Message:
Do not include subscribe and download links for calendars referenced
by an absolute path or with a relative path going up (i.e. ../).


Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** init.inc.php	26 Sep 2003 16:00:41 -0000	1.38
--- init.inc.php	16 Oct 2003 19:01:49 -0000	1.39
***************
*** 137,149 ****
  		
  		// Sets the download and subscribe paths from the config if present.
! 		if ($download_uri == '') {
  			$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
  			$download_filename = $filename;
! 		} else {
  			$newurl = eregi_replace("^(http://)", "", $download_uri); 
  			$subscribe_path = 'webcal://'.$newurl.'/'.$cal_filename.'.ics';
  			$download_filename = $download_uri.'/'.$cal_filename.'.ics';
  		}
- 		
  	}
  }
--- 137,151 ----
  		
  		// Sets the download and subscribe paths from the config if present.
! 		if ($download_uri == '' && preg_match('/(^\/|..\/)/', $filename) == 0) {
  			$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
  			$download_filename = $filename;
! 		} else if ($download_uri != '') {
  			$newurl = eregi_replace("^(http://)", "", $download_uri); 
  			$subscribe_path = 'webcal://'.$newurl.'/'.$cal_filename.'.ics';
  			$download_filename = $download_uri.'/'.$cal_filename.'.ics';
+ 		} else {
+ 			$subscribe_path = '';
+ 			$download_filename = '';
  		}
  	}
  }

[PHPiCalendar-Commits] phpicalendar/includes sidebar.php,1.22,1.23

[<jo...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv14040/includes

Modified Files:
	sidebar.php 
Log Message:
Fixed warning for reference to $query when not set.


Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** sidebar.php	16 Oct 2003 19:01:49 -0000	1.22
--- sidebar.php	16 Oct 2003 19:02:52 -0000	1.23
***************
*** 52,56 ****
  			echo '<div style="padding: 5px;">';
  			echo '<form style="margin-bottom:0;" action="day.php" method="GET">';
! 			echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
  			include('./functions/list_icals.php');
  			include('./functions/list_years.php');
--- 52,58 ----
  			echo '<div style="padding: 5px;">';
  			echo '<form style="margin-bottom:0;" action="day.php" method="GET">';
! 			echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'";
! 			if (isset($query)) echo $query;
! 			echo "');\">";
  			include('./functions/list_icals.php');
  			include('./functions/list_years.php');

[PHPiCalendar-Commits] phpicalendar index.php,1.5,1.6

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv8026

Modified Files:
	index.php 
Log Message:
Fixed errors.



Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** index.php	17 Nov 2002 02:32:10 -0000	1.5
--- index.php	26 Sep 2003 16:00:41 -0000	1.6
***************
*** 1,6 ****
  <?php
  
  include "./config.inc.php";
! if ($HTTP_COOKIE_VARS['phpicalendar']) {
  	$phpicalendar 		= unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
  	$default_view 		= $phpicalendar['cookie_view'];
--- 1,7 ----
  <?php
  
+ if (!isset($ALL_CALENDARS_COMBINED))  $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
  include "./config.inc.php";
! if (isset($HTTP_COOKIE_VARS['phpicalendar'])) {
  	$phpicalendar 		= unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
  	$default_view 		= $phpicalendar['cookie_view'];

[PHPiCalendar-Commits] phpicalendar search.php,1.22,1.23

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv11419

Modified Files:
	search.php 
Log Message:
removed uneeded code.


Index: search.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** search.php	21 Sep 2003 03:22:08 -0000	1.22
--- search.php	26 Sep 2003 16:10:42 -0000	1.23
***************
*** 19,37 ****
  
  $search_box = '';
! // yet to be implemented
! switch($HTTP_GET_VARS['mode']) {
! 	case 'advanced_search':
! 		// display advanced search stuff
! 		break;
! 	case 'search':
! 		// display simple search stuff
! 		break;
! 	case 'results':
! 		// display results of either simple or advanced search
! 		break;
! 	default:
! 		// some generic thing, maybe same as search
! }
! 
  $search_box .= 
  	'<form action="search.php" method="GET">'."\n".
--- 19,23 ----
  
  $search_box = '';
! s
  $search_box .= 
  	'<form action="search.php" method="GET">'."\n".

[PHPiCalendar-Commits] phpicalendar/functions init.inc.php,1.37,1.38

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv8026/functions

Modified Files:
	init.inc.php 
Log Message:
Fixed errors.



Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** init.inc.php	20 Sep 2003 00:16:05 -0000	1.37
--- init.inc.php	26 Sep 2003 16:00:41 -0000	1.38
***************
*** 7,11 ****
  
  // uncomment when developing, comment for shipping version
! //error_reporting (E_ALL);
  
  $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
--- 7,11 ----
  
  // uncomment when developing, comment for shipping version
! error_reporting (E_ALL);
  
  $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';

[PHPiCalendar-Commits] phpicalendar/languages korean.inc.php,NONE,1.1

[<ica...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv32441/languages

Added Files:
	korean.inc.php 
Log Message:
Added Korean language support from TaeYoung Oh <sp...@hy...>.

--- NEW FILE: korean.inc.php ---
<?php

// Korean language include
// For version 0.9.1 PHP iCalendar
//
// Translation by TaeYoung Oh (sp...@hy...)
//
// Submit new translations to ch...@ch...

$day_lang			= '일일';
$week_lang			= '주간';
$month_lang			= '월간';
$year_lang			= '연간';
$calendar_lang		= '달력';
$next_day_lang		= '다음 날';
$next_month_lang	= '다음 달';
$next_week_lang		= '다음 주';
$next_year_lang		= '다음 해';
$last_day_lang		= '전날';
$last_month_lang	= '전 달';
$last_week_lang		= '전 주';
$last_year_lang		= '전 년';
$subscribe_lang		= '가입';
$download_lang		= '다운로드';
$powered_by_lang 	= 'Powered by';
$event_lang			= '일정';
$event_start_lang	= '시작시간';
$event_end_lang		= '종료시간';
$this_months_lang	= '이달의 일정';
$date_lang			= '날짜';
$summary_lang		= '요약';
$all_day_lang		= '하루종일';
$notes_lang			= '메모';
$this_years_lang	= '올해의 일정';
$today_lang			= '오늘';
$this_week_lang		= '금주';
$this_month_lang	= '이번달';
$jump_lang			= '이동';
$tomorrows_lang		= '내일의 일정';
$goday_lang			= '일일 보기';
$goweek_lang		= '주간 보기';
$gomonth_lang		= '월간 보기';
$goyear_lang		= '연간 보기';
$search_lang		= '검색'; // the verb
$results_lang		= '검색결과';
$query_lang			= '질의어'; // will be followed by the search query
$no_results_lang	= '검색 결과가 없습니다.';
$goprint_lang		= '인쇄용 보기';
$time_lang			= '시간';
$summary_lang		= '요약';
$description_lang	= '설명';
$this_site_is_lang		= 'This site is';
$no_events_day_lang		= '오늘의 일정이 없습니다.';
$no_events_week_lang	= '이번주에는 일정이 없습니다.';
$no_events_month_lang	= '이달에는 일정이 없습니다.';
$rss_day_date			= 'g:i A';  // Lists just the time
$rss_week_date			= '%b %e일';  // Lists just the day
$rss_month_date			= '%b %e일';  // Lists just the day
$rss_language			= 'ko-kr';
$search_took_lang		= '검색소요시간 %s 초';
$recurring_event_lang	= '반복 일정';
$exception_lang			= '예외';
$no_query_lang			= '질의어가 없습니다';
$preferences_lang		= '환경설정';
$printer_lang			= '프린터';
$select_lang_lang		= '기본 언어를 선택하세요:';
$select_cal_lang		= '기본 달력을 선택하세요:';
$select_view_lang		= '기본 보기를 선택하세요:';
$select_time_lang		= '기본 시작 시간을 선택하세요:';
$select_day_lang		= '한주의 시작요일을 선택하세요:';
$select_style_lang		= '기본 스타일을 선택하세요:';
$set_prefs_lang			= '환경설정 저장';
$completed_date_lang	= '완료일';
$completed_lang			= '완료됨';
$created_lang			= '생성됨:';
$due_lang				= '마감일:';
$priority_lang			= '우선순위:';
$priority_high_lang		= '높음';
$priority_low_lang		= '낮음';
$priority_medium_lang	= '중간';
$priority_none_lang		= '없음';
$status_lang			= '상태:';
$todo_lang				= '해야할 일';
$unfinished_lang		= '마무리 안됨';
$prefs_set_lang 		= '환경설정이 저장되었습니다.';
$prefs_unset_lang 		= '환경설정 초기화되었습니다. 변경사항은 다음 페이지가 로딩될 때 적용됩니다.';
$unset_prefs_lang 		= '환경설정 초기화:';
$organizer_lang			= '주선자';
$attendee_lang			= '참석자';
$status_lang			= '상태';
$location_lang			= '위치';
$admin_header_lang		= 'PHP iCalendar 관리';
$username_lang			= '사용자 이름';
$password_lang			= '비밀번호';
$login_lang				= '로그인';
$invalid_login_lang		= '잘못된 사용자 이름이나 비밀번호.';
$addupdate_cal_lang		= '달력 추가 또는 갱신';
$addupdate_desc_lang	= '새 파일을 업로드하여 달력을 추가하세요. 같은 이름의 파일을 업로드하여 달력을 갱신할 수 있습니다.';
$delete_cal_lang		= '달력 삭제';
$logout_lang			= '로그아웃';
$cal_file_lang			= '달력 파일';
$php_error_lang			= 'PHP 오류';
$upload_error_gen_lang	= '업로드에 문제가 있었습니다.';
$upload_error_lang[0]	= '업로드에 문제가 있었습니다.';
$upload_error_lang[1]	= '업로드하려는 파일이 너무 큽니다.';
$upload_error_lang[2]	= '업로드하려는 파일이 너무 큽니다.';
$upload_error_lang[3]	= '업로드하려는 파일의 일부만 업로드되었습니다.';
$upload_error_lang[4]	= '업로드할 파일을 선택해야합니다.';
$upload_error_type_lang = '.ics 파일만 업로드할 수 있습니다.';
$copy_error_lang		= '파일 복사에 실패했습니다';
$delete_error_lang		= '파일 삭제에 실패했습니다';
$delete_success_lang	= '(이)가 성공적으로 삭제되었습니다.';
$action_success_lang	= '성공했습니다.';
$submit_lang			= '제출';
$delete_lang			= '삭제';

// ----- New for 0.9.4
$all_cal_comb_lang		= '모든 달력이 통합되었습니다';

// - navigation
$back_lang = '뒤로';
$next_lang = '다음';
$prev_lang = '이전';
$day_view_lang = '일일 보기';
$week_view_lang = '주간 보기';
$month_view_lang = '월간 보기';
$year_view_lang = '연간 보기';

// ---------------------------------


// $format_recur, items enclosed in % will be substituted with variables
$format_recur_lang['delimiter']	= ', ';								// ie, 'one, two, three'

$format_recur_lang['yearly']		= array('년','년');		// for these, put singular
$format_recur_lang['monthly']		= array('월','월');		// and plural forms
$format_recur_lang['weekly']		= array('주','주');		// these will be %freq%
$format_recur_lang['daily']			= array('일','일');			// in the replacement below
$format_recur_lang['hourly']		= array('시간','시간');
$format_recur_lang['minutely']		= array('분','분');
$format_recur_lang['secondly']		= array('초','초');

$format_recur_lang['start']			= '매 %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
$format_recur_lang['until']			= '%date% 까지';				// ie, 'until January 4'
$format_recur_lang['count']			= '%int% 회';		// ie, 'for 5 times'

$format_recur_lang['bymonth']		= '달에: %list%';			// ie, 'In months: January, February, March'
$format_recur_lang['bymonthday']	= '날짜에: %list%';			// ie, 'On dates: 1, 2, 3, 4'
$format_recur_lang['byday']			= '요일에: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'
$daysofweek_lang			= array ('일요일','월요일','화요일','수요일','목요일','금요일','토요일');
$daysofweekshort_lang		= array ('일','월','화','수','목','금','토');
$daysofweekreallyshort_lang	= array ('일','월','화','수','목','금','토');
$monthsofyear_lang			= array ('1월','2월','3월','4월','5월','6월','7월','8월','9월','10월','11월','12월');
$monthsofyearshort_lang		= array ('1월','2월','3월','4월','5월','6월','7월','8월','9월','10월','11월','12월');

// For time formatting, check out: http://www.php.net/manual/en/function.date.php
$timeFormat = 'g:i A';
$timeFormat_small = 'g:i';

// For date formatting, see note below
$dateFormat_day = '%B %e일, %A';
$dateFormat_week = '%B %e일';
$dateFormat_week_list = '%b %e일, %a';
$dateFormat_week_jump = '%b %e일';
$dateFormat_month = '%Y년 %B';
$dateFormat_month_list = '%B %e일, %A';

/*
Notes about dateFormat_*
	The pieces are similar to that of the PHP function strftime(), 
	however only the following is supported at this time:
	
	%A - the full week day name as specified in $daysofweek_lang
	%a - the shortened week day name as specified in $daysofweekshort_lang
	%B - the full month name as specified in $monthsofyear_lang
	%b - the shortened month name as specified in $monthsofyearshort_lang
	%e - the day of the month as a decimal number (1 to 31)
	%Y - the 4-digit year

	If this causes problems with representing your language accurately, let
	us know. We will be happy to modify this if needed.
*/

// Error messages - %s will be replaced with a variable
$error_title_lang = '오류!';
$error_window_lang = '에러가 발생했습니다!';
$error_calendar_lang = ' 오류가 발생할 때 "%s" 달력이 처리중이었습니다.';
$error_path_lang = '경로를 열지 못했습니다: "%s"';
$error_back_lang = '돌아가시려면 "뒤로" 버튼을 사용하세요.';
$error_remotecal_lang = '이 서버는 승인되지 않은 원격지 달력을 차단하고 있습니다.';
$error_restrictedcal_lang = '이 서버에서 제한되고 있는 달력에 접근시도를 하셨습니다.';
$error_invalidcal_lang = '올바르지 않은 달력파일입니다. 다른 달력으로 시도해보시기 바랍니다.';

?>

[PHPiCalendar-Commits] phpicalendar/calendars US Holidays.ics,1.2,1.3

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/calendars
In directory sc8-pr-cvs1:/tmp/cvs-serv20851/calendars

Modified Files:
	US Holidays.ics 
Log Message:
Fix for oopsie.



Index: US Holidays.ics
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/US Holidays.ics,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** US Holidays.ics	21 Sep 2003 20:02:54 -0000	1.2
--- US Holidays.ics	24 Sep 2003 04:18:33 -0000	1.3
***************
*** 15,18 ****
--- 15,556 ----
  BEGIN:VEVENT
  
+ 
+ SUMMARY:Grandparent's Day
+ 
+ 
+ DESCRIPTION:First Sunday after Labor Day
+ 
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ 
+ DTSTART;VALUE=DATE:19780910
+ 
+ 
+ RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=SU;BYMONTHDAY=13,7,8,9,10,11,12;BYMONTH=9
+ 
+ 
+ END:VEVENT
+ 
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ 
+ SUMMARY:Election Day
+ 
+ 
+ DESCRIPTION:Tuesday after 1st Monday in November
+ 
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ 
+ DTSTART;VALUE=DATE:17531106
+ 
+ 
+ RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8;BYMONTH=11
+ 
+ 
+ END:VEVENT
+ 
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:April Fools Day
+ 
+ DESCRIPTION:April 1
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530401
+ 
+ RRULE:FREQ=YEARLY;INTERVAL=1;
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Armed Forces Day
+ 
+ DESCRIPTION:3rd Saturday of May
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530519
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=5;BYDAY=3SA
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Columbus Day
+ 
+ DESCRIPTION:2nd Monday of October
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17531008
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=10;BYDAY=2MO
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Daylight Savings +1 hr
+ 
+ DESCRIPTION:1st Sunday of April
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530401
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=4;BYDAY=1SU
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Daylight Savings -1 hr
+ 
+ DESCRIPTION:Last Sunday of October
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17531028
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=10;BYDAY=-1SU
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Father's Day
+ 
+ DESCRIPTION:3rd Sunday of June
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530617
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=6;BYDAY=3SU
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Flag Day
+ 
+ DESCRIPTION:June 14
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530614
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Groundhog Day
+ 
+ DESCRIPTION:February 2
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530202
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Halloween
+ 
+ DESCRIPTION:October 31
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17531031
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Independence Day
+ 
+ DESCRIPTION:July 4
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530704
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Labor Day
+ 
+ DESCRIPTION:1st Monday of September
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530903
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=9;BYDAY=1MO
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Lincoln's Birthday
+ 
+ DESCRIPTION:February 12
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530212
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Mardi Gras (Fat Tuesday)
+ 
+ DESCRIPTION:47 days before Easter
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530308
+ 
+ X-WD-RECUR-EASTER:TRUE
+ 
+ X-WD-RECUR-OFFSET:-47
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Martin Luther King Jr.
+ 
+ DESCRIPTION:3rd Monday of January
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530115
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=1;BYDAY=3MO
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Memorial Day
+ 
+ DESCRIPTION:Last Monday of May
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530528
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=5;BYDAY=-1MO
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Mother's Day
+ 
+ DESCRIPTION:2nd Sunday of May
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530513
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=5;BYDAY=2SU
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:New Year's Day
+ 
+ DESCRIPTION:January 1
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530101
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:New Year's Eve
+ 
+ DESCRIPTION:December 31
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17531231
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:President's Day
+ 
+ DESCRIPTION:3rd Monday of February
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530219
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=2;BYDAY=3MO
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Secretaries Day
+ 
+ DESCRIPTION:Wednesday of last full week in April
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:19520423
+ 
+ 
+ RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=WE;BYMONTHDAY=25,26,27,21,22,23,24;BYMONTH=4
+ 
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:St. Patrick's Day
+ 
+ DESCRIPTION:March 17
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530317
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Thanksgiving
+ 
+ DESCRIPTION:4th Thursday of November
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17531122
+ 
+ RRULE:FREQ=MONTHLY;BYMONTH=11;BYDAY=4TH
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Valentine's Day
+ 
+ DESCRIPTION:February 14
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17530214
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
+ SUMMARY:Veteran's Day
+ 
+ DESCRIPTION:November 11
+ 
+ DTSTAMP:20030701T000000Z
+ 
+ UID:hol...@ic...
+ 
+ CATEGORIES:Holiday - US
+ 
+ DTSTART;VALUE=DATE:17531111
+ 
+ RRULE:FREQ=YEARLY
+ 
+ END:VEVENT
+ 
+ 
+ 
+ BEGIN:VEVENT
+ 
  SUMMARY:Washington's Birthday
  

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.110,1.111

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv20851/functions

Modified Files:
	ical_parser.php 
Log Message:
Fix for oopsie.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** ical_parser.php	21 Sep 2003 20:02:54 -0000	1.110
--- ical_parser.php	24 Sep 2003 04:18:33 -0000	1.111
***************
*** 524,539 ****
  														$recur_data[] = $next_date_time;
  													}
! 													foreach ($byyearday as $yearday) {
! 														ereg ('([-\+]{0,1})?([0-9]{1,3})', $yearday, $byyearday_arr);
! 														if ($byyearday_arr[1] == '-') {
! 															$ydtime = mktime(0,0,0,12,31,$this_year);
! 															$yearnum = $byyearday_arr[2] - 1;
! 															$next_date_time = strtotime('-'.$yearnum.' days', $ydtime);
! 														} else {
! 															$ydtime = mktime(0,0,0,1,1,$this_year);
! 															$yearnum = $byyearday_arr[2] - 1;
! 															$next_date_time = strtotime('+'.$yearnum.' days', $ydtime);
  														}
- 														$recur_data[] = $next_date_time;
  													}
  													break;
--- 524,541 ----
  														$recur_data[] = $next_date_time;
  													}
! 													if (isset($byyearday)) {
! 														foreach ($byyearday as $yearday) {
! 															ereg ('([-\+]{0,1})?([0-9]{1,3})', $yearday, $byyearday_arr);
! 															if ($byyearday_arr[1] == '-') {
! 																$ydtime = mktime(0,0,0,12,31,$this_year);
! 																$yearnum = $byyearday_arr[2] - 1;
! 																$next_date_time = strtotime('-'.$yearnum.' days', $ydtime);
! 															} else {
! 																$ydtime = mktime(0,0,0,1,1,$this_year);
! 																$yearnum = $byyearday_arr[2] - 1;
! 																$next_date_time = strtotime('+'.$yearnum.' days', $ydtime);
! 															}
! 															$recur_data[] = $next_date_time;
  														}
  													}
  													break;