R55408 - in /trunk: egroupware/api/src/Html/HtmLawed.php emailadmin/inc/class.emailadmin_imapbase.inc.php

[leithoff]

Author: leithoff
New Revision: 55408

URL: http://svn.stylite.de/viewvc/egroupware?rev=55408&view=rev
Log:
fix issues with new namespaces / translation class moved to new api/src location

Modified:
trunk/egroupware/api/src/Html/HtmLawed.php
trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php

Modified: trunk/egroupware/api/src/Html/HtmLawed.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Html/HtmLawed.php?rev=55408&r1=55407&r2=55408&view=diff

— trunk/egroupware/api/src/Html/HtmLawed.php (original)
+++ trunk/egroupware/api/src/Html/HtmLawed.php Thu Mar 17 10:29:54 2016
@@ -11,6 +11,8 @@
*/

namespace EGroupware\Api\Html;
+use EGroupware\Api;
+use translation;

require_once(DIR.’/htmLawed/htmLawed.php’);

@@ -136,7 +138,7 @@
{
//error_log(METHOD.LINE.array2string($newStyle[0]));
$style2buffer = implode(’’,$newStyle[0]);

•   	// only replace what we have found, we use it here, as we use the same routine in Translation::replaceTagsCompletley
  

•   	// only replace what we have found, we use it here, as we use the same routine in translation::replaceTagsCompletley
    	// no need to do the extra routine
    	$html = str_ireplace($newStyle[0],'',$html);
    }
  

@@ -149,7 +151,7 @@
if ($test==“null” && strlen($style2buffer)>0)
{
// this should not be needed, unless something fails with charset detection/ wrong charset passed

•   		error_log(__METHOD__.__LINE__.' Found Invalid sequence for utf-8 in CSS:'.$style2buffer.' Carset Detected:'.Translation::detect_encoding($style2buffer));
  

•   		error_log(__METHOD__.__LINE__.' Found Invalid sequence for utf-8 in CSS:'.$style2buffer.' Carset Detected:'.Api\Translation::detect_encoding($style2buffer));
    		$style2buffer = utf8_encode($style2buffer);
    	}
    }
  

@@ -165,15 +167,15 @@
// CSS Security
// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
$css = preg_replace(’/(javascript|expession|-moz-binding)/i’,’’,$style);

•   if (stripos($css,'script')!==false) Translation::replaceTagsCompletley($css,'script'); // Strip out script that may be included
  

•   if (stripos($css,'script')!==false) translation::replaceTagsCompletley($css,'script'); // Strip out script that may be included
    // we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
    // as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
    $css_no_comment = str_replace(array(':','<!--','-->'),array(': ','',''),$css);
    //error_log(__METHOD__.__LINE__.$css);
  

•   // we already removed what we have found, above, as we used pretty much the same routine as in Translation::replaceTagsCompletley
  

•   // we already removed what we have found, above, as we used pretty much the same routine as in translation::replaceTagsCompletley
    // no need to do the extra routine
    // TODO: we may have to strip urls and maybe comments and ifs
  

•   //if (stripos($html,'style')!==false) Translation::replaceTagsCompletley($html,'style'); // clean out empty or pagewide style definitions / left over tags
  

•   //if (stripos($html,'style')!==false) translation::replaceTagsCompletley($html,'style'); // clean out empty or pagewide style definitions / left over tags
    return $css_no_comment;
  

  }

@@ -389,17 +391,21 @@
if (!isset($attribute_array[‘title’])) $attribute_array[‘title’]=$attribute_array[‘alt’];
$attribute_array[‘src’]=common::image(‘phpgwapi’,‘dialog_error’);
}

