Author: nathangray
New Revision: 34550
URL: http://www.egroupware.org/viewvc/egroupware?rev=34550&view=rev
Log:
Iteratively increase backtrack limit to try to handle preg_replace limitations on larger files
Modified:
trunk/etemplate/inc/class.bo_merge.inc.php
Modified: trunk/etemplate/inc/class.bo_merge.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/etemplate/inc/class.bo_merge.inc.php?rev=34550&r1=34549&r2=34550&view=diff
— trunk/etemplate/inc/class.bo_merge.inc.php (original)
+++ trunk/etemplate/inc/class.bo_merge.inc.php Wed Apr 6 22:45:14 2011
@@ -483,6 +483,7 @@
$err = lang(’%1 not implemented for %2!’,’$$pagerepeat$$’,$mimetype);
return false;
}
+
return $content;
}
@@ -571,8 +572,8 @@
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>';
-
$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\3>.?<\/table:table-cell>/s'; -
$replacement = '<table:table-cell$1office:value-type="float" office:value="$4"$2>$4</table:table-cell>'; break; case 'application/xmlExcel.Sheet': // Excel 2003 $format = '/'.preg_quote('<Data ss:Type="String">','/').'('.implode('|',$names).')'.preg_quote('</Data>','/').'/';
@@ -582,7 +583,21 @@
}
if($format && $names)
{
-
$content = preg_replace($format, $replacement, $content);
-
// Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs -
$increase = 0; -
while($increase < 10) { -
$result = preg_replace($format, $replacement, $content, -1, $count); -
if( preg_last_error()== PREG_BACKTRACK_LIMIT_ERROR ) { // Only check on backtrack limit failure -
ini_set( 'pcre.backtrack_limit', (int)ini_get( 'pcre.backtrack_limit' )+ 100000 ); // Get current limit and increase -
$increase++; // Do not overkill the server -
} else { // No fail -
$content = $result; // On failure $sNewText would be NULL -
break; // Exit loop -
} -
} -
if($increase == 10) { -
throw new egw_exception('Backtrack limit exceeded @ ' . ini_get('pcre.backtrack_limit')); -
} } } // replace CRLF with linebreak tag of given type
Xperia™ PLAY
It’s a major breakthrough. An authentic gaming
smartphone on the nation’s most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs