[PHPiCalendar-Commits] phpicalendar day.php,1.96,1.97 preferences.php,1.31,1.32 week.php,1.97,1.98

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

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

Modified Files:
	day.php preferences.php week.php 
Log Message:
Forgot to commit change of references to all_calenders_combined971 to
$ALL_CALENDARS_COMBINED for these files.


Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** day.php	18 Sep 2003 00:49:03 -0000	1.96
--- day.php	20 Sep 2003 00:17:58 -0000	1.97
***************
*** 251,256 ****
  												  echo '<tr>'."\n";
  												  echo '<td class="eventbg_'.$event_calno.'">';
! 												  // Todo: keep track of where the event comes from, and indicate that to openevent instead of "all_calenders_combined971"
! 												  if ($cal == 'all_calenders_combined971') $calendar_name2=$cal; else $calendar_name2=$calendar_name;
  										  		  openevent("$calendar_name2",
  												  "$event_start",
--- 251,256 ----
  												  echo '<tr>'."\n";
  												  echo '<td class="eventbg_'.$event_calno.'">';
! 												  // Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
! 												  if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
  										  		  openevent("$calendar_name2",
  												  "$event_start",

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** preferences.php	17 Sep 2003 05:18:23 -0000	1.31
--- preferences.php	20 Sep 2003 00:17:58 -0000	1.32
***************
*** 179,186 ****
  												// add option to open all (non-web) calenders together
  												// Todo: add $all_calenders_combined_lang (plural) in the language-specific files and use it here
! 												if ($cookie_calendar == 'all_calenders_combined971') {
! 													print "<option value=\"all_calenders_combined971\" selected>$all_cal_comb_lang</option>\n";
  												} else {
! 													print "<option value=\"all_calenders_combined971\">$all_cal_comb_lang</option>\n";
  												}
  			
--- 179,186 ----
  												// add option to open all (non-web) calenders together
  												// Todo: add $all_calenders_combined_lang (plural) in the language-specific files and use it here
! 												if ($cookie_calendar == $ALL_CALENDARS_COMBINED) {
! 													print "<option value=\"$ALL_CALENDARS_COMBINED\" selected>$all_cal_comb_lang</option>\n";
  												} else {
! 													print "<option value=\"$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>\n";
  												}
  			

Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** week.php	18 Sep 2003 00:49:03 -0000	1.97
--- week.php	20 Sep 2003 00:17:59 -0000	1.98
***************
*** 305,310 ****
  																	$event_end	= $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
  																	$event_end 		= date ($timeFormat, $event_end);
! 																	// Todo: keep track of where the event comes from, and indicate that to openevent instead of "all_calenders_combined971"
! 																	if ($cal == 'all_calenders_combined971') $calendar_name2=$cal; else $calendar_name2=$calendar_name;
  																	openevent("$calendar_name2",
  																		  "$event_start",
--- 305,310 ----
  																	$event_end	= $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
  																	$event_end 		= date ($timeFormat, $event_end);
! 																	// Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
! 																	if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
  																	openevent("$calendar_name2",
  																		  "$event_start",