From 44d80c2476fc9d3abf798c9a515afce41b394761 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 31 Jul 2012 11:03:17 +0000 Subject: [PATCH] take care of php-warning on str_repeat (second param has to be greater or equal to 0) --- phpgwapi/inc/htmLawed/htmLawed.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpgwapi/inc/htmLawed/htmLawed.php b/phpgwapi/inc/htmLawed/htmLawed.php index 312ada1fa3..42d0da7e92 100644 --- a/phpgwapi/inc/htmLawed/htmLawed.php +++ b/phpgwapi/inc/htmLawed/htmLawed.php @@ -412,7 +412,7 @@ $t = $t[0]; if($t == '< '){return '< ';} if($t == '>'){return '>';} if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){ - //error_log(__METHOD__.__LINE__.' Keep Bad:'.$C['keep_bad'].'->'.array2string($t)); + error_log(__METHOD__.__LINE__.' Keep Bad:'.$C['keep_bad'].'->'.array2string($t)); //return str_replace(array('<', '>'), array('<', '>'), $t); return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('<', '>'), $t) : ''); }elseif(!isset($C['elements'][($e = strtolower($m[2]))])){ @@ -664,11 +664,11 @@ for($i=-1, $j=count($t); ++$i<$j;){ $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0); $e = "<$e>"; if(isset($d[$y])){ - if(!$x){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);} - else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));} + if(!$x){echo "\n", str_repeat($s, (--$n>=0?$n:0)), "$e\n", str_repeat($s, ($n>=0?$n:0));} + else{echo "\n", str_repeat($s, ($n>=0?$n:0)), "$e\n", str_repeat($s, ($x != 1 ? (++$n>=0?$n:0) : ($n>=0?$n:0)));} echo ltrim($r); continue; } - $f = "\n". str_repeat($s, $n); + $f = "\n". str_repeat($s, ($n>=0?$n:0)); if(isset($c[$y])){ if(!$x){echo $e, $f, ltrim($r);} else{echo $f, $e, $r;}