[php-blog-cvs] serendipity NEWS,1.214.2.20,1.214.2.21 serendipity_functions.inc.php,1.419.2.28,1.419.2.29

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

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_functions.inc.php 
Log Message:
MFH spamblock tweaks.
Todo: Comments don't seem to be working in this branch ATM. PostgreSQL seems to be emitting every comment twice. Needs to be looked at


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.28
retrieving revision 1.419.2.29
diff -u -d -r1.419.2.28 -r1.419.2.29
--- serendipity_functions.inc.php	22 Sep 2004 12:15:50 -0000	1.419.2.28
+++ serendipity_functions.inc.php	22 Sep 2004 15:25:16 -0000	1.419.2.29
@@ -206,7 +206,7 @@
 <?php
 }
 
-function serendipity_displayCommentForm($id, $url = '', $comments = NULL, $data = NULL, $showToolbar = true, $moderate_comments = true) {
+function serendipity_displayCommentForm($id, $url = '', $comments = NULL, $data = NULL, $showToolbar = true, $moderate_comments = true, $entry = null) {
     global $serendipity;
 
     if ($comments == NULL) {
@@ -226,7 +226,8 @@
         'commentform_data'           => isset($data['comment']) ? $data['comment'] : '',
         'is_commentform_showToolbar' => $showToolbar,
         'is_allowSubscriptions'      => $serendipity['allowSubscriptions'],
-        'is_moderate_comments'       => $moderate_comments
+        'is_moderate_comments'       => $moderate_comments,
+        'commentform_entry'          => $entry
       )
     );
 
@@ -1275,7 +1276,8 @@
                     true,
                     $serendipity['POST'],
                     true,
-                    serendipity_db_bool($entry['moderate_comments'])
+                    serendipity_db_bool($entry['moderate_comments']),
+                    $entry
                 );
             } /* END FULL ENTRY LOGIC */
         } // end for-loop (entries)

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.20
retrieving revision 1.214.2.21
diff -u -d -r1.214.2.20 -r1.214.2.21
--- NEWS	22 Sep 2004 11:34:02 -0000	1.214.2.20
+++ NEWS	22 Sep 2004 15:25:15 -0000	1.214.2.21
@@ -29,12 +29,23 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
-    * Fixed wrong implode() arguments for error reporting in installer
+    * Upgraded Spam Protector event plugin. Optionally:
+      - use Captchas - images with string sequences which a
+        user has to enter before his comment is accepted.
+      - restrict captchas to entries older than X days
+      - auto-moderate comments to entries older than X days
+      - auto-moderate comments depending on their amount of
+        contained links.
+      - reject comments depending on their amount of
+        contained links.
       (garvinhicking)
 
     * Fixed wrong implode() arguments for error reporting in installer
       (garvinhicking)
 
+    * Fixed windows detection for stripping backslashes out of
+      uploaded files. Thanks to Thomas! (garvinhicking)
+
 Version 0.7-beta3 (September 21st, 2004)
 ------------------------------------------------------------------------