oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding translations for authmodules.

Browse source
This commit is contained in:
Martin Kamerbeek 2002-12-09 15:44:13 +00:00
parent 5758178866
commit bbda83a487
4 changed files with 58 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

24
docs/upgrades/upgrade_4.9.1-4.9.2.sql
View file

@ -1,3 +1,23 @@
insert into webguiVersion values ('4.9.2','upgrade',unix_timestamp());
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (1,1,'Auth/LDAP','LDAP Authentication Options', 1039450730);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (1,1,'Auth/WebGUI','WebGUI Authentication Options', 1039449605);
update international set namespace='Auth/WebGUI', internationalId=2 where internationalId=55 and namespace='WebGUI';
update international set namespace='Auth/WebGUI', internationalId=3 where internationalId=78 and namespace='WebGUI';
update international set namespace='Auth/WebGUI', internationalId=4 where internationalId=726 and namespace='WebGUI';
update international set namespace='Auth/WebGUI', internationalId=5 where internationalId=727 and namespace='WebGUI';
update international set namespace='Auth/LDAP', internationalId=2 where internationalId=79 and namespace='WebGUI';
update international set namespace='Auth/LDAP', internationalId=3 where internationalId=165 and namespace='WebGUI';
update international set namespace='Auth/LDAP', internationalId=4 where internationalId=166 and namespace='WebGUI';
update international set namespace='Auth/LDAP', internationalId=5 where internationalId=120 and namespace='WebGUI';
update international set namespace='Auth/LDAP', internationalId=6 where internationalId=121 and namespace='WebGUI';
update international set namespace='Auth/LDAP', internationalId=7 where internationalId=122 and namespace='WebGUI';
update international set namespace='Auth/LDAP', internationalId=8 where internationalId=123 and namespace='WebGUI';
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (9,1,'Auth/SMB','NT Password', 1039453225);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (8,1,'Auth/SMB','NT Login', 1039452980);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (7,1,'Auth/SMB','NT Domain', 1039452950);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (6,1,'Auth/SMB','BDC', 1039452936);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (5,1,'Auth/SMB','PDC', 1039452926);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (4,1,'Auth/SMB','SMB Logon Error (3)<br>You have supplied an invalid username/password pair. Probably a typo, please try again.', 1039452797);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (3,1,'Auth/SMB','SMB Protocol Error (2)<br>Please contact your sysadmin.', 1039452769);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (2,1,'Auth/SMB','SMB Server Error (1)<br>Something went wrong accessing the domain controller. Perhaps the connection timed out. Please try again or contact your sysadmin.', 1039452744);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (1,1,'Auth/SMB','SMB Authentication Options', 1039451963);

22
lib/WebGUI/Authentication/LDAP.pm
View file

