adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-05 17:32:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved issue 0000712: PWG-ERROR-VERSION on remote synchronization

Browse Source 
Merge branch-1_7 2211:2212 into BSF


git-svn-id: http://piwigo.org/svn/trunk@2213 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2008-02-16 13:27:50 +00:00
parent 8b69393986
commit 158ab645e7
3 changed files with 83 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_xml.inc.php
+36 -8
View File
@@ -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 )
{