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

merging 5.5.5 changes

Browse source
This commit is contained in:
JT Smith 2004-02-27 02:34:54 +00:00
parent ec985af9d4
commit ab64b55d4b
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI/DateTime.pm
View file

@ -622,7 +622,7 @@ sub intervalToSeconds {
=head2 localtime ( epoch )
Returns an array of time elements. The elements are: years, months, days, hours, minutes, seconds, day of year, day of week.
Returns an array of time elements. The elements are: years, months, days, hours, minutes, seconds, day of year, day of week, daylight savings.
=over
@ -642,7 +642,8 @@ sub localtime {
}
my $doy = Date::Calc::Day_of_Year($year,$month,$day);
my $dow = Date::Calc::Day_of_Week($year,$month,$day);
return ($year, $month, $day, $hour, $min, $sec, $doy, $dow);
my @temp = Date::Calc::System_Clock();
return ($year, $month, $day, $hour, $min, $sec, $doy, $dow, $temp[8]);
}
#-------------------------------------------------------------------

5
lib/WebGUI/ErrorHandler.pm
View file

@ -106,7 +106,10 @@ sub fatalError {
$toLog .= getSessionVars();
writeLog($toLog);
unless ($WebGUI::Session::session{setting}{showDebug}) {
print WebGUI::International::get(416).'<br>';
#NOTE: You can't internationalize this because with some types of errors that would cause an infinite loop.
print "<h1>Problem With Request</h1>
We have encountered a problem with your request. Please use your back button and try again.
If this problem persists, please contact us with what you were trying to do and the time and date of the problem.";
print '<br>'.$WebGUI::Session::session{setting}{companyName};
print '<br>'.$WebGUI::Session::session{setting}{companyEmail};
print '<br>'.$WebGUI::Session::session{setting}{companyURL};

8
lib/WebGUI/Paginator.pm
View file

@ -77,10 +77,10 @@ The hash reference to append the variables to.
sub appendTemplateVars {
my $self = shift;
my $var = shift;
$var->{'pagination.firstpage'} = $self->getFirstPageLink;
$var->{'pagination.lastpage'} = $self->getLastPageLink;
$var->{'pagination.nextpage'} = $self->getNextPageLink;
$var->{'pagination.previouspage'} = $self->getPreviousPageLink;
$var->{'pagination.firstPage'} = $self->getFirstPageLink;
$var->{'pagination.lastPage'} = $self->getLastPageLink;
$var->{'pagination.nextPage'} = $self->getNextPageLink;
$var->{'pagination.previousPage'} = $self->getPreviousPageLink;
$var->{'pagination.pageNumber'} = $self->getPageNumber;
$var->{'pagination.pageCount'} = $self->getNumberOfPages;
$var->{'pagination.pageCount.isMultiple'} = ($self->getNumberOfPages > 1);