From 2583ae04deed167ba3bcb12c52d1188d2538536a Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Sun, 28 Feb 2016 20:44:17 +0100
Subject: Error correction function call

---
 server/core/LibOverride/genTokenOptions.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'server/core/LibOverride')

diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index b71defa..f239d84 100644
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -263,10 +263,10 @@ class genTokenOptions
 		$this->backup["roles"] = $backup["roles"];
 		$this->backup["project"] = $backup["project"];
 		$this->backup["user"] = $backup["user"];
-		loadComputeBackup($backup["Compute"]);
-		loadIdentityBackup($backup["Identity"]);
-		loadImageBackup($backup["Image"]);
-		loadNetworkBackup($backup["Network"]);
+		$this->loadComputeBackup($backup["Compute"]);
+		$this->loadIdentityBackup($backup["Identity"]);
+		$this->loadImageBackup($backup["Image"]);
+		$this->loadNetworkBackup($backup["Network"]);
 		
 	}
 	
-- 
cgit v1.2.3


From 0ab3116656c41300c571832b4f543125f93da399 Mon Sep 17 00:00:00 2001
From: EoleDev <root@serverpc.home>
Date: Sun, 28 Feb 2016 22:54:51 +0100
Subject: Error Correction on Token Save

---
 server/core/App.php                         | 1 +
 server/core/LibOverride/genTokenOptions.php | 2 ++
 2 files changed, 3 insertions(+)
 mode change 100644 => 100755 server/core/LibOverride/genTokenOptions.php

(limited to 'server/core/LibOverride')

diff --git a/server/core/App.php b/server/core/App.php
index 282a1db..edb75f6 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -105,6 +105,7 @@ class App{
 	
 	public function show(){
 		echo json_encode($this->output);
+		//error_log(var_dump(json_encode($this->output), true), 0);
 	}
 	
 }
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
old mode 100644
new mode 100755
index f239d84..50826ed
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -260,6 +260,7 @@ class genTokenOptions
 	public function loadBackup($back){
 		
 		$backup = unserialize($back);
+
 		$this->backup["roles"] = $backup["roles"];
 		$this->backup["project"] = $backup["project"];
 		$this->backup["user"] = $backup["user"];
@@ -324,6 +325,7 @@ class genTokenOptions
 	
 	private function unserializeToken($tokenSerialized){
 		$Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]);
+		$Saved = unserialize($Saved);
 		$api = new Api();
 		$token = new Models\Token($this->httpClient, $api);
 		$token->methods = unserialize($tokenSerialized["methods"]);
-- 
cgit v1.2.3