Attachment 208896 Details for Bug 241745 – mailzu php73 corrections

[patch] mailzu php73 corrections

_security_mailzu_php73.patch (text/plain), 4.03 KB, created by Krzysztof on 2019-11-05 23:16:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2019-11-05 23:16:24 UTC

Size: 4.03 KB

patch

obsolete

>diff -ruN security/mailzu/Makefile security/mailzu.new/Makefile
>--- security/mailzu/Makefile	2019-03-07 14:29:07.000000000 +0100
>+++ security/mailzu.new/Makefile	2019-10-12 21:58:01.446977000 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mailzu
> DISTVERSION=	0.8rc3
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	security
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
> PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
>diff -ruN security/mailzu/files/patch-lib_CmnFns.class.php security/mailzu.new/files/patch-lib_CmnFns.class.php
>--- security/mailzu/files/patch-lib_CmnFns.class.php	2018-11-24 11:12:21.000000000 +0100
>+++ security/mailzu.new/files/patch-lib_CmnFns.class.php	2019-10-12 21:56:57.420577000 +0200
>@@ -213,16 +213,21 @@
>  	{
>  		if( ! is_array( $array ) )
>  			return '';
>-@@ -441,7 +441,7 @@ class CmnFns {
>+@@ -441,8 +441,12 @@ class CmnFns {
>  	* @param integer $sizeLimit maximum number of messages per page
>  	* @param integer $count total number of messages
>  	*/
> -	function genMultiPagesLinks( $page, $sizeLimit, $count) {
> +	public static function genMultiPagesLinks( $page, $sizeLimit, $count) {
>  		global $link;
>++		global $pager_html;
>++		global $size_limit;
>++		global $query_string_next;
>++		global $query_string_last;
>  
>  		$total_pages = $count / $sizeLimit;
>-@@ -501,7 +501,7 @@ class CmnFns {
>+ 
>+@@ -501,7 +505,7 @@ class CmnFns {
>  	* Generate HTML for search engine
>  	* @param $content_type: 'B' (attachment) or 'S' (spam)
>  	*/
>@@ -231,7 +236,7 @@
>  		global $conf;
>  
>  		$fields_array = array("f" => translate('From'), 
>-@@ -579,7 +579,7 @@ class CmnFns {
>+@@ -579,7 +583,7 @@ class CmnFns {
>          * @param none
>          * @return value boolean
>          */
>@@ -240,7 +245,7 @@
>  		$return = false;
>  		$strings = array('f_string','s_string','t_string','m_string');
>  		foreach ($strings as $string) {
>-@@ -593,7 +593,7 @@ class CmnFns {
>+@@ -593,7 +597,7 @@ class CmnFns {
>          * @param array of variables to exclude
>  	* @return query string
>  	*/
>@@ -249,7 +254,7 @@
>  		return CmnFns::array_to_query_string( $_GET, $excl_array );
>  	}	
>  
>-@@ -602,7 +602,7 @@ class CmnFns {
>+@@ -602,7 +606,7 @@ class CmnFns {
>          * @param none
>          * @return value
>          */
>@@ -258,7 +263,7 @@
>                  // If there isnt one set, return NULL
>                  $result = NULL;
>  		if ( isset($_GET[$get_name]) )
>-@@ -617,7 +617,7 @@ class CmnFns {
>+@@ -617,7 +621,7 @@ class CmnFns {
>          * @param none
>          * @return value
>          */
>@@ -267,7 +272,7 @@
>                  // If there isnt one set, return NULL
>                  $result = (isset($_POST[$get_name])) ? $_POST[$get_name] : NULL;
>                  return $result;
>-@@ -628,7 +628,7 @@ class CmnFns {
>+@@ -628,7 +632,7 @@ class CmnFns {
>          * @param none
>          * @return value
>          */
>@@ -276,7 +281,7 @@
>                  // If there isnt one set, return NULL
>                  $result = (isset($_POST[$get_name])) ? $_POST[$get_name] : NULL;
>                  return $result;
>-@@ -656,7 +656,7 @@ class CmnFns {
>+@@ -656,7 +660,7 @@ class CmnFns {
>  	*	INORDER, SESSION, FORM, POST, GET, SERVER
>   	* @return value of var
>   	*/
>@@ -285,7 +290,7 @@
>  
>  		switch ($search) {
>  			
>-@@ -699,7 +699,7 @@ class CmnFns {
>+@@ -699,7 +703,7 @@ class CmnFns {
>  	* Redirect using javascript
>  	* @param $location string
>  	*/
>diff -ruN security/mailzu/files/patch-lib_htmlfilter.php security/mailzu.new/files/patch-lib_htmlfilter.php
>--- security/mailzu/files/patch-lib_htmlfilter.php	1970-01-01 01:00:00.000000000 +0100
>+++ security/mailzu.new/files/patch-lib_htmlfilter.php	2019-10-12 21:56:57.426977000 +0200
>@@ -0,0 +1,11 @@
>+--- lib/htmlfilter.php.orig	2007-06-14 19:00:15 UTC
>++++ lib/htmlfilter.php
>+@@ -106,7 +106,7 @@ function casenormalize(&$val){
>+ function skipspace($body, $offset){
>+     $me = 'skipspace';
>+     preg_match('/^(\s*)/s', substr($body, $offset), $matches);
>+-    if (sizeof($matches{1})){
>++    if (is_array($matches{1}) && sizeof($matches{1})){
>+         $count = strlen($matches{1});
>+         spew("$me: skipped $count chars\n");
>+         $offset += $count;

Flags:

ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 241745: 208896 | 208897 | 229276 | 229278