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

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

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

Modified Files:
	calendar_functions.php 
Log Message:
Fixed bug that would display webcals defined in the $list_webcals
array for $ALL_CALENDARS_COMBINED even if the global $allow_webcals
was not 'yes'.


Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** calendar_functions.php	16 Nov 2005 01:36:09 -0000	1.13
--- calendar_functions.php	24 Nov 2005 01:42:49 -0000	1.14
***************
*** 15,19 ****
  function availableCalendars($username, $password, $cal_filename, $admin = false) {
  	// Import globals.
! 	global $allow_login, $calendar_path, $recursive_path, $support_ical, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $apache_map, $lang, $ALL_CALENDARS_COMBINED, $_SERVER;
  
  	// Create the list of available calendars.
--- 15,19 ----
  function availableCalendars($username, $password, $cal_filename, $admin = false) {
  	// Import globals.
! 	global $allow_webcals, $allow_login, $calendar_path, $recursive_path, $support_ical, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $apache_map, $lang, $ALL_CALENDARS_COMBINED, $_SERVER;
  
  	// Create the list of available calendars.
***************
*** 44,48 ****
  		
  	// Add web calendars.
! 	if ($cal_filename == $ALL_CALENDARS_COMBINED || $admin) {
  		if (!isset($http_user) && !$admin) {
  			foreach ($list_webcals as $file) {
--- 44,50 ----
  		
  	// Add web calendars.
! 	if ($allow_webcals == 'yes' &&
! 		($cal_filename == $ALL_CALENDARS_COMBINED || $admin))
! 	{
  		if (!isset($http_user) && !$admin) {
  			foreach ($list_webcals as $file) {