Fixed charset + runaway <div>s

diff --git a/local/html/Ticket/Export.html b/local/html/Ticket/Export.html
index acb87229018bba73f7a367bffa1877ebe0723819..c7fb8d89e73ef9b3ce21e50a2b69c870fd88df87 100644 (file)
--- a/local/html/Ticket/Export.html
+++ b/local/html/Ticket/Export.html
@@ -6,16 +6,12 @@
 <& /Elements/Tabs &> 
 
 %## The html with %-prefixed perl code.
-<div class="history"><div id="ticket-history">
+<div class="history">
+<div id="ticket-history">
 <div class="titlebox" id="">
 <div class="titlebox-title">
 <span class="left">Ticket to export</span>
 <br><br>
-Ny funksjonalitet utvikla av USIT - for meir info: 
-<a href="http://www.usit.uio.no/tj-grupper/rt/sys-dok/export.html">Sj&aring; her</a>
-<br>
-Send eventuelle kommentarar og feil/manglar til rt-drift@usit.uio.no.
-<br>
 <span>
 <form action="Export.html" method="post">
 %print "<input type=\"text\" name=\"email\" size=\"40\" value=\"".$user->EmailAddress."\"/>";
@@ -31,6 +27,8 @@ Send eventuelle kommentarar og feil/manglar til rt-drift@usit.uio.no.
 </div>
 </div>
 </div>
+</div>
+</div>
 
 <%ARGS>
 $id => undef
@@ -55,6 +53,7 @@ unless ($TicketObj->CurrentUserHasRight('ShowTicket')) {
 # used to convert html-formated email -> plain text for the body.
 use HTML::Parse;
 use HTML::FormatText;
+use Encode;
 my $formater = HTML::FormatText->new(leftmargin => 0, rightmargin => 75);
 
 # using buildtin methods to get the attachments - all nice and cronological.
@@ -145,7 +144,7 @@ if ($email){
     my $mail = MIME::Entity->build(
         Type => 'text/plain',
         Charset => 'utf-8',
-        Data => $mail_head."\n".$mail,
+        Data => encode("utf8", $mail_head."\n".$mail),
     );
 
     $mail->head->set(To=>RT::Interface::Email::EncodeToMIME(String => $email));