[Rt-commit] rt branch, 4.2/canonicalize-urls-in-feeds, repushed

[Alex Vandiver]

The branch 4.2/canonicalize-urls-in-feeds was deleted and repushed:
       was eef07a98529990cebe445f2d77d2d98c012a1e21
       now 03aee7fccee54f8c4efd8ffc17e0516afcd0b7bc

1:  e28696f ! 1:  c7ce31a add $CanonicalizeURLsInFeeds config
    @@ -26,7 +26,7 @@
     +
      =item C<@JSFiles>
      
    - A list of JavaScript files to be included in head.  Removing any of
    + A list of additional JavaScript files to be included in head.
     
     diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
     --- a/lib/RT/Interface/Web.pm
    @@ -87,9 +87,10 @@
     --- a/share/html/NoAuth/iCal/dhandler
     +++ b/share/html/NoAuth/iCal/dhandler
     @@
    -     my $now = RT::Date->new( $cu ); $now->SetToNow;
    -     my $start = Data::ICal::Entry::Event->new;
    -     my $end   = Data::ICal::Entry::Event->new;
    +     next unless $t->DueObj->Unix > 0;
    + 
    +     my $starttime = $t->StartsObj->Unix > 0 ? $t->StartsObj : $t->CreatedObj;
    +-    my $url = RT->Config->Get('WebURL') . "Ticket/Display.html?id=".$t->id,
     +
     +    my $url;
     +    if ( RT->Config->Get('CanonicalizeURLsInFeeds') ) {
    @@ -98,13 +99,27 @@
     +    else {
     +        $url = RT::Interface::Web::GetWebURLFromENV();
     +    }
    ++    $url .= "Ticket/Display.html?id=".$t->id,
    + 
    +     my $now = RT::Date->new( $cu ); $now->SetToNow;
    +     my $start = Data::ICal::Entry::Event->new;
    +     my $end   = Data::ICal::Entry::Event->new;
    ++
     +
          $_->add_properties(
    --        url       => RT->Config->Get('WebURL') . "?q=".$t->id,
    -+        url       => $url . "?q=".$t->id,
    -         organizer => $t->OwnerObj->Name,
    -         dtstamp   => $now->iCal,
    -         created   => $t->CreatedObj->iCal,
    +-        url       => $url,
    +-        description => $url,
    +-        organizer => $t->OwnerObj->Name,
    +-        dtstamp   => $now->iCal,
    +-        created   => $t->CreatedObj->iCal,
    ++        url            => $url,
    ++        description    => $url,
    ++        organizer      => $t->OwnerObj->Name,
    ++        dtstamp        => $now->iCal,
    ++        created        => $t->CreatedObj->iCal,
    +        'last-modified' => $t->LastUpdatedObj->iCal,
    +     ) for $start, $end;
    + 
     
     diff --git a/share/html/Search/Elements/ResultsRSSView b/share/html/Search/Elements/ResultsRSSView
     --- a/share/html/Search/Elements/ResultsRSSView
2:  02c35c8 ! 2:  5d61fc6 GetWebURLFromENV is a bad name, change to GetWebURLFromRequest
    @@ -42,8 +42,8 @@
     -        $url = RT::Interface::Web::GetWebURLFromENV();
     +        $url = RT::Interface::Web::GetWebURLFromRequest();
          }
    +     $url .= "Ticket/Display.html?id=".$t->id,
      
    -     $_->add_properties(
     
     diff --git a/share/html/Search/Elements/ResultsRSSView b/share/html/Search/Elements/ResultsRSSView
     --- a/share/html/Search/Elements/ResultsRSSView
3:  eef07a9 = 3:  03aee7f "%ENV" is implementation details, "request" is better