diff options
Diffstat (limited to 'rt/lib/RT/Link_Overlay.pm')
| -rw-r--r-- | rt/lib/RT/Link_Overlay.pm | 75 |
1 files changed, 52 insertions, 23 deletions
diff --git a/rt/lib/RT/Link_Overlay.pm b/rt/lib/RT/Link_Overlay.pm index ac1bc370c..28143cfeb 100644 --- a/rt/lib/RT/Link_Overlay.pm +++ b/rt/lib/RT/Link_Overlay.pm @@ -1,8 +1,14 @@ -# BEGIN LICENSE BLOCK +# BEGIN BPS TAGGED BLOCK {{{ # -# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com> +# COPYRIGHT: +# +# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +# <jesse@bestpractical.com> # -# (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,30 @@ # 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 }}} + =head1 NAME RT::Link - an RT Link object @@ -54,6 +77,9 @@ ok (UNIVERSAL::isa($link, 'DBIx::SearchBuilder::Record')); =cut + +package RT::Link; + use strict; no warnings qw(redefine); @@ -81,28 +107,31 @@ sub Create { my $base = RT::URI->new( $self->CurrentUser ); $base->FromURI( $args{'Base'} ); - unless ( $base->Scheme ) { - $RT::Logger->warning( "$self couldn't resolve base:'" - . $args{'Base'} . " - " - . $base->Scheme - . "' into a URI\n" ); + unless ( $base->Resolver && $base->Scheme ) { + my $msg = $self->loc("Couldn't resolve base '[_1]' into a URI.", + $args{'Base'}); + $RT::Logger->warning( "$self $msg\n" ); - #use Data::Dumper; - #$RT::Logger->warning(scalar Dumper $base); - return (undef); + if (wantarray) { + return(undef, $msg); + } else { + return (undef); + } } my $target = RT::URI->new( $self->CurrentUser ); $target->FromURI( $args{'Target'} ); unless ( $target->Resolver ) { - $RT::Logger->warning( "$self couldn't resolve target:'" - . $args{'Target'} . " - " - . "' into a URI\n" ); - - #use Data::Dumper; - #$RT::Logger->warning(scalar Dumper $target); - return (undef); + my $msg = $self->loc("Couldn't resolve target '[_1]' into a URI.", + $args{'Target'}); + $RT::Logger->warning( "$self $msg\n" ); + + if (wantarray) { + return(undef, $msg); + } else { + return (undef); + } } my $base_id = 0; |