packages: phorum/paths.patch, phorum/phorum.spec - fix spamhurdles file

[glen]

Author: glen                         Date: Thu Apr  1 13:24:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix spamhurdles file

---- Files affected:
packages/phorum:
   paths.patch (1.19 -> 1.20) , phorum.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: packages/phorum/paths.patch
diff -u packages/phorum/paths.patch:1.19 packages/phorum/paths.patch:1.20
--- packages/phorum/paths.patch:1.19	Thu Feb 18 16:18:24 2010
+++ packages/phorum/paths.patch	Thu Apr  1 15:24:27 2010
@@ -602,8 +602,8 @@
  
      // Allow db layers to provide an initialization script of their own.
      // The main goal for this script is to allow a db layer to override the
---- phorum-5.2.14/mods/spamhurdles/spamhurdles.php~	2010-01-13 22:36:06.000000000 +0200
-+++ phorum-5.2.14/mods/spamhurdles/spamhurdles.php	2010-01-13 22:45:36.219833260 +0200
+--- phorum-5.2.14/mods/spamhurdles/spamhurdles.php	2010-01-13 22:45:36.219833260 +0200
++++ phorum/mods/spamhurdles/spamhurdles.php	2010-03-29 19:52:17.206811507 +0300
 @@ -92,7 +92,7 @@
      // If a spoken captcha is requested, then generate a wav file for it
      // and stream it to the user.
@@ -613,6 +613,33 @@
          exit(0);
      }
  
+@@ -104,7 +104,7 @@
+             isset($PHORUM["SPAMHURDLES"]["captcha_class"])) {
+             $question = $PHORUM["SPAMHURDLES"]["captcha"]["question"];
+             $class = $PHORUM["SPAMHURDLES"]["captcha_class"];
+-            require_once PHORUM_DIR.'/mods/spamhurdles/captcha/class.{$class}.php';
++            require_once PHORUM_DIR."/mods/spamhurdles/captcha/class.{$class}.php";
+             $captcha = new $class();
+             $captcha->generate_image($question);
+             exit(0);
+@@ -170,7 +170,7 @@
+         ($type == "external_captcha")) ) {
+ 
+         $class = "captcha_" . $conf["captcha_type"];
+-        require_once PHORUM_DIR.'/mods/spamhurdles/captcha/class.{$class}.php';
++        require_once PHORUM_DIR."/mods/spamhurdles/captcha/class.{$class}.php";
+         $captcha = new $class();
+         $captcha = $captcha->generate_captcha();
+         $PHORUM["SPAMHURDLES"]["captcha_class"] = $class;
+@@ -423,7 +423,7 @@
+     // Check if the captcha is filled in right.
+     if (!$do_block && isset($spamhurdles["captcha"])) {
+         $class = $spamhurdles["captcha_class"];
+-        require_once PHORUM_DIR.'/mods/spamhurdles/captcha/class.{$class}.php';
++        require_once PHORUM_DIR."/mods/spamhurdles/captcha/class.{$class}.php";
+         $captcha = new $class();
+         $error = $captcha->check_answer($spamhurdles["captcha"]);
+         if ($error) {
 --- phorum/include/admin/forum_defaults.php~	2010-01-13 23:12:00.000000000 +0200
 +++ phorum/include/admin/forum_defaults.php	2010-01-13 23:16:15.052984229 +0200
 @@ -21,6 +21,6 @@

================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.48 packages/phorum/phorum.spec:1.49
--- packages/phorum/phorum.spec:1.48	Thu Apr  1 15:07:48 2010
+++ packages/phorum/phorum.spec	Thu Apr  1 15:24:27 2010
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - modules images are not accessible from web
+# - module images are not accessible from web
 %define		mainver	5.2
 %include	/usr/lib/rpm/macros.php
 %define		php_min_version 5.0.0
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Phorum - implementacja forum WWW w PHP
 Name:		phorum
 Version:	%{mainver}.14
-Release:	0.61
+Release:	0.62
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
@@ -607,6 +607,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2010/04/01 13:24:27  glen
+- fix spamhurdles file
+
 Revision 1.48  2010/04/01 13:07:48  glen
 - skip php-date dep for now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/paths.patch?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.48&r2=1.49&f=u