Allow token from closure. Fixes #16

Author: sylvainjule

lib/matomo.php

@@ -11,7 +11,7 @@ public static function allowed() {
 		// if deactivated or missing option
 		if(!option('sylvainjule.matomo.id') || !option('sylvainjule.matomo.url') || !option('sylvainjule.matomo.active')) {
 			return false;
-		} 
+		}
 		// if debugging the plugin, return true before checking the blacklist / user status
 		if(option('sylvainjule.matomo.debug')) {
 			return true;
@@ -23,7 +23,7 @@ public static function allowed() {
 		// if users tracking is disabled and an I'm logged in
 		if(!option('sylvainjule.matomo.trackUsers') && kirby()->user()) {
 			return false;
-		} 
+		}
 
 		return true;
 	}
@@ -47,7 +47,7 @@ public static function allowed() {
 	public function __construct() {
     	$this->url   = option('sylvainjule.matomo.url');
 		$this->id    = option('sylvainjule.matomo.id');
-		$this->token = option('sylvainjule.matomo.token');
+		$this->token = is_callable($this->token) ? $this->token() : option('sylvainjule.matomo.token');
     }
 
 	public function apiWidget($widget, $method, $period, $date, $limit, $lang) {
@@ -171,7 +171,7 @@ public function filterPageMetrics($content, $uri, $lang) {
 		$currentLang = $lang['current'];
 		$defaultLang = $lang['default'];
 		$isDefault   = $currentLang == $defaultLang;
- 
+
 		// set the correct language and find the page
 		if($multilang) $site->visit($site->homePage(), $currentLang);
 		$page   = $site->childrenAndDrafts()->find($uri);
@@ -198,7 +198,7 @@ public function filterPageMetrics($content, $uri, $lang) {
 			// loop through all language
 			foreach($kirby->languages() as $language) {
 				if($language->code() == $currentLang) continue;
-				
+
 				$tempCode    = $language->code();
 				$tempDefault = $tempCode == $defaultLang;
 				$tempUrl     = $page->url($tempCode);
@@ -207,7 +207,7 @@ public function filterPageMetrics($content, $uri, $lang) {
 
 				$tempMetrics = $this->filterWithUri($content, $tempUri, $tempCode, $tempDefault);
 				array_push($metrics, $tempMetrics);
-			}		
+			}
 
 			// filter out empty languages
 			$metrics = array_filter($metrics);
@@ -250,7 +250,7 @@ public function filterPageMetrics($content, $uri, $lang) {
 				'current' => $current,
 				'all'     => $all,
 			);
-			
+
 		}
 	}
 
@@ -264,7 +264,7 @@ public function filterWithUri($content, $uri, $lang, $isDefault) {
 			});
 	    	// if the array exists, make it the new $content
 			if(count($langArray)) {
-				$content = reset($langArray)['subtable'] ?? array(); 
+				$content = reset($langArray)['subtable'] ?? array();
 			}
 			// if the array isn't found, but the language isn't the default one
 			else {
@@ -323,4 +323,4 @@ public function multiplyArraysByKey($arr1, $arr2) {
 		return $total;
 	}
 
-}
+}