[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php,1.7,1.8 init.inc.php,1.70,1.71 error.php,1.12,NONE

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

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

Modified Files:
	calendar_functions.php init.inc.php 
Removed Files:
	error.php 
Log Message:
Errors now seem to all work!



Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** calendar_functions.php	30 Jul 2004 01:32:09 -0000	1.7
--- calendar_functions.php	25 Oct 2004 02:21:27 -0000	1.8
***************
*** 15,19 ****
  function availableCalendars($username, $password, $cal_filename, $admin = false) {
  	// Import globals.
! 	global $allow_login, $calendar_path, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $apache_map, $error_path_lang, $error_restrictedcal_lang, $error_invalidcal_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_login, $calendar_path, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $apache_map, $lang, $ALL_CALENDARS_COMBINED, $_SERVER;
  
  	// Create the list of available calendars.
***************
*** 37,41 ****
  		// Add local calendars.
  		$dir_handle = @opendir($calendar_path)
! 			or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
  		while (($file = readdir($dir_handle)) != false) {
  			// Make sure this is not a dot file and it ends with .ics,
--- 37,41 ----
  		// Add local calendars.
  		$dir_handle = @opendir($calendar_path)
! 			or die(error(sprintf($lang['l_error_path'], $calendar_path), $cal_filename));
  		while (($file = readdir($dir_handle)) != false) {
  			// Make sure this is not a dot file and it ends with .ics,
***************
*** 81,85 ****
  		// in the argument.
  		if (in_array($cal_filename, $blacklisted_cals))
! 			exit(error($error_restrictedcal_lang, $cal_filename));
  
  		// If HTTP authenticated, make sure this calendar is available
--- 81,85 ----
  		// in the argument.
  		if (in_array($cal_filename, $blacklisted_cals))
! 			exit(error($lang['l_error_restrictedcal'], $cal_filename));
  
  		// If HTTP authenticated, make sure this calendar is available
***************
*** 89,93 ****
  				// Use the invalid calendar message so that the user is
  				// not made aware of locked calendars.
! 				exit(error($error_invalidcal_lang, $cal_filename));
  			}
  		}
--- 89,93 ----
  				// Use the invalid calendar message so that the user is
  				// not made aware of locked calendars.
! 				exit(error($lang['l_error_invalidcal'], $cal_filename));
  			}
  		}
***************
*** 99,103 ****
  			// Use the invalid calendar message so that the user is
  			// not made aware of locked calendars.
! 			exit(error($error_invalidcal_lang, $cal_filename));
  		}
  		
--- 99,103 ----
  			// Use the invalid calendar message so that the user is
  			// not made aware of locked calendars.
! 			exit(error($lang['l_error_invalidcal'], $cal_filename));
  		}
  		

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** init.inc.php	5 Oct 2004 22:32:15 -0000	1.70
--- init.inc.php	25 Oct 2004 02:21:27 -0000	1.71
***************
*** 15,19 ****
  if (!defined('BASE')) define('BASE', './');
  include_once(BASE.'config.inc.php');
! include_once(BASE.'functions/error.php');
  include_once(BASE.'functions/calendar_functions.php');
  include_once(BASE.'functions/userauth_functions.php');
--- 15,19 ----
  if (!defined('BASE')) define('BASE', './');
  include_once(BASE.'config.inc.php');
! include_once(BASE.'error.php');
  include_once(BASE.'functions/calendar_functions.php');
  include_once(BASE.'functions/userauth_functions.php');

--- error.php DELETED ---