php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.12,1.4.2.13

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
better fallback check


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.12
retrieving revision 1.4.2.13
diff -u -d -r1.4.2.12 -r1.4.2.13
--- serendipity_event_spamblock.php	24 Sep 2004 09:43:22 -0000	1.4.2.12
+++ serendipity_event_spamblock.php	24 Sep 2004 10:34:26 -0000	1.4.2.13
@@ -211,7 +211,7 @@
             $links_moderate  = $this->get_config('links_moderate', 10);
             $links_reject    = $this->get_config('links_reject', 20);
 
-            if (function_exists('imagettftext')) {
+            if (function_exists('imagettftext') && function_exists('imagejpeg')) {
                 $max_char = 5;
                 $min_char = 3;
                 $use_gd   = true;

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.16,1.17

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
better fallback check


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_event_spamblock.php	24 Sep 2004 09:42:58 -0000	1.16
+++ serendipity_event_spamblock.php	24 Sep 2004 10:34:22 -0000	1.17
@@ -211,7 +211,7 @@
             $links_moderate  = $this->get_config('links_moderate', 10);
             $links_reject    = $this->get_config('links_reject', 20);
 
-            if (function_exists('imagettftext')) {
+            if (function_exists('imagettftext') && function_exists('imagejpeg')) {
                 $max_char = 5;
                 $min_char = 3;
                 $use_gd   = true;

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.11,1.4.2.12

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
MFH


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -u -d -r1.4.2.11 -r1.4.2.12
--- serendipity_event_spamblock.php	23 Sep 2004 13:24:09 -0000	1.4.2.11
+++ serendipity_event_spamblock.php	24 Sep 2004 09:43:22 -0000	1.4.2.12
@@ -217,7 +217,7 @@
                 $use_gd   = true;
             } else {
                 $max_char = $min_char = 5;
-                $use_gd   = true;
+                $use_gd   = false;
             }
 
             switch($event) {
@@ -326,6 +326,7 @@
                             } else {
                                 $bgcolors = explode(',', $this->get_config('captcha_color', '255,0,255'));
                                 $hexval   = '#' . dechex(trim($bgcolors[0])) . dechex(trim($bgcolors[1])) . dechex(trim($bgcolors[2]));
+                                $this->random_string($max_char, $min_char);
                                 echo '<div style="background-color: ' . $hexval . '">';
                                 for ($i = 1; $i <= $max_char; $i++) {
                                     printf('<img src="%s" title="%s" alt="CAPTCHA ' . $i . '" class="captcha" />',
@@ -336,7 +337,7 @@
                                 echo '</div>';
                             }
                             echo '</label><br />';
-                            echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '<input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
+                            echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '<br /><input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
                         } elseif (isset($serendipity['POST']['captcha'])) {
                             echo '<input type="hidden" name="serendipity[captcha]" value="' . htmlspecialchars($serendipity['POST']['captcha']) . '" />';
                         }
@@ -366,20 +367,17 @@
 
                     $bgcolors = explode(',', $this->get_config('captcha_color', '255,255,255'));
                     $fontfiles = array('Comic_Sans_MS.ttf', 'Impact.ttf', 'Verdana.ttf');
-                    $chars     = array(2, 3, 4, 7, 9); // 1, 5, 6 and 8 may look like characters.
-                    $chars     = array_merge($chars, array('A','B','C','D','E','F','H','J','K','L','M','N','P','Q','R','T','U','V','W','X','Y','Z')); // I, O, S may look like numbers
 
-                    if ($use_gd || $parts[1] == '1') {
-                        $strings   = array_rand($chars, mt_rand($max_char, $min_char));
-                        $string    = '';
-                        foreach($strings AS $idx => $charidx) {
-                            $string .= $chars[$charidx];
+                    if ($use_gd) {
+                        $strings  = $this->random_string($max_char, $min_char);
+                        $fontname = $fontfiles[array_rand($fontfiles)];
+                        $font     = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/' . $fontname;
+
+                        if (!file_exists($font)) {
+                            // Search in shared plugin directory
+                            $font = S9Y_INCLUDE_PATH . 'plugins/serendipity_event_spamblock/' . $fontname;
                         }
-                        $_SESSION['spamblock'] = array('captcha' => $string);
-                    }
 
-                    if ($use_gd) {
-                        $font = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/' . $fontfiles[array_rand($fontfiles)];
                         if (!file_exists($font)) {
                             die(PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF);
                         }
@@ -404,7 +402,7 @@
                               $pos_y,
                               $color,
                               $font,
-                              $chars[$charidx]
+                              $this->chars[$charidx]
                             );
 
                             $pos_x = $pos_x + $size + 2;
@@ -429,6 +427,20 @@
         }
     }
 
+    function random_string($max_char, $min_char) {
+        $this->chars = array(2, 3, 4, 7, 9); // 1, 5, 6 and 8 may look like characters.
+        $this->chars = array_merge($this->chars, array('A','B','C','D','E','F','H','J','K','L','M','N','P','Q','R','T','U','V','W','X','Y','Z')); // I, O, S may look like numbers
+
+        $strings   = array_rand($this->chars, mt_rand($max_char, $min_char));
+        $string    = '';
+        foreach($strings AS $idx => $charidx) {
+            $string .= $this->chars[$charidx];
+        }
+        $_SESSION['spamblock'] = array('captcha' => $string);
+
+        return $strings;
+    }
+
     function log($logfile, $id, $switch, $reason, $comment) {
         global $serendipity;
 

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.15,1.16

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
fix plugin for shared installations
avoid race condition in fallback captcha generation
fix fallback generation :)


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_event_spamblock.php	23 Sep 2004 13:24:33 -0000	1.15
+++ serendipity_event_spamblock.php	24 Sep 2004 09:42:58 -0000	1.16
@@ -217,7 +217,7 @@
                 $use_gd   = true;
             } else {
                 $max_char = $min_char = 5;
-                $use_gd   = true;
+                $use_gd   = false;
             }
 
             switch($event) {
@@ -326,6 +326,7 @@
                             } else {
                                 $bgcolors = explode(',', $this->get_config('captcha_color', '255,0,255'));
                                 $hexval   = '#' . dechex(trim($bgcolors[0])) . dechex(trim($bgcolors[1])) . dechex(trim($bgcolors[2]));
+                                $this->random_string($max_char, $min_char);
                                 echo '<div style="background-color: ' . $hexval . '">';
                                 for ($i = 1; $i <= $max_char; $i++) {
                                     printf('<img src="%s" title="%s" alt="CAPTCHA ' . $i . '" class="captcha" />',
@@ -336,7 +337,7 @@
                                 echo '</div>';
                             }
                             echo '</label><br />';
-                            echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '<input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
+                            echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '<br /><input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
                         } elseif (isset($serendipity['POST']['captcha'])) {
                             echo '<input type="hidden" name="serendipity[captcha]" value="' . htmlspecialchars($serendipity['POST']['captcha']) . '" />';
                         }
@@ -366,20 +367,17 @@
 
                     $bgcolors = explode(',', $this->get_config('captcha_color', '255,255,255'));
                     $fontfiles = array('Comic_Sans_MS.ttf', 'Impact.ttf', 'Verdana.ttf');
-                    $chars     = array(2, 3, 4, 7, 9); // 1, 5, 6 and 8 may look like characters.
-                    $chars     = array_merge($chars, array('A','B','C','D','E','F','H','J','K','L','M','N','P','Q','R','T','U','V','W','X','Y','Z')); // I, O, S may look like numbers
 
-                    if ($use_gd || $parts[1] == '1') {
-                        $strings   = array_rand($chars, mt_rand($max_char, $min_char));
-                        $string    = '';
-                        foreach($strings AS $idx => $charidx) {
-                            $string .= $chars[$charidx];
+                    if ($use_gd) {
+                        $strings  = $this->random_string($max_char, $min_char);
+                        $fontname = $fontfiles[array_rand($fontfiles)];
+                        $font     = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/' . $fontname;
+
+                        if (!file_exists($font)) {
+                            // Search in shared plugin directory
+                            $font = S9Y_INCLUDE_PATH . 'plugins/serendipity_event_spamblock/' . $fontname;
                         }
-                        $_SESSION['spamblock'] = array('captcha' => $string);
-                    }
 
-                    if ($use_gd) {
-                        $font = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/' . $fontfiles[array_rand($fontfiles)];
                         if (!file_exists($font)) {
                             die(PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF);
                         }
@@ -404,7 +402,7 @@
                               $pos_y,
                               $color,
                               $font,
-                              $chars[$charidx]
+                              $this->chars[$charidx]
                             );
 
                             $pos_x = $pos_x + $size + 2;
@@ -429,6 +427,20 @@
         }
     }
 
+    function random_string($max_char, $min_char) {
+        $this->chars = array(2, 3, 4, 7, 9); // 1, 5, 6 and 8 may look like characters.
+        $this->chars = array_merge($this->chars, array('A','B','C','D','E','F','H','J','K','L','M','N','P','Q','R','T','U','V','W','X','Y','Z')); // I, O, S may look like numbers
+
+        $strings   = array_rand($this->chars, mt_rand($max_char, $min_char));
+        $string    = '';
+        foreach($strings AS $idx => $charidx) {
+            $string .= $this->chars[$charidx];
+        }
+        $_SESSION['spamblock'] = array('captcha' => $string);
+
+        return $strings;
+    }
+
     function log($logfile, $id, $switch, $reason, $comment) {
         global $serendipity;
 

[php-blog-cvs] serendipity/lang serendipity_lang_fr.inc.php,1.58,1.58.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_fr.inc.php 
Log Message:
locale


Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.58
retrieving revision 1.58.2.1
diff -u -d -r1.58 -r1.58.2.1
--- serendipity_lang_fr.inc.php	8 Sep 2004 08:37:41 -0000	1.58
+++ serendipity_lang_fr.inc.php	24 Sep 2004 09:30:58 -0000	1.58.2.1
@@ -12,7 +12,7 @@
 ##########################################################################
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'french, fr, en_US');
+@define('DATE_LOCALES', 'french, fr, fr_FR, en_US');
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'fr');

[php-blog-cvs] serendipity/lang serendipity_lang_fr.inc.php,1.58,1.59

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

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

Modified Files:
	serendipity_lang_fr.inc.php 
Log Message:
locale


Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- serendipity_lang_fr.inc.php	8 Sep 2004 08:37:41 -0000	1.58
+++ serendipity_lang_fr.inc.php	24 Sep 2004 09:30:46 -0000	1.59
@@ -12,7 +12,7 @@
 ##########################################################################
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'french, fr, en_US');
+@define('DATE_LOCALES', 'french, fr, fr_FR, en_US');
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'fr');

[php-blog-cvs] serendipity/plugins/serendipity_event_trackexits serendipity_event_trackexits.php,1.11.2.1,1.11.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_trackexits.php 
Log Message:
MFH evan's bug. Please commit bugs always to HEAD + branch-smarty.


Index: serendipity_event_trackexits.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- serendipity_event_trackexits.php	14 Sep 2004 13:11:17 -0000	1.11.2.1
+++ serendipity_event_trackexits.php	24 Sep 2004 09:16:20 -0000	1.11.2.2
@@ -178,7 +178,7 @@
             );
         }
 
