R27378 - /trunk/addressbook/inc/class.addressbook_merge.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 27378

URL: http://www.egroupware.org/viewvc/egroupware?rev=27378&view=rev
Log:
“handling text/rtf as rtf”

Modified:
trunk/addressbook/inc/class.addressbook_merge.inc.php

Modified: trunk/addressbook/inc/class.addressbook_merge.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/addressbook/inc/class.addressbook_merge.inc.php?rev=27378&r1=27377&r2=27378&view=diff

— trunk/addressbook/inc/class.addressbook_merge.inc.php (original)
+++ trunk/addressbook/inc/class.addressbook_merge.inc.php Tue Jul 7 12:12:31 2009
@@ -51,6 +51,7 @@
case ‘application/msword’:
if (strtolower($extension) != ‘.rtf’) break;
case ‘application/rtf’:

  •   	case 'text/rtf':
  		return true;	// rtf files
  	case 'application/vnd.oasis.opendocument.text':
  		if (!check_load_extension('zip')) break;

@@ -338,6 +339,7 @@
case ‘application/msword’:
if (strtolower(substr($document,-4)) != ‘.rtf’) break; // no binary word documents
case ‘application/rtf’:

  •   		case 'text/rtf':
  			return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend;
  		case 'application/vnd.oasis.opendocument.text':
  			// todo OO writer files

@@ -358,6 +360,7 @@
case ‘application/msword’:
if (strtolower(substr($document,-4)) != ‘.rtf’) break; // no binary word documents
case ‘application/rtf’:

  •   		case 'text/rtf':
  			return $contentstart.implode('\\par \\page\\pard\\plain',$contentrep).$contentend;
  		case 'application/vnd.oasis.opendocument.text':
  			// todo OO writer files

Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World™ will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/blackberry

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