@ -47,7 +47,7 @@ sub authenticate {
$port = $uri->port;
}
%args = (port => $port);
$ldap = Net::LDAP->new($uri->host, %args) or $result = WebGUI::International::get(79);
$ldap = Net::LDAP->new($uri->host, %args) or $result = WebGUI::International::get(2,'Auth/LDAP');
return $result if $result;
$auth = $ldap->bind(dn=>$$userData{connectDN}, password=>$identifier);
if ($auth->code == 48 || $auth->code == 49) {
@ -71,8 +71,8 @@ sub adminForm {
my $f;
$f = WebGUI::HTMLForm->new;
$f->readOnly('<b>'.optionsLabel().'</b>');
$f->url("ldapURL",WebGUI::International::get(165),$ldapURL);
$f->text("connectDN",WebGUI::International::get(166),$connectDN);
$f->url("ldapURL",WebGUI::International::get(3,'Auth/LDAP'),$ldapURL);
$f->text("connectDN",WebGUI::International::get(4,'Auth/LDAP'),$connectDN);
return $f->printRowsOnly;
}
@ -92,7 +92,7 @@ sub adminFormValidate {
#-------------------------------------------------------------------
sub optionsLabel {
return "LDAP Authentication Options";
return WebGUI::International::get(1,'Auth/LDAP');
}
#-------------------------------------------------------------------
@ -145,7 +145,7 @@ sub registrationFormValidate {
if (defined $search->entry(0)) {
$connectDN = "cn=".$search->entry(0)->get_value("cn");
$ldap->unbind;
$ldap = Net::LDAP->new($uri->host, {port=>$port}) or $error .= WebGUI::International::get(79);
$ldap = Net::LDAP->new($uri->host, {port=>$port}) or $error .= WebGUI::International::get(2,'Auth/LDAP');
$auth = $ldap->bind(dn=>$connectDN, password=>$session{form}{ldapPassword});
if ($auth->code == 48 || $auth->code == 49) {
$error .= '<li>'.WebGUI::International::get(68);
@ -161,10 +161,10 @@ sub registrationFormValidate {
WebGUI::ErrorHandler::warn("Invalid LDAP information for registration of LDAP ID: ".$session{form}{ldapId});
}
} else {
$error = WebGUI::International::get(79);
$error = WebGUI::International::get(2,'Auth/LDAP');
}
} else {
$error = WebGUI::International::get(79);
$error = WebGUI::International::get(2,'Auth/LDAP');
}
return $error;
}
@ -174,10 +174,10 @@ sub settingsForm {
my $f;
$f = WebGUI::HTMLForm->new;
$f->readOnly('<b>'.optionsLabel().'</b>');
$f->url("ldapURL",WebGUI::International::get(120),$session{setting}{ldapURL});
$f->text("ldapId",WebGUI::International::get(121),$session{setting}{ldapId});
$f->text("ldapIdName",WebGUI::International::get(122),$session{setting}{ldapIdName});
$f->text("ldapPasswordName",WebGUI::International::get(123),$session{setting}{ldapPasswordName});
$f->url("ldapURL",WebGUI::International::get(5,'Auth/LDAP'),$session{setting}{ldapURL});
$f->text("ldapId",WebGUI::International::get(6,'Auth/LDAP'),$session{setting}{ldapId});
$f->text("ldapIdName",WebGUI::International::get(7,'Auth/LDAP'),$session{setting}{ldapIdName});
$f->text("ldapPasswordName",WebGUI::International::get(8,'Auth/LDAP'),$session{setting}{ldapPasswordName});
return $f->printRowsOnly;
}

34
lib/WebGUI/Authentication/SMB.pm.disabled
View file

@ -9,7 +9,7 @@ package WebGUI::Authentication::SMB;
#-------------------------------------------------------------------
# http://www.plainblack.com info@plainblack.com
#-------------------------------------------------------------------~
use strict;
use WebGUI::Session;
use WebGUI::HTMLForm;
@ -18,21 +18,21 @@ use Authen::Smb;
use warnings;
my %smbError = (
1 => 'SMB Server Error (1)<br>Something went wrong accessing the domain controller. Perhaps the connection timed out. Please try again or contact your sysadmin.',
2 => 'SMB Protocol Error (2)<br>Please contact your sysadmin',
3 => 'SMB Logon Error (3)<br>You have supplied an invalid username/password pair. Probably a typo, please try again.'
1 => WebGUI::International::get(2,'Auth/SMB'),
2 => WebGUI::International::get(3,'Auth/SMB'),
3 => WebGUI::International::get(4,'Auth/SMB')
);
#-------------------------------------------------------------------
sub authenticate {
my ($uid, $password, $userData, $smb, $result);
my ($userId, $password, $userData, $smb, $result);
$userId = $_[0]->[0];
$password = $_[0]->[1];
$userData = WebGUI::Authentication::getParams($uid, 'SMB');
$userData = WebGUI::Authentication::getParams($userId, 'SMB');
$smb = Authen::Smb::authen($userData->{smbLogin}, $password, $userData->{smbPDC}, $userData->{smbBDC}, $userData->{smbDomain});
if ($smb > 0) {
$result = '<li>'. $smbError{$smb} . <br> ."Login: *$userData->{smbLogin}, PDC: *$userData->{smbPDC}*, BDC: *$userData->{smbBDC}*, Domain: *$userData->{smbDomain}*";
$result = '<li>'. $smbError{$smb};
} else {
$result = 1;
}
@ -50,10 +50,10 @@ sub adminForm {
my $f;
$f = WebGUI::HTMLForm->new;
$f->readOnly('<b>'.optionsLabel().'</b>');
$f->text("smbPDC","PDC",$pdc);
$f->text("smbBDC","BDC",$bdc);
$f->text("smbDomain","NT Domain",$domain);
$f->text("smbLogin","NT Login name",$login);
$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);
return $f->printRowsOnly;
}
@ -70,15 +70,15 @@ sub adminFormSave {
#-------------------------------------------------------------------
sub optionsLabel {
return "SMB Authentication Options";
return WebGUI::International::get(1,'Auth/SMB');
}
#-------------------------------------------------------------------
sub registrationForm {
my $f;
$f = WebGUI::HTMLForm->new;
$f->text("loginId","NT Login Id");
$f->password("smbPassword","NT Password");
$f->text("loginId",WebGUI::International::get(8,'Auth/SMB'));
$f->password("smbPassword",WebGUI::International::get(9,'Auth/SMB'));
return $f->printRowsOnly;
}
@ -115,9 +115,9 @@ sub settingsForm {
my $f;
$f = WebGUI::HTMLForm->new;
$f->readOnly('<b>'.optionsLabel().'</b>');
$f->text("smbPDC","PDC",$session{setting}{smbPDC});
$f->text("smbBDC","BDC",$session{setting}{smbBDC});
$f->text("smbDomain","NT Domain",$session{setting}{smbDomain});
$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});
return $f->printRowsOnly;
}

16
lib/WebGUI/Authentication/WebGUI.pm
View file

@ -55,7 +55,7 @@ sub adminFormValidate {
#-------------------------------------------------------------------
sub optionsLabel {
return "WebGUI Authentication Options";
return WebGUI::International::get(1,'Auth/WebGUI');
}
#-------------------------------------------------------------------
@ -63,7 +63,7 @@ sub registrationForm {
my $f;
$f = WebGUI::HTMLForm->new;
$f->password("identifier",WebGUI::International::get(51));
$f->password("identifierConfirm",WebGUI::International::get(55));
$f->password("identifierConfirm",WebGUI::International::get(2,'Auth/WebGUI'));
return $f->printRowsOnly;
}
@ -76,13 +76,13 @@ sub registrationFormSave {
sub registrationFormValidate {
my ($error);
if ($session{form}{identifier} ne $session{form}{identifierConfirm}) {
$error = '<li>'.WebGUI::International::get(78);
$error = '<li>'.WebGUI::International::get(3,'Auth/WebGUI');
}
if ($session{form}{identifier} eq "password") {
$error .= '<li>'.WebGUI::International::get(727);
$error .= '<li>'.WebGUI::International::get(5,'Auth/WebGUI');
}
if ($session{form}{identifier} eq "") {
$error .= '<li>'.WebGUI::International::get(726);
$error .= '<li>'.WebGUI::International::get(4,'Auth/WebGUI');
}
return $error;
}
@ -97,7 +97,7 @@ sub userForm {
my $f;
$f = WebGUI::HTMLForm->new;
$f->password("identifier",WebGUI::International::get(51),"password");
$f->password("identifierConfirm",WebGUI::International::get(55),"password");
$f->password("identifierConfirm",WebGUI::International::get(2,'Auth/WebGUI'),"password");
return $f->printRowsOnly;
}
@ -110,10 +110,10 @@ sub userFormSave {
sub userFormValidate {
my ($error);
if ($session{form}{identifier} ne $session{form}{identifierConfirm}) {
$error = '<li>'.WebGUI::International::get(78);
$error = '<li>'.WebGUI::International::get(3,'Auth/WebGUI');
}
if ($session{form}{identifier} eq "") {
$error .= '<li>'.WebGUI::International::get(726);
$error .= '<li>'.WebGUI::International::get(4,'Auth/WebGUI');
}
return $error;
}