CkEditorConfig.php Mail.php

ralfbecker_sf 2016-03-29 09:13:46 UTC #1

Author: ralfbecker
New Revision: 55546

URL: http://svn.stylite.de/viewvc/egroupware?rev=55546&view=rev
Log:
fix some wrong case usages of new Api\Html class

Modified:
trunk/egroupware/api/src/Etemplate/Widget/HtmlArea.php
trunk/egroupware/api/src/Html.php
trunk/egroupware/api/src/Html/CkEditorConfig.php
trunk/egroupware/api/src/Mail.php

Modified: trunk/egroupware/api/src/Etemplate/Widget/HtmlArea.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/HtmlArea.php?rev=55546&r1=55545&r2=55546&view=diff

— trunk/egroupware/api/src/Etemplate/Widget/HtmlArea.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/HtmlArea.php Tue Mar 29 11:13:46 2016
@@ -75,7 +75,7 @@
// only purify for html, mode “ascii” is NO html and content get lost!
if ($this->attrs[‘mode’] != ‘ascii’)
{

  		$value = Api\Html::purify($value, $this->attrs['validation_rules']);

  		$value = Api\Html\HtmLawed::purify($value, $this->attrs['validation_rules']);
  	}
  	$valid =& self::get_array($validated, $form_name, true);
  	if (true) $valid = $value;

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

— trunk/egroupware/api/src/Html.php (original)
+++ trunk/egroupware/api/src/Html.php Tue Mar 29 11:13:46 2016
@@ -665,7 +665,6 @@
*/
static function link($_url,$vars=’’)
{

  //echo "<p>html::link(url='$url',vars='"; print_r($vars); echo "')</p>\n";
  if (!is_array($vars))
  {
  	parse_str($vars,$vars);

@@ -779,7 +778,7 @@
continue; // parameter
}
// get the current part from the optional ‘h’ or ‘f’ prefix of the key

  	$p = $key[0] == 'h' ? html::THEAD : ($key[0] == 'f' ? html::TFOOT : html::TBODY);

  	$p = $key[0] == 'h' ? self::THEAD : ($key[0] == 'f' ? self::TFOOT : self::TBODY);
  	if ($part < $p && ($part || $p < self::TBODY))	// add only allowed and neccessary transitions
  	{
  		if ($part) $html .= '</'.self::$part2tag[$part].">\n";

@@ -977,7 +976,7 @@
{
$url = self::link($url,$vars);
}

  //echo "<p>html::a_href('".self::htmlspecialchars($content)."','$url',".print_r($vars,True).") = ".self::link($url,$vars)."</p>";

  //echo "<p>self::a_href('".self::htmlspecialchars($content)."','$url',".print_r($vars,True).") = ".self::link($url,$vars)."</p>";
  return '<a href="'.self::htmlspecialchars($url).'" '.$options.'>'.$content.'</a>';

}

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

— trunk/egroupware/api/src/Html/CkEditorConfig.php (original)
+++ trunk/egroupware/api/src/Html/CkEditorConfig.php Tue Mar 29 11:13:46 2016
@@ -212,13 +212,13 @@
{
//Get the skin name
$skin = $GLOBALS[‘egw_info’][‘user’][‘preferences’][‘common’][‘rte_skin’];

  	//error_log(__METHOD__.__LINE__.' UserAgent:'.html::$user_agent);

  	//error_log(__METHOD__.__LINE__.' UserAgent:'.EGroupware\Api\Header\UserAgent::type());
  	//Convert old fckeditor skin names to new ones
  	switch ($skin)
  	{
  		case 'kama':
  			$skin = "kama";

  			//if (html::$user_agent=='firefox' || html::$user_agent=='msie') $skin='moonocolor';

  			//if (EGroupware\Api\Header\UserAgent::type()=='firefox' || EGroupware\Api\Header\UserAgent::type()=='msie') $skin='moonocolor';
  			break;
  		case 'silver':
  		case 'moono-dark':

Modified: trunk/egroupware/api/src/Mail.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Mail.php?rev=55546&r1=55545&r2=55546&view=diff

— trunk/egroupware/api/src/Mail.php (original)
+++ trunk/egroupware/api/src/Mail.php Tue Mar 29 11:13:46 2016
@@ -4196,7 +4196,7 @@
// purify got switched to htmLawed
// some testcode to test purifying / htmlawed
//$_html = "

hi
there
kram

".$_html;

  $_html = html::purify($_html,self::$htmLawed_config,array(),true);

  $_html = Html\HtmLawed::purify($_html,self::$htmLawed_config,array(),true);
  //if ($hasOther) $_html = $matches[1]. $_html. $matches[3];
  // clean out comments , should not be needed as purify should do the job.
  $search = array(

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

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