-        if (isset($this->links[$url])) {
+        if (is_array($this->links) && isset($this->links[$url])) {
             return sprintf(
                 '<a%shref="%sexit.php?url_id=%s%s" title="%s" onmouseover="window.status=\'%s\';return true;" onmouseout="window.status=\'\';return true;"',
                 $buffer[1],

[php-blog-cvs] serendipity/plugins/serendipity_event_trackexits serendipity_event_trackexits.php,1.12,1.13

[Evan N. <tad...@us...>]

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

Modified Files:
	serendipity_event_trackexits.php 
Log Message:
Fix a bug where if the query to select links from the references table resulted in an error the first character of the error string would be inserted as the url_id instead of falling back on base64 encoding the URL. Thanks to Filip de Waard (http://www.filipdewaard.com/) for spotting.

Index: serendipity_event_trackexits.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_event_trackexits.php	14 Sep 2004 12:56:09 -0000	1.12
+++ serendipity_event_trackexits.php	24 Sep 2004 02:28:09 -0000	1.13
@@ -178,7 +178,7 @@
             );
         }
 
-        if (isset($this->links[$url])) {
+        if (is_array($this->links) && isset($this->links[$url])) {
             return sprintf(
                 '<a%shref="%sexit.php?url_id=%s%s" title="%s" onmouseover="window.status=\'%s\';return true;" onmouseout="window.status=\'\';return true;"',
                 $buffer[1],

[php-blog-cvs] serendipity/bundled-libs/Smarty ChangeLog,1.1.2.1,1.1.2.2 NEWS,1.1.2.1,1.1.2.2 README,1.1.2.1,1.1.2.2

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18996

Modified Files:
      Tag: branch-smarty
	ChangeLog NEWS README 
Log Message:
- Update to Smarty 2.6.5 (It's stable, even if their release says -dev)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Smarty/Attic/NEWS,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- NEWS	9 Sep 2004 14:55:43 -0000	1.1.2.1
+++ NEWS	23 Sep 2004 19:00:09 -0000	1.1.2.2
@@ -1,3 +1,12 @@
+Version 2.6.5 (Sept 13, 2004)
+-----------------------------
+
+  - fixed some parsing problems with object calls introduced
+    in 2.6.4 (Monte)
+  - add $smarty->security_settings['ALLOW_CONSTANTS']. note: this
+    defaults to false which means you have to allow them explicitely
+    in your secured templates from now on! (messju)
+
 Version 2.6.4 (Sept 7, 2004)
 ----------------------------
 

Index: README
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Smarty/Attic/README,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- README	9 Sep 2004 14:55:43 -0000	1.1.2.1
+++ README	23 Sep 2004 19:00:09 -0000	1.1.2.2
@@ -2,7 +2,7 @@
 
     Smarty - the PHP compiling template engine
 
-VERSION: 2.6.4
+VERSION: 2.6.0
 
 AUTHORS:
     

Index: ChangeLog
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Smarty/Attic/ChangeLog,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- ChangeLog	9 Sep 2004 14:55:43 -0000	1.1.2.1
+++ ChangeLog	23 Sep 2004 19:00:06 -0000	1.1.2.2
@@ -1,3 +1,52 @@
+2004-09-11  Messju Mohr  <me...@la...>
+
+    * libs/plugins/function.debug.php:
+      removed notice from {debug}
+      thanks to Peter Billen for pointing this one out!
+
+2004-09-11  Monte Ohrt  <mo...@is...>
+
+    * libs/Smarty_Compiler.class.php:
+      fix more object calling syntax issues
+
+2004-09-10  Messju Mohr  <me...@la...>
+
+    * NEWS
+      libs/Smarty.class.php
+      libs/Smarty_Compiler.class.php:
+      added $smarty->security_settings['ALLOW_CONSTANTS']
+      including test-cases for them
+
+2004-09-09  Monte Ohrt  <mo...@is...>
+
+    * libs/Smarty_Compiler.class.php:
+      break down regex to digestable chunks, fix multiple param problem with
+      method calls,
+      add object method testing to unit_test cases
+
+    * libs/Smarty_Compiler.class.php:
+      update code comment with more examples
+
+    * libs/Smarty_Compiler.class.php:
+      allow objects in arbitrary param positions
+
+    * libs/Smarty_Compiler.class.php:
+      fix object parameter regex, allow one level of object indirection
+
+    * libs/Smarty_Compiler.class.php:
+      fix compile problem with numeric constants and math operator matching
+
+2004-09-07  Monte Ohrt  <mo...@is...>
+
+    * libs/Config_File.class.php
+      libs/Smarty.class.php
+      libs/Smarty_Compiler.class.php:
+      update files to 2.6.5-dev
+
+    * (Smarty_2_6_4)
+      NEWS:
+      update NEWS file with 2.6.4 header
+
 2004-08-31  Monte Ohrt  <mo...@is...>
 
     * libs/Smarty_Compiler.class.php:

[php-blog-cvs] serendipity/bundled-libs/Smarty/libs Config_File.class.php,1.1.2.1,1.1.2.2 Smarty.class.php,1.1.2.1,1.1.2.2 Smarty_Compiler.class.php,1.1.2.1,1.1.2.2

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18996/libs

Modified Files:
      Tag: branch-smarty
	Config_File.class.php Smarty.class.php 
	Smarty_Compiler.class.php 
Log Message:
- Update to Smarty 2.6.5 (It's stable, even if their release says -dev)


Index: Smarty_Compiler.class.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/Attic/Smarty_Compiler.class.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Smarty_Compiler.class.php	9 Sep 2004 14:55:43 -0000	1.1.2.1
+++ Smarty_Compiler.class.php	23 Sep 2004 19:00:12 -0000	1.1.2.2
@@ -21,7 +21,7 @@
  * @link http://smarty.php.net/
  * @author Monte Ohrt <mo...@is...>
  * @author Andrei Zmievski <an...@ph...>
- * @version 2.6.4
+ * @version 2.6.5-dev
  * @copyright 2001-2004 ispi of Lincoln, Inc.
  * @package Smarty
  */
@@ -111,7 +111,7 @@
         // $foo[$bar]
         // $foo[5][blah]
         // $foo[5].bar[$foobar][4]
-        $this->_dvar_math_regexp = '[\+\*\/\%]|-(?!>)';
+        $this->_dvar_math_regexp = '(?:[\+\*\/\%]|(?:-(?!>)))';
         $this->_dvar_math_var_regexp = '[\$\w\.\+\-\*\/\%\d\>\[\]]';
         $this->_dvar_guts_regexp = '\w+(?:' . $this->_var_bracket_regexp
                 . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?';
@@ -137,9 +137,9 @@
         // #foo#
         // "text"
         // "text"
-        $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_qstr_regexp . ')';
+        $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_num_const_regexp . '|' . $this->_qstr_regexp . ')';
 
-        // matches valid object call (no objects allowed in parameters):
+        // matches valid object call (one level of object nesting allowed in parameters):
         // $foo->bar
         // $foo->bar()
         // $foo->bar("text")
@@ -147,13 +147,20 @@
         // $foo->bar($foo, "foo")
         // $foo->bar->foo()
         // $foo->bar->foo->bar()
+        // $foo->bar($foo->bar)
+        // $foo->bar($foo->bar())
+        // $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar))
         $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
-        $this->_obj_params_regexp = '\((?:-?\d|\w+|'
-                . $this->_var_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                . $this->_var_regexp . ')))*)?\)';
+        $this->_obj_restricted_param_regexp = '(?:'
+                . $this->_var_regexp . '(?:' . $this->_obj_ext_regexp . '(?:\((?:' . $this->_var_regexp
+                . '(?:\s*,\s*' . $this->_var_regexp . ')*)?\))?)*)';
+        $this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
+                . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
+        $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
+                . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
         $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
-        $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?)';
-
+        $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
+        
         // matches valid modifier syntax:
         // |foo
         // |@foo
@@ -399,7 +406,7 @@
         /* Matched comment. */
         if ($template_tag{0} == '*' && $template_tag{strlen($template_tag) - 1} == '*')
             return '';
-
+        
         /* Split tag into two three parts: command, command modifiers and the arguments. */
         if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
                 . '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
@@ -407,7 +414,7 @@
                     ~xs', $template_tag, $match)) {
             $this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
         }
-
+        
         $tag_command = $match[1];
         $tag_modifier = isset($match[2]) ? $match[2] : null;
         $tag_args = isset($match[3]) ? $match[3] : null;
@@ -1660,46 +1667,42 @@
     function _parse_var($var_expr)
     {
         $_has_math = false;
-        
-        if(!preg_match('~^' . $this->_obj_call_regexp . '$~', $var_expr)) {
-            // not an object call, see if there is math to parse
-            $_math_vars = preg_split('~('.$this->_dvar_math_regexp.'|'.$this->_qstr_regexp.')~', $var_expr, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $_math_vars = preg_split('~('.$this->_dvar_math_regexp.'|'.$this->_qstr_regexp.')~', $var_expr, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-            if(count($_math_vars) > 1) {
-                $_first_var = '';
-                $_complete_var = '';
-                $_output = '';
-                // simple check if there is any math, to stop recursion (due to modifiers with "xx % yy" as parameter)
-                foreach($_math_vars as $_k => $_math_var) {
-                    $_math_var = $_math_vars[$_k];
+        if(count($_math_vars) > 1) {
+            $_first_var = "";
+            $_complete_var = "";
+            $_output = "";
+            // simple check if there is any math, to stop recursion (due to modifiers with "xx % yy" as parameter)
+            foreach($_math_vars as $_k => $_math_var) {
+                $_math_var = $_math_vars[$_k];
 
-                    if(!empty($_math_var) || is_numeric($_math_var)) {
-                        // hit a math operator, so process the stuff which came before it
-                        if(preg_match('~^' . $this->_dvar_math_regexp . '$~', $_math_var)) {
-                            $_has_math = true;
-                            if(!empty($_complete_var) || is_numeric($_complete_var)) {
-                                $_output .= $this->_parse_var($_complete_var);
-                            }
+                if(!empty($_math_var) || is_numeric($_math_var)) {
+                    // hit a math operator, so process the stuff which came before it
+                    if(preg_match('~^' . $this->_dvar_math_regexp . '$~', $_math_var)) {
+                        $_has_math = true;
+                        if(!empty($_complete_var) || is_numeric($_complete_var)) {
+                            $_output .= $this->_parse_var($_complete_var);
+                        }
 
-                            // just output the math operator to php
-                            $_output .= $_math_var;
+                        // just output the math operator to php
+                        $_output .= $_math_var;
 
-                            if(empty($_first_var))
-                                $_first_var = $_complete_var;
+                        if(empty($_first_var))
+                            $_first_var = $_complete_var;
 
-                            $_complete_var = '';
-                        } else {
-                            $_complete_var .= $_math_var;
-                        }
+                        $_complete_var = "";
+                    } else {
+                        $_complete_var .= $_math_var;
                     }
                 }
-                if($_has_math) {
-                    if(!empty($_complete_var) || is_numeric($_complete_var))
-                        $_output .= $this->_parse_var($_complete_var);
+            }
+            if($_has_math) {
+                if(!empty($_complete_var) || is_numeric($_complete_var))
+                    $_output .= $this->_parse_var($_complete_var);
 
-                    // get the modifiers working (only the last var from math + modifier is left)
-                    $var_expr = $_complete_var;
-                }
+                // get the modifiers working (only the last var from math + modifier is left)
+                $var_expr = $_complete_var;
             }
         }
 
@@ -1710,10 +1713,11 @@
             $_var_ref = substr($var_expr, 1);
         
         if(!$_has_math) {
-            // get [foo] and .foo and ->foo and (...) pieces
-            preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $_match);
             
-            $_indexes = $_match[0];
+            // get [foo] and .foo and ->foo and (...) pieces
+            preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
+                        
+            $_indexes = $match[0];
             $_var_name = array_shift($_indexes);
 
             /* Handle $smarty.* variable references as a special case. */
@@ -2023,6 +2027,11 @@
                 break;
 
             case 'const':
+                if ($this->security && !$this->security_settings['ALLOW_CONSTANTS']) {
+                    $this->_syntax_error("(secure mode) constants not permitted",
+                                         E_USER_WARNING, __FILE__, __LINE__);
+                    return;
+                }
                 array_shift($indexes);
                 $_val = $this->_parse_var_props(substr($indexes[0],1));
                 $compiled_ref = '@constant(' . $_val . ')';

Index: Smarty.class.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/Attic/Smarty.class.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Smarty.class.php	9 Sep 2004 14:55:43 -0000	1.1.2.1
+++ Smarty.class.php	23 Sep 2004 19:00:12 -0000	1.1.2.2
@@ -27,7 +27,7 @@
  * @author Monte Ohrt <mo...@is...>
  * @author Andrei Zmievski <an...@ph...>
  * @package Smarty
- * @version 2.6.4
+ * @version 2.6.5-dev
  */
 
 /* $Id$ */
@@ -231,7 +231,8 @@
                                                                'true','false'),
                                     'INCLUDE_ANY'     => false,
                                     'PHP_TAGS'        => false,
-                                    'MODIFIER_FUNCS'  => array('count')
+                                    'MODIFIER_FUNCS'  => array('count'),
+                                    'ALLOW_CONSTANTS'  => false
                                    );
 
     /**
@@ -459,7 +460,7 @@
      *
      * @var string
      */
-    var $_version              = '2.6.4';
+    var $_version              = '2.6.5-dev';
 
     /**
      * current template inclusion depth
@@ -1107,7 +1108,7 @@
     function fetch($resource_name, $cache_id = null, $compile_id = null, $display = false)
     {
         static $_cache_info = array();
-
+        
         $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(isset($this->error_reporting)
                ? $this->error_reporting : error_reporting() & ~E_NOTICE);
 

Index: Config_File.class.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/Attic/Config_File.class.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Config_File.class.php	9 Sep 2004 14:55:43 -0000	1.1.2.1
+++ Config_File.class.php	23 Sep 2004 19:00:12 -0000	1.1.2.2
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @link http://smarty.php.net/
- * @version 2.6.4
+ * @version 2.6.5-dev
  * @copyright Copyright: 2001-2004 ispi of Lincoln, Inc.
  * @author Andrei Zmievski <an...@ph...>
  * @access public

[php-blog-cvs] serendipity/bundled-libs/Smarty/libs/plugins function.debug.php,1.1.2.1,1.1.2.2

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18996/libs/plugins

Modified Files:
      Tag: branch-smarty
	function.debug.php 
Log Message:
- Update to Smarty 2.6.5 (It's stable, even if their release says -dev)


Index: function.debug.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/plugins/Attic/function.debug.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- function.debug.php	9 Sep 2004 14:55:45 -0000	1.1.2.1
+++ function.debug.php	23 Sep 2004 19:00:13 -0000	1.1.2.2
@@ -23,8 +23,8 @@
  */
 function smarty_function_debug($params, &$smarty)
 {
-    if($params['output']) {
-        $smarty->assign('_smarty_debug_output',$params['output']);
+    if (isset($params['output'])) {
+        $smarty->assign('_smarty_debug_output', $params['output']);
     }
     require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.display_debug_console.php');
     return smarty_core_display_debug_console(null, $smarty);

[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.9,1.1.2.10 entries_summary.tpl,1.1.2.1,1.1.2.2 trackbacks.tpl,1.1.2.5,1.1.2.6

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

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

Modified Files:
      Tag: branch-smarty
	entries.tpl entries_summary.tpl trackbacks.tpl 
Log Message:
- Optimize Smarty to use less opcode, thanks to messju


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- entries.tpl	21 Sep 2004 20:43:16 -0000	1.1.2.9
+++ entries.tpl	23 Sep 2004 15:49:59 -0000	1.1.2.10
@@ -4,7 +4,7 @@
         {if $dateref[date] eq 'sticky'}
         <h3 class="serendipity_date">STICKY POSTINGS</h3>
         {else}
-        <h3 class="serendipity_date">{$dateref[date]|formatTime:DATE_FORMAT_ENTRY}</h3>
+        <h3 class="serendipity_date">{$dateref[date]|@formatTime:DATE_FORMAT_ENTRY}</h3>
         {/if}
 
         {section name=x loop=$bydate[date]}
@@ -14,7 +14,7 @@
             {if is_array($bydate[date][x][categories])}
             <span class="serendipity_entryIcon">
             {section name=cat loop=$bydate[date][x][categories]}
-                    <a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$bydate[date][x][categories].categoryid}-{$bydate[date][x][categories].category_name|makeFilename}"><img class="serendipity_entryIcon" title="{$bydate[date][x][categories].category_name|escape}{$bydate[date][x][categories].category_description|emptyPrefix}" alt="{$bydate[date][x][categories].category_name|escape}" src="{$bydate[date][x][categories].category_icon}" /></a>
+                    <a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$bydate[date][x][categories].categoryid}-{$bydate[date][x][categories].category_name|@makeFilename}"><img class="serendipity_entryIcon" title="{$bydate[date][x][categories].category_name|@escape}{$bydate[date][x][categories].category_description|@emptyPrefix}" alt="{$bydate[date][x][categories].category_name|@escape}" src="{$bydate[date][x][categories].category_icon}" /></a>
             {/section}
             </span>
             {/if}
@@ -28,15 +28,15 @@
             {/if}
 
             {if $bydate[date][x].has_extended and not $is_single_entry}
-            <br /><a href="{$bydate[date][x].entryLink}#extended">{$bydate[date][x].title|printf:VIEW_EXTENDED_ENTRY}</a><br /><br />
+            <br /><a href="{$bydate[date][x].entryLink}#extended">{$bydate[date][x].title|@printf:VIEW_EXTENDED_ENTRY}</a><br /><br />
             {/if}
 
             <div class='serendipity_entryFooter'>
                 {$CONST.POSTED_BY} {$bydate[date][x].username}
                 {if is_array($bydate[date][x].categories)}
-                    {$CONST.IN} {section name=cat loop=$bydate[date][x].categories}<a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$bydate[date][x].categories[cat].categoryid}-{$bydate[date][x].categories[cat].category_name|makeFilename}">{$bydate[date][x].categories[cat].category_name|escape}</a> {/section}
+                    {$CONST.IN} {section name=cat loop=$bydate[date][x].categories}<a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$bydate[date][x].categories[cat].categoryid}-{$bydate[date][x].categories[cat].category_name|@makeFilename}">{$bydate[date][x].categories[cat].category_name|@escape}</a> {/section}
                 {/if}
-                {$CONST.AT} <a href="{$bydate[date][x].entryLink}">{$bydate[date][x].timestamp|formatTime:'%H:%M'}</a>
+                {$CONST.AT} <a href="{$bydate[date][x].entryLink}">{$bydate[date][x].timestamp|@formatTime:'%H:%M'}</a>
 
                 {if $bydate[date][x].has_comments}
                     {if $use_popups}
@@ -75,23 +75,23 @@
         {$bydate[date][x].plugin_display_dat}
 
         {if $CONST.DATA_UNSUBSCRIBED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|printf:UNSUBSCRIBE_OK}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|@printf:UNSUBSCRIBE_OK}</div><br />
         {/if}
 
         {if $CONST.DATA_TRACKBACK_DELETED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_DELETED|printf:TRACKBACK_DELETED}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_DELETED|@printf:TRACKBACK_DELETED}</div><br />
         {/if}
 
         {if $CONST.DATA_TRACKBACK_APPROVED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_APPROVED|printf:TRACKBACK_APPROVED}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_APPROVED|@printf:TRACKBACK_APPROVED}</div><br />
         {/if}
 
         {if $CONST.DATA_COMMENT_DELETED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_DELETED|printf:COMMENT_DELETED}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_DELETED|@printf:COMMENT_DELETED}</div><br />
         {/if}
 
         {if $CONST.DATA_COMMENT_APPROVED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|printf:COMMENT_APPROVED}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@printf:COMMENT_APPROVED}</div><br />
         {/if}
 
         {if $is_single_entry and not $use_popups}
@@ -100,7 +100,7 @@
                 <a id="trackbacks"></a>
                 <div class="serendipity_commentsTitle">{$CONST.TRACKBACKS}</div>
                     <div class="serendipity_center">
-                        <a style="font-weight: normal" href="{$serendipityBaseURL}comment.php?type=trackback&amp;entry_id={$entry_id}" onclick="alert('{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|escape:htmlall}'); return false;" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|escape}">{$CONST.TRACKBACK_SPECIFIC}</a>
+                        <a style="font-weight: normal" href="{$serendipityBaseURL}comment.php?type=trackback&amp;entry_id={$entry_id}" onclick="alert('{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape:htmlall}'); return false;" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape}">{$CONST.TRACKBACK_SPECIFIC}</a>
                     </div>
                     <br />
                         {$TRACKBACKS}

Index: trackbacks.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/trackbacks.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- trackbacks.tpl	12 Sep 2004 23:00:51 -0000	1.1.2.5
+++ trackbacks.tpl	23 Sep 2004 15:49:59 -0000	1.1.2.6
@@ -11,11 +11,11 @@
         {assign var="name" value=$trackback.author}
     {/if}
     <div class="serendipity_comment">
-        <a href="{$link|strip_tags}" {'blank'|xhtml_target}>{$title}</a><br />
-        {$trackback.body|strip_tags|escape:all}<br />
+        <a href="{$link|@strip_tags}" {'blank'|@xhtml_target}>{$title}</a><br />
+        {$trackback.body|@strip_tags|@escape:all}<br />
         <div class="serendipity_comment_source">
-            <b>Weblog:</b> {$name|strip_tags}<br />
-            <b>{$CONST.TRACKED}:</b> {$trackback.timestamp|formatTime:'%b %d, %H:%M'}
+            <b>Weblog:</b> {$name|@strip_tags}<br />
+            <b>{$CONST.TRACKED}:</b> {$trackback.timestamp|@formatTime:'%b %d, %H:%M'}
         {if $is_trackbacks_owner}
             (<a href="{$serendipityBaseURL}comment.php?serendipity[delete]={$trackback.id}&amp;serendipity[entry]={$trackback.entry_id}&amp;serendipity[type]=trackbacks">{$CONST.DELETE}</a>)
         {/if}

Index: entries_summary.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries_summary.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- entries_summary.tpl	19 Sep 2004 21:30:44 -0000	1.1.2.1
+++ entries_summary.tpl	23 Sep 2004 15:49:59 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-<div class='serendipity_date'>{$CONST.TOPICS_OF} {$bydate[0][0].timestamp|formatTime:"%B, %Y"}</div>
+<div class='serendipity_date'>{$CONST.TOPICS_OF} {$bydate[0][0].timestamp|@formatTime:"%B, %Y"}</div>
 
 <div class="serendipity_entry">
     {section name=date loop=$bydate}

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.14,1.15

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
use $eventData[] before it's unset. :)


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_event_spamblock.php	23 Sep 2004 13:16:48 -0000	1.14
+++ serendipity_event_spamblock.php	23 Sep 2004 13:24:33 -0000	1.15
@@ -225,9 +225,9 @@
                     if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) {
                         $logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock_captcha.log');
                         if ( $this->get_config('killswitch', false) === true ) {
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                             $eventData = array('allow_comments' => false);
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH;
-                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                             return false;
                         }
 
@@ -236,9 +236,9 @@
                             $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'";
                             $row   = serendipity_db_query($query, true);
                             if (is_array($row) && $row['counter'] > 0) {
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
-                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                                 return false;
                             }
                         }
@@ -248,9 +248,9 @@
                             $query = "SELECT max(timestamp) AS last_post FROM {$serendipity['dbPrefix']}comments WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'";
                             $row   = serendipity_db_query($query, true);
                             if (is_array($row) && $row['last_post'] > (time() - $this->get_config('ipflood', 2)*60)) {
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD, $addData);
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_IP;
-                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD, $addData);
                                 return false;
                             }
                         }
