alxarafe / alixar

public/htdocs/includes/sabre/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php

Switch Indentation +18 added lines, -18 removed lines

@@ -67,25 +67,25 @@
         if (is_array($elems)) {
             foreach ($elems as $elem) {
                 switch ($elem['name']) {
-                case '{' . Plugin::NS_CARDDAV . '}param-filter':
-                        $result['param-filters'][] = $elem['value'];
-                    break;
-                case '{' . Plugin::NS_CARDDAV . '}is-not-defined':
-                        $result['is-not-defined'] = true;
-                    break;
-                case '{' . Plugin::NS_CARDDAV . '}text-match':
-                        $matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
+                    case '{' . Plugin::NS_CARDDAV . '}param-filter':
+                            $result['param-filters'][] = $elem['value'];
+                        break;
+                    case '{' . Plugin::NS_CARDDAV . '}is-not-defined':
+                            $result['is-not-defined'] = true;
+                        break;
+                    case '{' . Plugin::NS_CARDDAV . '}text-match':
+                            $matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
 
-                        if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
-                            throw new BadRequest('Unknown match-type: ' . $matchType);
-                            }
-                        $result['text-matches'][] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
-                        'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
-                        'value' => $elem['value'],
-                        'match-type' => $matchType,
-                        ];
-                    break;
+                            if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
+                                throw new BadRequest('Unknown match-type: ' . $matchType);
+                                }
+                            $result['text-matches'][] = [
+                            'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
+                            'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
+                            'value' => $elem['value'],
+                            'match-type' => $matchType,
+                            ];
+                        break;
             }
             }
         }

public/htdocs/includes/sabre/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php

Switch Indentation +15 added lines, -15 removed lines

@@ -61,22 +61,22 @@
         if (is_array($elems)) {
             foreach ($elems as $elem) {
                 switch ($elem['name']) {
-                case '{' . Plugin::NS_CARDDAV . '}is-not-defined':
-                        $result['is-not-defined'] = true;
-                    break;
-                case '{' . Plugin::NS_CARDDAV . '}text-match':
-                        $matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
+                    case '{' . Plugin::NS_CARDDAV . '}is-not-defined':
+                            $result['is-not-defined'] = true;
+                        break;
+                    case '{' . Plugin::NS_CARDDAV . '}text-match':
+                            $matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
 
-                        if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
-                            throw new BadRequest('Unknown match-type: ' . $matchType);
-                            }
-                        $result['text-match'] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
-                        'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
-                        'value' => $elem['value'],
-                        'match-type' => $matchType,
-                        ];
-                    break;
+                            if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
+                                throw new BadRequest('Unknown match-type: ' . $matchType);
+                                }
+                            $result['text-match'] = [
+                            'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
+                            'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
+                            'value' => $elem['value'],
+                            'match-type' => $matchType,
+                            ];
+                        break;
             }
             }
         }

public/htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php

Switch Indentation +22 added lines, -22 removed lines

@@ -64,28 +64,28 @@
         if (is_array($elems)) {
             foreach ($elems as $elem) {
                 switch ($elem['name']) {
-                case '{' . Plugin::NS_CALDAV . '}param-filter':
-                        $result['param-filters'][] = $elem['value'];
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}is-not-defined':
-                        $result['is-not-defined'] = true;
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}time-range':
-                        $result['time-range'] = [
-                        'start' => isset($elem['attributes']['start']) ? DateTimeParser::parseDateTime($elem['attributes']['start']) : null,
-                        'end' => isset($elem['attributes']['end']) ? DateTimeParser::parseDateTime($elem['attributes']['end']) : null,
-                        ];
-                        if ($result['time-range']['start'] && $result['time-range']['end'] && $result['time-range']['end'] <= $result['time-range']['start']) {
-                            throw new BadRequest('The end-date must be larger than the start-date');
-                            }
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}text-match':
-                        $result['text-match'] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
-                        'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
-                        'value' => $elem['value'],
-                        ];
-                    break;
+                    case '{' . Plugin::NS_CALDAV . '}param-filter':
+                            $result['param-filters'][] = $elem['value'];
+                        break;
+                    case '{' . Plugin::NS_CALDAV . '}is-not-defined':
+                            $result['is-not-defined'] = true;
+                        break;
+                    case '{' . Plugin::NS_CALDAV . '}time-range':
+                            $result['time-range'] = [
+                            'start' => isset($elem['attributes']['start']) ? DateTimeParser::parseDateTime($elem['attributes']['start']) : null,
+                            'end' => isset($elem['attributes']['end']) ? DateTimeParser::parseDateTime($elem['attributes']['end']) : null,
+                            ];
+                            if ($result['time-range']['start'] && $result['time-range']['end'] && $result['time-range']['end'] <= $result['time-range']['start']) {
+                                throw new BadRequest('The end-date must be larger than the start-date');
+                                }
+                        break;
+                    case '{' . Plugin::NS_CALDAV . '}text-match':
+                            $result['text-match'] = [
+                            'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
+                            'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
+                            'value' => $elem['value'],
+                            ];
+                        break;
             }
             }
         }

