[ActiveLock-Development] CVS: activelock/src ActiveLock.cls,1.9,1.10 ActiveLock2.vbp,1.6,1.7 IActiveLock.cls,1.6,1.7

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

Update of /cvsroot/activelock/activelock/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28814

Modified Files:
	ActiveLock.cls ActiveLock2.vbp IActiveLock.cls 
Log Message:
Changes for 2.0.7

Index: ActiveLock.cls
===================================================================
RCS file: /cvsroot/activelock/activelock/src/ActiveLock.cls,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ActiveLock.cls	18 Apr 2004 01:50:46 -0000	1.9
+++ ActiveLock.cls	16 May 2004 18:37:38 -0000	1.10
@@ -95,6 +95,8 @@
 ' 04.17.04 - th2tran       - Rolled back changes from 02.25.04. The above implementation smalll breached in security:
 '                            User can blank out the LastUsed property, set their clock back and continue to use an otherwise-expired
 '                            license.
+' 05.13.04 - th2tran       - Fixed "Object variable not set" error in IActiveLock_UsedDays() caused when retrieved Lic is Nothing.
+'
 ' </pre>
 
 '  ///////////////////////////////////////////////////////////////////////
@@ -404,7 +406,7 @@
 Private Function IActiveLock_LockCode(Optional Lic As ProductLicense = Nothing) As String
     Dim strLock As String
 
-    If (mLockTypes And lockMAC) = lockMAC Then
+    If mLockTypes And lockMAC Then
         AppendLockString strLock, modMACAddress.GetMACAddress()
     End If
     If mLockTypes And lockComp Then
@@ -458,6 +460,9 @@
 Private Property Get IActiveLock_UsedDays() As Long
     Dim Lic As ProductLicense
     Set Lic = mKeyStore.Retrieve(mSoftwareName)
+    
+    If Lic Is Nothing Then Exit Property
+    
     ' validate the license
     ValidateLic Lic
     IActiveLock_UsedDays = CLng(DateDiff("d", Lic.RegisteredDate, Now))

Index: ActiveLock2.vbp
===================================================================
RCS file: /cvsroot/activelock/activelock/src/ActiveLock2.vbp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ActiveLock2.vbp	18 Apr 2004 01:50:46 -0000	1.6
+++ ActiveLock2.vbp	16 May 2004 18:37:38 -0000	1.7
@@ -32,7 +32,7 @@
 VersionCompatible32="1"
 MajorVer=2
 MinorVer=0
-RevisionVer=5
+RevisionVer=7
 AutoIncrementVer=0
 ServerSupportFiles=0
 VersionCompanyName="The ActiveLock Software Group"

Index: IActiveLock.cls
===================================================================
RCS file: /cvsroot/activelock/activelock/src/IActiveLock.cls,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- IActiveLock.cls	18 Apr 2004 01:50:46 -0000	1.6
+++ IActiveLock.cls	16 May 2004 18:37:38 -0000	1.7
@@ -232,6 +232,7 @@
 '                         complicating ourselves in terms of compatibility.
 '                         Better to do it via property accessors (such as the AutoRegisterKeyPath property), and
 '                         leave Init() with no parameters.
+'   04.21.04 - th2tran  - Added AutoRegisterKeyPath property
 ' </pre>
 
 '  ///////////////////////////////////////////////////////////////////////