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

Merge branch 'develop' into loic

Browse source
This commit is contained in:
manzerbredes 2016-02-29 08:30:37 +01:00
commit 88894499be
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/core/App.php
View file

@ -105,6 +105,7 @@ class App{
public function show(){ public function show(){
echo json_encode($this->output); echo json_encode($this->output);
//error_log(var_dump(json_encode($this->output), true), 0);
} }
} }

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

@ -260,6 +260,7 @@ class genTokenOptions
public function loadBackup($back){ public function loadBackup($back){
$backup = unserialize($back); $backup = unserialize($back);
$this->backup["roles"] = $backup["roles"]; $this->backup["roles"] = $backup["roles"];
$this->backup["project"] = $backup["project"]; $this->backup["project"] = $backup["project"];
$this->backup["user"] = $backup["user"]; $this->backup["user"] = $backup["user"];
@ -324,6 +325,7 @@ class genTokenOptions
private function unserializeToken($tokenSerialized){ private function unserializeToken($tokenSerialized){
$Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]); $Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]);
$Saved = unserialize($Saved);
$api = new Api(); $api = new Api();
$token = new Models\Token($this->httpClient, $api); $token = new Models\Token($this->httpClient, $api);
$token->methods = unserialize($tokenSerialized["methods"]); $token->methods = unserialize($tokenSerialized["methods"]);