loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Yoggzo 2016-02-29 14:20:13 +01:00
parent 6349739a6c
commit cfce59d6dc
47 changed files with 500 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/core/LibOverride/genTokenOptions.php Normal file → Executable file
View file

@ -260,13 +260,14 @@ class genTokenOptions
public function loadBackup($back){
$backup = unserialize($back);
$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"]);
}
@ -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"]);