View | Details | Raw Unified | Return to bug 241745
Collapse All | Expand All

(-)security/mailzu.new/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	mailzu
4
PORTNAME=	mailzu
5
DISTVERSION=	0.8rc3
5
DISTVERSION=	0.8rc3
6
PORTREVISION=	6
6
PORTREVISION=	7
7
CATEGORIES=	security
7
CATEGORIES=	security
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
9
PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
9
PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
(-)security/mailzu.new/files/patch-lib_CmnFns.class.php (-9 / +14 lines)
Lines 213-228 Link Here
213
 	{
213
 	{
214
 		if( ! is_array( $array ) )
214
 		if( ! is_array( $array ) )
215
 			return '';
215
 			return '';
216
@@ -441,7 +441,7 @@ class CmnFns {
216
@@ -441,8 +441,12 @@ class CmnFns {
217
 	* @param integer $sizeLimit maximum number of messages per page
217
 	* @param integer $sizeLimit maximum number of messages per page
218
 	* @param integer $count total number of messages
218
 	* @param integer $count total number of messages
219
 	*/
219
 	*/
220
-	function genMultiPagesLinks( $page, $sizeLimit, $count) {
220
-	function genMultiPagesLinks( $page, $sizeLimit, $count) {
221
+	public static function genMultiPagesLinks( $page, $sizeLimit, $count) {
221
+	public static function genMultiPagesLinks( $page, $sizeLimit, $count) {
222
 		global $link;
222
 		global $link;
223
+		global $pager_html;
224
+		global $size_limit;
225
+		global $query_string_next;
226
+		global $query_string_last;
223
 
227
 
224
 		$total_pages = $count / $sizeLimit;
228
 		$total_pages = $count / $sizeLimit;
225
@@ -501,7 +501,7 @@ class CmnFns {
229
 
230
@@ -501,7 +505,7 @@ class CmnFns {
226
 	* Generate HTML for search engine
231
 	* Generate HTML for search engine
227
 	* @param $content_type: 'B' (attachment) or 'S' (spam)
232
 	* @param $content_type: 'B' (attachment) or 'S' (spam)
228
 	*/
233
 	*/
Lines 231-237 Link Here
231
 		global $conf;
236
 		global $conf;
232
 
237
 
233
 		$fields_array = array("f" => translate('From'), 
238
 		$fields_array = array("f" => translate('From'), 
234
@@ -579,7 +579,7 @@ class CmnFns {
239
@@ -579,7 +583,7 @@ class CmnFns {
235
         * @param none
240
         * @param none
236
         * @return value boolean
241
         * @return value boolean
237
         */
242
         */
Lines 240-246 Link Here
240
 		$return = false;
245
 		$return = false;
241
 		$strings = array('f_string','s_string','t_string','m_string');
246
 		$strings = array('f_string','s_string','t_string','m_string');
242
 		foreach ($strings as $string) {
247
 		foreach ($strings as $string) {
243
@@ -593,7 +593,7 @@ class CmnFns {
248
@@ -593,7 +597,7 @@ class CmnFns {
244
         * @param array of variables to exclude
249
         * @param array of variables to exclude
245
 	* @return query string
250
 	* @return query string
246
 	*/
251
 	*/
Lines 249-255 Link Here
249
 		return CmnFns::array_to_query_string( $_GET, $excl_array );
254
 		return CmnFns::array_to_query_string( $_GET, $excl_array );
250
 	}	
255
 	}	
251
 
256
 
252
@@ -602,7 +602,7 @@ class CmnFns {
257
@@ -602,7 +606,7 @@ class CmnFns {
253
         * @param none
258
         * @param none
254
         * @return value
259
         * @return value
255
         */
260
         */
Lines 258-264 Link Here
258
                 // If there isnt one set, return NULL
263
                 // If there isnt one set, return NULL
259
                 $result = NULL;
264
                 $result = NULL;
260
 		if ( isset($_GET[$get_name]) )
265
 		if ( isset($_GET[$get_name]) )
261
@@ -617,7 +617,7 @@ class CmnFns {
266
@@ -617,7 +621,7 @@ class CmnFns {
262
         * @param none
267
         * @param none
263
         * @return value
268
         * @return value
264
         */
269
         */
Lines 267-273 Link Here
267
                 // If there isnt one set, return NULL
272
                 // If there isnt one set, return NULL
268
                 $result = (isset($_POST[$get_name])) ? $_POST[$get_name] : NULL;
273
                 $result = (isset($_POST[$get_name])) ? $_POST[$get_name] : NULL;
269
                 return $result;
274
                 return $result;
270
@@ -628,7 +628,7 @@ class CmnFns {
275
@@ -628,7 +632,7 @@ class CmnFns {
271
         * @param none
276
         * @param none
272
         * @return value
277
         * @return value
273
         */
278
         */
Lines 276-282 Link Here
276
                 // If there isnt one set, return NULL
281
                 // If there isnt one set, return NULL
277
                 $result = (isset($_POST[$get_name])) ? $_POST[$get_name] : NULL;
282
                 $result = (isset($_POST[$get_name])) ? $_POST[$get_name] : NULL;
278
                 return $result;
283
                 return $result;
279
@@ -656,7 +656,7 @@ class CmnFns {
284
@@ -656,7 +660,7 @@ class CmnFns {
280
 	*	INORDER, SESSION, FORM, POST, GET, SERVER
285
 	*	INORDER, SESSION, FORM, POST, GET, SERVER
281
  	* @return value of var
286
  	* @return value of var
282
  	*/
287
  	*/
Lines 285-291 Link Here
285
 
290
 
286
 		switch ($search) {
291
 		switch ($search) {
287
 			
292
 			
288
@@ -699,7 +699,7 @@ class CmnFns {
293
@@ -699,7 +703,7 @@ class CmnFns {
289
 	* Redirect using javascript
294
 	* Redirect using javascript
290
 	* @param $location string
295
 	* @param $location string
291
 	*/
296
 	*/
(-)security/mailzu.new/files/patch-lib_htmlfilter.php (+11 lines)
Line 0 Link Here
1
--- lib/htmlfilter.php.orig	2007-06-14 19:00:15 UTC
2
+++ lib/htmlfilter.php
3
@@ -106,7 +106,7 @@ function casenormalize(&$val){
4
 function skipspace($body, $offset){
5
     $me = 'skipspace';
6
     preg_match('/^(\s*)/s', substr($body, $offset), $matches);
7
-    if (sizeof($matches{1})){
8
+    if (is_array($matches{1}) && sizeof($matches{1})){
9
         $count = strlen($matches{1});
10
         spew("$me: skipped $count chars\n");
11
         $offset += $count;

Return to bug 241745