From 0733c3a5a53284fa5355cafdc37459a5ce758132 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sun, 30 Apr 2006 16:30:48 +0000
Subject: [PATCH] cleaning up jukka's mess

---
 lib/WebGUI.pm            | 17 ++++++-----------
 lib/WebGUI/Asset/File.pm |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index d5937b5c8..3f065daef 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -29,7 +29,7 @@ use Apache2::RequestRec ();
 use Apache2::RequestIO ();
 use Apache2::Const -compile => qw(OK DECLINED NOT_FOUND DIR_MAGIC_TYPE);
 use Apache2::ServerUtil ();
-use File::MMagic;
+use LWP::MediaTypes qw(guess_media_type);
 
 #-------------------------------------------------------------------
 
@@ -106,20 +106,15 @@ sub contentHandler {
 		}
 		$session->http->setCookie("wgSession",$session->var->{_var}{sessionId}) unless $session->var->{_var}{sessionId} eq $session->http->getCookies->{"wgSession"};
 		my $filename = $session->http->getStreamedFile();
-#        print STDERR "file $filename and setting ".$session->config->get("enableStreamingUploads")."!\n";
 		if ((defined $filename) && ($session->config->get("enableStreamingUploads") eq "1")) {
-            #my $subr = $r->lookup_file($filename,$r->output_filters);
-            my $mm = new File::MMagic;
-            my $ct = $mm->checktype_filename($filename);
-            my $oldContentType = $r->content_type($ct);
-#            print STDERR "contenttype ".$r->content_type()."!\n";
-            if ($r->sendfile($filename) ) {
-    			return Apache2::Const::OK();
+			my $ct = guess_media_type($filename);
+            		my $oldContentType = $r->content_type($ct);
+            		if ($r->sendfile($filename) ) {
+    				return Apache2::Const::OK();
 			} else {
-                $r->content_type($oldContentType);
+                		$r->content_type($oldContentType);
 			}
 		}
-
 		$session->http->sendHeader();
 		unless ($session->http->isRedirect()) {
 			$session->output->print($output);
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index b9d9182da..66115bf97 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -374,7 +374,7 @@ sub www_view {
 		return $self->getContainer->www_view;
 	}
 	$self->session->http->setRedirect($self->getFileUrl);
-    $self->session->http->setStreamedFile($self->getStorageLocation->getPath($self->get("filename")));
+    	$self->session->http->setStreamedFile($self->getStorageLocation->getPath($self->get("filename")));
 	return '1';
 }