[PHPiCalendar-Commits] phpicalendar default_config.php, 1.10, 1.11 error.php, 1.6, 1.7 preferences.php, 1.68, 1.69

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

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

Modified Files:
	default_config.php error.php preferences.php 
Log Message:
change handling of multiday allday events in week view; other misc changes

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** default_config.php	28 Dec 2008 11:55:43 -0000	1.10
--- default_config.php	29 Dec 2008 03:07:34 -0000	1.11
***************
*** 23,27 ****
  		$this->gridLength 				= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
  		$this->num_years 				= '1';				// Number of years (up and back) to display in 'Jump to'
! 		$this->month_event_lines 		= '1';				// Number of lines to wrap each event title in month view, 0 means display all lines.
  		$this->tomorrows_events_lines 	= '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
  		$this->allday_week_lines 		= '1';				// Number of lines to wrap each event title in all-day events in week view, 0 means display all lines.
--- 23,27 ----
  		$this->gridLength 				= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
  		$this->num_years 				= '1';				// Number of years (up and back) to display in 'Jump to'
! 		$this->month_event_lines 		= '0';				// Number of lines to wrap each event title in month view, 0 means display all lines.
  		$this->tomorrows_events_lines 	= '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
  		$this->allday_week_lines 		= '1';				// Number of lines to wrap each event title in all-day events in week view, 0 means display all lines.

Index: error.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/error.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** error.php	28 Dec 2008 10:50:57 -0000	1.6
--- error.php	29 Dec 2008 03:07:34 -0000	1.7
***************
*** 45,49 ****
  		'error_msg'	 		=> $error_msg,
  		'error_calendar' 	=> $error_calendar,
- 		'generated'	 		=> $generated,
  		'l_powered_by'		=> $lang['l_powered_by'],
  		'l_error_back'		=> $lang['l_error_back'],
--- 45,48 ----

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** preferences.php	28 Dec 2008 19:30:41 -0000	1.68
--- preferences.php	29 Dec 2008 03:07:34 -0000	1.69
***************
*** 157,174 ****
  	'CET',
  	'EET',
- 	'Etc/GMT-1',
- 	'Etc/GMT-2',
- 	'Etc/GMT-3',
- 	'Etc/GMT-4',
- 	'Etc/GMT-5',
- 	'Etc/GMT-6',
- 	'Etc/GMT-7',
- 	'Etc/GMT-8',
- 	'Etc/GMT-9',
- 	'Etc/GMT-10',
- 	'Etc/GMT-11',
- 	'Etc/GMT-12',
- 	'Etc/GMT-13',
  	'Etc/GMT-14',
  	'Etc/GMT+1',
  	'Etc/GMT+2',
--- 157,174 ----
  	'CET',
  	'EET',
  	'Etc/GMT-14',
+ 	'Etc/GMT-13',
+ 	'Etc/GMT-12',
+ 	'Etc/GMT-11',
+ 	'Etc/GMT-10',
+ 	'Etc/GMT-9',
+ 	'Etc/GMT-8',
+ 	'Etc/GMT-7',
+ 	'Etc/GMT-6',
+ 	'Etc/GMT-5',
+ 	'Etc/GMT-4',
+ 	'Etc/GMT-3',
+ 	'Etc/GMT-2',
+ 	'Etc/GMT-1',
  	'Etc/GMT+1',
  	'Etc/GMT+2',
***************
*** 188,197 ****
  	'WET'
  );
  $timezone_select = '';
! foreach ($timezone_subset as $i => $timezone) {
! 	if ($timezone_subset[$i] == $cookie_timezone) {
  		$timezone_select .= "<option value='$timezone' selected='selected'>$timezone</option>\n";
  	} else {
! 		$timezone_select .= "<option value='$timezone.'>$timezone</option>\n";
  	}
  }
--- 188,198 ----
  	'WET'
  );
+ 
  $timezone_select = '';
! foreach ($timezone_subset as $timezone) {
! 	if ($timezone == $cookie_timezone) {
  		$timezone_select .= "<option value='$timezone' selected='selected'>$timezone</option>\n";
  	} else {
! 		$timezone_select .= "<option value='$timezone'>$timezone</option>\n";
  	}
  }
***************
*** 210,216 ****
  closedir($dir_handle);
  
- $php_ended = getmicrotime();
- $generated = number_format(($php_ended-$php_started),3);
- 
  $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/preferences.tpl');
  
--- 211,214 ----
***************
*** 243,247 ****
  	'style_select' 		=> $style_select,
  	'display_date'	 	=> $lang['l_preferences'],
- 	'generated'	 		=> $generated,
  	'message'	 		=> $message,
  	'l_preferences'		=> $lang['l_preferences'],
--- 241,244 ----