#4050 CSRF tokens improvements

inc/classes/BxDolForm.php

@@ -1109,7 +1109,7 @@ class BxDolForm extends BxDol implements iBxDolReplaceable
         if (!($oKeys = BxDolKey::getInstance()))
             return false;
 
-        return $oKeys->getNewKey (false, (int)getParam('sys_security_form_token_lifetime'), $_SERVER['REMOTE_ADDR']);
+        return $oKeys->getNewKey (false, (int)getParam('sys_security_form_token_lifetime'), BxDolSession::getInstance()->getId());
     }
     
     public static function isCsrfTokenValid($s)
@@ -1121,7 +1121,7 @@ class BxDolForm extends BxDol implements iBxDolReplaceable
             return true;
 
         if ($oKeys->isKeyExists($s)) {
-            $bRet = $oKeys->isKeyExists($s, $_SERVER['REMOTE_ADDR']);
+            $bRet = $oKeys->isKeyExists($s, BxDolSession::getInstance()->getId());
             $oKeys->removeKey($s);
             return $bRet;
         }