@@ -268,9 +268,9 @@
                                 foreach ($rbls as $rbl) {
                                     $rblhost = $reverseIP .'.'. trim($rbl);
                                     if (gethostbyname($rblhost) != $rblhost) {
+                                        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_RBL, $addData);
                                         $eventData = array('allow_comments' => false);
                                         $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL;
-                                        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_RBL, $addData);
                                         return false;
                                     }
                                 }
@@ -280,33 +280,33 @@
                         // Captcha checking
                         if ($show_captcha) {
                             if (!isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) {
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS, $addData);
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS;
-                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS, $addData);
                                 return false;
                             }
                         }
 
                         // Check for forced moderation
                         if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) {
+                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION, $addData);
                             $eventData['moderate_comments'] = true;
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION;
-                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION, $addData);
                             return false;
                         }
 
                         $link_count = substr_count(strtolower($addData['comment']), 'http://');
                         if ($links_reject > 0 && $link_count > $links_reject) {
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT, $addData);
                             $eventData = array('allow_comments' => false);
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
-                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT, $addData);
                             return false;
                         }
 
                         if ($links_moderate > 0 && $link_count > $links_moderate) {
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE, $addData);
                             $eventData['moderate_comments'] = true;
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION;
-                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE, $addData);
                             return false;
                         }
                     }
