From a4b998108570ae725f783cad48c955df39bf6155 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 10 Mar 2009 15:58:05 -0600 Subject: [PATCH] Convert drivers to Horde 4 package format. Remove some unneeded require/include and remove unrequired packages from package.xml. --- framework/Mime/lib/Horde/Mime/Mail.php | 1 - framework/Mime/lib/Horde/Mime/Mdn.php | 4 - framework/Mime/lib/Horde/Mime/Part.php | 1 - framework/Mime/lib/Horde/Mime/Viewer.php | 5 +- .../lib/Horde/Mime/Viewer/{audio.php => Audio.php} | 4 +- .../lib/Horde/Mime/Viewer/{css.php => Css.php} | 7 +- .../lib/Horde/Mime/Viewer/{deb.php => Deb.php} | 4 +- .../Horde/Mime/Viewer/{default.php => Default.php} | 6 +- .../Mime/Viewer/{enriched.php => Enriched.php} | 4 +- .../Mime/Viewer/{enscript.php => Enscript.php} | 8 +- .../lib/Horde/Mime/Viewer/{html.php => Html.php} | 4 +- .../Horde/Mime/Viewer/{images.php => Images.php} | 4 +- .../Horde/Mime/Viewer/{msexcel.php => Msexcel.php} | 4 +- .../Viewer/{mspowerpoint.php => Mspowerpoint.php} | 4 +- .../Horde/Mime/Viewer/{msword.php => Msword.php} | 4 +- .../lib/Horde/Mime/Viewer/{ooo.php => Ooo.php} | 7 +- .../lib/Horde/Mime/Viewer/{ooo => Ooo}/common.xsl | 0 .../Mime/Viewer/{ooo => Ooo}/global_document.xsl | 0 .../Horde/Mime/Viewer/{ooo => Ooo}/main_html.xsl | 0 .../lib/Horde/Mime/Viewer/{ooo => Ooo}/palm.xsl | 0 .../Mime/Viewer/{ooo => Ooo}/style_header.xsl | 0 .../Mime/Viewer/{ooo => Ooo}/style_inlined.xsl | 0 .../Mime/Viewer/{ooo => Ooo}/style_mapping.xsl | 0 .../lib/Horde/Mime/Viewer/{ooo => Ooo}/table.xsl | 0 .../Horde/Mime/Viewer/{ooo => Ooo}/table_cells.xsl | 0 .../Mime/Viewer/{ooo => Ooo}/table_columns.xsl | 0 .../Horde/Mime/Viewer/{ooo => Ooo}/table_rows.xsl | 0 .../lib/Horde/Mime/Viewer/{pdf.php => Pdf.php} | 4 +- .../lib/Horde/Mime/Viewer/{php.php => Php.php} | 4 +- .../lib/Horde/Mime/Viewer/{plain.php => Plain.php} | 4 +- .../lib/Horde/Mime/Viewer/{rar.php => Rar.php} | 5 +- .../Horde/Mime/Viewer/{report.php => Report.php} | 4 +- .../Horde/Mime/Viewer/{rfc822.php => Rfc822.php} | 4 +- .../Mime/Viewer/{richtext.php => Richtext.php} | 4 +- .../lib/Horde/Mime/Viewer/{rpm.php => Rpm.php} | 4 +- .../lib/Horde/Mime/Viewer/{rtf.php => Rtf.php} | 9 +- .../Mime/Viewer/{security.php => Security.php} | 4 +- .../Horde/Mime/Viewer/{simple.php => Simple.php} | 4 +- .../lib/Horde/Mime/Viewer/{smil.php => Smil.php} | 4 +- .../Horde/Mime/Viewer/{source.php => Source.php} | 4 +- .../Viewer/{srchighlite.php => Srchighlite.php} | 7 +- .../lib/Horde/Mime/Viewer/{tgz.php => Tgz.php} | 4 +- .../lib/Horde/Mime/Viewer/{tnef.php => Tnef.php} | 5 +- .../lib/Horde/Mime/Viewer/{vcard.php => Vcard.php} | 5 +- .../Horde/Mime/Viewer/{webcpp.php => Webcpp.php} | 5 +- .../Viewer/{wordperfect.php => Wordperfect.php} | 4 +- .../lib/Horde/Mime/Viewer/{zip.php => Zip.php} | 5 +- framework/Mime/package.xml | 140 ++++++++++----------- 48 files changed, 136 insertions(+), 168 deletions(-) rename framework/Mime/lib/Horde/Mime/Viewer/{audio.php => Audio.php} (89%) rename framework/Mime/lib/Horde/Mime/Viewer/{css.php => Css.php} (95%) rename framework/Mime/lib/Horde/Mime/Viewer/{deb.php => Deb.php} (94%) rename framework/Mime/lib/Horde/Mime/Viewer/{default.php => Default.php} (75%) rename framework/Mime/lib/Horde/Mime/Viewer/{enriched.php => Enriched.php} (98%) rename framework/Mime/lib/Horde/Mime/Viewer/{enscript.php => Enscript.php} (94%) rename framework/Mime/lib/Horde/Mime/Viewer/{html.php => Html.php} (98%) rename framework/Mime/lib/Horde/Mime/Viewer/{images.php => Images.php} (92%) rename framework/Mime/lib/Horde/Mime/Viewer/{msexcel.php => Msexcel.php} (92%) rename framework/Mime/lib/Horde/Mime/Viewer/{mspowerpoint.php => Mspowerpoint.php} (92%) rename framework/Mime/lib/Horde/Mime/Viewer/{msword.php => Msword.php} (93%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo.php => Ooo.php} (94%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/common.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/global_document.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/main_html.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/palm.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/style_header.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/style_inlined.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/style_mapping.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/table.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/table_cells.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/table_columns.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{ooo => Ooo}/table_rows.xsl (100%) rename framework/Mime/lib/Horde/Mime/Viewer/{pdf.php => Pdf.php} (90%) rename framework/Mime/lib/Horde/Mime/Viewer/{php.php => Php.php} (97%) rename framework/Mime/lib/Horde/Mime/Viewer/{plain.php => Plain.php} (95%) rename framework/Mime/lib/Horde/Mime/Viewer/{rar.php => Rar.php} (95%) rename framework/Mime/lib/Horde/Mime/Viewer/{report.php => Report.php} (87%) rename framework/Mime/lib/Horde/Mime/Viewer/{rfc822.php => Rfc822.php} (95%) rename framework/Mime/lib/Horde/Mime/Viewer/{richtext.php => Richtext.php} (98%) rename framework/Mime/lib/Horde/Mime/Viewer/{rpm.php => Rpm.php} (93%) rename framework/Mime/lib/Horde/Mime/Viewer/{rtf.php => Rtf.php} (87%) rename framework/Mime/lib/Horde/Mime/Viewer/{security.php => Security.php} (88%) rename framework/Mime/lib/Horde/Mime/Viewer/{simple.php => Simple.php} (92%) rename framework/Mime/lib/Horde/Mime/Viewer/{smil.php => Smil.php} (95%) rename framework/Mime/lib/Horde/Mime/Viewer/{source.php => Source.php} (88%) rename framework/Mime/lib/Horde/Mime/Viewer/{srchighlite.php => Srchighlite.php} (95%) rename framework/Mime/lib/Horde/Mime/Viewer/{tgz.php => Tgz.php} (96%) rename framework/Mime/lib/Horde/Mime/Viewer/{tnef.php => Tnef.php} (92%) rename framework/Mime/lib/Horde/Mime/Viewer/{vcard.php => Vcard.php} (98%) rename framework/Mime/lib/Horde/Mime/Viewer/{webcpp.php => Webcpp.php} (94%) rename framework/Mime/lib/Horde/Mime/Viewer/{wordperfect.php => Wordperfect.php} (93%) rename framework/Mime/lib/Horde/Mime/Viewer/{zip.php => Zip.php} (96%) diff --git a/framework/Mime/lib/Horde/Mime/Mail.php b/framework/Mime/lib/Horde/Mime/Mail.php index 9fa7f793d..129dda908 100644 --- a/framework/Mime/lib/Horde/Mime/Mail.php +++ b/framework/Mime/lib/Horde/Mime/Mail.php @@ -286,7 +286,6 @@ class Horde_Mime_Mail } if (empty($type)) { - require_once dirname(__FILE__) . '/Magic.php'; $type = Horde_Mime_Magic::filenameToMime($file, false); } diff --git a/framework/Mime/lib/Horde/Mime/Mdn.php b/framework/Mime/lib/Horde/Mime/Mdn.php index 54ecc9a22..fe8abc887 100644 --- a/framework/Mime/lib/Horde/Mime/Mdn.php +++ b/framework/Mime/lib/Horde/Mime/Mdn.php @@ -69,8 +69,6 @@ class Horde_Mime_Mdn return true; } - require_once dirname(__FILE__) . '/Address.php'; - /* RFC 3798 [2.1]: Explicit confirmation is needed if there is more * than one distinct address in the Disposition-Notification-To * header. */ @@ -145,8 +143,6 @@ class Horde_Mime_Mdn $mailparams = array(), $mod = array(), $err = array()) { - require_once dirname(__FILE__) . '/Headers.php'; - require_once dirname(__FILE__) . '/Part.php'; require_once 'Horde/Identity.php'; require_once 'Horde/Text.php'; diff --git a/framework/Mime/lib/Horde/Mime/Part.php b/framework/Mime/lib/Horde/Mime/Part.php index dc9c56acd..707cdacb0 100644 --- a/framework/Mime/lib/Horde/Mime/Part.php +++ b/framework/Mime/lib/Horde/Mime/Part.php @@ -1,7 +1,6 @@ applications[$app]['fileroot'] . '/lib/Mime/Viewer/' . $driver . '.php'; - require_once dirname(__FILE__) . '/Viewer/Driver.php'; - return require_once $file; } diff --git a/framework/Mime/lib/Horde/Mime/Viewer/audio.php b/framework/Mime/lib/Horde/Mime/Viewer/Audio.php similarity index 89% rename from framework/Mime/lib/Horde/Mime/Viewer/audio.php rename to framework/Mime/lib/Horde/Mime/Viewer/Audio.php index 317c93679..21ea21eb4 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 */ -class Horde_Mime_Viewer_audio extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Audio extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/css.php b/framework/Mime/lib/Horde/Mime/Viewer/Css.php similarity index 95% rename from framework/Mime/lib/Horde/Mime/Viewer/css.php rename to framework/Mime/lib/Horde/Mime/Viewer/Css.php index de16c9dc6..782a429da 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/css.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Css.php @@ -1,9 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_css extends Horde_Mime_Viewer_source +class Horde_Mime_Viewer_Css extends Horde_Mime_Viewer_Source { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/deb.php b/framework/Mime/lib/Horde/Mime/Viewer/Deb.php similarity index 94% rename from framework/Mime/lib/Horde/Mime/Viewer/deb.php rename to framework/Mime/lib/Horde/Mime/Viewer/Deb.php index a942f3832..59b61d72b 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 */ -class Horde_Mime_Viewer_deb extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Deb extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/default.php b/framework/Mime/lib/Horde/Mime/Viewer/Default.php similarity index 75% rename from framework/Mime/lib/Horde/Mime/Viewer/default.php rename to framework/Mime/lib/Horde/Mime/Viewer/Default.php index 35f06ccb1..64b7421b9 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 */ -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 similarity index 98% rename from framework/Mime/lib/Horde/Mime/Viewer/enriched.php rename to framework/Mime/lib/Horde/Mime/Viewer/Enriched.php index cea2e472b..aadc37077 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 */ -class Horde_Mime_Viewer_enriched extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Enriched extends Horde_Mime_Viewer_Driver { /** * This driver's capabilities. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/enscript.php b/framework/Mime/lib/Horde/Mime/Viewer/Enscript.php similarity index 94% rename from framework/Mime/lib/Horde/Mime/Viewer/enscript.php rename to framework/Mime/lib/Horde/Mime/Viewer/Enscript.php index 6f1b10d67..e8df9e2fc 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/enscript.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Enscript.php @@ -1,9 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_enscript extends Horde_Mime_Viewer_source +class Horde_Mime_Viewer_Enscript extends Horde_Mime_Viewer_Source { /** * Can this driver render various views? @@ -109,7 +106,6 @@ class Horde_Mime_Viewer_enscript extends Horde_Mime_Viewer_source */ protected function _typeToLang($type) { - include_once dirname(__FILE__) . '/../Magic.php'; $ext = Horde_Mime_Magic::MIMEToExt($type); switch ($ext) { diff --git a/framework/Mime/lib/Horde/Mime/Viewer/html.php b/framework/Mime/lib/Horde/Mime/Viewer/Html.php similarity index 98% rename from framework/Mime/lib/Horde/Mime/Viewer/html.php rename to framework/Mime/lib/Horde/Mime/Viewer/Html.php index 0008b4de3..acc3127aa 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/html.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Html.php @@ -1,6 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_images extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Images extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/msexcel.php b/framework/Mime/lib/Horde/Mime/Viewer/Msexcel.php similarity index 92% rename from framework/Mime/lib/Horde/Mime/Viewer/msexcel.php rename to framework/Mime/lib/Horde/Mime/Viewer/Msexcel.php index 56b8f344f..6aab1e76b 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 */ -class Horde_Mime_Viewer_msexcel extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Msexcel extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php b/framework/Mime/lib/Horde/Mime/Viewer/Mspowerpoint.php similarity index 92% rename from framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php rename to framework/Mime/lib/Horde/Mime/Viewer/Mspowerpoint.php index f72c455d4..31144b621 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 */ -class Horde_Mime_Viewer_mspowerpoint extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Mspowerpoint extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/msword.php b/framework/Mime/lib/Horde/Mime/Viewer/Msword.php similarity index 93% rename from framework/Mime/lib/Horde/Mime/Viewer/msword.php rename to framework/Mime/lib/Horde/Mime/Viewer/Msword.php index 945ee9b62..5a17a714f 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 */ -class Horde_Mime_Viewer_msword extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Msword extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo.php b/framework/Mime/lib/Horde/Mime/Viewer/Ooo.php similarity index 94% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo.php rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo.php index 8554b3824..bd14885c7 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/ooo.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Ooo.php @@ -1,6 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_ooo extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Ooo extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? @@ -49,7 +49,6 @@ class Horde_Mime_Viewer_ooo extends Horde_Mime_Viewer_Driver 'table:number-columns-spanned=' => 'colspan=' ); - require_once 'Horde/Compress.php'; $zip = &Horde_Compress::singleton('zip'); $list = $zip->decompress($this->_mimepart->getContents(), array('action' => HORDE_COMPRESS_ZIP_LIST)); @@ -79,7 +78,7 @@ class Horde_Mime_Viewer_ooo extends Horde_Mime_Viewer_Driver return array(); } - $xsl_file = dirname(__FILE__) . '/ooo/main_html.xsl'; + $xsl_file = dirname(__FILE__) . '/Ooo/main_html.xsl'; if ($has_ssfile) { /* Use DOMXML */ diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/common.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/common.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/common.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/common.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/global_document.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/global_document.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/global_document.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/global_document.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/main_html.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/main_html.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/main_html.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/main_html.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/palm.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/palm.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/palm.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/palm.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/style_header.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/style_header.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/style_header.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/style_header.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/style_inlined.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/style_inlined.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/style_inlined.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/style_inlined.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/style_mapping.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/style_mapping.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/style_mapping.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/style_mapping.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/table.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/table.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/table.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/table.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/table_cells.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/table_cells.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/table_cells.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/table_cells.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/table_columns.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/table_columns.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/table_columns.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/table_columns.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo/table_rows.xsl b/framework/Mime/lib/Horde/Mime/Viewer/Ooo/table_rows.xsl similarity index 100% rename from framework/Mime/lib/Horde/Mime/Viewer/ooo/table_rows.xsl rename to framework/Mime/lib/Horde/Mime/Viewer/Ooo/table_rows.xsl diff --git a/framework/Mime/lib/Horde/Mime/Viewer/pdf.php b/framework/Mime/lib/Horde/Mime/Viewer/Pdf.php similarity index 90% rename from framework/Mime/lib/Horde/Mime/Viewer/pdf.php rename to framework/Mime/lib/Horde/Mime/Viewer/Pdf.php index 1260a2a9e..4305a1108 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 */ -class Horde_Mime_Viewer_pdf extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Pdf extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/php.php b/framework/Mime/lib/Horde/Mime/Viewer/Php.php similarity index 97% rename from framework/Mime/lib/Horde/Mime/Viewer/php.php rename to framework/Mime/lib/Horde/Mime/Viewer/Php.php index b9b620e0a..3fd275353 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/php.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Php.php @@ -1,6 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_php extends Horde_Mime_Viewer_source +class Horde_Mime_Viewer_Php extends Horde_Mime_Viewer_source { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/plain.php b/framework/Mime/lib/Horde/Mime/Viewer/Plain.php similarity index 95% rename from framework/Mime/lib/Horde/Mime/Viewer/plain.php rename to framework/Mime/lib/Horde/Mime/Viewer/Plain.php index 138e92baf..57ae876e3 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/plain.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Plain.php @@ -1,6 +1,6 @@ * @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 similarity index 95% rename from framework/Mime/lib/Horde/Mime/Viewer/rar.php rename to framework/Mime/lib/Horde/Mime/Viewer/Rar.php index c85f8d35a..261c725a9 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/rar.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Rar.php @@ -1,6 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_rar extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Rar extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? @@ -51,7 +51,6 @@ class Horde_Mime_Viewer_rar extends Horde_Mime_Viewer_Driver { $contents = $this->_mimepart->getContents(); - require_once 'Horde/Compress.php'; $rar = &Horde_Compress::singleton('rar'); $rarData = $rar->decompress($contents); diff --git a/framework/Mime/lib/Horde/Mime/Viewer/report.php b/framework/Mime/lib/Horde/Mime/Viewer/Report.php similarity index 87% rename from framework/Mime/lib/Horde/Mime/Viewer/report.php rename to framework/Mime/lib/Horde/Mime/Viewer/Report.php index 11010c8bc..2b0200165 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/report.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Report.php @@ -1,6 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_report extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Report extends Horde_Mime_Viewer_Driver { /** * Return the underlying MIME Viewer for this part. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rfc822.php b/framework/Mime/lib/Horde/Mime/Viewer/Rfc822.php similarity index 95% rename from framework/Mime/lib/Horde/Mime/Viewer/rfc822.php rename to framework/Mime/lib/Horde/Mime/Viewer/Rfc822.php index 97a2c5ed8..57df4bc34 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 */ -class Horde_Mime_Viewer_rfc822 extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Rfc822 extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/richtext.php b/framework/Mime/lib/Horde/Mime/Viewer/Richtext.php similarity index 98% rename from framework/Mime/lib/Horde/Mime/Viewer/richtext.php rename to framework/Mime/lib/Horde/Mime/Viewer/Richtext.php index 5f14e4721..4aae86b77 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/richtext.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Richtext.php @@ -1,6 +1,6 @@ " to @@ -32,7 +32,7 @@ * @author Michael Slusarz * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_richtext extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Richtext extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rpm.php b/framework/Mime/lib/Horde/Mime/Viewer/Rpm.php similarity index 93% rename from framework/Mime/lib/Horde/Mime/Viewer/rpm.php rename to framework/Mime/lib/Horde/Mime/Viewer/Rpm.php index 4c15c4555..698cde66b 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 */ -class Horde_Mime_Viewer_rpm extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Rpm extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rtf.php b/framework/Mime/lib/Horde/Mime/Viewer/Rtf.php similarity index 87% rename from framework/Mime/lib/Horde/Mime/Viewer/rtf.php rename to framework/Mime/lib/Horde/Mime/Viewer/Rtf.php index 2da5d1feb..c4573da6a 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/rtf.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Rtf.php @@ -1,8 +1,9 @@ * @@ -12,7 +13,7 @@ * @author Duck * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_rtf extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Rtf extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/security.php b/framework/Mime/lib/Horde/Mime/Viewer/Security.php similarity index 88% rename from framework/Mime/lib/Horde/Mime/Viewer/security.php rename to framework/Mime/lib/Horde/Mime/Viewer/Security.php index f66851f30..2600ba547 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/security.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Security.php @@ -1,6 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_security extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Security extends Horde_Mime_Viewer_Driver { /** * Return the underlying MIME Viewer for this part. diff --git a/framework/Mime/lib/Horde/Mime/Viewer/simple.php b/framework/Mime/lib/Horde/Mime/Viewer/Simple.php similarity index 92% rename from framework/Mime/lib/Horde/Mime/Viewer/simple.php rename to framework/Mime/lib/Horde/Mime/Viewer/Simple.php index c42ae5652..aa4a15701 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 */ -class Horde_Mime_Viewer_simple extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Simple extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/smil.php b/framework/Mime/lib/Horde/Mime/Viewer/Smil.php similarity index 95% rename from framework/Mime/lib/Horde/Mime/Viewer/smil.php rename to framework/Mime/lib/Horde/Mime/Viewer/Smil.php index 1df1f213a..327059745 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 */ -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 similarity index 88% rename from framework/Mime/lib/Horde/Mime/Viewer/source.php rename to framework/Mime/lib/Horde/Mime/Viewer/Source.php index c1c16a0a4..bddc95cad 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 */ -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 similarity index 95% rename from framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php rename to framework/Mime/lib/Horde/Mime/Viewer/Srchighlite.php index bbcc5d200..af4e77eca 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Srchighlite.php @@ -1,9 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_srchighlite extends Horde_Mime_Viewer_source +class Horde_Mime_Viewer_Srchighlite extends Horde_Mime_Viewer_Source { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/tgz.php b/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php similarity index 96% rename from framework/Mime/lib/Horde/Mime/Viewer/tgz.php rename to framework/Mime/lib/Horde/Mime/Viewer/Tgz.php index d12822763..cbfd711e0 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/tgz.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php @@ -1,6 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_tgz extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/tnef.php b/framework/Mime/lib/Horde/Mime/Viewer/Tnef.php similarity index 92% rename from framework/Mime/lib/Horde/Mime/Viewer/tnef.php rename to framework/Mime/lib/Horde/Mime/Viewer/Tnef.php index 81ac09c73..373ee9157 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/tnef.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Tnef.php @@ -1,6 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_tnef extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Tnef extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? @@ -49,7 +49,6 @@ class Horde_Mime_Viewer_tnef extends Horde_Mime_Viewer_Driver */ protected function _renderInline() { - require_once 'Horde/Compress.php'; $tnef = &Horde_Compress::singleton('tnef'); $data = ''; diff --git a/framework/Mime/lib/Horde/Mime/Viewer/vcard.php b/framework/Mime/lib/Horde/Mime/Viewer/Vcard.php similarity index 98% rename from framework/Mime/lib/Horde/Mime/Viewer/vcard.php rename to framework/Mime/lib/Horde/Mime/Viewer/Vcard.php index 2932b9508..e7a7c3b84 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 */ -class Horde_Mime_Viewer_vcard extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Vcard extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? @@ -57,7 +57,6 @@ class Horde_Mime_Viewer_vcard extends Horde_Mime_Viewer_Driver $import_msg = null; $title = _("vCard"); - require_once 'Horde/iCalendar.php'; $iCal = new Horde_iCalendar(); if (!$iCal->parsevCalendar($data, 'VCALENDAR', $this->_mimepart->getCharset())) { $notification->push(_("There was an error reading the contact data."), 'horde.error'); diff --git a/framework/Mime/lib/Horde/Mime/Viewer/webcpp.php b/framework/Mime/lib/Horde/Mime/Viewer/Webcpp.php similarity index 94% rename from framework/Mime/lib/Horde/Mime/Viewer/webcpp.php rename to framework/Mime/lib/Horde/Mime/Viewer/Webcpp.php index 3d0f99597..b59e6bb1d 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 */ -class Horde_Mime_Viewer_webcpp extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Webcpp extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? @@ -92,7 +92,6 @@ class Horde_Mime_Viewer_webcpp extends Horde_Mime_Viewer_Driver file_put_contents($tmpin, $this->_mimepart->getContents()); /* Get the extension for the mime type. */ - include_once dirname(__FILE__) . '/../Magic.php'; $ext = Horde_Mime_Magic::MIMEToExt($this->_mimepart->getType()); /* Execute Web C Plus Plus. Specifying the in and out files didn't diff --git a/framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php b/framework/Mime/lib/Horde/Mime/Viewer/Wordperfect.php similarity index 93% rename from framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php rename to framework/Mime/lib/Horde/Mime/Viewer/Wordperfect.php index 7cf749610..8027e23a4 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 */ -class Horde_Mime_Viewer_wordperfect extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Wordperfect extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? diff --git a/framework/Mime/lib/Horde/Mime/Viewer/zip.php b/framework/Mime/lib/Horde/Mime/Viewer/Zip.php similarity index 96% rename from framework/Mime/lib/Horde/Mime/Viewer/zip.php rename to framework/Mime/lib/Horde/Mime/Viewer/Zip.php index 5399e2a9e..3dac1c8f5 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/zip.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Zip.php @@ -1,6 +1,6 @@ * @package Horde_Mime_Viewer */ -class Horde_Mime_Viewer_zip extends Horde_Mime_Viewer_Driver +class Horde_Mime_Viewer_Zip extends Horde_Mime_Viewer_Driver { /** * Can this driver render various views? @@ -68,7 +68,6 @@ class Horde_Mime_Viewer_zip extends Horde_Mime_Viewer_Driver { $contents = $this->_mimepart->getContents(); - require_once 'Horde/Compress.php'; $zip = &Horde_Compress::singleton('zip'); /* Make sure this is a valid zip file. */ diff --git a/framework/Mime/package.xml b/framework/Mime/package.xml index a75808545..8a86bca8e 100644 --- a/framework/Mime/package.xml +++ b/framework/Mime/package.xml @@ -41,7 +41,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + @@ -53,40 +53,40 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -147,10 +147,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> pecl.php.net - Auth - pear.horde.org - - Horde_Browser pear.horde.org @@ -167,10 +163,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> pear.horde.org - Horde_SessionObjects - pear.horde.org - - Horde_Text_Filter pear.horde.org @@ -189,39 +181,39 @@ http://pear.php.net/dtd/package-2.0.xsd"> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.11.0