diff options
| author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2006-10-24 02:40:58 +0000 |
|---|---|---|
| committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2006-10-24 02:40:58 +0000 |
| commit | a0ca5fa5615f963b479f7083db9c10f1fa1e9d29 (patch) | |
| tree | ca72d27830b219f42b2f3c1b372eb779caac4ac6 | |
| parent | b193f4e3c1c2b4e826ed1004b8c64d5e6e991ba8 (diff) | |
Forgot to include the ledger-smb.conf on that last commit
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@282 4979c152-3d1c-0410-bac9-87ea11338e46
| -rw-r--r-- | LedgerSMB/Sysconfig.pm | 13 | ||||
| -rwxr-xr-x | LedgerSMB/User.pm | 1 | ||||
| -rw-r--r-- | ledger-smb.conf | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/LedgerSMB/Sysconfig.pm b/LedgerSMB/Sysconfig.pm index 3023ac79..5b67b690 100644 --- a/LedgerSMB/Sysconfig.pm +++ b/LedgerSMB/Sysconfig.pm @@ -39,6 +39,11 @@ $gzip = "gzip -S .gz"; # Path to the translation files $localepath = 'locale/mo'; +# available printers +%printer = ( Laser => 'lpr -Plaser', + Epson => 'lpr -PEpson', + ); + ################################# # Global database parameters ################################# @@ -50,5 +55,13 @@ my $globalPassword = "set me to correct password"; #$GLOBALDBH = DBI->connect($globalDBConnect, $globalDBUserName, $globalDBPassword); +# These lines prevent other apps in mod_perl from seeing the global db +# connection info + +my $globalDBConnect = undef; +my $globalUserName = undef; +my $globalPassword = undef; + + 1; diff --git a/LedgerSMB/User.pm b/LedgerSMB/User.pm index b892eeb3..09b4a533 100755 --- a/LedgerSMB/User.pm +++ b/LedgerSMB/User.pm @@ -35,7 +35,6 @@ package User; use LedgerSMB::Sysconfig; - sub new { my ($type, $memfile, $login) = @_; my $self = {}; diff --git a/ledger-smb.conf b/ledger-smb.conf index 995e92fc..7821cf58 100644 --- a/ledger-smb.conf +++ b/ledger-smb.conf @@ -1,9 +1,3 @@ -use vars qw($userspath $spool $memberfile $templates $sendmail $language $sid $latex %printer $gzip $GLOBALDBH); - -# available printers -%printer = ( Laser => 'lpr -Plaser', - Epson => 'lpr -PEpson', - ); # if the server can't find gzip, latex, dvips or pdflatex, add the path $ENV{PATH} .= ":/usr/local/bin:/usr/local/pgsql/bin"; |