X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FTemplate_Overlay.pm;h=575333ef10454631b07f0fb6994fd012d97b1a8e;hb=479339313bbda612f8fe939217fd067999ef36d4;hp=057dfecdaf95864a17f279118319034ddc46ada1;hpb=5fc8c5edf574ab024d4646914b6432d458e2ffbd;p=freeside.git diff --git a/rt/lib/RT/Template_Overlay.pm b/rt/lib/RT/Template_Overlay.pm index 057dfecda..575333ef1 100644 --- a/rt/lib/RT/Template_Overlay.pm +++ b/rt/lib/RT/Template_Overlay.pm @@ -1,8 +1,14 @@ -# BEGIN LICENSE BLOCK +# BEGIN BPS TAGGED BLOCK {{{ # -# Copyright (c) 1996-2003 Jesse Vincent +# COPYRIGHT: +# +# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +# # -# (Except where explictly superceded by other copyright notices) +# (Except where explicitly superseded by other copyright notices) +# +# +# LICENSE: # # This work is made available to you under the terms of Version 2 of # the GNU General Public License. A copy of that license should have @@ -14,13 +20,29 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # -# Unless otherwise specified, all modifications, corrections or -# extensions to this work which alter its source code become the -# property of Best Practical Solutions, LLC when submitted for -# inclusion in the work. +# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# +# CONTRIBUTION SUBMISSION POLICY: +# +# (The following paragraph is not intended to limit the rights granted +# to you to modify and distribute this software under the terms of +# the GNU General Public License and is only of importance to you if +# you choose to contribute your changes and enhancements to the +# community by submitting them to Best Practical Solutions, LLC.) # +# By intentionally submitting any modifications, corrections or +# derivatives to this work, or any other work intended for use with +# Request Tracker, to Best Practical Solutions, LLC, you confirm that +# you are the copyright holder for those contributions and you grant +# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable, +# royalty-free, perpetual, license to use, copy, create derivative +# works based on those contributions, and sublicense and distribute +# those contributions and any derivatives thereof. # -# END LICENSE BLOCK +# END BPS TAGGED BLOCK }}} # Portions Copyright 2000 Tobias Brox =head1 NAME @@ -44,6 +66,9 @@ ok(require RT::Template); =cut + +package RT::Template; + use strict; no warnings qw(redefine); @@ -78,23 +103,11 @@ sub _Accessible { sub _Set { my $self = shift; - - # use super::value or we get acl blocked - if ( ( defined $self->SUPER::_Value('Queue') ) - && ( $self->SUPER::_Value('Queue') == 0 ) ) - { - unless ( $self->CurrentUser->HasRight( Object => $RT::System, Right => 'ModifyTemplate') ) { - return ( 0, $self->loc('Permission Denied') ); - } - } - else { - - unless ( $self->CurrentUserHasQueueRight('ModifyTemplate') ) { - return ( 0, $self->loc('Permission Denied') ); - } + + unless ( $self->CurrentUserHasQueueRight('ModifyTemplate') ) { + return ( 0, $self->loc('Permission Denied') ); } - return ( $self->SUPER::_Set(@_) ); - + return $self->SUPER::_Set( @_ ); } # }}} @@ -122,26 +135,12 @@ ok($t2->QueueObj->id, "Got the template's queue objet"); =cut sub _Value { - my $self = shift; - my $field = shift; - - - #If the current user doesn't have ACLs, don't let em at it. - #use super::value or we get acl blocked - if ( ( !defined $self->__Value('Queue') ) - || ( $self->__Value('Queue') == 0 ) ) - { - unless ( $self->CurrentUser->HasRight( Object => $RT::System, Right => 'ShowTemplate') ) { - return (undef); - } - } - else { - unless ( $self->CurrentUserHasQueueRight('ShowTemplate') ) { - return (undef); - } + + unless ( $self->CurrentUserHasQueueRight('ShowTemplate') ) { + return undef; } - return ( $self->__Value($field) ); + return $self->__Value( @_ ); } @@ -158,18 +157,12 @@ Load a template, either by number or by name sub Load { my $self = shift; my $identifier = shift; + return undef unless $identifier; - if ( !$identifier ) { - return (undef); - } - - if ( $identifier !~ /\D/ ) { - $self->SUPER::LoadById($identifier); - } - else { - $self->LoadByCol( 'Name', $identifier ); - + if ( $identifier =~ /\D/ ) { + return $self->LoadByCol( 'Name', $identifier ); } + return $self->LoadById( $identifier ); } # }}} @@ -235,32 +228,32 @@ sub Create { Content => undef, Queue => 0, Description => '[no description]', - Type => 'Action', #By default, template are 'Action' templates - Name => undef, + Type => 'Action', #By default, template are 'Action' templates + Name => undef, @_ ); - if ( !$args{'Queue'} ) { + unless ( $args{'Queue'} ) { unless ( $self->CurrentUser->HasRight(Right =>'ModifyTemplate', Object => $RT::System) ) { - return (undef); + return ( undef, $self->loc('Permission denied') ); } $args{'Queue'} = 0; } else { my $QueueObj = new RT::Queue( $self->CurrentUser ); - $QueueObj->Load( $args{'Queue'} ) || return ( 0, $self->loc('Invalid queue') ); + $QueueObj->Load( $args{'Queue'} ) || return ( undef, $self->loc('Invalid queue') ); unless ( $QueueObj->CurrentUserHasRight('ModifyTemplate') ) { - return (undef); + return ( undef, $self->loc('Permission denied') ); } $args{'Queue'} = $QueueObj->Id; } my $result = $self->SUPER::Create( - Content => $args{'Content'}, - Queue => $args{'Queue'}, + Content => $args{'Content'}, + Queue => $args{'Queue'}, Description => $args{'Description'}, - Name => $args{'Name'} + Name => $args{'Name'}, ); return ($result); @@ -299,10 +292,13 @@ sub MIMEObj { # {{{ sub Parse -=item Parse +=head2 Parse This routine performs Text::Template parsing on the template and then imports the results into a MIME::Entity so we can really use it + + Takes a hash containing Argument, TicketObj, and TransactionObj. + It returns a tuple of (val, message) If val is 0, the message contains an error message @@ -312,15 +308,16 @@ sub Parse { my $self = shift; #We're passing in whatever we were passed. it's destined for _ParseContent - my $content = $self->_ParseContent(@_); + my ($content, $msg) = $self->_ParseContent(@_); + return ( 0, $msg ) unless defined $content; #Lets build our mime Entity my $parser = MIME::Parser->new(); - # On some situations TMPDIR is non-writable. sad but true. - $parser->output_to_core(1); - $parser->tmp_to_core(1); + # On some situations TMPDIR is non-writable. sad but true. + $parser->output_to_core(1); + $parser->tmp_to_core(1); #If someone includes a message, don't extract it $parser->extract_nested_messages(1); @@ -335,15 +332,13 @@ sub Parse { ### Should we forgive normally-fatal errors? $parser->ignore_errors(1); $self->{'MIMEObj'} = eval { $parser->parse_data($content) }; - my $error = ( $@ || $parser->last_error ); - - if ($error) { - $RT::Logger->error("$error"); + if ( my $error = $@ || $parser->last_error ) { + $RT::Logger->error( "$error" ); return ( 0, $error ); } # Unfold all headers - $self->{'MIMEObj'}->head->unfold(); + $self->{'MIMEObj'}->head->unfold; return ( 1, $self->loc("Template parsed") ); @@ -372,16 +367,28 @@ sub _ParseContent { $T::rtname = $RT::rtname; *T::loc = sub { $T::Ticket->loc(@_) }; + my $content = $self->Content; + unless ( defined $content ) { + return ( undef, $self->loc("Permissions denied") ); + } + # We need to untaint the content of the template, since we'll be working # with it - my $content = $self->Content(); $content =~ s/^(.*)$/$1/; my $template = Text::Template->new( TYPE => 'STRING', SOURCE => $content ); - my $retval = $template->fill_in( PACKAGE => 'T' ); + my $is_broken = 0; + my $retval = $template->fill_in( PACKAGE => 'T', BROKEN => sub { + my (%args) = @_; + $RT::Logger->error("Template parsing error: $args{error}") + unless $args{error} =~ /^Died at /; # ignore intentional die() + $is_broken++; + return undef; + } ); + return ( undef, $self->loc('Template parsing error') ) if $is_broken; # MIME::Parser has problems dealing with high-bit utf8 data. Encode::_utf8_off($retval);