R55367 - /trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55367

URL: http://svn.stylite.de/viewvc/egroupware?rev=55367&view=rev
Log:
move egw_htmLawed to api/src/Html/HtmLawed, @Klaus: does mail really need to call that class, cant it use Html::purify?

Modified:
trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php

Modified: trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php?rev=55367&r1=55366&r2=55367&view=diff

— trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php Sun Mar 13 12:56:19 2016
@@ -9,6 +9,8 @@

• @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
• @version $Id$
  */

+use EGroupware\Api;

/**

• Mail worker class
  @@ -4803,11 +4805,11 @@
  $hasOther = true;
  $newBody = $matches[2];
  }

•   				$htmLawed = new egw_htmLawed();
  

•   				$htmLawed = new Api\Html\HtmLawed();
    				// the next line should not be needed, but produces better results on HTML 2 Text conversion,
    				// as we switched off HTMLaweds tidy functionality
    				$newBody = str_replace(array('&amp;amp;','<DIV><BR></DIV>',"<DIV>&nbsp;</DIV>",'<div>&nbsp;</div>'),array('&amp;','<BR>','<BR>','<BR>'),$newBody);
  

•   				$newBody = $htmLawed->egw_htmLawed($newBody,self::$htmLawed_config);
  

•   				$newBody = $htmLawed->run($newBody,self::$htmLawed_config);
    				if ($hasOther && $preserveHTML) $newBody = $matches[1]. $newBody. $matches[3];
    				$alreadyHtmlLawed=true;
    			}
  

---

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785111&iu=/4140

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs