ZP-474 #comment fixed switched charset conversion, added additional log lines...

ZP-474 #comment fixed switched charset conversion, added additional log lines for monitoring of executed conversions

git-svn-id: https://z-push.org/svn/z-push/trunk@1777 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/backend/zarafa/zarafa.php

@@ -503,29 +503,41 @@ class BackendZarafa implements IBackend, ISearchProvider {
                 // regarding the conversion @see ZP-470
                 if (strlen($body) > 0) {
                     $fwbody = MAPIUtils::readPropStream($fwmessage, PR_BODY);
-                    // if both cpids are set to the charset to charset conversion
-                    if (isset($cpid[$sendMailProps["internetcpid"]]) && isset($props[$sendMailProps["internetcpid"]]))
-                        $fwbody = Utils::ConvertCodepage($props[$sendMailProps["internetcpid"]], $cpid[$sendMailProps["internetcpid"]], $fwbody);
-                    // if only new message's cpid is set, convert to UTF-8
-                    elseif (isset($cpid[$sendMailProps["internetcpid"]]))
+                    // if both cpids are set convert from the existing charset to the new charset
+                    if (isset($cpid[$sendMailProps["internetcpid"]]) && isset($props[$sendMailProps["internetcpid"]])) {
+                        ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZarafaBackend->SendMail(): convert plain forwarded message charset (both set) from '%s' to '%s'", $cpid[$sendMailProps["internetcpid"]], $props[$sendMailProps["internetcpid"]]));
+                        $fwbody = Utils::ConvertCodepage($cpid[$sendMailProps["internetcpid"]], $props[$sendMailProps["internetcpid"]], $fwbody);
+                    }
+                    // if only the old message's cpid is set, convert from old charset to utf-8
+                    elseif (isset($cpid[$sendMailProps["internetcpid"]])) {
+                        ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZarafaBackend->SendMail(): convert plain forwarded message charset (only fw set) from '%s' to '65001'", $cpid[$sendMailProps["internetcpid"]]));
                         $fwbody = Utils::ConvertCodepageStringToUtf8($cpid[$sendMailProps["internetcpid"]], $fwbody);
+                    }
                     // otherwise to the general conversion
-                    else
+                    else {
+                        ZLog::Write(LOGLEVEL_DEBUG, "ZarafaBackend->SendMail(): no charset conversion done for plain forwarded message");
                         $fwbody = w2u($fwbody);
+                    }
 
                     $mapiprops[$sendMailProps["body"]] = $body."\r\n\r\n".$fwbody;
                 }
 
                 if (strlen($bodyHtml) > 0) {
                     $fwbodyHtml = MAPIUtils::readPropStream($fwmessage, PR_HTML);
-                    if (isset($cpid[$sendMailProps["internetcpid"]]) && isset($props[$sendMailProps["internetcpid"]]))
-                        $fwbodyHtml = Utils::ConvertCodepage($props[$sendMailProps["internetcpid"]], $cpid[$sendMailProps["internetcpid"]], $fwbodyHtml);
+                    if (isset($cpid[$sendMailProps["internetcpid"]]) && isset($props[$sendMailProps["internetcpid"]])) {
+                        ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZarafaBackend->SendMail(): convert html forwarded message charset (both set) from '%s' to '%s'", $cpid[$sendMailProps["internetcpid"]], $props[$sendMailProps["internetcpid"]]));
+                        $fwbodyHtml = Utils::ConvertCodepage( $cpid[$sendMailProps["internetcpid"]], $props[$sendMailProps["internetcpid"]], $fwbodyHtml);
+                    }
                     // if only new message's cpid is set, convert to UTF-8
-                    elseif (isset($cpid[$sendMailProps["internetcpid"]]))
+                    elseif (isset($cpid[$sendMailProps["internetcpid"]])) {
+                        ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZarafaBackend->SendMail(): convert html forwarded message charset (only fw set) from '%s' to '65001'", $cpid[$sendMailProps["internetcpid"]]));
                         $fwbodyHtml = Utils::ConvertCodepageStringToUtf8($cpid[$sendMailProps["internetcpid"]], $fwbodyHtml);
+                    }
                     // otherwise to the general conversion
-                    else
+                    else {
+                        ZLog::Write(LOGLEVEL_DEBUG, "ZarafaBackend->SendMail(): no charset conversion done for html forwarded message");
                         $fwbodyHtml = w2u($fwbodyHtml);
+                    }
 
                     $mapiprops[$sendMailProps["html"]] = $bodyHtml."<br><br>".$fwbodyHtml;
                 }