extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-01 20:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert r40031

Browse Source
This commit is contained in:
Klaus Leithoff 2012-08-02 10:01:39 +00:00
parent f9ceede91b
commit 6123e479b2
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpgwapi/inc/htmLawed/htmLawed.php
View File

@ -654,12 +654,9 @@ $a = array('br'=>1);
$b = array('button'=>1, 'input'=>1, 'option'=>1); $b = array('button'=>1, 'input'=>1, 'option'=>1);
$c = array('caption'=>1, 'dd'=>1, 'dt'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'isindex'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'object'=>1, 'p'=>1, 'pre'=>1, 'td'=>1, 'textarea'=>1, 'th'=>1); $c = array('caption'=>1, 'dd'=>1, 'dt'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'isindex'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'object'=>1, 'p'=>1, 'pre'=>1, 'td'=>1, 'textarea'=>1, 'th'=>1);
$d = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'colgroup'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'fieldset'=>1, 'form'=>1, 'hr'=>1, 'iframe'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1); $d = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'colgroup'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'fieldset'=>1, 'form'=>1, 'hr'=>1, 'iframe'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
$do = 1;
$t = explode('<', $t);
while($do){
$n = $no;
ob_start(); ob_start();
if(isset($d[$p])){echo str_repeat($s, ++$n);} if(isset($d[$p])){echo str_repeat($s, ++$n);}
$t = explode('<', $t);
echo ltrim(array_shift($t)); echo ltrim(array_shift($t));
for($i=-1, $j=count($t); ++$i<$j;){ for($i=-1, $j=count($t); ++$i<$j;){
$r = ''; list($e, $r) = explode('>', $t[$i]); $r = ''; list($e, $r) = explode('>', $t[$i]);
@ -667,14 +664,11 @@ while($do){
$y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0); $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0);
$e = "<$e>"; $e = "<$e>";
if(isset($d[$y])){ if(isset($d[$y])){
if(!$x){ if(!$x){echo "\n", str_repeat($s, (--$n>=0?$n:0)), "$e\n", str_repeat($s, ($n>=0?$n:0));}
if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);} 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)));}
else{++$no; continue 2;}
}
else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
echo ltrim($r); continue; echo ltrim($r); continue;
} }
$f = "\n". str_repeat($s, $n); $f = "\n". str_repeat($s, ($n>=0?$n:0));
if(isset($c[$y])){ if(isset($c[$y])){
if(!$x){echo $e, $f, ltrim($r);} if(!$x){echo $e, $f, ltrim($r);}
else{echo $f, $e, $r;} else{echo $f, $e, $r;}
@ -683,8 +677,6 @@ while($do){
}elseif(!$y){echo $f, $e, $f, ltrim($r); }elseif(!$y){echo $f, $e, $f, ltrim($r);
}else{echo $e, $r;} }else{echo $e, $r;}
} }
$do = 0;
}
$t = preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents()); $t = preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents());
ob_end_clean(); ob_end_clean();
if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){ if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){