Use Horde_Core_Factory_MimeViewer directly

diff --git a/agora/lib/Messages.php b/agora/lib/Messages.php
index a7ae704..3fdf6ba 100644 (file)
--- a/agora/lib/Messages.php
+++ b/agora/lib/Messages.php
@@ -1656,7 +1656,7 @@ class Agora_Messages {
         $html = '<br />';
         $view_url = Horde::url('view.php');
         foreach ($files as $file_id => $file) {
-            $mime_icon = $GLOBALS['injector']->getInstance('Horde_Mime_Viewer')->getIcon($file['file_type']);
+            $mime_icon = $GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->getIcon($file['file_type']);
             $title = _("download") . ': ' . $file['file_name'];
             $tooltip = $title . "\n" . sprintf(_("size: %s"), $this->formatSize($file['file_size'])) . "\n" . sprintf(_("type: %s"), $file['file_type']);
             $url = Horde_Util::addParameter($view_url, array('forum_id' => $this->_forum_id,

diff --git a/ansel/migration/1_ansel_base_tables.php b/ansel/migration/1_ansel_base_tables.php
index a2c64fb..a6e1f0b 100644 (file)
--- a/ansel/migration/1_ansel_base_tables.php
+++ b/ansel/migration/1_ansel_base_tables.php
@@ -198,6 +198,8 @@ class AnselBaseTables extends Horde_Db_Migration_Base
      */
     public function down()
     {
+        $tableList = $this->tables();
+
         $this->dropTable('ansel_images');
         $this->dropTable('ansel_image_attributes');
         $this->dropTable('ansel_faces');
@@ -206,9 +208,15 @@ class AnselBaseTables extends Horde_Db_Migration_Base
         $this->dropTable('ansel_shares_groups');
         $this->dropTable('ansel_shares_users');
         $this->dropTable('ansel_images_geolocation');
-        $this->dropTable('ansel_tags');
-        $this->dropTable('ansel_galleries_tags');
-        $this->dropTable('ansel_images_tags');
+        if (in_array('ansel_tags', $tableList)) {
+            $this->dropTable('ansel_tags');
+        }
+        if (in_array('ansel_galleries_tags', $tableList)) {
+            $this->dropTable('ansel_galleries_tags');
+        }
+        if (in_array('ansel_images_tags', $tableList)) {
+            $this->dropTable('ansel_images_tags');
+        }
     }
 
 }

diff --git a/ansel/migration/2_ansel_upgrade_autoincrement.php b/ansel/migration/2_ansel_upgrade_autoincrement.php
index 4bbf2ac..cda1f3a 100644 (file)
--- a/ansel/migration/2_ansel_upgrade_autoincrement.php
+++ b/ansel/migration/2_ansel_upgrade_autoincrement.php
@@ -24,10 +24,15 @@ class AnselUpgradeAutoIncrement extends Horde_Db_Migration_Base
 
     public function down()
     {
+        $tableList = $this->tables();
+
         $this->changeColumn('ansel_images', 'image_id', 'bigint', array('null' => false, 'autoincrement' => false));
         $this->changeColumn('ansel_faces', 'face_id', 'bigint', array('null' => false, 'autoincrement' => false));
         $this->changeColumn('ansel_shares', 'share_id', 'bigint', array('null' => false, 'autoincrement' => false));
-        $this->changeColumn('ansel_tags', 'tag_id', 'integer', array('null' => false, 'autoincrement' => false));
+
+        if (in_array('ansel_tags', $tableList)) {
+            $this->changeColumn('ansel_tags', 'tag_id', 'integer', array('null' => false, 'autoincrement' => false));
+        }
     }
 
 }
\ No newline at end of file

diff --git a/chora/browsedir.php b/chora/browsedir.php
index 7b5843f..81063b9 100644 (file)
--- a/chora/browsedir.php
+++ b/chora/browsedir.php
@@ -111,7 +111,7 @@ if ($fileList) {
             $readmes[] = $currFile;
         }
 
-        $icon = $injector->getInstance('Horde_Mime_Viewer')->getIcon($mimeType);
+        $icon = $injector->getInstance('Horde_Core_Factory_MimeViewer')->getIcon($mimeType);
         $author = Chora::showAuthorName($lg->queryAuthor());
         $filerev = $lg->queryRevision();
         $date = $lg->queryDate();

diff --git a/chora/lib/Chora.php b/chora/lib/Chora.php
index ded0390..e70649b 100644 (file)
--- a/chora/lib/Chora.php
+++ b/chora/lib/Chora.php
@@ -243,7 +243,7 @@ class Chora
         $mime->setType($mime_type);
         $mime->setContents($lns);
 
-        return $GLOBALS['injector']->getInstance('Horde_Mime_Viewer')->getViewer($mime);
+        return $GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->create($mime);
     }
 
     /**

diff --git a/framework/Core/lib/Horde/Core/Binder/MimeViewer.php b/framework/Core/lib/Horde/Core/Binder/MimeViewer.php
deleted file mode 100644 (file)
index b87b1b5..0000000
--- a/framework/Core/lib/Horde/Core/Binder/MimeViewer.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_MimeViewer implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_MimeViewer($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}

diff --git a/framework/Core/lib/Horde/Core/Factory/MimeViewer.php b/framework/Core/lib/Horde/Core/Factory/MimeViewer.php
index a8d6dc1..6b270fe 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/MimeViewer.php
+++ b/framework/Core/lib/Horde/Core/Factory/MimeViewer.php
@@ -67,7 +67,7 @@ class Horde_Core_Factory_MimeViewer
      * @return Horde_Mime_Viewer_Base  The newly created instance.
      * @throws Horde_Mime_Viewer_Exception
      */
-    public function getViewer(Horde_Mime_Part $mime, array $opts = array())
+    public function create(Horde_Mime_Part $mime, array $opts = array())
     {
         $app = isset($opts['app'])
             ? $opts['app']

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 14036d0..de94d50 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -265,7 +265,6 @@ class Horde_Registry
         $binders = array(
             'Horde_Auth_Factory' => new Horde_Core_Binder_AuthFactory(),
             'Horde_Core_Auth_Signup' => new Horde_Core_Binder_AuthSignup(),
-            'Horde_Mime_Viewer' => new Horde_Core_Binder_MimeViewer(),
             'Horde_Share_Factory' => new Horde_Core_Binder_ShareFactory(),
             'Horde_Template' => new Horde_Core_Binder_Template(),
             'Horde_Text_Filter' => new Horde_Core_Binder_TextFilter(),

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index cf51a9e..b59daad 100644 (file)
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -113,7 +113,6 @@ Application Framework.</description>
        <file name="Auth.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
-       <file name="MimeViewer.php" role="php" />
        <file name="ShareFactory.php" role="php" />
        <file name="Template.php" role="php" />
        <file name="TextFilter.php" role="php" />
@@ -425,7 +424,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Auth.php" name="lib/Horde/Core/Binder/Auth.php" />
    <install as="Horde/Core/Binder/AuthFactory.php" name="lib/Horde/Core/Binder/AuthFactory.php" />
    <install as="Horde/Core/Binder/AuthSignup.php" name="lib/Horde/Core/Binder/AuthSignup.php" />
-   <install as="Horde/Core/Binder/MimeViewer.php" name="lib/Horde/Core/Binder/MimeViewer.php" />
    <install as="Horde/Core/Binder/ShareFactory.php" name="lib/Horde/Core/Binder/ShareFactory.php" />
    <install as="Horde/Core/Binder/Template.php" name="lib/Horde/Core/Binder/Template.php" />
    <install as="Horde/Core/Binder/TextFilter.php" name="lib/Horde/Core/Binder/TextFilter.php" />

diff --git a/gollem/manager.php b/gollem/manager.php
index 478768e..ae64979 100644 (file)
--- a/gollem/manager.php
+++ b/gollem/manager.php
@@ -397,7 +397,7 @@ if (is_array($list) && $numitem && $read_perms) {
             $item['graphic'] = $folder_img;
         } else {
             if (empty($icon_cache[$val['type']])) {
-                $icon_cache[$val['type']] = Horde::img($injector->getInstance('Horde_Mime_Viewer')->getIcon(Horde_Mime_Magic::extToMime($val['type'])), '', '', '');
+                $icon_cache[$val['type']] = Horde::img($injector->getInstance('Horde_Core_Factory_MimeViewer')->getIcon(Horde_Mime_Magic::extToMime($val['type'])), '', '', '');
             }
             $item['graphic'] = $icon_cache[$val['type']];
         }

diff --git a/gollem/selectlist.php b/gollem/selectlist.php
index a36e4f6..d7079bc 100644 (file)
--- a/gollem/selectlist.php
+++ b/gollem/selectlist.php
@@ -127,7 +127,7 @@ if (is_array($info['list']) &&
             $item['graphic'] = $folder_img;
         } else {
             if (empty($icon_cache[$val['type']])) {
-                $icon_cache[$val['type']] = $injector->getInstance('Horde_Mime_Viewer')->getIcon($val['type']);
+                $icon_cache[$val['type']] = $injector->getInstance('Horde_Core_Factory_MimeViewer')->getIcon($val['type']);
             }
             $item['graphic'] = $icon_cache[$val['type']];
         }

diff --git a/horde/admin/phpshell.php b/horde/admin/phpshell.php
index c8b3c1f..37603e2 100644 (file)
--- a/horde/admin/phpshell.php
+++ b/horde/admin/phpshell.php
@@ -66,7 +66,7 @@ if ($command) {
     $part->setType('application/x-httpd-phps');
     $part->buildMimeIds();
 
-    $pretty = $injector->getInstance('Horde_Mime_Viewer')->getViewer($part)->render('inline');
+    $pretty = $injector->getInstance('Horde_Core_Factory_MimeViewer')->create($part)->render('inline');
 
     echo '<h1 class="header">' . _("PHP Code") . '</h1>' .
         $pretty[1]['data'] .

diff --git a/imp/compose.php b/imp/compose.php
index 7acd2a3..7751ed2 100644 (file)
--- a/imp/compose.php
+++ b/imp/compose.php
@@ -993,7 +993,7 @@ if ($redirect) {
         $t->set('numberattach', count($imp_compose));
         if ($t->get('numberattach')) {
             $atc = array();
-            $v = $injector->getInstance('Horde_Mime_Viewer');
+            $v = $injector->getInstance('Horde_Core_Factory_MimeViewer');
             foreach ($imp_compose as $atc_num => $data) {
                 $mime = $data['part'];
                 $type = $mime->getType();

diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index d080627..8a9c458 100644 (file)
--- a/imp/lib/Contents.php
+++ b/imp/lib/Contents.php
@@ -645,7 +645,7 @@ class IMP_Contents
         }
 
         /* Get part's icon. */
-        $part['icon'] = ($mask & self::SUMMARY_ICON) ? Horde::img($GLOBALS['injector']->getInstance('Horde_Mime_Viewer')->getIcon($mime_type), '', array('title' => $mime_type), '') : null;
+        $part['icon'] = ($mask & self::SUMMARY_ICON) ? Horde::img($GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->getIcon($mime_type), '', array('title' => $mime_type), '') : null;
 
         /* Get part's description. */
         $description = $mime_part->getDescription(true);

diff --git a/luxor/lib/Luxor.php b/luxor/lib/Luxor.php
index a68def5..a198249 100644 (file)
--- a/luxor/lib/Luxor.php
+++ b/luxor/lib/Luxor.php
@@ -157,7 +157,7 @@ class Luxor
                 if (preg_match('/^.*\.[oa]$|^core$|^00-INDEX$/', $node)) {
                     continue;
                 }
-                $icon = Horde::img($GLOBALS['injector']->getInstance('Horde_Mime_Viewer')->getIcon(Horde_Mime_Magic::filenameToMime($node)), '', '', '');
+                $icon = Horde::img($GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->getIcon(Horde_Mime_Magic::filenameToMime($node)), '', '', '');
                 $filesize = $files->getFilesize($dir . $node);
                 if ($filesize < 1 << 10) {
                     $bytes = _("bytes");
@@ -208,7 +208,7 @@ class Luxor
             $mime_part->setName('README');
 
             return $table_head .
-                $GLOBALS['injector']->getInstance('Horde_Mime_Viewer')->getViewer($mime_part)->render() .
+                $GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->create($mime_part)->render() .
                 $table_foot;
         }
     }

diff --git a/luxor/source.php b/luxor/source.php
index 59844ab..ca37dab 100644 (file)
--- a/luxor/source.php
+++ b/luxor/source.php
@@ -109,7 +109,7 @@ function printfile_raw($pathname)
 
     $mime_part = new Horde_Mime_Part(Horde_Mime_Magic::filenameToMime($pathname), $data);
     $mime_part->setName($pathname);
-    $viewer = $GLOBALS['injector']->getInstance('Horde_Mime_Viewer')->getViewer($mime_part);
+    $viewer = $GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->create($mime_part);
 
     if ($viewer->getType() == 'text/plain') {
         return '<pre class="fixed">' . htmlspecialchars($viewer->render()) . '</pre>';

diff --git a/turba/lib/Object.php b/turba/lib/Object.php
index 7367412..59c808f 100644 (file)
--- a/turba/lib/Object.php
+++ b/turba/lib/Object.php
@@ -404,7 +404,7 @@ class Turba_Object {
 
         $mime_part = new Horde_Mime_Part();
         $mime_part->setType(Horde_Mime_Magic::extToMime($file['type']));
-        $viewer = $GLOBALS['injector']->getInstance('Horde_Mime_Viewer')->getViewer($mime_part);
+        $viewer = $GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->create($mime_part);
 
         // We can always download files.
         $url_params = array('actionID' => 'download_file',

diff --git a/turba/view.php b/turba/view.php
index 8f1c957..428aa76 100644 (file)
--- a/turba/view.php
+++ b/turba/view.php
@@ -63,7 +63,7 @@ case 'view_file':
     $mime_part->setName($filename);
     $mime_part->buildMimeIds();
 
-    $content = $injector->getInstance('Horde_Mime_Viewer')->getViewer($mime_part)->render('full');
+    $content = $injector->getInstance('Horde_Core_Factory_MimeViewer')->create($mime_part)->render('full');
     $body = $content[1]['data'];
 
     $browser->downloadHeaders($filename, $content[1]['type'], true, strlen($body));

diff --git a/whups/lib/Whups.php b/whups/lib/Whups.php
index 9bf2451..c3e8ade 100644 (file)
--- a/whups/lib/Whups.php
+++ b/whups/lib/Whups.php
@@ -821,7 +821,7 @@ class Whups {
         // Can we view the attachment online?
         $mime_part = new Horde_Mime_Part();
         $mime_part->setType(Horde_Mime_Magic::extToMime($file['type']));
-        $viewer = $GLOBALS['injector']->getInstance('Horde_Mime_Viewer')->getViewer($mime_part);
+        $viewer = $GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->create($mime_part);
         if ($viewer && !($viewer instanceof Horde_Mime_Viewer_Default)) {
             $url = Horde_Util::addParameter(Horde::url('view.php'),
                                       array('actionID' => 'view_file',

diff --git a/whups/view.php b/whups/view.php
index 428e1a1..909a9a7 100644 (file)
--- a/whups/view.php
+++ b/whups/view.php
@@ -62,7 +62,7 @@ case 'view_file':
     $mime_part->setContents($data);
     $mime_part->setName($filename);
 
-    $ret = $injector->getInstance('Horde_Mime_Viewer')->getViewer($mime_part)->render('full');
+    $ret = $injector->getInstance('Horde_Core_Factory_MimeViewer')->create($mime_part)->render('full');
     reset($ret);
     $key = key($ret);
 

diff --git a/wicked/lib/Text_Wiki/Render/Xhtml/Code2.php b/wicked/lib/Text_Wiki/Render/Xhtml/Code2.php
index a6f8e81..43bb352 100644 (file)
--- a/wicked/lib/Text_Wiki/Render/Xhtml/Code2.php
+++ b/wicked/lib/Text_Wiki/Render/Xhtml/Code2.php
@@ -19,7 +19,6 @@ class Text_Wiki_Render_Xhtml_Code2 extends Text_Wiki_Render_Xhtml_Code
         $part = new Horde_Mime_Part();
         $part->setContents($options['text']);
         $part->setType("x-extension/$type");
-
         $viewer = new Horde_Core_Mime_Viewer_Syntaxhighlighter($part, array('registry' => $GLOBALS['registry']));
         $data = $viewer->render('inline');
         $data = reset($data);

diff --git a/wicked/templates/display/standard.inc b/wicked/templates/display/standard.inc
index 73adf1e..a76bdb2 100644 (file)
--- a/wicked/templates/display/standard.inc
+++ b/wicked/templates/display/standard.inc
@@ -124,7 +124,7 @@ foreach ($attachments as $attachment) {
                               array('page' => $this->pageName(),
                                     'file' => $attachment['attachment_name'],
                                     'version' => $attachment['attachment_majorversion'] . '.' . $attachment['attachment_minorversion']));
-    $icon = $GLOBALS['injector']->getInstance('Horde_Mime_Viewer')->getIcon(Horde_Mime_Magic::filenameToMime($attachment['attachment_name']));
+    $icon = $GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->getIcon(Horde_Mime_Magic::filenameToMime($attachment['attachment_name']));
     echo Horde::link($url) .
         '<img src="' . $icon . '" width="16" height="16" alt="" />&nbsp;' .
         htmlspecialchars($attachment['attachment_name']) . '</a><br />';