@@ -437,11 +437,12 @@
         }
 
         $fp = @fopen($logfile, 'a+');
-        if ( !is_resource($fp) ) {
+        if (!is_resource($fp)) {
             return;
         }
+
         fwrite($fp, sprintf(
-            '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]' . "\n",
+            '[%s] - [%s: %s] - [#%s, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]' . "\n",
             date('Y-m-d H:i:s'),
             $switch,
             $reason,

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.10,1.4.2.11

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
mfh


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.10
retrieving revision 1.4.2.11
diff -u -d -r1.4.2.10 -r1.4.2.11
--- serendipity_event_spamblock.php	23 Sep 2004 13:16:44 -0000	1.4.2.10
+++ serendipity_event_spamblock.php	23 Sep 2004 13:24:09 -0000	1.4.2.11
@@ -225,9 +225,9 @@
                     if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) {
                         $logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock_captcha.log');
                         if ( $this->get_config('killswitch', false) === true ) {
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                             $eventData = array('allow_comments' => false);
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH;
-                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                             return false;
                         }
 
@@ -236,9 +236,9 @@
                             $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'";
                             $row   = serendipity_db_query($query, true);
                             if (is_array($row) && $row['counter'] > 0) {
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
-                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                                 return false;
                             }
                         }
@@ -248,9 +248,9 @@
                             $query = "SELECT max(timestamp) AS last_post FROM {$serendipity['dbPrefix']}comments WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'";
                             $row   = serendipity_db_query($query, true);
                             if (is_array($row) && $row['last_post'] > (time() - $this->get_config('ipflood', 2)*60)) {
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD, $addData);
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_IP;
-                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD, $addData);
                                 return false;
                             }
                         }
@@ -268,9 +268,9 @@
                                 foreach ($rbls as $rbl) {
                                     $rblhost = $reverseIP .'.'. trim($rbl);
                                     if (gethostbyname($rblhost) != $rblhost) {
+                                        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_RBL, $addData);
                                         $eventData = array('allow_comments' => false);
                                         $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL;
-                                        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_RBL, $addData);
                                         return false;
                                     }
                                 }
@@ -280,33 +280,33 @@
                         // Captcha checking
                         if ($show_captcha) {
                             if (!isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) {
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS, $addData);
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS;
-                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS, $addData);
                                 return false;
                             }
                         }
 
                         // Check for forced moderation
                         if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) {
+                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION, $addData);
                             $eventData['moderate_comments'] = true;
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION;
-                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION, $addData);
                             return false;
                         }
 
                         $link_count = substr_count(strtolower($addData['comment']), 'http://');
                         if ($links_reject > 0 && $link_count > $links_reject) {
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT, $addData);
                             $eventData = array('allow_comments' => false);
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
-                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT, $addData);
                             return false;
                         }
 
                         if ($links_moderate > 0 && $link_count > $links_moderate) {
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE, $addData);
                             $eventData['moderate_comments'] = true;
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION;
-                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE, $addData);
                             return false;
                         }
                     }
@@ -437,11 +437,12 @@
         }
 
         $fp = @fopen($logfile, 'a+');
-        if ( !is_resource($fp) ) {
+        if (!is_resource($fp)) {
             return;
         }
+
         fwrite($fp, sprintf(
-            '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]' . "\n",
+            '[%s] - [%s: %s] - [#%s, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]' . "\n",
             date('Y-m-d H:i:s'),
             $switch,
             $reason,

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.13,1.14

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
german translation


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_event_spamblock.php	23 Sep 2004 13:05:56 -0000	1.13
+++ serendipity_event_spamblock.php	23 Sep 2004 13:16:48 -0000	1.14
@@ -1,6 +1,47 @@
 <?php # $Id$
 
 switch ($serendipity['lang']) {
+    case 'de':
+        @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spamschutz');
+        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'Mehrere Varianten um Kommentarspam einzudämmen');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'Spamschutz: Ungültiger Kommentar');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'Spamschutz: Ein weiterer Kommentar kann nicht so schnell übermittelt werden.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL', 'Spamschutz: Ihre IP ist als Open Relay geführt, daher wird Ihr Kommentar abgewiesen.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH', 'Dieses Blog ist im "Notfall Kommentar"-Modus. Bitte kommen Sie später wieder.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', 'Keine doppelten Kommentare erlauben');
+        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Verbietet Benutzern ein Kommentar zu übermitteln, was gleichlautend bereits besteht.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH', 'Notfall-Blockade von Kommentaren');
+        @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_DESC', 'Übergangsweise Kommentare zu allen Einträgen verbieten. Nützlich, wenn das Blog unter andauerndem Spam-Beschuss leidet.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD', 'IP-Block Intervall');
+        @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Schränkt die Anzahl an Kommentare pro IP ein, indem nur alle X Minuten ein Kommentar erlaubt wird. Hilfreich um Spamfluten derselben IP abzuwehren.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_RBL', 'Kommentare von RBL-Block comments from RBL-listed hosts');
+        @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Kommentare von Personen, deren IP in einer RBL (Blacklist) geführt wird, werden verboten. Führen Sie hier die Namen der RBLs auf; Listen mit dynamischen Hosts sollten vermieden werden.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS', 'Captchas aktivieren');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC', 'Erfordert die Eingabe eines zufälligen Buchstabenfolge vom Benutzer, damit ein Kommentar angenommen wird. Diese Eingabe kann von Spambots nicht getätigt werden und verhindert so automatische Kommentare. Jedoch können behinderte oder blinde Personen mit der Darstellung solcher Eingabegrafiken Probleme haben.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'Um maschinelle und automatische Übertragung von Spamkommentaren zu verhinden, bitte die Zeichenfolge im dargestellten Bild in der Eingabemaske eintragen. Nur wenn die Zeichenfolge richtig eingegeben wurde, kann der Kommentar angenommen werden: ');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2', 'Bitte die dargestellte Zeichenfolge in die Eingabemaske eintragen!');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3', 'Hier die Zeichenfolge der Spamschutz-Grafik eintragen: ');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS', 'Sie haben nicht die richtige Spamschutz-Zeichenfolge eingetragen, die in der Grafik dargestellt wurde. Bitte gucken Sie sich dieses Bild erneut an und tragen die korrekte Zeichenfolge ein.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF', 'Captchas können auf Ihrem Server nicht dargestellt werden. Sie benötigen GDLib und die freetype Bibliotheken, sowie die richtigen .TTF Dateien.');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_TTL', 'Captchas nach wievielen Tagen erzwingen');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_TTL_DESC', 'Captchas können abhängig vom Alter des Artikels eingeblendet werden. Tragen Sie das Minimalalter eines Artikels in Tagen ein, ab dem Captchas erforderlich werden sollen. Falls auf 0 gesetzt, sind Captchas immer erforderlich.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION', 'Kommentarmoderation nach wievielen Tagen erzwingen');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION_DESC', 'Alle Kommentare zu einem Artikel können abhängig vom Alter des Artikels automatisch moderiert werden. Tragen Sie hier das Minimalalter eines Artikels in Tagen ein, ab dem jeder Kommentar erst nach Ihrer Moderation dargestellt wird.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE', 'Erforderliche Anzahl an Links für Moderation');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE_DESC', 'Wenn in einem Kommentar eine bestimmte Anzahl an Links vorhanden ist, kann der Kommentar automatisch moderiert werden. Falls auf 0 gesetzt, wird diese Linkprüfung nicht vorgenommen.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT', 'Erforderliche Anzahl an Links für Abweisung');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT_DESC', 'Wenn in einem Kommentar eine bestimmte Anzahl an Links vorhanden ist, kann der Kommentar automatisch abgelehnt werden. Falls auf 0 gesetzt, wird diese Linkprüfung nicht vorgenommen.');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION', 'Aufgrund einiger Bedingungen wird der Kommentar moderiert und erst nach Bestätigung des Blog-Eigentümers dargestellt.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHA_COLOR', 'Hintergrundfarbe des Captchas');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHA_COLOR_DESC', 'RGB Werte eingeben: 0,255,255');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGFILE', 'Speicherplatz für das Logfile');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGFILE_DESC', 'Einige Informationen über die Abweisung/Moderation von Kommentaren kann in ein Logfile geschrieben werden. Wenn diese Option auf einen leeren Wert gesetzt wird, findet keine Protokollierung statt.');
+
+        break;
+
     default:
         @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spam Protector');
         @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of methods to prevent comment spam');
