holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mismatched tag in MS linefeed

Browse Source
This commit is contained in:
Nathan Gray 2011-07-29 15:34:12 +00:00
parent 399c835f11
commit c2c1b4af95
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/inc/class.bo_merge.inc.php
View File

@ -366,7 +366,7 @@ abstract class bo_merge
} }
catch (Exception $e) catch (Exception $e)
{ {
echo $content;die(); error_log($e);
// Failed... // Failed...
} }
} }
@ -655,7 +655,6 @@ echo $content;die();
{ {
// replace </p> and <br /> with CRLF (remove <p> and CRLF) // replace </p> and <br /> with CRLF (remove <p> and CRLF)
$value = str_replace(array("\r","\n",'<p>','</p>','<br />'),array('','','',"\r\n","\r\n"),$value); $value = str_replace(array("\r","\n",'<p>','</p>','<br />'),array('','','',"\r\n","\r\n"),$value);
//$value = strip_tags($value);
$value = strip_tags($value,implode('',$replace_tags)); $value = strip_tags($value,implode('',$replace_tags));
} }
// replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space // replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space
@ -819,7 +818,7 @@ echo $content;die();
break; break;
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
$LF ='</w:r></w:p><w:r><w:t>'; $LF ='</w:t></w:r></w:p><w:p><w:r><w:t>';
break; break;
case 'application/xml'; case 'application/xml';
$LF ='</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>'; $LF ='</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>';