updates/fixs to someof the abuse scripts

Author: detain

bin/clean_up_abuse_headers.php

@@ -1,5 +1,6 @@
 <?php
-include 'include/functions.inc.php';
+include __DIR__.'/../../../../include/functions.inc.php';
+include_once __DIR__.'/../src/ImapAbuseCheck.php';
 $db = get_module_db('default');
 $db2 = get_module_db('default');
 $limit = 10000;
@@ -8,14 +9,14 @@
 while ($continue == true) {
 	$start = time();
 	echo "Grabbing Rows $offset - ".($offset+$limit);
-	$db->query("select * from abuse left join abuse_data using (abuse_id) where abuse_id >= 440000 and abuse_headers != '' limit $offset, $limit;");
+	$db->query("select * from abuse left join abuse_data using (abuse_id) where abuse_headers != '' limit $offset, $limit;");
 	echo " got ".$db->num_rows()." rows";
 	if ($db->num_rows() < $limit) {
 		$continue = false;
 	}
 	$offset += $limit;
 	while ($db->next_record(MYSQL_ASSOC)) {
-		$out = fix_headers($db->Record['abuse_headers']);
+		$out = ImapAbuseCheck::fix_headers($db->Record['abuse_headers']);
 		if ($out != $db->Record['abuse_headers']) {
 			$db2->query("update abuse_data set abuse_headers='".$db->real_escape($out)."' where abuse_id={$db->Record['abuse_id']}");
 			//echo ".";

src/ImapAbuseCheck.php

@@ -533,7 +533,7 @@ public static function fix_headers($headers)
 				}
 			}
 		}
-		$out = preg_replace("/\n\s*\n/m", "\n", strip_tags($out));
+		$out = rtrim(preg_replace("/\n\s*\n/m", "\n", strip_tags($out)));
 		return $out;
 	}
 }