a few bug fixes

This commit is contained in:
JT Smith 2006-05-03 04:00:10 +00:00
parent d24ac0b273
commit e27a62cccc
3 changed files with 9 additions and 10 deletions

View file

@ -33,10 +33,9 @@ sub addTemplates {
className=>"WebGUI::Asset::Template",
template=>q|
<tmpl_if session.var.adminOn><tmpl_if controls><p><tmpl_var controls></p></tmpl_if></tmpl_if>
<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="*" align="middle">
<param name="allowScriptAccess" value="sameDomain" />
<param name="movie" value="<tmpl_var fileUrl>" /><param name="quality" value="high" /><embed src="<tmpl_var fileUrl>" quality="high" width="100%" height="*" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
</object>
<div><object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="*">
<param name="movie" value="<tmpl_var fileUrl>" /><param name="quality" value="high" /><embed src="<tmpl_var fileUrl>" quality="high" width="100%" height="*" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
</object></div>
|,
title=>"Flash Template",
menuTitle=>"Flash Template",

View file

@ -195,10 +195,10 @@ sub fatal {
#NOTE: You can't internationalize this because with some types of errors that would cause an infinite loop.
$self->session->output->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.",1);
$self->session->output->print('<br />'.$self->session->setting("companyName"),1);
$self->session->output->print('<br />'.$self->session->setting("companyEmail"),1);
$self->session->output->print('<br />'.$self->session->setting("companyURL"),1);
If this problem persists, please contact us with what you were trying to do and the time and date of the problem.<br />",1);
$self->session->output->print('<br />'.$self->session->setting->get("companyName"),1);
$self->session->output->print('<br />'.$self->session->setting->get("companyEmail"),1);
$self->session->output->print('<br />'.$self->session->setting->get("companyURL"),1);
} else {
$self->session->output->print("<h1>WebGUI Fatal Error</h1><p>Something unexpected happened that caused this system to fault.</p>\n",1);
$self->session->output->print("<p>".$message."</p>\n",1);
@ -206,7 +206,7 @@ sub fatal {
$self->session->output->print($self->showDebug(),1);
}
$self->session->close();
die $message;
exit;
}

View file

@ -184,7 +184,7 @@ sub sendHeader {
my $date = $self->session->datetime->epochToHuman(($self->{_http}{lastModified} || time()), "%W, %d %C %y %j:%m:%s %t");
$self->session->request->headers_out->set('Last-Modified' => $date);
if ($self->session->setting->get("preventProxyCache")) {
$self->session->request->headers_out->set(Expires => "-1d");
$self->setCacheControl(-60*60*24*365);
}
if ($self->{_http}{filename}) {
$self->session->request->headers_out->set('Content-Disposition' => qq!attachment; filename="$self->{_http}{filename}"!);