@@ -15,7 +56,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD', 'IP block interval');
         @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Only allow an IP to submit a comment every n minutes. Useful to prevent comment floods.');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBL', 'Block comments from RBL-listed hosts');
-        @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Blocks comments based on provided RPL lists. Avoid lists with dynamic hosts.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Blocks comments based on provided RBL lists. Avoid lists with dynamic hosts.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS', 'Enable Captchas');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC', 'Will force the user to input a random string displayed in a specially crafted image. This will disallow automatted submits to your blog. Please remember that people with decreased vision may find it hard to read those captchas.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'To prevent automatted Bots from commentspamming, please enter the string you see in the image below in the appropriate input box. Only if the strings match, your comment will be submitted: ');
@@ -418,4 +459,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.9,1.4.2.10

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
german translation


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -u -d -r1.4.2.9 -r1.4.2.10
--- serendipity_event_spamblock.php	23 Sep 2004 13:04:52 -0000	1.4.2.9
+++ serendipity_event_spamblock.php	23 Sep 2004 13:16:44 -0000	1.4.2.10
@@ -1,6 +1,47 @@
 <?php # $Id$
 
 switch ($serendipity['lang']) {
+    case 'de':
+        @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spamschutz');
+        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'Mehrere Varianten um Kommentarspam einzudämmen');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'Spamschutz: Ungültiger Kommentar');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'Spamschutz: Ein weiterer Kommentar kann nicht so schnell übermittelt werden.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL', 'Spamschutz: Ihre IP ist als Open Relay geführt, daher wird Ihr Kommentar abgewiesen.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH', 'Dieses Blog ist im "Notfall Kommentar"-Modus. Bitte kommen Sie später wieder.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', 'Keine doppelten Kommentare erlauben');
+        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Verbietet Benutzern ein Kommentar zu übermitteln, was gleichlautend bereits besteht.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH', 'Notfall-Blockade von Kommentaren');
+        @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_DESC', 'Übergangsweise Kommentare zu allen Einträgen verbieten. Nützlich, wenn das Blog unter andauerndem Spam-Beschuss leidet.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD', 'IP-Block Intervall');
+        @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Schränkt die Anzahl an Kommentare pro IP ein, indem nur alle X Minuten ein Kommentar erlaubt wird. Hilfreich um Spamfluten derselben IP abzuwehren.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_RBL', 'Kommentare von RBL-Block comments from RBL-listed hosts');
+        @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Kommentare von Personen, deren IP in einer RBL (Blacklist) geführt wird, werden verboten. Führen Sie hier die Namen der RBLs auf; Listen mit dynamischen Hosts sollten vermieden werden.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS', 'Captchas aktivieren');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC', 'Erfordert die Eingabe eines zufälligen Buchstabenfolge vom Benutzer, damit ein Kommentar angenommen wird. Diese Eingabe kann von Spambots nicht getätigt werden und verhindert so automatische Kommentare. Jedoch können behinderte oder blinde Personen mit der Darstellung solcher Eingabegrafiken Probleme haben.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'Um maschinelle und automatische Übertragung von Spamkommentaren zu verhinden, bitte die Zeichenfolge im dargestellten Bild in der Eingabemaske eintragen. Nur wenn die Zeichenfolge richtig eingegeben wurde, kann der Kommentar angenommen werden: ');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2', 'Bitte die dargestellte Zeichenfolge in die Eingabemaske eintragen!');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3', 'Hier die Zeichenfolge der Spamschutz-Grafik eintragen: ');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS', 'Sie haben nicht die richtige Spamschutz-Zeichenfolge eingetragen, die in der Grafik dargestellt wurde. Bitte gucken Sie sich dieses Bild erneut an und tragen die korrekte Zeichenfolge ein.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF', 'Captchas können auf Ihrem Server nicht dargestellt werden. Sie benötigen GDLib und die freetype Bibliotheken, sowie die richtigen .TTF Dateien.');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_TTL', 'Captchas nach wievielen Tagen erzwingen');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_TTL_DESC', 'Captchas können abhängig vom Alter des Artikels eingeblendet werden. Tragen Sie das Minimalalter eines Artikels in Tagen ein, ab dem Captchas erforderlich werden sollen. Falls auf 0 gesetzt, sind Captchas immer erforderlich.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION', 'Kommentarmoderation nach wievielen Tagen erzwingen');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION_DESC', 'Alle Kommentare zu einem Artikel können abhängig vom Alter des Artikels automatisch moderiert werden. Tragen Sie hier das Minimalalter eines Artikels in Tagen ein, ab dem jeder Kommentar erst nach Ihrer Moderation dargestellt wird.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE', 'Erforderliche Anzahl an Links für Moderation');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE_DESC', 'Wenn in einem Kommentar eine bestimmte Anzahl an Links vorhanden ist, kann der Kommentar automatisch moderiert werden. Falls auf 0 gesetzt, wird diese Linkprüfung nicht vorgenommen.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT', 'Erforderliche Anzahl an Links für Abweisung');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT_DESC', 'Wenn in einem Kommentar eine bestimmte Anzahl an Links vorhanden ist, kann der Kommentar automatisch abgelehnt werden. Falls auf 0 gesetzt, wird diese Linkprüfung nicht vorgenommen.');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION', 'Aufgrund einiger Bedingungen wird der Kommentar moderiert und erst nach Bestätigung des Blog-Eigentümers dargestellt.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHA_COLOR', 'Hintergrundfarbe des Captchas');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHA_COLOR_DESC', 'RGB Werte eingeben: 0,255,255');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGFILE', 'Speicherplatz für das Logfile');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGFILE_DESC', 'Einige Informationen über die Abweisung/Moderation von Kommentaren kann in ein Logfile geschrieben werden. Wenn diese Option auf einen leeren Wert gesetzt wird, findet keine Protokollierung statt.');
+
+        break;
+
     default:
         @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spam Protector');
         @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of methods to prevent comment spam');
@@ -15,7 +56,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD', 'IP block interval');
         @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Only allow an IP to submit a comment every n minutes. Useful to prevent comment floods.');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBL', 'Block comments from RBL-listed hosts');
-        @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Blocks comments based on provided RPL lists. Avoid lists with dynamic hosts.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Blocks comments based on provided RBL lists. Avoid lists with dynamic hosts.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS', 'Enable Captchas');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC', 'Will force the user to input a random string displayed in a specially crafted image. This will disallow automatted submits to your blog. Please remember that people with decreased vision may find it hard to read those captchas.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'To prevent automatted Bots from commentspamming, please enter the string you see in the image below in the appropriate input box. Only if the strings match, your comment will be submitted: ');
@@ -418,4 +459,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.12,1.13

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
- Suppress errors from fopen() again


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_event_spamblock.php	23 Sep 2004 13:02:59 -0000	1.12
+++ serendipity_event_spamblock.php	23 Sep 2004 13:05:56 -0000	1.13
@@ -395,7 +395,7 @@
             return;
         }
 
-        $fp = fopen($logfile, 'a+');
+        $fp = @fopen($logfile, 'a+');
         if ( !is_resource($fp) ) {
             return;
         }

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.8,1.4.2.9

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
MFH


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -u -d -r1.4.2.8 -r1.4.2.9
--- serendipity_event_spamblock.php	23 Sep 2004 12:51:31 -0000	1.4.2.8
+++ serendipity_event_spamblock.php	23 Sep 2004 13:04:52 -0000	1.4.2.9
@@ -391,7 +391,7 @@
     function log($logfile, $id, $switch, $reason, $comment) {
         global $serendipity;
 
-        if (empty($log)) {
+        if (empty($logfile)) {
             return;
         }
 
@@ -400,8 +400,8 @@
             return;
         }
         fwrite($fp, sprintf(
-            '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]',
-            date('%Y-%m-%d'),
+            '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]' . "\n",
+            date('Y-m-d H:i:s'),
             $switch,
             $reason,
             $id,

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.11,1.12

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
- Unbreak logging (sorry)
- Log time (H:i:s)
- Remove '%' chars from date() function - Should I ask why they were there? :)
- Add linebreak at the end of the logstring


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_event_spamblock.php	23 Sep 2004 12:50:28 -0000	1.11
+++ serendipity_event_spamblock.php	23 Sep 2004 13:02:59 -0000	1.12
@@ -391,17 +391,17 @@
     function log($logfile, $id, $switch, $reason, $comment) {
         global $serendipity;
 
-        if (empty($log)) {
+        if (empty($logfile)) {
             return;
         }
 
-        $fp = @fopen($logfile, 'a+');
+        $fp = fopen($logfile, 'a+');
         if ( !is_resource($fp) ) {
             return;
         }
         fwrite($fp, sprintf(
-            '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]',
-            date('%Y-%m-%d'),
+            '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]' . "\n",
+            date('Y-m-d H:i:s'),
             $switch,
             $reason,
             $id,

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.7,1.4.2.8

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
MFH


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -d -r1.4.2.7 -r1.4.2.8
--- serendipity_event_spamblock.php	23 Sep 2004 12:31:51 -0000	1.4.2.7
+++ serendipity_event_spamblock.php	23 Sep 2004 12:51:31 -0000	1.4.2.8
@@ -125,21 +125,21 @@
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION_DESC);
-                $propbag->add('default', '60');
+                $propbag->add('default', '30');
                 break;
 
             case 'links_moderate':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE_DESC);
-                $propbag->add('default', '10');
+                $propbag->add('default', '7');
                 break;
 
             case 'links_reject':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT_DESC);
-                $propbag->add('default', '20');
+                $propbag->add('default', '13');
                 break;
 
             default:
@@ -388,33 +388,34 @@
         }
     }
 
-    function log($log, $id, $switch, $reason, $comment) {
+    function log($logfile, $id, $switch, $reason, $comment) {
         global $serendipity;
 
         if (empty($log)) {
             return;
         }
 
-        $logfile = @fopen($log, 'a');
-        if ($logfile) {
-            fwrite($logfile, sprintf(
-                '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]',
-
-                date('%Y-%m-%d'),
-                $switch,
-                $reason,
-                $id,
-                str_replace("\n", ' ', $comment['name']),
-                str_replace("\n", ' ', $comment['email']),
-                str_replace("\n", ' ', $comment['url']),
-                str_replace("\n", ' ', $_SERVER['HTTP_USER_AGENT']),
-                $_SERVER['REMOTE_ADDR'],
-                str_replace("\n", ' ', $comment['comment'])
-            ));
-            fclose($logfile);
+        $fp = @fopen($logfile, 'a+');
+        if ( !is_resource($fp) ) {
+            return;
         }
+        fwrite($fp, sprintf(
+            '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]',
+            date('%Y-%m-%d'),
+            $switch,
+            $reason,
+            $id,
+            str_replace("\n", ' ', $comment['name']),
+            str_replace("\n", ' ', $comment['email']),
+            str_replace("\n", ' ', $comment['url']),
+            str_replace("\n", ' ', $_SERVER['HTTP_USER_AGENT']),
+            $_SERVER['REMOTE_ADDR'],
+            str_replace("\n", ' ', $comment['comment'])
+        ));
+
+        fclose($fp);
     }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.10,1.11

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
- Change some defaults
- Pretty log function


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_event_spamblock.php	23 Sep 2004 12:31:57 -0000	1.10
+++ serendipity_event_spamblock.php	23 Sep 2004 12:50:28 -0000	1.11
@@ -125,21 +125,21 @@
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION_DESC);
-                $propbag->add('default', '60');
+                $propbag->add('default', '30');
                 break;
 
             case 'links_moderate':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE_DESC);
-                $propbag->add('default', '10');
+                $propbag->add('default', '7');
                 break;
 
             case 'links_reject':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT_DESC);
