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

preparing for 7.0.0 release

Browse source
This commit is contained in:
JT Smith 2006-07-05 15:05:28 +00:00
parent 01ff53ed6c
commit a511ab9d50
4 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/changelog/7.x.x.txt
View file

@ -20,4 +20,8 @@
- fix: SQL Report w/ pagination and nested queries
- fix: Unable to add Web Services Client
- Fixed a bug in spectre where it wasn't using session cookies.
- Fixed a bug in spectre where you couldn't shut it down if you started it on
an IP other than 127.0.0.1.
- Made the Include macro more secure.
- Added Len's patch to fix some caching problems.

6
docs/create.sql
View file

File diff suppressed because one or more lines are too long

2
lib/WebGUI/Macro/Include.pm
View file

@ -40,7 +40,7 @@ sub process {
my (@param, $temp, $file);
@param = @_;
my $i18n = WebGUI::International->new($session,'Macro_Include');
if ($param[0] =~ /passwd/ || $param[0] =~ /shadow/ || $param[0] =~ /WebGUI.conf/) {
if ($param[0] =~ /passwd/i || $param[0] =~ /shadow/i || $param[0] =~ m!WebGUI/\w+.conf!i) {
$temp = $i18n->get('security');
} else {
$file = FileHandle->new($param[0],"r");

21
lib/WebGUI/Session/Http.pm
View file

@ -174,8 +174,9 @@ Generates and sends HTTP headers.
sub sendHeader {
my $self = shift;
return undef if ($self->{_http}{noHeader});
my $request = $self->session->request;
my ($request, $datetime) = $self->session->quick(qw(request datetime));
return undef unless $request;
my $userId = $self->session->var->get("userId");
$self->{_http}{noHeader} = 1;
my %params;
if ($self->isRedirect()) {
@ -183,19 +184,19 @@ sub sendHeader {
$request->status(301);
} else {
$request->content_type($self->{_http}{mimetype} || "text/html");
my $date = $self->session->datetime->epochToHttp($self->{_http}{lastModified});
my $cc = $self->{_http}{cacheControl};
my $date = ($userId eq "1") ? $datetime->epochToHttp($self->{_http}{lastModified}) : $datetime->epochToHttp;
my $cacheControl = $self->{_http}{cacheControl};
$request->headers_out->set('Last-Modified' => $date);
if ($cc eq "none" || $self->session->setting->get("preventProxyCache") || ($cc eq "" && $self->session->var->get("userId") ne "1")) {
if ($cacheControl eq "none" || $self->session->setting->get("preventProxyCache") || ($cacheControl eq "" && $userId ne "1")) {
$request->headers_out->set("Cache-Control" => "private");
$request->no_cache(1);
} elsif ($cc ne "" && $request->protocol =~ /(\d\.\d)/ && $1 >= 1.1){
} elsif ($cacheControl ne "" && $request->protocol =~ /(\d\.\d)/ && $1 >= 1.1){
my $extras = "";
$extras .= ", private" unless ($self->session->var->get("userId") eq "1");
$request->headers_out->set('Cache-Control' => "max-age=" . $cc.$extras);
} elsif ($cc ne "") {
$request->headers_out->set("Cache-Control" => "private") unless ($self->session->var->get("userId") eq "1");
my $date = $self->session->datetime->epochToHttp(time() + $cc);
$extras .= ", private" unless ($userId eq "1");
$request->headers_out->set('Cache-Control' => "max-age=" . $cacheControl.$extras);
} elsif ($cacheControl ne "") {
$request->headers_out->set("Cache-Control" => "private") unless ($userId eq "1");
my $date = $datetime->epochToHttp(time() + $cacheControl);
$request->headers_out->set('Expires' => $date);
}
if ($self->{_http}{filename}) {