Moved all scalars out of ledger-smb.conf

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@268 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 8 insertions, 8 deletions

diff --git a/LedgerSMB/User.pm b/LedgerSMB/User.pm
index 7f3549c0..52516885 100755
--- a/LedgerSMB/User.pm
+++ b/LedgerSMB/User.pm
@@ -98,7 +98,7 @@ sub country_codes {
 
 
 sub login {
-  my ($self, $form, $userspath) = @_;
+  my ($self, $form, ${LedgerSMB::Sysconfig::userspath}) = @_;
 
   my $rc = -1;
   
@@ -112,9 +112,9 @@ sub login {
     }
     
 	#there shouldn't be any harm in always doing this. It might even un-bork things.
-  	$self->create_config("$userspath/$self->{login}.conf");
+  	$self->create_config("${LedgerSMB::Sysconfig::userspath}/$self->{login}.conf");
     
-    do "$userspath/$self->{login}.conf";
+    do "${LedgerSMB::Sysconfig::userspath}/$self->{login}.conf";
     $myconfig{dbpasswd} = unpack 'u', $myconfig{dbpasswd};
   
     # check if database is down
@@ -752,18 +752,18 @@ sub create_config {
 
 
 sub save_member {
-	my ($self, $memberfile, $userspath) = @_;
+	my ($self, ${LedgerSMB::Sysconfig::memberfile}, ${LedgerSMB::Sysconfig::userspath}) = @_;
 
 	# format dbconnect and dboptions string
 	&dbconnect_vars($self, $self->{dbname});
 
-	$self->error("$memberfile locked!") if (-f "${memberfile}.LCK");
+	$self->error("${LedgerSMB::Sysconfig::memberfile} locked!") if (-f "${memberfile}.LCK");
 	open(FH, ">${memberfile}.LCK") or $self->error("${memberfile}.LCK : $!");
 	close(FH);
 
-	if (! open(CONF, "+<$memberfile")) {
+	if (! open(CONF, "+<${LedgerSMB::Sysconfig::memberfile}")) {
 		unlink "${memberfile}.LCK";
-		$self->error("$memberfile : $!");
+		$self->error("${LedgerSMB::Sysconfig::memberfile} : $!");
 	}
 
 	@config = <CONF>;
@@ -819,7 +819,7 @@ sub save_member {
 	# create conf file
 	if (! $self->{'root login'}) {
 
-		$self->create_config("$userspath/$self->{login}.conf");
+		$self->create_config("${LedgerSMB::Sysconfig::userspath}/$self->{login}.conf");
 
 		$self->{dbpasswd} =~ s/\\'/'/g;
 		$self->{dbpasswd} =~ s/\\\\/\\/g;