return $wgUser->getOption( "searchNs".$i );
} else {
// User is not logged in so we give him the global default namespaces
- return $wgNamespacesToBeSearchedDefault[ $i ];
+ return !empty($wgNamespacesToBeSearchedDefault[ $i ]);
}
}
# that is done by showResults()
function powersearch()
{
- global $wgUser, $wgOut, $wgLang, $wgTitle;
-
- $search = $_REQUEST['search'];
- $searchx = $_REQUEST['searchx'];
- $listredirs = $_REQUEST['redirs'];
+ global $wgUser, $wgOut, $wgLang, $wgTitle, $wgRequest;
+ $sk =& $wgUser->getSkin();
+
+ $search = $wgRequest->getText( 'search' );
+ $searchx = $wgRequest->getVal( 'searchx' );
+ $listredirs = $wgRequest->getVal( 'redirs' );
$ret = wfMsg("powersearchtext"); # Text to be returned
$tempText = ""; # Temporary text, for substitution into $ret
if ( !isset( $searchx ) ) {
$checkboxValue = $this->initNamespaceCheckbox( $i );
} else {
- $checkboxValue = $_REQUEST[$formVar];
+ $checkboxValue = $wgRequest->getVal( $formVar );
}
$checked = "";
if ( $checkboxValue == 1 ) {
- $checked = " checked";
+ $checked = " checked='checked'";
$this->addtoquery["ns{$i}"] = 1;
array_push( $this->namespacesToSearch, $i );
}
if ( $tempText !== "" ) {
$tempText .= " ";
}
- $tempText .= "<input type=checkbox value=\"1\" name=\"" .
- "ns{$i}\"{$checked}>{$name}\n";
+ $tempText .= "<input type='checkbox' value=\"1\" name=\"" .
+ "ns{$i}\"{$checked} />{$name}\n";
}
$ret = str_replace ( "$1", $tempText, $ret );
$checked = "";
if ( $listredirs == 1 ) {
$this->addtoquery["redirs"] = 1;
- $checked = " checked";
+ $checked = " checked='checked'";
}
- $tempText = "<input type=checkbox value=1 name=\"redirs\"{$checked}>\n";
+ $tempText = "<input type='checkbox' value='1' name=\"redirs\"{$checked} />\n";
$ret = str_replace( "$2", $tempText, $ret );
# Search field
- $tempText = "<input type=text name=\"search\" value=\"" .
- htmlspecialchars( $search ) ."\" width=80>\n";
+ $tempText = "<input type='text' name=\"search\" value=\"" .
+ htmlspecialchars( $search ) ."\" width='80' />\n";
$ret = str_replace( "$3", $tempText, $ret );
# Searchx button
- $tempText = "<input type=submit name=\"searchx\" value=\"" .
- wfMsg("powersearch") . "\">\n";
+ $tempText = "<input type='submit' name=\"searchx\" value=\"" .
+ wfMsg("powersearch") . "\" />\n";
$ret = str_replace( "$9", $tempText, $ret );
- global $wgScript;
- $ret = "<br><br>\n<form id=\"powersearch\" method=\"get\" " .
- "action=\"$wgScript\">\n{$ret}\n</form>\n";
+ $action = $sk->escapeSearchLink();
+ $ret = "<br /><br />\n<form id=\"powersearch\" method=\"get\" " .
+ "action=\"$action\">\n{$ret}\n</form>\n";
if ( isset ( $searchx ) ) {
if ( ! $listredirs ) {
return $ret;
}
+ function setupPage() {
+ global $wgOut;
+ $wgOut->setPageTitle( wfMsg( "searchresults" ) );
+ $q = wfMsg( "searchquery", htmlspecialchars( $this->mUsertext ) );
+ $wgOut->setSubtitle( $q );
+ $wgOut->setArticleRelated( false );
+ $wgOut->setRobotpolicy( "noindex,nofollow" );
+ }
+
# Perform the search and construct the results page
function showResults()
{
- global $wgUser, $wgTitle, $wgOut, $wgLang, $wgDisableTextSearch;
- global $wgInputEncoding;
+ global $wgUser, $wgTitle, $wgOut, $wgLang, $wgRequest;
+ global $wgDisableTextSearch, $wgInputEncoding;
$fname = "SearchEngine::showResults";
- $search = $_REQUEST['search'];
+ $search = $wgRequest->getText( 'search' );
$powersearch = $this->powersearch(); /* Need side-effects here? */
- $wgOut->setPageTitle( wfMsg( "searchresults" ) );
- $q = wfMsg( "searchquery", htmlspecialchars( $this->mUsertext ) );
- $wgOut->setSubtitle( $q );
- $wgOut->setArticleRelated( false );
- $wgOut->setRobotpolicy( "noindex,nofollow" );
-
+ $this->setupPage();
+
$sk = $wgUser->getSkin();
$header = wfMsg( "searchresulttext", $sk->makeKnownLink(
wfMsg( "searchhelppage" ), wfMsg( "searchingwikipedia" ) ) );
$this->parseQuery();
if ( "" == $this->mTitlecond || "" == $this->mTextcond ) {
$wgOut->addHTML( "<h2>" . wfMsg( "badquery" ) . "</h2>\n" .
- "<p>" . wfMsg( "badquerytext" ) );
+ "<p>" . wfMsg( "badquerytext" ) . "</p>\n" );
return;
}
list( $limit, $offset ) = wfCheckLimits( 20, "searchlimit" );
$this->parseQuery();
if ( "" == $this->mTitlecond || "" == $this->mTextcond ) {
$wgOut->addHTML( "<h2>" . wfMsg( "badquery" ) . "</h2>\n" .
- "<p>" . wfMsg( "badquerytext" ) );
+ "<p>" . wfMsg( "badquerytext" ) . "</p>\n" );
return;
}
list( $limit, $offset ) = wfCheckLimits( 20, "searchlimit" );
} else {
$top = wfShowingResultsNum( $offset, $limit, $num );
}
- $wgOut->addHTML( "<p>{$top}\n" );
+ $wgOut->addHTML( "<p>{$top}</p>\n" );
# For powersearch
$sl = wfViewPrevNext( $offset, $limit, "",
"search=" . wfUrlencode( $this->mUsertext ) . $a2l );
- $wgOut->addHTML( "<br>{$sl}\n" );
+ $wgOut->addHTML( "<br />{$sl}\n" );
$foundsome = false;
$wgOut->addHTML( "</ol>\n" );
}
if ( ! $foundsome ) {
- $wgOut->addHTML( "<p>" . wfMsg( "nonefound" ) . "\n" );
+ $wgOut->addHTML( "<p>" . wfMsg( "nonefound" ) . "</p>\n" );
}
- $wgOut->addHTML( "<p>{$sl}\n" );
+ $wgOut->addHTML( "<p>{$sl}</p>\n" );
$wgOut->addHTML( $powersearch );
}
}
# Use cleaner boolean search if available
return $this->parseQuery4();
}
+ # on non mysql4 database: get list of words we don't want to search for
+ require_once( "FulltextStoplist.php" );
$lc = SearchEngine::legalSearchChars() . "()";
$q = preg_replace( "/([()])/", " \\1 ", $this->mUsertext );
$line = preg_replace( $pat2,
"<font color='red'>\\1</font>", $line );
- $wgOut->addHTML( "<br><small>{$lineno}: {$line}</small>\n" );
+ $wgOut->addHTML( "<br /><small>{$lineno}: {$line}</small>\n" );
}
$wgOut->addHTML( "</li>\n" );
}
function goResult()
{
- global $wgOut, $wgDisableTextSearch;
+ global $wgOut, $wgRequest, $wgGoToEdit;
+ global $wgDisableTextSearch;
$fname = "SearchEngine::goResult";
- $search = $_REQUEST['search'];
+ $search = trim( $wgRequest->getText( "search" ) );
- # First try to go to page as entered.
+ # Try to go to page as entered.
#
$t = Title::newFromText( $search );
return;
}
- if ( 0 != $t->getArticleID() ) {
+ # Exact match? No need to look further.
+ if ( $t->getNamespace() == NS_SPECIAL || 0 != $t->getArticleID() ) {
$wgOut->redirect( $t->getFullURL() );
return;
}
return;
}
+ # Entering an IP address goes to the contributions page
+ if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $search ) ) {
+ $title = Title::makeTitle( NS_SPECIAL, "Contributions" );
+ $wgOut->redirect( $title->getFullUrl( "target=$search" ) );
+ return;
+ }
+
# No match, generate an edit URL
$t = Title::newFromText( $this->mUsertext );
- $wgOut->addHTML( wfMsg("nogomatch", $t->escapeLocalURL( "action=edit" ) ) . "\n<p>" );
+
+ # If the feature is enabled, go straight to the edit page
+ if ( $wgGoToEdit ) {
+ $wgOut->redirect( $t->getFullURL( "action=edit" ) );
+ return;
+ }
+
+ if( $t ) {
+ $editurl = $t->escapeLocalURL( "action=edit" );
+ } else {
+ $editurl = ""; # ??
+ }
+ $wgOut->addHTML( "<p>" . wfMsg("nogomatch", $editurl ) . "</p>\n" );
# Try a fuzzy title search
$anyhit = false;
/* static */ function doFuzzyTitleSearch( $search, $namespace ){
global $wgLang, $wgOut;
+
+ $this->setupPage();
+
$sstr = ucfirst($search);
$sstr = str_replace(" ", "_", $sstr);
$fuzzymatches = SearchEngine::fuzzyTitles( $sstr, $namespace );
$spanabs = ceil($slen * (1 + $span)) - $slen;
# print "Word: $sstr, len = $slen, range = [$min, $max], tolerance_count = $tolerance_count<BR>\n";
$result = array();
+ $cnt = 0;
for( $i=0; $i <= $spanabs; $i++ ){
$titles = SearchEngine::getTitlesByLength( $slen + $i, $namespace );
- if( $i != 0)
+ if( $i != 0) {
$titles = array_merge($titles, SearchEngine::getTitlesByLength( $slen - $i, $namespace ) );
+ }
foreach($titles as $t){
$d = levenshtein($sstr, $t);
if($d < $tolerance_count)
$result[] = array($d, $t);
$cnt++;
}
- }
+ }
usort($result, "SearchEngine_pcmp");
return $result;
}
dépôts / lhc / web / wiklou.git / blobdiff