diff --git a/Rocksolid_Light/rocksolid/newsportal.php b/Rocksolid_Light/rocksolid/newsportal.php
index 8c7bf3b..67af4e5 100644
--- a/Rocksolid_Light/rocksolid/newsportal.php
+++ b/Rocksolid_Light/rocksolid/newsportal.php
@@ -42,16 +42,12 @@ $CONFIG = include($config_file);
*/
function nntp_open($nserver=0,$nport=0) {
global $text_error,$CONFIG;
- global $server,$port,$synchro_user,$synchro_pass;
+ global $server,$port;
// echo "
NNTP OPEN
";
if(!isset($CONFIG['enable_nntp']) || $CONFIG['enable_nntp'] != true) {
$CONFIG['server_auth_user'] = $CONFIG['remote_auth_user'];
$CONFIG['server_auth_pass'] = $CONFIG['remote_auth_pass'];
}
- if(isset($synchro_user)) {
- $CONFIG['server_auth_user'] = $synchro_user;
- $CONFIG['server_auth_pass'] = $synchro_pass;
- }
$authorize=((isset($CONFIG['server_auth_user'])) && (isset($CONFIG['server_auth_pass'])) &&
($CONFIG['server_auth_user'] != ""));
if ($nserver==0) $nserver=$server;
@@ -87,8 +83,6 @@ function nntp_open($nserver=0,$nport=0) {
}
}
if ($ns==false) echo "".$text_error["connection_failed"]."
";
- unset($synchro_user);
- unset($synchro_pass);
return $ns;
}
@@ -1203,4 +1197,22 @@ function get_date_interval($value) {
}
return $variance;
}
+
+function rslight_db_open($database, $table) {
+ try {
+ $dbh = new PDO('sqlite:'.$database);
+ } catch (PDOExeption $e) {
+ echo 'Connection failed: '.$e->getMessage();
+ exit;
+ }
+ $dbh->exec("CREATE TABLE IF NOT EXISTS $table(
+ id INTEGER PRIMARY KEY,
+ newsgroup TEXT,
+ number TEXT,
+ msgid TEXT,
+ date TEXT,
+ name TEXT,
+ subject TEXT)");
+ return($dbh);
+}
?>
diff --git a/Rocksolid_Light/rocksolid/overboard.php b/Rocksolid_Light/rocksolid/overboard.php
index bbce4df..760612b 100755
--- a/Rocksolid_Light/rocksolid/overboard.php
+++ b/Rocksolid_Light/rocksolid/overboard.php
@@ -93,9 +93,13 @@ if(is_file($cachefile)) {
ob_start();
# Iterate through groups
+$database = $spooldir.'/'.$config_name.'-overview.db3';
+$table = 'overview';
+$dbh = rslight_db_open($database, $table);
+$query = $dbh->prepare('SELECT * FROM overview WHERE newsgroup=:findgroup ORDER BY date DESC LIMIT '.$maxdisplay);
$articles = array();
foreach($grouplist as $findgroup) {
- $groups = explode(" ", $findgroup);
+ $groups = preg_split("/(\ |\t)/", $findgroup, 2);
$findgroup = $groups[0];
$none=0;
@@ -115,16 +119,21 @@ foreach($grouplist as $findgroup) {
}
$stats = stat($spoolpath.$thisgroup);
if($stats[9] > $oldest) {
- $newarticles = scandir($spoolpath.$thisgroup);
- foreach($newarticles as $newarticle) {
-$newarticle = $spoolpath.$thisgroup."/".$newarticle;
- $stats = stat($newarticle);
- if($stats[9] > $oldest && $stats[7] > 0) {
- $articles[] = $newarticle;
- }
+ if($dbh) {
+ $query->execute(['findgroup' => $findgroup]);
+ while (($overviewline = $query->fetch()) !== false) {
+ if($overviewline['date'] < $oldest) {
+ continue 2;
+ }
+ if(stripos($overviewline['newsgroup'], $findgroup) !== false) {
+ $articles[] = $spoolpath.$thisgroup.'/'.$overviewline['number'];
+ }
+
}
+ }
}
}
+$dbh = null;
if (isset($_GET['thisgroup'])) {
echo '';
@@ -266,7 +275,7 @@ foreach($files as $article) {
$poster_name = $fromoutput[0];
}
$poster_name = trim($poster_name, "\"");
- echo '
Posted: '.$date_interval.' by: '.create_name_link($poster_name).'
';
+ echo 'Posted: '.$date_interval.' by: '.create_name_link(mb_decode_mimeheader($poster_name)).'
';
// echo 'Posted: '.$date_interval.' by: '.mb_decode_mimeheader($fromoutput[0]).'
';
# Try to display useful snippet
if($stop=strpos($body, "begin 644 "))
diff --git a/Rocksolid_Light/rocksolid/result.php b/Rocksolid_Light/rocksolid/result.php
deleted file mode 100755
index 68dc436..0000000
--- a/Rocksolid_Light/rocksolid/result.php
+++ /dev/null
@@ -1,213 +0,0 @@
-
-
-
-
-
-'.$grouplist[0].' (latest)';
- echo '';
-} else {
- echo '';
- echo ''.basename(getcwd()).' / ';
- echo 'search results for: '.$_GET['terms'].'
';
- echo '';
-}
-echo '';
-
-# Iterate through groups
-
-$local_groupfile=$spooldir."/".$config_name."/local_groups.txt";
-$results=0;
-foreach($grouplist as $findgroup) {
- $groups = preg_split("/( |\t)/", $findgroup, 2);
- $findgroup = $groups[0];
-
-// Find starting article number (last - $maxdisplay)
- $local_grouplist = file($local_groupfile, FILE_IGNORE_NEW_LINES);
- foreach($local_grouplist as $local_findgroup) {
- $name = explode(':', $local_findgroup);
- if (strcmp($name[0], $findgroup) == 0) {
- if (is_numeric($name[1]))
- $local = $name[1];
- else {
- $thisgroup = $path."/".preg_replace('/\./', '/', $findgroup);
- $articles = scandir($thisgroup);
- $ok_article=array();
- foreach($articles as $this_article) {
- if(!is_numeric($this_article)) {
- continue;
- }
- $ok_article[]=$this_article;
- }
- sort($ok_article);
- $local = $ok_article[key(array_slice($ok_article, -1, 1, true))];
- if(!is_numeric($local))
- $local = 0;
- }
- break;
- }
- }
- if($local < 1)
- $local = 1;
-
-// $overviewfp=fopen($spooldir."/".$findgroup."-overview", "r");
- $overviewfp=popen($CONFIG['tac'].' '.$spooldir.'/'.$findgroup.'-overview', 'r');
- if($overviewfp) {
- while (($overviewline = fgets($overviewfp)) !== false) {
- $article = explode("\t", $overviewline);
- if(intval($article[0]) < ($local - $maxdisplay)) {
- continue;
- }
- if(!strcmp($_GET['searchpoint'], "Subject")) {
- $searchme = quoted_printable_decode(mb_decode_mimeheader($article[1]));
- }
- if(!strcmp($_GET['searchpoint'], "Poster")) {
- $searchme = quoted_printable_decode(mb_decode_mimeheader($article[2]));
- }
- if(!strcmp($_GET['searchpoint'], "Message-ID")) {
- $searchme = $article[4];
- }
- if(stripos($searchme, $_GET['terms']) === false) {
- continue;
- }
- # Generate link
- $url = $thissite."/article-flat.php?id=".$article[0]."&group="._rawurlencode($findgroup)."#".$article[0];
- $groupurl = $thissite."/thread.php?group="._rawurlencode($findgroup);
- $fromoutput = explode("<", html_entity_decode($article[2]));
-
- // Just an email address?
- if(strlen($fromoutput[0]) < 2) {
- preg_match("/\<([^\)]*)\@/", html_entity_decode($article[2]), $fromaddress);
- $fromoutput[0] = $fromaddress[1];
- }
- if(strpos($fromoutput[0], "(")) {
- preg_match("/\(([^\)]*)\)/", html_entity_decode($article[2]), $fromaddress);
- $fromoutput[0] = $fromaddress[1];
- }
- if(($results % 2) != 0){
- echo '| ';
- } else {
- echo ' |
| ';
- }
- echo ' ';
- echo ''.mb_decode_mimeheader($article[1])."\r\n";
- echo ' ';
- echo ''.$findgroup.'';
- echo ' ';
- echo 'Posted: '.$article[3].' by: '.mb_decode_mimeheader($fromoutput[0]).' ';
- echo ' |
';
- if($results++ > ($maxdisplay - 2))
- break;
- }
- fclose($overviewfp);
- }
-}
-
-echo '
';
-echo "".$results." matching articles found.
\r\n";
-#echo "Rocksolid Overboard version ".$version;
-include "tail.inc";
-
-$thispage = ob_get_contents();
-
-ob_end_clean();
-
-echo $thispage;
-
-function highlightStr($haystack, $needle) {
- preg_match_all("/$needle+/i", $haystack, $matches);
- if (is_array($matches[0]) && count($matches[0]) >= 1) {
- foreach ($matches[0] as $match) {
- $haystack = str_replace($match, ''.$match.'', $haystack);
- }
- }
- return $haystack;
-}
-
-function _rawurlencode($string) {
- $string = rawurlencode(str_replace('+','%2B',$string));
- return $string;
-}
-
-function _rawurldecode($string) {
- $string = rawurldecode(str_replace('%2B','+',$string));
- return $string;
-}
-
-?>
-
-