From 302b875dae39dc968e1b81673d04787c64ded1b7 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 26 May 2003 01:25:14 +0000
Subject: [PATCH] added new range options to events calendar

---
 docs/upgrades/upgrade_5.2.6-5.3.0.sql |  2 ++
 lib/WebGUI/Wobject.pm                 |  3 ++-
 lib/WebGUI/Wobject/EventsCalendar.pm  | 11 +++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/docs/upgrades/upgrade_5.2.6-5.3.0.sql b/docs/upgrades/upgrade_5.2.6-5.3.0.sql
index 2b8a50544..8abaf4eec 100644
--- a/docs/upgrades/upgrade_5.2.6-5.3.0.sql
+++ b/docs/upgrades/upgrade_5.2.6-5.3.0.sql
@@ -610,6 +610,8 @@ insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (67, 'WebGUI',
 delete from help where helpId=4 and namespace='DataForm';
 insert into help (helpId,namespace,titleId,bodyId,seeAlso) values (4, 'DataForm', 88, 89, '1,DataForm;');
 update userProfileField set dataType='date' where fieldName='birthdate';
+delete from international where languageId=1 and namespace='EventsCalendar' and internationalId=98;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (98,1,'EventsCalendar','Now!', 1053888477,'"Something is going to happen now." This will be used to select a range in an events calendar. Now is the date and time right down to the current second.');
 
 
 
diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm
index eca7f914f..e02270cb3 100644
--- a/lib/WebGUI/Wobject.pm
+++ b/lib/WebGUI/Wobject.pm
@@ -646,7 +646,7 @@ sub new {
 			rearrange([qw(properties extendedProperties useDiscussion useTemplate)], @p);
 	} 
 	$useDiscussion = 0 unless ($useDiscussion);
-	$useTemplate = 0 unless ($useDiscussion);
+	$useTemplate = 0 unless ($useTemplate);
 	my $wobjectProperties = {
 		userDefined1=>{
 			fieldType=>"text"
@@ -742,6 +742,7 @@ sub new {
 		};
         bless({
 		_property=>$properties, 
+		_useTemplate=>$useTemplate,
 		_useDiscussion=>$useDiscussion,
 		_wobjectProperties=>$wobjectProperties,
 		_extendedProperties=>$extendedProperties
diff --git a/lib/WebGUI/Wobject/EventsCalendar.pm b/lib/WebGUI/Wobject/EventsCalendar.pm
index d6ee1079c..d3bc8e734 100644
--- a/lib/WebGUI/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Wobject/EventsCalendar.pm
@@ -236,6 +236,8 @@ sub www_edit {
 	$properties->select(
 		-name=>"startMonth",
 		-options=>{
+			"january"=>WebGUI::International::get(15),
+			"now"=>WebGUI::International::get(98,$_[0]->get("namespace")),
 			"current"=>WebGUI::International::get(82,$_[0]->get("namespace")),
 			"first"=>WebGUI::International::get(83,$_[0]->get("namespace"))
 			},
@@ -433,9 +435,14 @@ sub www_view {
 	if ($_[0]->get("startMonth") eq "first") {
 		($minDate) = WebGUI::SQL->quickArray("select min(startDate) from EventsCalendar_event 
 			where wobjectId=".$_[0]->get("wobjectId"));
+	} elsif ($_[0]->get("startMonth") eq "january") {
+		$minDate = WebGUI::DateTime::humanToEpoch(WebGUI::DateTime::epochToHuman("","%y")."-01-01 00:00:00");
+	} else {
+		$minDate = WebGUI::DateTime::time();
+	}
+	unless ($_[0]->get("startMonth") eq "now") {
+		($minDate,$junk) = WebGUI::DateTime::monthStartEnd($minDate);
 	}
-	$minDate = $minDate || WebGUI::DateTime::time();
-	($minDate,$junk) = WebGUI::DateTime::monthStartEnd($minDate);
 	if ($_[0]->get("endMonth") eq "last") {
 		($maxDate) = WebGUI::SQL->quickArray("select max(endDate) from EventsCalendar_event where 
 			wobjectId=".$_[0]->get("wobjectId"));