From 82cae7df993533cd56291e37f569eac64a412892 Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Wed, 24 Feb 2016 23:06:02 +0100
Subject: Add Network class Generation in App

---
 server/core/App.php | 5 +++++
 1 file changed, 5 insertions(+)
 mode change 100644 => 100755 server/core/App.php

(limited to 'server/core/App.php')

diff --git a/server/core/App.php b/server/core/App.php
old mode 100644
new mode 100755
index babb3d9..5495a1f
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -50,6 +50,11 @@ 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;
 		}
 		
 	}
-- 
cgit v1.2.3


From 3fe5596998b88e20aa3965a5b44d0a8ec9f0a4cb Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Sun, 28 Feb 2016 19:10:51 +0100
Subject: Correct Error in App, Add Compute in App, add Network in Index

---
 server/core/App.php | 9 +++++++--
 server/index.php    | 9 ++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'server/core/App.php')

diff --git a/server/core/App.php b/server/core/App.php
index 5495a1f..282a1db 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);
 		
 	}
 	
@@ -55,6 +55,11 @@ class App{
 				$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;
 		}
 		
 	}
@@ -102,4 +107,4 @@ class App{
 		echo json_encode($this->output);
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/server/index.php b/server/index.php
index 41b4e73..f888671 100644
--- a/server/index.php
+++ b/server/index.php
@@ -27,7 +27,14 @@
 			$identityObject->action($action);
 			$App->show();
 			break;
-			
+		
+		case "network":
+                        include_once("core/Network.php");
+                        $networkObject = new network($App);
+                        $networkObject->action($action);
+                        $App->show();
+                        break;	
+		
 		case "image":
 			include_once("core/Image.php");
 			$imageObject = new image($App);
-- 
cgit v1.2.3


From 0ab3116656c41300c571832b4f543125f93da399 Mon Sep 17 00:00:00 2001
From: EoleDev <root@serverpc.home>
Date: Sun, 28 Feb 2016 22:54:51 +0100
Subject: Error Correction on Token Save

---
 server/core/App.php                         | 1 +
 server/core/LibOverride/genTokenOptions.php | 2 ++
 2 files changed, 3 insertions(+)
 mode change 100644 => 100755 server/core/LibOverride/genTokenOptions.php

(limited to 'server/core/App.php')

diff --git a/server/core/App.php b/server/core/App.php
index 282a1db..edb75f6 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -105,6 +105,7 @@ class App{
 	
 	public function show(){
 		echo json_encode($this->output);
+		//error_log(var_dump(json_encode($this->output), true), 0);
 	}
 	
 }
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
old mode 100644
new mode 100755
index f239d84..50826ed
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -260,6 +260,7 @@ class genTokenOptions
 	public function loadBackup($back){
 		
 		$backup = unserialize($back);
+
 		$this->backup["roles"] = $backup["roles"];
 		$this->backup["project"] = $backup["project"];
 		$this->backup["user"] = $backup["user"];
@@ -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"]);
-- 
cgit v1.2.3