archive/oddmuse
2
0
Fork 0
forked from github/kensanata.oddmuse
Code Pull Requests Activity

Put matching pages into the same form as search.

Browse Source 
This works if we later handle a stand-alone match parameter like we handle the search parameter.
We just fake an action.
This commit is contained in:
Alex Schroeder
2014-11-24 22:32:11 +01:00
parent a24028affc
commit ea391981ec
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wiki.pl
View File

@@ -1318,16 +1318,16 @@ sub DoBrowseRequest {
my $id = GetId();
my $action = lc(GetParam('action', '')); # script?action=foo;id=bar
$action = 'download' if GetParam('download', '') and not $action; # script/download/id
my $search = GetParam('search', '');
if ($Action{$action}) {
&{$Action{$action}}($id);
} elsif ($action and defined &MyActions) {
eval { local $SIG{__DIE__}; MyActions(); };
} elsif ($action) {
ReportError(Ts('Invalid action parameter %s', $action), '501 NOT IMPLEMENTED');
} elsif ($search ne '') { # allow search for "0"
SetParam('action', 'search'); # fake it
DoSearch($search);
} elsif (GetParam('match', '') ne '') {
DoIndex();
} elsif (GetParam('search', '') ne '') { # allow search for "0"
DoSearch();
} elsif (GetParam('title', '') and not GetParam('Cancel', '')) {
DoPost(GetParam('title', ''));
} else {
@@ -2476,18 +2476,15 @@ sub GetSearchForm {
. $q->textfield(-name=>'replace', -id=>'replace', -size=>20) . ' '
. $q->checkbox(-name=>'delete', -label=>T('Delete')) . ' ';
}
if (GetParam('matchingpages', $MatchingPages)) {
$html .= $q->label({-for=>'matchingpage'}, T('Filter:')) . ' '
. $q->textfield(-name=>'match', -id=>'matchingpage', -size=>20) . ' ';
}
if (%Languages) {
$html .= $q->label({-for=>'searchlang'}, T('Language:')) . ' '
. $q->textfield(-name=>'lang', -id=>'searchlang', -size=>10, -default=>GetParam('lang', '')) . ' ';
}
$html .= $q->submit('dosearch', T('Go!')) . $q->end_p . $q->end_form;
if (GetParam('matchingpages', $MatchingPages)) {
$html .= GetFormStart(undef, 'get', 'matchingpages'). $q->start_p;
$html .= $q->input({-type=>'hidden', -name=>'action', -value=>'index'});
$html .= $q->label({-for=>'matchingpage'}, T('Filter:')) . ' '
. $q->textfield(-name=>'match', -id=>'matchingpage', -size=>20) . ' ';
$html .= $q->submit('dosearch', T('Go!')) . $q->end_p . $q->end_form;
}
return $html;
}
@@ -3296,7 +3293,7 @@ sub AllPagesList {
}
sub DoSearch {
my $string = shift;
my $string = shift || GetParam('search', '');;
return DoIndex() if $string eq '';
eval { qr/$string/ }
or $@ and ReportError(Ts('Malformed regular expression in %s', $string),