import rt 3.6.4

[freeside.git] / rt / lib / RT / URI.pm

diff --git a/rt/lib/RT/URI.pm b/rt/lib/RT/URI.pm
index 337a356..c6abf93 100644 (file)
--- a/rt/lib/RT/URI.pm
+++ b/rt/lib/RT/URI.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-2007 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,31 @@
 # 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., 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.
+# 
 # 
+# CONTRIBUTION SUBMISSION POLICY:
 # 
-# END LICENSE BLOCK
+# (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 BPS TAGGED BLOCK }}}
 package RT::URI;;
 
 use strict;
@@ -104,12 +128,12 @@ sub FromURI {
 
     return undef unless ($uri);
 
-       my $scheme;
-       # Special case: integers passed in as URIs must be ticket ids
-       if ($uri =~ /^(\d+)$/) {
-               $scheme = "fsck.com-rt";
-       } elsif ($uri =~ /^((?:\w|\.|-)+?):/) {
-         $scheme = $1;
+    my $scheme;
+    # Special case: integers passed in as URIs must be ticket ids
+    if ($uri =~ /^(\d+)$/) {
+       $scheme = "fsck.com-rt";
+    } elsif ($uri =~ /^((?:\w|\.|-)+?):/) {
+       $scheme = $1;
     }
     else {
         $RT::Logger->warning("$self Could not determine a URI scheme for $uri");
@@ -121,7 +145,7 @@ sub FromURI {
     
     unless ($self->Resolver->ParseURI($uri)) {
         $RT::Logger->warning("Resolver ".ref($self->Resolver)." could not parse $uri");
-        $self->{resolver} = undef; # clear resolver
+        $self->{resolver} = RT::URI::base->new( $self->CurrentUser ); # clear resolver
        return (undef);
     }
 
@@ -228,7 +252,17 @@ sub IsLocal {
 
 # }}}
 
+=head2 AsHREF
+
 
+=cut
+
+
+sub AsHREF {
+    my $self = shift;
+    return $self->Resolver->HREF;
+
+}
 =head Resolver
 
 Returns this URI's URI resolver object