Encryption error fixing part III

login/ChangePW.aspx.vb

@@ -100,13 +100,20 @@ Partial Class login_ChangePW
     End Sub
 
     Function getDateoftoken(tokenname As String) As Boolean
-        Dim data() As Byte = Convert.FromBase64String(tokenname)
+        Dim data() As Byte = Convert.FromBase64String(VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(tokenname))
         Dim wenn As DateTime = DateTime.FromBinary(BitConverter.ToInt64(data, 0))
-
+        Dim nameoftoken = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(tokenname)
         If wenn < DateTime.UtcNow.AddMinutes(-30) Then
+            nameoftoken = String.Empty
+            'MsgBox("Token has not been found or is too old!" + Environment.NewLine + "Please send a new E-mail!")
+            Session.Remove("TokenforEmail")
             Return False
-            tokenname = ""
-            MsgBox("Token nicht gefunden oder zu alt!" + Environment.NewLine + "Bitte erneut Mail senden!")
+        ElseIf nameoftoken = "Error04" Then
+            nameoftoken = String.Empty
+            Session.Remove("TokenforEmail")
+            Return False
+        ElseIf nameoftoken = "NotYet" Then
+            Return True
         Else
             Return True
         End If