projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import rt 3.4.6
[freeside.git]
/
rt
/
lib
/
RT
/
URI
/
fsck_com_rt.pm
diff --git
a/rt/lib/RT/URI/fsck_com_rt.pm
b/rt/lib/RT/URI/fsck_com_rt.pm
index
cfe77cd
..
bb2c188
100644
(file)
--- a/
rt/lib/RT/URI/fsck_com_rt.pm
+++ b/
rt/lib/RT/URI/fsck_com_rt.pm
@@
-1,8
+1,8
@@
-#
{{{ BEGIN BPS TAGGED BLOCK
+#
BEGIN BPS TAGGED BLOCK {{{
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-200
4
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-200
5
Best Practical Solutions, LLC
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-42,7
+42,7
@@
# works based on those contributions, and sublicense and distribute
# those contributions and any derivatives thereof.
#
# works based on those contributions, and sublicense and distribute
# those contributions and any derivatives thereof.
#
-#
}}} END BPS TAGGED BLOCK
+#
END BPS TAGGED BLOCK }}}
package RT::URI::fsck_com_rt;
use RT::Ticket;
package RT::URI::fsck_com_rt;
use RT::Ticket;
@@
-75,7
+75,7
@@
ok (UNIVERSAL::isa($uri,RT::URI::fsck_com_rt), "It's an RT::URI::fsck_com_rt");
ok ($uri->isa('RT::URI::base'), "It's an RT::URI::base");
ok ($uri->isa('RT::Base'), "It's an RT::Base");
ok ($uri->isa('RT::URI::base'), "It's an RT::URI::base");
ok ($uri->isa('RT::Base'), "It's an RT::Base");
-is ($uri->LocalURIPrefix , 'fsck.com-rt://
example.com'
);
+is ($uri->LocalURIPrefix , 'fsck.com-rt://
'.$RT::Organization
);
=end testing
=end testing
@@
-128,7
+128,7
@@
is($uri->LocalURIPrefix. "/ticket/1" , $uri->URIForObject($ticket));
sub URIForObject {
my $self = shift;
my $obj = shift;
sub URIForObject {
my $self = shift;
my $obj = shift;
- return ($self->LocalURIPrefix
."/".$self->ObjectType($obj)
."/". $obj->Id);
+ return ($self->LocalURIPrefix
."/". $self->ObjectType($obj)
."/". $obj->Id);
}
}
@@
-143,12
+143,12
@@
sub ParseURI {
my $self = shift;
my $uri = shift;
my $self = shift;
my $uri = shift;
- if ( $uri =~ /^
(\d+)
$/ ) {
+ if ( $uri =~ /^
\d+
$/ ) {
my $ticket = RT::Ticket->new( $self->CurrentUser );
my $ticket = RT::Ticket->new( $self->CurrentUser );
- $ticket->Load(
$uri
);
+ $ticket->Load(
$uri
);
$self->{'uri'} = $ticket->URI;
$self->{'object'} = $ticket;
$self->{'uri'} = $ticket->URI;
$self->{'object'} = $ticket;
- return($ticket->id);
+ return
($ticket->id);
}
else {
$self->{'uri'} = $uri;
}
else {
$self->{'uri'} = $uri;
@@
-156,9
+156,8
@@
sub ParseURI {
#If it's a local URI, load the ticket object and return its URI
if ( $self->IsLocal ) {
#If it's a local URI, load the ticket object and return its URI
if ( $self->IsLocal ) {
-
my $local_uri_prefix = $self->LocalURIPrefix;
my $local_uri_prefix = $self->LocalURIPrefix;
- if ( $self->{'uri'} =~ /^
$local_uri_prefix
\/(.*?)\/(\d+)$/i ) {
+ if ( $self->{'uri'} =~ /^
\Q$local_uri_prefix\E
\/(.*?)\/(\d+)$/i ) {
my $type = $1;
my $id = $2;
my $type = $1;
my $id = $2;
@@
-192,9
+191,9
@@
Returns undef otherwise.
sub IsLocal {
my $self = shift;
sub IsLocal {
my $self = shift;
-
my $local_uri_prefix = $self->LocalURIPrefix;
-
if ($self->{'uri'} =~ /^$local_uri_prefix/i
) {
-
return 1;
+ my $local_uri_prefix = $self->LocalURIPrefix;
+
if ( $self->{'uri'} =~ /^\Q$local_uri_prefix/i
) {
+ return 1;
}
else {
return undef;
}
else {
return undef;