SF.net SVN: ledger-smb:[5188] trunk

[..hidden..]

Revision: 5188
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5188&view=rev
Author:   einhverfr
Date:     2012-11-13 14:00:33 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Auth.pm
    trunk/old-handler.pl
    trunk/tools/prepare-company-database.sh

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5181
   + /branches/1.3:3711-5187

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-11-13 10:35:41 UTC (rev 5187)
+++ trunk/Changelog	2012-11-13 14:00:33 UTC (rev 5188)
@@ -91,6 +91,7 @@
 * Changed upgrade screen to pull AR/AP numbers (Erik H)
 * Rebuild modules after upgrade, ensuring upgrade to latest version (Chris T)
 * Fixed credit limit usage calculations (Chris T, h/t Erik H)
+* Fixes to get LedgerSMB running clearly using FCGI (Chris T)
 
 Berend T is Berend Tober
 Chris T is Chris Travers

Modified: trunk/LedgerSMB/Auth.pm
===================================================================
--- trunk/LedgerSMB/Auth.pm	2012-11-13 10:35:41 UTC (rev 5187)
+++ trunk/LedgerSMB/Auth.pm	2012-11-13 14:00:33 UTC (rev 5188)
@@ -74,6 +74,7 @@
 
 sub http_error {
     my ($errcode, $msg_plus) = @_;
+    $msg_plus = '' if not defined $msg_plus;
     my $cgi = CGI::Simple->new();
 
     my $err = {

Modified: trunk/old-handler.pl
===================================================================
--- trunk/old-handler.pl	2012-11-13 10:35:41 UTC (rev 5187)
+++ trunk/old-handler.pl	2012-11-13 14:00:33 UTC (rev 5188)
@@ -78,6 +78,7 @@
 use LedgerSMB::Auth;
 use LedgerSMB::Session;
 use LedgerSMB::App_State;
+use Data::Dumper;
 
 our $logger=Log::Log4perl->get_logger('old-handler-chain');#make logger available to other old programs
 
@@ -94,15 +95,24 @@
 use LedgerSMB::Sysconfig;
 
 # name of this script
-$0 =~ tr/\\/\//;
-$pos = rindex $0, '/';
-$script = substr( $0, $pos + 1 );
+my $script;
+if ($ENV{GATEWAY_INTERFACE} =~ /^CGI/){
+    $uri = $ENV{REQUEST_URI};
+    $uri =~ s/\?.*//;
+    $ENV{SCRIPT_NAME} = $uri;
+    $ENV{SCRIPT_NAME} =~ m/([^\/\\]*.pl)\?*.*$/;
+    $script = $1;
+} else {
+    $0 =~ tr/\\/\//;
+    $pos = rindex $0, '/';
+    $script = substr( $0, $pos + 1 );
+}
 
+
 $locale = LedgerSMB::Locale->get_handle( ${LedgerSMB::Sysconfig::language} )
   or $form->error( __FILE__ . ':' . __LINE__ . ": Locale not loaded: $!\n" );
 
 
-
 # we use $script for the language module
 $form->{script} = $script;
 

Modified: trunk/tools/prepare-company-database.sh
===================================================================
--- trunk/tools/prepare-company-database.sh	2012-11-13 10:35:41 UTC (rev 5187)
+++ trunk/tools/prepare-company-database.sh	2012-11-13 14:00:33 UTC (rev 5188)
@@ -216,7 +216,7 @@
 # Load the required PostgreSQL contribs, if a directory was specified
 if ! test "x$pgsql_contrib_dir" = "xignored"
 then
-  for contrib in tsearch2.sql pg_trgm.sql tablefunc.sql
+  for contrib in tsearch2.sql tablefunc.sql
   do
     cat $pgsql_contrib_dir/$contrib | $psql_cmd 2>&1 | unchatter
   done

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