lots of small bug fixes

lib/WebGUI/Asset/Event.pm

@@ -1,247 +1,247 @@
-package WebGUI::Asset::Event;
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2005 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-use strict;
-use Tie::CPHash;
-use WebGUI::DateTime;
-use WebGUI::Grouping;
-use WebGUI::HTML;
-use WebGUI::HTMLForm;
-use WebGUI::HTTP;
-use WebGUI::Icon;
-use WebGUI::Id;
-use WebGUI::International;
-use WebGUI::MessageLog;
-use WebGUI::Operation;
-use WebGUI::Paginator;
-use WebGUI::Privilege;
-use WebGUI::Session;
-use WebGUI::SQL;
-use WebGUI::Style;
-use WebGUI::Asset::Template;
-use WebGUI::URL;
-use WebGUI::User;
-use WebGUI::Utility;
-use WebGUI::Asset;
-use WebGUI::Asset::Wobject::EventsCalendar;
-
-our @ISA = qw(WebGUI::Asset);
+package WebGUI::Asset::Event;
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2005 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use strict;
+use Tie::CPHash;
+use WebGUI::DateTime;
+use WebGUI::Grouping;
+use WebGUI::HTML;
+use WebGUI::HTMLForm;
+use WebGUI::HTTP;
+use WebGUI::Icon;
+use WebGUI::Id;
+use WebGUI::International;
+use WebGUI::MessageLog;
+use WebGUI::Operation;
+use WebGUI::Paginator;
+use WebGUI::Privilege;
+use WebGUI::Session;
+use WebGUI::SQL;
+use WebGUI::Style;
+use WebGUI::Asset::Template;
+use WebGUI::URL;
+use WebGUI::User;
+use WebGUI::Utility;
+use WebGUI::Asset;
+use WebGUI::Asset::Wobject::EventsCalendar;
+
+our @ISA = qw(WebGUI::Asset);
 
 
 
