From 7ca2bacefd18cd896c0c6120e1bc979df1ebff8b Mon Sep 17 00:00:00 2001
From: Matthew Wilson <matt@plainblack.com>
Date: Sun, 24 Jul 2005 03:56:27 +0000
Subject: [PATCH] [ 1240140 ] Database link username in 6.6.3 is wrong

---
 lib/WebGUI/Operation/DatabaseLink.pm | 6 +++---
 lib/WebGUI/Operation/LDAPLink.pm     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/WebGUI/Operation/DatabaseLink.pm b/lib/WebGUI/Operation/DatabaseLink.pm
index 37ca51351..c6a8f979c 100644
--- a/lib/WebGUI/Operation/DatabaseLink.pm
+++ b/lib/WebGUI/Operation/DatabaseLink.pm
@@ -114,13 +114,13 @@ sub www_editDatabaseLink {
 		-value => $db{DSN},
         );
         $f->text(
-		-name => "username",
+		-name => "dbusername",
 		-label => WebGUI::International::get(994),
 		-hoverHelp => WebGUI::International::get('994 description'),
 		-value => $db{username},
         );
         $f->password(
-		-name => "identifier",
+		-name => "dbidentifier",
 		-label => WebGUI::International::get(995),
 		-hoverHelp => WebGUI::International::get('995 description'),
 		-value => $db{identifier},
@@ -138,7 +138,7 @@ sub www_editDatabaseLinkSave {
 		WebGUI::SQL->write("insert into databaseLink (databaseLinkId) values (".quote($session{form}{dlid}).")");
 	}
 	    WebGUI::SQL->write("update databaseLink set title=".quote($session{form}{title}).", DSN=".quote($session{form}{DSN}).",
-		username=".quote($session{form}{username}).", identifier=".quote($session{form}{identifier})." where databaseLinkId=".quote($session{form}{dlid}));
+		username=".quote($session{form}{dbusername}).", identifier=".quote($session{form}{dbidentifier})." where databaseLinkId=".quote($session{form}{dlid}));
         return www_listDatabaseLinks();
 }
 
diff --git a/lib/WebGUI/Operation/LDAPLink.pm b/lib/WebGUI/Operation/LDAPLink.pm
index 2c1317831..9e67223d6 100644
--- a/lib/WebGUI/Operation/LDAPLink.pm
+++ b/lib/WebGUI/Operation/LDAPLink.pm
@@ -113,7 +113,7 @@ sub www_editLDAPLink {
 		-value => $db{connectDn},
 	   );
    $f->password(
-   		-name => "identifier",
+   		-name => "ldapIdentifier",
 		-label => WebGUI::International::get("LDAPLink_995","AuthLDAP"),
 		-hoverHelp => WebGUI::International::get("LDAPLink_995 description","AuthLDAP"),
 		-value => $db{identifier},
@@ -189,7 +189,7 @@ sub www_editLDAPLinkSave {
    $properties->{ldapLinkName} = $session{form}{ldapLinkName};
    $properties->{ldapUrl} = $session{form}{ldapUrl};
    $properties->{connectDn} = $session{form}{connectDn};
-   $properties->{identifier} = $session{form}{identifier};
+   $properties->{identifier} = $session{form}{ldapIdentifier};
    $properties->{ldapUserRDN} = $session{form}{ldapUserRDN};
    $properties->{ldapIdentity} = $session{form}{ldapIdentity};
    $properties->{ldapIdentityName} = $session{form}{ldapIdentityName};