[php-blog-cvs] serendipity serendipity_functions.inc.php,1.348,1.349

[Tom S. <tom...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
* Fixed counter not being incremented if a non-moderation-required comment or a simple trackback is submitted (FUCK)
* Always allow trackbacks, even if comments are subject to moderation


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- serendipity_functions.inc.php	19 Jul 2004 09:04:36 -0000	1.348
+++ serendipity_functions.inc.php	19 Jul 2004 23:39:41 -0000	1.349
@@ -1639,7 +1639,7 @@
 }
 
 
-function serendipity_approveComment($cid, $entry_id) {
+function serendipity_approveComment($cid, $entry_id, $force = false) {
     global $serendipity;
 
     /* Get data about the comment, we need this query because this function can be called from anywhere */
@@ -1649,8 +1649,8 @@
                 LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
                 LEFT JOIN {$serendipity['dbPrefix']}authors a ON (e.authorid = a.authorid)
                 WHERE c.id = ". $cid ."
-                    ". (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN) ? 'AND e.authorid = '. $serendipity['authorId'] : '') ."
-                    AND status = 'pending'";
+                    ". (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN && $force !== true) ? 'AND e.authorid = '. $serendipity['authorId'] : '') ."
+                    ". (($force === true) ? "" : "AND status = 'pending'");
     $rs  = serendipity_db_query($sql, true);
 
     /* It's already approved, don't spam people */
@@ -1668,7 +1668,7 @@
     if ($ca['timestamp'] > time() - $serendipity['max_last_modified']) {
         $lm = time();
     } else {
-        $lm = $ca['last_modified'];
+        $lm = (int)$rs['last_modified'];
     }
 
     $query = "UPDATE {$serendipity['dbPrefix']}entries SET $field=$field+1, last_modified=". $lm ." WHERE id='$entry_id'";
@@ -1716,10 +1716,12 @@
                  AND e.authorid = a.authorid";
         $row = serendipity_db_query($query, true); // Get info on author/entry
 
+        // Send mail to author
         serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($row['moderate_comments']));
 
-        if (serendipity_db_bool($ca['moderate_comments']) == false) {
-            serendipity_approveComment($cid, serendipity_db_bool($row['mail_comments']), $id, $row['email'], $email, $name, $url, $row['title'], $comments, $type);
+        // Approve with force if moderation is disabled or it is a trackback
+        if (serendipity_db_bool($ca['moderate_comments']) == false || $type == 'TRACKBACK') {
+            serendipity_approveComment($cid, $id, true);
         }
         serendipity_purgeEntry($id, $t);
         return true;