From: Chuck Hagenbuch <chuck@horde.org>
Date: Sat, 13 Nov 2010 16:52:04 +0000 (-0500)
Subject: "Pretty" does not describe a mime type
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7e587153b506a2ce12572a59efdbac4eee98c5e1;p=horde.git

"Pretty" does not describe a mime type
---

diff --git a/chora/app/views/file/html.html.php b/chora/app/views/file/html.html.php
new file mode 100644
index 000000000..d670e2e9c
--- /dev/null
+++ b/chora/app/views/file/html.html.php
@@ -0,0 +1,20 @@
+<div class="file-view">
+<h3 class="file-view-header"><?php echo $this->h($this->title) ?></h3>
+<div class="file-view-contents">
+<?php
+if (strpos($this->mimeType, 'text/plain') !== false) {
+    $data = $this->pretty->render('inline');
+    $data = reset($data);
+    echo '<div class="fixed">' . $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($data['data'], 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO)) . '</div>';
+} elseif (strpos($this->mimeType, 'image/') !== false) {
+    echo Horde::img(Horde_Util::addParameter(Horde::selfUrl(true), 'p', 1), '', '', '');
+} elseif ($this->pretty->canRender('inline')) {
+    $data = $this->pretty->render('inline');
+    $data = reset($data);
+    echo $data['data'];
+} else {
+    echo Horde::link(Horde_Util::addParameter(Horde::selfUrl(true), 'p', 1)) . Horde::img('download.png') . ' ' . sprintf(_("Download revision %s"), $r) . '</a>';
+}
+?>
+</div>
+</div>
diff --git a/chora/app/views/file/pretty.html.php b/chora/app/views/file/pretty.html.php
deleted file mode 100644
index d670e2e9c..000000000
--- a/chora/app/views/file/pretty.html.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="file-view">
-<h3 class="file-view-header"><?php echo $this->h($this->title) ?></h3>
-<div class="file-view-contents">
-<?php
-if (strpos($this->mimeType, 'text/plain') !== false) {
-    $data = $this->pretty->render('inline');
-    $data = reset($data);
-    echo '<div class="fixed">' . $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($data['data'], 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO)) . '</div>';
-} elseif (strpos($this->mimeType, 'image/') !== false) {
-    echo Horde::img(Horde_Util::addParameter(Horde::selfUrl(true), 'p', 1), '', '', '');
-} elseif ($this->pretty->canRender('inline')) {
-    $data = $this->pretty->render('inline');
-    $data = reset($data);
-    echo $data['data'];
-} else {
-    echo Horde::link(Horde_Util::addParameter(Horde::selfUrl(true), 'p', 1)) . Horde::img('download.png') . ' ' . sprintf(_("Download revision %s"), $r) . '</a>';
-}
-?>
-</div>
-</div>
diff --git a/chora/browsedir.php b/chora/browsedir.php
index b896cee8e..8abcfb627 100644
--- a/chora/browsedir.php
+++ b/chora/browsedir.php
@@ -133,7 +133,7 @@ echo '</table>';
 if ($readmes) {
     $readmeCollection = new Chora_Readme_Collection($readmes);
     $readmeFile = $readmeCollection->chooseReadme();
-    $readmeRenderer = new Chora_Renderer_File_Pretty($injector->createInstance('Horde_View_Base'), $readmeFile, $readmeFile->queryRevision());
+    $readmeRenderer = new Chora_Renderer_File_Html($injector->createInstance('Horde_View_Base'), $readmeFile, $readmeFile->queryRevision());
     echo $readmeRenderer->render();
 }
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/chora/lib/Renderer/File/Html.php b/chora/lib/Renderer/File/Html.php
new file mode 100644
index 000000000..fa2e46264
--- /dev/null
+++ b/chora/lib/Renderer/File/Html.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright 2000-2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author  Chuck Hagenbuch <chuck@horde.org>
+ * @package Chora
+ */
+class Chora_Renderer_File_Html extends Chora_Renderer_File
+{
+    public function render()
+    {
+        // need the checkout
+        $checkOut = $GLOBALS['VC']->checkout($this->_file->queryPath(), $this->_revision);
+
+        // Pretty-print the checked out copy */
+        if ($this->_file->mimeType == 'application/octet-stream') {
+            $this->_view->mimeType = 'text/plain';
+        } else {
+            $this->_view->mimeType = $this->_file->mimeType;
+        }
+
+        $this->_view->title = $this->_file->queryName();
+        $this->_view->pretty = Chora::pretty($this->_view->mimeType, $checkOut);
+        if ($this->_view->mimeType == 'text/html') {
+            $this->_view->pretty->setConfigParam('inline', true);
+        }
+
+        return $this->_view->render('app/views/file/html.html.php');
+    }
+}
diff --git a/chora/lib/Renderer/File/Pretty.php b/chora/lib/Renderer/File/Pretty.php
deleted file mode 100644
index 226ab0483..000000000
--- a/chora/lib/Renderer/File/Pretty.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright 2000-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @author  Chuck Hagenbuch <chuck@horde.org>
- * @package Chora
- */
-class Chora_Renderer_File_Pretty extends Chora_Renderer_File
-{
-    public function render()
-    {
-        // need the checkout
-        $checkOut = $GLOBALS['VC']->checkout($this->_file->queryPath(), $this->_revision);
-
-        // Pretty-print the checked out copy */
-        if ($this->_file->mimeType == 'application/octet-stream') {
-            $this->_view->mimeType = 'text/plain';
-        } else {
-            $this->_view->mimeType = $this->_file->mimeType;
-        }
-
-        $this->_view->title = $this->_file->queryName();
-        $this->_view->pretty = Chora::pretty($this->_view->mimeType, $checkOut);
-        if ($this->_view->mimeType == 'text/html') {
-            $this->_view->pretty->setConfigParam('inline', true);
-        }
-
-        return $this->_view->render('app/views/file/pretty.html.php');
-    }
-}