novabbs
/
rocksolid-light
2
0
Fork 1
Code Issues 16 Pull Requests Releases Wiki Activity

Properly handle multibyte strings in header search

This commit is contained in:
Retro_Guy 2021-03-24 19:10:49 -07:00
parent 668ed3b85f
commit 829e357e0e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Rocksolid_Light/rocksolid/search.php
View File

@ -234,8 +234,8 @@ $results=0;
} else { } else {
$poster_name = $fromoutput[0]; $poster_name = $fromoutput[0];
} }
$poster_name = trim($poster_name, "\""); $poster_name = trim(mb_decode_mimeheader($poster_name), " \n\r\t\v\0\"");
echo '<p class=np_ob_posted_date>Posted: '.$newdate.' by: '.create_name_link(mb_decode_mimeheader(mb_decode_mimeheader($poster_name))).'</p>'; echo '<p class=np_ob_posted_date>Posted: '.$newdate.' by: '.create_name_link($poster_name).'</p>';
if($_POST['searchpoint'] == 'body') { if($_POST['searchpoint'] == 'body') {
$snip = strip_tags(quoted_printable_decode($overviewline['snippet']), '<strong><font><i>'); $snip = strip_tags(quoted_printable_decode($overviewline['snippet']), '<strong><font><i>');
} else { } else {
@ -320,10 +320,17 @@ function get_header_search($group, $terms) {
$article_dbh = article_db_open($article_database); $article_dbh = article_db_open($article_database);
$article_stmt = $article_dbh->prepare("SELECT * FROM articles WHERE number=:number"); $article_stmt = $article_dbh->prepare("SELECT * FROM articles WHERE number=:number");
if(is_multibyte($_POST['terms'])) { if(is_multibyte($_POST['terms'])) {
$stmt = $dbh->query("SELECT * FROM $table WHERE newsgroup=$group"); $stmt = $dbh->prepare("SELECT * FROM $table WHERE newsgroup=:group");
while($row = $stmt->fetch()) { $stmt->bindParam(':group', $group);
if(stripos(quoted_printable_decode(mb_decode_mimeheader($row[$_POST['searchpoint']])), $_POST['terms']) !== false) { $stmt->execute();
$overview[] = $row; while($found = $stmt->fetch()) {
if(stripos(mb_decode_mimeheader($found[$_POST['searchpoint']]), $_POST['terms']) !== false) {
$article_stmt->bindParam(':number', $found['number']);
$article_stmt->execute();
$found_snip = $article_stmt->fetch();
$found['search_snippet'] = $found_snip['search_snippet'];
$found['sort_date'] = $found_snip['date'];
$overview[] = $found;
} }
} }
} else { } else {