import rt 3.4.6

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

diff --git a/rt/lib/RT/Link_Overlay.pm b/rt/lib/RT/Link_Overlay.pm
index ef0347a..a45cb2a 100644 (file)
--- a/rt/lib/RT/Link_Overlay.pm
+++ b/rt/lib/RT/Link_Overlay.pm
@@ -1,8 +1,8 @@
-# {{{ BEGIN BPS TAGGED BLOCK
+# BEGIN BPS TAGGED BLOCK {{{
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,8 @@
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
 # 
-# }}} END BPS TAGGED BLOCK
+# END BPS TAGGED BLOCK }}}
+
 =head1 NAME
 
   RT::Link - an RT Link object
@@ -76,6 +77,9 @@ ok (UNIVERSAL::isa($link, 'DBIx::SearchBuilder::Record'));
 
 =cut
 
+
+package RT::Link;
+
 use strict;
 no warnings qw(redefine);
 
@@ -103,23 +107,31 @@ sub Create {
     my $base = RT::URI->new( $self->CurrentUser );
     $base->FromURI( $args{'Base'} );
 
-    unless ( $base->Resolver and $base->Scheme ) {
-        $RT::Logger->warning( "$self couldn't resolve base:'"
-                              . $args{'Base'} . " - "
-                              . "' 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" );
 
-        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" );
-
-        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;
@@ -256,8 +268,8 @@ sub TargetURI {
 =cut
 
 sub TargetObj {
-  my $self = shift;
-   return $self->TargetURI->Object;
+    my $self = shift;
+    return $self->TargetURI->Object;
 }
 # }}}
 
@@ -303,7 +315,7 @@ Returns true if the base of this link is a local ticket
 
 sub BaseIsLocal {
   my $self = shift;
-  $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal");
+  $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal at (". join(":",caller).")");
   return $self->BaseURI->IsLocal;
 }
 
@@ -319,7 +331,7 @@ Returns true if the target of this link is a local ticket
 
 sub TargetIsLocal {
   my $self = shift;
-  $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal");
+  $RT::Logger->crit("Link::BaseIsLocal is deprecated in favor of Link->BaseURI->IsLocal at (". join(":",caller).")");
   return $self->TargetURI->IsLocal;
 }
 
@@ -336,7 +348,7 @@ Returns an HTTP url to access the base of this link
 
 sub BaseAsHREF {
   my $self = shift;
-  $RT::Logger->crit("Link::BaseAsHREF deprecated in favor of ->BaseURI->AsHREF");
+  $RT::Logger->crit("Link::BaseAsHREF deprecated in favor of ->BaseURI->AsHREF at (". join(":",caller).")");
   return $self->BaseURI->HREF;
 }
 # }}}
@@ -351,7 +363,7 @@ return an HTTP url to access the target of this link
 
 sub TargetAsHREF {
   my $self = shift;
-  $RT::Logger->crit("Link::TargetAsHREF deprecated in favor of ->TargetURI->AsHREF");
+  $RT::Logger->crit("Link::TargetAsHREF deprecated in favor of ->TargetURI->AsHREF at (". join(":",caller).")");
   return $self->TargetURI->HREF;
 }
 # }}}