Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6168
Modified Files:
config.inc.php
Added Files:
error.php
Log Message:
Errors now seem to all work!
--- NEW FILE: error.php ---
<?php
if (!defined('BASE')) define('BASE','./');
require_once(BASE.'functions/template.php');
function error($error_msg='There was an error processing the request.', $file='NONE') {
global $template, $language, $enable_rss, $lang;
if (!isset($template)) $template = 'default';
if (!isset($lang['l_powered_by'])) $lang['l_powered_by'] = 'Powered by';
if (!isset($lang['l_error_title'])) $lang['l_error_title'] = 'Error!';
if (!isset($lang['l_error_window'])) $lang['l_error_window'] = 'There was an error!';
if (!isset($lang['l_error_calendar'])) $lang['l_error_calendar'] = 'The calendar "%s" was being processed when this error occurred.';
if (!isset($lang['l_error_back'])) $lang['l_error_back'] = 'Please use the "Back" button to return.';
if (!isset($lang['l_this_site_is'])) $lang['l_this_site_is'] = 'This site is';
if (!isset($enable_rss)) $enable_rss = 'no';
$error_calendar = sprintf($lang['l_error_calendar'], $file);
$current_view = 'error';
$display_date = $lang['l_error_title'];
$calendar_name = $lang['l_error_title'];
$page = new Page(BASE.'templates/'.$template.'/error.tpl');
$page->replace_files(array(
'header' => BASE.'templates/'.$template.'/header.tpl',
'footer' => BASE.'templates/'.$template.'/footer.tpl',
));
$page->replace_tags(array(
'default_path' => '',
'template' => $template,
'cal' => $cal,
'getdate' => $getdate,
'calendar_name' => $calendar_name,
'display_date' => $display_date,
'rss_powered' => $rss_powered,
'rss_available' => '',
'event_js' => '',
'todo_js' => '',
'todo_available' => '',
'rss_valid' => '',
'error_msg' => $error_msg,
'error_calendar' => $error_calendar,
'generated' => $generated,
'l_powered_by' => $lang['l_powered_by'],
'l_error_back' => $lang['l_error_back'],
'l_error_window' => $lang['l_error_window']
));
$page->output();
}
?>
Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** config.inc.php 2 Oct 2004 01:23:52 -0000 1.156
--- config.inc.php 25 Oct 2004 02:21:26 -0000 1.157
***************
*** 21,25 ****
$week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
$timezone = ''; // Set timezone. Read TIMEZONES file for more information
! $calendar_path = ''; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder.
$second_offset = ''; // The time in seconds between your time and your server's time.
$bleed_time = ''; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time. Is automatically set to $day_start if left blank.
--- 21,25 ----
$week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
$timezone = ''; // Set timezone. Read TIMEZONES file for more information
! $calendar_path = ''; // Leave this blank on most installs, place your FULL FILE PATH to calendars if they are outside the phpicalendar folder.
$second_offset = ''; // The time in seconds between your time and your server's time.
$bleed_time = ''; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time. Is automatically set to $day_start if left blank.
|