public/htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Filter/ParamFilter.php

Switch Indentation +10 added lines, -10 removed lines

@@ -60,16 +60,16 @@
         if (is_array($elems)) {
             foreach ($elems as $elem) {
                 switch ($elem['name']) {
-                case '{' . Plugin::NS_CALDAV . '}is-not-defined':
-                        $result['is-not-defined'] = true;
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}text-match':
-                        $result['text-match'] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
-                        'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
-                        'value' => $elem['value'],
-                        ];
-                    break;
+                    case '{' . Plugin::NS_CALDAV . '}is-not-defined':
+                            $result['is-not-defined'] = true;
+                        break;
+                    case '{' . Plugin::NS_CALDAV . '}text-match':
+                            $result['text-match'] = [
+                            'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
+                            'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
+                            'value' => $elem['value'],
+                            ];
+                        break;
             }
             }
         }

public/htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Filter/CompFilter.php

Switch Indentation +21 added lines, -21 removed lines

@@ -64,27 +64,27 @@
         if (is_array($elems)) {
             foreach ($elems as $elem) {
                 switch ($elem['name']) {
-                case '{' . Plugin::NS_CALDAV . '}comp-filter':
-                        $result['comp-filters'][] = $elem['value'];
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}prop-filter':
-                        $result['prop-filters'][] = $elem['value'];
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}is-not-defined':
-                        $result['is-not-defined'] = true;
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}time-range':
-                        if ('VCALENDAR' === $result['name']) {
-                            throw new BadRequest('You cannot add time-range filters on the VCALENDAR component');
-                            }
-                        $result['time-range'] = [
-                        'start' => isset($elem['attributes']['start']) ? DateTimeParser::parseDateTime($elem['attributes']['start']) : null,
-                        'end' => isset($elem['attributes']['end']) ? DateTimeParser::parseDateTime($elem['attributes']['end']) : null,
-                        ];
-                        if ($result['time-range']['start'] && $result['time-range']['end'] && $result['time-range']['end'] <= $result['time-range']['start']) {
-                            throw new BadRequest('The end-date must be larger than the start-date');
-                            }
-                    break;
+                    case '{' . Plugin::NS_CALDAV . '}comp-filter':
+                            $result['comp-filters'][] = $elem['value'];
+                        break;
+                    case '{' . Plugin::NS_CALDAV . '}prop-filter':
+                            $result['prop-filters'][] = $elem['value'];
+                        break;
+                    case '{' . Plugin::NS_CALDAV . '}is-not-defined':
+                            $result['is-not-defined'] = true;
+                        break;
+                    case '{' . Plugin::NS_CALDAV . '}time-range':
+                            if ('VCALENDAR' === $result['name']) {
+                                throw new BadRequest('You cannot add time-range filters on the VCALENDAR component');
+                                }
+                            $result['time-range'] = [
+                            'start' => isset($elem['attributes']['start']) ? DateTimeParser::parseDateTime($elem['attributes']['start']) : null,
+                            'end' => isset($elem['attributes']['end']) ? DateTimeParser::parseDateTime($elem['attributes']['end']) : null,
+                            ];
+                            if ($result['time-range']['start'] && $result['time-range']['end'] && $result['time-range']['end'] <= $result['time-range']['start']) {
+                                throw new BadRequest('The end-date must be larger than the start-date');
+                                }
+                        break;
             }
             }
         }

public/htdocs/includes/nusoap/lib/Mail/mimePart.php

Switch Indentation +72 added lines, -72 removed lines

