diff --git a/conlite/classes/class.version.php b/conlite/classes/class.version.php index 6e0107f..83e9a4a 100644 --- a/conlite/classes/class.version.php +++ b/conlite/classes/class.version.php @@ -273,35 +273,26 @@ class Version { * @return string returns content of xml file */ public function createNewXml() { - $oXW = new cXmlWriter(); - $oXW->openMemory(); - $oXW->setIndent(true); - $oXW->startDocument('1.0', 'UTF-8'); + $oWriter = new cXmlWriter(); + $oRootElement = $oWriter->addElement('version', '', NULL, array( + 'xml:lang' => 'de' + )); + $oHeadElement = $oWriter->addElement('head', '', $oRootElement); - $oXW->startElement('version'); - $oXW->writeAttribute('xml:lang', 'de'); - - $oXW->startElement('head'); - $oXW->writeElement('version_id', $this->iIdentity . '_' . $this->iVersion); - $oXW->writeElement('type', $this->sType); - $oXW->writeElement('date', date("Y-m-d H:i:s")); - $oXW->writeElement('author', $this->sAuthor); - $oXW->writeElement('client', $this->iClient); - $oXW->writeElement('created', $this->dCreated); - $oXW->writeElement('lastmodified', $this->dLastModified); - $oXW->endElement(); - - $oXW->startElement('body'); + $oWriter->addElement('version_id', $this->iIdentity . '_' . $this->iVersion, $oHeadElement); + $oWriter->addElement('type', $this->sType, $oHeadElement); + $oWriter->addElement('date', date('Y-m-d H:i:s'), $oHeadElement); + $oWriter->addElement('author', $this->sAuthor, $oHeadElement); + $oWriter->addElement('client', $this->iClient, $oHeadElement); + $oWriter->addElement('created', $this->dCreated, $oHeadElement); + $oWriter->addElement('lastmodified', $this->dLastModified, $oHeadElement); + $oBodyElement = $oWriter->addElement('body', '', $oRootElement); foreach ($this->aBodyData as $sKey => $sValue) { - $oXW->writeElement($sKey, clHtmlEntities($sValue)); + $oWriter->addElement($sKey, $sValue, $oBodyElement, array(), true); } - $oXW->endElement(); - - $oXW->endElement(); - - return $oXW->outputMemory(true); + return $oWriter->saveToString(); } /** diff --git a/conlite/classes/class.versionImport.php b/conlite/classes/class.versionImport.php index 4b72c3f..f6f6cae 100644 --- a/conlite/classes/class.versionImport.php +++ b/conlite/classes/class.versionImport.php @@ -147,7 +147,7 @@ class VersionImport extends Version { $this->sTableName = $this->aCfg['sql']['sqlprefix'] . "_mod_history"; } // init class member - $this->aCreateVesion = array(); + $this->aCreateVersion = array(); // Init class members with table con_history $this->getModuleHistoryTable();