2 files changed, 13 insertions, 1 deletions
diff --git a/server/core/App.php b/server/core/App.php
index d35ccc0..e3c9c22 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -37,6 +37,10 @@ class App{
 		
 	}
 	
+	public function checkToken(){
+		$this->tokenClass->checkToken();
+	}
+	
 	public function getLibClass($service){
 		
 		switch($service){
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index bdae8a6..028226a 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -49,6 +49,12 @@ class genTokenOptions
             $stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter']));
         }
     }
+
+	public function checkToken(){
+
+		return $this->backup['time'] > time();
+
+	}
 	
 	public function genIdentityToken(){
 		$options = $this->optionsGlobal['Common'];
@@ -271,6 +277,7 @@ class genTokenOptions
 		$path = "core/LibOverride/projectTokenData/".$token['saved']["project"]["name"];
 		//error_log(print_r($path, true), 0);
 		file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved']));
+		$this->backup['time'] = $token['time'];
 		$this->backup["roles"] = $token["roles"];
 		$this->backup["project"] = $token['saved']["project"]["name"];
 		$this->backup["user"] = $token["user"];
@@ -284,7 +291,7 @@ class genTokenOptions
 	public function loadBackup($back){
 		
 		$backup = unserialize($back);
-
+		$this->backup['time'] = $backup['time'];
 		$this->backup["roles"] = $backup["roles"];
 		$this->backup["project"] = $backup["project"];
 		$this->backup["user"] = $backup["user"];
@@ -343,6 +350,7 @@ class genTokenOptions
 		$tokenSerialized["user"]["name"] = serialize($token->user->name);
 		$tokenSerialized["token"]["issued"] = serialize($token->issued);
 		$tokenSerialized["token"]["id"] = serialize($token->id);		
+		$tokenSerialized['time'] = time()+$config['tokenTime']*60;
 
 		return $tokenSerialized;
 	}