holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved notes/description handling to backend

Browse Source
This commit is contained in:
Philip Herbert 2011-03-07 21:00:54 +00:00
parent 9167125f66
commit 1299714c61
1 changed files with 4 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
addressbook/inc/class.addressbook_activesync.inc.php
View File

@ -267,7 +267,6 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
switch ($attr) switch ($attr)
{ {
case 'note': case 'note':
if (empty($contact[$attr])) break;
if ($bodypreference == false) if ($bodypreference == false)
{ {
$message->body = $contact[$attr]; $message->body = $contact[$attr];
@ -276,52 +275,14 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
} }
else else
{ {
$message->airsyncbasebody = new SyncAirSyncBaseBody();
debugLog("airsyncbasebody!"); debugLog("airsyncbasebody!");
$message->airsyncbasenativebodytype=1;
$message->airsyncbasebody = new SyncAirSyncBaseBody(); $message->airsyncbasebody = new SyncAirSyncBaseBody();
if (isset($bodypreference[2])) $message->airsyncbasenativebodytype=1;
{ $this->backend->note2messagenote($contact[$attr], $bodypreference, &$message->airsyncbasebody);
//debugLog("HTML Body");
$message->airsyncbasebody->type = 2;
$html = '<html>'.
'<head>'.
'<meta name="Generator" content="Z-Push">'.
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.
'</head>'.
'<body>'.
str_replace(array("\n","\r","\r\n"),"<br />",$contact[$attr]).
'</body>'.
'</html>';
if (isset($bodypreference[2]["TruncationSize"]) && strlen($html) > $bodypreference[2]["TruncationSize"])
{
$html = utf8_truncate($html,$bodypreference[2]["TruncationSize"]);
$message->airsyncbasebody->truncated = 1;
}
$message->airsyncbasebody->data = $html;
$message->airsyncbasebody->estimateddatasize = strlen($html);
}
else
{
// debugLog("Plaintext Body");
$note = str_replace("\n","\r\n",str_replace("\r","",$contact[$attr]));
$message->airsyncbasebody->type = 1;
if(isset($bodypreference[1]["TruncationSize"]) && strlen($note) > $bodypreference[1]["TruncationSize"])
{
$note = utf8_truncate($note, $bodypreference[1]["TruncationSize"]);
$message->airsyncbasebody->truncated = 1;
}
$message->airsyncbasebody->estimateddatasize = strlen($note);
$message->airsyncbasebody->data = $note;
}
if ($message->airsyncbasebody->type != 3 && (!isset($message->airsyncbasebody->data) || strlen($message->airsyncbasebody->data) == 0))
{
$message->airsyncbasebody->data = " ";
}
} }
break; break;
case 'jpegphoto': case 'jpegphoto':
if (!empty($contact[$attr])) $message->$key = base64_encode($contact[$attr]); if (!empty($contact[$attr])) $message->$key = base64_encode($contact[$attr]);
break; break;
@ -454,45 +415,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
switch ($attr) switch ($attr)
{ {
case 'note': case 'note':
error_log ("Note !"); $contact[$attr] = $this->backend->messagenote2note($message->body, $message->rtf, $message->airsyncbasebody);
// Since in >=AS12.1 we have the airsyncbasebody object
// By doing this hack we can continue using our current functions...
if (isset($message->airsyncbasebody))
{
switch($message->airsyncbasebody->type)
{
case '3' : $message->rtf = $message->airsyncbasebody->data;
error_log("Airsyncbase RTF Body");
break;
case '1' : $message->body = $message->airsyncbasebody->data;
error_log("Airsyncbase Plain Body");
break;
}
}
if (isset($message->rtf))
{
// Nokia MfE 2.9.158 sends contact notes with RTF and Body element.
// The RTF is empty, the body contains the note therefore we need to unpack the rtf
// to see if it is realy empty and in case not, take the appointment body.
error_log("RTF Body");
$rtf_body = new rtf ();
$rtf_body->loadrtf(base64_decode($message->rtf));
$rtf_body->output("ascii");
$rtf_body->parse();
if (isset($message->body) && isset($rtf_body->out) && $rtf_body->out == "" && $message->body != "")
{
unset($message->rtf);
}
$rtf_body = new rtf ();
$rtf_body->loadrtf(base64_decode($message->rtf));
$rtf_body->output("ascii");
$rtf_body->parse();
//put rtf into body
if($rtf_body->out <> "") $message->body=$rtf_body->out;
}
$contact[$attr] = $message->body;
break; break;
case 'bday': // zpush uses timestamp in servertime case 'bday': // zpush uses timestamp in servertime