Permalink
Browse files

RSS fixes for SSL and logtoken

  • Loading branch information...
1 parent 76ef6c5 commit c4e724e40844cdafb3bf87c4dfb70b6fc6773e41 @pudge pudge committed Nov 18, 2004
Showing with 5 additions and 4 deletions.
  1. +3 −2 Slash/Apache/User/User.pm
  2. +2 −2 plugins/Journal/journal.pl
@@ -225,7 +225,8 @@ sub handler {
if (
($constants->{rss_allow_index} && $form->{content_type} eq 'rss' && $uri =~ m{^/index\.pl$})
||
- ($constants->{journal_rdfitemdesc_html} && $form->{content_type} eq 'rss' && $uri =~ m{^/journal\.pl$})
+ # hmmm ... journal.pl no work, because can be called as /journal/
+ ($constants->{journal_rdfitemdesc_html} && $form->{content_type} eq 'rss' && $uri =~ m{\bjournal\b})
) {
$logtoken = $form->{logtoken};
} else {
@@ -666,7 +667,7 @@ sub userdir_handler {
if ($extra =~ /^rss(\/(\d+::\w+)?)?$/) {
if ($2) {
(my $logtoken = $2) =~ s/::/%3A%3A/;
- $args .= "&logtoken=$2";
+ $args .= "&logtoken=$logtoken";
}
$args .= "&content_type=rss";
}
@@ -241,7 +241,7 @@ sub displayRSS {
},
title => $article->[2],
description => strip_mode($article->[1], $article->[4]),
- 'link' => "$gSkin->{absolutedir}/~" . fixparam($nickname) . "/journal/$article->[3]",
+ 'link' => root2abs() . '/~' . fixparam($nickname) . "/journal/$article->[3]",
};
}
@@ -270,7 +270,7 @@ sub displayRSS {
channel => {
title => "$title $journals",
description => "$title $constants->{sitename} $journals",
- 'link' => "$gSkin->{absolutedir}/~" . fixparam($juser->{nickname}) . $link,
+ 'link' => root2abs() . '/~' . fixparam($juser->{nickname}) . $link,
creator => $juser->{nickname},
},
image => 1,

0 comments on commit c4e724e

Please sign in to comment.