-#-------------------------------------------------------------------
-sub definition {
-	my $class = shift;
-  my $definition = shift;
-  push(@{$definition}, {
-    tableName=>'EventsCalendar_Event',
-    className=>'WebGUI::Asset::Event',
-    properties=>{
-			description => {
-				fieldType=>"HTMLArea",
-				defaultValue=>undef
-				},
-			eventStartDate => {
-				fieldType=>"dateTime",
-				defaultValue=>time()
-				},
-			eventEndDate => {
-				fieldType=>"dateTime",
-				defaultValue=>time()
-				},
-			EventsCalendar_recurringId => {
-				fieldType=>"hidden",
-				defaultValue=>undef
-				},
-			eventLocation => {
-				fieldType=>"text",
-				defaultValue=>undef
-				},
-#			allowRegistration => {
-#				fieldType=>"yesNo",
-#				defaultValue=>0
-#				},
-#			allowUnregistration => {
-#				fieldType=>"yesNo",
-#				defaultValue=>0
-#				},
-#			regConfirm => {
-#				fieldType=>"yesNo",
-#				defaultValue=>0
-#				},
-#			regNotify => {
-#				fieldType=>"yesNo",
-#				defaultValue=>0
-#				},
-#			regStartDate => {
-#				fieldType=>"dateTime",
-#				defaultValue=>time()
-#				},
-#			regEndDate => {
-#				fieldType=>"dateTime",
-#				defaultValue=>time()
-#				},
-#			allowReminders => {
-#				fieldType=>"yesNo",
-#				defaultValue=>0
-#				},
-#			reminderStartDate => {
-#				fieldType=>"dateTime",
-#				defaultValue=>time()
-#				},
-#			reminderEndDate => {
-#				fieldType=>"dateTime",
-#				defaultValue=>time()
-#				},
-#			reminderRecurs => {
-#				fieldType=>"interval",
-#				defaultValue=>604800
-#				},
-#			chargeForEvent => {
-#				fieldType=>"yesNo",
-#				defaultValue=>0
-#				},
-#			firstAttendeeFee => {
-#				fieldType=>"float",
-#				defaultValue=>0
-#				},
-#			secondAttendeeFee => {
-#				fieldType=>"float",
-#				defaultValue=>0
-#				},
-#			availableSeats => {
-#				fieldType=>"integer",
-#				defaultValue=>0
-#				},
-			templateId => {
-				fieldType=>"template",
-				defaultValue=>'PBtmpl0000000000000023'
-				},
-#			regConfirmTemplateId => {
-#				fieldType=>"template",
-#				defaultValue=>'MWtmplregConfirm000001'
-#				},
-#			regNotifyTemplateId => {
-#				fieldType=>"template",
-#				defaultValue=>'MWtmplregNotify0000001'
-#				},
-#			reminderTemplateId => {
-#				fieldType=>"template",
-#				defaultValue=>'MWtmplreminder00000001'
-#				},
-#			groupCanRegister => {
-#				fieldType=>"group",
-#				defaultValue=>'2'
-#				},
-#			groupCanReminder => {
-#				fieldType=>"group",
-#				defaultValue=>'2'
-#				},
-#			groupRegNotify => {
-#				fieldType=>"group",
+#-------------------------------------------------------------------
+sub definition {
+	my $class = shift;
+  my $definition = shift;
+  push(@{$definition}, {
+    tableName=>'EventsCalendar_Event',
+    className=>'WebGUI::Asset::Event',
+    properties=>{
+			description => {
+				fieldType=>"HTMLArea",
+				defaultValue=>undef
+				},
+			eventStartDate => {
+				fieldType=>"dateTime",
+				defaultValue=>time()
+				},
+			eventEndDate => {
+				fieldType=>"dateTime",
+				defaultValue=>time()
+				},
+			EventsCalendar_recurringId => {
+				fieldType=>"hidden",
+				defaultValue=>undef
+				},
+			eventLocation => {
+				fieldType=>"text",
+				defaultValue=>undef
+				},
+#			allowRegistration => {
+#				fieldType=>"yesNo",
+#				defaultValue=>0
+#				},
+#			allowUnregistration => {
+#				fieldType=>"yesNo",
+#				defaultValue=>0
+#				},
+#			regConfirm => {
+#				fieldType=>"yesNo",
+#				defaultValue=>0
+#				},
+#			regNotify => {
+#				fieldType=>"yesNo",
+#				defaultValue=>0
+#				},
+#			regStartDate => {
+#				fieldType=>"dateTime",
+#				defaultValue=>time()
+#				},
+#			regEndDate => {
+#				fieldType=>"dateTime",
+#				defaultValue=>time()
+#				},
+#			allowReminders => {
+#				fieldType=>"yesNo",
+#				defaultValue=>0
+#				},
+#			reminderStartDate => {
+#				fieldType=>"dateTime",
+#				defaultValue=>time()
+#				},
+#			reminderEndDate => {
+#				fieldType=>"dateTime",
+#				defaultValue=>time()
+#				},
+#			reminderRecurs => {
+#				fieldType=>"interval",
+#				defaultValue=>604800
+#				},
+#			chargeForEvent => {
+#				fieldType=>"yesNo",
+#				defaultValue=>0
+#				},
+#			firstAttendeeFee => {
+#				fieldType=>"float",
+#				defaultValue=>0
+#				},
+#			secondAttendeeFee => {
+#				fieldType=>"float",
+#				defaultValue=>0
+#				},
+#			availableSeats => {
+#				fieldType=>"integer",
+#				defaultValue=>0
+#				},
+			templateId => {
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000023'
+				},
+#			regConfirmTemplateId => {
+#				fieldType=>"template",
+#				defaultValue=>'MWtmplregConfirm000001'
+#				},
+#			regNotifyTemplateId => {
+#				fieldType=>"template",
+#				defaultValue=>'MWtmplregNotify0000001'
+#				},
+#			reminderTemplateId => {
+#				fieldType=>"template",
+#				defaultValue=>'MWtmplreminder00000001'
+#				},
+#			groupCanRegister => {
+#				fieldType=>"group",
+#				defaultValue=>'2'
+#				},
+#			groupCanReminder => {
+#				fieldType=>"group",
+#				defaultValue=>'2'
+#				},
+#			groupRegNotify => {
+#				fieldType=>"group",
 #				defaultValue=>'3'
-#			}
-		}
-	});
-	return $class->SUPER::definition($definition);
-}
-
-
-
-#-------------------------------------------------------------------
-sub getEditForm {
-	my $self = shift;
-	
-	my $tabform = $self->SUPER::getEditForm();
-	#return $tabform;
-	$tabform->getTab("properties")->HTMLArea(
-		-name=>"description", -label=>WebGUI::International::get(512,"EventsCalendar"),
-		-value=>$self->getValue("description")
-		);
-	$tabform->getTab("properties")->dateTime(
-		-name=>"eventStartDate", -label=>WebGUI::International::get(513,"EventsCalendar"),
-		-extras=>'onBlur="this.form.eventEndDate.value=this.form.eventStartDate.value;this.form.until.value=this.form.eventStartDate.value;"',
-		-value=>$self->getValue("eventStartDate")
-		);
-	$tabform->getTab("properties")->dateTime(
-		-name=>"eventEndDate", -label=>WebGUI::International::get(514,"EventsCalendar"),
-		-extras=>'onBlur="this.form.until.value=this.form.eventEndDate.value;"',
-		-value=>$self->getValue("eventEndDate")
-		);
-	$tabform->getTab("properties")->text(
-		-name=>"eventLocation", -label=>WebGUI::International::get(515,"EventsCalendar"),
-		-value=>$self->getValue("eventLocation")
-		);
-#	$tabform->getTab("properties")->yesNo(
-#		-name=>"allowRegistration", -label=>WebGUI::International::get(516,"EventsCalendar"),
-#		-value=>$self->getValue("allowRegistration")
-#		);
-#	$tabform->getTab("properties")->yesNo(
-#		-name=>"allowUnregistration", -label=>WebGUI::International::get(517,"EventsCalendar"),
-#		-value=>$self->getValue("allowUnregistration")
-#		);
-#	$tabform->getTab("properties")->yesNo(
-#		-name=>"regConfirm", -label=>WebGUI::International::get(518,"EventsCalendar"),
-#		-value=>$self->getValue("regConfirm")
-#		);
-#  $tabform->getTab("properties")->yesNo(
-#		-name=>"regNotify", -label=>WebGUI::International::get(519,"EventsCalendar"),
-#		-value=>$self->getValue("regNotify")
-#		);
-#	$tabform->getTab("properties")->dateTime(
-#		-name=>"regStartDate", -label=>WebGUI::International::get(520,"EventsCalendar"),
-#		-extras=>'onBlur="this.form.regEndDate.value=this.form.regStartDate.value;this.form.until.value=this.form.regStartDate.value;"',
-#		-value=>$self->getValue("regStartDate")
-#		);
-#	$tabform->getTab("properties")->dateTime(
-#		-name=>"regEndDate", -label=>WebGUI::International::get(521,"EventsCalendar"),
-#		-extras=>'onBlur="this.form.until.value=this.form.regEndDate.value;"',
-#		-value=>$self->getValue("regEndDate")
-#		);
-#	$tabform->getTab("properties")->yesNo(
-#		-name=>"allowReminders", -label=>WebGUI::International::get(522,"EventsCalendar"),
-#		-value=>$self->getValue("allowReminders")
-#		);
-#	$tabform->getTab("properties")->dateTime(
-#		-name=>"reminderStartDate", -label=>WebGUI::International::get(523,"EventsCalendar"),
-#		-extras=>'onBlur="this.form.reminderEndDate.value=this.form.reminderStartDate.value;this.form.until.value=this.form.reminderStartDate.value;"',
-#		-value=>$self->getValue("reminderStartDate")
-#		);
-#	$tabform->getTab("properties")->dateTime(
-#		-name=>"reminderEndDate", -label=>WebGUI::International::get(524,"EventsCalendar"),
-#		-extras=>'onBlur="this.form.until.value=this.form.reminderEndDate.value;"',
-#		-value=>$self->getValue("regEndDate")
-#		);
-#	$tabform->getTab("properties")->interval(
-#		-name=>"reminderRecurs", 
-#		-label=>WebGUI::International::get(524.5,"EventsCalendar"),
-#		-value=>$self->getValue("reminderRecurs")
-#		);
+#			}
+		}
+	});
+	return $class->SUPER::definition($definition);
+}
+
+
+
+#-------------------------------------------------------------------
+sub getEditForm {
+	my $self = shift;
+	
+	my $tabform = $self->SUPER::getEditForm();
+	#return $tabform;
+	$tabform->getTab("properties")->HTMLArea(
+		-name=>"description", -label=>WebGUI::International::get(512,"EventsCalendar"),
+		-value=>$self->getValue("description")
+		);
+	$tabform->getTab("properties")->dateTime(
+		-name=>"eventStartDate", -label=>WebGUI::International::get(513,"EventsCalendar"),
+		-extras=>'onBlur="this.form.eventEndDate.value=this.form.eventStartDate.value;this.form.until.value=this.form.eventStartDate.value;"',
+		-value=>$self->getValue("eventStartDate")
+		);
+	$tabform->getTab("properties")->dateTime(
+		-name=>"eventEndDate", -label=>WebGUI::International::get(514,"EventsCalendar"),
+		-extras=>'onBlur="this.form.until.value=this.form.eventEndDate.value;"',
+		-value=>$self->getValue("eventEndDate")
+		);
+	$tabform->getTab("properties")->text(
+		-name=>"eventLocation", -label=>WebGUI::International::get(515,"EventsCalendar"),
+		-value=>$self->getValue("eventLocation")
+		);
+#	$tabform->getTab("properties")->yesNo(
+#		-name=>"allowRegistration", -label=>WebGUI::International::get(516,"EventsCalendar"),
+#		-value=>$self->getValue("allowRegistration")
+#		);
+#	$tabform->getTab("properties")->yesNo(
+#		-name=>"allowUnregistration", -label=>WebGUI::International::get(517,"EventsCalendar"),
+#		-value=>$self->getValue("allowUnregistration")
+#		);
+#	$tabform->getTab("properties")->yesNo(
+#		-name=>"regConfirm", -label=>WebGUI::International::get(518,"EventsCalendar"),
+#		-value=>$self->getValue("regConfirm")
+#		);
+#  $tabform->getTab("properties")->yesNo(
+#		-name=>"regNotify", -label=>WebGUI::International::get(519,"EventsCalendar"),
+#		-value=>$self->getValue("regNotify")
+#		);
+#	$tabform->getTab("properties")->dateTime(
+#		-name=>"regStartDate", -label=>WebGUI::International::get(520,"EventsCalendar"),
+#		-extras=>'onBlur="this.form.regEndDate.value=this.form.regStartDate.value;this.form.until.value=this.form.regStartDate.value;"',
+#		-value=>$self->getValue("regStartDate")
+#		);
+#	$tabform->getTab("properties")->dateTime(
+#		-name=>"regEndDate", -label=>WebGUI::International::get(521,"EventsCalendar"),
+#		-extras=>'onBlur="this.form.until.value=this.form.regEndDate.value;"',
+#		-value=>$self->getValue("regEndDate")
+#		);
+#	$tabform->getTab("properties")->yesNo(
+#		-name=>"allowReminders", -label=>WebGUI::International::get(522,"EventsCalendar"),
+#		-value=>$self->getValue("allowReminders")
+#		);
+#	$tabform->getTab("properties")->dateTime(
+#		-name=>"reminderStartDate", -label=>WebGUI::International::get(523,"EventsCalendar"),
+#		-extras=>'onBlur="this.form.reminderEndDate.value=this.form.reminderStartDate.value;this.form.until.value=this.form.reminderStartDate.value;"',
+#		-value=>$self->getValue("reminderStartDate")
+#		);
+#	$tabform->getTab("properties")->dateTime(
+#		-name=>"reminderEndDate", -label=>WebGUI::International::get(524,"EventsCalendar"),
+#		-extras=>'onBlur="this.form.until.value=this.form.reminderEndDate.value;"',
+#		-value=>$self->getValue("regEndDate")
+#		);
+#	$tabform->getTab("properties")->interval(
+#		-name=>"reminderRecurs", 
+#		-label=>WebGUI::International::get(524.5,"EventsCalendar"),
+#		-value=>$self->getValue("reminderRecurs")
+#		);
 # Not quite implemented yet...
-#	$tabform->getTab("properties")->yesNo(
-#		-name=>"chargeForEvent", -label=>WebGUI::International::get(525,"EventsCalendar"),
-#		-value=>$self->getValue("chargeForEvent")
-#		);
-#	$tabform->getTab("properties")->float(
-#		-name=>"firstAttendeeFee", -label=>WebGUI::International::get(526,"EventsCalendar"),
-#		-value=>$self->getValue("firstAttendeeFee")
-#		);
-#	$tabform->getTab("properties")->float(
-#		-name=>"secondAttendeeFee", -label=>WebGUI::International::get(527,"EventsCalendar"),
-#		-value=>$self->getValue("secondAttendeeFee")
-#		);
-#	$tabform->getTab("properties")->integer(
-#		-name=>"availableSeats", -label=>WebGUI::International::get(528,"EventsCalendar"),
-#		-value=>$self->getValue("availableSeats")
+#	$tabform->getTab("properties")->yesNo(
+#		-name=>"chargeForEvent", -label=>WebGUI::International::get(525,"EventsCalendar"),
+#		-value=>$self->getValue("chargeForEvent")
+#		);
+#	$tabform->getTab("properties")->float(
+#		-name=>"firstAttendeeFee", -label=>WebGUI::International::get(526,"EventsCalendar"),
+#		-value=>$self->getValue("firstAttendeeFee")
+#		);
+#	$tabform->getTab("properties")->float(
+#		-name=>"secondAttendeeFee", -label=>WebGUI::International::get(527,"EventsCalendar"),
+#		-value=>$self->getValue("secondAttendeeFee")
+#		);
+#	$tabform->getTab("properties")->integer(
+#		-name=>"availableSeats", -label=>WebGUI::International::get(528,"EventsCalendar"),
+#		-value=>$self->getValue("availableSeats")
 #		);
 	if (($session{form}{func} eq "addStyledEvent") || ($session{form}{func} eq "addEvent")) {
 		my %recursEvery;
@@ -261,98 +261,98 @@ sub getEditForm {
 		$tabform->getTab("properties")->raw('<tr><td class="formdescription" valign="top">'.WebGUI::International::get(9,"EventsCalendar").'</td><td class="tableData">');
 		$tabform->getTab("properties")->date("until");
 		$tabform->getTab("properties")->raw("</td><tr>");
-	}
-#	$tabform->getTab("display")->template(
-#    -name=>"confirmationTemplateId",
-#    -value=>$self->getValue("confirmationTemplateId"),
-#    -namespace=>"EventsCalendar/Event",
-#    -label=>WebGUI::International::get(529,"EventsCalendar"),
-#    -afterEdit=>'func=edit'
-#    );
-	$tabform->getTab("display")->template(
-    -name=>"templateId",
-    -value=>$self->getValue("templateId"),
-    -namespace=>"EventsCalendar/Event",
-    -label=>WebGUI::International::get(530,"EventsCalendar"),
-    -afterEdit=>'func=edit&wid='.$self->get("wobjectId")
-    );
-#	$tabform->getTab("display")->template(
-#    -name=>"regNotifyTemplateId",
-#    -value=>$self->getValue("regNotifyTemplateId"),
-#    -namespace=>"EventsCalendar/Event",
-#    -label=>WebGUI::International::get(531,"EventsCalendar"),
-#    -afterEdit=>'func=edit&wid='.$self->get("wobjectId")
-#    );
-#  $tabform->getTab("display")->template(
-#  	-name=>"reminderTemplateId",
-#		-value=>$self->getValue("reminderTemplateId"),
-#		-namespace=>"EventsCalendar/Event",
-#		-label=>WebGUI::International::get(532,"EventsCalendar"),
-#		-afterEdit=>'func=edit&wid='.$self->get("wobjectId")
-#		);
-#	$tabform->getTab("security")->group(
-#		-name=>"groupCanRegister", -label=>WebGUI::International::get(533,"EventsCalendar"),
-#		-value=>[$self->getValue("groupCanRegister")]
-#		);
-#	$tabform->getTab("security")->group(
-#		-name=>"groupCanReminder", -label=>WebGUI::International::get(534,"EventsCalendar"),
-#		-value=>[$self->getValue("groupCanReminder")]
-#		);
-#	$tabform->getTab("security")->group(
-#		-name=>"groupNotify", -label=>WebGUI::International::get(535,"EventsCalendar"),
-#		-value=>[$self->getValue("regNotifyGroupId")]
-#		);
-	return $tabform;
-}
-
-
-
-#-------------------------------------------------------------------
-sub getIcon {
-	my $self = shift;
-	my $small = shift;
-	return $session{config}{extrasURL}.'/assets/small/calendar.gif' if ($small);
-	return $session{config}{extrasURL}.'/assets/calendar.gif';
-}
-
-
-#-------------------------------------------------------------------
-sub getName {
-        return WebGUI::International::get(511,"EventsCalendar");
-}
-
-
-#-------------------------------------------------------------------
-sub view {
-	my $self = shift;
-	return WebGUI::Privilege::noAccess() unless $self->canView;
-		$self->logView() if ($session{setting}{passiveProfilingEnabled});
-	my ($output, $event, %var, $id);
-	$event = $self;
-	$var{title} = $event->getValue("title");
-	$var{"start.label"} =  WebGUI::International::get(14,"EventsCalendar");
-	$var{"start.date"} = epochToHuman($self->getValue("eventStartDate"),"%z");
-	$var{"start.time"} = epochToHuman($self->getValue("eventStartDate"),"%Z");
-	$var{"end.label"} = WebGUI::International::get(15,"EventsCalendar");
-	$var{"end.date"} = epochToHuman($self->getValue("eventEndDate"),"%z");
-	$var{"end.time"} = epochToHuman($self->getValue("eventEndDate"),"%Z");
-	$var{canEdit} = $self->canEdit;
-	$var{"edit.url"} = WebGUI::URL::page('func=edit');
-	$var{"edit.label"} = WebGUI::International::get(575);
-	$var{"delete.url"} = WebGUI::URL::page('func=deleteEvent&rid='.$self->getValue("EventsCalendar_recurringId"));
-	$var{"delete.label"} = WebGUI::International::get(576);
-#	my $query = "select EventsCalendar_eventId from EventsCalendar_event where EventsCalendar_eventId<>".quote($event->getValue("EventsCalendar_eventId});
-#	$query .= " and wobjectId=".quote($self->get("wobjectId")) unless ($self->get("isMaster"));
-#	$query .= " and startDate<=$event->getValue("startDate} order by startDate desc, endDate desc";
-#	($id) = WebGUI::SQL->quickArray($query,WebGUI::SQL->getSlave);
-#	$var{"previous.label"} = '&laquo;'.WebGUI::International::get(92,"EventsCalendar");
-#	$var{"previous.url"} = WebGUI::URL::page("func=viewEvent&wid=".$self->get("wobjectId")."&eid=".$id) if ($id);
-#	$query = "select EventsCalendar_eventId from EventsCalendar_event where EventsCalendar_eventId<>".quote($event->getValue("EventsCalendar_eventId});
-#	$query .= " and wobjectId=".quote($self->get("wobjectId")) unless ($self->get("isMaster"));
-#	$query .= " and startDate>=$event->getValue("eventStartDate") order by startDate, endDate";
-#        ($id) = WebGUI::SQL->quickArray($query,WebGUI::SQL->getSlave);
-#        $var{"next.label"} = WebGUI::International::get(93,"EventsCalendar").'&raquo;';
-#        $var{"next.url"} = WebGUI::URL::page("func=viewEvent&wid=".$self->get("wobjectId")."&eid=".$id) if ($id);
+	}
+#	$tabform->getTab("display")->template(
+#    -name=>"confirmationTemplateId",
+#    -value=>$self->getValue("confirmationTemplateId"),
+#    -namespace=>"EventsCalendar/Event",
+#    -label=>WebGUI::International::get(529,"EventsCalendar"),
+#    -afterEdit=>'func=edit'
+#    );
+	$tabform->getTab("display")->template(
+    -name=>"templateId",
+    -value=>$self->getValue("templateId"),
+    -namespace=>"EventsCalendar/Event",
+    -label=>WebGUI::International::get(530,"EventsCalendar"),
+    -afterEdit=>'func=edit&wid='.$self->get("wobjectId")
+    );
+#	$tabform->getTab("display")->template(
+#    -name=>"regNotifyTemplateId",
+#    -value=>$self->getValue("regNotifyTemplateId"),
+#    -namespace=>"EventsCalendar/Event",
+#    -label=>WebGUI::International::get(531,"EventsCalendar"),
+#    -afterEdit=>'func=edit&wid='.$self->get("wobjectId")
+#    );
+#  $tabform->getTab("display")->template(
+#  	-name=>"reminderTemplateId",
+#		-value=>$self->getValue("reminderTemplateId"),
+#		-namespace=>"EventsCalendar/Event",
+#		-label=>WebGUI::International::get(532,"EventsCalendar"),
+#		-afterEdit=>'func=edit&wid='.$self->get("wobjectId")
+#		);
+#	$tabform->getTab("security")->group(
+#		-name=>"groupCanRegister", -label=>WebGUI::International::get(533,"EventsCalendar"),
+#		-value=>[$self->getValue("groupCanRegister")]
+#		);
+#	$tabform->getTab("security")->group(
+#		-name=>"groupCanReminder", -label=>WebGUI::International::get(534,"EventsCalendar"),
+#		-value=>[$self->getValue("groupCanReminder")]
+#		);
+#	$tabform->getTab("security")->group(
+#		-name=>"groupNotify", -label=>WebGUI::International::get(535,"EventsCalendar"),
+#		-value=>[$self->getValue("regNotifyGroupId")]
+#		);
+	return $tabform;
+}
+
+
+
+#-------------------------------------------------------------------
+sub getIcon {
+	my $self = shift;
+	my $small = shift;
+	return $session{config}{extrasURL}.'/assets/small/calendar.gif' if ($small);
+	return $session{config}{extrasURL}.'/assets/calendar.gif';
+}
+
+
+#-------------------------------------------------------------------
+sub getName {
+        return WebGUI::International::get(511,"EventsCalendar");
+}
+
+
+#-------------------------------------------------------------------
+sub view {
+	my $self = shift;
+	return WebGUI::Privilege::noAccess() unless $self->canView;
+		$self->logView() if ($session{setting}{passiveProfilingEnabled});
+	my ($output, $event, %var, $id);
+	$event = $self;
+	$var{title} = $event->getValue("title");
+	$var{"start.label"} =  WebGUI::International::get(14,"EventsCalendar");
+	$var{"start.date"} = epochToHuman($self->getValue("eventStartDate"),"%z");
+	$var{"start.time"} = epochToHuman($self->getValue("eventStartDate"),"%Z");
+	$var{"end.label"} = WebGUI::International::get(15,"EventsCalendar");
+	$var{"end.date"} = epochToHuman($self->getValue("eventEndDate"),"%z");
+	$var{"end.time"} = epochToHuman($self->getValue("eventEndDate"),"%Z");
+	$var{canEdit} = $self->canEdit;
+	$var{"edit.url"} = WebGUI::URL::page('func=edit');
+	$var{"edit.label"} = WebGUI::International::get(575);
+	$var{"delete.url"} = WebGUI::URL::page('func=deleteEvent&rid='.$self->getValue("EventsCalendar_recurringId"));
+	$var{"delete.label"} = WebGUI::International::get(576);
+#	my $query = "select EventsCalendar_eventId from EventsCalendar_event where EventsCalendar_eventId<>".quote($event->getValue("EventsCalendar_eventId});
+#	$query .= " and wobjectId=".quote($self->get("wobjectId")) unless ($self->get("isMaster"));
+#	$query .= " and startDate<=$event->getValue("startDate} order by startDate desc, endDate desc";
+#	($id) = WebGUI::SQL->quickArray($query,WebGUI::SQL->getSlave);
+#	$var{"previous.label"} = '&laquo;'.WebGUI::International::get(92,"EventsCalendar");
+#	$var{"previous.url"} = WebGUI::URL::page("func=viewEvent&wid=".$self->get("wobjectId")."&eid=".$id) if ($id);
+#	$query = "select EventsCalendar_eventId from EventsCalendar_event where EventsCalendar_eventId<>".quote($event->getValue("EventsCalendar_eventId});
+#	$query .= " and wobjectId=".quote($self->get("wobjectId")) unless ($self->get("isMaster"));
+#	$query .= " and startDate>=$event->getValue("eventStartDate") order by startDate, endDate";
+#        ($id) = WebGUI::SQL->quickArray($query,WebGUI::SQL->getSlave);
+#        $var{"next.label"} = WebGUI::International::get(93,"EventsCalendar").'&raquo;';
+#        $var{"next.url"} = WebGUI::URL::page("func=viewEvent&wid=".$self->get("wobjectId")."&eid=".$id) if ($id);
 	$var{description} = $event->getValue("description");
 #	my $where = "eventscalendar.type=2";
 #	my $kiddos = $self->getLineage(["children"],{returnObjects=>1,joinClass=>"WebGUI::Asset::Wobject::EventsCalendar",whereClause=>$where});
@@ -363,17 +363,17 @@ sub view {
 #		#These will be in order of lineage.  Use the Asset Manager to change the order.
 #		$tabform->getTab($agenda->getId)->raw($agenda->WebGUI::Asset::Wobject::EventsCalendar::view);
 #	}
-#	$var{agendas} = $tabform->print;
-	my $vars = \%var;
-	#get parent so we can get the parent's style.  Hopefully the parent is an EventsCalendar.  If not, oh well.
-	my $parent = $self->getParent;
-	return WebGUI::Style::process($self->processTemplate($vars,$self->getValue("templateId")),$parent->getValue("styleTemplateId"));
-}
-
+#	$var{agendas} = $tabform->print;
+	my $vars = \%var;
+	#get parent so we can get the parent's style.  Hopefully the parent is an EventsCalendar.  If not, oh well.
+	my $parent = $self->getParent;
+	return WebGUI::Style::process($self->processTemplate($vars,$self->getValue("templateId")),$parent->getValue("styleTemplateId"));
+}
+
 
 #-------------------------------------------------------------------
 sub www_deleteEvent {
-	my $self = shift;
+	my $self = shift;
 	return WebGUI::Privilege::insufficient() unless ($self->canEdit);
 	my ($output);
 	$output = '<h1>'.WebGUI::International::get(42).'</h1>';
@@ -389,7 +389,7 @@ sub www_deleteEvent {
 
 #-------------------------------------------------------------------
 sub www_deleteEventConfirm {
-	my $self = shift;
+	my $self = shift;
 	return WebGUI::Privilege::insufficient() unless ($self->canEdit);
 	if ($session{form}{rid} ne "") {
 		my $where = "EventsCalendar_Event.EventsCalendar_recurringId=".quote($session{form}{rid});
@@ -404,13 +404,13 @@ sub www_deleteEventConfirm {
 	return $self->getParent->getContainer->www_view;;
 }
 
-
-#-------------------------------------------------------------------
-sub www_edit {
-	my $self = shift;
-	return WebGUI::Privilege::insufficient() unless $self->canEdit;
-	$self->getAdminConsole->setHelp("event add/edit");
-	return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('13', 'EventsCalendar'));
+
+#-------------------------------------------------------------------
+sub www_edit {
+	my $self = shift;
+	return WebGUI::Privilege::insufficient() unless $self->canEdit;
+	$self->getAdminConsole->setHelp("event add/edit");
+	return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('13', 'EventsCalendar'));
 }
 
 
@@ -434,14 +434,14 @@ sub www_editSave {
 		return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
 		my (@startDate, @endDate, @regStartDate, @regEndDate, @reminderStartDate, 
 		@reminderEndDate, $until, @eventId, $i, $recurringEventId);
-		$startDate[0] = WebGUI::DateTime::setToEpoch($session{form}{eventStartDate});
-		$startDate[0] = time() unless ($startDate[0] > 0);
-		$endDate[0] = WebGUI::DateTime::setToEpoch($session{form}{eventEndDate});
-		$endDate[0] = $startDate[0] unless ($endDate[0] >= $startDate[0]);
-#		$regStartDate[0] = WebGUI::DateTime::setToEpoch($session{form}{regStartDate});
+		$startDate[0] = WebGUI::DateTime::setToEpoch($session{form}{eventStartDate});
+		$startDate[0] = time() unless ($startDate[0] > 0);
+		$endDate[0] = WebGUI::DateTime::setToEpoch($session{form}{eventEndDate});
+		$endDate[0] = $startDate[0] unless ($endDate[0] >= $startDate[0]);
+#		$regStartDate[0] = WebGUI::DateTime::setToEpoch($session{form}{regStartDate});
 #		$regEndDate[0] = WebGUI::DateTime::setToEpoch($session{form}{regStartDate});
 #		$regEndDate[0] = $regStartDate[0] unless ($regEndDate[0] >= $regStartDate[0]);
-#		$reminderStartDate[0] = WebGUI::DateTime::setToEpoch($session{form}{reminderStartDate});
+#		$reminderStartDate[0] = WebGUI::DateTime::setToEpoch($session{form}{reminderStartDate});
 #		$reminderEndDate[0] = WebGUI::DateTime::setToEpoch($session{form}{reminderStartDate});
 #		$reminderEndDate[0] = $reminderStartDate[0] unless ($reminderEndDate[0] >= $reminderStartDate[0]);
 		$session{form}{title} = $session{form}{title} || WebGUI::International::get(557,"EventsCalendar");
@@ -475,21 +475,21 @@ sub www_editSave {
 			$firstEvent->processPropertiesFromFormPost;
 			$firstEvent->updateHistory("edited");
 			$firstEvent->{_parent} = $self;
-			while ($startDate[$i] < $until) {
-				$i++;
-				$eventId[$i] = WebGUI::Id::generate();
-				if ($session{form}{recursEvery} eq "day") {
-					$startDate[$i] = addToDate($startDate[0],0,0,($i*$session{form}{interval}));
+			while ($startDate[$i] < $until) {
+				$i++;
+				$eventId[$i] = WebGUI::Id::generate();
+				if ($session{form}{recursEvery} eq "day") {
+					$startDate[$i] = addToDate($startDate[0],0,0,($i*$session{form}{interval}));
 					$endDate[$i] = addToDate($endDate[0],0,0,($i*$session{form}{interval}));
-				} elsif ($session{form}{recursEvery} eq "week") {
-					$startDate[$i] = addToDate($startDate[0],0,0,(7*$i*$session{form}{interval}));
-					$endDate[$i] = addToDate($endDate[0],0,0,(7*$i*$session{form}{interval}));
-				} elsif ($session{form}{recursEvery} eq "month") {
-					$startDate[$i] = addToDate($startDate[0],0,($i*$session{form}{interval}),0);
-					$endDate[$i] = addToDate($endDate[0],0,($i*$session{form}{interval}),0);
-				} elsif ($session{form}{recursEvery} eq "year") {
-					$startDate[$i] = addToDate($startDate[0],($i*$session{form}{interval}),0,0);
-					$endDate[$i] = addToDate($endDate[0],($i*$session{form}{interval}),0,0);
+				} elsif ($session{form}{recursEvery} eq "week") {
+					$startDate[$i] = addToDate($startDate[0],0,0,(7*$i*$session{form}{interval}));
+					$endDate[$i] = addToDate($endDate[0],0,0,(7*$i*$session{form}{interval}));
+				} elsif ($session{form}{recursEvery} eq "month") {
+					$startDate[$i] = addToDate($startDate[0],0,($i*$session{form}{interval}),0);
+					$endDate[$i] = addToDate($endDate[0],0,($i*$session{form}{interval}),0);
+				} elsif ($session{form}{recursEvery} eq "year") {
+					$startDate[$i] = addToDate($startDate[0],($i*$session{form}{interval}),0,0);
+					$endDate[$i] = addToDate($endDate[0],($i*$session{form}{interval}),0,0);
 				}
 				my $newEvent = $self->duplicate($firstEvent);
 				$newEvent->update({
@@ -499,7 +499,7 @@ sub www_editSave {
 				print "\n$i\n";
 				$newEvent->fixUrl;
 				$newEvent->updateHistory("edited");
-				$newEvent->{_parent} = $self;
+				$newEvent->{_parent} = $self;
 			}
 		}
 	} else {
@@ -526,6 +526,6 @@ sub www_editSave {
 #	return WebGUI::Privilege::noAccess() unless (($parent->getValue("className") eq "WebGUI::Asset::Wobject::EventsCalendar") && #($parent->canEdit));
 #	return WebGUI::Style::process($self->getEditForm->print,$parent->getValue("styleTemplateId"));
 #}
-
-1;
-
+
+1;
+