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

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

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

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

Removed Files:
	rss_index.tpl 
Log Message:
new rss icons;allow subweek calendars

--- rss_index.tpl DELETED ---

[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.188, 1.189 default_config.php, 1.5, 1.6 preferences.php, 1.65, 1.66

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

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

Modified Files:
	config.inc.php default_config.php preferences.php 
Log Message:
new rss icons;allow subweek calendars

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.188
retrieving revision 1.189
diff -C2 -d -r1.188 -r1.189
*** config.inc.php	27 Dec 2008 11:42:41 -0000	1.188
--- config.inc.php	27 Dec 2008 23:18:07 -0000	1.189
***************
*** 3,54 ****
  
  phpicalendar 2.3 should work with no additional configuration. This file can be changed to customize the behavior of phpicalendar.
! In version 2.3, there has been a change in the way configuration works in order to reduce the number of confusing global variables.  Unfortunately, this means that config.inc.php files from older installations will have to be translated to the new format.  The conversion is simple: use the old variable names as array keys for the $configs array below:
  */
! $secs = 6*60*60;
  $configs = array(
! #	'calendar_path'	=>	'/Library/WebServer/Documents/phpicalendar/calendars',
! #	'timezone'	=> 'US/Central', 
! #	'allow_admin'	=> 'yes', 
! #	'allow_login'	=> 'yes', 
! 	'allow_preferences'	=> 'yes', 
! 	'show_search'	=> 'yes',
! #	'show_todos'	=> 'no',
! 	'show_completed'	=> 'no',
! 	'timezone'	=> 'US/Central',
! #	'timezone'	=> 'America/Bogota',
! #	'timezone'	=> 'Europe/Paris',
! #	'gridLength' => 5,
! #	'second_offset'	=> $secs,
! #	'cookie_uri'	=> '' 
  );
  
! $blacklisted_cals[] = '';					// Fill in between the quotes the name of the calendars 
! $blacklisted_cals[] = '';					// you wish to 'blacklist' or that you don't want to show up in your calendar
! $blacklisted_cals[] = '';					// list. This should be the exact calendar filename without .ics
! $blacklisted_cals[] = '';					// the parser will *not* parse any cal that is in this list (it will not be Web accessible)
  // add more lines as necessary
  
! $list_webcals[] = '';						// Fill in between the quotes exact URL of a calendar that you wish
! $list_webcals[] = '';						// to show up in your calendar list. You must prefix the URL with http://
! $list_webcals[] = '';						// or webcal:// and the filename should contain the .ics suffix
! $list_webcals[] = '';						// $allow_webcals does *not* need to be "yes" for these to show up and work
  // add more lines as necessary
  
! #$more_webcals['cpath'][] = ''				//add webcals that will show up only for a particular cpath.
  
! $locked_cals[] = '';						// Fill in-between the quotes the names of the calendars you wish to hide
! $locked_cals[] = '';						// unless unlocked by a username/password login. This should be the
! $locked_cals[] = '';						// exact calendar filename without the .ics suffix.
! $locked_cals[] = '';						//
  // add more lines as necessary
  
! $locked_map['user1:pass'] = array('');		// Map username:password accounts to locked calendars that should be
! $locked_map['user2:pass'] = array('');		// unlocked if logged in. Calendar names should be the same as what is
! $locked_map['user3:pass'] = array('');		// listed in the $locked_cals, again without the .ics suffix.
! $locked_map['user4:pass'] = array('');		// Example: $locked_map['username:password'] = array('Locked1', 'Locked2');
  // add more lines as necessary
  
! $apache_map['user1'] = array('');			// Map HTTP authenticated users to specific calendars. Users listed here and
! $apache_map['user2'] = array('');			// authenticated via HTTP will not see the public calendars, and will not be
! $apache_map['user3'] = array('');			// given any login/logout options. Calendar names not include the .ics suffix.
! $apache_map['user4'] = array('');			// Example: $apache_map['username'] = array('Calendar1', 'Calendar2');
--- 3,93 ----
  
  phpicalendar 2.3 should work with no additional configuration. This file can be changed to customize the behavior of phpicalendar.
! In version 2.3, there has been a change in the way configuration works in order to reduce the number of confusing global variables.  Unfortunately, this means that config.inc.php files from older installations will have to be translated to the new format.  The conversion is simple: use the old variable names as array keys for the $configs array below.
! 
! To change basic settings, uncomment (remove the first '#') from the desired line and adjust the value.  For setting blacklists, autmatic webcals, locked calendars, and HTTP authorized calendars modify the arrays below the basic configuration section.
! 
! The commented out lines below include alternatives to the default settings.  Additional settings that can be overridden are in default_config.php
! 
! For more info and help, go to http://phpicalendar.net or email php...@gm...
  */
! 
  $configs = array(
! 
! /*     ========= BASIC CONFIGURATION =========
!        ** Server configuration **
! 
! As noted, phpicalendar should work without adjusting the default settings.  Change these if you are having problems or want to change where things are found.  For example, it is often useful to have calendar_path in a different location.
! 
!        calendar_path is a FILE path
!        default_path, cookie_uri, and download_uri are a URL paths, e.g. http://www.example.com/phpicalendar; set these if you are having problems.
! */
! #     'calendar_path'        => '/Library/WebServer/Documents/phpicalendar/calendars/recur_tests',
! #     'default_path'         => '', 	
! #     'save_parsed_cals'     => 'yes', 
! #     'cookie_uri'           => '', 
! #     'download_uri'         => '', 	
! 
! /*     ** Timezones **
! If timezone is not set, all events show in the local time of the source calendar.  This isn't a problem if all your calendars are in the same timezone.  If you set a timezone for the server, events in other timezones are shown when they occur at the server's time.
! */
! #     'timezone'             => 'US/Central',
! #     'second_offset'        => $secs,
! 
! /*     ** Appearance **      
! In this section you can set how phpicalendar will display calendar views.
! 
! phpicalendar currently supports about 30 language variants.  For a list of supported languages, see the languages folder.
! 
! 
! */
! 
! #     'language'             => 'Spanish',
! #     'default_cal'          => 'US Holidays',	   // Exact filename of calendar without .ics. Or set to 'ALL_CALENDARS_COMBINED to open all calenders combined into one.
! #     'template'             => 'green';           // Template support: change this to have a different "skin" for your installation.     
! #     'default_view'         => 'month',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
! #     'gridLength'           => 10,                // Grid size in day and week views. Allowed values are 1,2,3,4,10,12,15,20,30,60. Default is 15
! #     'minical_view'         => 'current',	       // Where do the mini-calendars go when clicked?'     => 'day', 'week', 'month', 'current'
! #     'allow_preferences'    => 'no', 
! #     'show_search'          => 'yes',
! #     'show_todos'           => 'no',
! #     'show_completed'       => 'no',
! #     'allow_admin'          => 'yes', 
!      'week_start_day'       => 'Monday',          // Day of the week your week starts on
!      'week_length'          => '5',	           // Number of days to display in the week view
! #     'day_start'            => '0600',	           // Start time for day grid
! #     'day_end'              => '2000',	           // End time for day grid
  );
  
! /*     ========= SPECIAL CALENDARS =========
! 
! */
! $blacklisted_cals[] = '';                          // Fill in between the quotes the name of the calendars 
! $blacklisted_cals[] = '';                          // you wish to 'blacklist' or that you don't want to show up in your calendar
! $blacklisted_cals[] = '';                          // list. This should be the exact calendar filename without .ics
! $blacklisted_cals[] = '';                          // the parser will *not* parse any cal that is in this list (it will not be Web accessible)
  // add more lines as necessary
  
! $list_webcals[] = '';                              // Fill in between the quotes exact URL of a calendar that you wish
! $list_webcals[] = '';                              // to show up in your calendar list. You must prefix the URL with http://
! $list_webcals[] = '';                              // or webcal:// and the filename should contain the .ics suffix
! $list_webcals[] = '';                              // $allow_webcals does *not* need to be "yes" for these to show up and work
  // add more lines as necessary
  
! #$more_webcals['cpath'][] = ''                     //add webcals that will show up only for a particular cpath.
  
! $locked_cals[] = '';                               // Fill in-between the quotes the names of the calendars you wish to hide
! $locked_cals[] = '';                               // unless unlocked by a username/password login. This should be the
! $locked_cals[] = '';                               // exact calendar filename without the .ics suffix.
! $locked_cals[] = '';                               //
  // add more lines as necessary
  
! $locked_map['user1:pass'] = array('');             // Map username:password accounts to locked calendars that should be
! $locked_map['user2:pass'] = array('');             // unlocked if logged in. Calendar names should be the same as what is
! $locked_map['user3:pass'] = array('');             // listed in the $locked_cals, again without the .ics suffix.
! $locked_map['user4:pass'] = array('');             // Example: $locked_map['username:password'] = array('Locked1', 'Locked2');
  // add more lines as necessary
  
! $apache_map['user1'] = array('');                  // Map HTTP authenticated users to specific calendars. Users listed here and
! $apache_map['user2'] = array('');                  // authenticated via HTTP will not see the public calendars, and will not be
! $apache_map['user3'] = array('');                  // given any login/logout options. Calendar names not include the .ics suffix.
! $apache_map['user4'] = array('');                  // Example: $apache_map['username'] = array('Calendar1', 'Calendar2');

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** default_config.php	27 Dec 2008 10:58:50 -0000	1.5
--- default_config.php	27 Dec 2008 23:18:07 -0000	1.6
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.2';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.3';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
***************
*** 42,46 ****
  		$this->rss_link_to_event		= '';				// Set to yes to have links in the feed popup an event window.  Default is to link to day.php
  		$this->show_search				= 'no';			// Show the search box in the sidebar.
! 		$this->allow_preferences		= 'no';			// Allow visitors to change various preferences via cookies.
  		$this->printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $this->default_view (listed well above).
  		$this->show_todos				= 'yes';			// Show your todo list on the side of day and week view.
--- 42,46 ----
  		$this->rss_link_to_event		= '';				// Set to yes to have links in the feed popup an event window.  Default is to link to day.php
  		$this->show_search				= 'no';			// Show the search box in the sidebar.
! 		$this->allow_preferences		= 'yes';			// Allow visitors to change various preferences via cookies.
  		$this->printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $this->default_view (listed well above).
  		$this->show_todos				= 'yes';			// Show your todo list on the side of day and week view.

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** preferences.php	24 Dec 2008 21:09:31 -0000	1.65
--- preferences.php	27 Dec 2008 23:18:07 -0000	1.66
***************
*** 32,36 ****
  	$cookie_endtime		= $_POST['cookie_endtime'];
  	$cookie_unset		= @$_POST['unset'];
! 	$the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time","cookie_endtime" => "$cookie_endtime", "cookie_cpath"=>"$cookie_cpath");
  	$the_cookie 		= serialize($the_cookie);
  	if ($cookie_unset) { 
--- 32,36 ----
  	$cookie_endtime		= $_POST['cookie_endtime'];
  	$cookie_unset		= @$_POST['unset'];
! 	$the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time","cookie_endtime" => "$cookie_endtime", "cookie_cpath"=>"$cookie_cpath", "cookie_timezone"=>"$cookie_timezone");
  	$the_cookie 		= serialize($the_cookie);
  	if ($cookie_unset) { 
***************
*** 59,62 ****
--- 59,63 ----
  	$cookie_time		= $phpicalendar['cookie_time'];
  	$cookie_endtime		= $phpicalendar['cookie_endtime'];
+ 	$cookie_endtime		= $phpicalendar['cookie_timezone'];
  	if ($cookie_unset) { 
  		unset ($cookie_language, $cookie_calendar, $cookie_view, $cookie_style,$cookie_startday);
***************
*** 73,76 ****
--- 74,78 ----
  	$cookie_time = $phpiCal_config->day_start;
  	$cookie_endtime = $phpiCal_config->day_end;
+ 	$cookie_timezone = $phpiCal_config->timezone;
  }
  
***************
*** 180,183 ****
--- 182,186 ----
  	'event_js' 			=> '',
  	'language_select' 	=> $language_select,
+ 	'timezone_select' 	=> $timezone_select,
  	'calendar_select' 	=> $calendar_select,
  	'view_select' 		=> $view_select,
***************
*** 194,197 ****
--- 197,201 ----
  	'l_select_view'		=> $lang['l_select_view'],
  	'l_select_time'		=> $lang['l_select_time'],
+ 	'l_select_timezone'	=> $lang['l_select_timezone'],
  	'l_select_endtime'	=> $lang['l_select_endtime'],
  	'l_select_day'		=> $lang['l_select_day'],

[PHPiCalendar-Commits] phpicalendar/templates/default preferences.tpl, 1.13, 1.14

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

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

Modified Files:
	preferences.tpl 
Log Message:
new rss icons;allow subweek calendars

Index: preferences.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/preferences.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** preferences.tpl	24 Dec 2008 21:09:31 -0000	1.13
--- preferences.tpl	27 Dec 2008 23:18:07 -0000	1.14
***************
*** 44,47 ****
--- 44,52 ----
  						</tr>
  						<tr align="left" valign="top">
+ 							<td width="80%" nowrap="nowrap">{L_SELECT_TIMEZONE}:</td>
+ 							<td width="10%"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td>
+ 							<td width="10%"><select name="cookie_timezone" class="query_style">{TIMEZONE_SELECT}</select></td>
+ 						</tr>
+ 						<tr align="left" valign="top">
  							<td nowrap="nowrap">{L_SELECT_CAL}:</td>
  							<td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td>

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.234, 1.235 template.php, 1.105, 1.106

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

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

Modified Files:
	ical_parser.php template.php 
Log Message:
new rss icons;allow subweek calendars

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.234
retrieving revision 1.235
diff -C2 -d -r1.234 -r1.235
*** ical_parser.php	27 Dec 2008 10:58:51 -0000	1.234
--- ical_parser.php	27 Dec 2008 23:18:07 -0000	1.235
***************
*** 12,16 ****
  if ($phpiCal_config->save_parsed_cals == 'yes') {	
  	if (sizeof ($cal_filelist) > 1) {
! 		$parsedcal = $tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
  		if (file_exists($parsedcal)) {
  			$fd = fopen($parsedcal, 'r');
--- 12,16 ----
  if ($phpiCal_config->save_parsed_cals == 'yes') {	
  	if (sizeof ($cal_filelist) > 1) {
! 		$parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
  		if (file_exists($parsedcal)) {
  			$fd = fopen($parsedcal, 'r');
***************
*** 52,56 ****
  		foreach ($cal_filelist as $filename) {
  			$realcal_mtime = filemtime($filename);
! 			$parsedcal = $tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
  			if (file_exists($parsedcal)) {
  				$parsedcal_mtime = filemtime($parsedcal);
--- 52,56 ----
  		foreach ($cal_filelist as $filename) {
  			$realcal_mtime = filemtime($filename);
! 			$parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
  			if (file_exists($parsedcal)) {
  				$parsedcal_mtime = filemtime($parsedcal);

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** template.php	27 Dec 2008 11:42:41 -0000	1.105
--- template.php	27 Dec 2008 23:18:07 -0000	1.106
***************
*** 270,274 ****
  			$thisdate = ($thisdate + (25 * 60 * 60));
  		}
! 
  		// Replaces the allday events
  		preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1);
--- 270,274 ----
  			$thisdate = ($thisdate + (25 * 60 * 60));
  		}
! 		#echo "<pre>";print_r($nbrGridCols);
  		// Replaces the allday events
  		preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1);
***************
*** 511,515 ****
  		$start_wt		 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
  		$start_day 			= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
! 		for ($i=0; $i<7; $i++) {
  			$day_num 		= date("w", $start_day);
  			$daylink		= date('Ymd', $start_wt);
--- 511,515 ----
  		$start_wt		 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
  		$start_day 			= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
! 		for ($i=0; $i<$phpiCal_config->week_length; $i++) {
  			$day_num 		= date("w", $start_day);
  			$daylink		= date('Ymd', $start_wt);
***************
*** 884,888 ****
  		$weekday_loop = '';
  		$middle = '';
! 		for ($i=0; $i<7; $i++) {
  			$day_num 		= date("w", $start_day);
  			$weekday 		= $langtype[$day_num];
--- 884,888 ----
  		$weekday_loop = '';
  		$middle = '';
! 		for ($i=0; $i< $phpiCal_config->week_length; $i++) {
  			$day_num 		= date("w", $start_day);
  			$weekday 		= $langtype[$day_num];
***************
*** 911,915 ****
  				$temp = $t_month[2];
  			}
! 			if (isset($master_array[$daylink])) {
  				if ($type != 'small') {
  					foreach ($master_array[$daylink] as $cal_time => $event_times) {
--- 911,915 ----
  				$temp = $t_month[2];
  			}
! 			if (isset($master_array[$daylink]) && $i <= $phpiCal_config->week_length) {
  				if ($type != 'small') {
  					foreach ($master_array[$daylink] as $cal_time => $event_times) {
***************
*** 954,958 ****
  			
  			$start_day = strtotime("+1 day", $start_day); 
! 			if ($i == 7) { 
  				$i = 0;
  				$middle .= $endweek;
--- 954,961 ----
  			
  			$start_day = strtotime("+1 day", $start_day); 
! 			if ($i == $phpiCal_config->week_length) { 
! 				if ($phpiCal_config->week_length != 7) {
! 					$start_day = strtotime("+".(7-$phpiCal_config->week_length)." day", $start_day);
! 				}
  				$i = 0;
  				$middle .= $endweek;

[PHPiCalendar-Commits] phpicalendar/rss feed.png, NONE, 1.1 index.php, 1.45, 1.46

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

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

Modified Files:
	index.php 
Added Files:
	feed.png 
Log Message:
new rss icons;allow subweek calendars

--- NEW FILE: feed.png ---
(This appears to be a binary file; contents omitted.)

Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** index.php	20 Dec 2008 03:22:54 -0000	1.45
--- index.php	27 Dec 2008 23:18:07 -0000	1.46
***************
*** 23,27 ****
  
  $rss_list = "<table>\n";
! $xml_icon ="<img src = 'xml.gif' alt='xml'>";
  
  $filelist = availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
--- 23,27 ----
  
  $rss_list = "<table>\n";
! $xml_icon ="<img src = 'feed.png' alt='rss icon'>";
  
  $filelist = availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);

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

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

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

Removed Files:
	rss_index.tpl 
Log Message:
new rss icons;allow subweek calendars

--- rss_index.tpl DELETED ---

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

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

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

Removed Files:
	rss_index.tpl 
Log Message:
new rss icons;allow subweek calendars

--- rss_index.tpl DELETED ---

[PHPiCalendar-Commits] phpicalendar/languages english.inc.php, 1.67, 1.68

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

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

Modified Files:
	english.inc.php 
Log Message:
new rss icons;allow subweek calendars

Index: english.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** english.inc.php	26 Dec 2008 16:59:10 -0000	1.67
--- english.inc.php	27 Dec 2008 23:18:07 -0000	1.68
***************
*** 70,73 ****
--- 70,74 ----
  $lang['l_select_view']		= 'Select your default view';
  $lang['l_select_time']		= 'Select your default start time';
+ $lang['l_select_timezone']	= 'Select your default timezone';
  $lang['l_select_endtime']	= 'Select your default end time';
  $lang['l_select_day']		= 'Select your default start day of week';

[PHPiCalendar-Commits] phpicalendar/functions template.php, 1.104, 1.105

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

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

Modified Files:
	template.php 
Log Message:
do not check overlap on all day events -- yet

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** template.php	27 Dec 2008 10:58:51 -0000	1.104
--- template.php	27 Dec 2008 11:42:41 -0000	1.105
***************
*** 915,918 ****
--- 915,919 ----
  					foreach ($master_array[$daylink] as $cal_time => $event_times) {
  						foreach ($event_times as $uid => $val) {
+ 							if (!isset($val['calnumber'])) continue;
  							$event_calno 	= $val['calnumber'];
  							$event_calno	= (($event_calno - 1) % $unique_colors) + 1;

[PHPiCalendar-Commits] phpicalendar/calendars test.ics,1.8,1.9

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

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

Modified Files:
	test.ics 
Log Message:
do not check overlap on all day events -- yet

Index: test.ics
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test.ics	27 Dec 2008 10:58:50 -0000	1.8
--- test.ics	27 Dec 2008 11:42:41 -0000	1.9
***************
*** 44,49 ****
  SUMMARY:Witchcraft EST
  CATEGORIES:jdr
! DTSTART;TZID=US/Eastern:20081211T100000
! DTEND;TZID=US/Eastern:20081211T130000
  CLASS:PUBLIC
  SEQUENCE:1
--- 44,49 ----
  SUMMARY:Witchcraft EST
  CATEGORIES:jdr
! DTSTART;TZID=US/Eastern:20081211T160000
! DTEND;TZID=US/Eastern:20081212T03000
  CLASS:PUBLIC
  SEQUENCE:1
***************
*** 68,76 ****
  SEQUENCE:7
  DTSTAMP:20020918T224617Z
! SUMMARY:Daily for 10 occurrences
  STATUS:CONFIRMED
! DURATION:PT1H30M
! DTSTART;TZID=US/Eastern:20100902T090000
! RRULE:FREQ=DAILY;COUNT=10
  URL:http://google.com
  END:VEVENT
--- 68,75 ----
  SEQUENCE:7
  DTSTAMP:20020918T224617Z
! SUMMARY:5 days
  STATUS:CONFIRMED
! DURATION:P4DT48H
! DTSTART;TZID=US/Eastern:20081212
  URL:http://google.com
  END:VEVENT

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.187,1.188

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

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

Modified Files:
	config.inc.php 
Log Message:
do not check overlap on all day events -- yet

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.187
retrieving revision 1.188
diff -C2 -d -r1.187 -r1.188
*** config.inc.php	27 Dec 2008 10:58:50 -0000	1.187
--- config.inc.php	27 Dec 2008 11:42:41 -0000	1.188
***************
*** 15,19 ****
  #	'show_todos'	=> 'no',
  	'show_completed'	=> 'no',
! #	'timezone'	=> 'US/Central',
  #	'timezone'	=> 'America/Bogota',
  #	'timezone'	=> 'Europe/Paris',
--- 15,19 ----
  #	'show_todos'	=> 'no',
  	'show_completed'	=> 'no',
! 	'timezone'	=> 'US/Central',
  #	'timezone'	=> 'America/Bogota',
  #	'timezone'	=> 'Europe/Paris',

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

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

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

Modified Files:
	end_vevent.php 
Log Message:
do not check overlap on all day events -- yet

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** end_vevent.php	27 Dec 2008 10:58:51 -0000	1.18
--- end_vevent.php	27 Dec 2008 11:42:41 -0000	1.19
***************
*** 321,325 ****
  			if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400';
  		}
! 		if($this_date_tmp == $end_date_tmp && $end_time == '0000') continue;
  		$master_array[$this_date_tmp][$time_key][$uid] = array (
  			'event_start' => $start_time,                	# hhmm
--- 321,325 ----
  			if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400';
  		}
! 		if($this_date_tmp == $end_date_tmp && ($end_time == '0000' ||$time_key == -1)) continue;
  		$master_array[$this_date_tmp][$time_key][$uid] = array (
  			'event_start' => $start_time,                	# hhmm
***************
*** 343,347 ****
  			'recur' => $recur
  			);
! 		checkOverlap($this_date_tmp, $time_key, $uid);
  	}
  } # end foreach recur_data 
--- 343,347 ----
  			'recur' => $recur
  			);
! 		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
  	}
  } # end foreach recur_data 

[PHPiCalendar-Commits] phpicalendar/calendars test.ics,1.7,1.8

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

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

Modified Files:
	test.ics 
Log Message:
rewrite and condense master array writing in end_vevent.php. Condense draw_week in template.php.  bump vers

Index: test.ics
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test.ics	26 Dec 2008 16:59:10 -0000	1.7
--- test.ics	27 Dec 2008 10:58:50 -0000	1.8
***************
*** 31,36 ****
  SUMMARY:Witchcraft Paris
  CATEGORIES:jdr
! DTSTART;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081213T210000
! DTEND;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081213T230000
  CLASS:PUBLIC
  SEQUENCE:1
--- 31,36 ----
  SUMMARY:Witchcraft Paris
  CATEGORIES:jdr
! DTSTART;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081212T210500
! DTEND;TZID=/softwarestudio.org/Tzfile/Europe/Paris:20081213T030000
  CLASS:PUBLIC
  SEQUENCE:1
***************
*** 42,63 ****
  DTSTAMP:20081128T075151Z
  LAST-MODIFIED:20081128T075152
! SUMMARY:Witchcraft PST
! CATEGORIES:jdr
! DTSTART;TZID=US/Pacific:20081213T210000
! DTEND;TZID=US/Pacific:20081213T230000
! CLASS:PUBLIC
! SEQUENCE:1
! CREATED:20081128T075152
! END:VEVENT
! 
! BEGIN:VEVENT
! UID:20081128T075152Z-3660-100-1-7@sietchtabr2
! DTSTAMP:20081128T075151Z
! LAST-MODIFIED:20081128T075152
! SUMMARY:daylight test PST
  CATEGORIES:jdr
! DTSTART;TZID=US/Pacific:20060331T010000
! DTEND;TZID=US/Pacific:20060331T020000
! RRULE:FREQ=DAILY;
  CLASS:PUBLIC
  SEQUENCE:1
--- 42,49 ----
  DTSTAMP:20081128T075151Z
  LAST-MODIFIED:20081128T075152
! SUMMARY:Witchcraft EST
  CATEGORIES:jdr
! DTSTART;TZID=US/Eastern:20081211T100000
! DTEND;TZID=US/Eastern:20081211T130000
  CLASS:PUBLIC
  SEQUENCE:1
***************
*** 90,108 ****
  END:VEVENT
  
- BEGIN:VEVENT
- DTSTAMP:20070306T130934Z
- ORGANIZER;CN=xxx:MAILTO:xxx localhost localdomain
- CREATED:20070212T152028Z
- UID:KOrganizer-1162820691.683
- SEQUENCE:2
- LAST-MODIFIED:20070306T130835Z
- SUMMARY:Knitting Class
- CLASS:PUBLIC
- PRIORITY:5
- RRULE:FREQ=WEEKLY;UNTIL=20070326T190000Z;BYDAY=MO
- DTSTART:20070219T190000Z
- DTEND:20070219T210000Z
- TRANSP:OPAQUE
- END:VEVENT
- 
  END:VCALENDAR
--- 76,78 ----

[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.17, 1.18 overlapping_events.php, 1.2, 1.3 recur_functions.php, 1.14, 1.15

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

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

Modified Files:
	end_vevent.php overlapping_events.php recur_functions.php 
Log Message:
rewrite and condense master array writing in end_vevent.php. Condense draw_week in template.php.  bump vers

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** end_vevent.php	26 Dec 2008 22:33:33 -0000	1.17
--- end_vevent.php	27 Dec 2008 10:58:51 -0000	1.18
***************
*** 14,24 ****
  if (!isset($start_date)) $start_date = "19700101";
  
- // Handle DURATION
- if (!isset($end_unixtime)) {
- 	if(!isset($the_duration)) $the_duration = 0;
- 	$end_unixtime 	= $start_unixtime + $the_duration;
- 	$end_time 	= date ('Hi', $end_unixtime);
- }
- 	
  // CLASS support
  if (isset($class)) {
--- 14,17 ----
***************
*** 30,34 ****
  		$description ='**CONFIDENTIAL**';
  	}
! }	 
  
  // make sure we have some value for $uid
--- 23,27 ----
  		$description ='**CONFIDENTIAL**';
  	}
! }
  
  // make sure we have some value for $uid
***************
*** 45,66 ****
  $uid_list[] = $uid;
  
  # adjust event start and end times
  if (isset($start_time) && isset($end_time)) {
  	// Mozilla style all-day events or just really long events
! 	if (($end_time - $start_time) > 2345) {
  		$allday_start = $start_date;
  		$allday_end = ($start_date + 1);
  	}
  }
- # disallow events with negative length
- if ($end_unixtime < $start_unixtime){
- 	$end_date = $start_date;
- 	$end_time = $start_time;
- 	$end_unixtime = $start_unixtime;
- }
  # look for events that span more than one day
! if (isset($start_unixtime,$end_unixtime) && date('Ymd',$start_unixtime) != date('Ymd',$end_unixtime)) {
  	$spans_day = true;
! 	$bleed_check = (($start_unixtime - $end_unixtime) < (60*60*24)) ? '-1' : '0';
  } else {
  	$spans_day = false;
--- 38,60 ----
  $uid_list[] = $uid;
  
+ # Handle DURATION
+ if (!isset($end_unixtime)) {
+ 	if(!isset($the_duration)) $the_duration = 0;
+ 	$end_unixtime 	= $start_unixtime + $the_duration;
+ 	$end_time 	= date ('Hi', $end_unixtime);
+ }
+ # at this point $end_unixtime should be set
  # adjust event start and end times
  if (isset($start_time) && isset($end_time)) {
  	// Mozilla style all-day events or just really long events
! 	if (($end_unixtime - $start_unixtime) > 24*60*60) {
  		$allday_start = $start_date;
  		$allday_end = ($start_date + 1);
  	}
  }
  # look for events that span more than one day
! if (isset($start_unixtime,$end_unixtime) && date('Ymd',$start_unixtime) < date('Ymd',$end_unixtime)) {
  	$spans_day = true;
! 	$bleed_check = (($start_unixtime - $end_unixtime) <= (60*60*24)) ? '-1' : '0';
  } else {
  	$spans_day = false;
***************
*** 68,86 ****
  }
  
! # get hour and minute adjusted to allowed grid times
! if (isset($start_time) && $start_time != '') {
! 	preg_match ('/([0-9]{2})([0-9]{2})/', $start_time, $time);
! 	preg_match ('/([0-9]{2})([0-9]{2})/', $end_time, $time2);
! 	if (isset($start_unixtime) && isset($end_unixtime)) {
! 		$length = $end_unixtime - $start_unixtime; 
! 	} else {
! 		$length = ($time2[1]*60+$time2[2]) - ($time[1]*60+$time[2]); 
! 	}
! 	
! 	$drawKey = drawEventTimes($start_time, $end_time);
! 	preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3);
! 	$hour = $time3[1];
! 	$minute = $time3[2];
  }
  
  // RECURRENCE-ID Support
--- 62,79 ----
  }
  
! $length = $end_unixtime - $start_unixtime;
! if ($length < 0){ 
! 	$length = 0;
! 	$end_time = $start_time;
  }
+ # get hour and minute adjusted to allowed grid times
+ $drawKey = drawEventTimes($start_time, $end_time);
+ preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3);
+ preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_end'], $time4);
+ $hour = $time3[1];
+ $minute = $time3[2];
+ $end_hour = $time4[1];
+ $end_minute = $time4[2];
+ 
  
  // RECURRENCE-ID Support
***************
*** 90,103 ****
  }
  
- 
- # treat nonrepeating events as rrule events with one instance
- if (!isset($rrule_array) && $start_unixtime < $mArray_end && $end_unixtime > $mArray_begin){
- 	$rrule_array['FREQ'] = 'YEARLY';
- 	$rrule_array['START_DATE'] = $start_date;
- 	$rrule_array['UNTIL'] = $start_date;
- #	$rrule_array['END'] = 'end';
- }
- 
- 
  if (isset($allday_start) && $allday_start != '') {
  	$hour = '-';
--- 83,86 ----
***************
*** 141,147 ****
  			break;
  		case 'UNTIL':
- 			#$until = str_replace('T', '', $val); 
- 			#$until = str_replace('Z', '', $until);
- 			#if (strlen($until) == 8) $until = $until.'235959';
  			# UNTIL must be in UTC
  			$until = date("YmdHis",strtotime($val));
--- 124,127 ----
***************
*** 198,201 ****
--- 178,183 ----
  	}
  }
+ if($current_view == 'search') $freq_type = 'none'; 
+ 
  # $recur is the recurrence info that goes into the master array for this VEVENT
  $recur = @$recur_array[($start_date)][($hour.$minute)][$uid]['recur']; 
***************
*** 224,245 ****
  $next_range_unixtime = $start_date_unixtime;
  
! #conditions where we can not iterate over the whole range
! if($count == 1000000){
! 	if($interval == 1) {
! 		$next_range_unixtime = $mArray_begin;
! 	}else{
! 		# can we calculate the right start time?
! 		# pick the right compare function from date_functions.php
! 		# $diff is the number of occurrences between start_date and next_range_time
! 	#	$func = $freq_type.'Compare';
! 	#	$diff = $func(date('Ymd',strtotime($getdate)), $start_date);	
! 	#	$next_range_unixtime = strtotime('+'.$diff*$interval.' '.$freq_type, $start_date_unixtime); echo "<pre>$summary\nnext $freq_type $diff $freq_type".date("Ymd",$start_date_unixtime)."\n";
! 	}
! }
! // if the beginning of our range is less than the start of the item, we may as well set it equal to it
  if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime;
  
  if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime;
  
  switch ($freq_type){
  	case 'week':
--- 206,220 ----
  $next_range_unixtime = $start_date_unixtime;
  
! # conditions where we don't need to iterate over the whole range
! # if repeating without limit, and steps are by 1, don't go back before the mArray beginning.
! if($count == 1000000 && $interval == 1 && $mArray_begin > $next_range_unixtime) $next_range_unixtime = $mArray_begin;
! 
! # if the beginning of our range is less than the start of the item, we may as well set the range to start at start_time
  if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime;
  
+ # stop at the until limit if set
  if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime;
  
+ # more adjustments
  switch ($freq_type){
  	case 'week':
***************
*** 251,254 ****
--- 226,231 ----
  		break;
  }
+ 
+ #nonrepeating events can stop at the first instance
  if(!isset($rrule_array['FREQ']) && isset($end_date)){ 
  	$end_range_unixtime = strtotime($end_date);
***************
*** 263,267 ****
  #echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tnext_range_unixtime:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."\n";
  $recur_data = array();
- if($current_view == 'search') $freq_type = 'none'; 
  while ($next_range_unixtime <= $end_range_unixtime && $count > 0) {
  	$year = date("Y", $next_range_unixtime); 
--- 240,243 ----
***************
*** 299,304 ****
  sort($recur_data);
  
! /* ============================ Use $recur_data array to write the master array ============================*/
! // This used to use 5 different blocks to write the array... can it be reduced further?						
  $recur_data_hour = @substr($start_time,0,2);
  $recur_data_minute = @substr($start_time,2,2);
--- 275,289 ----
  sort($recur_data);
  
! /* ============================ Use $recur_data array to write the master array ============================
! // This used to use 5 different blocks to write the array... can it be reduced further?
! 
! For each recurrence date, an event may still cross day boundaries.  So we need to loop from the start_date for that recurrence to the end of that recurrence.
! To generate $recur_data we mostly only paid attention to start times.
! 
! Now, a single event must be split into multiple master array values for each day on which it occurs
! 
! $hour and $minute are the values from the start_time, rounded to the nearest grid time.
! 
! */
  $recur_data_hour = @substr($start_time,0,2);
  $recur_data_minute = @substr($start_time,2,2);
***************
*** 308,419 ****
  }
  foreach($recur_data as $recur_data_unixtime) {
! 	$recur_data_year = date('Y', $recur_data_unixtime);
! 	$recur_data_month = date('m', $recur_data_unixtime);
! 	$recur_data_day = date('d', $recur_data_unixtime);
! 	$recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day;
! 
! 	/* 	at this point the recur data year, month, day, hour, and minute are in the default timezone for the phpicalendar installation, if that is set.  We need to compare whether both the event timezone and the the phpicaledar timezone are in the same state wrt std vs daylight time. */
  
! 	if (isset($allday_start) && $allday_start != '') {
! 		$start_time2 = $recur_data_unixtime;
! 		$end_time2 = strtotime('+'.$diff_allday_days.' days', $recur_data_unixtime);
! 		while ($start_time2 < $end_time2) {
! 			$start_date2 = date('Ymd', $start_time2);
! 			$master_array[($start_date2)][('-1')][$uid] = array (
! 				'event_text' => $summary, 
! 				'description' => $description, 
! 				'location' => $location, 
! 				'organizer' => serialize($organizer), 
! 				'attendee' => serialize($attendee), 
! 				'calnumber' => $calnumber, 
! 				'calname' => $actual_calname, 
! 				'url' => $url, 
! 				'status' => $status, 
! 				'class' => $class, 
! 				'recur' => $recur );
! 			$start_time2 = strtotime('+1 day', $start_time2);
! 		}
! 	} else {
! 		$start_unixtime_tmp = mktime($recur_data_hour,$recur_data_minute,0,$recur_data_month,$recur_data_day,$recur_data_year);
! 		$end_unixtime_tmp = $start_unixtime_tmp + $length;
! 		if (($end_time >= $phpiCal_config->bleed_time) && ($bleed_check == '-1')) {
! 			$start_tmp = strtotime(date('Ymd',$start_unixtime_tmp));
! 			$end_date_tmp = date('Ymd',$end_unixtime_tmp);
! 			while ($start_tmp < $end_unixtime_tmp) {
! 				$start_date_tmp = date('Ymd',$start_tmp);
! 				if ($start_date_tmp == $recur_data_year.$recur_data_month.$recur_data_day) {
! 					$time_tmp = $hour.$minute;
! 					$start_time_tmp = $start_time;
! 				} else {
! 					$time_tmp = '0000';
! 					$start_time_tmp = '0000';
! 				}
! 				if ($start_date_tmp == $end_date_tmp) {
! 					$end_time_tmp = $end_time;
! 				} else {
! 					$end_time_tmp = '2400';
! 					$display_end_tmp = $end_time;
! 				}
! 				$master_array[$start_date_tmp][$time_tmp][$uid] = array (
! 					'event_start' => $start_time_tmp, 
! 					'event_end' => $end_time_tmp, 
! 					'start_unixtime' => $start_unixtime_tmp, 
! 					'end_unixtime' => $end_unixtime_tmp, 
! 					'event_text' => $summary, #
! 					'event_length' => $length, 
! 					'event_overlap' => 0, 
! 					'description' => $description, 
! 					'status' => $status, 
! 					'class' => $class, 
! 					'spans_day' => true, 
! 					'location' => $location, 
! 					'organizer' => serialize($organizer), 
! 					'attendee' => serialize($attendee), 
! 					'calnumber' => $calnumber, 
! 					'calname' => $actual_calname, 
! 					'url' => $url, 
! 					'recur' => $recur);
! 				if (isset($display_end_tmp)){
! 					$master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp;
! 				}
! 				checkOverlap($start_date_tmp, $time_tmp, $uid);
! 				$start_tmp = strtotime('+1 day',$start_tmp);
! 			}
! 		} else {
! 			if ($bleed_check == '-1') {
! 				$display_end_tmp = $end_time;
! 				$end_time_tmp1 = '2400';
! 					
! 			}
! 			if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time;
! 				$master_array[($recur_data_date)][($hour.$minute)][$uid] = array (
! 				'event_start' => $start_time, 
! 				'event_end' => $end_time_tmp1, 
! 				'start_unixtime' => $start_unixtime_tmp, 
! 				'end_unixtime' => $end_unixtime_tmp, 
! 				'event_text' => $summary, 
! 				'event_length' => $length, 
! 				'event_overlap' => 0, 
! 				'description' => $description, 
! 				'status' => $status, 
! 				'class' => $class, 
! 				'spans_day' => false, 
! 				'location' => $location, 
! 				'organizer' => serialize($organizer), 
! 				'attendee' => serialize($attendee), 
! 				'calnumber' => $calnumber, 
! 				'calname' => $actual_calname, 
! 				'url' => $url, 
! 				'recur' => $recur);
! 			if (isset($display_end_tmp)){
! 				$master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp;
! 			}
! 			checkOverlap($recur_data_date, ($hour.$minute), $uid);
! 			
  		}
  	}
! 
! }
! 
  unset($recur_data);
  
--- 293,349 ----
  }
  foreach($recur_data as $recur_data_unixtime) {
! 	$recur_data_year 	= date('Y', $recur_data_unixtime);
! 	$recur_data_month 	= date('m', $recur_data_unixtime);
! 	$recur_data_day 	= date('d', $recur_data_unixtime);
! 	$recur_data_date 	= $recur_data_year.$recur_data_month.$recur_data_day;
! 	
! 	# initialize the loop range	to the recur date + grid time
! 	$next_range_unixtime = mktime($recur_data_hour,$recur_data_minute,0,$recur_data_month,$recur_data_day,$recur_data_year);
! 	$end_range_unixtime = $next_range_unixtime + $length;
! 	$end_date_tmp = date("Ymd",$end_range_unixtime);
! 	#echo "<pre>$summary ".date("Ymd H:i:s",$next_range_unixtime)." ".date("Ymd H:i:s",$end_range_unixtime)."\n";
  
! 	# default the time_key to -1 for allday events, overwrite as needed
! 	$time_key = -1;
! 	
! 	$start_unixtime_tmp = strtotime($recur_data_date.$start_time);
! 	$end_unixtime_tmp = strtotime($end_date_tmp.$end_time);
! 	while (date("Ymd", $next_range_unixtime) <= $end_date_tmp) {
! 		$this_date_tmp = date('Ymd',$next_range_unixtime);	
! 		$next_range_unixtime = strtotime('+1 day',$next_range_unixtime);
! 		
! 		if (!isset($allday_start) || $allday_start == '') $time_key = $hour.$minute;
! 		$display_end_tmp = $end_hour.$end_minute;
! 		if($time_key > -1){
! 			# the day is not the first day of the recurrence
! 			if ($this_date_tmp > $recur_data_date) $time_key = '0000';
! 			# the day is not the last day of the recurrence
! 			if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400';
  		}
+ 		if($this_date_tmp == $end_date_tmp && $end_time == '0000') continue;
+ 		$master_array[$this_date_tmp][$time_key][$uid] = array (
+ 			'event_start' => $start_time,                	# hhmm
+ 			'event_end' => $end_time,                    	# hhmm
+ 			'display_end' => $display_end_tmp,            	# hhmm display_start is $time_key
+ 			'start_unixtime' => $start_unixtime_tmp,      	# start unixtime for this recurrence
+ 			'end_unixtime' => $end_unixtime_tmp,          	# end unixtime for this recurrence
+ 			'event_text' => $summary,                    	#
+ 			'event_length' => $length,                    	# length in seconds
+ 			'event_overlap' => 0,                        	# checkOverlap modifies this
+ 			'description' => $description, 
+ 			'status' => $status, 
+ 			'class' => $class, 
+ 			'spans_day' => $spans_day, 
+ 			'location' => $location, 
+ 			'organizer' => serialize($organizer), 
+ 			'attendee' => serialize($attendee), 
+ 			'calnumber' => $calnumber, 
+ 			'calname' => $actual_calname, 
+ 			'url' => $url, 
+ 			'recur' => $recur
+ 			);
+ 		checkOverlap($this_date_tmp, $time_key, $uid);
  	}
! } # end foreach recur_data 
  unset($recur_data);
  

Index: overlapping_events.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/overlapping_events.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** overlapping_events.php	15 Dec 2008 17:25:28 -0000	1.2
--- overlapping_events.php	27 Dec 2008 10:58:51 -0000	1.3
***************
*** 110,121 ****
  
  // Builds $overlap_array structure, and updates event_overlap in $master_array for the given events.
- function checkOverlap($event_date, $event_time, $uid) {
- 	global $master_array, $overlap_array;
- 	if (!isset($event_date)) return;
- 	$event = $master_array[$event_date][$event_time][$uid];
- 	// Copy out the array - we replace this at the end.
- 	$ol_day_array = @$overlap_array[$event_date];
- 	$drawTimes = drawEventTimes($event['event_start'], $event['event_end']);
- 
  	// For a given date,
  	// 	- check to see if the event's already in a block, and if so, add it.
--- 110,113 ----
***************
*** 141,146 ****
  	//		'start' - start_time for the overlap block.
  	//		'end'	- end_time for the overlap block.
! 
  	$ol_day_array = @$overlap_array[$event_date];
  	// Track if $event has been merged in, so we don't re-add the details to 'event' or 'overlapRanges' multiple times.
  	$already_merged_once = false;
--- 133,146 ----
  	//		'start' - start_time for the overlap block.
  	//		'end'	- end_time for the overlap block.
! function checkOverlap($event_date, $event_time, $uid) {
! 	global $master_array, $overlap_array;
! 	if (!isset($event_date)) return;
! 	$event = $master_array[$event_date][$event_time][$uid];
! 	// Copy out the array - we replace this at the end.
  	$ol_day_array = @$overlap_array[$event_date];
+ 	$draw_end = $event['event_end'];
+ 	if (isset($event['display_end'])) $draw_end = $event['display_end'];
+ 	$drawTimes = drawEventTimes($event['event_start'], $draw_end);
+ 
  	// Track if $event has been merged in, so we don't re-add the details to 'event' or 'overlapRanges' multiple times.
  	$already_merged_once = false;
***************
*** 181,185 ****
  				// Make sure we haven't already dealt with the event, and we're not checking against ourself.
  				if ($loop_event['event_overlap'] == 0 && $loop_event_key != $uid) {
! 					$loopDrawTimes = drawEventTimes($loop_event['event_start'], $loop_event['event_end']);
  					if ($loopDrawTimes['draw_start'] < $drawTimes['draw_end'] && $loopDrawTimes['draw_end'] > $drawTimes['draw_start']) {
  						if ($loopDrawTimes['draw_start'] < $drawTimes['draw_start']) {
--- 181,185 ----
  				// Make sure we haven't already dealt with the event, and we're not checking against ourself.
  				if ($loop_event['event_overlap'] == 0 && $loop_event_key != $uid) {
! 					$loopDrawTimes = drawEventTimes($loop_event['event_start'], $loop_event['display_end']);
  					if ($loopDrawTimes['draw_start'] < $drawTimes['draw_end'] && $loopDrawTimes['draw_end'] > $drawTimes['draw_start']) {
  						if ($loopDrawTimes['draw_start'] < $drawTimes['draw_start']) {

Index: recur_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** recur_functions.php	26 Dec 2008 19:32:41 -0000	1.14
--- recur_functions.php	27 Dec 2008 10:58:51 -0000	1.15
***************
*** 252,254 ****
  	foreach($times as $time) echo "\ndate:".date("Y-m-d H:i:s",$time);
  	echo "</pre>";
! }
--- 252,254 ----
  	foreach($times as $time) echo "\ndate:".date("Y-m-d H:i:s",$time);
  	echo "</pre>";
! }
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar/functions/init configs.php, 1.6, 1.7

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

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

Modified Files:
	configs.php 
Log Message:
rewrite and condense master array writing in end_vevent.php. Condense draw_week in template.php.  bump vers

Index: configs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/configs.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configs.php	24 Dec 2008 21:09:31 -0000	1.6
--- configs.php	27 Dec 2008 10:58:51 -0000	1.7
***************
*** 46,50 ****
  	$fill_min = $dTime[2];
  	$fill_min = sprintf('%02d', $fill_min + $phpiCal_config->gridLength);
! 	if ($fill_min == 60) {
  		$fill_h = sprintf('%02d', ($fill_h + 1));
  		$fill_min = '00';
--- 46,50 ----
  	$fill_min = $dTime[2];
  	$fill_min = sprintf('%02d', $fill_min + $phpiCal_config->gridLength);
! 	if ($fill_min >= 60) {
  		$fill_h = sprintf('%02d', ($fill_h + 1));
  		$fill_min = '00';

[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.186, 1.187 default_config.php, 1.4, 1.5 month.php, 1.148, 1.149

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

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

Modified Files:
	config.inc.php default_config.php month.php 
Log Message:
rewrite and condense master array writing in end_vevent.php. Condense draw_week in template.php.  bump vers

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.186
retrieving revision 1.187
diff -C2 -d -r1.186 -r1.187
*** config.inc.php	26 Dec 2008 16:59:10 -0000	1.186
--- config.inc.php	27 Dec 2008 10:58:50 -0000	1.187
***************
*** 17,21 ****
  #	'timezone'	=> 'US/Central',
  #	'timezone'	=> 'America/Bogota',
! 	'timezone'	=> 'Europe/Paris',
  #	'second_offset'	=> $secs,
  #	'cookie_uri'	=> '' 
--- 17,22 ----
  #	'timezone'	=> 'US/Central',
  #	'timezone'	=> 'America/Bogota',
! #	'timezone'	=> 'Europe/Paris',
! #	'gridLength' => 5,
  #	'second_offset'	=> $secs,
  #	'cookie_uri'	=> '' 

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** default_config.php	26 Dec 2008 22:52:36 -0000	1.4
--- default_config.php	27 Dec 2008 10:58:50 -0000	1.5
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.1';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.2';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//

Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** month.php	20 Dec 2008 03:22:54 -0000	1.148
--- month.php	27 Dec 2008 10:58:50 -0000	1.149
***************
*** 95,99 ****
  	'legend'	 		=> $list_calcolors,
  	'current_view'		=> $current_view,
! 	'style_select' 		=> $style_select,
  	'sidebar_date'		=> $sidebar_date,
  	'l_goprint'			=> $lang['l_goprint'],
--- 95,99 ----
  	'legend'	 		=> $list_calcolors,
  	'current_view'		=> $current_view,
! #	'style_select' 		=> $style_select,
  	'sidebar_date'		=> $sidebar_date,
  	'l_goprint'			=> $lang['l_goprint'],

[PHPiCalendar-Commits] phpicalendar/functions date_functions.php, 1.44, 1.45 ical_parser.php, 1.233, 1.234 template.php, 1.103, 1.104

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

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

Modified Files:
	date_functions.php ical_parser.php template.php 
Log Message:
rewrite and condense master array writing in end_vevent.php. Condense draw_week in template.php.  bump vers

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** date_functions.php	26 Dec 2008 22:33:33 -0000	1.44
--- date_functions.php	27 Dec 2008 10:58:51 -0000	1.45
***************
*** 167,170 ****
--- 167,171 ----
  function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
  	global $cpath, $master_array;
+ 	$return = '';
  	$event_text = stripslashes(urldecode($arr["event_text"]));
  	if (empty($start)) {
***************
*** 249,252 ****
--- 250,254 ----
  	// Pull out the date and time values. Minimum year is 1970.
  	preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})T{0,1}([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
+ 	if (!isset ($regs[1])) return;
  	if ($regs[1] < 1970) { 
  		$regs[1] = '1971';

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.233
retrieving revision 1.234
diff -C2 -d -r1.233 -r1.234
*** ical_parser.php	26 Dec 2008 22:33:33 -0000	1.233
--- ical_parser.php	27 Dec 2008 10:58:51 -0000	1.234
***************
*** 481,486 ****
  #print '<pre>';
  #var_dump($phpiCal_config);
! //print_r($master_array);
! //print_r($overlap_array);
  //print_r($day_array);
  //print_r($rrule_array);
--- 481,486 ----
  #print '<pre>';
  #var_dump($phpiCal_config);
! #print_r($master_array);
! #var_dump($overlap_array['20081211']);
  //print_r($day_array);
  //print_r($rrule_array);

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** template.php	26 Dec 2008 22:33:33 -0000	1.103
--- template.php	27 Dec 2008 10:58:51 -0000	1.104
***************
*** 251,255 ****
  		
  		// Figure out colspans and initialize weekarray
- 		$dayborder 	= 0;
  		$thisdate  	= $start_week_time;
  		$swt	   	= $start_week_time;
--- 251,254 ----
***************
*** 268,274 ****
  			}
  			$weekarray[$i] 		= $thisday;
  			$thisdate = ($thisdate + (25 * 60 * 60));
  		}
! 		#echo "<pre>";print_r($nbrGridCols);		
  		// Replaces the allday events
  		preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1);
--- 267,274 ----
  			}
  			$weekarray[$i] 		= $thisday;
+ 			$event_length[$thisday] = array ();
  			$thisdate = ($thisdate + (25 * 60 * 60));
  		}
! 
  		// Replaces the allday events
  		preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1);
***************
*** 302,326 ****
  		$loop_dof = trim($match1[1]);
  		$start_wt		 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
- 		$start_day 			= strtotime($phpiCal_config->week_start_day);
  		$weekday_loop = '';
  		for ($i=0; $i<$phpiCal_config->week_length; $i++) {
- 			$day_num 		= date("w", $start_day);
  			$daylink		= date('Ymd', $start_wt);
! 			if ($current_view == 'day') {
! 				$weekday 		= $daysofweek_lang[$day_num];
! 			} else {
! 				$weekday = localizeDate($dateFormat_week_list, strtotime($daylink));
! 			}	
! 			
  			if ($daylink == $getdate) {
  				$row1 = 'rowToday';
  				$row2 = 'rowOn';
  				$row3 = 'rowToday';
! 			} else {
  				$row1 = 'rowOff';
  				$row2 = 'rowOn';
  				$row3 = 'rowOff';
  			}
- 			$start_day 		= strtotime("+1 day", $start_day);
  			$start_wt 		= strtotime("+1 day", $start_wt);
  			$colspan		= 'colspan="'.$nbrGridCols[$daylink].'"';
--- 302,318 ----
  		$loop_dof = trim($match1[1]);
  		$start_wt		 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
  		$weekday_loop = '';
  		for ($i=0; $i<$phpiCal_config->week_length; $i++) {
  			$daylink		= date('Ymd', $start_wt);
! 			$weekday = localizeDate($dateFormat_week_list, strtotime($daylink));
  			if ($daylink == $getdate) {
  				$row1 = 'rowToday';
  				$row2 = 'rowOn';
  				$row3 = 'rowToday';
! 			}else{
  				$row1 = 'rowOff';
  				$row2 = 'rowOn';
  				$row3 = 'rowOff';
  			}
  			$start_wt 		= strtotime("+1 day", $start_wt);
  			$colspan		= 'colspan="'.$nbrGridCols[$daylink].'"';
***************
*** 345,354 ****
  		$this_year = $day_array2[1];
  		$thisdate = $swt;
! 		for ($i=0; $i < 7; $i++) {
! 			$thisday = date("Ymd", $thisdate);
! 			$event_length[$thisday] = array ();
! 			$thisdate = ($thisdate + (25 * 60 * 60));
! 		}
  		$weekdisplay = '';
  		foreach ($day_array as $key) {
  			$cal_time = $key;	
--- 337,344 ----
  		$this_year = $day_array2[1];
  		$thisdate = $swt;
! 
  		$weekdisplay = '';
+ 		
+ 		#day_array is an array of time blocks of length $phpiCal_config->gridLength
  		foreach ($day_array as $key) {
  			$cal_time = $key;	
***************
*** 372,426 ****
  				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>';
  			}
! 			
! 			// initialize $thisdate again
! 			$thisdate = $swt;
! 			
! 			// loop this part 7 times, one for each day
! 			for ($week_loop=0; $week_loop<$phpiCal_config->week_length; $week_loop++) {
! 				$thisday = date("Ymd", $thisdate);
! 				$dayborder = 0;
! 				unset($this_time_arr);
! 
  				if ($phpiCal_config->day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) {
  					foreach($master_array[$thisday] as $time_key => $time_arr) {
! 						if ((int)$time_key <= (int)$cal_time) {
! 							if (is_array($time_arr) && $time_key != '-1') {
! 								foreach($time_arr as $uid => $event_tmp) {
! 									if ((int)$event_tmp['event_end'] > (int)$cal_time) {
! 										$this_time_arr[$uid] = $event_tmp;
! 									}
! 								}
! 							}
! 						} else {
! 							break;
  						}
  					}
  				} else {
  					if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) {
! 						$this_time_arr = $master_array[$thisday][$cal_time];
  					}
  				}
- 				
- 				// check for eventstart 
- 				if (isset($this_time_arr) && sizeof($this_time_arr) > 0) {
- 					#print "<pre>";print_r ($this_time_arr);print "</pre>";
  
! 					foreach ($this_time_arr as $eventKey => $loopevent) {
! 						$drawEvent = drawEventTimes ($cal_time, $loopevent["event_end"]);
! 						$j = 0;
! 						while (isset($event_length[$thisday][$j])) {
! 							if ($event_length[$thisday][$j]["state"] == "ended") {
! 								$event_length[$thisday][$j] = array ("length" => ($drawEvent["draw_length"] / $phpiCal_config->gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin");
! 								break;
! 							}
! 							$j++;
! 						}
! 						if ($j == sizeof($event_length[$thisday])) {
! 							array_push ($event_length[$thisday], array ("length" => ($drawEvent["draw_length"] / $phpiCal_config->gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin"));
  						}
  					}
  				}
! 
! 				if (sizeof($event_length[$thisday]) == 0) {
  					if ($dayborder == 0) {
  						$class = ' class="weekborder"';
--- 362,404 ----
  				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>';
  			}
! 						
! 			/* 	add columns in the $cal_time grid slot for each day
! 				each cell will have $this_time_arr of events 	*/
! 			foreach ($weekarray as $thisday) {
! 				$this_time_arr = array();
! 				$dayborder 	= 0;
  				if ($phpiCal_config->day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) {
+ 					# want to pile up all the events before day_start that end in the displayed times
  					foreach($master_array[$thisday] as $time_key => $time_arr) {
! 						if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
! 							foreach($time_arr as $uid => $event_tmp) {
! 								if ((int)$event_tmp['display_end'] > (int)$cal_time) $this_time_arr[$uid] = $event_tmp;			
! 							}		
  						}
  					}
  				} else {
+ 					# events that start in internal cal_times the grid
  					if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) {
! 						$this_time_arr = $master_array[$thisday][$cal_time]; 
  					}
  				}
  
! 				// go through $this_time_array and fill the event_length array
! 				foreach ($this_time_arr as $eventKey => $loopevent) {
! 					$drawEvent = drawEventTimes ($cal_time, $loopevent["display_end"]);
! 					$j = 0;
! 					while (isset($event_length[$thisday][$j])) {
! 						if ($event_length[$thisday][$j]["state"] == "ended") {
! 							$event_length[$thisday][$j] = array ("length" => ($drawEvent["draw_length"] / $phpiCal_config->gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin");
! 							break;
  						}
+ 						$j++;
+ 					}
+ 					if ($j == sizeof(@$event_length[$thisday])) {
+ 						$event_length[$thisday][] = array ("length" => ($drawEvent["draw_length"] / $phpiCal_config->gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin");
  					}
  				}
! 				if (empty($event_length[$thisday])) {
! 					# no events
  					if ($dayborder == 0) {
  						$class = ' class="weekborder"';
***************
*** 429,447 ****
  						$class = '';
  						$dayborder = 0;
! 					}
! 					
  					$drawWidth = 1;
  					$colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth);
! 					$weekdisplay .= '<td width="' . $colspan_width . '" colspan="' . $nbrGridCols[$thisday] . '" ' . $class . '>&nbsp;</td>'."\n";
! 					
  				} else {
  					$emptyWidth = $nbrGridCols[$thisday];
  					// Used to "join" ended events, so the ended case below results in one colspan'd td instead of multiple tds.
  					$ended_counter = 0;
! 					for ($i=0;$i<sizeof($event_length[$thisday]);$i++) {
! 
! 						$drawWidth = $nbrGridCols[$thisday] / ($event_length[$thisday][$i]["overlap"] + 1);
  						$emptyWidth = $emptyWidth - $drawWidth;
! 						switch ($event_length[$thisday][$i]["state"]) {
  							case "begin":
  								if ($ended_counter) {
--- 407,423 ----
  						$class = '';
  						$dayborder = 0;
! 					}					
  					$drawWidth = 1;
  					$colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth);
! 					$weekdisplay .= '<td width="' . $colspan_width . '" colspan="' . $nbrGridCols[$thisday] . '" ' . $class . '>&nbsp;</td>'."\n";					
  				} else {
+ 					# have events
  					$emptyWidth = $nbrGridCols[$thisday];
  					// Used to "join" ended events, so the ended case below results in one colspan'd td instead of multiple tds.
  					$ended_counter = 0;
! 					foreach($event_length[$thisday] as $i=>$el) {					
! 						$drawWidth = $nbrGridCols[$thisday] / ($el["overlap"] + 1);
  						$emptyWidth = $emptyWidth - $drawWidth;
! 						switch ($el["state"]) {
  							case "begin":
  								if ($ended_counter) {
***************
*** 503,507 ****
  					}
  				}
- 				$thisdate = ($thisdate + (25 * 60 * 60));
  			}
  			$weekdisplay .= "</tr>\n";
--- 479,482 ----
***************
*** 861,864 ****
--- 836,841 ----
  	function draw_month($template_p, $offset = '+0', $type) {
  		global $phpiCal_config, $getdate, $master_array, $this_year, $this_month, $dateFormat_month, $cal, $minical_view, $month_event_lines, $daysofweekreallyshort_lang, $daysofweekshort_lang, $daysofweek_lang, $timeFormat_small, $timeFormat;
+ 
+ 		$unique_colors = $phpiCal_config->unique_colors;
  		preg_match("!<\!-- loop weekday on -->(.*)<\!-- loop weekday off -->!Uis", $template_p, $match1);
  		preg_match("!<\!-- loop monthdays on -->(.*)<\!-- loop monthdays off -->!Uis", $template_p, $match2);
***************
*** 939,944 ****
  						foreach ($event_times as $uid => $val) {
  							$event_calno 	= $val['calnumber'];
! 							$event_calno	= (($event_calno - 1) % $phpiCal_config->unique_colors) + 1;
! 							if (!isset($val['event_start'])) {
  								if ($type == 'large') {
  									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
--- 916,921 ----
  						foreach ($event_times as $uid => $val) {
  							$event_calno 	= $val['calnumber'];
! 							$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
! 							if ($cal_time == -1) {
  								if ($type == 'large') {
  									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';

[PHPiCalendar-Commits] phpicalendar default_config.php,1.3,1.4

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

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

Modified Files:
	default_config.php 
Log Message:
bump vers

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** default_config.php	11 Dec 2008 21:54:52 -0000	1.3
--- default_config.php	26 Dec 2008 22:52:36 -0000	1.4
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.1';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//

[PHPiCalendar-Commits] phpicalendar/functions date_functions.php, 1.43, 1.44 ical_parser.php, 1.232, 1.233 init.inc.php, 1.114, 1.115 template.php, 1.102, 1.103

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

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

Modified Files:
	date_functions.php ical_parser.php init.inc.php template.php 
Log Message:
revert event length display  adjustment - messes up overlap calculations

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** date_functions.php	26 Dec 2008 19:32:41 -0000	1.43
--- date_functions.php	26 Dec 2008 22:33:33 -0000	1.44
***************
*** 146,150 ****
  
  function chooseOffset($time, $timezone = '') {
! 	global $tz_array;
  	switch ($timezone) {
  		case '':
--- 146,150 ----
  
  function chooseOffset($time, $timezone = '') {
! 	global $tz_array, $summary;
  	switch ($timezone) {
  		case '':
***************
*** 156,160 ****
  		default:
  			if (is_array($tz_array) && array_key_exists($timezone, $tz_array)) {
! 				$dlst = is_daylight($time, $timezone);	
  				$offset = $tz_array[$timezone][$dlst];
  			} else {
--- 156,160 ----
  		default:
  			if (is_array($tz_array) && array_key_exists($timezone, $tz_array)) {
! 				$dlst = is_daylight($time, $timezone);
  				$offset = $tz_array[$timezone][$dlst];
  			} else {

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.232
retrieving revision 1.233
diff -C2 -d -r1.232 -r1.233
*** ical_parser.php	26 Dec 2008 17:07:52 -0000	1.232
--- ical_parser.php	26 Dec 2008 22:33:33 -0000	1.233
***************
*** 364,370 ****
  				
  							if (isset($recurrence_id['tzid'])) {
! 								$offset_tmp = chooseOffset($recur_unixtime, $recurrence_id['tzid']);
  							} elseif (isset($calendar_tz)) {
! 								$offset_tmp = chooseOffset($recur_unixtime, $tz_array[$calendar_tz]);
  							} else {
  								$offset_tmp = $chooseOffset($recur_unixtime);
--- 364,370 ----
  				
  							if (isset($recurrence_id['tzid'])) {
! 								$offset_tmp = chooseOffset($recur_unixtime, $recurrence_id['tzid']); 
  							} elseif (isset($calendar_tz)) {
! 								$offset_tmp = chooseOffset($recur_unixtime, $calendar_tz);
  							} else {
  								$offset_tmp = $chooseOffset($recur_unixtime);

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** init.inc.php	12 Dec 2008 06:22:59 -0000	1.114
--- init.inc.php	26 Dec 2008 22:33:33 -0000	1.115
***************
*** 185,188 ****
--- 185,190 ----
  	return ((float)$usec + (float)$sec); 
  }
+ 
+ $uid_list = array();
  #uncomment for diagnostics
  #echo "after init.inc.ics<pre>";

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** template.php	26 Dec 2008 16:59:10 -0000	1.102
--- template.php	26 Dec 2008 22:33:33 -0000	1.103
***************
*** 11,15 ****
  			$this->page 	= str_replace('{DOWNLOAD_FILENAME}', $download_filename, $this->page);
  		} else {
! 			$this->page = preg_replace('!<\!-- switch display_download on -->(.*)<\!-- switch display_download off -->!Uis', '', $this->page);
  		}
  	}
--- 11,15 ----
  			$this->page 	= str_replace('{DOWNLOAD_FILENAME}', $download_filename, $this->page);
  		} else {
! 			$this->page = preg_replace('!<\!-- switch display_download on -->.*<\!-- switch display_download off -->!Uis', '', $this->page);
  		}
  	}
***************
*** 49,54 ****
  			$this->page 	= str_replace('{DELETE_TABLE}', $delete_table, $this->page);
  		} else {
! 			$this->page 	= preg_replace('!<\!-- switch logged_in on -->(.*)<\!-- switch logged_in off -->!Uis', '', $this->page);
! 			$this->page 	= preg_replace('!<\!-- switch logged_in2 on -->(.*)<\!-- switch logged_in2 off -->!Uis', '', $this->page);
  		}
  	
--- 49,54 ----
  			$this->page 	= str_replace('{DELETE_TABLE}', $delete_table, $this->page);
  		} else {
! 			$this->page 	= preg_replace('!<\!-- switch logged_in on -->.*<\!-- switch logged_in off -->!Uis', '', $this->page);
! 			$this->page 	= preg_replace('!<\!-- switch logged_in2 on -->.*<\!-- switch logged_in2 off -->!Uis', '', $this->page);
  		}
  	
***************
*** 105,113 ****
  						
  						if ($description == '') {
! 							$events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!Uis', '', $events_tmp);
  						}
  
  						if ($location == '') {
! 							$events_tmp = preg_replace('!<\!-- switch location_events on -->(.*)<\!-- switch location_events off -->!Uis', '', $events_tmp);
  						}
  						
--- 105,113 ----
  						
  						if ($description == '') {
! 							$events_tmp = preg_replace('!<\!-- switch description_events on -->.*<\!-- switch description_events off -->!Uis', '', $events_tmp);
  						}
  
  						if ($location == '') {
! 							$events_tmp = preg_replace('!<\!-- switch location_events on -->.*<\!-- switch location_events off -->!Uis', '', $events_tmp);
  						}
  						
***************
*** 128,135 ****
  		
  		if ($events_week < 1) {
! 			$this->page = preg_replace('!<\!-- switch some_events on -->(.*)<\!-- switch some_events off -->!Uis', '', $this->page);
  		} else {
! 			$this->page = preg_replace('!<\!-- switch some_events on -->(.*)<\!-- switch some_events off -->!Uis', $final, $this->page);
! 			$this->page = preg_replace('!<\!-- switch no_events on -->(.*)<\!-- switch no_events off -->!Uis', '', $this->page);
  		}
  	}	
--- 128,135 ----
  		
  		if ($events_week < 1) {
! 			$this->page = preg_replace('!<\!-- switch some_events on -->.*<\!-- switch some_events off -->!Uis', '', $this->page);
  		} else {
! 			$this->page = preg_replace('!<\!-- switch some_events on -->.*<\!-- switch some_events off -->!Uis', $final, $this->page);
! 			$this->page = preg_replace('!<\!-- switch no_events on -->.*<\!-- switch no_events off -->!Uis', '', $this->page);
  		}
  	}	
***************
*** 173,180 ****
  					
  					if ($description == '') {
! 						$events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!Uis', '', $events_tmp);
  					}
  						if (!isset($val['exceptions'])) {
! 						$events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', '', $events_tmp);
  					}else{
  							$some_exceptions = "";
--- 173,180 ----
  					
  					if ($description == '') {
! 						$events_tmp = preg_replace('!<\!-- switch description_events on -->.*<\!-- switch description_events off -->!Uis', '', $events_tmp);
  					}
  						if (!isset($val['exceptions'])) {
! 						$events_tmp = preg_replace('!<\!-- switch exceptions on -->.*<\!-- switch exceptions off -->!Uis', '', $events_tmp);
  					}else{
  							$some_exceptions = "";
***************
*** 197,201 ****
  								#is there a recur in the exception?
  								if (!$except_val['recur']) {
! 									$except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!Uis', '', $except_tmp);
  								}else{
  									$except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp);
--- 197,201 ----
  								#is there a recur in the exception?
  								if (!$except_val['recur']) {
! 									$except_tmp = preg_replace('!<\!-- switch except_recur on -->.*<\!-- switch except_recur off -->!Uis', '', $except_tmp);
  								}else{
  									$except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp);
***************
*** 203,207 ****
  								#is there a description in the exception?
  								if (!$except_val['description']) {
! 									$except_tmp = preg_replace('!<\!-- switch except_description on -->(.*)<\!-- switch except_description off -->!Uis', '', $except_tmp);
  								}else{
  									$except_description = stripslashes(urldecode($except_val['description']));
--- 203,207 ----
  								#is there a description in the exception?
  								if (!$except_val['description']) {
! 									$except_tmp = preg_replace('!<\!-- switch except_description on -->.*<\!-- switch except_description off -->!Uis', '', $except_tmp);
  								}else{
  									$except_description = stripslashes(urldecode($except_val['description']));
***************
*** 211,215 ****
  		
  							}
! 							$events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', $some_exceptions,$events_tmp );
  	
  		
--- 211,215 ----
  		
  							}
! 							$events_tmp = preg_replace('!<\!-- switch exceptions on -->.*<\!-- switch exceptions off -->!Uis', $some_exceptions,$events_tmp );
  	
  		
***************
*** 217,221 ****
  					
  					if (!$val['recur']) {
! 						$events_tmp = preg_replace('!<\!-- switch recur on -->(.*)<\!-- switch recur off -->!Uis', '', $events_tmp);
  						$events_tmp = str_replace('{L_STARTING_ON}', '', $events_tmp);
  					}else{
--- 217,221 ----
  					
  					if (!$val['recur']) {
! 						$events_tmp = preg_replace('!<\!-- switch recur on -->.*<\!-- switch recur off -->!Uis', '', $events_tmp);
  						$events_tmp = str_replace('{L_STARTING_ON}', '', $events_tmp);
  					}else{
***************
*** 238,245 ****
  		}		
  		if ($events_found < 1) {
! 			$this->page = preg_replace('!<\!-- switch results on -->(.*)<\!-- switch results off -->!Uis', '', $this->page);
  		} else {
! 			$this->page = preg_replace('!<\!-- switch results on -->(.*)<\!-- switch results off -->!Uis', $final, $this->page);
! 			$this->page = preg_replace('!<\!-- switch no_results on -->(.*)<\!-- switch no_results off -->!Uis', '', $this->page);
  			#echo "<hr>this->page: $this->page<br><hr>";
  
--- 238,245 ----
  		}		
  		if ($events_found < 1) {
! 			$this->page = preg_replace('!<\!-- switch results on -->.*<\!-- switch results off -->!Uis', '', $this->page);
  		} else {
! 			$this->page = preg_replace('!<\!-- switch results on -->.*<\!-- switch results off -->!Uis', $final, $this->page);
! 			$this->page = preg_replace('!<\!-- switch no_results on -->.*<\!-- switch no_results off -->!Uis', '', $this->page);
  			#echo "<hr>this->page: $this->page<br><hr>";
  
***************
*** 250,262 ****
  		global $phpiCal_config, $start_week_time, $getdate, $cal, $master_array, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $timeFormat_small;
  		
! 		// Figure out colspans
  		$dayborder 	= 0;
  		$thisdate  	= $start_week_time;
  		$swt	   	= $start_week_time;
! 		for ($i=0;$i < 7;$i++) {
  			$thisday = date("Ymd", $thisdate);
  			$nbrGridCols[$thisday] = 1;
  			if (isset($master_array[$thisday])) {
  				foreach($master_array[($thisday)] as $ovlKey => $ovlValue) {
  					if ($ovlKey != "-1") {
  						foreach($ovlValue as $ovl2Value) {
--- 250,263 ----
  		global $phpiCal_config, $start_week_time, $getdate, $cal, $master_array, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $timeFormat_small;
  		
! 		// Figure out colspans and initialize weekarray
  		$dayborder 	= 0;
  		$thisdate  	= $start_week_time;
  		$swt	   	= $start_week_time;
! 		for ($i=0;$i < $phpiCal_config->week_length;$i++) {
  			$thisday = date("Ymd", $thisdate);
  			$nbrGridCols[$thisday] = 1;
  			if (isset($master_array[$thisday])) {
  				foreach($master_array[($thisday)] as $ovlKey => $ovlValue) {
+ 					# ovlKey is a time slot; $ovlValue is an array with key=uid
  					if ($ovlKey != "-1") {
  						foreach($ovlValue as $ovl2Value) {
***************
*** 266,277 ****
  				} 
  			}
  			$thisdate = ($thisdate + (25 * 60 * 60));
  		}
! 		
! 		for ($i=0; $i < $phpiCal_config->week_length; $i++) {
! 			$thisdate 			= date ('Ymd', $start_week_time); 
! 			$weekarray[$i] 		= $thisdate;
! 			$start_week_time 	= strtotime('+1 day', $start_week_time);
! 		}
  		// Replaces the allday events
  		preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1);
--- 267,274 ----
  				} 
  			}
+ 			$weekarray[$i] 		= $thisday;
  			$thisdate = ($thisdate + (25 * 60 * 60));
  		}
! 		#echo "<pre>";print_r($nbrGridCols);		
  		// Replaces the allday events
  		preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1);
***************
*** 299,303 ****
  			$weekreplace .= $replace;
  		}
! 		$this->page = preg_replace('!<\!-- loop alldaysofweek on -->(.*)<\!-- loop alldaysofweek off -->!Uis', $weekreplace, $this->page);
  		
  		// Replaces the daysofweek
--- 296,300 ----
  			$weekreplace .= $replace;
  		}
! 		$this->page = preg_replace('!<\!-- loop alldaysofweek on -->.*<\!-- loop alldaysofweek off -->!Uis', $weekreplace, $this->page);
  		
  		// Replaces the daysofweek
***************
*** 333,337 ****
  			$weekday_loop  .= $loop_tmp;
  		}
! 		$this->page = preg_replace('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!Uis', $weekday_loop, $this->page);
  		
  		// Build the body
--- 330,334 ----
  			$weekday_loop  .= $loop_tmp;
  		}
! 		$this->page = preg_replace('!<\!-- loop daysofweek on -->.*<\!-- loop daysofweek off -->!Uis', $weekday_loop, $this->page);
  		
  		// Build the body
***************
*** 361,364 ****
--- 358,362 ----
  												
  			if (ereg("([0-9]{1,2}):00", $key)) {
+ 				# column of times colspan = 4 to cover navigation links at top
  				$weekdisplay .= '<tr>';
  				$weekdisplay .= '<td colspan="4" rowspan="' . (60 / $phpiCal_config->gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>';
***************
*** 367,373 ****
  				$size_tmp = 60 - (int)substr($cal_time,2,2);
  				$weekdisplay .= '<tr>';
! 				$weekdisplay .= '<td colspan="4" rowspan="' . ($size_tmp / $phpiCal_config->gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'; 
  				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>';
  			} else {
  				$weekdisplay .= '<tr>';
  				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>';
--- 365,372 ----
  				$size_tmp = 60 - (int)substr($cal_time,2,2);
  				$weekdisplay .= '<tr>';
! 				$weekdisplay .= '<td colspan="4" rowspan="' . ($size_tmp / $phpiCal_config->gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.' </td>'; 
  				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>';
  			} else {
+ 				# empty row for each gridLength, to the right of times and left of first weekday
  				$weekdisplay .= '<tr>';
  				$weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>';
***************
*** 405,411 ****
  				// check for eventstart 
  				if (isset($this_time_arr) && sizeof($this_time_arr) > 0) {
! 					#print "<pre>";
! 					#print_r ($this_time_arr);
! 					#print "</pre>";
  
  					foreach ($this_time_arr as $eventKey => $loopevent) {
--- 404,408 ----
  				// check for eventstart 
  				if (isset($this_time_arr) && sizeof($this_time_arr) > 0) {
! 					#print "<pre>";print_r ($this_time_arr);print "</pre>";
  
  					foreach ($this_time_arr as $eventKey => $loopevent) {
***************
*** 468,474 ****
  								$event_temp   = $loop_event;
  								$event 		  = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $phpiCal_config->week_events_lines, 25, 'ps');
- 								# adjust length by rough guess to word wrapping
- 								$event_text_lines = ceil((strlen(strip_tags(trim($event))) * 8)/$colspan_width) + 1; 
- 								if ($event_length[$thisday][$i]['length'] < $event_text_lines) $event_length[$thisday][$i]['length'] = $event_text_lines;
  								$weekdisplay .= '<td width="'.$colspan_width.'" rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
  
--- 465,468 ----
***************
*** 514,518 ****
  		}
  
! 		$this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop event off -->!Uis', $weekdisplay, $this->page);
  	}
  
--- 508,512 ----
  		}
  
! 		$this->page = preg_replace('!<\!-- loop row on -->.*<\!-- loop event off -->!Uis', $weekdisplay, $this->page);
  	}
  
***************
*** 535,539 ****
  			}
  		}
! 		$this->page = preg_replace('!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis', $replace, $this->page);
  
  		// Replaces the daysofweek
--- 529,533 ----
  			}
  		}
! 		$this->page = preg_replace('!<\!-- loop allday on -->.*<\!-- loop allday off -->!Uis', $replace, $this->page);
  
  		// Replaces the daysofweek
***************
*** 566,570 ****
  			$weekday_loop  .= $loop_tmp;
  		}
! 		$this->page = preg_replace('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!Uis', $weekday_loop, $this->page);
  		
  		// Build the body
--- 560,564 ----
  			$weekday_loop  .= $loop_tmp;
  		}
! 		$this->page = preg_replace('!<\!-- loop daysofweek on -->.*<\!-- loop daysofweek off -->!Uis', $weekday_loop, $this->page);
  		
  		// Build the body
***************
*** 734,738 ****
  		}
  		
! 		$this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop event off -->!Uis', $daydisplay, $this->page);
  	
  	
--- 728,732 ----
  		}
  		
! 		$this->page = preg_replace('!<\!-- loop row on -->.*<\!-- loop event off -->!Uis', $daydisplay, $this->page);
  	
  	
***************
*** 768,777 ****
  			}
  
! 			$this->page = preg_replace('!<\!-- switch t_allday on -->(.*)<\!-- switch t_allday off -->!Uis', $replace_ad, $this->page);
! 			$this->page = preg_replace('!<\!-- switch t_event on -->(.*)<\!-- switch t_event off -->!Uis', $replace_e, $this->page);		
  
  		} else {
  
! 			$this->page = preg_replace('!<\!-- switch tomorrows_events on -->(.*)<\!-- switch tomorrows_events off -->!Uis', '', $this->page);
  
  		}
--- 762,771 ----
  			}
  
! 			$this->page = preg_replace('!<\!-- switch t_allday on -->.*<\!-- switch t_allday off -->!Uis', $replace_ad, $this->page);
! 			$this->page = preg_replace('!<\!-- switch t_event on -->.*<\!-- switch t_event off -->!Uis', $replace_e, $this->page);		
  
  		} else {
  
! 			$this->page = preg_replace('!<\!-- switch tomorrows_events on -->.*<\!-- switch tomorrows_events off -->!Uis', '', $this->page);
  
  		}
***************
*** 856,865 ****
  		// If there are no TODO items, completely hide the TODO list.
  		if (($nugget2 == '') || ($phpiCal_config->show_todos != 'yes')) {
! 			$this->page = preg_replace('!<\!-- switch vtodo on -->(.*)<\!-- switch vtodo off -->!Uis', '', $this->page);
  		}
  		
  		// Otherwise display the list of TODOs.
  		else {
! 			$this->page = preg_replace('!<\!-- switch show_completed on -->(.*)<\!-- switch show_normal off -->!Uis', $nugget2, $this->page);
  		}
  	}
--- 850,859 ----
  		// If there are no TODO items, completely hide the TODO list.
  		if (($nugget2 == '') || ($phpiCal_config->show_todos != 'yes')) {
! 			$this->page = preg_replace('!<\!-- switch vtodo on -->.*<\!-- switch vtodo off -->!Uis', '', $this->page);
  		}
  		
  		// Otherwise display the list of TODOs.
  		else {
! 			$this->page = preg_replace('!<\!-- switch show_completed on -->.*<\!-- switch show_normal off -->!Uis', $nugget2, $this->page);
  		}
  	}
***************
*** 991,995 ****
  		
  		$return = str_replace('<!-- loop weekday on -->'.$match1[1].'<!-- loop weekday off -->', $weekday_loop, $template_p);
! 		$return = preg_replace('!<\!-- loop monthweeks on -->(.*)<\!-- loop monthweeks off -->!Uis', $middle, $return);
  		$return = str_replace('{MONTH_TITLE}', $month_title, $return);
  		$return = str_replace('{CAL}', $cal, $return);
--- 985,989 ----
  		
  		$return = str_replace('<!-- loop weekday on -->'.$match1[1].'<!-- loop weekday off -->', $weekday_loop, $template_p);
! 		$return = preg_replace('!<\!-- loop monthweeks on -->.*<\!-- loop monthweeks off -->!Uis', $middle, $return);
  		$return = str_replace('{MONTH_TITLE}', $month_title, $return);
  		$return = str_replace('{CAL}', $cal, $return);
***************
*** 1000,1008 ****
  	
  	function nomonthbottom() {
! 		$this->page = preg_replace('!<\!-- switch showbottom on -->(.*)<\!-- switch showbottom off -->!Uis','', $this->page);
  	}
  
  	function nosearch() {
! 		$this->page = preg_replace('!<\!-- switch show_search on -->(.*)<\!-- switch show_search off -->!Uis','', $this->page);
  	}
  	
--- 994,1002 ----
  	
  	function nomonthbottom() {
! 		$this->page = preg_replace('!<\!-- switch showbottom on -->.*<\!-- switch showbottom off -->!Uis','', $this->page);
  	}
  
  	function nosearch() {
! 		$this->page = preg_replace('!<\!-- switch show_search on -->.*<\!-- switch show_search off -->!Uis','', $this->page);
  	}
  	
***************
*** 1065,1069 ****
  		} while ($this_month == $check_month);
  
! 		$this->page = preg_replace('!<\!-- loop showbottomevents_odd on -->(.*)<\!-- loop showbottomevents_even off -->!Uis', $middle, $this->page);
  
  	}
--- 1059,1063 ----
  		} while ($this_month == $check_month);
  
! 		$this->page = preg_replace('!<\!-- loop showbottomevents_odd on -->.*<\!-- loop showbottomevents_even off -->!Uis', $middle, $this->page);
  
  	}
***************
*** 1104,1108 ****
  				// This removes any unfilled tags
  				if (!$data) {
! 					$this->page = preg_replace('!<\!-- switch ' . $tag . ' on -->(.*)<\!-- switch ' . $tag . ' off -->!Uis', '', $this->page);
  				}
  				
--- 1098,1102 ----
  				// This removes any unfilled tags
  				if (!$data) {
! 					$this->page = preg_replace('!<\!-- switch ' . $tag . ' on -->.*<\!-- switch ' . $tag . ' off -->!Uis', '', $this->page);
  				}
  				
***************
*** 1124,1128 ****
  				// This removes any unfilled tags
  				if (!$data) {
! 					$this->page = preg_replace('!<\!-- switch ' . $tag . ' on -->(.*)<\!-- switch ' . $tag . ' off -->!Uis', '', $this->page);
  				}
  				
--- 1118,1122 ----
  				// This removes any unfilled tags
  				if (!$data) {
! 					$this->page = preg_replace('!<\!-- switch ' . $tag . ' on -->.*<\!-- switch ' . $tag . ' off -->!Uis', '', $this->page);
  				}
  				
***************
*** 1168,1172 ****
  		$this->page = str_replace('{GENERATED2}', $generated2, $this->page);
  		if ($phpiCal_config->enable_rss != 'yes') {
! 			$this->page = preg_replace('!<\!-- switch rss_powered on -->(.*)<\!-- switch rss_powered off -->!Uis', '', $this->page);
  		} else {
  			$this->page = str_replace('{BASE}', BASE, $this->page);
--- 1162,1166 ----
  		$this->page = str_replace('{GENERATED2}', $generated2, $this->page);
  		if ($phpiCal_config->enable_rss != 'yes') {
! 			$this->page = preg_replace('!<\!-- switch rss_powered on -->.*<\!-- switch rss_powered off -->!Uis', '', $this->page);
  		} else {
  			$this->page = str_replace('{BASE}', BASE, $this->page);

[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.16, 1.17

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

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

Modified Files:
	end_vevent.php 
Log Message:
revert event length display  adjustment - messes up overlap calculations

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** end_vevent.php	26 Dec 2008 16:59:10 -0000	1.16
--- end_vevent.php	26 Dec 2008 22:33:33 -0000	1.17
***************
*** 37,43 ****
  	$uid_counter++;
  	$uid_valid = false;
! } else {
  	$uid_valid = true;
  }
  
  # adjust event start and end times
--- 37,47 ----
  	$uid_counter++;
  	$uid_valid = false;
! }elseif(in_array($uid, $uid_list)) {
! 	$uid .= $uid_counter;
! 	$uid_counter++;
! }else{
  	$uid_valid = true;
  }
+ $uid_list[] = $uid;
  
  # adjust event start and end times

[PHPiCalendar-Commits] phpicalendar/languages danish.inc.php, 1.28, 1.29

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

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

Modified Files:
	danish.inc.php 
Log Message:
update danish

Index: danish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/danish.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** danish.inc.php	20 Dec 2008 00:11:56 -0000	1.28
--- danish.inc.php	26 Dec 2008 19:32:41 -0000	1.29
***************
*** 1,8 ****
  <?php
  
! // English language include
  // For version 2.0 PHP iCalendar
  //
! // Translation by Chad Little (ch...@ch...)
  //
  // Submit new translations to php...@gm...
--- 1,10 ----
  <?php
  
! // Danish language include
  // For version 2.0 PHP iCalendar
  //
! // Translation by Henrik H¿jmark (st...@wo...)
! //            and Jakob Peterh¿nsel (ma...@cr...) 
! // 2.0 transfer and update by AlleyKat - Finn S¿rensen (tra...@ph...)
  //
  // Submit new translations to php...@gm...
***************
*** 17,42 ****
  $lang['l_next_week'] 		= 'N&aelig;ste uge';
  $lang['l_next_year'] 		= 'N&aelig;ste &aring;r';
! $lang['l_last_day'] 		= 'Forrige dag';
! $lang['l_last_month'] 		= 'Forrige m&aring;ned';
! $lang['l_last_week'] 		= 'Forrige uge';
! $lang['l_last_year'] 		= 'Forrige &Aring;r';
  $lang['l_subscribe'] 		= 'Abonn&eacute;r';
! $lang['l_download'] 		= 'Download';
! $lang['l_powered_by'] 		= 'Powered by';
! $lang['l_event'] 			= 'Event';
! $lang['l_event_start'] 		= 'Starttid';
! $lang['l_event_end'] 		= 'Sluttid';
! $lang['l_this_months'] 		= 'Denne m&aring;neds events';
  $lang['l_date'] 			= 'Dato';
! $lang['l_summary'] 			= 'Summary';
! $lang['l_all_day'] 			= 'Heldags-event';
  $lang['l_notes'] 			= 'Noter';
! $lang['l_this_years'] 		= 'Dette &aring;rs events';
! $lang['l_today'] 			= 'Idag';
  $lang['l_this_week'] 		= 'Denne uge';
  $lang['l_this_month'] 		= 'Denne m&aring;ned';
  $lang['l_jump'] 			= 'G&aring; til';
! $lang['l_tomorrows'] 		= 'Events imorgen';
! $lang['l_goday'] 			= 'G&aring; til idag';
  $lang['l_goweek'] 			= 'G&aring; til denne uge';
  $lang['l_gomonth'] 			= 'G&aring; til denne m&aring;ned';
--- 19,44 ----
  $lang['l_next_week'] 		= 'N&aelig;ste uge';
  $lang['l_next_year'] 		= 'N&aelig;ste &aring;r';
! $lang['l_last_day'] 		= 'Foreg&aring;ende dag';
! $lang['l_last_month'] 		= 'Foreg&aring;ende m&aring;ned';
! $lang['l_last_week'] 		= 'Foreg&aring;ende uge';
! $lang['l_last_year'] 		= 'Foreg&aring;ende &aring;r';
  $lang['l_subscribe'] 		= 'Abonn&eacute;r';
! $lang['l_download'] 		= 'Hent';
! $lang['l_powered_by'] 		= 'Drevet af';
! $lang['l_event'] 			= 'Aftale';
! $lang['l_event_start'] 		= 'Starttidspunkt';
! $lang['l_event_end'] 		= 'Sluttidspunkt';
! $lang['l_this_months'] 		= 'Denne m&aring;neds aftaler';
  $lang['l_date'] 			= 'Dato';
! $lang['l_summary'] 			= 'Opsummering';
! $lang['l_all_day'] 			= 'Heldagsaftale';
  $lang['l_notes'] 			= 'Noter';
! $lang['l_this_years'] 		= 'Dette &aring;s aftaler';
! $lang['l_today'] 			= 'I dag';
  $lang['l_this_week'] 		= 'Denne uge';
  $lang['l_this_month'] 		= 'Denne m&aring;ned';
  $lang['l_jump'] 			= 'G&aring; til';
! $lang['l_tomorrows'] 		= 'N&aelig;ste dags aftaler';
! $lang['l_goday'] 			= 'G&aring; til i dag';
  $lang['l_goweek'] 			= 'G&aring; til denne uge';
  $lang['l_gomonth'] 			= 'G&aring; til denne m&aring;ned';
***************
*** 45,79 ****
  $lang['l_results'] 			= 'S&oslash;geresultater';
  $lang['l_pick_multiple'] 	= 'V&aelig;lg flere';
! $lang['l_query'] 			= 'Kriterie'; // will be followed by the search query
! $lang['l_no_results'] 		= 'Ingen events fundet';
! $lang['l_goprint'] 			= 'Printervenlig';
  $lang['l_time'] 			= 'Tid';
! $lang['l_summary'] 			= 'Summary';
  $lang['l_description'] 		= 'Beskrivelse';
! $lang['l_this_site_is']		= 'Dette site er';
! $lang['l_no_events_day']	= 'Ingen events idag.';
! $lang['l_no_events_week']	= 'Ingen events denne uge.';
! $lang['l_no_events_month']	= 'Ingen events denne m&aring;ned.';
  $lang['l_rss_day_date']		= 'g:i A';  // Lists just the time
  $lang['l_rss_week_date	']	= '%b %e';  // Lists just the day
  $lang['l_rss_month_date	']	= '%b %e';  // Lists just the day
! $lang['l_rss_language']		= 'en-us';
! $lang['l_search_took']		= 'S&oslash;gning tog %s sekunder';
! $lang['l_recurring_event']	= 'Tilbagevendende event';
  $lang['l_exception']		= 'Undtagelse';
! $lang['l_no_query']			= 'Ingen kriterier angivet';
  $lang['l_preferences']		= 'Indstillinger';
  $lang['l_printer']			= 'Printer';
! $lang['l_select_lang']		= 'V&aelig;lg dit standard-sprog';
! $lang['l_select_cal']		= 'V&aelig;lg din standard-kalender';
! $lang['l_select_view']		= 'V&aelig;lg dit standard-view';
! $lang['l_select_time']		= 'V&aelig;lg din standard-starttid';
! $lang['l_select_day']		= 'V&aelig;lg din f&oslash;rste dag i ugen';
! $lang['l_select_style']		= 'V&aelig;lg din standard-stil';
! $lang['l_set_prefs']		= 'Indstillinger';
! $lang['l_completed_date']	= 'Afsluttet d.';
  $lang['l_completed']		= 'Afsluttet';
  $lang['l_created']			= 'Oprettet';
! $lang['l_due']				= 'Forfald';
  $lang['l_priority']			= 'Prioritet';
  $lang['l_priority_high']	= 'H&oslash;j';
--- 47,81 ----
  $lang['l_results'] 			= 'S&oslash;geresultater';
  $lang['l_pick_multiple'] 	= 'V&aelig;lg flere';
! $lang['l_query'] 			= 'S&oslash;gekriterier'; // will be followed by the search query
! $lang['l_no_results'] 		= 'Der er ikke fundet nogen aftaler';
! $lang['l_goprint'] 			= 'Udskriftsvenligt';
  $lang['l_time'] 			= 'Tid';
! $lang['l_summary'] 			= 'Opsummering';
  $lang['l_description'] 		= 'Beskrivelse';
! $lang['l_this_site_is']		= 'Denne webadresse er';
! $lang['l_no_events_day']	= 'Ingen aftaler i dag.';
! $lang['l_no_events_week']	= 'Ingen aftaler i denne uge.';
! $lang['l_no_events_month']	= 'Ingen aftaler i denne m&aring;ned.';
  $lang['l_rss_day_date']		= 'g:i A';  // Lists just the time
  $lang['l_rss_week_date	']	= '%b %e';  // Lists just the day
  $lang['l_rss_month_date	']	= '%b %e';  // Lists just the day
! $lang['l_rss_language']		= 'da-dk';
! $lang['l_search_took']		= 'S&oslash;gningen tog %s sekunder';
! $lang['l_recurring_event']	= 'Gentagen aftale';
  $lang['l_exception']		= 'Undtagelse';
! $lang['l_no_query']			= 'Ingen forsp&oslash;rgsel angivet';
  $lang['l_preferences']		= 'Indstillinger';
  $lang['l_printer']			= 'Printer';
! $lang['l_select_lang']		= 'V&aelig;lg sprog';
! $lang['l_select_cal']		= 'V&aelig;lg kalender';
! $lang['l_select_view']		= 'V&aelig;lg standard visning';
! $lang['l_select_time']		= 'V&aelig;lg starttidspunkt';
! $lang['l_select_day']		= 'V&aelig;lg f&oslash;rste dag i ugen';
! $lang['l_select_style']		= 'V&aelig;lg stil';
! $lang['l_set_prefs']		= 'Gem indstillinger';
! $lang['l_completed_date']	= 'Afsluttet p&aring;';
  $lang['l_completed']		= 'Afsluttet';
  $lang['l_created']			= 'Oprettet';
! $lang['l_due']				= 'Klar';
  $lang['l_priority']			= 'Prioritet';
  $lang['l_priority_high']	= 'H&oslash;j';
***************
*** 84,138 ****
  $lang['l_status_confirmed'] = 'BEKR&AElig;FTET' ; 
  $lang['l_status_cancelled'] = 'ANNULLERET'; 
! $lang['l_status_tentative'] = 'TENTATIV'; 
! $lang['l_todo']				= 'Todo-items';
! $lang['l_unfinished']		= 'Ikke afsluttet';
  $lang['l_prefs_set'] 		= 'Dine indstillinger er gemt.';
! $lang['l_prefs_unset'] 		= 'Indstillinger nulstillet.  &AElig;ndringer vil tr&aelig;de i kraft n&aelig;ste gang siden indl&aelig;ses.';
  $lang['l_unset_prefs'] 		= 'Nulstil indstillinger';
! $lang['l_organizer']		= 'Organizer';
! $lang['l_attendee']			= 'Tilstede';
! $lang['l_location']			= 'Location';
! $lang['l_admin_header']		= 'PHP iCalendar-administration';
  $lang['l_username']			= 'Brugernavn';
! $lang['l_password']			= 'Password';
! $lang['l_login']			= 'Login';
! $lang['l_invalid_login']	= 'Forkert brugernavn eller password.';
! $lang['l_addupdate_cal']	= 'Tilf&oslash;j eller opdat&eacute;r en kalender';
! $lang['l_addupdate_desc']	= 'Tilf&oslash;j en kalender ved at uploade en ny fil.  Opdat&eacute;r en kalender ved at uploade en fil med samme navn.';
  $lang['l_delete_cal']		= 'Slet en kalender';
! $lang['l_logout']			= 'Logout';
  $lang['l_cal_file']			= 'Kalenderfil';
  $lang['l_php_error']		= 'PHP-fejl';
! $upload_error_gen_lang		= 'Der opstod et problem med din upload.';
! $upload_error_lang[0]		= 'Der opstod et problem med din upload.';
! $upload_error_lang[1]		= 'Den fil du fors&oslash;ger at uploade er for stor.';
! $upload_error_lang[2]		= 'Den fil du fors&oslash;ger at uploade er for stor.';
! $upload_error_lang[3]		= 'Den fil du fors&oslash;ger at uploade blev kun delvist uploaded.';
! $upload_error_lang[4]		= 'Du skal v&aelig;lge en fil at uploade..';
! $lang['l_upload_error_type'] = 'Kun .ics-filer kan uploades.';
  $lang['l_copy_error']			= 'Kunne ikke kopiere fil';
  $lang['l_delete_error']			= 'Kunne ikke slette fil';
! $lang['l_delete_success']		= 'er blevet slettet.';
! $lang['l_action_success']		= 'Gennemf&oslash;rt.';
! $lang['l_submit']				= 'Submit';
  $lang['l_delete']				= 'Slet';
  $all_cal_comb_lang			= 'Alle kombineret';
  
  // New for 2.0
! $lang['l_legend']			= 'Signaturer';
! $lang['l_admin_subhead']	= 'Administr&eacute;r dine kalendre fra denne side';
! $lang['l_prefs_subhead']	= 'Gemmer en cookie n&aring;r du beg&oslash;ger dette site';
  $lang['l_rss_info']			= 'RSS-information';
! $lang['l_rss_subhead']		= 'RSS-feeds for hver enkelt kalender';
! $lang['l_rss_notenabled']	= 'RSS er ikke tilg&aelig;ngeligt p&aring; dette site';
  
  // - navigation
  $lang['l_back'] 		= 'Tilbage';
  $lang['l_next'] 		= 'N&aelig;ste';
! $lang['l_prev'] 		= 'Forrige';
! $lang['l_day_view'] 	= 'Dag-view';
! $lang['l_week_view'] 	= 'Uge-iew';
! $lang['l_month_view'] 	= 'M&aring;ned-view';
! $lang['l_year_view'] 	= '&Aring;r-view';
  
  // ---------------------------------
--- 86,140 ----
  $lang['l_status_confirmed'] = 'BEKR&AElig;FTET' ; 
  $lang['l_status_cancelled'] = 'ANNULLERET'; 
! $lang['l_status_tentative'] = 'AFVENTENDE'; 
! $lang['l_todo']				= 'Ting der skal g&oslash;res';
! $lang['l_unfinished']		= 'Uafsluttet';
  $lang['l_prefs_set'] 		= 'Dine indstillinger er gemt.';
! $lang['l_prefs_unset'] 		= 'Indstillinger fjernet. &AElig;ndringer er synlig ved n&aelig;ste opdatering af siden.';
  $lang['l_unset_prefs'] 		= 'Nulstil indstillinger';
! $lang['l_organizer']		= 'Organisator';
! $lang['l_attendee']			= 'Deltager';
! $lang['l_location']			= 'Sted';
! $lang['l_admin_header']		= 'PHP iCalendar Administration';
  $lang['l_username']			= 'Brugernavn';
! $lang['l_password']			= 'Kodeord';
! $lang['l_login']			= 'Log ind';
! $lang['l_invalid_login']	= 'Forkert brugernavn eller kodeord.';
! $lang['l_addupdate_cal']	= 'Tilf&oslash;j eller opdater en kalender';
! $lang['l_addupdate_desc']	= 'Tilf&oslash;j en kalender ved at uploade en ny fil. Opdater en kalender ved at uploade en fil med samme navn.';
  $lang['l_delete_cal']		= 'Slet en kalender';
! $lang['l_logout']			= 'Log ud';
  $lang['l_cal_file']			= 'Kalenderfil';
  $lang['l_php_error']		= 'PHP-fejl';
! $upload_error_gen_lang		= 'Der var et problem med dit upload.';
! $upload_error_lang[0]		= 'Der var et problem med dit upload.';
! $upload_error_lang[1]		= 'Filen du pr&oslash;ver at uploade er for stor.';
! $upload_error_lang[2]		= 'Filen du pr&oslash;ver at uploade er for stor.';
! $upload_error_lang[3]		= 'Filen du pr&oslash;ver at uploade blev kun delvist uploadet.';
! $upload_error_lang[4]		= 'Du skal v&aelig;lge en fil der skal uploades.';
! $lang['l_upload_error_type'] = 'Kun .ics filer kan uploades.';
  $lang['l_copy_error']			= 'Kunne ikke kopiere fil';
  $lang['l_delete_error']			= 'Kunne ikke slette fil';
! $lang['l_delete_success']		= 'blev korrekt slettet.';
! $lang['l_action_success']		= 'Handlingen lykkedes.';
! $lang['l_submit']				= 'Indsend';
  $lang['l_delete']				= 'Slet';
  $all_cal_comb_lang			= 'Alle kombineret';
  
  // New for 2.0
! $lang['l_legend']			= 'Forklaring';
! $lang['l_admin_subhead']	= 'Administrer dine kalendere fra denne side';
! $lang['l_prefs_subhead']	= 'S&aelig;tter en cookie ved bes&oslash;g pΠdenne side';
  $lang['l_rss_info']			= 'RSS-information';
! $lang['l_rss_subhead']		= 'Grundl&aelig;ggende RSS-feeds tilg&aelig;ngelige for hver kalender';
! $lang['l_rss_notenabled']	= 'RSS er ikke aktiveret for denne side';
  
  // - navigation
  $lang['l_back'] 		= 'Tilbage';
  $lang['l_next'] 		= 'N&aelig;ste';
! $lang['l_prev'] 		= 'Foreg&aring;ende';
! $lang['l_day_view'] 	= 'Vis Dag';
! $lang['l_week_view'] 	= 'Vis Uge';
! $lang['l_month_view'] 	= 'Vis M&aring;ned';
! $lang['l_year_view'] 	= 'Vis &Aring;r';
  
  // ---------------------------------
***************
*** 143,147 ****
  
  $format_recur_lang['yearly']		= array('&aring;r','&aring;r');		// for these, put singular
! $format_recur_lang['monthly']		= array('m^aring;ned','m&aring;neder');		// and plural forms
  $format_recur_lang['weekly']		= array('uge','uger');		// these will be %freq%
  $format_recur_lang['daily']			= array('dag','dage');			// in the replacement below
--- 145,149 ----
  
  $format_recur_lang['yearly']		= array('&aring;r','&aring;r');		// for these, put singular
! $format_recur_lang['monthly']		= array('m&aring;ned','m&aring;neder');		// and plural forms
  $format_recur_lang['weekly']		= array('uge','uger');		// these will be %freq%
  $format_recur_lang['daily']			= array('dag','dage');			// in the replacement below
***************
*** 154,165 ****
  $format_recur_lang['count']			= '%int% gange';		// ie, 'for 5 times'
  
! $format_recur_lang['bymonth']		= 'I m&aring;neder: %list%';			// ie, 'In months: January, February, March'
! $format_recur_lang['bymonthday']	= 'P&aring; datoer: %list%';			// ie, 'On dates: 1, 2, 3, 4'
! $format_recur_lang['byday']			= 'P&aring; dage: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'
  
  // ---------------------------------
  
  $daysofweek_lang			= array ('S&oslash;ndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','L&oslash;rdag');
! $daysofweekshort_lang		= array ('S&oslash;n','Man','Tir','Ons','Tor','Fre','L&oslash;r');
  $daysofweekreallyshort_lang	= array ('S','M','T','O','T','F','L');
  $monthsofyear_lang			= array ('Januar','Februar','Marts','April','Maj','Juni','Juli','August','September','Oktober','November','December');
--- 156,167 ----
  $format_recur_lang['count']			= '%int% gange';		// ie, 'for 5 times'
  
! $format_recur_lang['bymonth']		= 'I m&aring;nderne: %list%';			// ie, 'In months: January, February, March'
! $format_recur_lang['bymonthday']	= 'P&aring; datoerne: %list%';			// ie, 'On dates: 1, 2, 3, 4'
! $format_recur_lang['byday']			= 'P&aring; dagene: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'
  
  // ---------------------------------
  
  $daysofweek_lang			= array ('S&oslash;ndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','L&oslash;rdag');
! $daysofweekshort_lang		= array ('S&oslash;n','Man','Tir','Ons','Tors','Fre','L&oslash;r');
  $daysofweekreallyshort_lang	= array ('S','M','T','O','T','F','L');
  $monthsofyear_lang			= array ('Januar','Februar','Marts','April','Maj','Juni','Juli','August','September','Oktober','November','December');
***************
*** 167,182 ****
  
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
! $timeFormat = 'G:i';
! $timeFormat_small = 'G:i';
  
  // For date formatting, see note below
! $dateFormat_day = '%A, %B %e';
! $dateFormat_week = '%B %e';
! //$dateFormat_week_list = '%a, %b %e';
! $dateFormat_week_list = '%a %e. %b';
  $dateFormat_week_jump = '%e. %b';
  $dateFormat_month = '%B %Y';
! $dateFormat_month_list = '%A, %e. %B';
! $dateFormat_year = '%Y';
  
  
--- 169,183 ----
  
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
! $timeFormat = 'H:i';
! $timeFormat_small = 'H:i';
  
  // For date formatting, see note below
! $dateFormat_day = '%A, %e. %B';
! $dateFormat_week = '%e. %B';
! $dateFormat_week_list = '%a, %e %b';
  $dateFormat_week_jump = '%e. %b';
  $dateFormat_month = '%B %Y';
! $dateFormat_month_list = '%A, %e %B';
! $dateFormat_year = '%Y'; 
  
  
***************
*** 200,211 ****
  $lang['l_error_title'] 			= 'Fejl!';
  $lang['l_error_window'] 		= 'Der opstod en fejl!';
! $lang['l_error_calendar'] 		= 'Kalenderen "%s" var under behandling da denne fejl opstod.';
! $lang['l_error_path'] 			= 'Kan ikke &aring;bne sti: "%s"';
! $lang['l_error_back'] 			= 'Brug "Tilbage"-knappen for at komme retur.';
! $lang['l_error_remotecal'] 		= 'Denne server blokerer remote-kalendre der ikke er godkendt.';
! $lang['l_error_restrictedcal'] 	= 'Du har ford&oslash;gt at tilg&aring; en kalender der er begr&arlig;nset adgang til p&aring; denne server.';
! $lang['l_error_invalidcal'] 	= 'Ugyldig kalender-fil.  Pr&oslash;v venligst en anden kalender.';
  $lang['l_error_cantopen'] 		= 'Kan ikke &aring;bne kalender.';
! $lang['l_error_cache']			= 'Kan ikke skrive til cache-folder.  Kontroll&eacute;r venligst ops&aelig;tningen.';
  
  ?>
--- 201,212 ----
  $lang['l_error_title'] 			= 'Fejl!';
  $lang['l_error_window'] 		= 'Der opstod en fejl!';
! $lang['l_error_calendar'] 		= 'Kalenderen "%s" blev behandlet da fejlen opstod.';
! $lang['l_error_path'] 			= 'Kan ikke &aring;bne stien: "%s"';
! $lang['l_error_back'] 			= 'Brug venligst "Tilbage" knappen for at g&aring; tilbage.';
! $lang['l_error_remotecal'] 		= 'Denne server blokerer for eksterne kalendere der ikke er blevet godkendt.';
! $lang['l_error_restrictedcal'] 	= 'Du har fors&oslash;gt at f&aring; adgang til en beskyttet kalender p&aring; denne server.';
! $lang['l_error_invalidcal'] 	= 'Kalenderen kan ikke l&aelig;ses. Pr&oslash;v en anden kalender.';
  $lang['l_error_cantopen'] 		= 'Kan ikke &aring;bne kalender.';
! $lang['l_error_cache']			= 'Kan ikek skrive til mellemlager-mappen. Check din konfiguration.';
  
  ?>

[PHPiCalendar-Commits] phpicalendar/functions date_functions.php, 1.42, 1.43

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

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

Modified Files:
	date_functions.php 
Log Message:
update danish

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** date_functions.php	26 Dec 2008 05:54:46 -0000	1.42
--- date_functions.php	26 Dec 2008 19:32:41 -0000	1.43
***************
*** 108,120 ****
  	$month = date("n", $timestamp)-1;
  	$day = date("j", $timestamp);
! 	$dayofweek = date("w", $timestamp);
! 	
! 	$date = str_replace('%Y', $year, $format);
! 	$date = str_replace('%e', $day, $date);
! 	$date = str_replace('%B', $monthsofyear_lang[$month], $date);
! 	$date = str_replace('%b', $monthsofyearshort_lang[$month], $date);
! 	$date = str_replace('%A', $daysofweek_lang[$dayofweek], $date);
! 	$date = str_replace('%a', $daysofweekshort_lang[$dayofweek], $date);
! 	
  	return $date;	
  	
--- 108,122 ----
  	$month = date("n", $timestamp)-1;
  	$day = date("j", $timestamp);
! 	$dayofweek = date("w", $timestamp);	
!  	$replacements = array(
!  		'%Y' =>	$year,
!  		'%e' => $day,
!  		'%B' => $monthsofyear_lang[$month],
!  		'%b' => $monthsofyearshort_lang[$month],
!  		'%A' => $daysofweek_lang[$dayofweek],
!  		'%a' => $daysofweekshort_lang[$dayofweek],
!  		'%d' => sprintf("%02d", $day)
!  	);
!  	$date = str_replace(array_keys($replacements), array_values($replacements), $format);	
  	return $date;	
  	

[PHPiCalendar-Commits] phpicalendar/functions/parse recur_functions.php, 1.13, 1.14

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

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

Modified Files:
	recur_functions.php 
Log Message:
update danish

Index: recur_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** recur_functions.php	26 Dec 2008 08:26:31 -0000	1.13
--- recur_functions.php	26 Dec 2008 19:32:41 -0000	1.14
***************
*** 35,38 ****
--- 35,39 ----
  		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) 

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.231, 1.232

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

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

Modified Files:
	ical_parser.php 
Log Message:
squelch warnings in event.php

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.231
retrieving revision 1.232
diff -C2 -d -r1.231 -r1.232
*** ical_parser.php	26 Dec 2008 09:11:52 -0000	1.231
--- ical_parser.php	26 Dec 2008 17:07:52 -0000	1.232
***************
*** 234,242 ****
  					$field = $line[1];
  					$data = $line[2];
! 					
! 					$property = $field;
  					$prop_pos = strpos($property,';');
  					if ($prop_pos !== false) $property = substr($property,0,$prop_pos);
- 					$property = strtoupper($property);
  					
  					switch ($property) {
--- 234,240 ----
  					$field = $line[1];
  					$data = $line[2];
! 					$property = strtoupper($field);
  					$prop_pos = strpos($property,';');
  					if ($prop_pos !== false) $property = substr($property,0,$prop_pos);
  					
  					switch ($property) {

[PHPiCalendar-Commits] phpicalendar/functions/parse parse_tzs.php, 1.5, 1.6

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

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

Modified Files:
	parse_tzs.php 
Log Message:
squelch warnings in event.php

Index: parse_tzs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/parse_tzs.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** parse_tzs.php	26 Dec 2008 05:54:46 -0000	1.5
--- parse_tzs.php	26 Dec 2008 17:07:52 -0000	1.6
***************
*** 55,65 ****
  			break;
  		default:
! 			unset ( $data, $prop_pos, $property);
! 			if (ereg ("([^:]+):(.*)", $line, $arr)){
! 				$property = $arr[1];
! 				$data = $arr[2];
  				$prop_pos = strpos($property,';');
  				if ($prop_pos !== false) $property = substr($property,0,$prop_pos);
- 				$property = strtoupper($property);
  				switch ($property) {		
  					case 'TZID':
--- 55,65 ----
  			break;
  		default:
! 			unset ($field, $data, $prop_pos, $property);
! 			if (ereg ("([^:]+):(.*)", $line, $line)){
! 				$field = $line[1];
! 				$data = $line[2];				
! 				$property = strtoupper($field);
  				$prop_pos = strpos($property,';');
  				if ($prop_pos !== false) $property = substr($property,0,$prop_pos);
  				switch ($property) {		
  					case 'TZID':