diff --git a/lib/WebGUI/Help/AuthLDAP.pm b/lib/WebGUI/Help/AuthLDAP.pm index 82bb97bd4..9cdc78c92 100644 --- a/lib/WebGUI/Help/AuthLDAP.pm +++ b/lib/WebGUI/Help/AuthLDAP.pm @@ -5,6 +5,71 @@ our $HELP = { title => 'LDAPLink_990', body => 'ldap connection add/edit body', fields => [ + { + title => 'LDAPLink_992', + description => 'LDAPLink_992 description', + namespace => 'AuthLDAP', + }, + { + title => 'LDAPLink_993', + description => 'LDAPLink_993 description', + namespace => 'AuthLDAP', + }, + { + title => 'LDAPLink_994', + description => 'LDAPLink_994 description', + namespace => 'AuthLDAP', + }, + { + title => 'LDAPLink_995', + description => 'LDAPLink_995 description', + namespace => 'AuthLDAP', + }, + { + title => '9', + description => '9 description', + namespace => 'AuthLDAP', + }, + { + title => '6', + description => '6 description', + namespace => 'AuthLDAP', + }, + { + title => '7', + description => '7 description', + namespace => 'AuthLDAP', + }, + { + title => '8', + description => '8 description', + namespace => 'AuthLDAP', + }, + { + title => '868', + description => '868 description', + namespace => 'AuthLDAP', + }, + { + title => '869', + description => '869 description', + namespace => 'AuthLDAP', + }, + { + title => 'account template', + description => 'account template description', + namespace => 'AuthLDAP', + }, + { + title => 'create account template', + description => 'create account template description', + namespace => 'AuthLDAP', + }, + { + title => 'login template', + description => 'login template description', + namespace => 'AuthLDAP', + }, ], related => [ ], }, diff --git a/lib/WebGUI/Operation/LDAPLink.pm b/lib/WebGUI/Operation/LDAPLink.pm index 548c501c2..2c1317831 100644 --- a/lib/WebGUI/Operation/LDAPLink.pm +++ b/lib/WebGUI/Operation/LDAPLink.pm @@ -78,46 +78,102 @@ sub www_editLDAPLink { %db = WebGUI::SQL->quickHash("select * from ldapLink where ldapLinkId=".quote($session{form}{llid})); $f = WebGUI::HTMLForm->new( -extras=>'autocomplete="off"' ); - $f->hidden("op","editLDAPLinkSave"); - $f->hidden("llid",$session{form}{llid}); - $f->hidden("returnUrl",$session{form}{returnUrl}); - $f->readOnly($session{form}{llid},WebGUI::International::get("LDAPLink_991","AuthLDAP")); - $f->text("ldapLinkName",WebGUI::International::get("LDAPLink_992","AuthLDAP"),$db{ldapLinkName}); - $f->text("ldapUrl",WebGUI::International::get("LDAPLink_993","AuthLDAP"),$db{ldapUrl}); - $f->text("connectDn",WebGUI::International::get("LDAPLink_994","AuthLDAP"),$db{connectDn}); - $f->password("identifier",WebGUI::International::get("LDAPLink_995","AuthLDAP"),$db{identifier}); - - $f->text("ldapUserRDN",WebGUI::International::get(9,'AuthLDAP'),$db{ldapUserRDN}); - $f->text("ldapIdentity",WebGUI::International::get(6,'AuthLDAP'),$db{ldapIdentity}); - $f->text("ldapIdentityName",WebGUI::International::get(7,'AuthLDAP'),$db{ldapIdentityName}); - $f->text("ldapPasswordName",WebGUI::International::get(8,'AuthLDAP'),$db{ldapPasswordName}); + $f->hidden( + -name => "op", + -value => "editLDAPLinkSave", + ); + $f->hidden( + -name => "llid", + -value => $session{form}{llid}, + ); + $f->hidden( + -name => "returnUrl", + -value => $session{form}{returnUrl}, + ); + $f->readOnly( + -label => WebGUI::International::get("LDAPLink_991","AuthLDAP"), + -value => $session{form}{llid}, + ); + $f->text( + -name => "ldapLinkName", + -label => WebGUI::International::get("LDAPLink_992","AuthLDAP"), + -hoverHelp => WebGUI::International::get("LDAPLink_992 description","AuthLDAP"), + -value => $db{ldapLinkName}, + ); + $f->text( + -name => "ldapUrl", + -label => WebGUI::International::get("LDAPLink_993","AuthLDAP"), + -hoverHelp => WebGUI::International::get("LDAPLink_993 description","AuthLDAP"), + -value => $db{ldapUrl}, + ); + $f->text( + -name => "connectDn", + -label => WebGUI::International::get("LDAPLink_994","AuthLDAP"), + -hoverHelp => WebGUI::International::get("LDAPLink_994 description","AuthLDAP"), + -value => $db{connectDn}, + ); + $f->password( + -name => "identifier", + -label => WebGUI::International::get("LDAPLink_995","AuthLDAP"), + -hoverHelp => WebGUI::International::get("LDAPLink_995 description","AuthLDAP"), + -value => $db{identifier}, + ); + $f->text( + -name => "ldapUserRDN", + -label => WebGUI::International::get(9,'AuthLDAP'), + -hoverHelp => WebGUI::International::get('9 description','AuthLDAP'), + -value => $db{ldapUserRDN}, + ); + $f->text( + -name => "ldapIdentity", + -label => WebGUI::International::get(6,'AuthLDAP'), + -hoverHelp => WebGUI::International::get('6 description','AuthLDAP'), + -value => $db{ldapIdentity}, + ); + $f->text( + -name => "ldapIdentityName", + -label => WebGUI::International::get(7,'AuthLDAP'), + -hoverHelp => WebGUI::International::get('7 description','AuthLDAP'), + -value => $db{ldapIdentityName}, + ); + $f->text( + -name => "ldapPasswordName", + -label => WebGUI::International::get(8,'AuthLDAP'), + -hoverHelp => WebGUI::International::get('8 description','AuthLDAP'), + -value => $db{ldapPasswordName}, + ); $f->yesNo( -name=>"ldapSendWelcomeMessage", -value=>$db{ldapSendWelcomeMessage}, - -label=>WebGUI::International::get(868) + -label=>WebGUI::International::get(868,"AuthLDAP") + -hoverHelp=>WebGUI::International::get('868 description',"AuthLDAP") ); $f->textarea( -name=>"ldapWelcomeMessage", -value=>$db{ldapWelcomeMessage}, - -label=>WebGUI::International::get(869) + -label=>WebGUI::International::get(869,"AuthLDAP") + -hoverHelp=>WebGUI::International::get('869 description',"AuthLDAP") ); $f->template( -name=>"ldapAccountTemplate", -value=>$db{ldapAccountTemplate}, -namespace=>"Auth/LDAP/Account", -label=>WebGUI::International::get("account template","AuthLDAP") + -hoverHelp=>WebGUI::International::get("account template description","AuthLDAP") ); $f->template( -name=>"ldapCreateAccountTemplate", -value=>$db{ldapCreateAccountTemplate}, -namespace=>"Auth/LDAP/Create", -label=>WebGUI::International::get("create account template","AuthLDAP") + -hoverHelp=>WebGUI::International::get("create account template description","AuthLDAP") ); $f->template( -name=>"ldapLoginTemplate", -value=>$db{ldapLoginTemplate}, -namespace=>"Auth/LDAP/Login", -label=>WebGUI::International::get("login template","AuthLDAP") + -hoverHelp=>WebGUI::International::get("login template description","AuthLDAP") ); $f->submit; diff --git a/lib/WebGUI/i18n/English/AuthLDAP.pm b/lib/WebGUI/i18n/English/AuthLDAP.pm index 3c269e86f..aed8ee3b1 100644 --- a/lib/WebGUI/i18n/English/AuthLDAP.pm +++ b/lib/WebGUI/i18n/English/AuthLDAP.pm @@ -540,76 +540,92 @@ Default text for password form field. lastUpdated => 1056151382 }, - 'ldap connection add/edit body' => { - message => q| + 'LDAPLink_992 description' => { + message => q|The name of this connection. All LDAP connection names must be unique.|, + lastUpdated => 1120164594, + }, -Name
-The name of this connection. All LDAP connection names must be unique. -

+ 'LDAPLink_993 description' => { + message => q|The URL used to connect to the LDAP server.|, + lastUpdated => 1120164594, + }, -LDAP URL
-The URL used to connect to the LDAP server. -

- -Connect DN
-DN = Distinguished Name. A DN is a unique path to a particular object within an LDAP + 'LDAPLink_994 description' => { + message => q|DN = Distinguished Name. A DN is a unique path to a particular object within an LDAP directory. In this case, the "Connect DN" is the DN that point's the the user account record. Usually that will look something like:

+

cn=Joe Shmoe,ou=people,dc=example,dc=com|, + lastUpdated => 1120164594, + }, -

cn=Joe Shmoe,ou=people,dc=example,dc=com -

+ 'LDAPLink_995 description' => { + message => q|The password for the LDAP connection|, + lastUpdated => 1120164594, + }, -Identifier
-The password for the LDAP connection -

- -User RDN
-RDN is a relative distinguished name. It means that we're looking at only part of the + '9 description' => { + message => q|RDN is a relative distinguished name. It means that we're looking at only part of the path. In this case, the "User RDN" is the path to where user records can be found. Usually the RDN looks something like:

+

ou=people,dc=example,dc=com|, + lastUpdated => 1120164594, + }, -

