extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:12:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix SyncEvolution issue (community bug#2975)

Browse Source
This commit is contained in:
Jörg Lehrke 2011-09-24 17:33:35 +00:00
parent 0ace096701
commit f6f47e586b
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
phpgwapi/inc/horde/Horde/SyncML/Command/Sync/ContentSyncElement.php
View File

@ -30,35 +30,46 @@ class Horde_SyncML_Command_Sync_ContentSyncElement extends Horde_SyncML_Command_
} else { } else {
$this->_command = $command; $this->_command = $command;
} }
$attrs = array(); $attrs = array();
$strict_xml = strtolower($this->_contentFormat) == 'strictxml'; $contentFormat = isset($this->_contentFormat) ? strtolower($this->_contentFormat) : '';
$output->startElement($state->getURI(), $command, $attrs); $output->startElement($state->getURI(), $command, $attrs);
$output->startElement($state->getURI(), 'CmdID', $attrs); $output->startElement($state->getURI(), 'CmdID', $attrs);
$output->characters($currentCmdID); $output->characters($currentCmdID);
$output->endElement($state->getURI(), 'CmdID'); $output->endElement($state->getURI(), 'CmdID');
if (isset($this->_content) && !$this->_moreData) { if (isset($this->_content) && !$this->_moreData) {
//$this->_content = trim($this->_content);
$this->_contentSize = strlen($this->_content); $this->_contentSize = strlen($this->_content);
if (strtolower($this->_contentFormat) == 'b64') {
$this->_content = base64_encode($this->_content);
}
} else { } else {
$this->_contentSize = 0; $this->_contentSize = 0;
} }
switch ($contentFormat) {
case 'strictxml':
break;
case 'htmlenc':
if ($this->_contentSize) {
$this->_content = htmlspecialchars($this->_content, ENT_COMPAT, 'UTF-8');
}
break;
case 'b64':
if ($this->_contentSize) {
$this->_content = base64_encode($this->_content);
}
default:
$contentFormat = '';
}
// <command><Meta> // <command><Meta>
if ($this->_contentSize || isset($this->_contentType) || if ($this->_contentSize || isset($this->_contentType) ||
(!$strict_xml && isset($this->_contentFormat))) { (!$contentFormat && isset($this->_contentFormat))) {
$output->startElement($state->getURI(), 'Meta', $attrs); $output->startElement($state->getURI(), 'Meta', $attrs);
if (isset($this->_contentType)) { if (isset($this->_contentType)) {
$output->startElement($state->getURIMeta(), 'Type', $attrs); $output->startElement($state->getURIMeta(), 'Type', $attrs);
$output->characters($this->_contentType); $output->characters($this->_contentType);
$output->endElement($state->getURIMeta(), 'Type'); $output->endElement($state->getURIMeta(), 'Type');
} }
if (!$strict_xml && isset($this->_contentFormat)) { if (!$contentFormat && isset($this->_contentFormat)) {
$output->startElement($state->getURIMeta(), 'Format', $attrs); $output->startElement($state->getURIMeta(), 'Format', $attrs);
$output->characters($this->_contentFormat); $output->characters($this->_contentFormat);
$output->endElement($state->getURIMeta(), 'Format'); $output->endElement($state->getURIMeta(), 'Format');
@ -97,6 +108,7 @@ class Horde_SyncML_Command_Sync_ContentSyncElement extends Horde_SyncML_Command_
// <command><Item><Data> // <command><Item><Data>
if (isset($this->_content)) { if (isset($this->_content)) {
$this->_contentSize = strlen($this->_content);
$output->startElement($state->getURI(), 'Data', $attrs); $output->startElement($state->getURI(), 'Data', $attrs);
$currentSize = $output->getOutputSize(); $currentSize = $output->getOutputSize();
Horde::logMessage("SyncML: $command: current = $currentSize, max = $maxMsgSize", __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage("SyncML: $command: current = $currentSize, max = $maxMsgSize", __FILE__, __LINE__, PEAR_LOG_DEBUG);
@ -124,8 +136,10 @@ class Horde_SyncML_Command_Sync_ContentSyncElement extends Horde_SyncML_Command_
. $chars, __FILE__, __LINE__, PEAR_LOG_DEBUG); . $chars, __FILE__, __LINE__, PEAR_LOG_DEBUG);
$this->_moreData = true; $this->_moreData = true;
} }
if ($strict_xml) { switch ($contentFormat) {
$chars = '<![CDATA['. $chars. ']]>'; case 'strictxml':
$chars = '<![CDATA['. $chars. ']]>';
break;
} }
$output->characters($chars); $output->characters($chars);
$output->endElement($state->getURI(), 'Data'); $output->endElement($state->getURI(), 'Data');

4
phpgwapi/inc/horde/Horde/SyncML/State.php
View File

@ -856,8 +856,8 @@ class Horde_SyncML_State {
} }
break; break;
case 'patrick ohly': case 'patrick ohly':
// SyncEvolution requires well-formed XML, too // SyncEvolution requires HTML Encoding
$res['ContentFormat'] = 'strictxml'; $res['ContentFormat'] = 'htmlenc';
default: default:
$res['mayFragment'] = 1; $res['mayFragment'] = 1;
break; break;