merge

1 files changed, 13 insertions, 2 deletions

diff --git a/server/core/App.php b/server/core/App.php
index babb3d9..edb75f6 100644..100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -33,7 +33,7 @@ class App{
 	public function setToken($token){

 		

 		$this->tokenPost = $token;

-		$this->tokenClass->loadBackup($his->tokenPost);

+		$this->tokenClass->loadBackup($this->tokenPost);

 		

 	}

 	

@@ -50,6 +50,16 @@ class App{
 				$opt = $this->tokenClass->getOptions($service);

 				return $this->openstack->imagesV2($opt);

 				break;

+			case "Network":

+				if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();

+				$opt = $this->tokenClass->getOptions($service);

+				return $this->openstack->networkingV2($opt);

+				break;

+			case "Compute":

+                                if($this->tokenPost == NULL) $this->tokenClass->genComputeToken();

+                                $opt = $this->tokenClass->getOptions($service);

+                                return $this->openstack->computeV2($opt);

+                                break;

 		}

 		

 	}

@@ -95,6 +105,7 @@ class App{
 	

 	public function show(){

 		echo json_encode($this->output);

+		//error_log(var_dump(json_encode($this->output), true), 0);

 	}

 	

-}
\ No newline at end of file
+}