-                $propbag->add('default', '20');
+                $propbag->add('default', '13');
                 break;
 
             default:
@@ -388,33 +388,34 @@
         }
     }
 
-    function log($log, $id, $switch, $reason, $comment) {
+    function log($logfile, $id, $switch, $reason, $comment) {
         global $serendipity;
 
         if (empty($log)) {
             return;
         }
 
-        $logfile = @fopen($log, 'a');
-        if ($logfile) {
-            fwrite($logfile, sprintf(
-                '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]',
-
-                date('%Y-%m-%d'),
-                $switch,
-                $reason,
-                $id,
-                str_replace("\n", ' ', $comment['name']),
-                str_replace("\n", ' ', $comment['email']),
-                str_replace("\n", ' ', $comment['url']),
-                str_replace("\n", ' ', $_SERVER['HTTP_USER_AGENT']),
-                $_SERVER['REMOTE_ADDR'],
-                str_replace("\n", ' ', $comment['comment'])
-            ));
-            fclose($logfile);
+        $fp = @fopen($logfile, 'a+');
+        if ( !is_resource($fp) ) {
+            return;
         }
+        fwrite($fp, sprintf(
+            '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]',
+            date('%Y-%m-%d'),
+            $switch,
+            $reason,
+            $id,
+            str_replace("\n", ' ', $comment['name']),
+            str_replace("\n", ' ', $comment['email']),
+            str_replace("\n", ' ', $comment['url']),
+            str_replace("\n", ' ', $_SERVER['HTTP_USER_AGENT']),
+            $_SERVER['REMOTE_ADDR'],
+            str_replace("\n", ' ', $comment['comment'])
+        ));
+
+        fclose($fp);
     }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock captcha_2.png,1.1,1.2 captcha_3.png,1.1,1.2 captcha_4.png,1.1,1.2 captcha_7.png,1.1,1.2 captcha_9.png,1.1,1.2 captcha_a.png,1.1,1.2 captcha_b.png,1.1,1.2 captcha_c.png,1.1,1.2 captcha_d.png,1.1,1.2 captcha_e.png,1.1,1.2 captcha_f.png,1.1,1.2 captcha_h.png,1.1,1.2 captcha_j.png,1.1,1.2 captcha_k.png,1.1,1.2 captcha_l.png,1.1,1.2 captcha_m.png,1.1,1.2 captcha_n.png,1.1,1.2 captcha_p.png,1.1,1.2 captcha_q.png,1.1,1.2 captcha_r.png,1.1,1.2 captcha_t.png,1.1,1.2 captcha_u.png,1.1,1.2 captcha_v.png,1.1,1.2 captcha_w.png,1.1,1.2 captcha_x.png,1.1,1.2 captcha_y.png,1.1,1.2 captcha_z.png,1.1,1.2 serendipity_event_spamblock.php,1.9,1.10

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

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

Modified Files:
	serendipity_event_spamblock.php 
Added Files:
	captcha_2.png captcha_3.png captcha_4.png captcha_7.png 
	captcha_9.png captcha_a.png captcha_b.png captcha_c.png 
	captcha_d.png captcha_e.png captcha_f.png captcha_h.png 
	captcha_j.png captcha_k.png captcha_l.png captcha_m.png 
	captcha_n.png captcha_p.png captcha_q.png captcha_r.png 
	captcha_t.png captcha_u.png captcha_v.png captcha_w.png 
	captcha_x.png captcha_y.png captcha_z.png 
Log Message:
Captcha fallback on non-gdlib hosts.
Added ability to write a plaintext logfile for rejected/moderated comments.


--- NEW FILE: captcha_y.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_x.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_z.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_w.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_p.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_3.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_r.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_m.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_l.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_n.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_k.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_e.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_d.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_f.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_a.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_4.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_9.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_2.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_u.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_t.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_v.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_q.png ---
(This appears to be a binary file; contents omitted.)

Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_spamblock.php	22 Sep 2004 15:37:21 -0000	1.9
+++ serendipity_event_spamblock.php	23 Sep 2004 12:31:57 -0000	1.10
@@ -36,6 +36,9 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION', 'Because of some conditions, your comment has been marked to require moderation by the owner of this blog.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHA_COLOR', 'Background color of the captcha');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHA_COLOR_DESC', 'Enter RGB values: 0,255,255');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGFILE', 'Logfile location');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGFILE_DESC', 'Information about rejected/moderated posts can be written to a logfile. Set this to an empty string if you want to disable logging.');
         break;
 }
 
@@ -54,11 +57,13 @@
             'external_plugin'      => true,
             'frontend_comment'     => true
         ));
-        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'rbl', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'links_moderate', 'links_reject'));
+        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'rbl', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'links_moderate', 'links_reject', 'logfile'));
     }
 
     function introspect_config_item($name, &$propbag)
     {
+        global $serendipity;
+
         switch($name) {
             case 'bodyclone':
                 $propbag->add('type', 'boolean');
@@ -68,12 +73,10 @@
                 break;
 
             case 'captchas':
-                if (function_exists('imagettftext')) {
-                    $propbag->add('type', 'boolean');
-                    $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS);
-                    $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC);
-                    $propbag->add('default', true);
-                }
+                $propbag->add('type', 'boolean');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC);
+                $propbag->add('default', true);
                 break;
 
             case 'killswitch':
@@ -83,6 +86,13 @@
                 $propbag->add('default', false);
                 break;
 
+            case 'logfile':
+                $propbag->add('type', 'string');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LOGFILE);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_LOGFILE_DESC);
+                $propbag->add('default', $serendipity['serendipityPath'] . 'spamblock_captcha.log');
+                break;
+
             case 'ipflood':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD);
@@ -151,7 +161,7 @@
 
         if (isset($hooks[$event])) {
             $captchas_ttl = $this->get_config('captchas_ttl', 7);
-            $captchas     = (serendipity_db_bool($this->get_config('captchas', true)) && function_exists('imagettftext') ? true : false);
+            $captchas     = (serendipity_db_bool($this->get_config('captchas', true)) ? true : false);
             // Check if the entry is older than the allowed amount of time. Enforce kaptchas if that is true
             // of if kaptchas are activated for every entry
             $show_captcha = ($captchas && isset($eventData['timestamp']) && ($captchas_ttl < 1 || ($eventData['timestamp'] < (time() - ($captchas_ttl*60*60*24)))) ? true : false);
@@ -160,13 +170,23 @@
             $links_moderate  = $this->get_config('links_moderate', 10);
             $links_reject    = $this->get_config('links_reject', 20);
 
+            if (function_exists('imagettftext')) {
+                $max_char = 5;
+                $min_char = 3;
+                $use_gd   = true;
+            } else {
+                $max_char = $min_char = 5;
+                $use_gd   = true;
+            }
+
             switch($event) {
                 case 'frontend_saveComment':
                     if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) {
-
+                        $logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock_captcha.log');
                         if ( $this->get_config('killswitch', false) === true ) {
                             $eventData = array('allow_comments' => false);
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH;
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                             return false;
                         }
 
@@ -177,6 +197,7 @@
                             if (is_array($row) && $row['counter'] > 0) {
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                                 return false;
                             }
                         }
@@ -188,6 +209,7 @@
                             if (is_array($row) && $row['last_post'] > (time() - $this->get_config('ipflood', 2)*60)) {
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_IP;
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD, $addData);
                                 return false;
                             }
                         }
@@ -207,6 +229,7 @@
                                     if (gethostbyname($rblhost) != $rblhost) {
                                         $eventData = array('allow_comments' => false);
                                         $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL;
+                                        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_RBL, $addData);
                                         return false;
                                     }
                                 }
@@ -218,6 +241,7 @@
                             if (!isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) {
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS;
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS, $addData);
                                 return false;
                             }
                         }
@@ -226,6 +250,7 @@
                         if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) {
                             $eventData['moderate_comments'] = true;
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION;
+                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION, $addData);
                             return false;
                         }
 
@@ -233,12 +258,14 @@
                         if ($links_reject > 0 && $link_count > $links_reject) {
                             $eventData = array('allow_comments' => false);
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT, $addData);
                             return false;
                         }
 
                         if ($links_moderate > 0 && $link_count > $links_moderate) {
                             $eventData['moderate_comments'] = true;
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION;
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE, $addData);
                             return false;
                         }
                     }