•   	if (!$GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'])
  

•   	if (!preg_match('/^cid:.*/',$attribute_array['src']))
    	{
  

•   		if (!preg_match('/^cid:.*/',$attribute_array['src']))
  

•   		if (!$GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'])
    		{
  

•   			$attribute_array['alt']= $attribute_array['alt'].' [blocked external image:'.$attribute_array['src'].']';
  

•   			if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
  

•   			$attribute_array['src']=common::image('mail','no-image-shown');
  

•   			$attribute_array['border'] = 1;
  

•   			if ($attribute_array['style'])
  

•   			//the own webserver url is not external, so it should be allowed
  

•   			if (empty($GLOBALS['egw_info']['server']['webserver_url'])||!preg_match("$^".$GLOBALS['egw_info']['server']['webserver_url'].".*$",$attribute_array['src']))
    			{
  

•   				if (stripos($attribute_array['style'],'border')!==false) $attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
  

•   				$attribute_array['alt']= $attribute_array['alt'].' [blocked external image:'.$attribute_array['src'].']';
  

•   				if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
  

•   				$attribute_array['src']=common::image('mail','no-image-shown');
  

•   				$attribute_array['border'] = 1;
  

•   				if ($attribute_array['style'])
  

•   				{
  

•   					if (stripos($attribute_array['style'],'border')!==false) $attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
  

•   				}
    			}
    		}
    	}
  

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=55408&r1=55407&r2=55408&view=diff

— trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php Thu Mar 17 10:29:54 2016
@@ -11,6 +11,7 @@
*/

use EGroupware\Api;
+use translation;

/**

• Mail worker class
  @@ -1495,7 +1496,7 @@
  $buffer = translation::convertHTMLToText($part->toString(array(
  ‘encode’ => Horde_Mime_Part::ENCODE_BINARY, // otherwise we cant recode charset
  )), $charset, ‘utf-8’);

•   					$headerObject['BODYPREVIEW']=trim(str_replace(array("\r\n","\r","\n"),' ',mb_substr(translation::convert_jsonsafe($buffer),0,((int)$_fetchPreviews<300?300:$_fetchPreviews))));
  

•   					$headerObject['BODYPREVIEW']=trim(str_replace(array("\r\n","\r","\n"),' ',mb_substr(Api\Translation::convert_jsonsafe($buffer),0,((int)$_fetchPreviews<300?300:$_fetchPreviews))));
    				} elseif (empty($headerObject['BODYPREVIEW'])&&$part->getPrimaryType()== 'multipart')
    				{
    					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($part));
  

@@ -1526,10 +1527,10 @@
$_structure=$part;
$this->fetchPartContents($uid, $_structure, false,true);
$headerObject[‘BODYPREVIEW’]=trim(str_replace(array("\r\n","\r","\n"),’ ',mb_substr(translation::convertHTMLToText($_structure->getContents()),0,((int)$_fetchPreviews<300?300:$_fetchPreviews))));

•   					$charSet=translation::detect_encoding($headerObject['BODYPREVIEW']);
  

•   					$charSet=Api\Translation::detect_encoding($headerObject['BODYPREVIEW']);
    					// add line breaks to $bodyParts
    					//error_log(__METHOD__.' ('.__LINE__.') '.' Charset:'.$bodyParts[$i]['charSet'].'->'.$bodyParts[$i]['body']);
  

•   					$headerObject['BODYPREVIEW']  = translation::convert_jsonsafe($headerObject['BODYPREVIEW'], $charSet);
  

•   					$headerObject['BODYPREVIEW']  = Api\Translation::convert_jsonsafe($headerObject['BODYPREVIEW'], $charSet);
    					//error_log(__METHOD__.__LINE__.$headerObject['BODYPREVIEW']);
    			}
    			//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.'->'.$mime_id.' Disp:'.$partdisposition.' Type:'.$partPrimaryType);
  

@@ -2298,7 +2299,7 @@
}
catch (Exception $e)
{

•   	error_log(__METHOD__.' ('.__LINE__.') '.' subscribe to new folder '.$newFolderName.'->'.$e->getMessage());
  

•   	error_log(__METHOD__.' ('.__LINE__.') '.' subscribe to new folder '.$newFolderName.'->'.$e->getMessage().' ('.$e->details);
    	return false;
    }
  

@@ -4067,7 +4068,7 @@
//setting the charset (if not given)
if ($_charset===false) $_charset = self::$displayCharset;
$string = @htmlentities($_string, ENT_QUOTES, $_charset, false);

•   if (empty($string) && !empty($_string)) $string = @htmlentities(translation::convert($_string,translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
  

•   if (empty($string) && !empty($_string)) $string = @htmlentities(translation::convert($_string,Api\Translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
    return $string;
  

  }

@@ -4758,10 +4759,10 @@
$bodyParts[$i][‘body’] = preg_replace($sar,$rar,$bodyParts[$i][‘body’]);
}

•   	if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = translation::detect_encoding($bodyParts[$i]['body']);
  

•   	if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Api\Translation::detect_encoding($bodyParts[$i]['body']);
    	// add line breaks to $bodyParts
    	//error_log(__METHOD__.' ('.__LINE__.') '.' Charset:'.$bodyParts[$i]['charSet'].'->'.$bodyParts[$i]['body']);
  

•   	$newBody  = translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
  

•   	$newBody  = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']);
    	//error_log(__METHOD__.' ('.__LINE__.') '.' MimeType:'.$bodyParts[$i]['mimeType'].'->'.$newBody);
    	$mailClass->activeMimeType = 'text/plain';
    	if ($bodyParts[$i]['mimeType'] == 'text/html') {
  

@@ -5165,7 +5166,7 @@
continue;
}

•   	if ($singleBodyPart['charSet']===false) $singleBodyPart['charSet'] = translation::detect_encoding($singleBodyPart['body']);
  

•   	if ($singleBodyPart['charSet']===false) $singleBodyPart['charSet'] = Api\Translation::detect_encoding($singleBodyPart['body']);
    	$singleBodyPart['body'] = translation::convert(
    		$singleBodyPart['body'],
    		strtolower($singleBodyPart['charSet'])
  

@@ -5187,7 +5188,7 @@
if ($test==“null” && strlen($style2buffer)>0)
{
// this should not be needed, unless something fails with charset detection/ wrong charset passed

•   			error_log(__METHOD__.' ('.__LINE__.') '.' Found Invalid sequence for utf-8 in CSS:'.$style2buffer.' Charset Reported:'.$singleBodyPart['charSet'].' Carset Detected:'.translation::detect_encoding($style2buffer));
  

•   			error_log(__METHOD__.' ('.__LINE__.') '.' Found Invalid sequence for utf-8 in CSS:'.$style2buffer.' Charset Reported:'.$singleBodyPart['charSet'].' Carset Detected:'.Api\Translation::detect_encoding($style2buffer));
    			$style2buffer = utf8_encode($style2buffer);
    		}
    	}
  

@@ -5957,7 +5958,7 @@
// no attempt to convert, if we dont know about the charset
if (isset($attachments[$num][‘charset’])&&!empty($attachments[$num][‘charset’])) {
// we do not try guessing the charset, if it is not set

•   					//if ($attachments[$num]['charset']===false) $attachments[$num]['charset'] = translation::detect_encoding($attachments[$num]['attachment']);
  

•   					//if ($attachments[$num]['charset']===false) $attachments[$num]['charset'] = Api\Translation::detect_encoding($attachments[$num]['attachment']);
    					translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']);
    				}
    				if(in_array($attachments[$num]['name'], $file_list))
  

---

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=278785231&iu=/4140

---

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