ou=people,dc=example,dc=com -

+ '6 description' => { + message => q|The LDAP Identity is the unique identifier in the LDAP server that the user will be identified against. Often this field is shortname, which takes the form of first initial + last name. Example: jdoe. Therefore if you specify the LDAP identity to be shortname then Jon Doe would enter jdoe during the registration process.|, + lastUpdated => 1120164594, + }, -LDAP Identity
-The LDAP Identity is the unique identifier in the LDAP server that the user will be identified against. Often this field is shortname, which takes the form of first initial + last name. Example: jdoe. Therefore if you specify the LDAP identity to be shortname then Jon Doe would enter jdoe during the registration process. -

+ '7 description' => { + message => q|The label used to describe the LDAP Identity to the user. For instance, some companies use an LDAP server for their proxy server users to authenticate against. In the documentation or training already provided to their users, the LDAP identity is known as their Web Username. So you could enter that label here for consistency.|, + lastUpdated => 1120164594, + }, -LDAP Identity Name
-The label used to describe the LDAP Identity to the user. For instance, some companies use an LDAP server for their proxy server users to authenticate against. In the documentation or training already provided to their users, the LDAP identity is known as their Web Username. So you could enter that label here for consistency. -

+ '8 description' => { + message => q|Just as the LDAP Identity Name is a label, so is the LDAP Password Name. Use this label as you would LDAP Identity Name.|, + lastUpdated => 1120164594, + }, -LDAP Password Name
-Just as the LDAP Identity Name is a label, so is the LDAP Password Name. Use this label as you would LDAP Identity Name. + '868 description' => { + message => q|Do you wish WebGUI to automatically send users a welcome message when they register for your site?

+NOTE: In addition to the message you specify below, the user's account information will be included in the message.|, + lastUpdated => 1120164594, + }, -User RDN
-

+ '869 description' => { + message => q|Type the message that you'd like to be sent to users upon registration.|, + lastUpdated => 1120164594, + }, -Send welcome message?
-Do you wish WebGUI to automatically send users a welcome message when they register for your site? -

-NOTE: In addition to the message you specify below, the user's account information will be included in the message. -

+ 'account template description' => { + message => q|Template to be used to display a user's account.|, + lastUpdated => 1120164594, + }, -Welcome Message
-Type the message that you'd like to be sent to users upon registration. -

+ 'create account template description' => { + message => q|Template to be used to show the form for creating an account.|, + lastUpdated => 1120164594, + }, -Account Template
-Template to be used to display a user's account. -

+ 'login template description' => { + message => q|Template used to display login information to the user as an operation as opposed to inside of a page via a macro.|, + lastUpdated => 1120164594, + }, -Create Account Template
-Template to be used to show the form for creating an account. -

+ 'ldap connection add/edit body' => { + message => q| |, + lastUpdated => 1120164639, + }, -Login Template
-Template used to display login information to the user as an operation as opposed to inside of a page via a macro. -

+ '868' => { + message => q|Send welcome message?|, + lastUpdated => 1120164338 + }, -|, - lastUpdated => 1118542474, + '869' => { + message => q|Welcome Message|, + lastUpdated => 1120164366 }, 'LDAPLink_1075' => {