Fixed bug #566280
This commit is contained in:
parent
3b64444f57
commit
d782011514
1 changed files with 15 additions and 6 deletions
|
|
@ -15,6 +15,7 @@ use strict;
|
|||
use WebGUI::HTMLForm;
|
||||
use WebGUI::International;
|
||||
use WebGUI::Paginator;
|
||||
use WebGUI::Privilege;
|
||||
use WebGUI::Search;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::SQL;
|
||||
|
|
@ -25,22 +26,30 @@ our @EXPORT = qw(&www_search);
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_search {
|
||||
my ($constraints, $p, $output, %page, $sth, @row, $i);
|
||||
my ($constraints, $p, $output, %page, $sth, @row, $i, $url);
|
||||
$url = WebGUI::URL::page('op=search');
|
||||
$url = WebGUI::URL::append($url,'all='.$session{form}{all}) if ($session{form}{all} ne "");
|
||||
$url = WebGUI::URL::append($url,'exactPhrase='.$session{form}{exactPhrase}) if ($session{form}{exactPhrase} ne "");
|
||||
$url = WebGUI::URL::append($url,'atLeastOne='.$session{form}{atLeastOne}) if ($session{form}{atLeastOne} ne "");
|
||||
$url = WebGUI::URL::append($url,'without='.$session{form}{without}) if ($session{form}{without} ne "");
|
||||
$output = WebGUI::Search::form({op=>'search'});
|
||||
$constraints = WebGUI::Search::buildConstraints([qw(page.synopsis page.title page.menuTitle page.metaTags
|
||||
page.urlizedTitle wobject.description wobject.title wobject.namespace)]);
|
||||
if ($constraints ne "") {
|
||||
tie %page, 'Tie::CPHash';
|
||||
$sth = WebGUI::SQL->read("select page.urlizedTitle,page.title,wobject.wobjectId from page,wobject where $constraints
|
||||
and page.pageId=wobject.pageId and (page.pageId > 25 or page.pageId=1) and page.pageId<>$session{page}{pageId} order by lastEdited");
|
||||
$sth = WebGUI::SQL->read("select page.urlizedTitle,page.title,wobject.wobjectId,page.pageId from page,wobject where $constraints
|
||||
and page.pageId=wobject.pageId and (page.pageId > 25 or page.pageId=1)
|
||||
and page.pageId<>$session{page}{pageId} order by lastEdited");
|
||||
while (%page = $sth->hash) {
|
||||
$row[$i] = '<li><a href="'.WebGUI::URL::gateway($page{urlizedTitle}).'#'.$page{wobjectId}.'">'.$page{title}.'</a>';
|
||||
$i++;
|
||||
if (WebGUI::Privilege::canViewPage($page{pageId})) {
|
||||
$row[$i] = '<li><a href="'.WebGUI::URL::gateway($page{urlizedTitle}).'#'.$page{wobjectId}.'">'.$page{title}.'</a>';
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
$sth->finish;
|
||||
}
|
||||
if ($row[0] ne "") {
|
||||
$p = WebGUI::Paginator->new(WebGUI::URL::page('op=search'),\@row,$session{form}{numResults});
|
||||
$p = WebGUI::Paginator->new($url,\@row,$session{form}{numResults});
|
||||
$output .= '<p/>'.WebGUI::International::get(365).'<p><ol>';
|
||||
$output .= $p->getPage($session{form}{pn});
|
||||
$output .= '</ol>'.$p->getBarTraditional($session{form}{pn});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue