aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_xml.inc.php
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2008-02-16 13:22:47 +0000
committerrub <rub@piwigo.org>2008-02-16 13:22:47 +0000
commit81a509d5bfca69c678e0c1eb66f6731db61c222c (patch)
tree9aae0e4d7f421fc6fe87c2c1e5177430a0d5c96b /include/functions_xml.inc.php
parentea3769d28365be0e6f1a08c40508bb8c5543c6b9 (diff)
Resolved issue 0000712: PWG-ERROR-VERSION on remote synchronization
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2212 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/functions_xml.inc.php')
-rw-r--r--include/functions_xml.inc.php44
1 files changed, 36 insertions, 8 deletions
diff --git a/include/functions_xml.inc.php b/include/functions_xml.inc.php
index 7c388d292..ba0f11737 100644
--- a/include/functions_xml.inc.php
+++ b/include/functions_xml.inc.php
@@ -2,10 +2,10 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far)
-// | file : $RCSfile$
+// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
// | revision : $Revision$
@@ -65,7 +65,7 @@ function encodeAttribute( $attribute, $value )
{
return $attribute.'="'.htmlspecialchars($value, ENT_QUOTES).'" ';
}
-
+
// The function getChild returns the first child
// exemple : getChild( "<table><tr>XXX</tr><tr>YYY</tr></table>", "tr" )
// returns "<tr>XXX</tr>"
@@ -74,8 +74,19 @@ function getChild( $document, $node )
$regex = '/<'.$node.'(\s+'.ATT_REG.'="'.VAL_REG.'")*';
$regex.= '(\s*\/>|>.*<\/'.$node.'>)/U';
- preg_match( $regex, $document, $out );
- return $out[0];
+ if
+ (
+ preg_match( $regex, $document, $out )
+ or
+ preg_last_error() == PREG_NO_ERROR
+ )
+ {
+ return $out[0];
+ }
+ else
+ {
+ die('getChild: error ['.preg_last_error().'] with preg_match function');
+ }
}
// getChildren returns a list of the children identified by the $node
@@ -89,14 +100,31 @@ function getChildren( $document, $node )
$regex = '/<'.$node.'(\s+'.ATT_REG.'="'.VAL_REG.'")*';
$regex.= '(\s*\/>|>.*<\/'.$node.'>)/U';
- preg_match_all( $regex, $document, $out );
- return $out[0];
+ if
+ (
+ preg_match_all( $regex, $document, $out )
+ or
+ preg_last_error() == PREG_NO_ERROR
+ )
+ {
+ return $out[0];
+ }
+ else
+ {
+ die('getChild: error ['.preg_last_error().'] with preg_match_all function');
+ }
}
-
+
// get_CodeXML places the content of a text file in a PHP variable and
// return it. If the file can't be opened, returns false.
function getXmlCode( $filename )
{
+ if (function_exists('ini_set'))
+ {
+ // limit must be growed with php5 and "big" listing file
+ ini_set("pcre.backtrack_limit", pow(2, 32));
+ }
+
$file = fopen( $filename, 'r' );
if ( !$file )
{