extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 02:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow anchor tags in OO.o

Browse Source 
r39251: Display error from merge, if merge gives error
r39252: Implement pagerepeat tag for html files
This commit is contained in:
Nathan Gray 2012-05-22 17:54:01 +00:00
parent 541d7539b9
commit 61fb406928
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -774,6 +774,7 @@ abstract class bo_merge
case 'application/vnd.oasis.opendocument.text':
case 'application/vnd.oasis.opendocument.spreadsheet':
case 'application/xml':
case 'text/html':
return $contentstart.implode('',$contentrep).$contentend;
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
@ -839,7 +840,7 @@ abstract class bo_merge
case 'application/vnd.oasis.opendocument.spreadsheet':
$replace_tags = array(
'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
'<table>','<tr>','<td>',
'<table>','<tr>','<td>','<a>',
);
break;
case 'application/xmlWord.Document': // Word 2003*/

1
filemanager/inc/class.filemanager_ui.inc.php
View File

@ -740,6 +740,7 @@ function force_download(_action, _senders)
if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document'];
$document_merge = new filemanager_merge(egw_vfs::decodePath($dir));
$msg = $document_merge->download($settings, $selected, '', $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_dir']);
if($msg) return $msg;
$failed = count($selected);
return false;
}