From 039a3c410e82b2b335658208a9caaf569653f844 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 10 Nov 2008 15:12:07 -0700 Subject: [PATCH] More MIME->Mime conversions --- framework/Mime/lib/Horde/Mime/Viewer.php | 2 +- framework/Mime/lib/Horde/Mime/Viewer/Driver.php | 190 --------------------- framework/Mime/lib/Horde/Mime/Viewer/audio.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/css.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/deb.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/default.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/enriched.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/enscript.php | 8 +- framework/Mime/lib/Horde/Mime/Viewer/html.php | 8 +- framework/Mime/lib/Horde/Mime/Viewer/images.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/msexcel.php | 6 +- .../Mime/lib/Horde/Mime/Viewer/mspowerpoint.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/msword.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/ooo.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/pdf.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/php.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/plain.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/rar.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/report.php | 26 +-- framework/Mime/lib/Horde/Mime/Viewer/rfc822.php | 8 +- framework/Mime/lib/Horde/Mime/Viewer/richtext.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/rpm.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/rtf.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/security.php | 32 ++-- framework/Mime/lib/Horde/Mime/Viewer/simple.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/smil.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/source.php | 6 +- .../Mime/lib/Horde/Mime/Viewer/srchighlite.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/tgz.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/tnef.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/vcard.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/webcpp.php | 6 +- .../Mime/lib/Horde/Mime/Viewer/wordperfect.php | 6 +- framework/Mime/lib/Horde/Mime/Viewer/zip.php | 6 +- framework/Mime/lib/Horde/Mime/mime.magic.php | Bin 16939 -> 16925 bytes framework/Mime/lib/Horde/Mime/mime.mapping.php | 6 +- 36 files changed, 125 insertions(+), 317 deletions(-) delete mode 100644 framework/Mime/lib/Horde/Mime/Viewer/Driver.php diff --git a/framework/Mime/lib/Horde/Mime/Viewer.php b/framework/Mime/lib/Horde/Mime/Viewer.php index e45018976..9eec8882c 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer.php +++ b/framework/Mime/lib/Horde/Mime/Viewer.php @@ -26,7 +26,7 @@ class Horde_Mime_Viewer /** * The driver cache array. This array is shared between all instances of - * Horde_MIME_Viewer. + * Horde_Mime_Viewer. * * @var array */ diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Driver.php b/framework/Mime/lib/Horde/Mime/Viewer/Driver.php deleted file mode 100644 index fe70349c4..000000000 --- a/framework/Mime/lib/Horde/Mime/Viewer/Driver.php +++ /dev/null @@ -1,190 +0,0 @@ - - * @author Michael Slusarz - * @package Horde_MIME - */ -class Horde_MIME_Viewer_Driver -{ - /* 'type' constants for status info. */ - const WARNING = 1; - const INFO = 2; - - /** - * Viewer configuration. - * - * @var array - */ - protected $_conf = array(); - - /** - * The Horde_MIME_Part object to render. - * - * @var Horde_MIME_Part - */ - protected $_mimepart = null; - - /** - * Viewer parameters. - * - * @var array - */ - protected $_params = array(); - - /** - * Can this driver render various views? - * - * @var boolean - */ - protected $_canrender = array( - 'full' => false, - 'info' => false, - 'inline' => false, - ); - - /** - * Constructor. - * - * @param array $conf Configuration specific to the driver. - */ - function __construct($conf = array()) - { - $this->_conf = $conf; - } - - /** - * Sets the Horde_MIME_Part object for the class. - * - * @param Horde_MIME_Part &$mime_part Reference to an object with the - * information to be rendered. - */ - public function setMIMEPart(&$mime_part) - { - $this->_mimepart = $mime_part; - } - - /** - * Set parameters for use with this object. - * - * @param array $params An array of params to add to the internal - * params list. - */ - public function setParams($params = array()) - { - $this->_params = array_merge($this->_params, $params); - } - - /** - * Return the rendered version of the Horde_MIME_Part object. - * - * @return array TODO - */ - public function render() - { - return (is_null($this->_mimepart) || !$this->canDisplay()) - ? array('data' => '', 'status' => array(), 'type' => 'text/plain') - : $this->_render(); - } - - /** - * Return the rendered version of the Horde_MIME_Part object. - * - * @return string Rendered version of the Horde_MIME_Part object. - */ - protected function _render() - { - } - - /** - * Return the rendered inline version of the Horde_MIME_Part object. - * - * @return string Rendered version of the Horde_MIME_Part object. - */ - public function renderInline() - { - return (is_null($this->_mimepart) || !$this->canDisplayInline()) - ? array('data' => '', 'status' => array()) - : $this->_renderInline(); - } - - /** - * Return the rendered inline version of the Horde_MIME_Part object. - * - * @return string Rendered version of the Horde_MIME_Part object. - */ - protected function _renderInline() - { - } - - /** - * Return the rendered information about the Horde_MIME_Part object. - * - * @return string Rendered information on the Horde_MIME_Part object. - */ - public function renderInfo() - { - return (is_null($this->_mimepart) || !$this->canDisplayInfo()) - ? array('data' => '', 'status' => array()) - : $this->_renderInfo(); - } - - /** - * Return the rendered information about the Horde_MIME_Part object. - * - * @return string Rendered information on the Horde_MIME_Part object. - */ - protected function _renderInfo() - { - } - - /** - * Can this driver render the the data? - * - * @return boolean True if the driver can render data. - */ - public function canDisplay() - { - return $this->_canrender['full']; - } - - /** - * Can this driver render the the data inline? - * - * @return boolean True if the driver can display inline. - */ - public function canDisplayInline() - { - return $this->getConfigParam('inline') && $this->_canrender['inline']; - } - - /** - * Can this driver render the the data inline? - * - * @return boolean True if the driver can display inline. - */ - public function canDisplayInfo() - { - return $this->_canrender['info']; - } - - /** - * Return a configuration parameter for the current viewer. - * - * @param string $param The parameter name. - * - * @return mixed The value of the parameter; returns null if the - * parameter doesn't exist. - */ - public function getConfigParam($param) - { - return isset($this->_conf[$param]) ? $this->_conf[$param] : null; - } -} diff --git a/framework/Mime/lib/Horde/Mime/Viewer/audio.php b/framework/Mime/lib/Horde/Mime/Viewer/audio.php index df83fbeb6..edcd967f1 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/audio.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/audio.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_audio extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_audio extends Horde_Mime_Viewer_Driver { /** * Return the content-type. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/css.php b/framework/Mime/lib/Horde/Mime/Viewer/css.php index d11ebed79..a8575cb58 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/css.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/css.php @@ -3,7 +3,7 @@ require_once dirname(__FILE__) . '/source.php'; /** - * The Horde_MIME_Viewer_css class renders CSS source as HTML with an effort + * The Horde_Mime_Viewer_css class renders CSS source as HTML with an effort * to remove potentially malicious code. * * Copyright 2004-2008 The Horde Project (http://www.horde.org/) @@ -12,9 +12,9 @@ require_once dirname(__FILE__) . '/source.php'; * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Chuck Hagenbuch - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_css extends Horde_MIME_Viewer_source +class Horde_Mime_Viewer_css extends Horde_Mime_Viewer_source { /** * Render out the currently set contents. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/deb.php b/framework/Mime/lib/Horde/Mime/Viewer/deb.php index 7afdc97d9..d848f06e2 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/deb.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/deb.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_deb extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_deb extends Horde_Mime_Viewer_Driver { /** * Render the data. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/default.php b/framework/Mime/lib/Horde/Mime/Viewer/default.php index 4872f75f2..2d2b4bcc6 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/default.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/default.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_default extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_default extends Horde_Mime_Viewer_Driver { } diff --git a/framework/Mime/lib/Horde/Mime/Viewer/enriched.php b/framework/Mime/lib/Horde/Mime/Viewer/enriched.php index a46db587f..aff1ef42b 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/enriched.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/enriched.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_enriched extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_enriched extends Horde_Mime_Viewer_Driver { /** * Render out the currently set contents in HTML format. The diff --git a/framework/Mime/lib/Horde/Mime/Viewer/enscript.php b/framework/Mime/lib/Horde/Mime/Viewer/enscript.php index 7d3edb18b..533a63dd1 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/enscript.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/enscript.php @@ -3,7 +3,7 @@ require_once dirname(__FILE__) . '/source.php'; /** - * The Horde_MIME_Viewer_enscript class renders out various content in HTML + * The Horde_Mime_Viewer_enscript class renders out various content in HTML * format by using GNU Enscript. * * Copyright 1999-2008 The Horde Project (http://www.horde.org/) @@ -12,9 +12,9 @@ require_once dirname(__FILE__) . '/source.php'; * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Anil Madhavapeddy - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_enscript extends Horde_MIME_Viewer_source +class Horde_Mime_Viewer_enscript extends Horde_Mime_Viewer_source { /** * Render out the data using Enscript. @@ -74,7 +74,7 @@ class Horde_MIME_Viewer_enscript extends Horde_MIME_Viewer_source { include_once dirname(__FILE__) . '/../Magic.php'; - $ext = Horde_MIME_Magic::MIMEToExt($type); + $ext = Horde_Mime_Magic::MIMEToExt($type); switch ($ext) { case 'cs': diff --git a/framework/Mime/lib/Horde/Mime/Viewer/html.php b/framework/Mime/lib/Horde/Mime/Viewer/html.php index 946718713..47e42e9d3 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/html.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/html.php @@ -1,6 +1,6 @@ * @author Jon Parise * @author Michael Slusarz - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_html extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_html extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? @@ -159,7 +159,7 @@ class Horde_MIME_Viewer_html extends Horde_MIME_Viewer_Driver $status[] = array( 'text' => $phish_warning, - 'type' => self::WARNING + 'type' => 'warning' ); } diff --git a/framework/Mime/lib/Horde/Mime/Viewer/images.php b/framework/Mime/lib/Horde/Mime/Viewer/images.php index ced92d7b1..3cc13714a 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/images.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/images.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_images extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_images extends Horde_Mime_Viewer_Driver { /** * Return the content-type. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/msexcel.php b/framework/Mime/lib/Horde/Mime/Viewer/msexcel.php index 7b82a6417..fc79250ea 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/msexcel.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/msexcel.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_msexcel extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_msexcel extends Horde_Mime_Viewer_Driver { /** * Render out the currently data using xlhtml. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php b/framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php index 6bef4dec6..2d19fe018 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_mspowerpoint extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_mspowerpoint extends Horde_Mime_Viewer_Driver { /** * Render out the current data using ppthtml. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/msword.php b/framework/Mime/lib/Horde/Mime/Viewer/msword.php index 7892fb2dd..0b37cad95 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/msword.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/msword.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_msword extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_msword extends Horde_Mime_Viewer_Driver { /** * Render out the current data using wvWare. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo.php b/framework/Mime/lib/Horde/Mime/Viewer/ooo.php index 4c82e2de4..81689db81 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/ooo.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/ooo.php @@ -1,6 +1,6 @@ * @author Jan Schneider - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_ooo extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_ooo extends Horde_Mime_Viewer_Driver { /** * Render out the current data. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/pdf.php b/framework/Mime/lib/Horde/Mime/Viewer/pdf.php index 40e46eca7..a75f76148 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/pdf.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/pdf.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_pdf extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_pdf extends Horde_Mime_Viewer_Driver { /** * Return the content-type. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/php.php b/framework/Mime/lib/Horde/Mime/Viewer/php.php index 0c0095487..3113cce3f 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/php.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/php.php @@ -3,7 +3,7 @@ require_once dirname(__FILE__) . '/source.php'; /** - * The Horde_MIME_Viewer_php class renders out syntax-highlighted PHP code in + * The Horde_Mime_Viewer_php class renders out syntax-highlighted PHP code in * HTML format. * * Copyright 1999-2008 The Horde Project (http://www.horde.org/) @@ -12,9 +12,9 @@ require_once dirname(__FILE__) . '/source.php'; * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Chuck Hagenbuch - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_php extends Horde_MIME_Viewer_source +class Horde_Mime_Viewer_php extends Horde_Mime_Viewer_source { /** * Renders out the contents. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/plain.php b/framework/Mime/lib/Horde/Mime/Viewer/plain.php index 202f5ccaa..f667cba56 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/plain.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/plain.php @@ -1,6 +1,6 @@ * @author Michael Slusarz - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_plain extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_plain extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rar.php b/framework/Mime/lib/Horde/Mime/Viewer/rar.php index 5fe863aa1..37a031ce2 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/rar.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/rar.php @@ -1,6 +1,6 @@ * @author Michael Cochrane - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_rar extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_rar extends Horde_Mime_Viewer_Driver { /** * Rar compression methods. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/report.php b/framework/Mime/lib/Horde/Mime/Viewer/report.php index 89197e62e..e0ee24621 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/report.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/report.php @@ -1,7 +1,7 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_report extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_report extends Horde_Mime_Viewer_Driver { /** - * Stores the Horde_MIME_Viewer of the specified protocol. + * Stores the Horde_Mime_Viewer of the specified protocol. * - * @var Horde_MIME_Viewer + * @var Horde_Mime_Viewer */ protected $_viewer; @@ -29,12 +29,12 @@ class Horde_MIME_Viewer_report extends Horde_MIME_Viewer_Driver */ public function render($params = array()) { - /* Get the appropriate Horde_MIME_Viewer for the protocol specified. */ + /* Get the appropriate Horde_Mime_Viewer for the protocol specified. */ if (!($this->_resolveViewer())) { return; } - /* Render using the loaded Horde_MIME_Viewer object. */ + /* Render using the loaded Horde_Mime_Viewer object. */ return $this->_viewer->render($params); } @@ -45,7 +45,7 @@ class Horde_MIME_Viewer_report extends Horde_MIME_Viewer_Driver */ public function getType() { - /* Get the appropriate Horde_MIME_Viewer for the protocol specified. */ + /* Get the appropriate Horde_Mime_Viewer for the protocol specified. */ if (!($this->_resolveViewer())) { return 'application/octet-stream'; } else { @@ -54,9 +54,9 @@ class Horde_MIME_Viewer_report extends Horde_MIME_Viewer_Driver } /** - * Load a Horde_MIME_Viewer according to the report-type parameter stored + * Load a Horde_Mime_Viewer according to the report-type parameter stored * in the MIME_Part to render. If unsuccessful, try to load a generic - * multipart Horde_MIME_Viewer. + * multipart Horde_Mime_Viewer. * * @return boolean True on success, false on failure. */ @@ -66,7 +66,7 @@ class Horde_MIME_Viewer_report extends Horde_MIME_Viewer_Driver if (empty($this->_viewer)) { if (($type = $this->mime_part->getContentTypeParameter('report-type'))) { - $viewer = &Horde_MIME_Viewer::factory($this->mime_part, 'message/' . String::lower($type)); + $viewer = &Horde_Mime_Viewer::factory($this->mime_part, 'message/' . String::lower($type)); $type = $this->mime_part->getPrimaryType(); } else { /* If report-type is missing, the message is an improper @@ -77,7 +77,7 @@ class Horde_MIME_Viewer_report extends Horde_MIME_Viewer_Driver if (empty($viewer) || (String::lower(get_class($viewer)) == 'mime_viewer_default')) { - if (!($viewer = &Horde_MIME_Viewer::factory($this->mime_part, $type . '/*'))) { + if (!($viewer = &Horde_Mime_Viewer::factory($this->mime_part, $type . '/*'))) { return false; } } diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rfc822.php b/framework/Mime/lib/Horde/Mime/Viewer/rfc822.php index b8a10be20..808791458 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/rfc822.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/rfc822.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_rfc822 extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_rfc822 extends Horde_Mime_Viewer_Driver { /** * Render out the currently set contents. @@ -62,7 +62,7 @@ class Horde_MIME_Viewer_rfc822 extends Horde_MIME_Viewer_Driver /* Get the list of headers now. */ require_once 'Horde/MIME/Headers.php'; - $headers = Horde_MIME_Headers::parseHeaders($text); + $headers = Horde_Mime_Headers::parseHeaders($text); $header_array = array( 'date' => _("Date"), diff --git a/framework/Mime/lib/Horde/Mime/Viewer/richtext.php b/framework/Mime/lib/Horde/Mime/Viewer/richtext.php index e8c696565..aae76b428 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/richtext.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/richtext.php @@ -1,6 +1,6 @@ " to @@ -30,9 +30,9 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Michael Slusarz - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_richtext extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_richtext extends Horde_Mime_Viewer_Driver { /** * Render out the currently set contents in HTML format. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rpm.php b/framework/Mime/lib/Horde/Mime/Viewer/rpm.php index 5c12665b6..8d99d2a8e 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/rpm.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/rpm.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_rpm extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_rpm extends Horde_Mime_Viewer_Driver { /** * Render out the RPM contents. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rtf.php b/framework/Mime/lib/Horde/Mime/Viewer/rtf.php index e48e63466..b7e9001b6 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/rtf.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/rtf.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_rtf extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_rtf extends Horde_Mime_Viewer_Driver { /** * Render out the current data using UnRTF. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/security.php b/framework/Mime/lib/Horde/Mime/Viewer/security.php index 480b6e441..c898eaafa 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/security.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/security.php @@ -1,7 +1,7 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_security extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_security extends Horde_Mime_Viewer_Driver { /** - * Stores the Horde_MIME_Viewer of the specified security protocol. + * Stores the Horde_Mime_Viewer of the specified security protocol. * - * @var Horde_MIME_Viewer + * @var Horde_Mime_Viewer */ protected $_viewer; /** * The $mime_part class variable has the information to render - * out, encapsulated in a Horde_MIME_Part object. + * out, encapsulated in a Horde_Mime_Part object. * * @param $params mixed The parameters (if any) to pass to the underlying - * Horde_MIME_Viewer. + * Horde_Mime_Viewer. * * @return string Rendering of the content. */ public function render($params = array()) { - /* Get the appropriate Horde_MIME_Viewer for the protocol specified. */ + /* Get the appropriate Horde_Mime_Viewer for the protocol specified. */ if (!($this->_resolveViewer())) { return; } - /* Render using the loaded Horde_MIME_Viewer object. */ + /* Render using the loaded Horde_Mime_Viewer object. */ return $this->_viewer->render($params); } @@ -48,7 +48,7 @@ class Horde_MIME_Viewer_security extends Horde_MIME_Viewer_Driver */ public function getType() { - /* Get the appropriate Horde_MIME_Viewer for the protocol specified. */ + /* Get the appropriate Horde_Mime_Viewer for the protocol specified. */ if (!($this->_resolveViewer())) { return 'application/octet-stream'; } else { @@ -57,9 +57,9 @@ class Horde_MIME_Viewer_security extends Horde_MIME_Viewer_Driver } /** - * Load a Horde_MIME_Viewer according to the protocol parameter stored - * in the Horde_MIME_Part to render. If unsuccessful, try to load a generic - * multipart Horde_MIME_Viewer. + * Load a Horde_Mime_Viewer according to the protocol parameter stored + * in the Horde_Mime_Part to render. If unsuccessful, try to load a generic + * multipart Horde_Mime_Viewer. * * @return boolean True on success, false on failure. */ @@ -72,10 +72,10 @@ class Horde_MIME_Viewer_security extends Horde_MIME_Viewer_Driver if (empty($protocol)) { return false; } - $viewer = &Horde_MIME_Viewer::factory($this->mime_part, $protocol); + $viewer = &Horde_Mime_Viewer::factory($this->mime_part, $protocol); if (empty($viewer) || (String::lower(get_class($viewer)) == 'mime_viewer_default')) { - $viewer = &Horde_MIME_Viewer::factory($this->mime_part, $this->mime_part->getPrimaryType() . '/*'); + $viewer = &Horde_Mime_Viewer::factory($this->mime_part, $this->mime_part->getPrimaryType() . '/*'); if (empty($viewer)) { return false; } diff --git a/framework/Mime/lib/Horde/Mime/Viewer/simple.php b/framework/Mime/lib/Horde/Mime/Viewer/simple.php index d2eecd342..a416a6787 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/simple.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/simple.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_simple extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_simple extends Horde_Mime_Viewer_Driver { /** * Return the MIME type of the rendered content. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/smil.php b/framework/Mime/lib/Horde/Mime/Viewer/smil.php index 8f521a481..e5078f1d3 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/smil.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/smil.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_smil extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_smil extends Horde_Mime_Viewer_Driver { /** * Handle for the XML parser object. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/source.php b/framework/Mime/lib/Horde/Mime/Viewer/source.php index 336946be5..cbd163976 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/source.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/source.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_source extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_source extends Horde_Mime_Viewer_Driver { /** * Add line numbers to a block of code. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php b/framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php index aa04725a7..0f1ea38a1 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php @@ -3,7 +3,7 @@ require_once dirname(__FILE__) . '/source.php'; /** - * The Horde_MIME_Viewer_srchighlite class renders out various content in HTML + * The Horde_Mime_Viewer_srchighlite class renders out various content in HTML * format by using Source-highlight. * * Source-highlight: http://www.gnu.org/software/src-highlite/ @@ -14,9 +14,9 @@ require_once dirname(__FILE__) . '/source.php'; * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Mike Cochrane - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_srchighlite extends Horde_MIME_Viewer_source +class Horde_Mime_Viewer_srchighlite extends Horde_Mime_Viewer_source { /** * Render out the currently set contents using Source-highlight diff --git a/framework/Mime/lib/Horde/Mime/Viewer/tgz.php b/framework/Mime/lib/Horde/Mime/Viewer/tgz.php index 4bd76649d..a49595b3c 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/tgz.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/tgz.php @@ -4,7 +4,7 @@ require_once 'Horde/Compress.php'; require_once 'Horde/Text.php'; /** - * The Horde_MIME_Viewer_tgz class renders out plain or gzipped tarballs in + * The Horde_Mime_Viewer_tgz class renders out plain or gzipped tarballs in * HTML. * * See the enclosed file COPYING for license information (LGPL). If you @@ -12,9 +12,9 @@ require_once 'Horde/Text.php'; * * @author Anil Madhavapeddy * @author Michael Cochrane - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_tgz extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_tgz extends Horde_Mime_Viewer_Driver { /** * Render out the currently set tar file contents. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/tnef.php b/framework/Mime/lib/Horde/Mime/Viewer/tnef.php index 64856df00..bc26393bd 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/tnef.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/tnef.php @@ -1,6 +1,6 @@ * @author Michael Slusarz - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_tnef extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_tnef extends Horde_Mime_Viewer_Driver { /** * Render out the current tnef data. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/vcard.php b/framework/Mime/lib/Horde/Mime/Viewer/vcard.php index b116eb8b3..adaa98289 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/vcard.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/vcard.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_vcard extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_vcard extends Horde_Mime_Viewer_Driver { /** * Render out the vcard contents. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/webcpp.php b/framework/Mime/lib/Horde/Mime/Viewer/webcpp.php index 6c4ad0da8..756479ec1 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/webcpp.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/webcpp.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_webcpp extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_webcpp extends Horde_Mime_Viewer_Driver { /** * Render out the currently set contents using Web C Plus Plus. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php b/framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php index c65184cc3..588af5232 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php @@ -1,6 +1,6 @@ - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_wordperfect extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_wordperfect extends Horde_Mime_Viewer_Driver { /** * Render out the current data using wpd2html. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/zip.php b/framework/Mime/lib/Horde/Mime/Viewer/zip.php index ebdca0b94..ef824211f 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/zip.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/zip.php @@ -1,6 +1,6 @@ * @author Michael Cochrane - * @package Horde_MIME_Viewer + * @package Horde_Mime_Viewer */ -class Horde_MIME_Viewer_zip extends Horde_MIME_Viewer_Driver +class Horde_Mime_Viewer_zip extends Horde_Mime_Viewer_Driver { /** * Render out the current zip contents. diff --git a/framework/Mime/lib/Horde/Mime/mime.magic.php b/framework/Mime/lib/Horde/Mime/mime.magic.php index d63efbea09f4cc734dce2bf740fd41a496a448b3..0ee89d226e1f174b769fe6c51f12f9e2ca131f53 100644 GIT binary patch delta 23 ccmZ48!Z^2uae^9iW^U?4O$89OG3uft0AouCd;kCd delta 37 qcmbQ+!nnGHae^ANr?2ZoO$9+9#igJHL<%Y%`9&$IDjR(+IsyR5$_l;! diff --git a/framework/Mime/lib/Horde/Mime/mime.mapping.php b/framework/Mime/lib/Horde/Mime/mime.mapping.php index 82aebacea..d0ae80e18 100644 --- a/framework/Mime/lib/Horde/Mime/mime.mapping.php +++ b/framework/Mime/lib/Horde/Mime/mime.mapping.php @@ -10,9 +10,7 @@ * Any unknown file extensions will automatically be mapped to * 'x-extension/' where is the unknown file extension. * - * @package Horde_MIME - * - * $Horde: framework/MIME/MIME/mime.mapping.php,v 1.18 2008/11/06 04:33:47 chuck Exp $ + * @package Horde_Mime * * Generated: 11/05/08 23:30:23 by chuck on technest.org */ @@ -891,4 +889,4 @@ $mime_extension_map = array( 'wk3' => 'application/vnd.lotus-1-2-3', 'abw' => 'application/x-abiword', 'pict1' => 'image/x-pict' -); \ No newline at end of file +); -- 2.11.0