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

fixed warning: implode(): Invalid arguments passed in /var/www/epl-trunk/etemplate/inc/class.bo_merge.inc.php on line 569

Browse Source
This commit is contained in:
Ralf Becker 2011-03-18 15:14:55 +00:00
parent ebbbf233cf
commit 6c05070aa0
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,7 +341,7 @@ abstract class bo_merge
$contentrepeat = $contentstart; $contentrepeat = $contentstart;
$contentstart = ''; $contentstart = '';
} }
} }
if ($mimetype == 'application/vnd.oasis.opendocument.text' && count($ids) > 1) if ($mimetype == 'application/vnd.oasis.opendocument.text' && count($ids) > 1)
{ {
@ -384,7 +384,7 @@ abstract class bo_merge
{ {
$err = lang('Entry not found!'); $err = lang('Entry not found!');
return false; return false;
} }
// some general replacements: current user, date and time // some general replacements: current user, date and time
if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id'))) if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
{ {
@ -557,24 +557,24 @@ abstract class bo_merge
} }
// Look for numbers, set their value if needed // Look for numbers, set their value if needed
$format = $replacement = ''; $format = $replacement = '';
if($this->numeric_fields) { if($this->numeric_fields)
{
$names = array(); $names = array();
foreach($this->numeric_fields as $fieldname) { foreach($this->numeric_fields as $fieldname) {
$names[] = preg_quote($fieldname,'/'); $names[] = preg_quote($fieldname,'/');
} }
switch($mimetype.$mso_application_progid)
{
case 'application/vnd.oasis.opendocument.spreadsheet': // open office calc
$format = '/<table:table-cell([^>]+?)office:value-type="([^"]+)"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\4>.?<\/table:table-cell>/s';
$replacement = '<table:table-cell$1office:value-type="float" office:value="$5"$3>$5</table:table-cell>';
break;
}
if($format && $names)
{
$content = preg_replace($format, $replacement, $content);
}
} }
switch($mimetype.$mso_application_progid)
{
case 'application/vnd.oasis.opendocument.spreadsheet': // open office calc
$format = '/<table:table-cell([^>]+?)office:value-type="([^"]+)"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\4>.?<\/table:table-cell>/s';
$replacement = '<table:table-cell$1office:value-type="float" office:value="$5"$3>$5</table:table-cell>';
break;
}
if($format && $names)
{
$content = preg_replace($format, $replacement, $content);
}
// replace CRLF with linebreak tag of given type // replace CRLF with linebreak tag of given type
switch($mimetype.$mso_application_progid) switch($mimetype.$mso_application_progid)
{ {
@ -609,7 +609,7 @@ abstract class bo_merge
/** /**
* Process special flags, such as IF or NELF * Process special flags, such as IF or NELF
* *
* @param content Text to be examined and changed * @param content Text to be examined and changed
* @param replacements array of markers => replacement * @param replacements array of markers => replacement
* *
@ -767,7 +767,7 @@ abstract class bo_merge
if (isset($archive)) if (isset($archive))
{ {
$zip = new ZipArchive; $zip = new ZipArchive;
if ($zip->open($archive,ZIPARCHIVE::CHECKCONS) !== true) if ($zip->open($archive,ZIPARCHIVE::CHECKCONS) !== true)
{ {
error_log(__METHOD__.__LINE__." !ZipArchive::open('$archive',ZIPARCHIVE::CHECKCONS) failed. Trying open without validating"); error_log(__METHOD__.__LINE__." !ZipArchive::open('$archive',ZIPARCHIVE::CHECKCONS) failed. Trying open without validating");
if ($zip->open($archive) !== true) throw new Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)"); if ($zip->open($archive) !== true) throw new Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");