[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php,1.5,1.6 list_functions.php,1.5,1.6

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6076/functions

Modified Files:
	calendar_functions.php list_functions.php 
Log Message:
More XHTML conversion.



Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** calendar_functions.php	28 Jan 2004 07:27:23 -0000	1.5
--- calendar_functions.php	15 May 2004 03:07:21 -0000	1.6
***************
*** 180,184 ****
  		$cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp);
  		if ($cal_httpPrefix_tmp == urldecode($cal)) {
! 			$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\" selected>$cal_displayname_tmp</option>";
  		} else {
  			$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\">$cal_displayname_tmp</option>";	
--- 180,184 ----
  		$cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp);
  		if ($cal_httpPrefix_tmp == urldecode($cal)) {
! 			$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\" selected=\"selected\">$cal_displayname_tmp</option>";
  		} else {
  			$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\">$cal_displayname_tmp</option>";	
***************
*** 188,192 ****
  	// option to open all (non-web) calenders together
  	if ($cal == $ALL_CALENDARS_COMBINED) {
! 		$return .=  "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\" selected>$all_cal_comb_lang</option>";
  	} else {
  		$return .=  "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\">$all_cal_comb_lang</option>";
--- 188,192 ----
  	// option to open all (non-web) calenders together
  	if ($cal == $ALL_CALENDARS_COMBINED) {
! 		$return .=  "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>";
  	} else {
  		$return .=  "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&amp;getdate=$getdate\">$all_cal_comb_lang</option>";

Index: list_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** list_functions.php	15 May 2004 02:42:15 -0000	1.5
--- list_functions.php	15 May 2004 03:07:22 -0000	1.6
***************
*** 30,34 ****
  		$select_month 	= localizeDate($dateFormat_month, $month_time);
  		if ($month_month == $getdate_month) {
! 			$return .= "<option value=\"month.php?cal=$cal&amp;getdate=$monthdate\" selected>$select_month</option>\n";
  		} else {
  			$return .= "<option value=\"month.php?cal=$cal&amp;getdate=$monthdate\">$select_month</option>\n";
--- 30,34 ----
  		$select_month 	= localizeDate($dateFormat_month, $month_time);
  		if ($month_month == $getdate_month) {
! 			$return .= "<option value=\"month.php?cal=$cal&amp;getdate=$monthdate\" selected=\"selected\">$select_month</option>\n";
  		} else {
  			$return .= "<option value=\"month.php?cal=$cal&amp;getdate=$monthdate\">$select_month</option>\n";
***************
*** 54,58 ****
  	$getdate_date = date("Ymd", $year_time);
  	$getdate_year = date("Y", $year_time);
! 	$return .= "<option value=\"year.php?cal=$cal&amp;getdate=$getdate_date\" selected>$getdate_year</option>\n";
  	
  	for ($i=0; $i < $num_years; $i++) {
--- 54,58 ----
  	$getdate_date = date("Ymd", $year_time);
  	$getdate_year = date("Y", $year_time);
! 	$return .= "<option value=\"year.php?cal=$cal&amp;getdate=$getdate_date\" selected=\"selected\">$getdate_year</option>\n";
  	
  	for ($i=0; $i < $num_years; $i++) {
***************
*** 84,88 ****
  	
  		if (($check_week >= $start_week_time) && ($check_week <= $end_week_time)) {
! 			$return .= "<option value=\"week.php?cal=$cal&amp;getdate=$weekdate\" selected>$select_week1 - $select_week2</option>\n";
  		} else {
  			$return .= "<option value=\"week.php?cal=$cal&amp;getdate=$weekdate\">$select_week1 - $select_week2</option>\n";
--- 84,88 ----
  	
  		if (($check_week >= $start_week_time) && ($check_week <= $end_week_time)) {
! 			$return .= "<option value=\"week.php?cal=$cal&amp;getdate=$weekdate\" selected=\"selected\">$select_week1 - $select_week2</option>\n";
  		} else {
  			$return .= "<option value=\"week.php?cal=$cal&amp;getdate=$weekdate\">$select_week1 - $select_week2</option>\n";
***************
*** 103,107 ****
  			$language_tmp = urlencode(ucfirst(substr($file, 0, -8)));
  			if ($language_tmp == $tmp_pref_language) {
! 				$return .= "<option value=\"$current_view.php?chlang=$language_tmp\" selected>in $language_tmp</option>\n";
  			} else {
  				$return .= "<option value=\"$current_view.php?chlang=$language_tmp\">in $language_tmp</option>\n";
--- 103,107 ----
  			$language_tmp = urlencode(ucfirst(substr($file, 0, -8)));
  			if ($language_tmp == $tmp_pref_language) {
! 				$return .= "<option value=\"$current_view.php?chlang=$language_tmp\" selected=\"selected\">in $language_tmp</option>\n";
  			} else {
  				$return .= "<option value=\"$current_view.php?chlang=$language_tmp\">in $language_tmp</option>\n";