diff options
| author | Chad Little <clittle@users.sourceforge.net> | 2003-09-21 03:22:08 +0000 |
|---|---|---|
| committer | Chad Little <clittle@users.sourceforge.net> | 2003-09-21 03:22:08 +0000 |
| commit | 816cc749dc0110f0f7f9474296b03242a087d2e7 (patch) | |
| tree | a87cc59cd89317bf31d6828777d7fcc05698d050 | |
| parent | 2450f15799cf36e8ba872ce746659eb15102ebff (diff) | |
| download | phpicalendar-816cc749dc0110f0f7f9474296b03242a087d2e7.tar.gz phpicalendar-816cc749dc0110f0f7f9474296b03242a087d2e7.tar.bz2 phpicalendar-816cc749dc0110f0f7f9474296b03242a087d2e7.zip | |
Completed (hopefully) the move to header/footer on all pages. Cleaned up
header a bit.
| -rw-r--r-- | functions/error.php | 24 | ||||
| -rw-r--r-- | includes/header.inc.php | 7 | ||||
| -rw-r--r-- | preferences.php | 1 | ||||
| -rw-r--r-- | search.php | 1 |
4 files changed, 12 insertions, 21 deletions
diff --git a/functions/error.php b/functions/error.php index 1f555a2..7070769 100644 --- a/functions/error.php +++ b/functions/error.php @@ -1,5 +1,7 @@ <?php if (!defined('BASE')) define('BASE','../'); +$current_view = 'error'; +$display_date = $error_title_lang; function error($error_msg='There was an error processing the request.', $file='NONE') { global $style_sheet, $powered_by_lang, $version_lang, $error_title_lang, $error_window_lang, $error_calendar_lang, $error_back_lang, $enable_rss, $this_site_is_lang; @@ -14,16 +16,10 @@ function error($error_msg='There was an error processing the request.', $file='N if (!isset($this_site_is_lang)) $this_site_is_lang = 'This site is'; $error_calendar = sprintf($error_calendar_lang, $file); + include (BASE.'includes/header.inc.php'); + ?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> -<html> -<head> - <meta http-equiv="content-type" content="text/html;charset=UTF-8"> - <title><?php echo $error_title_lang; ?></title> - <link rel="stylesheet" type="text/css" href="styles/<?php echo "$style_sheet/default.css"; ?>"> -</head> -<body bgcolor="#FFFFFF"> + <center> <table border="0" width="700" cellspacing="0" cellpadding="0"> <tr> @@ -64,11 +60,11 @@ function error($error_msg='There was an error processing the request.', $file='N </td> </tr> </table> -<?php include (BASE.'includes/footer.inc.php'); ?> </center> -</body> -</html> +<?php + + include (BASE.'includes/footer.inc.php'); -<?php } -?> + +?>
\ No newline at end of file diff --git a/includes/header.inc.php b/includes/header.inc.php index 12d2943..6c35d0d 100644 --- a/includes/header.inc.php +++ b/includes/header.inc.php @@ -1,10 +1,3 @@ -<? - -if ($current_view == 'preferences') $display_date = $preferences_lang; -if ($current_view == 'search') $display_date = $results_lang; - -?> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> <html> diff --git a/preferences.php b/preferences.php index 49bfded..e7d464f 100644 --- a/preferences.php +++ b/preferences.php @@ -2,6 +2,7 @@ define('BASE','./'); include(BASE.'functions/ical_parser.php'); +$display_date = $preferences_lang; if ($cookie_uri == '') { $cookie_uri = $HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/')); @@ -2,6 +2,7 @@ define('BASE','./'); $current_view = 'search'; +$display_date = $results_lang; include('./functions/ical_parser.php'); if (isset($HTTP_SERVER_VARS['HTTP_REFERER']) && $HTTP_SERVER_VARS['HTTP_REFERER'] != '') { |