|
@@ -1712,6 +1712,11 @@ sub RcOtherParameters {
|
|
|
return $more;
|
|
|
}
|
|
|
|
|
|
+sub RcSelfWebsite {
|
|
|
+ my $action = 'rc';
|
|
|
+ return "action=$action" . RcOtherParameters(qw(from upto days));
|
|
|
+}
|
|
|
+
|
|
|
sub RcSelfAction {
|
|
|
my $action = GetParam('action', 'rc');
|
|
|
return "action=$action" . RcOtherParameters(qw(from upto days));
|
|
@@ -1898,7 +1903,7 @@ sub GetRcRss {
|
|
|
};
|
|
|
my $title = QuoteHtml($SiteName) . ': ' . GetParam('title', QuoteHtml(NormalToFree($HomePage)));
|
|
|
$rss .= "<title>$title</title>\n";
|
|
|
- $rss .= "<link>$ScriptName?" . RcSelfAction() . "</link>\n";
|
|
|
+ $rss .= "<link>$ScriptName?" . RcSelfWebsite() . "</link>\n";
|
|
|
$rss .= qq{<atom:link href="$ScriptName?} . RcSelfAction() . qq{" rel="self" type="application/rss+xml" />\n};
|
|
|
$rss .= qq{<atom:link href="$ScriptName?} . RcPreviousAction() . qq{" rel="previous" type="application/rss+xml" />\n};
|
|
|
$rss .= qq{<atom:link href="$ScriptName?} . RcLastAction() . qq{" rel="last" type="application/rss+xml" />\n};
|
|
@@ -1918,7 +1923,7 @@ sub GetRcRss {
|
|
|
$rss .= "<image>\n";
|
|
|
$rss .= "<url>$RssImageUrl</url>\n";
|
|
|
$rss .= "<title>$title</title>\n"; # the same as the channel
|
|
|
- $rss .= "<link>$ScriptName?" . RcSelfAction() . "</link>\n"; # the same as the channel
|
|
|
+ $rss .= "<link>$ScriptName?" . RcSelfWebsite() . "</link>\n"; # the same as the channel
|
|
|
$rss .= "</image>\n";
|
|
|
}
|
|
|
my $limit = GetParam("rsslimit", 15); # Only take the first 15 entries
|
|
@@ -2552,23 +2557,30 @@ sub GetFormStart {
|
|
|
}
|
|
|
|
|
|
sub GetSearchForm {
|
|
|
- my $html = GetFormStart(undef, 'get', 'search') . $q->start_p;
|
|
|
- $html .= $q->label({-for=>'search'}, T('Search:')) . ' '
|
|
|
- . $q->textfield(-name=>'search', -id=>'search', -size=>15, -accesskey=>T('f')) . ' ';
|
|
|
- if (GetParam('search') ne '' and UserIsAdmin()) { # see DoBrowseRequest
|
|
|
- $html .= $q->label({-for=>'replace'}, T('Replace:')) . ' '
|
|
|
- . $q->textfield(-name=>'replace', -id=>'replace', -size=>20) . ' '
|
|
|
- . $q->label({-for=>'delete', -title=>'If you want to replace matches with the empty string'}, T('Delete')) . ' '
|
|
|
- . $q->input({-type=>'checkbox', -name=>'delete'})
|
|
|
- . $q->submit('preview', T('Preview'));
|
|
|
+ my $html = GetFormStart(undef, 'get', 'search');
|
|
|
+ my $replacing = (GetParam('search') ne '' and UserIsAdmin());
|
|
|
+ $html .= $q->start_p({-class => ($replacing ? 'replace' : 'search')});
|
|
|
+ $html .= $q->span({-class=>'search'},
|
|
|
+ $q->label({-for=>'search'}, T('Search:')) . ' '
|
|
|
+ . $q->textfield(-name=>'search', -id=>'search', -size=>15, -accesskey=>T('f'))) . ' ';
|
|
|
+ if ($replacing) { # see DoBrowseRequest
|
|
|
+ $html .= $q->span({-class=>'replace'},
|
|
|
+ $q->label({-for=>'replace'}, T('Replace:')) . ' '
|
|
|
+ . $q->textfield(-name=>'replace', -id=>'replace', -size=>20)) . ' '
|
|
|
+ . $q->span({-class=>'delete'},
|
|
|
+ $q->label({-for=>'delete', -title=>'If you want to replace matches with the empty string'}, T('Delete')) . ' '
|
|
|
+ . $q->input({-type=>'checkbox', -name=>'delete'})) . ' '
|
|
|
+ . $q->submit('preview', T('Preview')) . ' ';
|
|
|
}
|
|
|
if (GetParam('matchingpages', $MatchingPages)) {
|
|
|
- $html .= $q->label({-for=>'matchingpage'}, T('Filter:')) . ' '
|
|
|
- . $q->textfield(-name=>'match', -id=>'matchingpage', -size=>15) . ' ';
|
|
|
+ $html .= $q->span({-class=>'match'},
|
|
|
+ $q->label({-for=>'matchingpage'}, T('Filter:')) . ' '
|
|
|
+ . $q->textfield(-name=>'match', -id=>'matchingpage', -size=>15)) . ' ';
|
|
|
}
|
|
|
if (%Languages) {
|
|
|
- $html .= $q->label({-for=>'searchlang'}, T('Language:')) . ' '
|
|
|
- . $q->textfield(-name=>'lang', -id=>'searchlang', -size=>5, -default=>GetParam('lang', '')) . ' ';
|
|
|
+ $html .= $q->span({-class=>'lang'},
|
|
|
+ $q->label({-for=>'searchlang'}, T('Language:')) . ' '
|
|
|
+ . $q->textfield(-name=>'lang', -id=>'searchlang', -size=>5, -default=>GetParam('lang', ''))) . ' ';
|
|
|
}
|
|
|
$html .= $q->submit('dosearch', T('Go!')) . $q->end_p . $q->end_form;
|
|
|
return $html;
|