X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FURI.pm;h=11a9e3e06d9434012672521cf37e34b5962b208a;hp=c6abf93968e633cf1aa67512b3e75d5411206d4a;hb=e9e0cf0989259b94d9758eceff448666a2e5a5cc;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1 diff --git a/rt/lib/RT/URI.pm b/rt/lib/RT/URI.pm index c6abf9396..11a9e3e06 100644 --- a/rt/lib/RT/URI.pm +++ b/rt/lib/RT/URI.pm @@ -1,40 +1,40 @@ # BEGIN BPS TAGGED BLOCK {{{ -# +# # COPYRIGHT: -# -# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC -# -# +# +# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +# +# # (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 # been provided with this software, but in any event can be snarfed # from www.gnu.org. -# +# # This work is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. -# +# # 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. -# -# +# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. +# +# # 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 @@ -43,13 +43,14 @@ # 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 BPS TAGGED BLOCK }}} -package RT::URI;; + +package RT::URI; use strict; -use vars qw/@ISA/; -@ISA = qw(RT::Base); +use warnings; +use base 'RT::Base'; use RT::URI::base; use Carp; @@ -90,13 +91,31 @@ sub new { return ($self); } +=head2 CanonicalizeURI + +Returns the canonical form of the given URI by calling L and then L. + +If the URI is unparseable by FromURI the passed in URI is simply returned untouched. + +=cut +sub CanonicalizeURI { + my $self = shift; + my $uri = shift; + if ($self->FromURI($uri)) { + my $canonical = $self->URI; + if ($canonical and $uri ne $canonical) { + RT->Logger->debug("Canonicalizing URI '$uri' to '$canonical'"); + $uri = $canonical; + } + } + return $uri; +} -# {{{ FromObject =head2 FromObject -Given a local object, such as an RT::Ticket or an RT::FM::Article, this routine will return a URI for +Given a local object, such as an RT::Ticket or an RT::Article, this routine will return a URI for the local object =cut @@ -109,9 +128,7 @@ sub FromObject { return $self->FromURI($obj->URI); } -# }}} -# {{{ FromURI =head2 FromURI @@ -132,32 +149,34 @@ sub FromURI { # Special case: integers passed in as URIs must be ticket ids if ($uri =~ /^(\d+)$/) { $scheme = "fsck.com-rt"; - } elsif ($uri =~ /^((?:\w|\.|-)+?):/) { + } elsif ($uri =~ /^((?!javascript|data)(?:\w|\.|-)+?):/i) { $scheme = $1; } else { - $RT::Logger->warning("$self Could not determine a URI scheme for $uri"); - return (undef); + $self->{resolver} = RT::URI::base->new( $self->CurrentUser ); # clear resolver + $RT::Logger->warning("Could not determine a URI scheme for $uri"); + return (undef); } # load up a resolver object for this scheme $self->_GetResolver($scheme); unless ($self->Resolver->ParseURI($uri)) { - $RT::Logger->warning("Resolver ".ref($self->Resolver)." could not parse $uri"); + $RT::Logger->warning( "Resolver " + . ref( $self->Resolver ) + . " could not parse $uri, maybe Organization config was changed?" + ); $self->{resolver} = RT::URI::base->new( $self->CurrentUser ); # clear resolver return (undef); } -return(1); + return(1); } -# }}} -# {{{ _GetResolver -=private _GetResolver +=head2 _GetResolver Gets an RT URI resolver for the scheme . Falls back to a null resolver. RT::URI::base. @@ -172,27 +191,27 @@ sub _GetResolver { my $resolver; - eval " - require RT::URI::$scheme; - \$resolver = RT::URI::$scheme->new(\$self->CurrentUser); - "; + eval " + require RT::URI::$scheme; + \$resolver = RT::URI::$scheme->new(\$self->CurrentUser); + "; - if ($resolver) { + if ($resolver) { $self->{'resolver'} = $resolver; - } else { + } else { + RT->Logger->warning("Failed to create new resolver object for scheme '$scheme': $@") + if $@ !~ m{Can't locate RT/URI/\Q$scheme\E}; $self->{'resolver'} = RT::URI::base->new($self->CurrentUser); - } + } } -# }}} -# {{{ Scheme =head2 Scheme -Returns a local object id for this content. You are expected to know what sort of object this is the Id -of +Returns a local object id for this content. You are expected to know +what sort of object this is the Id of =cut @@ -201,8 +220,6 @@ sub Scheme { return ($self->Resolver->Scheme); } -# }}} -# {{{ URI =head2 URI @@ -216,9 +233,7 @@ sub URI { return ($self->Resolver->URI); } -# }}} -# {{{ Object =head2 Object @@ -234,9 +249,7 @@ sub Object { } -# }}} -# {{{ IsLocal =head2 IsLocal @@ -250,7 +263,6 @@ sub IsLocal { } -# }}} =head2 AsHREF @@ -261,9 +273,9 @@ sub IsLocal { sub AsHREF { my $self = shift; return $self->Resolver->HREF; - } -=head Resolver + +=head2 Resolver Returns this URI's URI resolver object @@ -275,9 +287,6 @@ sub Resolver { return ($self->{'resolver'}); } -eval "require RT::URI_Vendor"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI_Vendor.pm}); -eval "require RT::URI_Local"; -die $@ if ($@ && $@ !~ qr{^Can't locate RT/URI_Local.pm}); +RT::Base->_ImportOverlays(); 1;