X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=calendar.php;h=fff508c7dbab9e85c10c1797dc74424c5d81c4c5;hp=78fc206af7d7ee2878bef1141c61273e6a5cd60a;hb=HEAD;hpb=b063dc432f05059d76aa02b08fe94c705ef66868

diff --git a/calendar.php b/calendar.php
index 78fc206..fff508c 100644
--- a/calendar.php
+++ b/calendar.php
@@ -1,30 +1,17 @@
 <?php
 
-#  Copyright (C) 2006 Jason Woofenden
-#
-#  This file is part of wfpl.
-#
-#  wfpl is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  wfpl is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with wfpl; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-#  MA 02111-1307, USA.
+# This program is in the public domain within the United States. Additionally,
+# we waive copyright and related rights in the work worldwide through the CC0
+# 1.0 Universal public domain dedication, which can be found at
+# http://creativecommons.org/publicdomain/zero/1.0/
+
 
 
 # This file generates a simple calendar which looks something like this:
 #
 #            December 2006
 #     Sun Mon Tue Wed Thu Fri Sat
-#      1   2
+#                          1   2
 #      3   4   5   6   7   8   9
 #     10  11  12  13  14  15  16
 #     17  18  19  20  21  22  23
@@ -38,7 +25,7 @@
 
 
 
-require_once('code/wfpl/template.php');
+require_once(__DIR__.'/'.'template.php');
 
 function calendar_week(&$template) {
 	$template->sub('week');
@@ -49,9 +36,16 @@ function calendar_day($kind, &$template) {
 	$template->sub('day');
 }
 
-function calendar($year, $month, $events = 0, &$template = 0) {
-	if($template == 0) {
-		$template = $GLOBALS['wfpl_template'];
+# php4 is broken, in that you cannot set a default value for a parameter that
+# is passed by reference. So, this is set up to use the following screwy
+# syntax:
+#
+# calendar('2006', '12', $events, ref($my_template))
+function calendar($year, $month, $events = 0, $template = 0) {
+	if($template === 0) {
+		$template = &$GLOBALS['wfpl_template'];
+	} else {
+		$template = &$template->ref;
 	}
 
 	if(strlen($year) == 2) {
@@ -64,7 +58,7 @@ function calendar($year, $month, $events = 0, &$template = 0) {
 	$template->set('month_year', strftime('%B', $start_timestamp) . " " . $year);
 
 	# number of non-day slots at the begining of the month
-	$pre_non_days = date( 'w', $start_timestamp );
+	$pre_non_days = date('w', $start_timestamp );
 
 	# first display empty cells so the 1st can be in the right column
 	while($cell < $pre_non_days) {
@@ -73,7 +67,7 @@ function calendar($year, $month, $events = 0, &$template = 0) {
 	}
 
 	# do the days in this month
-	$days_count = date( 't', $start_timestamp );
+	$days_count = date('t', $start_timestamp );
 	for($day = 1; $day <= $days_count; $day++ ) {
 		$template->set('day_number', $day);
 		if(($cell + 1) % 7 < 2) {
@@ -103,5 +97,3 @@ function calendar($year, $month, $events = 0, &$template = 0) {
 		calendar_week($template);
 	}
 }
-
-?>