From daed08ef102efb003742940806e71e9b544c5874 Mon Sep 17 00:00:00 2001
From: Dominique Fournier <dominique@fournier38.fr>
Date: Tue, 10 Sep 2019 12:58:30 +0000
Subject: [PATCH] csrf : update migration

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@5467 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
---
 csrf.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/csrf.php b/csrf.php
index 902ff64..bb34ea6 100644
--- a/csrf.php
+++ b/csrf.php
@@ -98,12 +98,14 @@ class csrf
       return TRUE;
     // Migrate from unique format to multiple CSRF tokens format
     // The new format is : array (token => the last used time)
-    if (isset ($_SESSION["domframework"]["csrf"]["csrfStart"]))
+    if (isset ($_SESSION["domframework"]["csrf"]["csrf"]) &&
+        isset ($_SESSION["domframework"]["csrf"]["csrfStart"]))
     {
       $_SESSION["domframework"]["csrf"] = array (
         $_SESSION["domframework"]["csrf"]["csrf"] =>
          $_SESSION["domframework"]["csrf"]["csrfStart"]
       );
+      unset ($_SESSION["domframework"]["csrf"]["csrfStart"]);
     }
     if (! isset ($_SESSION["domframework"]["csrf"]))
     {