Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv28204 Modified Files: admin.php config.inc.php day.php month.php preferences.php print.php week.php year.php Log Message: Moved all html head/meta data/body/ect to 'header.inc.php' so people can more easily modify the top to fit their site. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin.php 30 May 2003 00:45:20 -0000 1.4 --- admin.php 17 Sep 2003 05:18:23 -0000 1.5 *************** *** 41,60 **** } } ?> - - <!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 "$admin_header_lang"; ?></title> - <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> - </head> - <body bgcolor="#FFFFFF"> <center> - - <?php include (BASE.'includes/header.inc.php'); ?> - <table width="640" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> --- 41,48 ---- } } + include (BASE.'includes/header.inc.php'); ?> <center> <table width="640" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** config.inc.php 16 Sep 2003 05:38:33 -0000 1.108 --- config.inc.php 17 Sep 2003 05:18:23 -0000 1.109 *************** *** 41,45 **** $enable_rss = 'yes'; // Enable RSS access to your calendars (good thing). $show_search = 'no'; // Show the search box in the sidebar. - $header_always = 'yes'; // Set to yes to have header on print.php $allow_preferences = 'yes'; // Allow visitors to change various preferences via cookies. $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). --- 41,44 ---- Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** day.php 16 Sep 2003 05:38:33 -0000 1.94 --- day.php 17 Sep 2003 05:18:23 -0000 1.95 *************** *** 43,66 **** } } ! ?> ! ! <!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 "$calendar_name - $display_date"; ?></title> ! <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> ! <?php ! // if RSS is enabled, set the RSS auto-discovery link ! if ($enable_rss == 'yes') { ! echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&rssview=day\">"; ! } ! ?> ! <?php if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); ?> ! </head> ! <body bgcolor="#FFFFFF"> ! <?php include (BASE.'includes/header.inc.php'); ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0"> --- 43,49 ---- } } ! include (BASE.'includes/header.inc.php'); ! ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0"> Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** month.php 15 Sep 2003 06:28:50 -0000 1.96 --- month.php 17 Sep 2003 05:18:23 -0000 1.97 *************** *** 35,39 **** $prev_month = date("Ymd", $prev_month_time); ! $display_month = localizeDate ($dateFormat_month, $date); $parse_month = date ("Ym", $date); $first_of_month = $this_year.$this_month."01"; --- 35,39 ---- $prev_month = date("Ymd", $prev_month_time); ! $display_date = localizeDate ($dateFormat_month, $date); $parse_month = date ("Ym", $date); $first_of_month = $this_year.$this_month."01"; *************** *** 42,64 **** $num_of_events = 0; ?> - <!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 "$calendar_name - $display_month"; ?></title> - <link rel="stylesheet" type="text/css" href="styles/<?php echo "$style_sheet/default.css"; ?>"> - <?php - // if RSS is enabled, set the RSS auto-discovery link - if ($enable_rss == 'yes') - { - echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&rssview=month\">"; - } - ?> - </head> - <body> - <?php include (BASE.'includes/header.inc.php'); ?> <center> <table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder"> --- 42,48 ---- $num_of_events = 0; + include (BASE.'includes/header.inc.php'); ?> <center> <table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder"> Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** preferences.php 15 Sep 2003 01:00:44 -0000 1.30 --- preferences.php 17 Sep 2003 05:18:23 -0000 1.31 *************** *** 65,79 **** } ?> - <!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 "$calendar_lang - $preferences_lang"; ?></title> - <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> - </head> - <body bgcolor="#FFFFFF"> - <?php include (BASE.'includes/header.inc.php'); ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0"> --- 65,71 ---- } + include (BASE.'includes/header.inc.php'); + ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0"> Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** print.php 29 May 2003 18:28:00 -0000 1.16 --- print.php 17 Sep 2003 05:18:23 -0000 1.17 *************** *** 9,62 **** } ! $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); ! $end_week_time = $start_week_time + (6 * 25 * 60 * 60); ! $parse_month = date ("Ym", strtotime($getdate)); ! $printview = $HTTP_GET_VARS['printview']; ! $cal_displayname = str_replace("32", " ", $cal); ! $events_week = 0; ! $unix_time = strtotime("$getdate"); if ($printview == 'day') { ! $print_title = localizeDate ($dateFormat_day, strtotime($getdate)); ! $next = date("Ymd", strtotime("+1 day", $unix_time)); ! $prev = date("Ymd", strtotime("-1 day", $unix_time)); ! $zero_events = $no_events_day_lang; $print_next_nav = $next_day_lang; $print_prev_nav = $last_day_lang; ! $week_start = ''; ! $week_end = ''; } elseif ($printview == 'week') { ! $start_week = localizeDate($dateFormat_week, $start_week_time); ! $end_week = localizeDate($dateFormat_week, $end_week_time); ! $print_title = "$start_week - $end_week"; ! $week_start = date("Ymd", $start_week_time); ! $week_end = date("Ymd", $end_week_time); ! $next = date("Ymd", strtotime("+1 week", $unix_time)); ! $prev = date("Ymd", strtotime("-1 week", $unix_time)); ! $zero_events = $no_events_week_lang; $print_next_nav = $next_week_lang; $print_prev_nav = $last_week_lang; } elseif ($printview == 'month') { ! $print_title = localizeDate ($dateFormat_month, strtotime($getdate)); ! $next = date("Ymd", strtotime("+1 month", $unix_time)); ! $prev = date("Ymd", strtotime("-1 month", $unix_time)); ! $zero_events = $no_events_month_lang; $print_next_nav = $next_month_lang; $print_prev_nav = $last_month_lang; ! $week_start = ''; ! $week_end = ''; } ! ?> ! <!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 "$calendar_name: $print_title"; ?></title> ! <link rel="stylesheet" type="text/css" href="styles/<?php echo $style_sheet.'/default.css'; ?>"> ! </head> ! <body bgcolor="#FFFFFF"> ! <?php if ($header_always == 'yes') include (BASE.'includes/header.inc.php'); ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder"> --- 9,54 ---- } ! $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); ! $end_week_time = $start_week_time + (6 * 25 * 60 * 60); ! $parse_month = date ("Ym", strtotime($getdate)); ! $printview = $HTTP_GET_VARS['printview']; ! $cal_displayname = str_replace("32", " ", $cal); ! $events_week = 0; ! $unix_time = strtotime("$getdate"); if ($printview == 'day') { ! $display_date = localizeDate ($dateFormat_day, strtotime($getdate)); ! $next = date("Ymd", strtotime("+1 day", $unix_time)); ! $prev = date("Ymd", strtotime("-1 day", $unix_time)); ! $zero_events = $no_events_day_lang; $print_next_nav = $next_day_lang; $print_prev_nav = $last_day_lang; ! $week_start = ''; ! $week_end = ''; } elseif ($printview == 'week') { ! $start_week = localizeDate($dateFormat_week, $start_week_time); ! $end_week = localizeDate($dateFormat_week, $end_week_time); ! $display_date = "$start_week - $end_week"; ! $week_start = date("Ymd", $start_week_time); ! $week_end = date("Ymd", $end_week_time); ! $next = date("Ymd", strtotime("+1 week", $unix_time)); ! $prev = date("Ymd", strtotime("-1 week", $unix_time)); ! $zero_events = $no_events_week_lang; $print_next_nav = $next_week_lang; $print_prev_nav = $last_week_lang; } elseif ($printview == 'month') { ! $print_title = localizeDate ($dateFormat_month, strtotime($getdate)); ! $next = date("Ymd", strtotime("+1 month", $unix_time)); ! $prev = date("Ymd", strtotime("-1 month", $unix_time)); ! $zero_events = $no_events_month_lang; $print_next_nav = $next_month_lang; $print_prev_nav = $last_month_lang; ! $week_start = ''; ! $week_end = ''; } ! include (BASE.'includes/header.inc.php'); ! ! ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder"> *************** *** 70,74 **** <tr> <td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$prev&printview=$printview\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$print_prev_nav]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $print_title; ?></font></td> <td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$next&printview=$printview\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$print_next_nav]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> --- 62,66 ---- <tr> <td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$prev&printview=$printview\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$print_prev_nav]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_date; ?></font></td> <td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$next&printview=$printview\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$print_next_nav]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** week.php 17 Sep 2003 04:36:40 -0000 1.95 --- week.php 17 Sep 2003 05:18:23 -0000 1.96 *************** *** 43,65 **** $thisdate = ($thisdate + (25 * 60 * 60)); } ?> - <!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 "$calendar_name - $display_date"; ?></title> - <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> - <?php - // if RSS is enabled, set the RSS auto-discovery link - if ($enable_rss == 'yes') { - echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&rssview=week\">"; - } - ?> - <?php if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); ?> - </head> - <body bgcolor="#FFFFFF"> - <?php include (BASE.'includes/header.inc.php'); ?> <center> <table border="0" width="720" cellspacing="0" cellpadding="0"> --- 43,50 ---- $thisdate = ($thisdate + (25 * 60 * 60)); } + include (BASE.'includes/header.inc.php'); + ?> <center> <table border="0" width="720" cellspacing="0" cellpadding="0"> Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** year.php 30 Nov 2002 21:05:39 -0000 1.22 --- year.php 17 Sep 2003 05:18:23 -0000 1.23 *************** *** 8,12 **** $this_month = $day_array2[2]; $this_year = $day_array2[1]. '01'. '01'; ! $this_year2 = $day_array2[1]; $unix_time = strtotime($getdate); --- 8,12 ---- $this_month = $day_array2[2]; $this_year = $day_array2[1]. '01'. '01'; ! $display_date = $day_array2[1]; $unix_time = strtotime($getdate); *************** *** 21,37 **** $thisday2 = localizeDate($dateFormat_week_list, $unix_time); ?> - <!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 "$calendar_name - $this_year2"; ?></title> - <link rel="stylesheet" type="text/css" href="styles/<?php echo $style_sheet.'/default.css'; ?>"> - <meta name="generator" content="BBEdit 6.5.3"> - </head> - <body> - <?php include (BASE.'includes/header.inc.php'); ?> <center> <table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder"> --- 21,27 ---- $thisday2 = localizeDate($dateFormat_week_list, $unix_time); + include (BASE.'includes/header.inc.php'); ?> <center> <table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder"> *************** *** 45,49 **** <tr> <td align="right" width="45%" class="navback"><?php echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$prev_year\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$last_year_lang]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="10%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $this_year2; ?></font></td> <td align="left" width="45%" class="navback"><?php echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$next_year\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$next_year_lang]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> --- 35,39 ---- <tr> <td align="right" width="45%" class="navback"><?php echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$prev_year\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$last_year_lang]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="10%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_date; ?></font></td> <td align="left" width="45%" class="navback"><?php echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$next_year\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$next_year_lang]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> |