kill admin.php; misc other changes; bump rc num

1 files changed, 8 insertions, 15 deletions

diff --git a/error.php b/error.php
index 35e9e19..a7ae585 100644
--- a/error.php
+++ b/error.php
@@ -3,18 +3,11 @@ if (!defined('BASE')) define('BASE','./');
 require_once(BASE.'functions/template.php');
 
 
-function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='./') {
-	global $language, $enable_rss, $lang, $charset, $phpiCal_config;
+function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='') {
+	global $getdate, $rss_powered, $lang, $phpiCal_config, $cal;
 	if (!isset($template))					$template = $phpiCal_config->template;
-	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);
+	$error_calendar 	= sprintf($lang['l_error_calendar'], print_r($file,true));
 	$current_view 		= 'error';
 	$display_date 		= $lang['l_error_title'];
 	$calendar_name 		= $lang['l_error_title'];
@@ -27,7 +20,6 @@ function error($error_msg='There was an error processing the request.', $file='N
 			$default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
 		}
 	}
-	
 	$page = new Page(BASE.'templates/'.$template.'/error.tpl');
 	
 	$page->replace_files(array(
@@ -36,12 +28,12 @@ function error($error_msg='There was an error processing the request.', $file='N
 	));
 
 	$page->replace_tags(array(
-		'version'			=> $phpicalendar_version,
-		'default_path'		=> $default_path.'/',
+		'version'			=> $phpiCal_config->phpicalendar_version,
+		'default_path'		=> $phpiCal_config->default_path.$error_base,
 		'template'			=> $template,
 		'cal'				=> $cal,
 		'getdate'			=> $getdate,
-		'charset'			=> $charset,
+		'charset'			=> $phpiCal_config->charset,
 		'calendar_name'		=> $calendar_name,
 		'display_date'		=> $display_date,
 		'rss_powered'	 	=> $rss_powered,
@@ -55,7 +47,8 @@ function error($error_msg='There was an error processing the request.', $file='N
 		'generated'	 		=> $generated,
 		'l_powered_by'		=> $lang['l_powered_by'],
 		'l_error_back'		=> $lang['l_error_back'],
-		'l_error_window'	=> $lang['l_error_window']
+		'l_error_window'	=> $lang['l_error_window'],
+		'l_this_site_is'	=> $lang['l_this_site_is']			
 				
 		));