packages: phorum/phorum.spec, phorum/multibyte_description.patch (NEW) - mu...

[glen]

Author: glen                         Date: Tue May  4 09:34:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- multibyte chop corruption fix from phorum

---- Files affected:
packages/phorum:
   phorum.spec (1.59 -> 1.60) , multibyte_description.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.59 packages/phorum/phorum.spec:1.60
--- packages/phorum/phorum.spec:1.59	Mon May  3 17:16:14 2010
+++ packages/phorum/phorum.spec	Tue May  4 11:34:03 2010
@@ -3,12 +3,12 @@
 # - module images are not accessible from web (checkme?)
 %define		mainver	5.2
 %include	/usr/lib/rpm/macros.php
-%define		php_min_version 5.0.0
+%define		php_min_version 5.2.0
 Summary:	Phorum is a web based message board written in PHP
 Summary(pl.UTF-8):	Phorum - implementacja forum WWW w PHP
 Name:		phorum
 Version:	%{mainver}.15a
-Release:	0.75
+Release:	0.76
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 Patch6:		no-pear-json.patch
 Patch7:		update-et.patch
 Patch8:		update-ru.patch
+Patch9:		multibyte_description.patch
 URL:		http://www.phorum.org/
 BuildRequires:	iconv
 BuildRequires:	rpm-php-pearprov
@@ -330,6 +331,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -606,6 +608,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2010/05/04 09:34:03  glen
+- multibyte chop corruption fix from phorum
+
 Revision 1.59  2010/05/03 15:16:14  glen
 - ru translations update
 

================================================================
Index: packages/phorum/multibyte_description.patch
diff -u /dev/null packages/phorum/multibyte_description.patch:1.1
--- /dev/null	Tue May  4 11:34:08 2010
+++ packages/phorum/multibyte_description.patch	Tue May  4 11:34:03 2010
@@ -0,0 +1,24 @@
+http://www.phorum.org/phorum5/read.php?61,131083
+
+--- phorum/htdocs/read.php~	2010-05-03 18:12:21.000000000 +0300
++++ phorum/htdocs/read.php	2010-05-04 11:38:50.829674278 +0300
+@@ -788,7 +788,18 @@
+     // here, because of modules adding images and formatting.
+     $PHORUM["DATA"]["HTML_TITLE"] = trim(strip_tags($PHORUM["threaded_read"] ? $PHORUM["DATA"]["MESSAGE"]["subject"] : $PHORUM["DATA"]["TOPIC"]["subject"]));
+ 
+-    $PHORUM["DATA"]["DESCRIPTION"] = htmlspecialchars(preg_replace('!\s+!s'," ",strip_tags(substr($PHORUM["DATA"]["TOPIC"]["body"],0,300))), ENT_COMPAT, $PHORUM["DATA"]["HCHARSET"]);
++    $PHORUM["DATA"]["DESCRIPTION"] = preg_replace('!\s+!s'," ", strip_tags($PHORUM["DATA"]["TOPIC"]["body"]));
++    if (strtoupper($PHORUM["DATA"]["HCHARSET"])=='UTF-8') {
++        if (function_exists('mb_substr')) {
++            $PHORUM["DATA"]["DESCRIPTION"] = mb_substr($PHORUM["DATA"]["DESCRIPTION"], 0, 300, $PHORUM["DATA"]["HCHARSET"]);
++        } else {
++            // No change to short description without PHP warning
++            $PHORUM["DATA"]["DESCRIPTION"] = $PHORUM["DATA"]["DESCRIPTION"];
++        }
++    } else {
++        $PHORUM["DATA"]["DESCRIPTION"] = substr($PHORUM["DATA"]["DESCRIPTION"], 0, 300);
++    }
++    $PHORUM["DATA"]["DESCRIPTION"] = htmlspecialchars($PHORUM["DATA"]["DESCRIPTION"], ENT_COMPAT, $PHORUM["DATA"]["HCHARSET"]);
+ 
+     // add feed url
+     if(isset($PHORUM['use_rss']) && $PHORUM['use_rss']){
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.59&r2=1.60&f=u