[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php,1.9,1.10

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

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

Modified Files:
	calendar_functions.php 
Log Message:
Took acc out of list



Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** calendar_functions.php	14 Sep 2005 20:44:55 -0000	1.9
--- calendar_functions.php	27 Oct 2005 17:41:24 -0000	1.10
***************
*** 194,199 ****
  					$return .= "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp</option>\n";	
  			}
! 		}
! 		else {
  		$cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp);
  		if ($cal_httpPrefix_tmp == urldecode($cal)) {
--- 194,198 ----
  					$return .= "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp</option>\n";	
  			}
! 		} else {
  		$cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp);
  		if ($cal_httpPrefix_tmp == urldecode($cal)) {
***************
*** 202,215 ****
  			$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\">$cal_displayname_tmp</option>";	
  		}
! 	}			
  	}			
  
  	// 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>";
  	}
- 	
  	return $return;
  }
\ No newline at end of file
--- 201,215 ----
  			$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\">$cal_displayname_tmp</option>";	
  		}
! 	 }			
  	}			
  
  	// option to open all (non-web) calenders together
! 	if (!$pick) {
! 		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>";
! 		}
  	}
  	return $return;
  }
\ No newline at end of file