[ActiveLock-Development] CVS: alugen/lib alugen.dll,1.4,1.5 ALUGENLib.vbp,1.4,1.5 Generator.cls,1.4,1.5

[Thanh H. T. <th...@us...>]

Update of /cvsroot/activelock/alugen/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29727

Modified Files:
	alugen.dll ALUGENLib.vbp Generator.cls 
Log Message:
Changes for 2.0.7

Index: alugen.dll
===================================================================
RCS file: /cvsroot/activelock/alugen/lib/alugen.dll,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvsdHtYUw and /tmp/cvsD967pn differ

Index: ALUGENLib.vbp
===================================================================
RCS file: /cvsroot/activelock/alugen/lib/ALUGENLib.vbp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ALUGENLib.vbp	3 Nov 2003 06:41:31 -0000	1.4
+++ ALUGENLib.vbp	16 May 2004 18:41:22 -0000	1.5
@@ -20,7 +20,7 @@
 VersionCompatible32="1"
 MajorVer=2
 MinorVer=0
-RevisionVer=4
+RevisionVer=7
 AutoIncrementVer=0
 ServerSupportFiles=0
 VersionCompanyName="The ActiveLock Software Group"

Index: Generator.cls
===================================================================
RCS file: /cvsroot/activelock/alugen/lib/Generator.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Generator.cls	3 Nov 2003 06:40:45 -0000	1.4
+++ Generator.cls	16 May 2004 18:41:22 -0000	1.5
@@ -66,7 +66,11 @@
 '                           - Finished implementing IALUGenerator_GenKey()
 '                           - Dumped ActiveLockEventNotifier.  Don't neeed it here.
 ' 11.02.03 - th2tran        - Re-implemented IALUGenerator_GenKey() - interface changed
+' 05.13.04 - th2tran        - Fixed bug in GetLockAndUserFromInstallCode()--wasn't returning
+'							  the correct LockCode when InstallationCode contained multiple 
+'							  lockTo setttings (e.g. lockToHD Or lockToMAC)
 '
+
 ' </pre>
 
 '  ///////////////////////////////////////////////////////////////////////
@@ -217,16 +221,18 @@
 ' Retrieves lock string and user info from the request string
 '
 Private Sub GetLockAndUserFromInstallCode(ByVal strReq As String, ByRef strLock As String, ByRef strUser As String)
-    Dim Index%, i
-
-    For i = 1 To Len(strReq)
-        If Mid(strReq, i, 1) = vbLf Then Index = i
-    Next i
+    Dim Index%, i%
+    Index = 0: i = 1
+    ' Get to the last vbLf, which denotes the ending of the lock code and beginning of user name.
+    Do While i > 0
+        i = InStr(Index + 1, strReq, vbLf)
+        If i > 0 Then Index = i
+    Loop
 
-    Index = InStr(1, strReq, vbLf)
     If Index <= 0 Then Exit Sub
-
-    strLock = Left(strReq, Index - 1)
+	' lockcode is from beginning to Index-1
+    strLock = Left(strReq, Index - 1) 
+    ' user name starts from Index+1 to the end
     strUser = Mid$(strReq, Index + 1)
     strUser = TrimNulls(strUser)
 End Sub