summarize_detail_badhost(): check empty

[pukiwiki/pukiwiki_sandbox.git] / spam / spam_pickup.php

diff --git a/spam/spam_pickup.php b/spam/spam_pickup.php
index 2f4e702..d69b19e 100644 (file)
--- a/spam/spam_pickup.php
+++ b/spam/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.45 2007/05/03 15:30:46 henoheno Exp $
+// $Id: spam_pickup.php,v 1.48 2007/05/05 07:33:31 henoheno Exp $
 // Concept-work of spam-uri metrics
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
@@ -126,20 +126,21 @@ if (! empty($progress)) {
                echo '<br />';
 
                if (! $asap) {
-                       echo 'METRICS: ' . summarize_spam_progress($progress) . '<br />';
+                       echo 'METRICS: ' . summarize_spam_progress($progress) . '<br />' . "\n";
                }
 
                $action = 'Blocked by: ' . summarize_spam_progress($progress, TRUE);
 
                $tmp = summarize_detail_badhost($progress);
                if ($tmp != '') {
-                       echo 'DETAIL_BADHOST: ' . htmlspecialchars($tmp) . '<br />';
+                       echo 'DETAIL_BADHOST: ' . 
+                               str_replace('  ', '&nbsp; ', nl2br(htmlspecialchars($tmp). "\n"));
                }
        }
 
        $tmp = summarize_detail_newtral($progress);
        if (! $asap && $tmp != '') {
-               echo 'DETAIL_NEUTRAL_HOST: ' . htmlspecialchars($tmp) . '<br />';
+               echo 'DETAIL_NEUTRAL_HOST: ' . htmlspecialchars($tmp);
        }
        
        if ($prog) {