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

[PHPiCalendar-Commits] phpicalendar/templates/grey default.css, 1.10, 1.11

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/grey
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24380/templates/grey

Modified Files:
	default.css 
Log Message:
Make border-top solid for timeborder and timeborder2 classes.

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/grey/default.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** default.css	5 Feb 2010 15:04:42 -0000	1.10
--- default.css	5 Feb 2010 21:37:38 -0000	1.11
***************
*** 90,95 ****
  .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
  .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px dotted #888; }
! .timeborder 	{ border-right: 1px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
! .timeborder2 	{ border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
  .navback 		{ background-image: url(images/time_bg.gif); }
  .sideback 		{ background-image: url(images/side_bg.gif); }
--- 90,95 ----
  .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
  .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px dotted #888; }
! .timeborder 	{ border-right: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); }
! .timeborder2 	{ border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); }
  .navback 		{ background-image: url(images/time_bg.gif); }
  .sideback 		{ background-image: url(images/side_bg.gif); }

[PHPiCalendar-Commits] phpicalendar/templates/red default.css, 1.10, 1.11

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/red
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30099/templates/red

Modified Files:
	default.css 
Log Message:
Add dayborder3 and weekborder3 classes for the half-hour borders (dotted style by default)

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/red/default.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** default.css	30 Jul 2009 17:55:06 -0000	1.10
--- default.css	5 Feb 2010 15:04:42 -0000	1.11
***************
*** 46,49 ****
--- 46,50 ----
  .dayborder 		{ background-color: #fff; border-top: 1px solid #A1A5A9; }
  .dayborder2 	{ background-color: #fff; border-top: 1px dashed #ccc; }
+ .dayborder2 	{ background-color: #fff; border-top: 1px dotted #888; }
  
  .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
***************
*** 88,91 ****
--- 89,93 ----
  .weekborder 	{ border-left: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
  .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
+ .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px dotted #888; }
  .timeborder 	{ border-right: 1px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
  .timeborder2 	{ border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
***************
*** 102,106 ****
  a.psf:hover		{ color: #FF0099; text-decoration: underline; }
  
! /* This is the link style for the mini-cals */	
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #a01010; }
--- 104,108 ----
  a.psf:hover		{ color: #FF0099; text-decoration: underline; }
  
! /* This is the link style for the mini-cals */
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #a01010; }
***************
*** 109,113 ****
  a.ps2:hover		{ color: #000099; }
  
! /* This is the link style for year months */	
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
--- 111,115 ----
  a.ps2:hover		{ color: #000099; }
  
! /* This is the link style for year months */
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
***************
*** 116,120 ****
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */	
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
--- 118,122 ----
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
***************
*** 122,126 ****
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 	
  /* Body attributes */
  
--- 124,128 ----
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 
  /* Body attributes */
  

[PHPiCalendar-Commits] phpicalendar/templates/tan default.css, 1.9, 1.10

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/tan
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30099/templates/tan

Modified Files:
	default.css 
Log Message:
Add dayborder3 and weekborder3 classes for the half-hour borders (dotted style by default)

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/tan/default.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** default.css	30 Jul 2009 17:55:06 -0000	1.9
--- default.css	5 Feb 2010 15:04:42 -0000	1.10
***************
*** 64,67 ****
--- 64,68 ----
  .dayborder 		{ background-color: #fff; border-top: 1px solid #A1A5A9; }
  .dayborder2 	{ background-color: #fff; border-top: 1px dashed #ccc; }
+ .dayborder2 	{ background-color: #fff; border-top: 1px dotted #888; }
  
  .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
***************
*** 106,109 ****
--- 107,111 ----
  .weekborder 	{ border-left: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
  .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
+ .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px dotted #888; }
  .timeborder 	{ border-right: 1px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
  .timeborder2 	{ border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
***************
*** 120,124 ****
  a.psf:hover		{ color: #333; text-decoration: underline; }
  
! /* This is the link style for the mini-cals (varies)*/	
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #0066FF; }
--- 122,126 ----
  a.psf:hover		{ color: #333; text-decoration: underline; }
  
! /* This is the link style for the mini-cals (varies)*/
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #0066FF; }
***************
*** 127,131 ****
  a.ps2:hover		{ color: #000099; }
  
! /* This is the link style for year months */	
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
--- 129,133 ----
  a.ps2:hover		{ color: #000099; }
  
! /* This is the link style for year months */
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
***************
*** 134,138 ****
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */	
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
--- 136,140 ----
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
***************
*** 140,144 ****
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 	
  /* Body attributes */
  
--- 142,146 ----
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 
  /* Body attributes */
  

[PHPiCalendar-Commits] phpicalendar/templates/default default.css, 1.31, 1.32

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/default
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30099/templates/default

Modified Files:
	default.css 
Log Message:
Add dayborder3 and weekborder3 classes for the half-hour borders (dotted style by default)

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** default.css	30 Jul 2009 17:55:06 -0000	1.31
--- default.css	5 Feb 2010 15:04:42 -0000	1.32
***************
*** 46,49 ****
--- 46,50 ----
  .dayborder 		{ background-color: #fff; border-top: 1px solid #A1A5A9; }
  .dayborder2 	{ background-color: #fff; border-top: 1px dashed #ccc; }
+ .dayborder3 	{ background-color: #fff; border-top: 1px dotted #888; }
  
  .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
***************
*** 87,90 ****
--- 88,92 ----
  .weekborder 	{ border-left: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
  .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
+ .weekborder3 	{ border-left: 1px solid #A1A5A9; border-top: 1px dotted #888; }
  .timeborder 	{ border-right: 1px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
  .timeborder2 	{ border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
***************
*** 101,105 ****
  a.psf:hover		{ color: #000099; text-decoration: underline; }
  
! /* This is the link style for the mini-cals */	
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #0066FF; }
--- 103,107 ----
  a.psf:hover		{ color: #000099; text-decoration: underline; }
  
! /* This is the link style for the mini-cals */
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #0066FF; }
***************
*** 108,112 ****
  a.ps2:hover		{ color: #000099; }
  
! /* This is the link style for year months */	
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
--- 110,114 ----
  a.ps2:hover		{ color: #000099; }
  
! /* This is the link style for year months */
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
***************
*** 115,119 ****
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */	
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
--- 117,121 ----
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
***************
*** 121,125 ****
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 	
  /* Body attributes */
  
--- 123,127 ----
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 
  /* Body attributes */
  

[PHPiCalendar-Commits] phpicalendar/functions template.php, 1.125, 1.126

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30099/functions

Modified Files:
	template.php 
Log Message:
Add dayborder3 and weekborder3 classes for the half-hour borders (dotted style by default)

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** template.php	28 Jul 2009 14:42:01 -0000	1.125
--- template.php	5 Feb 2010 15:04:42 -0000	1.126
***************
*** 14,22 ****
  		}
  	}
! 	
  	function draw_admin() {
  		global $phpiCal_config, $getdate, $cal, $master_array, $is_loged_in;
  		$delete_table = '';
! 		if ($is_loged_in == TRUE) { 
  			// Print Calendar Checkboxes
  			$COLUMNS_TO_PRINT = 3;
--- 14,22 ----
[...1192 lines suppressed...]
  		}
! 
  	function output() {
  		global $phpiCal_config, $php_started, $lang, $template_started, $cpath;
! 
  		// Looks for {MONTH} before sending page out
  		preg_match_all ('!\{MONTH_([A-Z]*)\|?([+|-])([0-9]{1,2})\}!Uis', $this->page, $match);
***************
*** 1202,1206 ****
  			}
  		}
! 		
  		$php_ended = @getmicrotime();
  		$generated1 = number_format(($php_ended-$php_started),3);
--- 1215,1219 ----
  			}
  		}
! 
  		$php_ended = @getmicrotime();
  		$generated1 = number_format(($php_ended-$php_started),3);

[PHPiCalendar-Commits] phpicalendar/templates/grey default.css, 1.9, 1.10

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/grey
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30099/templates/grey

Modified Files:
	default.css 
Log Message:
Add dayborder3 and weekborder3 classes for the half-hour borders (dotted style by default)

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/grey/default.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** default.css	30 Jul 2009 17:55:06 -0000	1.9
--- default.css	5 Feb 2010 15:04:42 -0000	1.10
***************
*** 46,49 ****
--- 46,50 ----
  .dayborder 		{ background-color: #fff; border-top: 1px solid #A1A5A9; }
  .dayborder2 	{ background-color: #fff; border-top: 1px dashed #ccc; }
+ .dayborder2 	{ background-color: #fff; border-top: 1px dotted #888; }
  
  .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
***************
*** 88,91 ****
--- 89,93 ----
  .weekborder 	{ border-left: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
  .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
+ .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px dotted #888; }
  .timeborder 	{ border-right: 1px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
  .timeborder2 	{ border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
***************
*** 102,106 ****
  a.psf:hover		{ color: #333; text-decoration: underline; }
  
! /* This is the link style for the mini-cals (varies)*/	
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #0066FF; }
--- 104,108 ----
  a.psf:hover		{ color: #333; text-decoration: underline; }
  
! /* This is the link style for the mini-cals (varies)*/
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #0066FF; }
***************
*** 109,113 ****
  a.ps2:hover		{ color: #000099; }
  
! /* This is the link style for year months */	
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
--- 111,115 ----
  a.ps2:hover		{ color: #000099; }
  
! /* This is the link style for year months */
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
***************
*** 116,120 ****
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */	
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
--- 118,122 ----
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
***************
*** 122,126 ****
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 	
  /* Body attributes */
  
--- 124,128 ----
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 
  /* Body attributes */
  

[PHPiCalendar-Commits] phpicalendar/templates/green default.css, 1.9, 1.10

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/green
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30099/templates/green

Modified Files:
	default.css 
Log Message:
Add dayborder3 and weekborder3 classes for the half-hour borders (dotted style by default)

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/green/default.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** default.css	30 Jul 2009 17:55:06 -0000	1.9
--- default.css	5 Feb 2010 15:04:42 -0000	1.10
***************
*** 63,66 ****
--- 63,67 ----
  .dayborder 		{ background-color: #fff; border-top: 1px solid #A1A5A9; }
  .dayborder2 	{ background-color: #fff; border-top: 1px dashed #ccc; }
+ .dayborder2 	{ background-color: #fff; border-top: 1px dotted #888; }
  
  .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
***************
*** 108,111 ****
--- 109,113 ----
  .weekborder 	{ border-left: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
  .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
+ .weekborder2 	{ border-left: 1px solid #A1A5A9; border-top: 1px dotted #888; }
  .timeborder 	{ border-right: 1px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
  .timeborder2 	{ border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
***************
*** 122,126 ****
  a.psf:hover		{ color: #003300; text-decoration: underline; }
  
! /* This is the link style for the mini-cals */	
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #009900; }
--- 124,128 ----
  a.psf:hover		{ color: #003300; text-decoration: underline; }
  
! /* This is the link style for the mini-cals */
  a.ps2			{ text-decoration:	underline; }
  a.ps2:link		{ color: #009900; }
***************
*** 129,133 ****
  a.ps2:hover		{ color: #003300; }
  
! /* This is the link style for year months */	
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
--- 131,135 ----
  a.ps2:hover		{ color: #003300; }
  
! /* This is the link style for year months */
  a.ps3			{ text-decoration:	none; }
  a.ps3:link		{ color: #000; }
***************
*** 136,140 ****
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */	
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
--- 138,142 ----
  a.ps3:hover		{ color: #000; text-decoration: underline; }
  
! /* This is the link style for events */
  a.ps			{ text-decoration:	none; }
  a.ps:link		{ color: #fff; }
***************
*** 142,146 ****
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 	
  /* Body attributes */
  
--- 144,148 ----
  a.ps:active		{ color: #fff; }
  a.ps:hover		{ color: #fff; text-decoration: underline; }
! 
  /* Body attributes */
  

[PHPiCalendar-Commits] phpicalendar/functions/parse recur_functions.php, 1.19, 1.20

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

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30837/functions/parse

Modified Files:
	recur_functions.php 
Log Message:
Fix missing variable in last patch

Index: recur_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** recur_functions.php	29 Dec 2009 16:08:55 -0000	1.19
--- recur_functions.php	4 Feb 2010 21:48:14 -0000	1.20
***************
*** 11,20 ****
  function add_recur($times,$freq=''){
  	global $recur_data;
! 	global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime,$until_unixtime, $day_offset, $current_view;	
  	if (!is_array($times)) $times = array($times);
  	/*	BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS	*/
  #dump_times($times);
  	if ($current_view != 'search'){
! 		$times = restrict_bymonth($times,$freq); 
  	#	$times = restrict_byweekno($times,$freq);
  		$times = restrict_byyearday($times,$freq);
--- 11,20 ----
  function add_recur($times,$freq=''){
  	global $recur_data;
! 	global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime,$until_unixtime, $day_offset, $current_view;
  	if (!is_array($times)) $times = array($times);
  	/*	BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS	*/
  #dump_times($times);
  	if ($current_view != 'search'){
! 		$times = restrict_bymonth($times,$freq);
  	#	$times = restrict_byweekno($times,$freq);
  		$times = restrict_byyearday($times,$freq);
***************
*** 24,49 ****
  		$times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos";
  		$times = array_unique($times);
! 		sort($times); 
  	}
  	$until_date = date("Ymd",$end_range_unixtime);
! 	foreach ($times as $time){ 
  		#echo "time:". date("Ymd",$time)." $until_date<br>\n";
  		if (!isset($time) || $time == '') continue;
  		$date = date("Ymd",$time);
  		$time = strtotime("$date 12:00:00");
! 		# day offset fixes shifts across day boundaries due to time diffs.  
  		# These are already fixed for the initial instance, but need to be fixed for recurrences
  		if (date("Ymd", $time) != $start_date) $time = $time + $day_offset * (24*60*60);
! 		if(isset($time) 
  			&& $time != ''
! 			&& !in_array($time, $recur_data) 
! 			&& !in_array($date, $except_dates) 
! 			&& $time <= $until_unixtime 
! 			&& $time >= $start_date_unixtime 
  			&& $date <= $until_date
! 		){ 
  			$count--; #echo "\n.$count\n";
! 			if($time >= $mArray_begin 
! 				&& $time  <= $mArray_end 
  				&& $count >= 0
  			) $recur_data[] = $time;
--- 24,49 ----
  		$times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos";
  		$times = array_unique($times);
! 		sort($times);
  	}
  	$until_date = date("Ymd",$end_range_unixtime);
! 	foreach ($times as $time){
  		#echo "time:". date("Ymd",$time)." $until_date<br>\n";
  		if (!isset($time) || $time == '') continue;
  		$date = date("Ymd",$time);
  		$time = strtotime("$date 12:00:00");
! 		# day offset fixes shifts across day boundaries due to time diffs.
  		# These are already fixed for the initial instance, but need to be fixed for recurrences
  		if (date("Ymd", $time) != $start_date) $time = $time + $day_offset * (24*60*60);
! 		if(isset($time)
  			&& $time != ''
! 			&& !in_array($time, $recur_data)
! 			&& !in_array($date, $except_dates)
! 			&& $time <= $until_unixtime
! 			&& $time >= $start_date_unixtime
  			&& $date <= $until_date
! 		){
  			$count--; #echo "\n.$count\n";
! 			if($time >= $mArray_begin
! 				&& $time  <= $mArray_end
  				&& $count >= 0
  			) $recur_data[] = $time;
***************
*** 56,67 ****
  	global $bymonth, $byweekno, $bymonthday, $year, $start_unixtime, $freq_type;
  	if(!empty($byweekno)) return $time;
! 	if(empty($bymonth)) $bymonth = array(date("m", $start_unixtime)); 
  	$d = date("d",$start_unixtime);
  	if (!empty($bymonthday)) $d = 1;
! 	foreach ($bymonth as $m){ 
  		$time = mktime(12,0,0,$m,$d,$year); #echo "exm:".date("Ymd",$time)."\n";
  		$times[] = $time;
! 	}	
! 	return $times;	
  }
  function expand_byweekno($times){
--- 56,67 ----
  	global $bymonth, $byweekno, $bymonthday, $year, $start_unixtime, $freq_type;
  	if(!empty($byweekno)) return $time;
! 	if(empty($bymonth)) $bymonth = array(date("m", $start_unixtime));
  	$d = date("d",$start_unixtime);
  	if (!empty($bymonthday)) $d = 1;
! 	foreach ($bymonth as $m){
  		$time = mktime(12,0,0,$m,$d,$year); #echo "exm:".date("Ymd",$time)."\n";
  		$times[] = $time;
! 	}
! 	return $times;
  }
  function expand_byweekno($times){
***************
*** 73,78 ****
  	if (empty($byweekno)) return $times;
  	$total_weeks = date("W",mktime(12,0,0,12,24,$year) ) +1;
! 	$w1_start = strtotime("this $wkst3char", mktime(12,0,0,1,1,$year) ); 
! 	foreach($byweekno as $weekno){ 
  		if($weekno < 0) $weekno = $weekno + $total_weeks;
  		#echo "\n $wkst3char w1st:".date("Ymd", $w1_start)." ".date("Ymd", mktime(12,0,0,1,1,$year))." weekno:$weekno";
--- 73,78 ----
  	if (empty($byweekno)) return $times;
  	$total_weeks = date("W",mktime(12,0,0,12,24,$year) ) +1;
! 	$w1_start = strtotime("this $wkst3char", mktime(12,0,0,1,1,$year) );
! 	foreach($byweekno as $weekno){
  		if($weekno < 0) $weekno = $weekno + $total_weeks;
  		#echo "\n $wkst3char w1st:".date("Ymd", $w1_start)." ".date("Ymd", mktime(12,0,0,1,1,$year))." weekno:$weekno";
***************
*** 86,98 ****
  	global $byyearday, $year;
  	if (empty($byyearday)) return $times;
! 	$py = $year-1; 
  	$ny = $year+1;
  	$new_times = array();
! 	foreach($times as $time){ 
  		foreach($byyearday as $yearday){
  			if($yearday > 0){ $day = strtotime("+$yearday days Dec 31, $py");#echo "\n".date("Ymd",$day)." = +$yearday days Dec 31, $py";
  			}else $day = strtotime("Jan 1 $ny $yearday days");
  			if(date("Y",$day == $year)) $new_times[] = $day;
! 		}	
  	}
  #	dump_times($new_times);
--- 86,98 ----
  	global $byyearday, $year;
  	if (empty($byyearday)) return $times;
! 	$py = $year-1;
  	$ny = $year+1;
  	$new_times = array();
! 	foreach($times as $time){
  		foreach($byyearday as $yearday){
  			if($yearday > 0){ $day = strtotime("+$yearday days Dec 31, $py");#echo "\n".date("Ymd",$day)." = +$yearday days Dec 31, $py";
  			}else $day = strtotime("Jan 1 $ny $yearday days");
  			if(date("Y",$day == $year)) $new_times[] = $day;
! 		}
  	}
  #	dump_times($new_times);
***************
*** 103,114 ****
  	global $bymonthday, $year;
  	if (empty($bymonthday)) return $times;
! 	foreach($times as $time){ 
  		$month = date('m',$time);
! 		foreach($bymonthday as $monthday){ 
  			if($monthday < 0) $monthday = date("t",$time) + $monthday +1;
  			$new_times[] = mktime(12,0,0,$month,$monthday,$year);
  			#echo "monthday:$monthday\n";
! 		}	
! 	}	
  	return $new_times;
  }
--- 103,114 ----
  	global $bymonthday, $year;
  	if (empty($bymonthday)) return $times;
! 	foreach($times as $time){
  		$month = date('m',$time);
! 		foreach($bymonthday as $monthday){
  			if($monthday < 0) $monthday = date("t",$time) + $monthday +1;
  			$new_times[] = mktime(12,0,0,$month,$monthday,$year);
  			#echo "monthday:$monthday\n";
! 		}
! 	}
  	return $new_times;
  }
***************
*** 132,137 ****
  			case 'week':
  				#need to find the first day of the appropriate week.
! 				$next_date_time = strtotime("this $on_day",strtotime($the_sunday)) + (12 * 60 * 60);					
! 				$times[] = $next_date_time; 
  				break;
  			case 'month':
--- 132,137 ----
  			case 'week':
  				#need to find the first day of the appropriate week.
! 				$next_date_time = strtotime("this $on_day",strtotime($the_sunday)) + (12 * 60 * 60);
! 				$times[] = $next_date_time;
  				break;
  			case 'month':
***************
*** 140,144 ****
  				if(empty($byweekno)){
  					$week_arr = array(1,2,3,4,5);
! 					if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]); 
  					$month_start = strtotime(date("Ym01",$time)) - (24 * 60 * 60);
  					$month_end = strtotime(date("Ymt",$time))+ (36 * 60 * 60);
--- 140,144 ----
  				if(empty($byweekno)){
  					$week_arr = array(1,2,3,4,5);
! 					if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]);
  					$month_start = strtotime(date("Ym01",$time)) - (24 * 60 * 60);
  					$month_end = strtotime(date("Ymt",$time))+ (36 * 60 * 60);
***************
*** 147,150 ****
--- 147,151 ----
  						$month_end   = mktime(12,0,0,1,1,$year+1);
  					}
+ 					$month_start_day = strtolower(date("D", $month_start));
  					foreach($week_arr as $week){
  						#echo "<pre>$summary ".$byday_arr[1].$week.$on_day." st:".date("Ymd",$month_start)." t:".date("Ymd",$time)."\n";
***************
*** 158,172 ****
  						}
  						# check that we're still in the same month
! 						if (date("m",$next_date_time) == date("m",$time) ) $times[] = $next_date_time; 
  					}
  				}else{
  					# byweekno should act like freq_type = week
! 					$next_date_time = strtotime("this $on_day",strtotime($the_sunday)) + (12 * 60 * 60);					
! 					$times[] = $next_date_time; 				
  				}
  				break;
  			default:
  				$month_start = strtotime(date("Ym01",$time));
! 				$next_date_time = strtotime($byday_arr[1].$byday_arr[2].$on_day, $month_start); 
  		}
  	}
--- 159,173 ----
  						}
  						# check that we're still in the same month
! 						if (date("m",$next_date_time) == date("m",$time) ) $times[] = $next_date_time;
  					}
  				}else{
  					# byweekno should act like freq_type = week
! 					$next_date_time = strtotime("this $on_day",strtotime($the_sunday)) + (12 * 60 * 60);
! 					$times[] = $next_date_time;
  				}
  				break;
  			default:
  				$month_start = strtotime(date("Ym01",$time));
! 				$next_date_time = strtotime($byday_arr[1].$byday_arr[2].$on_day, $month_start);
  		}
  	}
***************
*** 180,186 ****
  	if (empty($bymonth) || !empty($byyearday)) return $times;
  	$new_times=array();
! 	foreach ($times as $time){ 
  		if(in_array(date("m", $time), $bymonth)) $new_times[] = $time;
! 	}	
  	return $new_times;
  }
--- 181,187 ----
  	if (empty($bymonth) || !empty($byyearday)) return $times;
  	$new_times=array();
! 	foreach ($times as $time){
  		if(in_array(date("m", $time), $bymonth)) $new_times[] = $time;
! 	}
  	return $new_times;
  }
***************
*** 202,211 ****
  				$yearday = 365 + $yearday +1;
  				if(date("L",$time)) $yearday += 1;
! 			}	
  			$yearday_arr[] = $yearday;
  		}
  		# date(z,$time) gives 0 for Jan 1
  		if(in_array((date("z", $time)+1), $yearday_arr)) $new_times[] = $time;
! 	}	
  	return $new_times;
  }
--- 203,212 ----
  				$yearday = 365 + $yearday +1;
  				if(date("L",$time)) $yearday += 1;
! 			}
  			$yearday_arr[] = $yearday;
  		}
  		# date(z,$time) gives 0 for Jan 1
  		if(in_array((date("z", $time)+1), $yearday_arr)) $new_times[] = $time;
! 	}
  	return $new_times;
  }
***************
*** 219,225 ****
  			if($monthday < 0) $monthday = date("t",$time) + $monthday +1;
  			$monthday_arr[] = $monthday;
! 		}	
  		if(in_array(date("j", $time), $monthday_arr)) $new_times[] = $time;
! 	}	
  	return $new_times;
  }
--- 220,226 ----
  			if($monthday < 0) $monthday = date("t",$time) + $monthday +1;
  			$monthday_arr[] = $monthday;
! 		}
  		if(in_array(date("j", $time), $monthday_arr)) $new_times[] = $time;
! 	}
  	return $new_times;
  }
***************
*** 239,243 ****
  	$new_times=array();
  	foreach ($times as $time) if(in_array(strtolower(date("D", $time)), $byday3)) $new_times[] = $time;
! 	return $new_times;	
  }
  
--- 240,244 ----
  	$new_times=array();
  	foreach ($times as $time) if(in_array(strtolower(date("D", $time)), $byday3)) $new_times[] = $time;
! 	return $new_times;
  }
  
***************
*** 246,254 ****
  	if(empty($bysetpos)) return $times;
  	sort($times);
! 	$new_times=array(); 
  	foreach($bysetpos as $setpos){
  		$new_times[] = implode('',array_slice($times, $setpos, 1));
  	}
! 	return $new_times;	
  }
  
--- 247,255 ----
  	if(empty($bysetpos)) return $times;
  	sort($times);
! 	$new_times=array();
  	foreach($bysetpos as $setpos){
  		$new_times[] = implode('',array_slice($times, $setpos, 1));
  	}
! 	return $new_times;
  }
  

[PHPiCalendar-Commits] phpicalendar default_config.php,1.23,1.24

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28381

Modified Files:
	default_config.php 
Log Message:
Version number 2.4alpha -> 2.4

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** default_config.php	7 Jul 2009 14:48:28 -0000	1.23
--- default_config.php	25 Jan 2010 18:13:51 -0000	1.24
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.4alpha';
  	// Configuration file for PHP iCalendar 2.4
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.4';
  	// Configuration file for PHP iCalendar 2.4
  	//
***************
*** 10,14 ****
  #=================Initialize global variables=================================
  // Define some magic strings.
! 		$this->ALL_CALENDARS_COMBINED = 'all_calendars_combined971';	
  		$this->template 				= 'default';		// Template support
  		$this->default_view 			= 'day';			// Default view for calendars = 'day', 'week', 'month', 'year'
--- 10,14 ----
  #=================Initialize global variables=================================
  // Define some magic strings.
! 		$this->ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
  		$this->template 				= 'default';		// Template support
  		$this->default_view 			= 'day';			// Default view for calendars = 'day', 'week', 'month', 'year'
***************
*** 35,39 ****
  		$this->cpath	     			= ''; 				// optional subdirectory
  		$this->charset					= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
! 		
  		// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
  		$this->allow_webcals 			= 'no';				// Allow http:// and webcal:// prefixed URLs to be used as the $this->cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
--- 35,39 ----
  		$this->cpath	     			= ''; 				// optional subdirectory
  		$this->charset					= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
! 
  		// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
  		$this->allow_webcals 			= 'no';				// Allow http:// and webcal:// prefixed URLs to be used as the $this->cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
***************
*** 52,65 ****
  		$this->support_ical				= 'no';			// Set to yes to support the Apple iCal calendar database structure.
  		$this->recursive_path			= 'no';			// Set to yes to recurse into subdirectories of the calendar path.
! 		
  		// Calendar Caching (decreases page load times)
  		$this->save_parsed_cals 		= 'no';				// Saves a copy of the cal in /tmp after it's been parsed. Improves performance.
  		$this->tmp_dir					= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
! 		
  		// Webdav style publishing
  		$this->phpicalendar_publishing 	= '0';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
! 		
  		// Administration settings (/admin/)
! 		$this->allow_admin				= 'no';			// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $this->auth_method			
  		$this->auth_method				= 'internal';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $this->auth_internal_username and $this->auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
  		$this->auth_internal_username	= 'admin';			// Only used if $this->auth_method='internal'. The username for the administrator.
--- 52,65 ----
  		$this->support_ical				= 'no';			// Set to yes to support the Apple iCal calendar database structure.
  		$this->recursive_path			= 'no';			// Set to yes to recurse into subdirectories of the calendar path.
! 
  		// Calendar Caching (decreases page load times)
  		$this->save_parsed_cals 		= 'no';				// Saves a copy of the cal in /tmp after it's been parsed. Improves performance.
  		$this->tmp_dir					= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
! 
  		// Webdav style publishing
  		$this->phpicalendar_publishing 	= '0';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
! 
  		// Administration settings (/admin/)
! 		$this->allow_admin				= 'no';			// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $this->auth_method
  		$this->auth_method				= 'internal';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $this->auth_internal_username and $this->auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
  		$this->auth_internal_username	= 'admin';			// Only used if $this->auth_method='internal'. The username for the administrator.
***************
*** 71,82 ****
  		// Calendar colors
  		//
! 		// You can increase the number of unique colors by adding additional images (monthdot_n.gif) 
  		// and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n
  		// Colors will repeat from the beginning for calendars past $this->unique_colors (7 by default), with no limit.
! 		$this->unique_colors			= '7';	
! 		
  		return true;
! 	}	
! 	
  	public static function getInstance(){
  		if (empty(self::$instance)){
--- 71,82 ----
  		// Calendar colors
  		//
! 		// You can increase the number of unique colors by adding additional images (monthdot_n.gif)
  		// and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n
  		// Colors will repeat from the beginning for calendars past $this->unique_colors (7 by default), with no limit.
! 		$this->unique_colors			= '7';
! 
  		return true;
! 	}
! 
  	public static function getInstance(){
  		if (empty(self::$instance)){
***************
*** 85,89 ****
  		return self::$instance;
  	}
! 	
  	# val can be an array
  	public function setProperty($key,$val){
--- 85,89 ----
  		return self::$instance;
  	}
! 
  	# val can be an array
  	public function setProperty($key,$val){

[PHPiCalendar-Commits] phpicalendar/languages czech.inc.php, 1.13, 1.14

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

Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12393/languages

Modified Files:
	czech.inc.php 
Log Message:
czech file label

Index: czech.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/czech.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** czech.inc.php	24 Jul 2009 16:55:31 -0000	1.13
--- czech.inc.php	20 Jan 2010 00:31:53 -0000	1.14
***************
*** 1,5 ****
  <?php
  
! // English language include
  // For version 2.0 PHP iCalendar
  //
--- 1,5 ----
  <?php
  
! // Czech language include
  // For version 2.0 PHP iCalendar
  //

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

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1209/functions

Modified Files:
	userauth_functions.php 
Log Message:
Fix repeating ampersands at the end of the URL on log in/log out. Fix use of 

Index: userauth_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/userauth_functions.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** userauth_functions.php	24 Dec 2009 17:24:30 -0000	1.11
--- userauth_functions.php	12 Jan 2010 19:33:41 -0000	1.12
***************
*** 8,12 ****
  
  	// Return the login query string.
! 	$querys = preg_replace('/&&/', '', $querys);
  	return $querys;
  }
--- 8,12 ----
  
  	// Return the login query string.
! 	$querys = preg_replace('/&&|&$/', '', $querys);
  	return $querys;
  }
***************
*** 18,22 ****
  	// Make sure the action is logout.
  	$querys = preg_replace('/action=[^&]+/', 'action=logout', $_SERVER['QUERY_STRING']);
! 	if ($querys == $QUERY_STRING) $querys .= '&action=logout';
  
  	// Remove references to the username or password.
--- 18,22 ----
  	// Make sure the action is logout.
  	$querys = preg_replace('/action=[^&]+/', 'action=logout', $_SERVER['QUERY_STRING']);
! 	if ($querys == $_SERVER['QUERY_STRING']) $querys .= '&action=logout';
  
  	// Remove references to the username or password.
***************
*** 24,28 ****
  
  	// Return the logout query string.
! 	$querys = preg_replace('/&&/', '', $querys);
  	return $querys;
  }
--- 24,28 ----
  
  	// Return the logout query string.
! 	$querys = preg_replace('/&&|&$/', '', $querys);
  	return $querys;
  }

[PHPiCalendar-Commits] phpicalendar/functions/parse recur_functions.php, 1.18, 1.19

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

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22505/functions/parse

Modified Files:
	recur_functions.php 
Log Message:
Fixed recurring events across multiple versions of PHP; thanks to Len and gueba!

Index: recur_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** recur_functions.php	29 Dec 2008 03:07:34 -0000	1.18
--- recur_functions.php	29 Dec 2009 16:08:55 -0000	1.19
***************
*** 141,145 ****
  					$week_arr = array(1,2,3,4,5);
  					if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]); 
! 					$month_start = strtotime(date("Ym00",$time));
  					$month_end = strtotime(date("Ymt",$time))+ (36 * 60 * 60);
  					if($freq_type == 'year' && empty($bymonth)){
--- 141,145 ----
  					$week_arr = array(1,2,3,4,5);
  					if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]); 
! 					$month_start = strtotime(date("Ym01",$time)) - (24 * 60 * 60);
  					$month_end = strtotime(date("Ymt",$time))+ (36 * 60 * 60);
  					if($freq_type == 'year' && empty($bymonth)){
***************
*** 150,154 ****
  						#echo "<pre>$summary ".$byday_arr[1].$week.$on_day." st:".date("Ymd",$month_start)." t:".date("Ymd",$time)."\n";
  						if($byday_arr[1] == '-') $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_end);
! 						else $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_start);
  						# check that we're still in the same month
  						if (date("m",$next_date_time) == date("m",$time) ) $times[] = $next_date_time; 
--- 150,160 ----
  						#echo "<pre>$summary ".$byday_arr[1].$week.$on_day." st:".date("Ymd",$month_start)." t:".date("Ymd",$time)."\n";
  						if($byday_arr[1] == '-') $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_end);
! 						else {
! 							# we need this special offset in case the event day coincides with the month start day
! 							# eg: month starts on a Sunday, our event is the Nth Sunday of the month... without this
! 							# special offset, the event will be added to the (N+1)th Sunday of the month
! 							$special_offset = ($month_start_day == $on_day) ? (24 * 60 * 60) : 0;
! 							$next_date_time = strtotime($byday_arr[1] . $week . $on_day, ($month_start + $special_offset));
! 						}
  						# check that we're still in the same month
  						if (date("m",$next_date_time) == date("m",$time) ) $times[] = $next_date_time; 

[PHPiCalendar-Commits] phpicalendar README,1.118,1.119

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22505

Modified Files:
	README 
Log Message:
Fixed recurring events across multiple versions of PHP; thanks to Len and gueba!

Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** README	24 Dec 2009 17:41:02 -0000	1.118
--- README	29 Dec 2009 16:08:55 -0000	1.119
***************
*** 104,107 ****
--- 104,108 ----
  	Fix logout
  	Fixed bugs with ALL_CALENDARS_COMBINED and saving parsed calendars (using wrong file name)
+ 	Fixed recurring events across multiple versions of PHP; thanks to Len and gueba!
  	Better handling of URLs and email addresses in event descriptions (also strip "blocked" protocols, added by some mail servers)
  

[PHPiCalendar-Commits] phpicalendar/templates/red month_small.tpl, 1.1, NONE

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/red
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5806/templates/red

Removed Files:
	month_small.tpl 
Log Message:
Fix small month view "header" height

--- month_small.tpl DELETED ---

[PHPiCalendar-Commits] phpicalendar/templates/grey month_small.tpl, 1.1, NONE

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/grey
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5806/templates/grey

Removed Files:
	month_small.tpl 
Log Message:
Fix small month view "header" height

--- month_small.tpl DELETED ---

[PHPiCalendar-Commits] phpicalendar/templates/green month_small.tpl, 1.1, NONE

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/green
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5806/templates/green

Removed Files:
	month_small.tpl 
Log Message:
Fix small month view "header" height

--- month_small.tpl DELETED ---

[PHPiCalendar-Commits] phpicalendar/templates/tan month_small.tpl, 1.1, NONE

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/tan
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5806/templates/tan

Removed Files:
	month_small.tpl 
Log Message:
Fix small month view "header" height

--- month_small.tpl DELETED ---

[PHPiCalendar-Commits] phpicalendar/templates/default month_small.tpl, 1.8, 1.9

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/default
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5806/templates/default

Modified Files:
	month_small.tpl 
Log Message:
Fix small month view "header" height

Index: month_small.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month_small.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** month_small.tpl	12 Sep 2004 18:29:07 -0000	1.8
--- month_small.tpl	24 Dec 2009 17:52:04 -0000	1.9
***************
*** 1,5 ****
  <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
  	<tr>
! 		<td align="center" class="sideback"><div style="height:16px;"><b>{MONTH_TITLE}</b></div></td>
  	</tr>
  	<tr>
--- 1,5 ----
  <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
  	<tr>
! 		<td align="center" class="sideback"><div style="height:14px;"><b>{MONTH_TITLE}</b></div></td>
  	</tr>
  	<tr>

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.256, 1.257

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4606/functions

Modified Files:
	ical_parser.php 
Log Message:
Unset additional recurrence variables in ICS parser

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.256
retrieving revision 1.257
diff -C2 -d -r1.256 -r1.257
*** ical_parser.php	10 Jul 2009 18:00:53 -0000	1.256
--- ical_parser.php	24 Dec 2009 17:41:02 -0000	1.257
***************
*** 140,144 ****
  						$beginning, $start_of_vevent,
  						$valarm_description, $start_unixtime, $end_unixtime, $display_end_tmp, $end_time_tmp1, 
! 						$recurrence_id, $uid, $rrule, $until_check,
  						$until, $byweek, $byweekno, 
  						$byminute, $byhour, $bysecond
--- 140,144 ----
  						$beginning, $start_of_vevent,
  						$valarm_description, $start_unixtime, $end_unixtime, $display_end_tmp, $end_time_tmp1, 
! 						$recurrence_id, $recurrence_d, $recurrence_, $uid, $rrule, $until_check,
  						$until, $byweek, $byweekno, 
  						$byminute, $byhour, $bysecond

[PHPiCalendar-Commits] phpicalendar README,1.117,1.118

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4606

Modified Files:
	README 
Log Message:
Unset additional recurrence variables in ICS parser

Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** README	7 Jul 2009 14:48:28 -0000	1.117
--- README	24 Dec 2009 17:41:02 -0000	1.118
***************
*** 102,105 ****
--- 102,106 ----
  	Fix timezone DST calculation with all-day events
  	Fix dates before 1970
+ 	Fix logout
  	Fixed bugs with ALL_CALENDARS_COMBINED and saving parsed calendars (using wrong file name)
  	Better handling of URLs and email addresses in event descriptions (also strip "blocked" protocols, added by some mail servers)

[PHPiCalendar-Commits] phpicalendar/functions userauth_functions.php, 1.10, 1.11

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3201/functions

Modified Files:
	userauth_functions.php 
Log Message:
Fix small time format in French tranlsation

Index: userauth_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/userauth_functions.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** userauth_functions.php	9 Feb 2009 16:10:11 -0000	1.10
--- userauth_functions.php	24 Dec 2009 17:24:30 -0000	1.11
***************
*** 4,11 ****
  // Returns the login query string.
  function login_querys() {
- 	global $QUERY_STRING;
- 
  	// Remove the username, password, and action values.
! 	$querys = preg_replace('/(username|password|action)=[^&]+/', '', $QUERY_STRING);
  
  	// Return the login query string.
--- 4,9 ----
  // Returns the login query string.
  function login_querys() {
  	// Remove the username, password, and action values.
! 	$querys = preg_replace('/(username|password|action)=[^&]+/', '', $_SERVER['QUERY_STRING']);
  
  	// Return the login query string.
***************
*** 18,25 ****
  // Returns the logout query string.
  function logout_querys() {
- 	global $QUERY_STRING;
- 
  	// Make sure the action is logout.
! 	$querys = preg_replace('/action=[^&]+/', 'action=logout', $QUERY_STRING);
  	if ($querys == $QUERY_STRING) $querys .= '&action=logout';
  
--- 16,21 ----
  // Returns the logout query string.
  function logout_querys() {
  	// Make sure the action is logout.
! 	$querys = preg_replace('/action=[^&]+/', 'action=logout', $_SERVER['QUERY_STRING']);
  	if ($querys == $QUERY_STRING) $querys .= '&action=logout';
  

[PHPiCalendar-Commits] phpicalendar/languages french.inc.php, 1.32, 1.33

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

Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3201/languages

Modified Files:
	french.inc.php 
Log Message:
Fix small time format in French tranlsation

Index: french.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/french.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** french.inc.php	22 Jun 2009 20:54:57 -0000	1.32
--- french.inc.php	24 Dec 2009 17:24:31 -0000	1.33
***************
*** 178,182 ****
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
  $timeFormat = 'H:i';
! $timeFormat_small = 'g:i';
  
  // For date formatting, see note below
--- 178,182 ----
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
  $timeFormat = 'H:i';
! $timeFormat_small = 'G:i';
  
  // For date formatting, see note below

[PHPiCalendar-Commits] phpicalendar/templates/default default.css, 1.30, 1.31

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

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

Modified Files:
	default.css 
Log Message:
Make 'today' highlighting in day and week views more obvious. Add missing weekToday CSS class.

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** default.css	28 Jul 2009 14:42:01 -0000	1.30
--- default.css	30 Jul 2009 17:55:06 -0000	1.31
***************
*** 16,24 ****
  .alldaybg_7 {background: #959595 url(images/allday_7.gif) repeat-x; border-bottom: 1px solid #888888; min-height: 18px; padding-top: 5px; text-align: center;}
  
! .rowOn			{ background-color: #cfc; border-top: 1px solid #fff; border-left: 1px solid #fff; }
! .rowOn2			{ background-color: #cfc; border-top: 1px solid #fff; }
  .rowOff			{ background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  .rowOff2		{ background-color: #E1E8F1; border-top: 1px solid #fff; }
! .rowToday		{ background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  
  .padd			{ padding: 2px; }
--- 16,24 ----
  .alldaybg_7 {background: #959595 url(images/allday_7.gif) repeat-x; border-bottom: 1px solid #888888; min-height: 18px; padding-top: 5px; text-align: center;}
  
! .rowOn			{ background-color: #B0E8B0; border-top: 1px solid #fff; border-left: 1px solid #fff; }
! .rowOn2			{ background-color: #B0E8B0; border-top: 1px solid #fff; }
  .rowOff			{ background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  .rowOff2		{ background-color: #E1E8F1; border-top: 1px solid #fff; }
! .rowToday		{ background-color: #B0E8E8; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  
  .padd			{ padding: 2px; }
***************
*** 54,58 ****
  
  /* Week view */
! .weektoday		{ background-color: #eff; }
  
  /* Month View */
--- 54,58 ----
  
  /* Week view */
! .weektoday		{ background-color: #dff; }
  
  /* Month View */

[PHPiCalendar-Commits] phpicalendar/templates/tan default.css, 1.8, 1.9

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

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

Modified Files:
	default.css 
Log Message:
Make 'today' highlighting in day and week views more obvious. Add missing weekToday CSS class.

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/tan/default.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** default.css	28 Jul 2009 14:42:01 -0000	1.8
--- default.css	30 Jul 2009 17:55:06 -0000	1.9
***************
*** 16,24 ****
  .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;}
  
! .rowOn			{ background-color: #cfc; border-top: 1px solid #fff; border-left: 1px solid #fff; }
! .rowOn2			{ background-color: #cfc; border-top: 1px solid #fff; }
  .rowOff			{ background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  .rowOff2		{ background-color: #E1E8F1; border-top: 1px solid #fff; }
! .rowToday		{ background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  
  .padd			{ padding: 2px; }
--- 16,24 ----
  .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;}
  
! .rowOn			{ background-color: #B0E8B0; border-top: 1px solid #fff; border-left: 1px solid #fff; }
! .rowOn2			{ background-color: #B0E8B0; border-top: 1px solid #fff; }
  .rowOff			{ background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  .rowOff2		{ background-color: #E1E8F1; border-top: 1px solid #fff; }
! .rowToday		{ background-color: #B0E8E8; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  
  .padd			{ padding: 2px; }
***************
*** 71,74 ****
--- 71,77 ----
  .maintable		{ width: 990px; }
  
+ /* Week view */
+ .weektoday		{ background-color: #dff; }
+ 
  /* Month View */
  

[PHPiCalendar-Commits] phpicalendar/templates/red default.css, 1.9, 1.10

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

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

Modified Files:
	default.css 
Log Message:
Make 'today' highlighting in day and week views more obvious. Add missing weekToday CSS class.

Index: default.css
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/red/default.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** default.css	28 Jul 2009 14:42:01 -0000	1.9
--- default.css	30 Jul 2009 17:55:06 -0000	1.10
***************
*** 16,24 ****
  .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;}
  
! .rowOn			{ background-color: #cfc; border-top: 1px solid #fff; border-left: 1px solid #fff; }
! .rowOn2			{ background-color: #cfc; border-top: 1px solid #fff; }
  .rowOff			{ background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  .rowOff2		{ background-color: #E1E8F1; border-top: 1px solid #fff; }
! .rowToday		{ background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  
  .padd			{ padding: 2px; }
--- 16,24 ----
  .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;}
  
! .rowOn			{ background-color: #B0E8B0; border-top: 1px solid #fff; border-left: 1px solid #fff; }
! .rowOn2			{ background-color: #B0E8B0; border-top: 1px solid #fff; }
  .rowOff			{ background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  .rowOff2		{ background-color: #E1E8F1; border-top: 1px solid #fff; }
! .rowToday		{ background-color: #B0E8E8; border-top: 1px solid #fff; border-left: 1px solid #fff; }
  
  .padd			{ padding: 2px; }
***************
*** 53,56 ****
--- 53,59 ----
  .maintable		{ width: 990px; }
  
+ /* Week view */
+ .weektoday		{ background-color: #dff; }
+ 
  /* Month View */