aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README14
-rw-r--r--admin.php6
-rw-r--r--day.php4
-rw-r--r--includes/footer.inc.php7
-rw-r--r--includes/header.inc.php7
-rw-r--r--month.php6
-rw-r--r--preferences.php5
-rw-r--r--print.php4
-rw-r--r--search.php20
-rw-r--r--week.php5
-rw-r--r--year.php4
11 files changed, 36 insertions, 46 deletions
diff --git a/README b/README
index a65e825..91b6b1a 100644
--- a/README
+++ b/README
@@ -73,13 +73,15 @@ COPYING for more information about our license.
Changes:
--------
0.9.4
- -Vastly improved BYDAY, BYMONTHDAY support
- -Improved DURATION Support
+ -Vastly improved BYDAY, BYMONTHDAY, BYYEARDAY support.
+ -Improved DURATION Support.
-Smaller HTML footprint on all pages with same look and feel.
- -Combined Calendars automatically refresh when changes are made
- -Vtodo popup works again
- -Validation increased on multiple pages
- -Fixed a bug not listing blacklisted calendars
+ -Combined Calendars automatically refresh when changes are made.
+ -Vtodo popup works again.
+ -Validation increased on multiple pages.
+ -Fixed a bug not listing blacklisted calendars.
+ -Moved HTML head into header.inc.php to better support embedding of calendar.
+ -Moved HTML foot into footer.inc.php to better support embedding of calendar.
0.9.3
-Multiple calendar support (up to 8).
diff --git a/admin.php b/admin.php
index 14ec9c7..7b72859 100644
--- a/admin.php
+++ b/admin.php
@@ -271,13 +271,9 @@ if ($action == "delete") {
</td>
</tr>
</table>
-
+</center>
<?php include (BASE.'includes/footer.inc.php'); ?>
-</center>
-</body>
-</html>
-
diff --git a/day.php b/day.php
index 8ca7a8e..85d7dd8 100644
--- a/day.php
+++ b/day.php
@@ -304,11 +304,9 @@ include (BASE.'includes/header.inc.php');
<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
<td width="170" valign="top">
<?php include (BASE.'includes/sidebar.php'); ?>
- <?php include (BASE.'includes/footer.inc.php'); ?>
</td>
</tr>
</table>
</center>
-</body>
-</html>
+<?php include (BASE.'includes/footer.inc.php'); ?>
diff --git a/includes/footer.inc.php b/includes/footer.inc.php
index 07b5038..65a46a2 100644
--- a/includes/footer.inc.php
+++ b/includes/footer.inc.php
@@ -1,6 +1,6 @@
<?php
-echo "<center><font class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.4</a>";
+echo "<center class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.4</a>";
if ($enable_rss == 'yes') {
echo "<br>\n";
if ((isset($current_view)) && ($current_view == 'rssindex')) {
@@ -9,6 +9,9 @@ if ($enable_rss == 'yes') {
echo $this_site_is_lang.' <a class="psf" href="'.BASE.'rss/index.php?cal='.$cal.'&amp;getdate='.$getdate.'">RSS-Enabled</a>';
}
}
-echo '</font></center>';
+echo '</center>';
?>
+
+</body>
+</html>
diff --git a/includes/header.inc.php b/includes/header.inc.php
index 09ceb52..12d2943 100644
--- a/includes/header.inc.php
+++ b/includes/header.inc.php
@@ -1,4 +1,9 @@
-<? if ($current_view == 'preferences') $display_date = $preferences_lang; ?>
+<?
+
+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">
diff --git a/month.php b/month.php
index e9ad944..2d75f48 100644
--- a/month.php
+++ b/month.php
@@ -233,7 +233,7 @@ include (BASE.'includes/header.inc.php');
?>
</table>
<?php } ?>
-<?php include (BASE.'includes/footer.inc.php'); ?>
</center>
-</body>
-</html>
+<?php include (BASE.'includes/footer.inc.php'); ?>
+
+
diff --git a/preferences.php b/preferences.php
index dbe664b..49bfded 100644
--- a/preferences.php
+++ b/preferences.php
@@ -321,7 +321,6 @@ include (BASE.'includes/header.inc.php');
</td>
</tr>
</table>
-<?php include (BASE.'includes/footer.inc.php'); ?>
</center>
-</body>
-</html>
+<?php include (BASE.'includes/footer.inc.php'); ?>
+
diff --git a/print.php b/print.php
index a4eafa9..6cfcc44 100644
--- a/print.php
+++ b/print.php
@@ -166,7 +166,5 @@ include (BASE.'includes/header.inc.php');
</td>
</tr>
</table>
-<?php include (BASE.'includes/footer.inc.php'); ?>
</center>
-</body>
-</html>
+<?php include (BASE.'includes/footer.inc.php'); ?>
diff --git a/search.php b/search.php
index 95d6762..fb9f880 100644
--- a/search.php
+++ b/search.php
@@ -86,18 +86,10 @@ $search_ended = getmicrotime();
$search_took = number_format(($search_ended-$search_started),3);
+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 "$calendar_name - $results_lang"; ?></title>
- <link rel="stylesheet" type="text/css" href="styles/<?php echo $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" bgcolor="#FFFFFF" class="calborder">
<tr>
@@ -283,10 +275,10 @@ $search_took = number_format(($search_ended-$search_started),3);
</tr>
</table>
</center>
-<?php include (BASE.'includes/footer.inc.php'); ?>
-</body>
-</html>
-<?php
+<?php
+
+include (BASE.'includes/footer.inc.php');
+
// takes a boolean search and formats it into an array
// use with sister function search_boolean()
diff --git a/week.php b/week.php
index 04e8d58..0d3e0c7 100644
--- a/week.php
+++ b/week.php
@@ -359,10 +359,9 @@ include (BASE.'includes/header.inc.php');
<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
<td width="170" valign="top">
<?php include (BASE.'includes/sidebar.php'); ?>
- <?php include (BASE.'includes/footer.inc.php'); ?>
</td>
</tr>
</table>
-</body>
-</html>
+</center>
+<?php include (BASE.'includes/footer.inc.php'); ?>
diff --git a/year.php b/year.php
index b42c996..13755f7 100644
--- a/year.php
+++ b/year.php
@@ -167,7 +167,5 @@ include (BASE.'includes/header.inc.php');
?>
</tr>
</table>
-<?php include (BASE.'includes/footer.inc.php'); ?>
</center>
-</body>
-</html>
+<?php include (BASE.'includes/footer.inc.php'); ?>

© 2014-2024 Faster IT GmbH | imprint | privacy policy