Merge branch 'develop' into Evan

mise a jour

1 files changed, 16 insertions, 6 deletions

diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 81ecfc8..58b87c1 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -81,7 +81,7 @@ class genTokenOptions
 		$options['catalogType'] = 'false';
 		$options['region'] = 'RegionOne';
 		
-		$this->backup['Identity'] = unserialize($opt);
+		$this->backup['Identity'] = $opt;
 		$token = $this->unserializeToken($this->backup['Identity']['token']);
 		$baseUrl = $this->backup['Identity']['baseUrl'];
 		
@@ -129,7 +129,7 @@ class genTokenOptions
 		$options['catalogType'] = 'image';
 		$options['region'] = 'RegionOne';
 		
-		$this->backup['Image'] = unserialize($opt);
+		$this->backup['Image'] = $opt;
 		$token = $this->unserializeToken($this->backup['Image']['token']);
 		$baseUrl = $this->backup['Image']['baseUrl'];
     
@@ -176,7 +176,7 @@ class genTokenOptions
 		$options['catalogType'] = 'network';
 		$options['region'] = 'RegionOne';
 		
-		$this->backup['Network'] = unserialize($opt);
+		$this->backup['Network'] = $opt;
 		$token = $this->unserializeToken($this->backup['Network']['token']);
 		$baseUrl = $this->backup['Network']['baseUrl'];
     
@@ -224,7 +224,7 @@ class genTokenOptions
 		$options['catalogType'] = 'compute';
 		$options['region'] = 'RegionOne';
 		
-		$this->backup['Compute'] = unserialize($opt);
+		$this->backup['Compute'] = $opt;
 		$token = $this->unserializeToken($this->backup['Compute']['token']);
 		$baseUrl = $this->backup['Compute']['baseUrl'];
     
@@ -242,8 +242,18 @@ class genTokenOptions
 		$this->optionsGlobal['Compute'] = $options;
 	}
 
-	public function getBackup($service){
-		return serialize($this->backup[$service]);
+	public function getBackup(){
+		return serialize($this->backup);
+	}
+	
+	public function loadBackup($back){
+		
+		$backup = unserialize($back);
+		loadComputeBackup($backup["Compute"]);
+		loadIdentityBackup($backup["Identity"]);
+		loadImageBackup($backup["Image"]);
+		loadNetworkBackup($backup["Network"]);
+		
 	}
 	
 	public function getOptions($service){