@@ -178,27 +178,27 @@ 
 
         foreach ($params as $key => $value) {
             switch ($key) {
-            case 'encoding':
-                    $this->_encoding = $value;
-                    $headers['Content-Transfer-Encoding'] = $value;
-                break;
-
-            case 'cid':
-                    $headers['Content-ID'] = '<' . $value . '>';
-                break;
-
-            case 'location':
-                    $headers['Content-Location'] = $value;
-                break;
-
-            case 'body_file':
-                    $this->_body_file = $value;
-                break;
-
-            // for backward compatibility
-            case 'dfilename':
-                    $params['filename'] = $value;
-                break;
+                case 'encoding':
+                        $this->_encoding = $value;
+                        $headers['Content-Transfer-Encoding'] = $value;
+                    break;
+
+                case 'cid':
+                        $headers['Content-ID'] = '<' . $value . '>';
+                    break;
+
+                case 'location':
+                        $headers['Content-Location'] = $value;
+                    break;
+
+                case 'body_file':
+                        $this->_body_file = $value;
+                    break;
+
+                // for backward compatibility
+                case 'dfilename':
+                        $params['filename'] = $value;
+                    break;
             }
         }
 
@@ -480,18 +480,18 @@ 
     function _getEncodedData($data, $encoding)
     {
         switch ($encoding) {
-        case 'quoted-printable':
-            return $this->_quotedPrintableEncode($data);
-            break;
+            case 'quoted-printable':
+                return $this->_quotedPrintableEncode($data);
+                break;
 
-        case 'base64':
-            return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
-            break;
+            case 'base64':
+                return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
+                break;
 
-        case '8bit':
-        case '7bit':
-        default:
-            return $data;
+            case '8bit':
+            case '7bit':
+            default:
+                return $data;
         }
     }
 
@@ -522,48 +522,48 @@ 
         $data = '';
 
         switch ($encoding) {
-        case 'quoted-printable':
-                while (!feof($fd)) {
-                    $buffer = $this->_quotedPrintableEncode(fgets($fd));
-                    if ($fh) {
-                        fwrite($fh, $buffer);
-                    } else {
-                        $data .= $buffer;
-                    }
-                    }
-            break;
-
-        case 'base64':
-                while (!feof($fd)) {
-                    // Should read in a multiple of 57 bytes so that
-                    // the output is 76 bytes per line. Don't use big chunks
-                    // because base64 encoding is memory expensive
-                    $buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
-                    $buffer = base64_encode($buffer);
-                    $buffer = chunk_split($buffer, 76, $this->_eol);
-                    if (feof($fd)) {
-                        $buffer = rtrim($buffer);
-                    }
+            case 'quoted-printable':
+                    while (!feof($fd)) {
+                        $buffer = $this->_quotedPrintableEncode(fgets($fd));
+                        if ($fh) {
+                            fwrite($fh, $buffer);
+                        } else {
+                            $data .= $buffer;
+                        }
+                        }
+                break;
 
-                    if ($fh) {
-                        fwrite($fh, $buffer);
-                    } else {
-                        $data .= $buffer;
-                    }
-                    }
-            break;
-
-        case '8bit':
-        case '7bit':
-        default:
-                while (!feof($fd)) {
-                    $buffer = fread($fd, 1048576); // 1 MB
-                    if ($fh) {
-                        fwrite($fh, $buffer);
-                    } else {
-                        $data .= $buffer;
-                    }
-                    }
+            case 'base64':
+                    while (!feof($fd)) {
+                        // Should read in a multiple of 57 bytes so that
+                        // the output is 76 bytes per line. Don't use big chunks
+                        // because base64 encoding is memory expensive
+                        $buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
+                        $buffer = base64_encode($buffer);
+                        $buffer = chunk_split($buffer, 76, $this->_eol);
+                        if (feof($fd)) {
+                            $buffer = rtrim($buffer);
+                        }
+
+                        if ($fh) {
+                            fwrite($fh, $buffer);
+                        } else {
+                            $data .= $buffer;
+                        }
+                        }
+                break;
+
+            case '8bit':
+            case '7bit':
+            default:
+                    while (!feof($fd)) {
+                        $buffer = fread($fd, 1048576); // 1 MB
+                        if ($fh) {
+                            fwrite($fh, $buffer);
+                        } else {
+                            $data .= $buffer;
+                        }
+                        }
         }
 
         fclose($fd);

public/htdocs/includes/nusoap/lib/Mail/mime.php

Switch Indentation +113 added lines, -113 removed lines

