SF.net SVN: ledger-smb:[4389] branches/1.3

[..hidden..]

Revision: 4389
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4389&view=rev
Author:   einhverfr
Date:     2012-03-06 13:36:30 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
corrected character encoding issue with backups to browser.

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/scripts/setup.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-03-06 10:45:10 UTC (rev 4388)
+++ branches/1.3/Changelog	2012-03-06 13:36:30 UTC (rev 4389)
@@ -7,6 +7,7 @@
 * Changed db setup not to use createdb for simple admin of pg_hba.conf (Chris T)
 * Corrected type = 'password' not handled properly in elements.html (Chris T)
 * Non-billable information now retained in db for timecards (Chris T)
+* Corrected character encoding issue with backup scripts (Chris T)
 
 Changelog for 1.3.12
 * Corrected processing of <?lsmb tags in order/invoice numbers (Chris T)

Modified: branches/1.3/scripts/setup.pl
===================================================================
--- branches/1.3/scripts/setup.pl	2012-03-06 10:45:10 UTC (rev 4388)
+++ branches/1.3/scripts/setup.pl	2012-03-06 13:36:30 UTC (rev 4389)
@@ -231,7 +231,14 @@
             file     => $backupfile,
 	);
         $mail->send;
+        my $template = LedgerSMB::Template->new(
+            path => 'UI/setup',
+            template => 'complete',
+            format => 'HTML',
+        );
+        $template->render($request);
     } elsif ($request->{backup_type} eq 'browser'){
+        binmode(STDOUT, ':bytes');
         open BAK, '<', $backupfile;
         my $cgi = CGI::Simple->new();
         $backupfile =~ s/$LedgerSMB::Sysconfig::backuppath(\/)?//;
@@ -249,12 +256,6 @@
     } else {
         $request->error($request->{_locale}->text("Don't know what to do with backup"));
     }
-    my $template = LedgerSMB::Template->new(
-            path => 'UI/setup',
-            template => 'complete',
-            format => 'HTML',
-    );
-    $template->render($request);
  
 }
    

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.