From c4eaad2efd74eee481675f45ec90e376e984352e Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 27 Sep 2012 03:30:57 +0200 Subject: [PATCH] Fix build --- lib/classes/task/abstract.class.php | 3 ++- lib/classes/task/period/ftp.class.php | 9 ++++++--- lib/classes/task/period/ftpPull.class.php | 9 ++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/classes/task/abstract.class.php b/lib/classes/task/abstract.class.php index 0e38c5c1ca..e3fb2ed948 100755 --- a/lib/classes/task/abstract.class.php +++ b/lib/classes/task/abstract.class.php @@ -828,7 +828,8 @@ abstract class task_abstract (null, 0, "stopped", 0, :active, :name, "0000/00/00 00:00:00", :class, :settings)'; - if ($settings && ! DOMDocument::loadXML($settings)) { + $domdoc = new DOMDocument(); + if ($settings && ! $domdoc->loadXML($settings)) { throw new Exception('settings invalide'); } elseif ( ! $settings) { $settings = "\n\n"; diff --git a/lib/classes/task/period/ftp.class.php b/lib/classes/task/period/ftp.class.php index 0a230fd0d9..3f2433996f 100755 --- a/lib/classes/task/period/ftp.class.php +++ b/lib/classes/task/period/ftp.class.php @@ -50,7 +50,8 @@ class task_period_ftp extends task_appboxAbstract , "proxyport" , "period" ); - if (($dom = @DOMDocument::loadXML($oldxml)) != FALSE) { + $dom = new DOMDocument(); + if ((@$dom->loadXML($oldxml)) != FALSE) { $xmlchanged = false; foreach (array("str:proxy", "str:proxyport", "str:period") as $pname) { $ptype = substr($pname, 0, 3); @@ -167,7 +168,8 @@ class task_period_ftp extends task_appboxAbstract if ($parm["xml"] === null) { // pas de xml 'raw' : on accepte les champs 'graphic view' - if (($domTaskSettings = @DOMDocument::loadXML($taskrow["settings"])) != FALSE) { + $domTaskSettings = new DOMDocument(); + if ((@$domTaskSettings->loadXML($taskrow["settings"])) != FALSE) { $xmlchanged = false; foreach (array("proxy", "proxyport", "period") as $f) { if ($parm[$f] !== NULL) { @@ -194,7 +196,8 @@ class task_period_ftp extends task_appboxAbstract } // si on doit changer le xml, on verifie qu'il est valide - if ($parm["xml"] && ! @DOMDocument::loadXML($parm["xml"])) { + $domdoc = new DOMDocument(); + if ($parm["xml"] && ! @$domdoc->loadXML($parm["xml"])) { return(false); } diff --git a/lib/classes/task/period/ftpPull.class.php b/lib/classes/task/period/ftpPull.class.php index 5bafac0784..555c0db8b1 100755 --- a/lib/classes/task/period/ftpPull.class.php +++ b/lib/classes/task/period/ftpPull.class.php @@ -45,7 +45,8 @@ class task_period_ftpPull extends task_appboxAbstract , "password", "ssl", "ftppath", "localpath" , "passive", "period" ); - if ($dom = @DOMDocument::loadXML($oldxml)) { + $dom = new DOMDocument(); + if (@$dom->loadXML($oldxml)) { $xmlchanged = false; foreach (array("str:proxy", "str:proxyport", "str:period", "boo:passive", "boo:ssl", "str:password", "str:user", "str:ftppath", "str:localpath", "str:port", "str:host") as $pname) { $ptype = substr($pname, 0, 3); @@ -189,7 +190,8 @@ class task_period_ftpPull extends task_appboxAbstract if ($parm["xml"] === null) { // pas de xml 'raw' : on accepte les champs 'graphic view' - if (($domTaskSettings = DOMDocument::loadXML($taskrow["settings"])) != FALSE) { + $domdoc = new DOMDocument(); + if (($domTaskSettings = $domdoc->loadXML($taskrow["settings"])) != FALSE) { $xmlchanged = false; foreach (array("proxy", "proxyport", "period", "host", "port", "user", "password", "ssl", "passive", "localpath", "ftppath") as $f) { if ($parm[$f] !== NULL) { @@ -216,7 +218,8 @@ class task_period_ftpPull extends task_appboxAbstract } // si on doit changer le xml, on verifie qu'il est valide - if ($parm["xml"] && ! DOMDocument::loadXML($parm["xml"])) { + $domdoc = new DOMDocument(); + if ($parm["xml"] && ! $domdoc->loadXML($parm["xml"])) { return(false); }