From 7a393b16445b74f9b82c3ba3a889f4b2a861a2da Mon Sep 17 00:00:00 2001
From: Pierre <pierre@hubert.fr>
Date: Fri, 26 May 2017 09:36:20 +0200
Subject: [PATCH] Created components class & default userID

---
 classes/components.php              | 34 +++++++++++++++++++++++++++++
 classes/components/accountImage.php | 21 ++++++++++++++++++
 functions/user.php                  |  4 ++++
 index.php                           |  8 +++++--
 init.php                            | 12 +++++++++-
 5 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 classes/components.php
 create mode 100644 classes/components/accountImage.php

diff --git a/classes/components.php b/classes/components.php
new file mode 100644
index 0000000..42c8152
--- /dev/null
+++ b/classes/components.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Components unificator
+ *
+ * @author Pierre HUBERT
+ */
+class Components {
+
+	/**
+	 * A static table that contains all the object
+	 *
+	 * @var array
+	 */
+	private static $objects = array();
+
+	/**
+	 * Public constructor
+	 */
+	public function __construct(){
+		//Transform static object into dynamic object
+		foreach(self::$objects as $name=>$object)
+			$this->{$name} = $object;
+	}
+
+	/**
+	 * Class registration
+	 *
+	 * @param String $className The name of the class to register
+	 * @param Object $object The object to register
+	 */
+	public static function register($className, $object){
+		self::$objects[$className] = $object;
+	}
+}
\ No newline at end of file
diff --git a/classes/components/accountImage.php b/classes/components/accountImage.php
new file mode 100644
index 0000000..333fefc
--- /dev/null
+++ b/classes/components/accountImage.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Account image class
+ *
+ * @author Pierre HUBERT
+ */
+class accountImage{
+	/**
+	 * Public constructor
+	 */
+	public function __construct(){
+		//Nothing now
+	}
+
+	public function test(){
+		return "test";
+	}
+}
+
+//Register class
+Components::register("accountImage", new accountImage());
\ No newline at end of file
diff --git a/functions/user.php b/functions/user.php
index e570eb8..789c008 100644
--- a/functions/user.php
+++ b/functions/user.php
@@ -16,6 +16,10 @@ function user_login_required(){
         Rest_fatal_error(401, "This function requires user to be logged in!");
     }
 
+    //Check if userID is the number 0
+    if(userID == 0)
+        Rest_fatal_error(401, "This function requires user to be logged in!");
+
     //User logged in
     return true;
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index 48d6085..22e8469 100644
--- a/index.php
+++ b/index.php
@@ -23,12 +23,12 @@ require PROJECT_PATH."3rdparty/RestServer/RestServer.php";
 //Allow remote requests
 header("Access-Control-Allow-Origin: *");
 
-//By default format is json
+//By default return format is json
 if(!isset($_GET["format"]))
 	$_GET['format'] = "json";
 
 //Check client tokens
-if($cs->config->get("site_mode") == "debug"){
+if($cs->config->get("site_mode") == "debug"){ //DEBUG ONLY
 	$_POST['serviceName'] = "testService";
 	$_POST['serviceToken'] = "testPasswd";
 }
@@ -50,6 +50,10 @@ if(isset($_POST['userToken1']) AND isset($_POST['userToken2'])){
 	//Else save userID
 	define("userID", $userID);
 }
+else {
+	//Defined userID is number 0
+	define("userID", 0);
+}
 
 /**
  * Handle Rest requests
diff --git a/init.php b/init.php
index 787f2ca..73e05d7 100644
--- a/init.php
+++ b/init.php
@@ -13,6 +13,11 @@ foreach(glob(PROJECT_PATH."classes/*.php") as $classFile){
     require_once $classFile;
 }
 
+//Include components
+foreach(glob(PROJECT_PATH."classes/components/*.php") as $classFile){
+    require_once $classFile;
+}
+
 //Include functions
 foreach(glob(PROJECT_PATH."functions/*.php") as $funcFile){
     require_once $funcFile;
@@ -53,4 +58,9 @@ unset($tokens);
 //Add user object
 $user = new User();
 $cs->register("user", $user);
-unset($user);
\ No newline at end of file
+unset($user);
+
+//Add components object
+$components = new Components();
+$cs->register("components", $components);
+unset($components);
\ No newline at end of file