[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.35,1.419.2.36

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8003

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php 
Log Message:
* fix e-mail on spamblock comment moderation
* better logfile reject/moderate reasons


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.35
retrieving revision 1.419.2.36
diff -u -d -r1.419.2.35 -r1.419.2.36
--- serendipity_functions.inc.php	27 Sep 2004 12:13:49 -0000	1.419.2.35
+++ serendipity_functions.inc.php	28 Sep 2004 11:00:40 -0000	1.419.2.36
@@ -1410,7 +1410,7 @@
         serendipity_db_query($query);
         $cid = serendipity_db_insert_id('comments', 'id');
 
-        $query = "SELECT a.email, e.title, a.mail_comments, a.mail_trackbacks, e.moderate_comments
+        $query = "SELECT a.email, e.title, a.mail_comments, a.mail_trackbacks
                  FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a
                  WHERE e.id  = '". (int)$id ."'
                  AND e.authorid = a.authorid";
@@ -1420,7 +1420,7 @@
         if (serendipity_db_bool($ca['moderate_comments'])
             || ($type == 'NORMAL' && serendipity_db_bool($row['mail_comments']))
             || ($type == 'TRACKBACK' && serendipity_db_bool($row['mail_trackbacks']))) {
-            serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($row['moderate_comments']));
+            serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($ca['moderate_comments']));
         }
 
         // Approve with force, if moderation is disabled
@@ -1517,7 +1517,7 @@
         $subject =  '[' . $serendipity['blogTitle'] . '] ' . NEW_TRACKBACK_TO . ' ' . $title;
         $text = sprintf(A_NEW_TRACKBACK_BLAHBLAH, $title)
               . "\n"
-              . "\n" . REQUIRES_REVIEW          . ': ' . (($moderate_comment) ? YES : NO)
+              . "\n" . REQUIRES_REVIEW          . ': ' . (($moderate_comment) ? YES : NO) . (isset($serendipity['moderate_reason']) ? ' (' . $serendipity['moderate_reason'] . ')' : '')
               . "\n" . LINK_TO_ENTRY            . ': ' . $entryURI
               . "\n" . 'Weblog ' . NAME         . ': ' . stripslashes($fromName)
               . "\n" . LINK_TO_REMOTE_ENTRY     . ': ' . $fromUrl
@@ -1539,7 +1539,7 @@
         $text = sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity['blogTitle'], $title)
               . "\n" . LINK_TO_ENTRY . ': ' . $entryURI
               . "\n"
-              . "\n" . REQUIRES_REVIEW         . ': ' . (($moderate_comment) ? YES : NO)
+              . "\n" . REQUIRES_REVIEW         . ': ' . (($moderate_comment) ? YES : NO) . (isset($serendipity['moderate_reason']) ? ' (' . $serendipity['moderate_reason'] . ')' : '')
               . "\n" . USER . ' ' . IP_ADDRESS . ': ' . $_SERVER['REMOTE_ADDR']
               . "\n" . USER . ' ' . NAME       . ': ' . $fromName
               . "\n" . USER . ' ' . EMAIL      . ': ' . $fromEmail
@@ -3335,4 +3335,4 @@
 
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file