From 9c68254528b6f2c7d8c1921b452fa56064783782 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 2 Mar 2008 04:06:06 +0000 Subject: import rt 3.4.6 --- rt/html/NoAuth/Logout.html | 36 +++++++++++++++--------------------- rt/html/NoAuth/Reminder.html | 6 ++---- rt/html/NoAuth/images/autohandler | 20 ++++++++------------ rt/html/NoAuth/images/bplogo.gif | Bin 755 -> 825 bytes 4 files changed, 25 insertions(+), 37 deletions(-) (limited to 'rt/html/NoAuth') diff --git a/rt/html/NoAuth/Logout.html b/rt/html/NoAuth/Logout.html index 49b7a4e59..b6a238bac 100644 --- a/rt/html/NoAuth/Logout.html +++ b/rt/html/NoAuth/Logout.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -%# 02110-1301 or visit their web page on the internet at -%# http://www.gnu.org/copyleft/gpl.html. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -45,29 +43,25 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - - -RT: Logout - - - + + +RT: Logout + + +

<&|/l&>You have been logged out of RT. -
-
-<&|/l&>You're welcome to login again. +
+
+<&|/l&>You're welcome to login again -% $m->abort(); - -<%INIT> -$m->comp('/Elements/Callback', _CallbackName => 'BeforeSessionDelete', %ARGS); +<%PERL> if (defined %session) { - tied(%session)->delete; + tied(%session)->delete; } - -$m->comp('/Elements/Callback', _CallbackName => 'AfterSessionDelete', %ARGS); - +$m->abort(); + <%ARGS> $URL => $RT::WebPath."/" diff --git a/rt/html/NoAuth/Reminder.html b/rt/html/NoAuth/Reminder.html index dc935d45e..0793f6c96 100644 --- a/rt/html/NoAuth/Reminder.html +++ b/rt/html/NoAuth/Reminder.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -%# 02110-1301 or visit their web page on the internet at -%# http://www.gnu.org/copyleft/gpl.html. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/NoAuth/images/autohandler b/rt/html/NoAuth/images/autohandler index 720979830..2e428c157 100644 --- a/rt/html/NoAuth/images/autohandler +++ b/rt/html/NoAuth/images/autohandler @@ -1,28 +1,24 @@ -<%INIT> -&RT::Interface::Web::StaticFileHeaders(); +<%init> # This autohandler will spit out RT's images if the user hasn't # properly configured their webserver to stop RT from passing # images through the mason handler. -my $file = $m->base_comp->source_file; - +my $file = $m->base_comp->source_file; my $type = "application/octet-stream"; + if ($file =~ /\.(gif|png|jpe?g)$/i) { $type = "image/$1"; $type =~ s/jpg/jpeg/gi; } -die "file not found" unless -f $file && -r _; - +die unless (-f $file && -r $file); $r->content_type($type); -open my $fh, "<$file" or die "couldn't open file: $!"; -binmode($fh); +open (FILE, "<$file") || die; { local $/ = \16384; - $m->out($_) while (<$fh>); - $m->flush_buffer; + $m->out($_) while (); + close(FILE); } -close $fh; $m->abort; - + diff --git a/rt/html/NoAuth/images/bplogo.gif b/rt/html/NoAuth/images/bplogo.gif index 1bb0adfb4..e2cf49c42 100644 Binary files a/rt/html/NoAuth/images/bplogo.gif and b/rt/html/NoAuth/images/bplogo.gif differ -- cgit v1.2.1