Namespaced forvars to prevent ambiguity.

This commit is contained in:
Martin Kamerbeek 2002-12-09 19:22:45 +00:00
parent bbda83a487
commit 908ead7a4e
3 changed files with 50 additions and 50 deletions

View file

@ -43,17 +43,17 @@ sub authenticate {
#-------------------------------------------------------------------
sub adminForm {
my $userData = WebGUI::Authentication::getParams($_[0], 'SMB');
my $pdc = $session{form}{smbPDC} || $userData->{smbPDC} || $session{setting}{smbPDC};
my $bdc = $session{form}{smbBDC} || $userData->{smbBDC} || $session{setting}{smbBDC};
my $domain = $session{form}{smbDomain} || $userData->{smbDomain} || $session{setting}{smbDomain};
my $login = $session{form}{smbLogin} || $userData->{smbLogin};
my $pdc = $session{form}{authSMB.smbPDC} || $userData->{smbPDC} || $session{setting}{smbPDC};
my $bdc = $session{form}{authSMB.smbBDC} || $userData->{smbBDC} || $session{setting}{smbBDC};
my $domain = $session{form}{authSMB.smbDomain} || $userData->{smbDomain} || $session{setting}{smbDomain};
my $login = $session{form}{authSMB.smbLogin} || $userData->{smbLogin};
my $f;
$f = WebGUI::HTMLForm->new;
$f->readOnly('<b>'.optionsLabel().'</b>');
$f->text("smbPDC",WebGUI::International::get(5,'Auth/SMB'),$pdc);
$f->text("smbBDC",WebGUI::International::get(6,'Auth/SMB'),$bdc);
$f->text("smbDomain",WebGUI::International::get(7,'Auth/SMB'),$domain);
$f->text("smbLogin",WebGUI::International::get(8,'Auth/SMB'),$login);
$f->text("authSMB.smbPDC",WebGUI::International::get(5,'Auth/SMB'),$pdc);
$f->text("authSMB.smbBDC",WebGUI::International::get(6,'Auth/SMB'),$bdc);
$f->text("authSMB.smbDomain",WebGUI::International::get(7,'Auth/SMB'),$domain);
$f->text("authSMB.smbLogin",WebGUI::International::get(8,'Auth/SMB'),$login);
return $f->printRowsOnly;
}
@ -61,10 +61,10 @@ sub adminForm {
sub adminFormSave {
WebGUI::Authentication::saveParams($session{form}{uid},'SMB',
{
smbPDC => $session{form}{smbPDC},
smbBDC => $session{form}{smbBDC},
smbDomain => $session{form}{smbDomain},
smbLogin => $session{form}{smbLogin}
smbPDC => $session{form}{authSMB.smbPDC},
smbBDC => $session{form}{authSMB.smbBDC},
smbDomain => $session{form}{authSMB.smbDomain},
smbLogin => $session{form}{authSMB.smbLogin}
});
}
@ -77,8 +77,8 @@ sub optionsLabel {
sub registrationForm {
my $f;
$f = WebGUI::HTMLForm->new;
$f->text("loginId",WebGUI::International::get(8,'Auth/SMB'));
$f->password("smbPassword",WebGUI::International::get(9,'Auth/SMB'));
$f->text("authSMB.loginId",WebGUI::International::get(8,'Auth/SMB'));
$f->password("authSMB.smbPassword",WebGUI::International::get(9,'Auth/SMB'));
return $f->printRowsOnly;
}
@ -91,7 +91,7 @@ sub registrationFormSave {
smbPDC => $session{setting}{smbPDC},
smbBDC => $session{setting}{smbBDC},
smbDomain => $session{setting}{smbDomain},
smbLogin => $session{form}{loginId}
smbLogin => $session{form}{authSMB.loginId}
});
}
@ -101,8 +101,8 @@ sub registrationFormValidate {
$pdc = $session{setting}{smbPDC};
$bdc = $session{setting}{smbBDC};
$ntDomain = $session{setting}{smbDomain};
$smbLogin = $session{form}{loginId};
$smb = Authen::Smb::authen($smbLogin, $session{form}{smbPassword}, $pdc, $bdc, $ntDomain);
$smbLogin = $session{form}{authSMB.loginId};
$smb = Authen::Smb::authen($smbLogin, $session{form}{authSMB.smbPassword}, $pdc, $bdc, $ntDomain);
if ($smb > 0) {
$error = '<li>'. $smbError{$smb} . "pdc: $pdc, bdc: $bdc, domain: $ntDomain";
}
@ -115,9 +115,9 @@ sub settingsForm {
my $f;
$f = WebGUI::HTMLForm->new;
$f->readOnly('<b>'.optionsLabel().'</b>');
$f->text("smbPDC",WebGUI::International::get(5,'Auth/SMB'),$session{setting}{smbPDC});
$f->text("smbBDC",WebGUI::International::get(6,'Auth/SMB'),$session{setting}{smbBDC});
$f->text("smbDomain",WebGUI::International::get(7,'Auth/SMB'),$session{setting}{smbDomain});
$f->text("authSMB.smbPDC",WebGUI::International::get(5,'Auth/SMB'),$session{setting}{smbPDC});
$f->text("authSMB.smbBDC",WebGUI::International::get(6,'Auth/SMB'),$session{setting}{smbBDC});
$f->text("authSMB.smbDomain",WebGUI::International::get(7,'Auth/SMB'),$session{setting}{smbDomain});
return $f->printRowsOnly;
}