beenull/wiby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add files via upload

Browse source
This commit is contained in:
wibyweb 2023-09-12 01:49:20 -04:00 committed by GitHub
parent 79a12b5666
commit cccb97766a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
html/index.php
View file

@ -213,7 +213,7 @@ else
if ($word[0] != '-' && $word[0] != '+'){ if ($word[0] != '-' && $word[0] != '+'){
$queryNoQuotesOrFlags .= $word; $queryNoQuotesOrFlags .= $word;
} }
if ($word[0] == '+' && strlen($word) > 1){ if ($word[0] == '+' && strlen($word) > 1 && $requiredword == ''){
$requiredword = substr($word,1); $requiredword = substr($word,1);
} }
if ($word[0] == '-' || $word[0] == '+'){ if ($word[0] == '-' || $word[0] == '+'){
@ -287,7 +287,7 @@ else
if(strpos($queryNoQuotes,'"') !== false){ if(strpos($queryNoQuotes,'"') !== false){
$quotes++; $quotes++;
} }
if(((strpos($queryNoQuotes,'-') !== false && $word[0] != '-') || (strpos($queryNoQuotes,'+') !== false && $word[0] != '+')) && $quotes%2 == 0){//if hyphen exists, not a flag, not wrapped in quotes already if(((strpos($word,'-') !== false && $word[0] != '-') || (strpos($word,'+') !== false && $word[0] != '+')) && $quotes%2 == 0){//if hyphen exists, not a flag, not wrapped in quotes already
$word = '"' . $word . '"'; $word = '"' . $word . '"';
} }
if($i > 0){ if($i > 0){
@ -296,8 +296,6 @@ else
$query .= $word; $query .= $word;
$i++; $i++;
} }
//cant use hyphens as required keywords, use regular query instead
$keywordQuery = $query;
} }
if($filterHTTPS == true){ if($filterHTTPS == true){
@ -324,9 +322,14 @@ else
$keywordQuery = $query; $keywordQuery = $query;
} }
$querytouse = $query;
if($flagssetbyuser > 0){
$querytouse = $keywordQuery;
}
//perform full text search FOR InnoDB or MyISAM STORAGE ENGINE //perform full text search FOR InnoDB or MyISAM STORAGE ENGINE
if($exactMatch == false && $urlDetected==0 && strpos($query, ' ') == true && $flagssetbyuser != $wordcount){ if($exactMatch == false && $urlDetected==0 && strpos($query, ' ') == true && $flagssetbyuser != $wordcount){
$outputFTS = mysqli_query($link, "SELECT id, url, title, description, body FROM windex WHERE MATCH(tags, body, description, title, url) AGAINST('$query' IN BOOLEAN MODE) AND enable = '1' $additions ORDER BY CASE WHEN MATCH(tags) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 30 WHEN MATCH(title) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 20 WHEN MATCH(body) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) OR MATCH(description) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 15 WHEN MATCH(title) AGAINST('$keywordQuery' IN BOOLEAN MODE) THEN 14 WHEN MATCH(title) AGAINST('$query' IN BOOLEAN MODE) THEN 13 END DESC, id DESC LIMIT $lim OFFSET $offset"); $outputFTS = mysqli_query($link, "SELECT id, url, title, description, body FROM windex WHERE MATCH(tags, body, description, title, url) AGAINST('$querytouse' IN BOOLEAN MODE) AND enable = '1' $additions ORDER BY CASE WHEN MATCH(tags) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 30 WHEN MATCH(title) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 20 WHEN MATCH(body) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) OR MATCH(description) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 15 WHEN MATCH(title) AGAINST('$keywordQuery' IN BOOLEAN MODE) THEN 14 WHEN MATCH(title) AGAINST('$query' IN BOOLEAN MODE) THEN 13 END DESC, id DESC LIMIT $lim OFFSET $offset");
}else{ }else{
$outputFTS = mysqli_query($link, "SELECT id, url, title, description, body FROM windex WHERE MATCH(tags, body, description, title, url) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) AND enable = '1' $additions ORDER BY CASE WHEN MATCH(tags) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 30 WHEN MATCH(title) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 20 END DESC, id DESC LIMIT $lim OFFSET $offset"); $outputFTS = mysqli_query($link, "SELECT id, url, title, description, body FROM windex WHERE MATCH(tags, body, description, title, url) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) AND enable = '1' $additions ORDER BY CASE WHEN MATCH(tags) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 30 WHEN MATCH(title) AGAINST('$queryWithQuotesAndFlags' IN BOOLEAN MODE) THEN 20 END DESC, id DESC LIMIT $lim OFFSET $offset");
} }
@ -376,7 +379,7 @@ else
$count++; $count++;
$lastID = $row[0]; $lastID = $row[0];
if($exactMatch == false && $flagssetbyuser == 0) if($exactMatch == false && ($flagssetbyuser == 0 || $flagssetbyuser == $wordcount))
{ {
//remove the '*' at the end of the longest word if present //remove the '*' at the end of the longest word if present
if(strpos($longestWord,'*') == true) if(strpos($longestWord,'*') == true)