class.bo_merge.inc.php

nathangray 2016-04-07 15:13:10 UTC #1

ImportTimoutError: THIS MESSAGE WAS NOT PARSED BY THE IMPORTER!!
by mwork.nabble.com (Postfix) with ESMTP id 97BDF21C830A3
for lists+1266706073828-308044@n3.nabble.com; Thu, 7 Apr 2016 07:59:53 -0700 (PDT)
Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com)
by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76)
(envelope-from egroupware-cvs-bounces@lists.sourceforge.net)
id 1aoBcV-0005RG-DV; Thu, 07 Apr 2016 15:13:19 +0000
Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192]
helo=mx.sourceforge.net)
by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76)
(envelope-from nathangray@users.sourceforge.net)
id 1aoBcU-0005R7-3V for egroupware-cvs@lists.sourceforge.net;
Thu, 07 Apr 2016 15:13:18 +0000
X-ACL-Warn:
Received: from dovecot.stylite.de ([213.183.76.200])
by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256)
(Exim 4.76) id 1aoBcS-0006Pk-6q
for egroupware-cvs@lists.sourceforge.net;
Thu, 07 Apr 2016 15:13:18 +0000
Received: from localhost.localdomain (svn [10.40.8.12])
by dovecot.stylite.de (Postfix) with ESMTP id 4289B1E4
for egroupware-cvs@lists.sf.net;
Thu, 7 Apr 2016 17:13:10 +0200 (CEST)
MIME-Version: 1.0
Date: Thu, 07 Apr 2016 15:13:10 -0000
To: egroupware-cvs@lists.sf.net
From: nathangray@users.sourceforge.net
X-Mailer: svnmailer-1.0.8
X-Spam-Score: 1.0 (+)
X-Spam-Report: Spam Filtering performed by mx.sourceforge.net.
See http://spamassassin.org/tag/ for more details.
1.0 MISSING_MID Missing Message-Id: header
X-Headers-End: 1aoBcS-0006Pk-6q
Subject: [eGroupWare-svn] r55674 - in /branches/14.2/etemplate: ./
inc/class.bo_merge.inc.php
X-BeenThere: egroupware-cvs@lists.sourceforge.net
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: “SVN commits (automaticaly generated)”
<egroupware-cvs.lists.sourceforge.net>
List-Unsubscribe: https://lists.sourceforge.net/lists/listinfo/egroupware-cvs,
mailto:egroupware-cvs-request@lists.sourceforge.net?subject=unsubscribe
List-Archive: http://sourceforge.net/mailarchive/forum.php?forum_name=egroupware-cvs
List-Post: mailto:egroupware-cvs@lists.sourceforge.net
List-Help: mailto:egroupware-cvs-request@lists.sourceforge.net?subject=help
List-Subscribe: https://lists.sourceforge.net/lists/listinfo/egroupware-cvs,
mailto:egroupware-cvs-request@lists.sourceforge.net?subject=subscribe
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: egroupware-cvs-bounces@lists.sourceforge.net
Message-Id: E1aoBcV-0005RG-DV@sfs-ml-4.v29.ch3.sourceforge.com

Author: nathangray
Date: Thu Apr 7 17:13:10 2016
New Revision: 55674

URL: http://svn.stylite.de/viewvc/egroupware?rev=55674&view=rev
Log:
Avoid double encoding when not parsing html styles

Modified:
branches/14.2/etemplate/ (props changed)
branches/14.2/etemplate/inc/class.bo_merge.inc.php

Propchange: branches/14.2/etemplate/

— svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 17:13:10 2016
@@ -1,1 +1,1 @@
-/trunk/etemplate:51364,51378,51382,51385,51389,51391,51397-51398,51405,51410,51412,51424-51425,51435,51437-51438,51450,51453-51454,51465,51488,51490,51516,51518,51522,51531,51533,51548,51551,51562,51565,51567,51580,51586-51589,51595,51600,51612,51628,51636,51645-51646,51649-51651,51680,51684,51690-51691,51695,51708,51712,51716-51717,51720,51757,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907-51908,51929,51933,51943,51948,51950-51951,51953,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103,52114,52117,52152-52153,52163,52175-52176,52188,52192,52194-52196,52204,52222,52224,52229,52232,52236,52238,52243,52245,52253,52255,52258,52261-52262,52268,52275-52276,52278,52282,52285-52286,52296,52307,52321,52330,52334-52336,52340-52341,52353-52355,52357,52360,52368,52372-52373,52375,52379,52385,52406,52412,52423,52440,52447,52449,52455,52460,52470,52472,52477,52482,52487,52492,52495-52496,52510,52514,52519,52524,52555,52570,52
573-52574,52583,52610,52624,52627,52635,52664,52667,52688,52690,52696,52698,52708,52713,52718,52720,52726,52728,52732,52734,52749,52753,52778,52787-52788,52790,52804-52806,52819,52832,52842,52844,52851,52914,52920,52946,52982,53008-53009,53021-53022,53024,53061,53082,53103,53109,53135,53169-53170,53182,53203,53205,53207-53209,53211,53231,53252,53327-53328,53333,53341,53348,53354,53376,53381,53397,53421,53440,53494,53498,53522,53527,53607,53615,53626,53690,53705,53707-53709,53712-53713,53716,53726,53730-53732,53741,53759-53760,53773,53797,53819,53821-53822,53846,53854,53869,53887,53916,53926,53933,53935,53942,53945,53960,53981,53983,53991,53999,54040,54048,54090,54136,54165,54182,54196,54210,54252,54388,54443,54466,54468,54655,54664,54668,54670,54674,54677,54782,54795-54797,54822,54894,54965,54996,55037-55038,55142,55197,55215,55219,55340-55342
+/trunk/etemplate:51364,51378,51382,51385,51389,51391,51397-51398,51405,51410,51412,51424-51425,51435,51437-51438,51450,51453-51454,51465,51488,51490,51516,51518,51522,51531,51533,51548,51551,51562,51565,51567,51580,51586-51589,51595,51600,51612,51628,51636,51645-51646,51649-51651,51680,51684,51690-51691,51695,51708,51712,51716-51717,51720,51757,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907-51908,51929,51933,51943,51948,51950-51951,51953,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103,52114,52117,52152-52153,52163,52175-52176,52188,52192,52194-52196,52204,52222,52224,52229,52232,52236,52238,52243,52245,52253,52255,52258,52261-52262,52268,52275-52276,52278,52282,52285-52286,52296,52307,52321,52330,52334-52336,52340-52341,52353-52355,52357,52360,52368,52372-52373,52375,52379,52385,52406,52412,52423,52440,52447,52449,52455,52460,52470,52472,52477,52482,52487,52492,52495-52496,52510,52514,52519,52524,52555,52570,52
573-52574,52583,52610,52624,52627,52635,52664,52667,52688,52690,52696,52698,52708,52713,52718,52720,52726,52728,52732,52734,52749,52753,52778,52787-52788,52790,52804-52806,52819,52832,52842,52844,52851,52914,52920,52946,52982,53008-53009,53021-53022,53024,53061,53082,53103,53109,53135,53169-53170,53182,53203,53205,53207-53209,53211,53231,53252,53327-53328,53333,53341,53348,53354,53376,53381,53397,53421,53440,53494,53498,53522,53527,53607,53615,53626,53690,53705,53707-53709,53712-53713,53716,53726,53730-53732,53741,53759-53760,53773,53797,53819,53821-53822,53846,53854,53869,53887,53916,53926,53933,53935,53942,53945,53960,53981,53983,53991,53999,54040,54048,54090,54136,54165,54182,54196,54210,54252,54388,54443,54466,54468,54655,54664,54668,54670,54674,54677,54782,54795-54797,54822,54894,54965,54996,55037-55038,55142,55197,55215,55219,55340-55342,55618

Modified: branches/14.2/etemplate/inc/class.bo_merge.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/etemplate/inc/class.bo_merge.inc.php?rev=55674&r1=55673&r2=55674&view=diff

— branches/14.2/etemplate/inc/class.bo_merge.inc.php (original)
+++ branches/14.2/etemplate/inc/class.bo_merge.inc.php Thu Apr 7 17:13:10 2016
@@ -202,7 +202,7 @@
$contact = $this->contacts->read($contact, $ignore_acl);
}
if (!is_array($contact)) return array();

  $replacements = array();
  foreach(array_keys($this->contacts->contact_fields) as $name)
  {

@@ -1001,7 +1001,7 @@
continue;
}
// decode html entities back to utf-8

  		if (is_string($value) && (strpos($value,'&') !== false) && $this->parse_html_styles)
  		{
  			$value = html_entity_decode($value,ENT_QUOTES,$charset);

@@ -1107,7 +1107,10 @@
}
// now decode &, < and >, which need to be encoded as entities in xml
// Check for encoded >< getting double-encoded

  	$replacements = str_replace(array('&',"\r","\n",'&amp;lt;','&amp;gt;'),array('&amp;','',$break,'&lt;','&gt;'),$replacements);

```
  	if($this->parse_html_styles)
```
```
  	{
```

  		$replacements = str_replace(array('&',"\r","\n",'&amp;lt;','&amp;gt;'),array('&amp;','',$break,'&lt;','&gt;'),$replacements);

  	}
  }
  return str_replace(array_keys($replacements),array_values($replacements),$content);

}

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