@@ -890,61 +890,61 @@ 
         $text        = !$html && strlen($this->_txtbody);
 
         switch (true) {
-        case $text && !$attachments:
-                $message =& $this->_addTextPart($null, $this->_txtbody);
-            break;
-
-        case !$text && !$html && $attachments:
-                $message =& $this->_addMixedPart();
-                for ($i = 0; $i < count($this->_parts); $i++) {
-                    $this->_addAttachmentPart($message, $this->_parts[$i]);
-                    }
-            break;
-
-        case $text && $attachments:
-                $message =& $this->_addMixedPart();
-                $this->_addTextPart($message, $this->_txtbody);
-                for ($i = 0; $i < count($this->_parts); $i++) {
-                    $this->_addAttachmentPart($message, $this->_parts[$i]);
-                    }
-            break;
-
-        case $html && !$attachments && !$html_images:
-                if (isset($this->_txtbody)) {
-                    $message =& $this->_addAlternativePart($null);
-                    $this->_addTextPart($message, $this->_txtbody);
-                    $this->_addHtmlPart($message);
-                    } else {
-                    $message =& $this->_addHtmlPart($null);
-                    }
-            break;
-
-        case $html && !$attachments && $html_images:
-                // * Content-Type: multipart/alternative;
-                //    * text
-                //    * Content-Type: multipart/related;
-                //       * html
-                //       * image...
-                if (isset($this->_txtbody)) {
-                    $message =& $this->_addAlternativePart($null);
+            case $text && !$attachments:
+                    $message =& $this->_addTextPart($null, $this->_txtbody);
+                break;
+
+            case !$text && !$html && $attachments:
+                    $message =& $this->_addMixedPart();
+                    for ($i = 0; $i < count($this->_parts); $i++) {
+                        $this->_addAttachmentPart($message, $this->_parts[$i]);
+                        }
+                break;
+
+            case $text && $attachments:
+                    $message =& $this->_addMixedPart();
                     $this->_addTextPart($message, $this->_txtbody);
-
-                    $ht =& $this->_addRelatedPart($message);
-                    $this->_addHtmlPart($ht);
-                    for ($i = 0; $i < count($this->_html_images); $i++) {
-                        $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
-                    }
-                    } else {
-                    // * Content-Type: multipart/related;
-                    //    * html
-                    //    * image...
-                    $message =& $this->_addRelatedPart($null);
-                    $this->_addHtmlPart($message);
-                    for ($i = 0; $i < count($this->_html_images); $i++) {
-                        $this->_addHtmlImagePart($message, $this->_html_images[$i]);
-                    }
-                    }
-                /*
+                    for ($i = 0; $i < count($this->_parts); $i++) {
+                        $this->_addAttachmentPart($message, $this->_parts[$i]);
+                        }
+                break;
+
+            case $html && !$attachments && !$html_images:
+                    if (isset($this->_txtbody)) {
+                        $message =& $this->_addAlternativePart($null);
+                        $this->_addTextPart($message, $this->_txtbody);
+                        $this->_addHtmlPart($message);
+                        } else {
+                        $message =& $this->_addHtmlPart($null);
+                        }
+                break;
+
+            case $html && !$attachments && $html_images:
+                    // * Content-Type: multipart/alternative;
+                    //    * text
+                    //    * Content-Type: multipart/related;
+                    //       * html
+                    //       * image...
+                    if (isset($this->_txtbody)) {
+                        $message =& $this->_addAlternativePart($null);
+                        $this->_addTextPart($message, $this->_txtbody);
+
+                        $ht =& $this->_addRelatedPart($message);
+                        $this->_addHtmlPart($ht);
+                        for ($i = 0; $i < count($this->_html_images); $i++) {
+                            $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
+                        }
+                        } else {
+                        // * Content-Type: multipart/related;
+                        //    * html
+                        //    * image...
+                        $message =& $this->_addRelatedPart($null);
+                        $this->_addHtmlPart($message);
+                        for ($i = 0; $i < count($this->_html_images); $i++) {
+                            $this->_addHtmlImagePart($message, $this->_html_images[$i]);
+                        }
+                        }
+                    /*
                 // #13444, #9725: the code below was a non-RFC compliant hack
                 // * Content-Type: multipart/related;
                 //    * Content-Type: multipart/alternative;
@@ -963,39 +963,39 @@ 
                 $this->_addHtmlImagePart($message, $this->_html_images[$i]);
                 }
                 */
-            break;
-
-        case $html && $attachments && !$html_images:
-                $message =& $this->_addMixedPart();
-                if (isset($this->_txtbody)) {
-                    $alt =& $this->_addAlternativePart($message);
-                    $this->_addTextPart($alt, $this->_txtbody);
-                    $this->_addHtmlPart($alt);
-                    } else {
-                    $this->_addHtmlPart($message);
-                    }
-                for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-                    }
-            break;
-
-        case $html && $attachments && $html_images:
-                $message =& $this->_addMixedPart();
-                if (isset($this->_txtbody)) {
-                    $alt =& $this->_addAlternativePart($message);
-                    $this->_addTextPart($alt, $this->_txtbody);
-                    $rel =& $this->_addRelatedPart($alt);
-                    } else {
-                    $rel =& $this->_addRelatedPart($message);
-                    }
-                $this->_addHtmlPart($rel);
-                for ($i = 0; $i < count($this->_html_images); $i++) {
-                $this->_addHtmlImagePart($rel, $this->_html_images[$i]);
-                    }
-                for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-                    }
-            break;
+                break;
+
+            case $html && $attachments && !$html_images:
+                    $message =& $this->_addMixedPart();
+                    if (isset($this->_txtbody)) {
+                        $alt =& $this->_addAlternativePart($message);
+                        $this->_addTextPart($alt, $this->_txtbody);
+                        $this->_addHtmlPart($alt);
+                        } else {
+                        $this->_addHtmlPart($message);
+                        }
+                    for ($i = 0; $i < count($this->_parts); $i++) {
+                    $this->_addAttachmentPart($message, $this->_parts[$i]);
+                        }
+                break;
+
+            case $html && $attachments && $html_images:
+                    $message =& $this->_addMixedPart();
+                    if (isset($this->_txtbody)) {
+                        $alt =& $this->_addAlternativePart($message);
+                        $this->_addTextPart($alt, $this->_txtbody);
+                        $rel =& $this->_addRelatedPart($alt);
+                        } else {
+                        $rel =& $this->_addRelatedPart($message);
+                        }
+                    $this->_addHtmlPart($rel);
+                    for ($i = 0; $i < count($this->_html_images); $i++) {
+                    $this->_addHtmlImagePart($rel, $this->_html_images[$i]);
+                        }
+                    for ($i = 0; $i < count($this->_parts); $i++) {
+                    $this->_addAttachmentPart($message, $this->_parts[$i]);
+                        }
+                break;
         }
 
         if (!isset($message)) {
@@ -1357,32 +1357,32 @@ 
 
         // See get()
         switch (true) {
-        case $text && !$attachments:
-                $headers['Content-Type'] = 'text/plain';
-            break;
-
-        case !$text && !$html && $attachments:
-        case $text && $attachments:
-        case $html && $attachments && !$html_images:
-        case $html && $attachments && $html_images:
-                $headers['Content-Type'] = 'multipart/mixed';
-            break;
-
-        case $html && !$attachments && !$html_images && isset($this->_txtbody):
-        case $html && !$attachments && $html_images && isset($this->_txtbody):
-                $headers['Content-Type'] = 'multipart/alternative';
-            break;
-
-        case $html && !$attachments && !$html_images && !isset($this->_txtbody):
-                $headers['Content-Type'] = 'text/html';
-            break;
-
-        case $html && !$attachments && $html_images && !isset($this->_txtbody):
-                $headers['Content-Type'] = 'multipart/related';
-            break;
-
-        default:
-            return $headers;
+            case $text && !$attachments:
+                    $headers['Content-Type'] = 'text/plain';
+                break;
+
+            case !$text && !$html && $attachments:
+            case $text && $attachments:
+            case $html && $attachments && !$html_images:
+            case $html && $attachments && $html_images:
+                    $headers['Content-Type'] = 'multipart/mixed';
+                break;
+
+            case $html && !$attachments && !$html_images && isset($this->_txtbody):
+            case $html && !$attachments && $html_images && isset($this->_txtbody):
+                    $headers['Content-Type'] = 'multipart/alternative';
+                break;
+
+            case $html && !$attachments && !$html_images && !isset($this->_txtbody):
+                    $headers['Content-Type'] = 'text/html';
+                break;
+
+            case $html && !$attachments && $html_images && !isset($this->_txtbody):
+                    $headers['Content-Type'] = 'multipart/related';
+                break;
+
+            default:
+                return $headers;
         }
 
         $this->_checkParams();