@@ -249,10 +276,25 @@
                     if ($show_captcha) {
                         echo '<div class="serendipity_commentDirection">';
                         if (!isset($serendipity['POST']['preview']) || strtolower($serendipity['POST']['captcha'] != strtolower($_SESSION['spamblock']['captcha']))) {
-                            printf('<br />' . PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC . '<br /><label for="captcha"><img src="%s" title="%s" alt="CAPTCHA" class="captcha" /></label><br />',
-                                $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/captcha_' . md5(time()),
-                                htmlspecialchars(PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2)
-                            );
+                            echo '<br />' . PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC . '<br /><label for="captcha">';
+                            if ($use_gd) {
+                                printf('<img src="%s" title="%s" alt="CAPTCHA" class="captcha" />',
+                                    $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/captcha_' . md5(time()),
+                                    htmlspecialchars(PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2)
+                                );
+                            } else {
+                                $bgcolors = explode(',', $this->get_config('captcha_color', '255,0,255'));
+                                $hexval   = '#' . dechex(trim($bgcolors[0])) . dechex(trim($bgcolors[1])) . dechex(trim($bgcolors[2]));
+                                echo '<div style="background-color: ' . $hexval . '">';
+                                for ($i = 1; $i <= $max_char; $i++) {
+                                    printf('<img src="%s" title="%s" alt="CAPTCHA ' . $i . '" class="captcha" />',
+                                        $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/captcha_' . $i . '_' . md5(time()),
+                                        htmlspecialchars(PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2)
+                                    );
+                                }
+                                echo '</div>';
+                            }
+                            echo '</label><br />';
                             echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '<input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
                         } elseif (isset($serendipity['POST']['captcha'])) {
                             echo '<input type="hidden" name="serendipity[captcha]" value="' . htmlspecialchars($serendipity['POST']['captcha']) . '" />';
@@ -273,59 +315,67 @@
 
                     $methods = array('captcha');
 
-                    if (!in_array($parts[0], $methods) || !function_exists('imagettftext')) {
+                    if (!in_array($parts[0], $methods)) {
                         return;
                     }
 
+                    mt_srand(time());
                     $width    = 120;
                     $height   = 40;
-                    $max_char = 5;
-                    $min_char = 3;
-                    $bgcolors = explode(',', $this->get_config('captcha_color', '255,255,255'));
 
+                    $bgcolors = explode(',', $this->get_config('captcha_color', '255,255,255'));
                     $fontfiles = array('Comic_Sans_MS.ttf', 'Impact.ttf', 'Verdana.ttf');
                     $chars     = array(2, 3, 4, 7, 9); // 1, 5, 6 and 8 may look like characters.
                     $chars     = array_merge($chars, array('A','B','C','D','E','F','H','J','K','L','M','N','P','Q','R','T','U','V','W','X','Y','Z')); // I, O, S may look like numbers
-                    $strings   = array_rand($chars, mt_rand($max_char, $min_char));
-                    $string    = '';
-                    foreach($strings AS $idx => $charidx) {
-                        $string .= $chars[$charidx];
-                    }
-                    $_SESSION['spamblock'] = array('captcha' => $string);
 
-                    $font   = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/' . $fontfiles[array_rand($fontfiles)];
-                    if (!file_exists($font)) {
-                        die(PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF);
+                    if ($use_gd || $parts[1] == '1') {
+                        $strings   = array_rand($chars, mt_rand($max_char, $min_char));
+                        $string    = '';
+                        foreach($strings AS $idx => $charidx) {
+                            $string .= $chars[$charidx];
+                        }
+                        $_SESSION['spamblock'] = array('captcha' => $string);
                     }
 
-                    header('Content-Type: image/jpeg');
-                    $image  = imagecreate($width, $height);
-                    imagecolorallocate($image, trim($bgcolors[0]), trim($bgcolors[1]), trim($bgcolors[2]));
-                    // imagettftext($image, 10, 1, 1, 15, imagecolorallocate($image, 255, 255, 255), $font, 'String: ' . $string);
+                    if ($use_gd) {
+                        $font = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/' . $fontfiles[array_rand($fontfiles)];
+                        if (!file_exists($font)) {
+                            die(PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF);
+                        }
 
-                    $pos_x  = 5;
-                    foreach($strings AS $idx => $charidx) {
-                        $color = imagecolorallocate($image, mt_rand(50, 255), mt_rand(50, 255), mt_rand(50,255));
-                        $size  = mt_rand(15, 21);
-                        $angle = mt_rand(-20, 20);
-                        $pos_y = ceil($height - (mt_rand($size/3, $size/2)));
+                        header('Content-Type: image/jpeg');
+                        $image  = imagecreate($width, $height);
+                        imagecolorallocate($image, trim($bgcolors[0]), trim($bgcolors[1]), trim($bgcolors[2]));
+                        // imagettftext($image, 10, 1, 1, 15, imagecolorallocate($image, 255, 255, 255), $font, 'String: ' . $string);
 
-                        imagettftext(
-                          $image,
-                          $size,
-                          $angle,
-                          $pos_x,
-                          $pos_y,
-                          $color,
-                          $font,
-                          $chars[$charidx]
-                        );
+                        $pos_x  = 5;
+                        foreach($strings AS $idx => $charidx) {
+                            $color = imagecolorallocate($image, mt_rand(50, 235), mt_rand(50, 235), mt_rand(50,235));
+                            $size  = mt_rand(15, 21);
+                            $angle = mt_rand(-20, 20);
+                            $pos_y = ceil($height - (mt_rand($size/3, $size/2)));
 
-                        $pos_x = $pos_x + $size + 2;
+                            imagettftext(
+                              $image,
+                              $size,
+                              $angle,
+                              $pos_x,
+                              $pos_y,
+                              $color,
+                              $font,
+                              $chars[$charidx]
+                            );
 
+                            $pos_x = $pos_x + $size + 2;
+
+                        }
+                        imagejpeg($image, '', 90);
+                        imagedestroy($image);
+                    } else {
+                        header('Content-Type: image/png');
+                        $output_char = strtolower($_SESSION['spamblock']['captcha']{$parts[1] - 1});
+                        echo file_get_contents($serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/captcha_' . $output_char . '.png');
                     }
-                    imagejpeg($image, '', 90);
-                    imagedestroy($image);
                     return true;
                     break;
 
@@ -337,6 +387,33 @@
             return false;
         }
     }
+
+    function log($log, $id, $switch, $reason, $comment) {
+        global $serendipity;
+
+        if (empty($log)) {
+            return;
+        }
+
+        $logfile = @fopen($log, 'a');
+        if ($logfile) {
+            fwrite($logfile, sprintf(
+                '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]',
+
+                date('%Y-%m-%d'),
+                $switch,
+                $reason,
+                $id,
+                str_replace("\n", ' ', $comment['name']),
+                str_replace("\n", ' ', $comment['email']),
+                str_replace("\n", ' ', $comment['url']),
+                str_replace("\n", ' ', $_SERVER['HTTP_USER_AGENT']),
+                $_SERVER['REMOTE_ADDR'],
+                str_replace("\n", ' ', $comment['comment'])
+            ));
+            fclose($logfile);
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

--- NEW FILE: captcha_h.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_j.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_7.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_c.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_b.png ---
(This appears to be a binary file; contents omitted.)

[php-blog-cvs] serendipity NEWS,1.231,1.232 serendipity_functions.inc.php,1.431,1.432

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

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
Captcha fallback on non-gdlib hosts.
Added ability to write a plaintext logfile for rejected/moderated comments.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -d -r1.431 -r1.432
--- serendipity_functions.inc.php	22 Sep 2004 15:14:49 -0000	1.431
+++ serendipity_functions.inc.php	23 Sep 2004 12:31:57 -0000	1.432
@@ -1776,7 +1776,7 @@
 function serendipity_saveComment($id, $commentInfo, $type = 'NORMAL') {
     global $serendipity;
 
-    $query = "SELECT allow_comments, moderate_comments, last_modified, timestamp FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'";
+    $query = "SELECT id, allow_comments, moderate_comments, last_modified, timestamp FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'";
     $ca    = serendipity_db_query($query, true);
 
     serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo);

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- NEWS	22 Sep 2004 15:14:49 -0000	1.231
+++ NEWS	23 Sep 2004 12:31:57 -0000	1.232
@@ -12,6 +12,8 @@
         contained links.
       - reject comments depending on their amount of
         contained links.
+      - able to log rejected/moderated comments to a plaintext file
+      - fallback method for non-gdlib-enabled hosts
       (garvinhicking)
 
     * Fixed wrong implode() arguments for error reporting in installer

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock captcha_2.png,NONE,1.1.2.1 captcha_3.png,NONE,1.1.2.1 captcha_4.png,NONE,1.1.2.1 captcha_7.png,NONE,1.1.2.1 captcha_9.png,NONE,1.1.2.1 captcha_a.png,NONE,1.1.2.1 captcha_b.png,NONE,1.1.2.1 captcha_c.png,NONE,1.1.2.1 captcha_d.png,NONE,1.1.2.1 captcha_e.png,NONE,1.1.2.1 captcha_f.png,NONE,1.1.2.1 captcha_h.png,NONE,1.1.2.1 captcha_j.png,NONE,1.1.2.1 captcha_k.png,NONE,1.1.2.1 captcha_l.png,NONE,1.1.2.1 captcha_m.png,NONE,1.1.2.1 captcha_n.png,NONE,1.1.2.1 captcha_p.png,NONE,1.1.2.1 captcha_q.png,NONE,1.1.2.1 captcha_r.png,NONE,1.1.2.1 captcha_t.png,NONE,1.1.2.1 captcha_u.png,NONE,1.1.2.1 captcha_v.png,NONE,1.1.2.1 captcha_w.png,NONE,1.1.2.1 captcha_x.png,NONE,1.1.2.1 captcha_y.png,NONE,1.1.2.1 captcha_z.png,NONE,1.1.2.1 serendipity_event_spamblock.php,1.4.2.6,1.4.2.7

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Added Files:
      Tag: branch-smarty
	captcha_2.png captcha_3.png captcha_4.png captcha_7.png 
	captcha_9.png captcha_a.png captcha_b.png captcha_c.png 
	captcha_d.png captcha_e.png captcha_f.png captcha_h.png 
	captcha_j.png captcha_k.png captcha_l.png captcha_m.png 
	captcha_n.png captcha_p.png captcha_q.png captcha_r.png 
	captcha_t.png captcha_u.png captcha_v.png captcha_w.png 
	captcha_x.png captcha_y.png captcha_z.png 
Log Message:
MFH


--- NEW FILE: captcha_y.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_x.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_z.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_w.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_p.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_3.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_r.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_m.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_l.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_n.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_k.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_e.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_d.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_f.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_a.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_4.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_9.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_2.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_u.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_t.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_v.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_q.png ---
(This appears to be a binary file; contents omitted.)

Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -d -r1.4.2.6 -r1.4.2.7
--- serendipity_event_spamblock.php	22 Sep 2004 15:37:40 -0000	1.4.2.6
+++ serendipity_event_spamblock.php	23 Sep 2004 12:31:51 -0000	1.4.2.7
@@ -36,6 +36,9 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION', 'Because of some conditions, your comment has been marked to require moderation by the owner of this blog.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHA_COLOR', 'Background color of the captcha');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHA_COLOR_DESC', 'Enter RGB values: 0,255,255');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGFILE', 'Logfile location');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGFILE_DESC', 'Information about rejected/moderated posts can be written to a logfile. Set this to an empty string if you want to disable logging.');
         break;
 }
 
@@ -54,11 +57,13 @@
             'external_plugin'      => true,
             'frontend_comment'     => true
         ));
-        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'rbl', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'links_moderate', 'links_reject'));
+        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'rbl', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'links_moderate', 'links_reject', 'logfile'));
     }
 
     function introspect_config_item($name, &$propbag)
     {
+        global $serendipity;
+
         switch($name) {
             case 'bodyclone':
                 $propbag->add('type', 'boolean');
@@ -68,12 +73,10 @@
                 break;
 
             case 'captchas':
-                if (function_exists('imagettftext')) {
-                    $propbag->add('type', 'boolean');
-                    $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS);
-                    $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC);
-                    $propbag->add('default', true);
-                }
+                $propbag->add('type', 'boolean');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC);
+                $propbag->add('default', true);
                 break;
 
             case 'killswitch':
@@ -83,6 +86,13 @@
                 $propbag->add('default', false);
                 break;
 
+            case 'logfile':
+                $propbag->add('type', 'string');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LOGFILE);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_LOGFILE_DESC);
+                $propbag->add('default', $serendipity['serendipityPath'] . 'spamblock_captcha.log');
+                break;
+
             case 'ipflood':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD);
