Pass detected Content-Type to iTip handler.

When displaying the attachment summary, we try to detect the real MIME type if it has been specified as octet-stream. This works fine and the correct MIME viewer is loaded. But this detected content type hasn't been passed further on to the iTip Ajax handler, so it tried to import those components with the original octet-stream content type while the applications' APIs expected actually supported type.
horde · Nov 23, 2016 · f9a59b2 · f9a59b2
1 parent 7a99f25
commit f9a59b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/imp/lib/Ajax/Imple/ItipRequest.php b/imp/lib/Ajax/Imple/ItipRequest.php
@@ -41,8 +41,9 @@ public function __construct(array $params = array())
     protected function _attach($init)
     {
         return array(
+            'ctype' => $this->_params['ctype'],
             'mime_id' => $this->_params['mime_id'],
-            'muid' => $this->_params['muid']
+            'muid' => $this->_params['muid'],
         );
     }
 
@@ -69,7 +70,12 @@ protected function _handle(Horde_Variables $vars)
             $mime_part = $contents->getMIMEPart($vars->mime_id);
             if (empty($mime_part)) {
                 throw new IMP_Exception(_("Cannot retrieve calendar data from message."));
-            } elseif (!$vCal->parsevCalendar($mime_part->getContents(), 'VCALENDAR', $mime_part->getCharset())) {
+            }
+            if ($vars->ctype) {
+                $mime_part = clone $mime_part;
+                $mime_part->setType($vars->ctype);
+            }
+            if (!$vCal->parsevCalendar($mime_part->getContents(), 'VCALENDAR', $mime_part->getCharset())) {
                 throw new IMP_Exception(_("The calendar data is invalid"));
             }
 

diff --git a/imp/lib/Factory/MimeViewer.php b/imp/lib/Factory/MimeViewer.php
@@ -114,6 +114,7 @@ public function getViewerConfig($type, $app)
         }
 
         $params['imp_contents'] = $this->_contents;
+        $params['type'] = $type;
 
         return array($driver, $params);
     }

diff --git a/imp/lib/Mime/Viewer/Itip.php b/imp/lib/Mime/Viewer/Itip.php
@@ -106,8 +106,9 @@ protected function _renderInline()
         }
 
         $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create('IMP_Ajax_Imple_ItipRequest', array(
+            'ctype' => $this->_conf['type'],
             'mime_id' => $mime_id,
-            'muid' => strval($imp_contents->getIndicesOb())
+            'muid' => strval($imp_contents->getIndicesOb()),
         ));
 
         // Get the method type.