extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

added support for ms excel 2007

Browse Source
This commit is contained in:
Ralf Becker 2009-09-01 14:41:48 +00:00
parent 4a2d859391
commit 4e2f35d4dc
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etemplate/inc/class.bo_merge.inc.php
View File

@ -87,8 +87,10 @@ abstract class bo_merge
case 'application/vnd.oasis.opendocument.spreadsheet': // oo spreadsheet case 'application/vnd.oasis.opendocument.spreadsheet': // oo spreadsheet
if (!$zip_available) break; if (!$zip_available) break;
return true; // open office write xml files return true; // open office write xml files
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': // ms word 2007 xml format
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d': // mimetypes in vfs are limited to 64 chars case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d': // mimetypes in vfs are limited to 64 chars
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': // ms excel 2007 xml format
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
if (!$zip_available) break; if (!$zip_available) break;
return true; // ms word xml format return true; // ms word xml format
default: default:
@ -315,7 +317,7 @@ abstract class bo_merge
// remove not existing replacements (eg. from calendar array) // remove not existing replacements (eg. from calendar array)
if (strpos($content,'$$') !== null) if (strpos($content,'$$') !== null)
{ {
$content = preg_replace('/\$\$[a-z0-9_]+\$\$/i','',$content); $content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i','',$content);
} }
if ($contentrepeat) $contentrep[$id] = $content; if ($contentrepeat) $contentrep[$id] = $content;
} }
@ -350,6 +352,8 @@ abstract class bo_merge
break; break;
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d': // mimetypes in vfs are limited to 64 chars case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d': // mimetypes in vfs are limited to 64 chars
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
// todo ms word xml files // todo ms word xml files
break; break;
} }
@ -372,6 +376,8 @@ abstract class bo_merge
break; break;
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d': // mimetypes in vfs are limited to 64 chars case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d': // mimetypes in vfs are limited to 64 chars
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
// todo ms word xml files // todo ms word xml files
break; break;
} }
@ -429,6 +435,13 @@ abstract class bo_merge
'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>$$','/').'/i' => '$$\\2$$', '([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>$$','/').'/i' => '$$\\2$$',
); );
break; break;
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
$mime_type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.xlsx').'-').'.xlsx';
copy($content_url,$archive);
$content_url = 'zip://'.$archive.'#'.($content_file = 'xl/sharedStrings.xml');
break;
} }
if (!($merged =& $this->merge($content_url,$ids,$err,$mime_type,$fix))) if (!($merged =& $this->merge($content_url,$ids,$err,$mime_type,$fix)))
{ {

BIN
etemplate/templates/default/images/mime16_application_vnd.openxmlformats-officedocument.spreadsheetml.sheet.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 139 B

1
phpgwapi/inc/class.mime_magic.inc.php
View File

@ -415,6 +415,7 @@ class mime_magic
'xht' => 'application/xhtml+xml', 'xht' => 'application/xhtml+xml',
'xhtml' => 'application/xhtml+xml', 'xhtml' => 'application/xhtml+xml',
'xls' => 'application/vnd.ms-excel', 'xls' => 'application/vnd.ms-excel',
'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', // excel xml format
'xlt' => 'application/vnd.ms-excel', 'xlt' => 'application/vnd.ms-excel',
'xml' => 'application/xml', 'xml' => 'application/xml',
'xpm' => 'image/x-xpixmap', 'xpm' => 'image/x-xpixmap',