R52552 - /branches/14.2/mail/inc/class.mail_compose.inc.php

Old eGW-svn
1

Author: hnategh
New Revision: 52552

URL: http://svn.stylite.de/viewvc/egroupware?rev=52552&view=rev
Log:
Always convert html to plain text if browsing with mobile device, because of CKEditor complatibility

Modified:
branches/14.2/mail/inc/class.mail_compose.inc.php

Modified: branches/14.2/mail/inc/class.mail_compose.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/mail/inc/class.mail_compose.inc.php?rev=52552&r1=52551&r2=52552&view=diff

— branches/14.2/mail/inc/class.mail_compose.inc.php (original)
+++ branches/14.2/mail/inc/class.mail_compose.inc.php Tue Apr 21 12:15:01 2015
@@ -244,17 +244,6 @@
{
list($_content[‘mailaccount’], $_content[‘mailidentity’]) = explode(’:’, $_content[‘mailaccount’]);
}

  •   // As CKEditor is not available for mobile devices

  •   // we should always switch the compose mimeType to plainText and

  •   // disable the html option

  •   // TODO: After CKEditor complatibility with all devices, this part needs to be removed

  •   if (html::$ua_mobile)

  •   {

  •   	$_content['mimeType'] = 'plain';

  •   	$readonlys['mimeType'] = true;

  •   }

  •   //error_log(__METHOD__.__LINE__.array2string($sigPref));
  //lang('compose'),lang('from') // needed to be found by translationtools
  //error_log(__METHOD__.__LINE__.array2string($_REQUEST).function_backtrace());

@@ -1013,11 +1002,14 @@
}
}
}

  •   if ($content['mimeType'] == 'html' && html::htmlarea_availible()===false)

  •   //Since the ckeditor is not stable enough on mobile devices, we always convert html messages to plain text

  •   //TODO: needs to remove html:$ua_mobile condition after better mobile support from CKeditor

  •   //mobile compatibility is disabled expilcitly in ckeditor.js plugin too, which needs to be removed

  •   if ($content['mimeType'] == 'html' && html::htmlarea_availible()===false || html::$ua_mobile)
  {
  	$_content['mimeType'] = $content['mimeType'] = 'plain';
  	$content['body'] = $this->convertHTMLToText($content['body']);

  •   	$readonlys['mimeType'] = true;
  }
  // is a certain signature requested?
  // only the following values are supported (and make sense)

BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF

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