Fixes #4493, move DoNotTrack & AnonymizeIP logic to PrivacyManager plugin. Includes modification to EventDipatcher to allow generic callbacks in getListHooksRegistered method.

1 files changed, 21 insertions, 0 deletions

diff --git a/core/Nonce.php b/core/Nonce.php
index 55567e8841..0fc84c3f6b 100644
--- a/core/Nonce.php
+++ b/core/Nonce.php
@@ -154,4 +154,25 @@ class Nonce
 
         return $origins;
     }
+
+    /**
+     * Verifies and discards a nonce.
+     * 
+     * @param string $nonceName The nonce's unique ID. See {@link getNonce()}.
+     * @param string|null $nonce The nonce from the client. If `null`, the value from the
+     *                           **nonce** query parameter is used.
+     * @throws Exception if the nonce is invalid. See {@link verifyNonce()}.
+     */
+    static public function checkNonce($nonceName, $nonce = null)
+    {
+        if ($nonce === null) {
+            $nonce = Common::getRequestVar('nonce', null, 'string');
+        }
+
+        if (!self::verifyNonce($nonceName, $nonce)) {
+            throw new \Exception(Piwik::translate('General_ExceptionNonceMismatch'));
+        }
+
+        self::discardNonce($nonceName);
+    }
 }
\ No newline at end of file