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-03-30 14:14:10 +02:00
commit 237b627bf6
8 changed files with 147 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/core/LibOverride/genTokenOptions.php
View file

@ -51,9 +51,9 @@ class genTokenOptions
}
public function checkToken(){
//error_log($this->backup['time'], 0);
//return $this->backup['time'] > time();
return true;
//error_log(print_r($this->backup['time'], true), 0);
return $this->backup['time'] > time();
//return true;
}
public function genIdentityToken(){
@ -386,7 +386,7 @@ class genTokenOptions
$token->catalog = new Models\Catalog($this->httpClient, $api);
$token->catalog->services = [];
error_log(print_r($Saved["catalog"], true), 0);
//error_log(print_r($Saved["catalog"], true), 0);
foreach($Saved["catalog"] as $key => $service){
$tmp = new Models\Service($this->httpClient, $api);