@@ -151,7 +161,7 @@
 
         if (isset($hooks[$event])) {
             $captchas_ttl = $this->get_config('captchas_ttl', 7);
-            $captchas     = (serendipity_db_bool($this->get_config('captchas', true)) && function_exists('imagettftext') ? true : false);
+            $captchas     = (serendipity_db_bool($this->get_config('captchas', true)) ? true : false);
             // Check if the entry is older than the allowed amount of time. Enforce kaptchas if that is true
             // of if kaptchas are activated for every entry
             $show_captcha = ($captchas && isset($eventData['timestamp']) && ($captchas_ttl < 1 || ($eventData['timestamp'] < (time() - ($captchas_ttl*60*60*24)))) ? true : false);
@@ -160,13 +170,23 @@
             $links_moderate  = $this->get_config('links_moderate', 10);
             $links_reject    = $this->get_config('links_reject', 20);
 
+            if (function_exists('imagettftext')) {
+                $max_char = 5;
+                $min_char = 3;
+                $use_gd   = true;
+            } else {
+                $max_char = $min_char = 5;
+                $use_gd   = true;
+            }
+
             switch($event) {
                 case 'frontend_saveComment':
                     if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) {
-
+                        $logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock_captcha.log');
                         if ( $this->get_config('killswitch', false) === true ) {
                             $eventData = array('allow_comments' => false);
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH;
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                             return false;
                         }
 
@@ -177,6 +197,7 @@
                             if (is_array($row) && $row['counter'] > 0) {
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH, $addData);
                                 return false;
                             }
                         }
@@ -188,6 +209,7 @@
                             if (is_array($row) && $row['last_post'] > (time() - $this->get_config('ipflood', 2)*60)) {
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_IP;
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD, $addData);
                                 return false;
                             }
                         }
@@ -207,6 +229,7 @@
                                     if (gethostbyname($rblhost) != $rblhost) {
                                         $eventData = array('allow_comments' => false);
                                         $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL;
+                                        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_RBL, $addData);
                                         return false;
                                     }
                                 }
@@ -218,6 +241,7 @@
                             if (!isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) {
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS;
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS, $addData);
                                 return false;
                             }
                         }
@@ -226,6 +250,7 @@
                         if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) {
                             $eventData['moderate_comments'] = true;
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION;
+                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_FORCEMODERATION, $addData);
                             return false;
                         }
 
@@ -233,12 +258,14 @@
                         if ($links_reject > 0 && $link_count > $links_reject) {
                             $eventData = array('allow_comments' => false);
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_REJECT, $addData);
                             return false;
                         }
 
                         if ($links_moderate > 0 && $link_count > $links_moderate) {
                             $eventData['moderate_comments'] = true;
                             $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_NOTICE_MODERATION;
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_LINKS_MODERATE, $addData);
                             return false;
                         }
                     }
@@ -249,10 +276,25 @@
                     if ($show_captcha) {
                         echo '<div class="serendipity_commentDirection">';
                         if (!isset($serendipity['POST']['preview']) || strtolower($serendipity['POST']['captcha'] != strtolower($_SESSION['spamblock']['captcha']))) {
-                            printf('<br />' . PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC . '<br /><label for="captcha"><img src="%s" title="%s" alt="CAPTCHA" class="captcha" /></label><br />',
-                                $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/captcha_' . md5(time()),
-                                htmlspecialchars(PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2)
-                            );
+                            echo '<br />' . PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC . '<br /><label for="captcha">';
+                            if ($use_gd) {
+                                printf('<img src="%s" title="%s" alt="CAPTCHA" class="captcha" />',
+                                    $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/captcha_' . md5(time()),
+                                    htmlspecialchars(PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2)
+                                );
+                            } else {
+                                $bgcolors = explode(',', $this->get_config('captcha_color', '255,0,255'));
+                                $hexval   = '#' . dechex(trim($bgcolors[0])) . dechex(trim($bgcolors[1])) . dechex(trim($bgcolors[2]));
+                                echo '<div style="background-color: ' . $hexval . '">';
+                                for ($i = 1; $i <= $max_char; $i++) {
+                                    printf('<img src="%s" title="%s" alt="CAPTCHA ' . $i . '" class="captcha" />',
+                                        $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/captcha_' . $i . '_' . md5(time()),
+                                        htmlspecialchars(PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2)
+                                    );
+                                }
+                                echo '</div>';
+                            }
+                            echo '</label><br />';
                             echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '<input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
                         } elseif (isset($serendipity['POST']['captcha'])) {
                             echo '<input type="hidden" name="serendipity[captcha]" value="' . htmlspecialchars($serendipity['POST']['captcha']) . '" />';
@@ -273,59 +315,67 @@
 
                     $methods = array('captcha');
 
-                    if (!in_array($parts[0], $methods) || !function_exists('imagettftext')) {
+                    if (!in_array($parts[0], $methods)) {
                         return;
                     }
 
+                    mt_srand(time());
                     $width    = 120;
                     $height   = 40;
-                    $max_char = 5;
-                    $min_char = 3;
-                    $bgcolors = explode(',', $this->get_config('captcha_color', '255,255,255'));
 
+                    $bgcolors = explode(',', $this->get_config('captcha_color', '255,255,255'));
                     $fontfiles = array('Comic_Sans_MS.ttf', 'Impact.ttf', 'Verdana.ttf');
                     $chars     = array(2, 3, 4, 7, 9); // 1, 5, 6 and 8 may look like characters.
                     $chars     = array_merge($chars, array('A','B','C','D','E','F','H','J','K','L','M','N','P','Q','R','T','U','V','W','X','Y','Z')); // I, O, S may look like numbers
-                    $strings   = array_rand($chars, mt_rand($max_char, $min_char));
-                    $string    = '';
-                    foreach($strings AS $idx => $charidx) {
-                        $string .= $chars[$charidx];
-                    }
-                    $_SESSION['spamblock'] = array('captcha' => $string);
 
-                    $font   = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/' . $fontfiles[array_rand($fontfiles)];
-                    if (!file_exists($font)) {
-                        die(PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF);
+                    if ($use_gd || $parts[1] == '1') {
+                        $strings   = array_rand($chars, mt_rand($max_char, $min_char));
+                        $string    = '';
+                        foreach($strings AS $idx => $charidx) {
+                            $string .= $chars[$charidx];
+                        }
+                        $_SESSION['spamblock'] = array('captcha' => $string);
                     }
 
-                    header('Content-Type: image/jpeg');
-                    $image  = imagecreate($width, $height);
-                    imagecolorallocate($image, trim($bgcolors[0]), trim($bgcolors[1]), trim($bgcolors[2]));
-                    // imagettftext($image, 10, 1, 1, 15, imagecolorallocate($image, 255, 255, 255), $font, 'String: ' . $string);
+                    if ($use_gd) {
+                        $font = $serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/' . $fontfiles[array_rand($fontfiles)];
+                        if (!file_exists($font)) {
+                            die(PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF);
+                        }
 
-                    $pos_x  = 5;
-                    foreach($strings AS $idx => $charidx) {
-                        $color = imagecolorallocate($image, mt_rand(50, 255), mt_rand(50, 255), mt_rand(50,255));
-                        $size  = mt_rand(15, 21);
-                        $angle = mt_rand(-20, 20);
-                        $pos_y = ceil($height - (mt_rand($size/3, $size/2)));
+                        header('Content-Type: image/jpeg');
+                        $image  = imagecreate($width, $height);
+                        imagecolorallocate($image, trim($bgcolors[0]), trim($bgcolors[1]), trim($bgcolors[2]));
+                        // imagettftext($image, 10, 1, 1, 15, imagecolorallocate($image, 255, 255, 255), $font, 'String: ' . $string);
 
-                        imagettftext(
-                          $image,
-                          $size,
-                          $angle,
-                          $pos_x,
-                          $pos_y,
-                          $color,
-                          $font,
-                          $chars[$charidx]
-                        );
+                        $pos_x  = 5;
+                        foreach($strings AS $idx => $charidx) {
+                            $color = imagecolorallocate($image, mt_rand(50, 235), mt_rand(50, 235), mt_rand(50,235));
+                            $size  = mt_rand(15, 21);
+                            $angle = mt_rand(-20, 20);
+                            $pos_y = ceil($height - (mt_rand($size/3, $size/2)));
 
-                        $pos_x = $pos_x + $size + 2;
+                            imagettftext(
+                              $image,
+                              $size,
+                              $angle,
+                              $pos_x,
+                              $pos_y,
+                              $color,
+                              $font,
+                              $chars[$charidx]
+                            );
 
+                            $pos_x = $pos_x + $size + 2;
+
+                        }
+                        imagejpeg($image, '', 90);
+                        imagedestroy($image);
+                    } else {
+                        header('Content-Type: image/png');
+                        $output_char = strtolower($_SESSION['spamblock']['captcha']{$parts[1] - 1});
+                        echo file_get_contents($serendipity['serendipityPath'] . 'plugins/serendipity_event_spamblock/captcha_' . $output_char . '.png');
                     }
-                    imagejpeg($image, '', 90);
-                    imagedestroy($image);
                     return true;
                     break;
 
@@ -337,6 +387,33 @@
             return false;
         }
     }
+
+    function log($log, $id, $switch, $reason, $comment) {
+        global $serendipity;
+
+        if (empty($log)) {
+            return;
+        }
+
+        $logfile = @fopen($log, 'a');
+        if ($logfile) {
+            fwrite($logfile, sprintf(
+                '[%s] - [%s: %s] - [#%d, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]',
+
+                date('%Y-%m-%d'),
+                $switch,
+                $reason,
+                $id,
+                str_replace("\n", ' ', $comment['name']),
+                str_replace("\n", ' ', $comment['email']),
+                str_replace("\n", ' ', $comment['url']),
+                str_replace("\n", ' ', $_SERVER['HTTP_USER_AGENT']),
+                $_SERVER['REMOTE_ADDR'],
+                str_replace("\n", ' ', $comment['comment'])
+            ));
+            fclose($logfile);
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

--- NEW FILE: captcha_h.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_j.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_7.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_c.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: captcha_b.png ---
(This appears to be a binary file; contents omitted.)

[php-blog-cvs] serendipity NEWS,1.214.2.21,1.214.2.22 serendipity_functions.inc.php,1.419.2.29,1.419.2.30

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

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_functions.inc.php 
Log Message:
MFH


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.29
retrieving revision 1.419.2.30
diff -u -d -r1.419.2.29 -r1.419.2.30
--- serendipity_functions.inc.php	22 Sep 2004 15:25:16 -0000	1.419.2.29
+++ serendipity_functions.inc.php	23 Sep 2004 12:31:50 -0000	1.419.2.30
@@ -1612,7 +1612,7 @@
 function serendipity_saveComment($id, $commentInfo, $type = 'NORMAL') {
     global $serendipity;
 
-    $query = "SELECT allow_comments, moderate_comments, last_modified, timestamp FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'";
+    $query = "SELECT id, allow_comments, moderate_comments, last_modified, timestamp FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'";
     $ca    = serendipity_db_query($query, true);
 
     serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo);

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.21
retrieving revision 1.214.2.22
diff -u -d -r1.214.2.21 -r1.214.2.22
--- NEWS	22 Sep 2004 15:25:15 -0000	1.214.2.21
+++ NEWS	23 Sep 2004 12:31:42 -0000	1.214.2.22
@@ -38,6 +38,8 @@
         contained links.
       - reject comments depending on their amount of
         contained links.
+      - able to log rejected/moderated comments to a plaintext file
+      - fallback method for non-gdlib-enabled hosts
       (garvinhicking)
 
     * Fixed wrong implode() arguments for error reporting in installer