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

[..hidden..]

Revision: 4712
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4712&view=rev
Author:   einhverfr
Date:     2012-05-14 06:26:18 +0000 (Mon, 14 May 2012)
Log Message:
-----------
Fixing file uploads, so that action not found() and hanging errors are no longer happening, and also fixed scoping of state error array so that friendly db errors are displaying properly again

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/File.pm
    branches/1.3/LedgerSMB.pm
    branches/1.3/lsmb-request.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-05-13 16:22:25 UTC (rev 4711)
+++ branches/1.3/Changelog	2012-05-14 06:26:18 UTC (rev 4712)
@@ -10,8 +10,10 @@
 * Optional image retrieval with size detection for latex templates (Chris T)
 * Added option to attach images to LaTeX PDF invoices/orders/etc (Chris T)
 * Corrected one is_zero error with latest Math::BigInt (Chris T)
+* Fixed file uploads sometimes hanging (Chris T)
+* Fixed file uploads sometimes throwing action not found errors (Chris T)
+* Fixed helpful DB error messages not displayed (Chris T)
 
-
 Mark L is Matt Lubratt
 
 Changelog for 1.3.16

Modified: branches/1.3/LedgerSMB/File.pm
===================================================================
--- branches/1.3/LedgerSMB/File.pm	2012-05-13 16:22:25 UTC (rev 4711)
+++ branches/1.3/LedgerSMB/File.pm	2012-05-14 06:26:18 UTC (rev 4712)
@@ -312,6 +312,7 @@
     
     for my $result (@results) {
         open FILE, '>', $self->file_path . "/$result->{file_name}";
+        binmode FILE, ':bytes';
         print FILE $result->{content};
         close FILE;
         eval { # Block used so that Image::Size is optional

Modified: branches/1.3/LedgerSMB.pm
===================================================================
--- branches/1.3/LedgerSMB.pm	2012-05-13 16:22:25 UTC (rev 4711)
+++ branches/1.3/LedgerSMB.pm	2012-05-14 06:26:18 UTC (rev 4712)
@@ -1069,7 +1069,7 @@
    my $self = shift @_;
    my $state_error = {};
    if ($self->{_locale}){
-       my $state_error = {
+       $state_error = {
             '42883' => $self->{_locale}->text('Internal Database Error'),
             '42501' => $self->{_locale}->text('Access Denied'),
             '42401' => $self->{_locale}->text('Access Denied'),
@@ -1077,7 +1077,7 @@
             '22012' => $self->{_locale}->text('Division by 0 error'),
             '22004' => $self->{_locale}->text('Required input not provided'),
             '23502' => $self->{_locale}->text('Required input not provided'),
-            '23505' => $self->{_locale}->text('Conflict with Existing Data'),
+            '23505' => $self->{_locale}->text('Conflict with Existing Data.  Perhaps you already entered this?'),
             'P0001' => $self->{_locale}->text('Error from Function:') . "\n" .
                     $self->{dbh}->errstr,
        };

Modified: branches/1.3/lsmb-request.pl
===================================================================
--- branches/1.3/lsmb-request.pl	2012-05-13 16:22:25 UTC (rev 4711)
+++ branches/1.3/lsmb-request.pl	2012-05-14 06:26:18 UTC (rev 4712)
@@ -26,7 +26,7 @@
 
 $| = 1;
 
-binmode (STDIN, ':utf8');
+#binmode (STDIN, ':utf8');
 binmode (STDOUT, ':utf8');
 use LedgerSMB::User;
 use LedgerSMB;

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