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

Correction Erreur

Browse source
This commit is contained in:
EoleDev 2016-03-23 15:13:42 +01:00
parent d3fc2ab36c
commit 0dc17aa9ef
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/js/controllers/home/home.js
View file

@ -44,7 +44,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
if(Identity.isAlreadyLogin()){ if(Identity.isAlreadyLogin()){
if(Compute.getData().machines == null{ if(Compute.getData().machines == null){
Loading.start(); Loading.start();
Compute.pullData(callMeAfterPullData); Compute.pullData(callMeAfterPullData);
} }

4
server/core/App.php
View file

@ -22,7 +22,7 @@ class App{
$this->tokenPost = NULL; $this->tokenPost = NULL;
$this->tokenClass = new genTokenOptions($args); $this->tokenClass = new genTokenOptions($args);
$this->openstack = new OpenStack\OpenStack([]); $this->openstack = new OpenStack\OpenStack(['authUrl' => $args["authUrl"]]);
$this->pluginsApi = plugin_api::getInstance(); $this->pluginsApi = plugin_api::getInstance();
$this->errorClass = new errorManagement($this); $this->errorClass = new errorManagement($this);
$this->output = array(); $this->output = array();
@ -38,7 +38,7 @@ class App{
} }
public function checkToken(){ public function checkToken(){
$this->tokenClass->checkToken(); return $this->tokenClass->checkToken();
} }
public function getLibClass($service){ public function getLibClass($service){

1
server/core/Compute.php
View file

@ -492,6 +492,7 @@ class compute
} }
return; return;
} }
}
/** /**
* Resize a server * Resize a server
* A call to this method has to be followed by either confirmResize or revertResize * A call to this method has to be followed by either confirmResize or revertResize

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

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

2
server/index.php
View file

@ -55,7 +55,7 @@
} }
}else{ }else{
$App->setOuptut("Error", "Token Invalide"); $App->setOutput("Error", "Token Invalide");
$App->show(); $App->show();
} }