oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug 650127.

Browse source
This commit is contained in:
JT Smith 2002-12-15 04:42:54 +00:00
parent a1127cc7ec
commit 600583789b
2 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

52
lib/WebGUI/DateTime.pm
View file

@ -141,7 +141,7 @@ sub addToTime {
sub dayStartEnd {
my ($year,$month,$day, $hour,$min,$sec, $start, $end);
($year,$month,$day, $hour,$min,$sec) = Date::Calc::Time_to_Date($_[0]);
$start = Date::Calc::Date_to_Time($year,$month,$day,0,0,0)-43200;
$start = Date::Calc::Date_to_Time($year,$month,$day,0,0,0);
$end = Date::Calc::Date_to_Time($year,$month,$day,23,59,59);
return ($start, $end);
}
@ -184,12 +184,12 @@ sub dayStartEnd {
=cut
sub epochToHuman {
my ($offset, $temp, $hour12, $value, $output, @date, $day, $month);
my ($offset, $temp, $hour12, $value, $output);
$offset = $session{user}{timeOffset} || 0;
$offset = $offset*3600;
$temp = int($_[0]) || time();
$temp = $temp+$offset;
@date = &localtime($temp);
my ($year,$month,$day,$hour,$min,$sec) = Date::Calc::Time_to_Date($temp);
$output = $_[1] || "%z %Z";
#---dealing with percent symbol
$output =~ s/\%\%/\%/g;
@ -200,27 +200,27 @@ sub epochToHuman {
$temp = $session{user}{timeFormat} || '%H:%n %p';
$output =~ s/\%Z/$temp/g;
#---year stuff
$output =~ s/\%y/$date[0]/g;
$value = substr($date[0],2,2);
$output =~ s/\%y/$year/g;
$value = substr($year,2,2);
$output =~ s/\%Y/$value/g;
#---month stuff
$value = sprintf("%02d",$date[1]);
$value = sprintf("%02d",$month);
$output =~ s/\%m/$value/g;
$output =~ s/\%M/$date[1]/g;
$output =~ s/\%M/$month/g;
if ($output =~ /\%c/) {
$month = getMonthName($date[1]);
$output =~ s/\%c/$month/g;
my $monthName = getMonthName($month);
$output =~ s/\%c/$monthName/g;
}
#---day stuff
$value = sprintf("%02d",$date[2]);
$value = sprintf("%02d",$day);
$output =~ s/\%d/$value/g;
$output =~ s/\%D/$date[2]/g;
$output =~ s/\%D/$day/g;
if ($output =~ /\%w/) {
$day = getDayName($date[7]);
$output =~ s/\%w/$day/g;
my $dayName = getDayName(Day_of_Week($year,$month,$day));
$output =~ s/\%w/$dayName/g;
}
#---hour stuff
$hour12 = $date[3];
$hour12 = $hour;
if ($hour12 > 12) {
$hour12 = $hour12 - 12;
if ($hour12 == 0) {
@ -230,10 +230,10 @@ sub epochToHuman {
$value = sprintf("%02d",$hour12);
$output =~ s/\%h/$value/g;
$output =~ s/\%H/$hour12/g;
$value = sprintf("%02d",$date[3]);
$value = sprintf("%02d",$hour);
$output =~ s/\%j/$value/g;
$output =~ s/\%J/$date[3]/g;
if ($date[3] > 11) {
$output =~ s/\%J/$hour/g;
if ($hour > 11) {
$output =~ s/\%p/pm/g;
$output =~ s/\%P/PM/g;
} else {
@ -241,10 +241,10 @@ sub epochToHuman {
$output =~ s/\%P/AM/g;
}
#---minute stuff
$value = sprintf("%02d",$date[4]);
$value = sprintf("%02d",$min);
$output =~ s/\%n/$value/g;
#---second stuff
$value = sprintf("%02d",$date[5]);
$value = sprintf("%02d",$sec);
$output =~ s/\%s/$value/g;
return $output;
}
@ -438,11 +438,9 @@ sub localtime {
sub monthCount {
my ($start, $end) = @_;
my $count = 1;
while (addToDate($start,0,$count,0) < $end) {
$count++;
}
return $count;
my @delta = Date::Calc::Delta_YMDHMS( Date::Calc::Time_to_Date($start), Date::Calc::Time_to_Date($end));
my $change = (($delta[0]*12)+$delta[1])+1;
return $change;
}
@ -520,9 +518,9 @@ sub secondsToInterval {
=cut
sub setToEpoch {
my @date = &localtime(time());
my @date = Date::Calc::Time_to_Date(time());
my ($month, $day, $year) = split(/\//,$_[0]);
if (int($year) < 2038 && int($year) > 1900) {
if (int($year) < 2038 && int($year) > 1969) {
$year = int($year);
} else {
$year = $date[0];
@ -549,7 +547,7 @@ sub setToEpoch {
=cut
sub time {
return Date::Calc::Mktime(Date::Calc::Today_and_Now());
return Date::Calc::Date_to_Time(Date::Calc::Today_and_Now());
}
1;

31
lib/WebGUI/Wobject/EventsCalendar.pm
View file

@ -357,12 +357,15 @@ sub www_editEvent {
sub www_editEventSave {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
my (@startDate, @endDate, $until, @eventId, $i, $recurringEventId);
$startDate[0] = setToEpoch($session{form}{startDate});
$startDate[0] = time() unless ($startDate[0] > 0);
$endDate[0] = setToEpoch($session{form}{endDate});
$endDate[0] = $startDate[0] unless ($endDate[0] >= $startDate[0]);
if ($session{form}{eid} eq "new") {
$session{form}{name} = $session{form}{name} || "unnamed";
$session{form}{eid} = getNextId("EventsCalendar_eventId");
$startDate[0] = setToEpoch($session{form}{startDate});
$endDate[0] = setToEpoch($session{form}{endDate});
$until = setToEpoch($session{form}{until});
$until = $endDate[0] unless ($until >= $endDate[0]);
$eventId[0] = getNextId("EventsCalendar_eventId");
$session{form}{interval} = 1 if ($session{form}{interval} < 1);
if ($session{form}{recursEvery} eq "never") {
@ -398,8 +401,8 @@ sub www_editEventSave {
}
} else {
WebGUI::SQL->write("update EventsCalendar_event set name=".quote($session{form}{name}).",
description=".quote($session{form}{description}).", startDate='".setToEpoch($session{form}{startDate})."',
endDate='".setToEpoch($session{form}{endDate})."' where EventsCalendar_eventId=$session{form}{eid}");
description=".quote($session{form}{description}).", startDate=".$startDate[0].",
endDate=".$endDate[0]." where EventsCalendar_eventId=$session{form}{eid}");
}
if ($session{form}{proceed} eq "addEvent") {
$session{form}{eid} = "new";
@ -419,36 +422,36 @@ sub www_view {
($minDate) = WebGUI::SQL->quickArray("select min(startDate) from EventsCalendar_event
where wobjectId=".$_[0]->get("wobjectId"));
}
$minDate = $minDate || time();
$minDate = $minDate || WebGUI::DateTime::time();
($minDate,$junk) = WebGUI::DateTime::dayStartEnd($minDate);
if ($_[0]->get("endMonth") eq "last") {
($maxDate) = WebGUI::SQL->quickArray("select max(endDate) from EventsCalendar_event where
wobjectId=".$_[0]->get("wobjectId"));
} elsif ($_[0]->get("endMonth") eq "after12") {
$maxDate = WebGUI::DateTime::addToDate($minDate,0,12,0);
$maxDate = WebGUI::DateTime::addToDate($minDate,0,11,0);
} elsif ($_[0]->get("endMonth") eq "after9") {
$maxDate = WebGUI::DateTime::addToDate($minDate,0,9,0);
$maxDate = WebGUI::DateTime::addToDate($minDate,0,8,0);
} elsif ($_[0]->get("endMonth") eq "after6") {
$maxDate = WebGUI::DateTime::addToDate($minDate,0,6,0);
$maxDate = WebGUI::DateTime::addToDate($minDate,0,5,0);
} elsif ($_[0]->get("endMonth") eq "after3") {
$maxDate = WebGUI::DateTime::addToDate($minDate,0,3,0);
$maxDate = WebGUI::DateTime::addToDate($minDate,0,2,0);
}
$maxDate = $maxDate || time();
$maxDate = $maxDate || WebGUI::DateTime::time();
($junk,$maxDate) = WebGUI::DateTime::dayStartEnd($maxDate);
my $monthCount = WebGUI::DateTime::monthCount($minDate,$maxDate);
unless ($session{form}{pn}) {
$flag = 1;
if ($_[0]->get("defaultMonth") eq "current") {
$session{form}{pn} = WebGUI::DateTime::monthCount($minDate,time());
$session{form}{pn} = WebGUI::DateTime::monthCount($minDate,WebGUI::DateTime::time());
} elsif ($_[0]->get("defaultMonth") eq "last") {
$session{form}{pn} = WebGUI::DateTime::monthCount($minDate,$maxDate);
} else {
$session{form}{pn} = 1;
}
}
for ($i=0;$i<$monthCount;$i++) {
if ($session{form}{pn} == ($i+1)) {
my $thisMonth = WebGUI::DateTime::addToDate($minDate,0,($i),0);
for ($i=1;$i<$monthCount;$i++) {
if ($session{form}{pn} == ($i)) {
my $thisMonth = WebGUI::DateTime::addToDate($minDate,0,($i-1),0);
$var{"calendar.big"} = $_[0]->_drawBigCalendar($thisMonth);
$var{"calendar.small"} = $_[0]->_drawSmallCalendar($thisMonth);
}