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

[..hidden..]

Revision: 6559
          http://sourceforge.net/p/ledger-smb/code/6559
Author:   einhverfr
Date:     2014-01-20 10:54:46 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
moving old code to auth provider for credentials since otherwise custom auth providers will not work for old code properly

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Form.pm
    branches/1.3/LedgerSMB/OE.pm
    branches/1.3/bin/oe.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2014-01-20 10:49:13 UTC (rev 6558)
+++ branches/1.3/Changelog	2014-01-20 10:54:46 UTC (rev 6559)
@@ -16,6 +16,8 @@
 * Fixed blank screens after New on ar/ap transactions (Chris T, 924)
 * Fixed back button handling after logout (Chris T)
 * Fixed Chrome and some other browsers not properly logging out (Chris T)
+* Added SQL-Ledger 2.8 migration script (Erik H)
+* Removed sales/purchase order recurring logic (Chris T, 888)
 
 Changelog for 1.3.36
 * Set default date for AP invoice creation to current date (Chris T)

Modified: branches/1.3/LedgerSMB/Form.pm
===================================================================
--- branches/1.3/LedgerSMB/Form.pm	2014-01-20 10:49:13 UTC (rev 6558)
+++ branches/1.3/LedgerSMB/Form.pm	2014-01-20 10:54:46 UTC (rev 6559)
@@ -1364,13 +1364,9 @@
     my ( $self, $myconfig ) = @_;
     $logger->trace("begin");
 
-    # Handling of HTTP Basic Auth headers
-    my $auth = $ENV{'HTTP_AUTHORIZATION'};
-	# Send HTTP 401 if the authorization header is missing
-    LedgerSMB::Auth::credential_prompt unless ($auth);
-	$auth =~ s/Basic //i; # strip out basic authentication preface
-    $auth = MIME::Base64::decode($auth);
-    my ($login, $password) = split(/:/, $auth);
+    my $creds = LedgerSMB::Auth::get_credentials;
+    my ($login, $password) = ($creds->{login}, $creds->{password});
+    LedgerSMB::Auth::credential_prompt unless ($login) and ($login ne 'logout');
     $self->{login} = $login;
     if (!$self->{company}){ 
         $self->{company} = $LedgerSMB::Sysconfig::default_db;
@@ -3270,7 +3266,7 @@
 
 sub save_recurring {
 
-    my ( $self, $dbh2, $myconfig ) = @_;
+    my ( $self, $dbh2, $myconfig, $is_oe) = @_;
 
     my $dbh = $self->{dbh};
 

Modified: branches/1.3/LedgerSMB/OE.pm
===================================================================
--- branches/1.3/LedgerSMB/OE.pm	2014-01-20 10:49:13 UTC (rev 6558)
+++ branches/1.3/LedgerSMB/OE.pm	2014-01-20 10:54:46 UTC (rev 6559)
@@ -710,8 +710,6 @@
 
    # $form->audittrail( $dbh, "", \%audittrail );
 
-    $form->save_recurring( $dbh, $myconfig );
-
     my $rc = $dbh->commit;
 
     $rc;

Modified: branches/1.3/bin/oe.pl
===================================================================
--- branches/1.3/bin/oe.pl	2014-01-20 10:49:13 UTC (rev 6558)
+++ branches/1.3/bin/oe.pl	2014-01-20 10:54:46 UTC (rev 6559)
@@ -792,7 +792,6 @@
 
     # type=submit $locale->text('Update')
     # type=submit $locale->text('Print')
-    # type=submit $locale->text('Schedule')
     # type=submit $locale->text('Save')
     # type=submit $locale->text('Print and Save')
     # type=submit $locale->text('Ship to')
@@ -847,8 +846,6 @@
                 value => $locale->text('Purchase Order')
             },
             'rfq' => { ndx => 14, key => 'Q', value => $locale->text('RFQ') },
-            'schedule' =>
-              { ndx => 15, key => 'H', value => $locale->text('Schedule') },
             'delete' =>
               { ndx => 16, key => 'D', value => $locale->text('Delete') },
         );

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


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits