* @link http://pear.horde.org/index.php?package=Kolab_Server
*/
-/** We need the DOM library for XML access. */
-require_once 'Horde/DOM.php';
-
/**
* Kolab XML to array hash converter.
*
public function load(&$xmltext)
{
try {
- $noderoot = $this->_parseXml($xmltext);
- } catch (Horde_Exception $e) {
+ $this->_parseXml($xmltext);
+ } catch (DOMException $e) {
/**
* If the first call does not return successfully this might mean we
* got an attachment with broken encoding. There are some Kolab
'UTF-8, ISO-8859-1'), 'UTF-8') !== 0) {
$xmltext = mb_convert_encoding($xmltext, 'UTF-8', 'ISO-8859-1');
}
- $noderoot = $this->_parseXml($xmltext);
+ $this->_parseXml($xmltext);
}
- if (empty($noderoot)) {
+ if (empty($this->_xmldoc)) {
return false;
}
- if (!$noderoot->has_child_nodes()) {
+ if (!$this->_xmldoc->hasChildNodes()) {
throw new Horde_Exception(_("No or unreadable content in Kolab XML object"));
}
- $children = $noderoot->child_nodes();
-
// fresh object data
$object = array();
- $result = $this->_loadArray($children, $this->_fields_basic);
+ $result = $this->_loadArray($this->_xmldoc->childNodes, $this->_fields_basic);
$object = array_merge($object, $result);
$this->_loadMultipleCategories($object);
- $result = $this->_load($children);
+ $result = $this->_load($this->_xmldoc->childNodes);
$object = array_merge($object, $result);
// uid is vital
* Get the text content of the named data node among the specified
* children.
*
- * @param array $children The children to search.
- * @param string $name The name of the node to return.
- * @param array $params Parameters for the data conversion.
+ * @param array &$children The children to search.
+ * @param string $name The name of the node to return.
+ * @param array $params Parameters for the data conversion.
*
* @return string The content of the specified node or an empty
* string.
*
* @todo Make protected (fix the XmlTest for that)
*/
- public function _getXmlData($children, $name, $params)
+ public function _getXmlData(&$children, $name, $params)
{
+ if ($params['type'] == self::TYPE_MULTIPLE) {
+ $result = array();
+ foreach($children as $child) {
+ if ($child->nodeType == XML_ELEMENT_NODE && $child->tagName == $name) {
+ $value = $this->_getXmlData(array($child), $name,
+ $params['array']);
+ $result[] = $value;
+ }
+ }
+ return $result;
+ }
+
$value = null;
$missing = false;
$params['load']));
}
} elseif ($params['type'] == self::TYPE_COMPOSITE) {
- return $this->_loadArray($child->child_nodes(), $params['array']);
- } elseif ($params['type'] == self::TYPE_MULTIPLE) {
- $result = array();
- foreach($children as $child) {
- if ($child->type == XML_ELEMENT_NODE && $child->tagname == $name) {
- $value = $this->_getXmlData(array($child), $name,
- $params['array']);
- $result[] = $value;
- }
- }
- return $result;
+ return $this->_loadArray($child->childNodes, $params['array']);
} else {
return $this->_loadDefault($child, $params);
}
*
* @param string $xmltext The XML of the message as string.
*
- * @return Horde_DOM_Node The root node of the document.
+ * @return NULL
*
* @throws Horde_Exception If parsing the XML data failed.
*
*/
public function _parseXml(&$xmltext)
{
- $params = array(
- 'xml' => $xmltext,
- 'options' => HORDE_DOM_LOAD_REMOVE_BLANKS,
- );
-
- $result = Horde_DOM_Document::factory($params);
- if (is_a($result, 'PEAR_Error')) {
- throw new Horde_Exception($result);
- }
- $this->_xmldoc = $result;
- return $this->_xmldoc->document_element();
+ $this->_xmldoc = new DOMDocument();
+ $this->_xmldoc->preserveWhiteSpace = false;
+ $this->_xmldoc->formatOutput = true;
+ $this->_xmldoc->loadXML($xmltext);
}
/**
$this->_saveArray($root, $object, $this->_fields_basic);
$this->_save($root, $object);
- return $this->_xmldoc->dump_mem(true);
+ return $this->_xmldoc->saveXML();
}
/**
* Save the specific XML values.
*
- * @param array $root The XML document root.
+ * @param array &$root The XML document root.
* @param array $object The resulting data array.
*
* @return boolean True on success.
*
* @throws Horde_Exception If converting the data to XML failed.
*/
- protected function _save($root, $object)
+ protected function _save(&$root, $object)
{
if (!empty($this->_fields_specific)) {
$this->_saveArray($root, $object, $this->_fields_specific);
*
* @todo Make protected (fix the XmlTest for that)
*/
- public function _prepareSave()
+ public function &_prepareSave()
{
- if ($this->_xmldoc != null) {
- $root = $this->_xmldoc->document_element();
- } else {
+ if (empty($this->_xmldoc)) {
// create new XML
- $this->_xmldoc = Horde_DOM_Document::factory();
- $root = $this->_xmldoc->create_element($this->_root_name);
- $root = $this->_xmldoc->append_child($root);
- $root->set_attribute("version", $this->_root_version);
+ $this->_xmldoc = new DOMDocument();
+ $this->_xmldoc->preserveWhiteSpace = false;
+ $this->_xmldoc->formatOutput = true;
+ $root = $this->_xmldoc->createElement($this->_root_name);
+ $root = $this->_xmldoc->appendChild($root);
+ $root->setAttribute('version', $this->_root_version);
}
-
- return $root;
+ return $this->_xmldoc;
}
/**
}
// Create a new complex node
- $composite_node = $this->_xmldoc->create_element($name);
- $composite_node = $parent_node->append_child($composite_node);
+ $composite_node = $this->_xmldoc->createElement($name);
+ $composite_node = $parent_node->appendChild($composite_node);
return $this->_saveArray($composite_node, $value, $params['array']);
} elseif ($params['type'] == self::TYPE_MULTIPLE) {
// Remove the old nodes first
{
$value = Horde_String::convertCharset($value, Horde_Nls::getCharset(), 'utf-8');
- $node = $this->_xmldoc->create_element($name);
+ $node = $this->_xmldoc->createElement($name);
- $node = $parent->append_child($node);
+ $node = $parent->appendChild($node);
// content
- $text = $this->_xmldoc->create_text_node($value);
- $text = $node->append_child($text);
+ $text = $this->_xmldoc->createTextNode($value);
+ $text = $node->appendChild($text);
return $node;
}
/**
* Return the named node among a list of nodes.
*
- * @param array $nodes The list of nodes.
+ * @param array %$nodes The list of nodes.
* @param string $name The name of the node to return.
*
* @return mixed The named Horde_DOM_Node or false if no node was found.
*/
- protected function _findNode($nodes, $name)
+ protected function _findNode(&$nodes, $name)
{
foreach($nodes as $node) {
- if ($node->type == XML_ELEMENT_NODE && $node->tagname == $name) {
+ if ($node->nodeType == XML_ELEMENT_NODE && $node->tagName == $name) {
return $node;
}
}
{
foreach($nodes as $node)
{
- if ($node->type == XML_ELEMENT_NODE && $node->tagname == $parent_name) {
- $children = $node->child_nodes();
+ if ($node->nodeType == XML_ELEMENT_NODE && $node->tagName == $parent_name) {
+ $children = $node->childNodes;
foreach ($children as $child)
- if ($child->type == XML_ELEMENT_NODE
- && $child->tagname == $child_name
- && $child->get_content() == $value) {
+ if ($child->nodeType == XML_ELEMENT_NODE
+ && $child->tagName == $child_name
+ && $child->textContent == $value) {
return $node;
}
}
*/
protected function _getNodeContent($node)
{
- return Horde_String::convertCharset($node->get_content(), 'utf-8');
+ return Horde_String::convertCharset($node->textContent, 'utf-8');
}
*/
protected function _removeNodes($parent_node, $name)
{
- while ($old_node = $this->_findNode($parent_node->child_nodes(), $name)) {
- $parent_node->remove_child($old_node);
+ while ($old_node = $this->_findNode($parent_node->childNodes, $name)) {
+ $parent_node->removeChild($old_node);
}
}
// Range is special
foreach($children as $child) {
- if ($child->tagname == "range") {
+ if ($child->tagname == 'range') {
$recurrence['range-type'] = $child->get_attribute('type');
}
}
$value['range'] = Horde_Kolab_Format_Date::encodeDate($value['range']);
}
- $r_node = $this->_xmldoc->create_element($name);
- $r_node = $parent_node->append_child($r_node);
+ $r_node = $this->_xmldoc->createElement($name);
+ $r_node = $parent_node->appendChild($r_node);
// Save normal fields
$this->_saveArray($r_node, $value, $this->_fields_recurrence);
// Add attributes
- $r_node->set_attribute("cycle", $value['cycle']);
+ $r_node->setAttribute('cycle', $value['cycle']);
if (isset($value['type'])) {
- $r_node->set_attribute("type", $value['type']);
+ $r_node->setAttribute('type', $value['type']);
}
- $child = $this->_findNode($r_node->child_nodes(), "range");
+ $child = $this->_findNode($r_node->childNodes, 'range');
if ($child) {
- $child->set_attribute("type", $value['range-type']);
+ $child->setAttribute('type', $value['range-type']);
}
return $r_node;
{
$xml = &new Horde_Kolab_Format_XML();
$xml->_prepareSave();
- $base = $xml->_xmldoc->dump_mem(true);
+ $base = $xml->_xmldoc->saveXML();
$this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\"/>\n", $base);
}
{
$xml = &new Horde_Kolab_Format_XML();
$xml->_prepareSave();
- $base = $xml->_xmldoc->dump_mem(true);
+ $base = $xml->_xmldoc->saveXML();
$xml->_parseXml($base);
- $this->assertEquals($base, $xml->_xmldoc->dump_mem(true));
+ $this->assertEquals($base, $xml->_xmldoc->saveXML());
}
{
$xml = &new Horde_Kolab_Format_XML();
$xml->_prepareSave();
- $root = $xml->_xmldoc->document_element();
- $base = $xml->_xmldoc->dump_mem(true);
+ $root = $xml->_xmldoc;
+ $base = $xml->_xmldoc->saveXML();
// A missing attribute should cause no change if it
// is allowed to be empty
array(),
'empty1',
array('value' => Horde_Kolab_Format_Xml::VALUE_MAYBE_MISSING));
- $this->assertEquals($base, $xml->_xmldoc->dump_mem(true));
+ $this->assertEquals($base, $xml->_xmldoc->saveXML());
// A missing attribute should cause an error if it
// is not allowed to be empty
'empty1',
array('value' => Horde_Kolab_Format_Xml::VALUE_DEFAULT,
'default' => 'empty1', 'type' => 0));
- $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty1>empty1</empty1>\n</kolab>\n", $xml->_xmldoc->dump_mem(true));
+ $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty1>empty1</empty1>\n</kolab>\n", $xml->_xmldoc->saveXML());
try {
$xml->_updateNode($root,
{
$dxml = new Horde_Kolab_Format_XML_dummy();
$dxml->_prepareSave();
- $droot = $dxml->_xmldoc->document_element();
+ $droot = $dxml->_xmldoc;
// Test calculated nodes
$dxml->_updateNode($droot,
'present1',
array('value' => Horde_Kolab_Format_Xml::VALUE_CALCULATED,
'save' => 'Value', 'type' => 0));
- $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty2>empty2: , missing</empty2>\n <present1>present1: present1</present1>\n</kolab>\n", $dxml->_xmldoc->dump_mem(true));
+ $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty2>empty2: , missing</empty2>\n <present1>present1: present1</present1>\n</kolab>\n", $dxml->_xmldoc->saveXML());
$xml = &new Horde_Kolab_Format_XML();
$xml->_prepareSave();
- $root = $xml->_xmldoc->document_element();
+ $root = $xml->_xmldoc;
$xml->_updateNode($root,
array(),
'empty1',
'present1',
array('value' => Horde_Kolab_Format_Xml::VALUE_DEFAULT,
'default' => 'empty1', 'type' => 0));
- $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty1>empty1</empty1>\n <present1>present1</present1>\n</kolab>\n", $xml->_xmldoc->dump_mem(true));
+ $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty1>empty1</empty1>\n <present1>present1</present1>\n</kolab>\n", $xml->_xmldoc->saveXML());
// Test overwriting a value
$xml->_updateNode($root,
'present1',
array('value' => Horde_Kolab_Format_Xml::VALUE_DEFAULT,
'default' => 'empty1', 'type' => 0));
- $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty1>empty1</empty1>\n <present1>new1</present1>\n</kolab>\n", $xml->_xmldoc->dump_mem(true));
+ $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty1>empty1</empty1>\n <present1>new1</present1>\n</kolab>\n", $xml->_xmldoc->saveXML());
// Test saving a date
$xml->_updateNode($root,
array('value' => Horde_Kolab_Format_Xml::VALUE_DEFAULT,
'default' => 'empty1',
'type' => Horde_Kolab_Format_Xml::TYPE_DATETIME));
- $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty1>empty1</empty1>\n <present1>new1</present1>\n <date1>2007-03-28T11:06:48Z</date1>\n</kolab>\n", $xml->_xmldoc->dump_mem(true));
+ $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <empty1>empty1</empty1>\n <present1>new1</present1>\n <date1>2007-03-28T11:06:48Z</date1>\n</kolab>\n", $xml->_xmldoc->saveXML());
// Now load the data back in
- $children = $root->child_nodes();
+ $children = $root->childNodes;
// Test loading a value that may be empty
$this->assertEquals(null, $xml->_getXmlData($children,
// Continue with complex values
$xml = new Horde_Kolab_Format_XML();
$xml->_prepareSave();
- $root = $xml->_xmldoc->document_element();
+ $root = $xml->_xmldoc;
// Test saving a composite value
$xml->_updateNode($root,
array('composite1' => array('display-name' => 'test', 'smtp-address' => 'test@example.com')),
'composite1', $xml->_fields_simple_person);
- $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <composite1>\n <display-name>test</display-name>\n <smtp-address>test@example.com</smtp-address>\n <uid></uid>\n </composite1>\n</kolab>\n", $xml->_xmldoc->dump_mem(true));
+ $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <composite1>\n <display-name>test</display-name>\n <smtp-address>test@example.com</smtp-address>\n <uid></uid>\n </composite1>\n</kolab>\n", $xml->_xmldoc->saveXML());
// Test saving multiple values
$xml->_updateNode($root,
array('attendee1' => array(array('display-name' => 'test'), array('smtp-address' => 'test@example.com'))),
'attendee1', $xml->_fields_attendee);
- $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <composite1>\n <display-name>test</display-name>\n <smtp-address>test@example.com</smtp-address>\n <uid></uid>\n </composite1>\n <attendee1>\n <display-name>test</display-name>\n <smtp-address></smtp-address>\n <status>none</status>\n <request-response>true</request-response>\n <role>required</role>\n </attendee1>\n <attendee1>\n <display-name></display-name>\n <smtp-address>test@example.com</smtp-address>\n <status>none</status>\n <request-response>true</request-response>\n <role>required</role>\n </attendee1>\n</kolab>\n", $xml->_xmldoc->dump_mem(true));
+ $this->assertEquals("<?xml version=\"1.0\"?>\n<kolab version=\"1.0\">\n <composite1>\n <display-name>test</display-name>\n <smtp-address>test@example.com</smtp-address>\n <uid></uid>\n </composite1>\n <attendee1>\n <display-name>test</display-name>\n <smtp-address></smtp-address>\n <status>none</status>\n <request-response>true</request-response>\n <role>required</role>\n </attendee1>\n <attendee1>\n <display-name></display-name>\n <smtp-address>test@example.com</smtp-address>\n <status>none</status>\n <request-response>true</request-response>\n <role>required</role>\n </attendee1>\n</kolab>\n", $xml->_xmldoc->saveXML());
$children = $root->child_nodes();
projects / horde.git / commitdiff