Fix typo

3rdparty/RestServer/RestServer.php

@@ -34,6 +34,33 @@ use ReflectionObject;
 use ReflectionMethod;
 use DOMDocument;
 
+////////////////////////////////////////////////////////////////////////////////
+////////// THESE FUNCTIONS FIXE ENCODING ISSUES DUE TO PREVIOUS ENCODING ///////
+/////////// CHOICES ////////////////////////////////////////////////////////////
+//////////// THEY HAVE NOT BEEN TESTED ENOUGH, USE WITH CAUTION !!!!! //////////
+////////////////////////////////////////////////////////////////////////////////
+function do_fix_utf8($input){
+	if(\json_encode($input) == FALSE)
+		return utf8_encode($input);
+	
+	return $input;
+}
+
+function check_utf8($input) {
+
+	if(is_array($input)) {
+		$out = array();
+		foreach($input as $key => $value)
+			$out[$key] = check_utf8($value);
+		return $out;
+	}
+	else
+		return mb_detect_encoding($input) == "UTF-8" ? do_fix_utf8($input) : $input;
+}
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
 /**
  * Description of RestServer
  *
@@ -432,7 +459,13 @@ class RestServer
 				$options = JSON_PRETTY_PRINT;
 			}
 			$options = $options | JSON_UNESCAPED_UNICODE;
-			echo json_encode($data, $options);
+
+			// Return data
+			$output = json_encode($data, $options);
+			if($output === FALSE)
+				$output = json_encode(check_utf8($data), $options);
+			echo $output;
+
 		}
 	}
 

README.md

@@ -4,10 +4,18 @@ This project is the main Comunic RestAPI. It assures data backend support.
 
 (c) Pierre HUBERT since 2017
 
+# Crons required for Comunic
+
+## Calls cron
+There is a cron to automatically cleanup old conversation. Ideally this cron should be executed every 30 seconds. The file to execute is `bin/clean_calls` 
 
 
-### Add API clients
 
+# Use calls in Comunic
+To use calls in Comunic, you need a WebRTCSignalExchangerServer, a small signal exchanging server written using NodeJS. You also need to modify your configuration file located at `config/overwrite.php` by copying and pasting commented configuration located at `config/calls.php` and make it fit your needs.
+
+
+# Add API clients
 In order to easily add clients to the API, a script has been created.
 bin/add_client [name] [token]
 Note : The name of the client must be unique, and the token should the strongest

RestControllers/CallsController.php

@@ -0,0 +1,249 @@
+<?php
+
+/**
+ * Calls controller
+ * 
+ * @author Pierre HUBERT
+ */
+
+class CallsController {
+
+	/**
+	 * Single user response to call
+	 */
+	const USER_RESPONSE_TO_CALL = array(
+		CallMemberInformation::USER_ACCEPTED => "accepted",
+		CallMemberInformation::USER_REJECTED => "rejected",
+		CallMemberInformation::USER_UNKNOWN => "unknown",
+		CallMemberInformation::USER_HANG_UP => "hang_up"
+	);
+
+	/**
+	 * Public constructor
+	 */
+	public function __construct(){
+		
+		//Clean calls
+		components()->calls->cleanCalls();
+
+	}
+
+	/**
+	 * Get call configuration
+	 * 
+	 * @url POST /calls/config
+	 */
+	public function getConfig(){
+		user_login_required();
+		return self::CallsConfigToAPI(components()->calls->getConfig());
+	}
+
+	/**
+	 * Create a call for a conversation
+	 * 
+	 * @url POST /calls/createForConversation
+	 */
+	public function createForConversation(){
+
+		user_login_required();
+
+		//Get conversation ID
+		$conversationID = getPostConversationID("conversationID");
+
+		//Check if the user belongs to the conversation
+		if(!components()->conversations->userBelongsTo(userID, $conversationID))
+			Rest_fatal_error(401, "Specified user doesn't belongs to the conversation number ".$conversationID." !");
+
+		//First, check if a call alreay exists for this conversation
+		$call = components()->calls->getForConversation($conversationID, true);
+
+		//If could not get a call, try to create a new one
+		if(!$call->isValid()){
+
+			//Try to create the call
+			if(!components()->calls->createForConversation($conversationID))
+				Rest_fatal_error(500, "Could not create the call");
+
+			//Get the conversation again
+			$call = components()->calls->getForConversation($conversationID, true);
+
+			if(!$call->isValid())
+				Rest_fatal_error(500, "Could not get information about created call!");
+		}
+
+		//The user automatically accept the call
+		components()->calls->setMemberResponse($call->get_id(), userID, true);
+
+		//Returns information about the call
+		return self::CallInformationToAPI($call);
+			
+	}
+
+	/**
+	 * Get information about a single call
+	 * 
+	 * @url POST /calls/getInfo
+	 */
+	public function getInfo(){
+		
+		user_login_required();
+
+		//Get target call ID
+		$call_id = $this->GetSafeCallIDFromRequest("call_id");
+
+		//Get information about the call
+		$call = components()->calls->get($call_id, true);
+
+		if(!$call->isValid())
+			Rest_fatal_error(500, "Could not get information about the call!");
+		
+		//Update last activity of the call
+		components()->calls->updateLastActivity($call_id);
+		
+		return self::CallInformationToAPI($call);
+	}
+
+	/**
+	 * Get the next pending call
+	 * 
+	 * @url POST /calls/nextPending
+	 */
+	public function GetNextPendingCall(){
+		user_login_required();
+
+		//Get the next pending call for the user
+		$call = components()->calls->getNextPendingForUser(userID, TRUE);
+
+		if(!$call->isValid())
+			return array("notice" => "No pending call.");
+
+		return self::CallInformationToAPI($call);
+	}
+
+	/**
+	 * Respond to a call
+	 * 
+	 * @url POST /calls/respond
+	 */
+	public function respondToCall(){
+		user_login_required();
+
+		//Get target call ID
+		$call_id = $this->GetSafeCallIDFromRequest("call_id");
+
+		//Get target response
+		$accept = postBool("accept");
+
+		//Set user response to call
+		if(!components()->calls->setMemberResponse($call_id, userID, $accept))
+			Rest_fatal_error(500, "Could not set response of user to call!");
+		
+		return array(
+			"success" => "User response to call has been successfully set!"
+		);
+	}
+
+	/**
+	 * Hang up a call
+	 * 
+	 * @url POST /calls/hangUp
+	 */
+	public function hangUp(){
+		user_login_required();
+
+		//Get target call ID
+		$call_id = $this->GetSafeCallIDFromRequest("call_id");
+
+		//Make user hang up call
+		if(!components()->calls->setMemberHangUp($call_id, userID))
+			Rest_fatal_error(500, "Could not make user hang up call!");
+		
+		return array(
+			"success" => "User successfully hang up call!"
+		);
+	}
+
+	/**
+	 * Get safely the ID of a call from the request
+	 * 
+	 * @param $name The name of the POST field containing call ID
+	 * @return int The ID of the call
+	 */
+	private function GetSafeCallIDFromRequest(string $name) : int {
+
+		//Get call ID
+		$call_id = postInt($name);
+
+		if($call_id < 1)
+			Rest_fatal_error(401, "Invalid call id !");
+		
+		//Check if the user belongs to the call or not
+		if(!components()->calls->doesUserBelongToCall($call_id, userID))
+			Rest_fatal_error(401, "You do not belong to this call!");
+		
+		return $call_id;
+	}
+
+	/**
+	 * Turn a CallsConfig object into an API entry
+	 * 
+	 * @param $config The config to convert
+	 * @return array Generated API entry
+	 */
+	private static function CallsConfigToAPI(CallsConfig $config) : array {
+
+		$data = array();
+
+		$data["enabled"] = $config->get_enabled();
+
+		//Give full configuration calls are enabled
+		if($config->get_enabled()){
+			$data["maximum_number_members"] = $config->get_maximum_number_members();
+			$data["signal_server_name"] = $config->get_signal_server_name();
+			$data["signal_server_port"] = $config->get_signal_server_port();
+			$data["is_signal_server_secure"] = $config->get_is_signal_server_secure();
+			$data["stun_server"] = $config->get_stun_server();
+			$data["turn_server"] = $config->get_turn_server();
+			$data["turn_username"] = $config->get_turn_username();
+			$data["turn_password"] = $config->get_turn_password();
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Turn a CallInformation object into an API entry
+	 * 
+	 * @param $call The call to convert
+	 * @return array Generated API entry
+	 */
+	private static function CallInformationToAPI(CallInformation $call) : array {
+		$data = array(
+			"id" => $call->get_id(),
+			"conversation_id" => $call->get_conversation_id(),
+			"last_active" => $call->get_last_active(),
+			"members" => array()
+		);
+
+		foreach($call->get_members() as $member)
+			$data["members"][] = self::CallMemberInformationToAPI($member);
+
+		return $data;
+	}
+
+	/**
+	 * Turn a CallMemberInformation object into an API entry
+	 * 
+	 * @param $member Member information
+	 * @return array User information API entry
+	 */
+	private static function CallMemberInformationToAPI(CallMemberInformation $member) : array {
+		return array(
+			"id" => $member->get_id(),
+			"userID" => $member->get_userID(),
+			"call_id" => $member->get_call_id(),
+			"user_call_id" => $member->get_user_call_id(),
+			"status" => self::USER_RESPONSE_TO_CALL[$member->get_status()]
+		);
+	}
+}

RestControllers/ConversationsController.php

@@ -480,6 +480,55 @@ class ConversationsController {
 		return array("success" => "The conversation has been deleted");
 	}
 
+	/**
+	 * Update the content of a conversation message
+	 * 
+	 * @url POST /conversations/updateMessage
+	 */
+	public function updateMessage(){
+		user_login_required();
+
+		$messageID = postInt("messageID");
+		$newContent = postString("content");
+
+		if(!check_string_before_insert($newContent))
+			Rest_fatal_error(401, "Invalid new message content!");
+
+		//Check whether the user own or not conversation message
+		if(!components()->conversations->isOwnerMessage(userID, $messageID))
+			Rest_fatal_error(401, "You do not own this conversation message!");
+		
+		//Update the message
+		$message = new ConversationMessage();
+		$message->set_id($messageID);
+		$message->set_message($newContent);
+		if(!components()->conversations->updateMessage($message))
+			Rest_fatal_error(500, "Could not update the content of the message!");
+		
+		return array("success" => "The conversation message has been successfully updated!");
+	}
+
+	/**
+	 * Delete a conversation message
+	 * 
+	 * @url POST /conversations/deleteMessage
+	 */
+	public function deleteMessage(){
+		
+		user_login_required();
+
+		$messageID = postInt("messageID");
+
+		//Check whether the user own or not conversation message
+		if(!components()->conversations->isOwnerMessage(userID, $messageID))
+			Rest_fatal_error(401, "You do not own this conversation message!");
+		
+		if(!components()->conversations->deleteConversationMessage($messageID))
+			Rest_fatal_error(500, "Could not delete conversation message!");
+		
+		return array("success" => "Conversation message has been successfully deleted!");
+	}
+
 	/**
 	 * Get and return safely a conversation ID specified in a $_POST Request
 	 * 

RestControllers/GroupsController.php

@@ -359,6 +359,36 @@ class GroupsController {
 		return $members;
 	}
 
+	/**
+	 * Invite a user to join the network
+	 * 
+	 * @url POST /groups/invite
+	 */
+	public function inviteUser(){
+
+		user_login_required();
+
+		//Get target group ID
+		$groupID = getPostGroupIdWithAccess("group_id", GroupInfo::MODERATOR_ACCESS);
+
+		//Get target user ID
+		$userID = getPostUserID("userID");
+
+		//Get the current status of the user over the group
+		if(components()->groups->getMembershipLevel($userID, $groupID) != GroupMember::VISITOR)
+			Rest_fatal_error(401, "The user is not a visitor for this group!");
+		
+		//Save the invitation of the user
+		if(!components()->groups->sendInvitation($userID, $groupID))
+			Rest_fatal_error(500, "Could not send user invitation!");
+
+		//Create notification
+		create_group_membership_notification($userID, userID, $groupID, Notification::SENT_GROUP_MEMBERSHIP_INVITATION);
+
+		//Success
+		return array("success" => "The user has been successfully invited to join this group!");
+	}
+
 	/**
 	 * Respond to a membership invitation
 	 * 
@@ -642,10 +672,6 @@ class GroupsController {
 
 		//Get the list of groups of the user
 		$list = components()->groups->getListUser(userID);
-
-		//Parse list
-		foreach($list as $num => $info)
-			$list[$num] = self::GroupInfoToAPI($info);
 		
 		return $list;
 
@@ -706,6 +732,29 @@ class GroupsController {
 		return array("success" => "Follow status has been successfully updated!");
 	}
 
+	/**
+	 * Delete a group
+	 * 
+	 * @url POST groups/delete
+	 */
+	public function delete(){
+
+		user_login_required();
+
+		//Check user password
+		if(!check_post_password(userID, "password"))
+			Rest_fatal_error(401, "Password required!");
+
+		//Get the group
+		$groupID = getPostGroupIdWithAccess("groupID", GroupInfo::ADMIN_ACCESS);
+
+		//Delete the group
+		if(!components()->groups->delete_group($groupID))
+			Rest_fatal_error(500, "Could not delete group!");
+		
+		return array("success" => "The group has been successfully deleted!");
+	}
+
 	/**
 	 * Parse a GroupInfo object into an array for the API
 	 * 

RestControllers/PostsController.php

@@ -486,17 +486,34 @@ class PostsController {
 		if(!CS::get()->components->posts->delete($postID))
 			Rest_fatal_error(500, "Couldn't delete post!");
 
-		//Delete related notifications
-		$notification = new Notification();
-		$notification->set_on_elem_type(Notification::POST);
-		$notification->set_on_elem_id($postID);
-		components()->notifications->delete($notification);
-
 		//Success
 		return array("success" => "The post has been deleted!");
 	}
 
 
+	/**
+	 * Get the list of targets (pages) where the current user can create
+	 * posts
+	 * 
+	 * @url POST /posts/getAvailableTargets
+	 */
+	public function getAvailableTargets() {
+		user_login_required();
+
+		// Get the list of friends of the user where the user
+		// can create posts
+		$friends = components()->friends->getListThatAllowPostsFromUser(userID);
+
+		// Get the list of groups where the user can create posts
+		$groups = components()->groups->getListUserWhereCanCreatePosts(userID);
+		
+		//Return result
+		return array(
+			"friends" => $friends,
+			"groups" => $groups
+		);
+	}
+
 	/**
 	 * Get the visibility level specified in a POST request
 	 * 

RestControllers/WebAppController.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Web application controller
+ * 
+ * Methods specifically targetting the web application
+ * 
+ * @author Pierre HUBERT
+ */
+
+class WebAppController {
+
+	// Kins of membership
+	const MEMBERSHIP_FRIEND = "friend";
+	const MEMBERSHIP_GROUP = "group";
+
+	public function __construction() {
+		user_login_required();
+	}
+
+	/**
+	 * Get all the memberships of the user, sorted by last activity order
+	 * 
+	 * @url POST /webApp/getMemberships
+	 */
+	public function getMemberships() {
+
+		// Get the list of friends of the user
+		$friends = components()->friends->getList(userID);
+
+		// Get the list of groups of the user
+		$groups = components()->groups->getListUser(userID);
+
+		// Get last activities of groups
+		$groups_activity = array();
+		foreach($groups as $group)
+			$groups_activity[components()->groups->getLastActivity($group)] = $group;
+		krsort($groups_activity);
+		$groups = array();
+		foreach($groups_activity as $activity => $id)
+			$groups[] = array("id" => $id, "activity" => $activity);
+
+		$out = array();
+		while(count($friends) != 0 || count($groups) != 0) {
+
+			if(count($friends) == 0)
+				$type = self::MEMBERSHIP_GROUP;
+			
+			else if(count($groups) == 0)
+				$type = self::MEMBERSHIP_FRIEND;
+			
+			else if($friends[0]->getLastActivityTime() > $groups[0]["activity"])
+				$type = self::MEMBERSHIP_FRIEND;
+			
+			else
+				$type = self::MEMBERSHIP_GROUP;
+			
+			// In case of friend
+			if($type == self::MEMBERSHIP_FRIEND){
+				$out[] = array(
+					"type" => $type,
+					"friend" => friendsController::parseFriendAPI(array_shift($friends))
+				);
+			}
+
+			// In case of group
+			else {
+				$info = array_shift($groups);
+				$out[] = array(
+					"type" => $type,
+					"id" => (int)$info["id"],
+					"last_activity" => $info["activity"]
+				);
+			}
+
+		}
+
+
+		return $out;
+	}
+
+}

RestControllers/accountController.php

@@ -393,7 +393,7 @@ class accountController {
 		user_login_required();
 		check_post_password(userID, "password");
 
-		//Try to delet the account
+		//Try to delete the account
 		if(!components()->account->delete(userID))
 			Rest_fatal_error(500, "An error occurred while trying to delete your account!");
 		

RestControllers/friendsController.php

@@ -38,7 +38,7 @@ class friendsController{
 		}
 
 		//Update the last activity of the user
-		CS::get()->components->user->updateLastActivity(userID);
+		update_last_user_activity_if_allowed();
 
 		//Return list
 		return $api_list;
@@ -113,6 +113,10 @@ class friendsController{
 		//Get target ID
 		$friendID = getPostUserID('friendID');
 
+		//Check if the current user is requesting himself as friend
+		if($friendID == userID)
+			Rest_fatal_error(401, "You can not become a friend to yourself!");
+
 		//Check if the two persons are already friend
 		if(CS::get()->components->friends->are_friend(userID, $friendID))
 			Rest_fatal_error(401, "The two personns are already friend !");
@@ -326,7 +330,7 @@ class friendsController{
 		
 		//Update status
 		if(!components()->friends->set_can_post_texts(userID, $friendID, $can_post_texts))
-			Rest_fatal_error(500, "Coudl not update friendship status !");
+			Rest_fatal_error(500, "Could not update friendship status !");
 
 		//Success
 		return array("success" => "Updated authorization status !");

RestControllers/notificationsController.php

@@ -40,11 +40,23 @@ class notificationsController {
 		user_login_required();
 
 		//Get and return the data
-		return array(
+		$data = array(
 			"notifications" => components()->notifications->count_unread(userID),
 			"conversations" => components()->conversations->number_user_unread(userID)
 		);
 
+		//Include friendship requests if required
+		if(isset($_POST["friends_request"]))
+			if(postBool("friends_request"))
+				$data["friends_request"] = components()->friends->count_requests(userID);
+
+		
+		//Include pending calls if required
+		if(isset($_POST["include_calls"]))
+			if(postBool("include_calls"))
+				$data["calls"] = components()->calls->countPendingResponsesForUser(userID);
+
+		return $data;
 	}
 
 

RestControllers/userController.php

@@ -129,7 +129,7 @@ class userController
 		user_login_required();
 
 		//Update last user activity
-		CS::get()->components->user->updateLastActivity(userID);
+		update_last_user_activity_if_allowed();
 
 		//Return userID
 		return array("userID" => userID);

bin/clean_calls

@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+
+############################
+# ComunicAPI calls cleaner #
+#                          #
+#  @author Pierre HUBERT   #
+############################
+
+Automatically remove old calls
+
+<?php
+
+require __DIR__."/../init.php";
+
+if(!components()->calls->cleanCalls())
+	echo "Could not clean calls!";
+
+echo "Calls successfully cleaned.";

bin/clean_calls_perpetual.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Clean call on a long period
+# This script is made to be used on dev machines only
+# @author Pierre HUBERT
+
+# Place us in current directory
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_DIR;
+
+while true; do
+	./clean_calls
+	sleep 30;
+done

classes/APIClients.php

@@ -7,6 +7,12 @@
 
 class APIClients {
 	
+	/**
+	 * Tables name
+	 */
+	const SERVICES_TOKENS_TABLE = DBprefix."api_services_tokens";
+	const USERS_TOKENS_TABLE = DBprefix."api_users_tokens";
+
 	/**
 	 * Check request client tokens
 	 *
@@ -21,7 +27,7 @@ class APIClients {
 			return false;
 
 		//Save service ID in a constant
-		define("APIServiceID", $serviceInfos["ID"]);
+		define("APIServiceID", $serviceInfos["id"]);
 
 		//Save service domain in a constant (if any)
 		if($serviceInfos["clientDomain"] != "")
@@ -40,8 +46,8 @@ class APIClients {
 	 */
 	private function validateClientTokens(string $serviceName, string $token) {
 		//Prepare DataBase request
-		$tableName = CS::get()->config->get("dbprefix")."API_ServicesToken";
+		$tableName = self::SERVICES_TOKENS_TABLE;
-		$conditions = "WHERE serviceName = ? AND token = ?";
+		$conditions = "WHERE service_name = ? AND token = ?";
 		$values = array(
 			$serviceName,
 			$token
@@ -58,7 +64,7 @@ class APIClients {
 			//The API is correctly identified
 			//Generate client informations
 			$clientInformations = array(
-				"ID" => $requestResult[0]['ID'],
+				"id" => $requestResult[0]['id'],
 				"clientDomain" => ($requestResult[0]["client_domain"] == "" ? false : $requestResult[0]["client_domain"])
 			);
 
@@ -80,7 +86,7 @@ class APIClients {
 		$entry = self::APIClientsToDb($client);
 
 		//Insert the entry in the database
-		$tableName = CS::get()->config->get("dbprefix")."API_ServicesToken";
+		$tableName = self::SERVICES_TOKENS_TABLE;
 		return CS::get()->db->addLine($tableName, $entry);
 	}
 
@@ -95,7 +101,7 @@ class APIClients {
 		$data = array();
 
 		$data["time_insert"] = $client->get_time_insert();
-		$data["serviceName"] = $client->get_name();
+		$data["service_name"] = $client->get_name();
 		$data["token"] = $client->get_token();
 		if($client->has_client_domain())
 			$data["client_domain"] = $client->get_client_domain();

classes/components/AccountComponent.php

@@ -12,18 +12,6 @@ class AccountComponent {
 	 */
 	const USER_TABLE = "utilisateurs";
 
-	/**
-	 * @var String $userLoginAPItable The name of the table that contains logins performed on the API
-	 */
-	private $userLoginAPItable = "";
-
-	/**
-	 * Public constructor
-	 */
-	public function __construct(){
-		$this->userLoginAPItable = CS::get()->config->get("dbprefix")."API_userLoginToken";
-	}
-
 	/**
 	 * Try to login user with returning a service token
 	 * 
@@ -61,10 +49,10 @@ class AccountComponent {
 		$token2 = random_str(75);
 
 		//Insert token in the database
-		$tableName = $this->userLoginAPItable;
+		$tableName = APIClients::USERS_TOKENS_TABLE;
 		$insertValues = array(
-			"ID_utilisateurs" => $userID,
+			"user_id" => $userID,
-			"ID_".CS::get()->config->get("dbprefix")."API_ServicesToken" => $serviceID,
+			"service_id" => $serviceID,
 			"token1" => $token1,
 			"token2" => $token2
 		);
@@ -84,12 +72,12 @@ class AccountComponent {
 	 */
 	private function getUserLoginTokenByIDs(int $userID, int $serviceID) {
 		//Prepare database request
-		$conditions = "WHERE ID_utilisateurs = ? AND ID_".CS::get()->config->get("dbprefix")."API_ServicesToken = ?";
+		$conditions = "WHERE user_id = ? AND service_id = ?";
 		$values = array(
 			$userID,
 			$serviceID
 		);
-		$tokenInfos = CS::get()->db->select($this->userLoginAPItable, $conditions, $values);
+		$tokenInfos = CS::get()->db->select(APIClients::USERS_TOKENS_TABLE, $conditions, $values);
 		
 		if(count($tokenInfos) == 0)
 			return false; //There is nobody at this address
@@ -111,14 +99,14 @@ class AccountComponent {
 	public function deleteUserLoginToken(int $userID, string $serviceID) : bool {
 
 		//Prepare database request
-		$condition = "ID_utilisateurs = ? AND ID_".CS::get()->config->get("dbprefix")."API_ServicesToken = ?";
+		$condition = "user_id = ? AND service_id = ?";
 		$values = array(
 			$userID,
 			$serviceID
 		);
 
 		//Try to perform request
-		if(!CS::get()->db->deleteEntry($this->userLoginAPItable, $condition, $values))
+		if(!CS::get()->db->deleteEntry(APIClients::USERS_TOKENS_TABLE, $condition, $values))
 			return false; //Something went wrong during the request
 		
 		//Everything is ok
@@ -135,13 +123,13 @@ class AccountComponent {
 	public function deleteAllUserLoginTokens(int $userID) : bool {
 
 		//Prepare database request
-		$condition = "ID_utilisateurs = ?";
+		$condition = "user_id = ?";
 		$values = array(
 			$userID
 		);
 
 		//Try to perform request
-		if(!CS::get()->db->deleteEntry($this->userLoginAPItable, $condition, $values))
+		if(!CS::get()->db->deleteEntry(APIClients::USERS_TOKENS_TABLE, $condition, $values))
 			return false; //Something went wrong during the request
 		
 		//Everything is ok
@@ -162,8 +150,8 @@ class AccountComponent {
 			return 0;
 		
 		//Prepare database request
-		$tablesName = $this->userLoginAPItable;
+		$tablesName = APIClients::USERS_TOKENS_TABLE;
-		$conditions = "WHERE ".$this->userLoginAPItable.".ID_".CS::get()->config->get("dbprefix")."API_ServicesToken = ? AND ".$this->userLoginAPItable.".token1 = ? AND ".$this->userLoginAPItable.".token2 = ?";
+		$conditions = "WHERE ".APIClients::USERS_TOKENS_TABLE.".service_id = ? AND ".APIClients::USERS_TOKENS_TABLE.".token1 = ? AND ".APIClients::USERS_TOKENS_TABLE.".token2 = ?";
 		$conditionsValues = array(
 			$serviceID,
 			$tokens[0],
@@ -178,7 +166,7 @@ class AccountComponent {
 			return 0; //No result
 
 		//Return ID
-		return $userInfos[0]["ID_utilisateurs"];
+		return $userInfos[0]["user_id"];
 	}
 
 	/**
@@ -421,8 +409,12 @@ class AccountComponent {
 	 */
 	public function delete(int $userID) : bool {
 
+		/*//Delete all group memberships
+		if(!components()->groups->deleteAllUsersGroups($userID))
+			return FALSE;
+
 		//Delete user comments
-		/*if(!components()->comments->deleteAllUser($userID))
+		if(!components()->comments->deleteAllUser($userID))
 			return false;
 
 		//Delete user posts
@@ -461,6 +453,10 @@ class AccountComponent {
 		if(!components()->accountImage->delete($userID))
 			return FALSE;
 		
+		//Delete all the likes on the user page
+		if(!components()->likes->delete_all($userID, Likes::LIKE_USER))
+			return FALSE;
+		
 		if(!components()->backgroundImage->delete($userID))
 			return FALSE;
 

classes/components/AccountImage.php

@@ -114,8 +114,8 @@ class AccountImage {
 		//Check for personnalized level
 		$fileContent = file_get_contents($filePath);
 
-			//Return visibility level
+		//Return visibility level
-			return $fileContent;
+		return (int)$fileContent;
 	}
 
 	/**

classes/components/CallsComponent.php

@@ -0,0 +1,410 @@
+<?php
+/**
+ * Calls components
+ * 
+ * @author Pierre HUBERT
+ */
+
+class CallsComponents {
+
+	/**
+	 * Calls tables names
+	 */
+	private const CALLS_LIST_TABLE = "comunic_calls";
+	private const CALLS_MEMBERS_TABLE = "comunic_calls_members";
+
+	/**
+	 * Get and return calls configuration
+	 * 
+	 * @return CallsConfig Calls configuration / invalid object
+	 * if none found (empty config)
+	 */
+	public function getConfig() : CallsConfig {
+
+		$callConfig = cs()->config->get("calls");
+
+		//If no call config was found
+		if(!$callConfig || !is_array($callConfig) || !$callConfig["enabled"])
+			return new CallsConfig();
+
+		$config = new CallsConfig();
+		$config->set_enabled($callConfig["enabled"]);
+		$config->set_maximum_number_members($callConfig["maximum_number_members"]);
+		$config->set_signal_server_name($callConfig["signal_server_name"]);
+		$config->set_signal_server_port($callConfig["signal_server_port"]);
+		$config->set_is_signal_server_secure($callConfig["is_signal_server_secure"]);
+		$config->set_stun_server($callConfig["stun_server"]);
+		$config->set_turn_server($callConfig["turn_server"]);
+		$config->set_turn_username($callConfig["turn_username"]);
+		$config->set_turn_password($callConfig["turn_password"]);
+
+		return $config;
+	}
+
+	/**
+	 * Get the call for a conversation
+	 * 
+	 * @param $conversation_id Target conversation ID
+	 * @param $load_members Specify whether members information should
+	 * be loaded too or not
+	 * @return CallInformation Matching call information object / invalid object
+	 * in case of failure
+	 */
+	public function getForConversation(int $conversation_id, bool $load_members) : CallInformation {
+		
+		$entry = db()->select(
+			self::CALLS_LIST_TABLE, 
+			"WHERE conversation_id = ?",
+			array($conversation_id)
+		);
+
+		if(count($entry) == 0)
+			return new CallInformation();
+		
+		$info = self::DBToCallInformation($entry[0]);
+
+		//Load call members if required
+		if($load_members && !$this->getMembers($info))
+			return new CallInformation();
+
+
+		return $info;
+	}
+
+	/**
+	 * Get information about a call
+	 * 
+	 * @param $call_id Target call ID
+	 * @param $load_members Specify whether members information should
+	 * be loaded too or not
+	 * @return CallInformation Matching call information object / invalid object
+	 * in case of failure
+	 */
+	public function get(int $call_id, bool $load_members) : CallInformation {
+		
+		$entry = db()->select(
+			self::CALLS_LIST_TABLE, 
+			"WHERE id = ?",
+			array($call_id)
+		);
+
+		if(count($entry) == 0)
+			return new CallInformation();
+		
+		$info = self::DBToCallInformation($entry[0]);
+
+		//Load call members if required
+		if($load_members && !$this->getMembers($info))
+			return new CallInformation();
+
+
+		return $info;
+	}
+
+	/**
+	 * Update last activity time of a conversation
+	 * 
+	 * @param $call_id The ID of the call to update
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function updateLastActivity(int $call_id) : bool {
+
+		return db()->updateDB(
+			self::CALLS_LIST_TABLE,
+			"id = ?",
+			array(
+				"last_active" => time()
+			),
+			array(
+				$call_id
+			)
+		);
+
+	}
+
+	/**
+	 * Get the next call for a user
+	 * 
+	 * @param $userID Target user ID
+	 * @param $load_members Specify whether information about members 
+	 * should be loaded or not
+	 * @return CallInformation Information about the call / invalid object
+	 * if none found
+	 */
+	public function getNextPendingForUser(int $userID, bool $load_members) : CallInformation {
+
+		//Get the ID of a call the user has not responded yet
+		$entries = db()->select(
+			self::CALLS_MEMBERS_TABLE,
+			"WHERE user_id = ? AND status = ?",
+			array($userID, CallMemberInformation::USER_UNKNOWN),
+			array("call_id")
+		);
+
+		//Check if the user has no pending call
+		if(count($entries) == 0)
+			return new CallInformation();
+		
+		return $this->get($entries[0]["call_id"], $load_members);
+
+	}
+
+	/**
+	 * Create a call for a conversation
+	 * 
+	 * @param $conversationID The ID of the target conversation
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function createForConversation(int $conversationID) : bool {
+
+		//Generate call information
+		$info = new CallInformation();
+		$info->set_conversation_id($conversationID);
+		$info->set_last_active(time());
+
+		//We need to get the list of members of the conversation to create members list
+		$conversation_members = components()->conversations->getConversationMembers($conversationID);
+
+		//Check for errors
+		if(count($conversation_members) == 0)
+			return false;
+
+		
+		//Insert the call in the database to get its ID
+		if(!db()->addLine(
+			self::CALLS_LIST_TABLE,
+			self::CallInformationToDB($info)
+		))
+			return false;
+		$info->set_id(db()->getLastInsertedID());
+
+		foreach($conversation_members as $memberID){
+			$member = new CallMemberInformation();
+			$member->set_call_id($info->get_id());
+			$member->set_userID($memberID);
+			$member->set_user_call_id(random_str(190));
+			$member->set_status(CallMemberInformation::USER_UNKNOWN);
+
+			//Try to add the member to the list
+			if(!$this->addMember($member))
+				return false;
+		}
+
+		//Success
+		return true;
+	}
+
+	/**
+	 * Add a new member to a call
+	 * 
+	 * @param $member Information about the member to add
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	private function addMember(CallMemberInformation $member) : bool {
+		return db()->addLine(
+			self::CALLS_MEMBERS_TABLE,
+			self::CallMemberInformationToDB($member)
+		);
+	}
+
+	/**
+	 * Load information about the members related to the call
+	 * 
+	 * @param $info Information about the call to process
+	 * @return bool TRUE in case of success / FALSE else
+	 */
+	private function getMembers(CallInformation $info) : bool {
+
+		$entries = db()->select(
+			self::CALLS_MEMBERS_TABLE,
+			"WHERE call_id = ?",
+			array($info->get_id())
+		);
+		
+		foreach($entries as $entry)
+			$info->add_member(self::DBToCallMemberInformation($entry));
+		
+		return count($entries) > 0;
+	}
+
+	/**
+	 * Count and return the number of pending calls for a user
+	 * 
+	 * @param $userID The ID of the target user
+	 * @return int The number of pending calls for the user
+	 */
+	public function countPendingResponsesForUser(int $userID) : int {
+
+		return db()->count(
+			self::CALLS_MEMBERS_TABLE,
+			"WHERE user_id = ? AND status = ?",
+			array($userID, CallMemberInformation::USER_UNKNOWN)
+		);
+
+	}
+
+	/**
+	 * Check out whether a user belongs to a call or not
+	 * 
+	 * @param $callID The ID of the target call
+	 * @param $userID The ID of the target user
+	 * @return bool TRUE if the user belongs to the call / FALSE else
+	 */
+	public function doesUserBelongToCall(int $callID, int $userID) : bool {
+		return db()->count(
+			self::CALLS_MEMBERS_TABLE,
+			"WHERE call_id = ? AND user_id = ?",
+			array($callID, $userID)
+		) > 0;
+	}
+
+	/**
+	 * Set the response of a member to a call
+	 * 
+	 * @param $callID The ID of the target call
+	 * @param $userID The ID of the target member
+	 * @param $accept TRUE to accept the call / FALSE else
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function setMemberResponse(int $callID, int $userID, bool $accept) : bool {
+		return $this->setMemberStatus(
+			$accept ? CallMemberInformation::USER_ACCEPTED : CallMemberInformation::USER_REJECTED, $callID, $userID);
+	}
+
+	/**
+	 * Make user hang up the call
+	 * 
+	 * @param int $callID Target call ID
+	 * @param int $userID Target user ID
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function setMemberHangUp(int $callID, int $userID) : bool {
+		return $this->setMemberStatus(CallMemberInformation::USER_HANG_UP, $callID, $userID);
+	}
+
+	/**
+	 * Update member status
+	 * 
+	 * @param $status New status for the user
+	 * @param $callID Target call ID
+	 * @param $userID Target user ID
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	private function setMemberStatus(int $status, int $callID, int $userID){
+		db()->updateDB(
+			self::CALLS_MEMBERS_TABLE,
+			"call_id = ? AND user_id = ?",
+			array(
+				"status" => $status
+			),
+			array(
+				$callID,
+				$userID
+			)
+		);
+
+		return true;
+	}
+
+	/**
+	 * Delete all old call
+	 * 
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function cleanCalls() : bool {
+
+		//Compute timeout time
+		$old_time = time() - cs()->config->get("calls_expiration");
+		
+		//Get the list of old calls
+		$calls = db()->select(
+			self::CALLS_LIST_TABLE,
+			"WHERE last_active < ?",
+			array($old_time),
+			array("id")
+		);
+
+		//Process each result
+		foreach($calls as $call){
+
+			//Delete all the members of the call
+			db()->deleteEntry(
+				self::CALLS_MEMBERS_TABLE,
+				"call_id = ?",
+				array($call["id"])
+			);
+
+		}
+
+		//Delete calls entries
+		db()->deleteEntry(
+			self::CALLS_LIST_TABLE,
+			"last_active < ?",
+			array($old_time)
+		);
+
+		//Success
+		return true;
+	}
+
+	/**
+	 * Turn a database entry into a CallInformation object
+	 * 
+	 * @param $entry The entry to convert
+	 * @return CallInformation Generated object
+	 */
+	private static function DBToCallInformation(array $entry) : CallInformation {
+		$info = new CallInformation();
+		$info->set_id($entry["id"]);
+		$info->set_conversation_id($entry["conversation_id"]);
+		$info->set_last_active($entry["last_active"]);
+		return $info;
+	}
+
+	/**
+	 * Turn a CallInformation object into a database entry
+	 * 
+	 * @param $call Call information object to convert
+	 * @return array Generated array
+	 */
+	private static function CallInformationToDB(CallInformation $call) : array {
+		$data = array();
+		$data["conversation_id"] = $call->get_conversation_id();
+		$data["last_active"] = $call->get_last_active();
+		return $data;
+	}
+
+	/**
+	 * Turn a database entry into a CallMemberInformation object
+	 * 
+	 * @param $entry The entry to convert
+	 * @return CallMemberInformation Generated object
+	 */
+	private static function DBToCallMemberInformation(array $entry) : CallMemberInformation {
+		$member = new CallMemberInformation();
+		$member->set_id($entry["id"]);
+		$member->set_call_id($entry["call_id"]);
+		$member->set_userID($entry["user_id"]);
+		$member->set_user_call_id($entry["user_call_id"]);
+		$member->set_status($entry["status"]);
+		return $member;
+	}
+
+	/**
+	 * Turn a CallMemberInformation object into a database entry
+	 * 
+	 * @param $member The member to convert
+	 * @return array Generated database entry
+	 */
+	private static function CallMemberInformationToDB(CallMemberInformation $member) : array {
+		$data = array();
+		$data["call_id"] = $member->get_call_id();
+		$data["user_id"] = $member->get_userID();
+		$data["user_call_id"] = $member->get_user_call_id();
+		$data["status"] = $member->get_status();
+		return $data;
+	}
+}
+
+//Register class
+Components::register("calls", new CallsComponents());

classes/components/Conversations.php

@@ -8,29 +8,11 @@
 class Conversations {
 
 	/**
-	 * @var String $conversationsListTable Name of the conversation list table 
+	 * Tables name definition
 	 */
-	private $conversationsListTable;
+	const LIST_TABLE = DBprefix."conversations_list";
-
+	const USERS_TABLE = DBprefix."conversations_users";
-	/**
+	const MESSAGES_TABLE = DBprefix."conversations_messages";
-	 * @var String $conversationsUsersTable Name of the conversation users table 
-	 */
-	private $conversationsUsersTable;
-
-	/**
-	 * @var String $conversationMessagesTabel Name of the conversation messages table
-	 */
-	private $conversationsMessagesTable;
-
-
-	/**
-	 * Public constructor
-	 */
-	public function __construct(){
-		$this->conversationsListTable = CS::get()->config->get("dbprefix")."conversations_list";
-		$this->conversationsUsersTable = CS::get()->config->get("dbprefix")."conversations_users";
-		$this->conversationsMessagesTable = CS::get()->config->get("dbprefix")."conversations_messages";
-	}
 
 	/**
 	 * Get the conversations list of a specified user
@@ -43,19 +25,19 @@ class Conversations {
 	public function getList(int $userID, int $conversationID = 0){
 
 		//Prepare database request
-		$tablesName = $this->conversationsListTable.", ".$this->conversationsUsersTable;
+		$tablesName = self::LIST_TABLE.", ".self::USERS_TABLE;
 		
 		//Prepare conditions
-		$tableJoinCondition = $this->conversationsListTable.".ID = ".$this->conversationsUsersTable.".ID_".$this->conversationsListTable."";
+		$tableJoinCondition = self::LIST_TABLE.".id = ".self::USERS_TABLE.".conv_id";
-		$userCondition = $this->conversationsUsersTable.".ID_utilisateurs = ?";
+		$userCondition = self::USERS_TABLE.".user_id = ?";
-		$orderResults = "ORDER BY ".$this->conversationsListTable.".last_active DESC";
+		$orderResults = "ORDER BY ".self::LIST_TABLE.".last_active DESC";
 
 		//Specify conditions values
 		$conditionsValues = array($userID);
 
 		//Check if we have to get informations about just one conversation
 		if($conversationID != 0){
-			$specificConditions = "AND ".$this->conversationsListTable.".ID  = ?";
+			$specificConditions = "AND ".self::LIST_TABLE.".id  = ?";
 			$conditionsValues[] = $conversationID;
 		}
 		else
@@ -66,12 +48,12 @@ class Conversations {
 		
 		//Fields list
 		$requiredFields = array(
-			$this->conversationsListTable.".ID",
+			self::LIST_TABLE.".id",
-			$this->conversationsListTable.".last_active",
+			self::LIST_TABLE.".last_active",
-			$this->conversationsListTable.".name",
+			self::LIST_TABLE.".name",
-			$this->conversationsListTable.".ID_utilisateurs AS ID_owner",
+			self::LIST_TABLE.".user_id AS owner_id",
-			$this->conversationsUsersTable.".following",
+			self::USERS_TABLE.".following",
-			$this->conversationsUsersTable.".saw_last_message",
+			self::USERS_TABLE.".saw_last_message",
 		);
 
 		//Perform database request
@@ -101,10 +83,10 @@ class Conversations {
 	public function getConversationMembers(int $conversationID) : array {
 
 		//Perform a request on the database
-		$tableName = $this->conversationsUsersTable;
+		$tableName = self::USERS_TABLE;
-		$conditions = "WHERE ID_".$this->conversationsListTable." = ?";
+		$conditions = "WHERE conv_id = ?";
 		$conditionsValues = array($conversationID*1);
-		$getFields = array("ID_utilisateurs as userID");
+		$getFields = array("user_id");
 
 		//Perform the request
 		$results = CS::get()->db->select($tableName, $conditions, $conditionsValues, $getFields);
@@ -116,7 +98,7 @@ class Conversations {
 		$membersList = array();
 
 		foreach($results as $processUser)
-			$membersList[] = $processUser["userID"];
+			$membersList[] = $processUser["user_id"];
 
 		//Return result
 		return $membersList;
@@ -131,18 +113,18 @@ class Conversations {
 	public function create(ConversationInfo $conv) : int{
 		
 		$mainInformations = array(
-			"ID_utilisateurs" => $conv->get_id_owner(),
+			"user_id" => $conv->get_id_owner(),
 			"name" => ($conv->has_name() ? $conv->get_name() : ""),
 			"last_active" => time(),
 			"creation_time" => time()
 		);
 
 		//First, insert the conversation in the main table
-		if(!CS::get()->db->addLine($this->conversationsListTable, $mainInformations))
+		if(!CS::get()->db->addLine(self::LIST_TABLE, $mainInformations))
 			return 0; //An error occured
 		
 		//Get the last inserted ID
-		$conversationID = CS::get()->db->getLastInsertedID();
+		$conversationID = db()->getLastInsertedID();
 
 		//Check for errors
 		if($conversationID == 0)
@@ -175,8 +157,8 @@ class Conversations {
 	public function userBelongsTo(int $userID, int $conversationID) : bool {
 		
 		//Prepare a request on the database
-		$tableName = $this->conversationsUsersTable;
+		$tableName = self::USERS_TABLE;
-		$conditions = "WHERE ID_".$this->conversationsListTable." = ? AND ID_utilisateurs = ?";
+		$conditions = "WHERE conv_id = ? AND user_id = ?";
 		$values = array(
 			$conversationID,
 			$userID
@@ -204,8 +186,8 @@ class Conversations {
 	public function changeFollowState(int $userID, int $conversationID, bool $follow) : bool{
 		
 		//Prepare the request on the database
-		$tableName = $this->conversationsUsersTable;
+		$tableName = self::USERS_TABLE;
-		$conditions = "ID_".$this->conversationsListTable." = ? AND ID_utilisateurs = ?";
+		$conditions = "conv_id = ? AND user_id = ?";
 		$condVals = array(
 			$conversationID,
 			$userID
@@ -233,8 +215,8 @@ class Conversations {
 	 */
 	public function changeName(int $conversationID, string $conversationName) : bool{
 		//Prepare database request
-		$tableName = $this->conversationsListTable;
+		$tableName = self::LIST_TABLE;
-		$conditions = "ID = ?";
+		$conditions = "id = ?";
 		$condVals = array($conversationID);
 
 		//Changes
@@ -295,10 +277,10 @@ class Conversations {
 	private function addMember(int $conversationID, int $userID, bool $follow = false) : bool {
 
 		//Prepare database request
-		$tableName = $this->conversationsUsersTable;
+		$tableName = self::USERS_TABLE;
 		$values = array(
-			"ID_".$this->conversationsListTable => $conversationID,
+			"conv_id" => $conversationID,
-			"ID_utilisateurs" => $userID,
+			"user_id" => $userID,
 			"time_add" => time(),
 			"following" => $follow ? 1 : 0,
 			"saw_last_message" => 1
@@ -317,8 +299,8 @@ class Conversations {
 	 */
 	private function removeMember(int $conversationID, int $userID) : bool {
 		//Prepare database request
-		$tableName = $this->conversationsUsersTable;
+		$tableName = self::USERS_TABLE;
-		$conditions = "ID_".$this->conversationsListTable." = ? AND ID_utilisateurs = ?";
+		$conditions = "conv_id = ? AND user_id = ?";
 		$values = array(
 			$conversationID,
 			$userID
@@ -337,11 +319,11 @@ class Conversations {
 	 */
 	public function userIsModerator(int $userID, int $conversationID) : bool {
 		//Prepare database request
-		$tableName = $this->conversationsListTable;
+		$tableName = self::LIST_TABLE;
-		$conditions = "WHERE ID = ?";
+		$conditions = "WHERE id = ?";
 		$values = array($conversationID);
 		$requiredFields = array(
-			"ID_utilisateurs"
+			"user_id"
 		);
 
 		//Peform a request on the database
@@ -356,7 +338,22 @@ class Conversations {
 			return false;
 
 		//Check the first result only
-		return $results[0]["ID_utilisateurs"] == $userID;
+		return $results[0]["user_id"] == $userID;
+	}
+
+	/**
+	 * Check whether a user is the owner of a conversation message or not
+	 * 
+	 * @param int $userID Target user ID
+	 * @param int $messageID Target message
+	 * @return bool TRUE if the user is the owner of the conversation / FALSE else
+	 */
+	public function isOwnerMessage(int $userID, int $messageID) : bool {
+		return db()->count(
+			self::MESSAGES_TABLE, 
+			"WHERE id  = ? AND user_id = ?",
+			array($messageID, $userID)
+		) > 0;
 	}
 
 	/**
@@ -369,22 +366,22 @@ class Conversations {
 	public function findPrivate(int $user1, int $user2) : array{
 		
 		//Prepare database request
-		$tableName = $this->conversationsUsersTable." AS table1 JOIN ".
+		$tableName = self::USERS_TABLE." AS table1 JOIN ".
-			$this->conversationsUsersTable." AS table2 JOIN ".
+			self::USERS_TABLE." AS table2 JOIN ".
-			$this->conversationsUsersTable." AS table3";
+			self::USERS_TABLE." AS table3";
 		
 		//Prepare conditions
-		$joinCondition = "(table1.ID_".$this->conversationsListTable." = table2.ID_".$this->conversationsListTable.")".
+		$joinCondition = "(table1.conv_id = table2.conv_id)".
-			"AND (table1.ID_".$this->conversationsListTable." = table3.ID_".$this->conversationsListTable.")";
+			"AND (table1.conv_id = table3.conv_id)";
-		$whereConditions = "table1.ID_utilisateurs = ? AND table2.ID_utilisateurs = ?";
+		$whereConditions = "table1.user_id = ? AND table2.user_id = ?";
-		$groupCondition = "table1.ID_".$this->conversationsListTable." having count(*) = 2";
+		$groupCondition = "table1.conv_id having count(*) = 2";
 
 		//Conditions values
 		$condValues = array($user1, $user2);
 
 		//Required fields
 		$requiredFields = array(
-			"table1.ID_".$this->conversationsListTable." as conversationID",
+			"table1.conv_id as conversationID",
 		);
 
 		//Build conditions
@@ -415,11 +412,11 @@ class Conversations {
 	private function insertMessage(NewConversationMessage $message) : bool {
 
 		//Prepare values
-		$tableName = $this->conversationsMessagesTable;
+		$tableName = self::MESSAGES_TABLE;
 		$values = array(
-			"ID_".$this->conversationsListTable => $message->get_conversationID(),
+			"conv_id" => $message->get_conversationID(),
-			"ID_utilisateurs" => $message->get_userID(),
+			"user_id" => $message->get_userID(),
-			"time_insert" => time(),
+			"time_insert" => $message->get_time_sent(),
 			"message" => $message->has_message() ? $message->get_message() : ""
 		);
 
@@ -445,8 +442,8 @@ class Conversations {
 	private function updateLastActive(int $conversationID, int $time) : bool{
 
 		//Perform a request on the database
-		$tableName = $this->conversationsListTable;
+		$tableName = self::LIST_TABLE;
-		$conditions = "ID = ?";
+		$conditions = "id = ?";
 		$condVals = array($conversationID);
 
 		//Set new values
@@ -472,13 +469,13 @@ class Conversations {
 	private function allUsersAsUnread(int $conversationID, array $exceptions) : bool{
 
 		//Prepare request
-		$tableName = $this->conversationsUsersTable;
+		$tableName = self::USERS_TABLE;
-		$conditions = "ID_".$this->conversationsListTable." = ?";
+		$conditions = "conv_id = ?";
 		$condVals = array($conversationID);
 
 		//Remove users exceptions
 		foreach($exceptions as $userID){
-			$conditions.= " AND ID_utilisateurs != ?";
+			$conditions.= " AND user_id != ?";
 			$condVals[] = $userID;
 		}
 
@@ -505,8 +502,8 @@ class Conversations {
 	public function markUserAsRead(int $userID, int $conversationID) : bool {
 
 		//Prepare database request
-		$tableName = $this->conversationsUsersTable;
+		$tableName = self::USERS_TABLE;
-		$conditions = "ID_".$this->conversationsListTable." = ? AND ID_utilisateurs = ?";
+		$conditions = "conv_id = ? AND user_id = ?";
 		$condVals = array(
 			$conversationID,
 			$userID
@@ -536,12 +533,15 @@ class Conversations {
 		//GUIDE LINE : this method act like a "controller" : it doesn't perform any database operation
 		//But it manages all operations (insert message; save image; inform other users; ...)
 
+		//Set unique message time
+		$message->set_time_sent(time());
+
 		//First, try to insert the message
 		if(!$this->insertMessage($message))
 			return false; //An error occured
 		
 		//Then, update the last activity of the conversation
-		if(!$this->updateLastActive($message->get_conversationID(), time()))
+		if(!$this->updateLastActive($message->get_conversationID(), $message->get_time_sent()))
 			return false; //An error occured (2)
 		
 		//Then, set all the users of the conversation as unread
@@ -552,6 +552,24 @@ class Conversations {
 		 return true;
 	}
 
+	/**
+	 * Update a message
+	 * 
+	 * @param ConversationMessage $message Information about the message to update
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function updateMessage(ConversationMessage $message) : bool {
+		
+		$modifs = array();
+
+		//Check if the content of message has to be updated
+		if($message->has_message())
+			$modifs["message"] = $message->get_message();
+
+		//Peform update
+		return db()->updateDB(self::MESSAGES_TABLE, "id = ?", $modifs, array($message->get_id()));
+	}
+
 	/**
 	 * Get the last messages of a conversation
 	 *
@@ -562,7 +580,7 @@ class Conversations {
 	public function getLastMessages(int $conversationID, int $numberOfMessages) : array {
 
 		//Define conditions
-		$conditions = "WHERE ID_".$this->conversationsListTable." = ? ORDER BY ID DESC LIMIT ".($numberOfMessages*1);
+		$conditions = "WHERE conv_id = ? ORDER BY id DESC LIMIT ".($numberOfMessages*1);
 		$condVals = array(
 			$conversationID
 		);
@@ -587,7 +605,7 @@ class Conversations {
 	public function getNewMessages(int $conversationID, int $lastMessageID) : array {
 
 		//Define conditions
-		$conditions = "WHERE ID_".$this->conversationsListTable." = ? AND ID > ? ORDER BY ID";
+		$conditions = "WHERE conv_id = ? AND ID > ? ORDER BY id";
 		$condVals = array(
 			$conversationID,
 			$lastMessageID
@@ -611,7 +629,7 @@ class Conversations {
 	public function getOlderMessages(int $conversationID, int $startID, int $limit) : array {
 
 		//Define conditions
-		$conditions = "WHERE ID_".$this->conversationsListTable." = ? AND ID < ? ORDER BY ID DESC LIMIT ".($limit);
+		$conditions = "WHERE conv_id = ? AND ID < ? ORDER BY id DESC LIMIT ".($limit);
 		$condVals = array(
 			$conversationID,
 			$startID + 1
@@ -637,7 +655,7 @@ class Conversations {
 	public function getAllMessages(int $conversationID) : array {
 
 		//Define conditions
-		$conditions = "WHERE ID_".$this->conversationsListTable." = ? ORDER BY ID";
+		$conditions = "WHERE conv_id = ? ORDER BY id";
 		$condVals = array(
 			$conversationID
 		);
@@ -658,9 +676,9 @@ class Conversations {
 	public function exist(int $convID) : bool {
 
 		//Perform a request on the database
-		$tableName = $this->conversationsListTable;
+		$tableName = self::LIST_TABLE;
 
-		return CS::get()->db->count($tableName, "WHERE ID = ?", array($convID)) > 0;
+		return CS::get()->db->count($tableName, "WHERE id = ?", array($convID)) > 0;
 
 	}
 
@@ -698,7 +716,7 @@ class Conversations {
 	public function delete_conversation(int $convID) : bool {
 
 		//Get all the messages of the conversation
-		$messages = $this->getMessages("WHERE ID_".$this->conversationsListTable." = ?", array($convID));
+		$messages = $this->getMessages("WHERE conv_id = ?", array($convID));
 
 		//Delete each message
 		foreach($messages as $message){
@@ -733,7 +751,7 @@ class Conversations {
 
 		//Get all the messages of member the conversation
 		$messages = $this->getMessages(
-			"WHERE ID_".$this->conversationsListTable." = ? AND ID_utilisateurs = ?", 
+			"WHERE conv_id = ? AND user_id = ?", 
 			array($convID, $memberID));
 
 		//Delete each message
@@ -750,6 +768,22 @@ class Conversations {
 		return true;
 	}
 
+	/**
+	 * Delete a single conversation message
+	 * 
+	 * @param int $messageID The ID of the message to delete
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function deleteConversationMessage(int $messageID) : bool {
+
+		//Get information about the message
+		$messages = $this->getMessages("WHERE id = ?", array($messageID));
+
+		if(count($messages) < 1)
+			return FALSE; //Message not found
+
+		return $this->delete_message($messages[0]);
+	}
 
 	/**
 	 * Delete a single message of a conversation
@@ -774,7 +808,7 @@ class Conversations {
 		//Delete message from the database
 		$conditions = "ID = ?";
 		$condValues = array($message->get_id());
-		return CS::get()->db->deleteEntry($this->conversationsMessagesTable, $conditions, $condValues);
+		return CS::get()->db->deleteEntry(self::MESSAGES_TABLE, $conditions, $condValues);
 
 	}
 
@@ -787,13 +821,13 @@ class Conversations {
 	private function delete_all_members(int $convID) : bool {
 
 		//Prepare request on the database
-		$conditions = "ID_".$this->conversationsListTable." = ?";
+		$conditions = "conv_id = ?";
 		$values = array(
 			$convID
 		);
 
 		//Try to perform request
-		return CS::get()->db->deleteEntry($this->conversationsUsersTable, $conditions, $values);
+		return CS::get()->db->deleteEntry(self::USERS_TABLE, $conditions, $values);
 
 	}
 
@@ -804,7 +838,7 @@ class Conversations {
 	 * @return bool True in case of success / false else
 	 */
 	private function delete_conversation_entry(int $convID) : bool {
-		return CS::get()->db->deleteEntry($this->conversationsListTable, "ID = ?", array($convID));
+		return CS::get()->db->deleteEntry(self::LIST_TABLE, "id = ?", array($convID));
 	}
 
 	/**
@@ -816,8 +850,8 @@ class Conversations {
 	public function number_user_unread(int $userID) : int {
 
 		//Prepare database request
-		$tableName = $this->conversationsUsersTable;
+		$tableName = self::USERS_TABLE;
-		$conditions = "WHERE ID_utilisateurs = ? AND saw_last_message = 0 AND following = 1";
+		$conditions = "WHERE user_id = ? AND saw_last_message = 0 AND following = 1";
 		$values = array($userID);
 
 		//Perform request and return result
@@ -834,9 +868,9 @@ class Conversations {
 	public function get_list_unread(int $userID) : array {
 
 		//Perform the request on the server
-		$tablesName = $this->conversationsUsersTable." as users, ".$this->conversationsListTable." as list, ".$this->conversationsMessagesTable." as messages";
+		$tablesName = self::USERS_TABLE." as users, ".self::LIST_TABLE." as list, ".self::MESSAGES_TABLE." as messages";
-		$conditions = "WHERE users.ID_utilisateurs = ? AND users.following = 1 AND users.saw_last_message = 0 AND users.ID_comunic_conversations_list = list.ID
+		$conditions = "WHERE users.user_id = ? AND users.following = 1 AND users.saw_last_message = 0 AND users.conv_id = list.id
-		AND list.ID = messages.ID_comunic_conversations_list AND list.last_active = messages.time_insert";
+		AND list.id = messages.conv_id AND list.last_active = messages.time_insert";
 		$values = array($userID);
 
 		//Perform the request
@@ -864,7 +898,7 @@ class Conversations {
 	public function getAllUserMessages(int $userID) : array {
 
 		//Define conditions
-		$conditions = "WHERE ID_utilisateurs = ? ";
+		$conditions = "WHERE user_id = ? ";
 		$condVals = array(
 			$userID
 		);
@@ -929,12 +963,12 @@ class Conversations {
 	private function getMessages(string $conditions, array $conditionsValues = array()) : array{
 
 		//Prepare database request
-		$tableName = $this->conversationsMessagesTable;
+		$tableName = self::MESSAGES_TABLE;
 
 		//Define required fields
 		$requiredFields = array(
-			"ID",
+			"id",
-			"ID_utilisateurs AS ID_user",
+			"user_id",
 			"image_path",
 			"message",
 			"time_insert"
@@ -961,14 +995,14 @@ class Conversations {
 
 		$conv = new ConversationInfo();
 
-		$conv->set_id($entry["ID"]);
+		$conv->set_id($entry["id"]);
-		$conv->set_id_owner($entry["ID_owner"]);
+		$conv->set_id_owner($entry["owner_id"]);
 		$conv->set_last_active($entry["last_active"]);
 		if($entry["name"] != null)
 			$conv->set_name($entry["name"]);
 		$conv->set_following($entry["following"] == 1);
 		$conv->set_saw_last_message($entry["saw_last_message"] == 1);
-		$conv->set_members($this->getConversationMembers($entry["ID"]));
+		$conv->set_members($this->getConversationMembers($entry["id"]));
 
 		return $conv;
 
@@ -984,8 +1018,8 @@ class Conversations {
 
 		$message = new ConversationMessage();
 
-		$message->set_id($entry["ID"]);
+		$message->set_id($entry["id"]);
-		$message->set_userID($entry["ID_user"]);
+		$message->set_userID($entry["user_id"]);
 		$message->set_time_sent($entry["time_insert"]);
 		if($entry["image_path"] != null)
 			$message->set_image_path($entry["image_path"]);
@@ -1006,11 +1040,11 @@ class Conversations {
 		
 		$conversation = new UnreadConversation();
 
-		$conversation->set_id($entry["ID_comunic_conversations_list"]);
+		$conversation->set_id($entry["conv_id"]);
 		if($entry["name"] != null)
 			$conversation->set_conv_name($entry["name"]);
 		$conversation->set_last_active($entry["last_active"]);
-		$conversation->set_userID($entry["ID_utilisateurs"]);
+		$conversation->set_userID($entry["user_id"]);
 		if($entry["message"] != null)
 			$conversation->set_message($entry["message"]);
 

classes/components/GroupsComponent.php

@@ -71,7 +71,7 @@ class GroupsComponent {
 	 * Get the list of groups of a user
 	 * 
 	 * @param int $userID The ID of the target user
-	 * @return array The list of groups of the user
+	 * @return array The list of groups of the user (the IDs of the groups)
 	 */
 	public function getListUser(int $userID) : array {
 
@@ -86,11 +86,37 @@ class GroupsComponent {
 		//Parse results
 		$info = array();
 		foreach($groups as $group)
-			$info[] = $this->get_info($group["groups_id"]);
+			$info[] = $group["groups_id"];
 		
 		return $info;
 	}
 
+	/**
+	 * Get the list of groups of a user where the users can create
+	 * posts
+	 * 
+	 * @param int $userID The ID of the target user
+	 * @return array The list of the groups the user can participate to
+	 */
+	public function getListUserWhereCanCreatePosts(int $userID) : array {
+		$list = db()->select(self::GROUPS_MEMBERS_TABLE." m, ".self::GROUPS_LIST_TABLE." g",
+			"WHERE user_id = ? 
+				AND m.groups_id = g.id 
+				AND (
+					level = ".GroupMember::ADMINISTRATOR." OR
+					level = ".GroupMember::MODERATOR." OR
+					(level = ".GroupMember::MEMBER." AND posts_level = ".GroupInfo::POSTS_LEVEL_ALL_MEMBERS.")
+				)
+			", 
+			array($userID), 
+			array("g.id"));
+
+		foreach($list as $num => $info)
+			$list[$num] = (int)$info["id"];
+
+		return $list;
+	}
+
 	/**
 	 * Get the visibility level of a group
 	 * 
@@ -172,6 +198,25 @@ class GroupsComponent {
 		return $this->dbToAdvancedGroupInfo($info[0], null, TRUE);
 	}
 
+	/**
+	 * Get the timestamp of the estimated last activity on the group
+	 * 
+	 * @param int $id The ID of the target group
+	 * @return int The time of last activity on the group
+	 */
+	public function getLastActivity(int $id) : int {
+
+		// Query the database
+		$posts = components()->posts->getGroupPosts($id, true, 0, 1);
+
+		if(count($posts) == 0)
+			return 0;
+
+		else
+			return $posts[0]->get_time_sent();
+
+	}
+
 	/**
 	 * Get a group settings
 	 * 
@@ -354,6 +399,22 @@ class GroupsComponent {
 		);
 	}
 
+	/**
+	 * Invite a user to join a group
+	 * 
+	 * @param int $userID The ID of the target user
+	 * @param int $groupID The ID of the target group
+	 * @param bool TRUE for a success / FALSE else
+	 */
+	public function sendInvitation(int $userID, int $groupID) : bool {
+		$member = new GroupMember();
+		$member->set_userID($userID);
+		$member->set_group_id($groupID);
+		$member->set_time_sent(time());
+		$member->set_level(GroupMember::INVITED);
+		return $this->insertMember($member);
+	}
+
 	/**
 	 * Check whether a user received an invitation or not
 	 * 
@@ -505,6 +566,20 @@ class GroupsComponent {
 			 == GroupMember::ADMINISTRATOR;
 	}
 
+	/**
+	 * Check out whether a user is the last administrator of a group
+	 * or not
+	 * 
+	 * @param int $userID The ID of the user to check
+	 * @param int $groupID The ID of the target group
+	 * @return bool TRUE if the user is an admin and the last one of the group
+	 * and FALSE else
+	 */
+	public function isLastAdmin(int $userID, int $groupID) : bool {
+		return $this->isAdmin($userID, $groupID) 
+			&& $this->countMembersAtLevel($groupID, GroupMember::ADMINISTRATOR) === 1;
+	}
+
 	/**
 	 * Check whether a group is open or not
 	 * 
@@ -539,7 +614,7 @@ class GroupsComponent {
 	 */
 	private function countMembers(int $id) : int {
 		return db()->count(self::GROUPS_MEMBERS_TABLE, 
-			"WHERE groups_id = ?",
+			"WHERE groups_id = ? AND level <= ".GroupMember::MEMBER,
 			array($id));
 	}
 
@@ -656,7 +731,7 @@ class GroupsComponent {
 	 * @param int $groupID The ID of the target group
 	 * @return bool TRUE if the directory is available / FALSE
 	 */
-	public function checkDirectoryAvailability(string $directory, int $groupID) : int {
+	public function checkDirectoryAvailability(string $directory, int $groupID) : bool {
 		$currID = $this->findByVirtualDirectory($directory);
 
 		//Check if the domain has not been allocated
@@ -684,6 +759,72 @@ class GroupsComponent {
 			array($groupID, $userID));
 	}
 
+	/**
+	 * Delete a group
+	 * 
+	 * @param int $groupID Target group id
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function delete_group(int $groupID) : bool {
+
+		// Delete all the likes of the group
+		if(!components()->likes->delete_all($groupID, Likes::LIKE_GROUP))
+			return FALSE;
+
+		//Delete group image
+		if(!$this->deleteLogo($groupID))
+			return FALSE;
+
+		//Delete all group posts
+		if(!components()->posts->deleteAllGroup($groupID))
+			return FALSE;
+
+		//Delete all group related notifications
+		if(!components()->notifications->deleteAllRelatedWithGroup($groupID))
+		 	return FALSE;
+
+		//Delete all group members
+		if(!db()->deleteEntry(self::GROUPS_MEMBERS_TABLE, "groups_id = ?", array($groupID)))
+			return FALSE;
+
+		//Delete group information
+		if(!db()->deleteEntry(self::GROUPS_LIST_TABLE, "id = ?", array($groupID)))
+			return FALSE;
+		
+		//Success
+		return TRUE;
+	}
+
+	/**
+	 * Delete all the groups a user belongs to 
+	 * 
+	 * @param int $userID The ID of the target user
+	 * @return bool TRUE in case of success / FALSE else
+	 */
+	public function deleteAllUsersGroups(int $userID) : bool {
+		
+		//Get all user gropus
+		foreach($this->getListUser($userID) as $groupID){
+
+			//Get information about user membership to determine whether the group has to be
+			// deleted or not, to do so we check whether the user is the last administrator
+			// of the group or not
+			if($this->isLastAdmin($userID, $groupID)) {
+				if(!$this->delete_group($groupID))
+					return FALSE;
+			}
+			else
+				//Make the user leave the group
+				if(!$this->deleteMembershipWithStatus(
+					$userID, $groupID, $this->getMembershipLevel($userID, $groupID)))
+					return FALSE;
+
+		}
+
+		//Success
+		return TRUE;
+	}
+
 	/**
 	 * Turn a database entry into a GroupInfo object
 	 * 

classes/components/friends.php

@@ -76,6 +76,28 @@ class friends {
 
 	}
 
+	/**
+	 * Get the list of friends of a given user that allows him to
+	 * create posts on their page
+	 * 
+	 * @param $userID The ID of the target user
+	 * @return array The list of friends of a user that allows him
+	 * to create posts
+	 */
+	public function getListThatAllowPostsFromUser(int $userID) : array {
+		$list = db()->select(
+			$this->friendsTable, 
+			"WHERE autoriser_post_page = 1 AND ID_amis = ?", 
+			array($userID), 
+			array("ID_personne")
+		);
+
+		foreach($list as $num=>$info)
+			$list[$num] = (int)$info["ID_personne"];
+		
+		return $list;
+	}
+
 	/**
 	 * Respond to a friendship request
 	 *
@@ -409,6 +431,19 @@ class friends {
 
 	}
 
+	/**
+	 * Count the number of friendship requests a user has received
+	 * 
+	 * @param int $userID Target user ID
+	 * @return int The number of friendship request the user received
+	 */
+	public function count_requests(int $userID) : int {
+		return db()->count(
+			$this->friendsTable, 
+			"WHERE ID_personne = ? AND actif = 0", 
+			array($userID));
+	}
+
 	/**
 	 * Parse friend informations from the database
 	 * 

classes/components/notifications.php

@@ -93,7 +93,7 @@ class notificationComponent {
 		//Determine the visibility level of the notification
 		if($notification->get_on_elem_type() == Notification::POST){
 
-			//Fetch post informations
+			//Fetch post information
 			$info_post = components()->posts->get_single($notification->get_on_elem_id());
 
 			//Check for error
@@ -402,6 +402,21 @@ class notificationComponent {
 	}
 
 
+	/**
+	 * Delete all the notifications related with a post
+	 * 
+	 * @param int $postID The ID of the target post
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function deleteAllRelatedWithPost(int $postID) : bool {
+
+		$notification = new Notification();
+		$notification->set_on_elem_type(Notification::POST);
+		$notification->set_on_elem_id($postID);
+		return $this->delete($notification);
+		
+	}
+
 	/**
 	 * Delete all the notifications related with a user
 	 * 
@@ -421,6 +436,26 @@ class notificationComponent {
 
 	}
 
+	/**
+	 * Delete all the notifications related with a group
+	 * 
+	 * @param int $groupID The ID of the target group
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function deleteAllRelatedWithGroup(int $groupID) : bool {
+
+		//Groups membership notifications
+		$notification = new Notification();
+		$notification->set_on_elem_type(Notification::GROUP_MEMBERSHIP);
+		$notification->set_on_elem_id($groupID);
+		if(!$this->delete($notification)) return FALSE;
+
+		$notification->set_on_elem_type(Notification::GROUP_PAGE);
+		if(!$this->delete($notification)) return FALSE;
+		
+		return TRUE;
+	}
+
 	/**
 	 * Convert a notification object into database array
 	 * 

classes/components/posts.php

@@ -327,6 +327,34 @@ class Posts {
 		
 	}
 
+	/**
+	 * Get the entire list of posts of a group, ignoring visibility levels
+	 * 
+	 * @param int $groupID The ID of the target group
+	 * @param bool $load_comments Specify whether the comments should be loaded or not
+	 * @return array The list of posts
+	 */
+	public function getGroupEntirePostsList(int $groupID, bool $load_comments = FALSE) : array {
+
+		//Security
+		if($groupID == 0)
+			return array();
+
+		//Prepare database request
+		$conditions = "WHERE group_id = ?";
+		$dataConds = array($groupID);
+
+		//Perform the request
+		$list = CS::get()->db->select(
+			$this::TABLE_NAME,
+			$conditions,
+			$dataConds
+		);
+
+		//Parse and return posts (do not load comments)
+		return $this->processGetMultiple($list, $load_comments);
+	}
+
 	/**
 	 * Get the entire list of posts that uses a movie
 	 * 
@@ -644,13 +672,17 @@ class Posts {
 	 */
 	public function delete(int $postID) : bool {
 
-		//Get informations about the post
+		//Get information about the post
 		$post_info = $this->get_single($postID);
 
-		//Check if we didn't get informations about the post
+		//Check if we didn't get information about the post
 		if(!$post_info->isValid())
 			return false;
 
+		//Delete all the notifications related to the post
+		if(!components()->notifications->deleteAllRelatedWithPost($postID))
+			return FALSE;
+
 		//Delete the likes associated to the post
 		if(!components()->likes->delete_all($postID, Likes::LIKE_POST))
 			return false;
@@ -765,6 +797,30 @@ class Posts {
 		return TRUE;
 	}
 
+	/**
+	 * Delete all the posts of a group
+	 * 
+	 * @param int $groupID The ID of the target group
+	 * @return bool TRUE for a success / FALSE else
+	 */
+	public function deleteAllGroup(int $groupID) : bool {
+
+		//Get the list of posts of the group
+		$posts = $this->getGroupEntirePostsList($groupID);
+
+		//Delete the list of posts
+		foreach($posts as $post){
+
+			//Delete the posts
+			if(!$this->delete($post->get_id()))
+				return FALSE;
+
+		}
+
+		//Success
+		return TRUE;
+	}
+
 	/**
 	 * Process processing of multiples posts entries in database
 	 * 

classes/models/CallInformation.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Call information object
+ * 
+ * @author Pierre HUBERT
+ */
+
+class CallInformation extends BaseUniqueObject {
+
+	//Private fields
+	private $conversation_id;
+	private $last_active;
+	private $members;
+
+	public function __construct(){
+		parent::__construct();
+		$this->members = array();
+	}
+
+	//Conversations ID
+	public function set_conversation_id(int $conversation_id){
+		$this->conversation_id = $conversation_id;
+	}
+
+	public function has_conversation_id() : bool {
+		return $this->conversation_id > -1;
+	}
+
+	public function get_conversation_id() : int {
+		return $this->conversation_id;
+	}
+
+
+	//Last activity
+	public function set_last_active(int $last_active){
+		$this->last_active = $last_active;
+	}
+
+	public function has_last_active() : bool {
+		return $this->last_active > -1;
+	}
+
+	public function get_last_active() : int {
+		return $this->last_active;
+	}
+
+	//Call members list
+	public function add_member(CallMemberInformation $member) {
+		$this->members[] = $member;
+	}
+
+	public function get_members() : array {
+		return $this->members;
+	}
+}

classes/models/CallMemberInformation.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Information about two members call
+ * 
+ * @author Pierre HUBERT
+ */
+
+class CallMemberInformation extends BaseUniqueObjectFromUser {
+	
+	/**
+	 * Possible user responses
+	 */
+	public const USER_ACCEPTED = 1;
+	public const USER_REJECTED = 0;
+	public const USER_UNKNOWN  = -1;
+	public const USER_HANG_UP = 2;
+
+
+	
+	//Private fields
+	private $call_id;
+	private $user_call_id;
+	private $accepted;
+
+
+
+	//Call ID
+	public function set_call_id(int $call_id){
+		$this->call_id = $call_id;
+	}
+
+	public function has_call_id() : bool {
+		return $this->call_id > -1;
+	}
+
+	public function get_call_id() : int {
+		return $this->call_id;
+	}
+
+
+	//User Call ID
+	public function set_user_call_id(string $user_call_id){
+		$this->user_call_id = $user_call_id == "" ? null : $user_call_id;
+	}
+
+	public function has_user_call_id() : bool {
+		return $this->user_call_id != null;
+	}
+
+	public function get_user_call_id() : string {
+		return $this->user_call_id != null ? $this->user_call_id : "null";
+	}
+
+
+	//User response to call
+	public function set_status(int $status){
+		$this->status = $status;
+	}
+
+	public function has_status() : bool {
+		return $this->status > -1;
+	}
+
+	public function get_status() : int {
+		return $this->status;
+	}
+
+}

classes/models/CallsConfig.php

@@ -0,0 +1,136 @@
+<?php
+/**
+ * Calls configuration object
+ * 
+ * @author Pierre HUBERT
+ */
+
+class CallsConfig {
+
+	//Private fields
+	private $enabled = false;
+	private $maximum_number_members = -1;
+	private $signal_server_name;
+	private $signal_server_port;
+	private $is_signal_server_secure;
+	private $stun_server;
+	private $turn_server;
+	private $turn_username;
+	private $turn_password;
+
+
+	//Set and get enabled state
+	public function set_enabled(bool $enabled){
+		$this->enabled = $enabled;
+	}
+
+	public function get_enabled() : bool {
+		return $this->enabled;
+	}
+	
+
+	//Get the maximum number of members for a conversation
+	public function set_maximum_number_members(int $maximum_number_members){
+		$this->maximum_number_members = $maximum_number_members;
+	}
+
+	public function has_maximum_number_members() : bool {
+		return $this->maximum_number_members > 0;
+	}
+
+	public function get_maximum_number_members() : int {
+		return $this->maximum_number_members;
+	}
+
+
+	//Get Set Signal Server name
+	public function set_signal_server_name(string $signal_server_name){
+		$this->signal_server_name = $signal_server_name == "" ? null : $signal_server_name;
+	}
+
+	public function has_signal_server_name() : bool {
+		return $this->signal_server_name != null;
+	}
+
+	public function get_signal_server_name() : string {
+		return $this->signal_server_name != null ? $this->signal_server_name : "null";
+	}
+
+
+	//Set and get Signal Server Port
+	public function set_signal_server_port(int $signal_server_port){
+		$this->signal_server_port = $signal_server_port;
+	}
+
+	public function has_signal_server_port() : bool {
+		return $this->signal_server_port > 0;
+	}
+
+	public function get_signal_server_port() : int {
+		return $this->signal_server_port;
+	}
+
+	//Get and set secure state of the signaling server
+	public function set_is_signal_server_secure(bool $is_signal_server_secure){
+		$this->is_signal_server_secure = $is_signal_server_secure;
+	}
+
+	public function get_is_signal_server_secure() : bool {
+		return $this->is_signal_server_secure;
+	}
+
+	//Get and set stun server
+	public function set_stun_server(string $stun_server){
+		$this->stun_server = $stun_server == "" ? null : $stun_server;
+	}
+
+	public function has_stun_server() : bool {
+		return $this->stun_server != null;
+	}
+
+	public function get_stun_server() : string {
+		return $this->stun_server != null ? $this->stun_server : "null";
+	}
+
+
+	//Get and set turn server
+	public function set_turn_server(string $turn_server){
+		$this->turn_server = $turn_server == "" ? null : $turn_server;
+	}
+
+	public function has_turn_server() : bool {
+		return $this->turn_server != null;
+	}
+
+	public function get_turn_server() : string {
+		return $this->turn_server != null ? $this->turn_server : "null";
+	}
+
+
+	//Get and set turn username
+	public function set_turn_username(string $turn_username){
+		$this->turn_username = $turn_username == "" ? null : $turn_username;
+	}
+
+	public function has_turn_username() : bool {
+		return $this->turn_username != null;
+	}
+
+	public function get_turn_username() : string {
+		return $this->turn_username != null ? $this->turn_username : "null";
+	}
+
+	
+	//Get and set turn password
+	public function set_turn_password(string $turn_password){
+		$this->turn_password = $turn_password == "" ? null : $turn_password;
+	}
+
+	public function has_turn_password() : bool {
+		return $this->turn_password != null;
+	}
+
+	public function get_turn_password() : string {
+		return $this->turn_password != null ? $this->turn_password : "null";
+	}
+}

classes/models/SearchResult.php

@@ -21,7 +21,7 @@ class SearchResult {
 	 * @param int $kind The kind of result (group, user...)
 	 * @param int $kind_id The ID of the result
 	 */
-	public function SearchResult(int $kind, int $kind_id){
+	public function __construct(int $kind, int $kind_id){
 		$this->set_kind($kind);
 		$this->set_kind_id($kind_id);
 	}

config/calls.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Calls configuration file
+ * 
+ * @author Pierre HUBERT
+ */
+
+/**
+ * Calls through clients are disabled by default.
+ */
+$config->set("calls", false);
+
+/**
+ * Copy the lines of code below to the overwrite.php file
+ * if you would like to enable calls on your instance of
+ * Comunic
+ * 
+ */
+/*
+$config->set("calls", array(
+	"enabled" => true,
+	"maximum_number_members" => 2,
+	"signal_server_name" => "localhost",
+	"signal_server_port" => 8081,
+	"is_signal_server_secure" => false,
+	"stun_server" => "stun:127.0.0.1:3478",
+	"turn_server" => "turn:127.0.0.1:3478",
+	"turn_username" => "anonymous",
+	"turn_password" => "anonymous"
+));
+*/
+
+/**
+ * Calls expiration time
+ * 
+ * The amount of time of inactivity for what the call get
+ * automatically deleted
+ */
+$config->set("calls_expiration", 30);

db_struct.sql

@@ -81,60 +81,81 @@ CREATE TABLE `comunic_api_limit_count` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
-DROP TABLE IF EXISTS `comunic_API_ServicesToken`;
+DROP TABLE IF EXISTS `comunic_api_services_tokens`;
-CREATE TABLE `comunic_API_ServicesToken` (
+CREATE TABLE `comunic_api_services_tokens` (
-  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `time_insert` int(11) DEFAULT NULL,
-  `serviceName` varchar(255) NOT NULL,
+  `service_name` varchar(255) NOT NULL,
   `token` varchar(255) NOT NULL,
   `client_domain` varchar(45) DEFAULT NULL,
-  PRIMARY KEY (`ID`)
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
-DROP TABLE IF EXISTS `comunic_API_userLoginToken`;
+DROP TABLE IF EXISTS `comunic_api_users_tokens`;
-CREATE TABLE `comunic_API_userLoginToken` (
+CREATE TABLE `comunic_api_users_tokens` (
-  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ID_utilisateurs` int(11) NOT NULL,
+  `user_id` int(11) NOT NULL,
-  `ID_comunic_API_ServicesToken` int(11) NOT NULL,
+  `service_id` int(11) NOT NULL,
   `token1` varchar(255) NOT NULL,
   `token2` varchar(255) NOT NULL,
-  PRIMARY KEY (`ID`)
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+
+DROP TABLE IF EXISTS `comunic_calls`;
+CREATE TABLE `comunic_calls` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `conversation_id` INT NULL,
+  `last_active` INT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+
+DROP TABLE IF EXISTS `comunic_calls_members`;
+CREATE TABLE `comunic_calls_members` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `call_id` INT NOT NULL,
+  `user_id` INT NULL,
+  `user_call_id` VARCHAR(200) NULL,
+  `status` TINYINT DEFAULT NULL,
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 DROP TABLE IF EXISTS `comunic_conversations_list`;
 CREATE TABLE `comunic_conversations_list` (
-  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ID_utilisateurs` int(11) DEFAULT NULL,
+  `user_id` int(11) DEFAULT NULL,
   `name` varchar(50) DEFAULT NULL,
   `last_active` int(11) DEFAULT NULL,
   `creation_time` int(11) DEFAULT NULL,
-  PRIMARY KEY (`ID`)
+  `can_everyone_add_members` tinyint(4) DEFAULT '1',
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 DROP TABLE IF EXISTS `comunic_conversations_messages`;
 CREATE TABLE `comunic_conversations_messages` (
-  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ID_comunic_conversations_list` int(11) DEFAULT NULL,
+  `conv_id` int(11) DEFAULT NULL,
-  `ID_utilisateurs` int(11) DEFAULT NULL,
+  `user_id` int(11) DEFAULT NULL,
   `time_insert` int(11) DEFAULT NULL,
   `message` varchar(200) DEFAULT NULL,
   `image_path` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`ID`)
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 DROP TABLE IF EXISTS `comunic_conversations_users`;
 CREATE TABLE `comunic_conversations_users` (
-  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ID_comunic_conversations_list` int(11) DEFAULT NULL,
+  `conv_id` int(11) DEFAULT NULL,
-  `ID_utilisateurs` int(11) DEFAULT NULL,
+  `user_id` int(11) DEFAULT NULL,
   `time_add` int(11) DEFAULT NULL,
   `following` int(1) DEFAULT '0',
   `saw_last_message` int(1) DEFAULT NULL,
-  PRIMARY KEY (`ID`)
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 DROP TABLE IF EXISTS `comunic_groups`;
@@ -171,7 +192,7 @@ CREATE TABLE `comunic_mails_queue` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `priority` int(11) DEFAULT NULL,
   `time_insert` int(11) DEFAULT NULL,
-  `userID` int(11) DEFAULT NULL,
+  `user_id` int(11) DEFAULT NULL,
   `template` varchar(45) DEFAULT NULL,
   `data` text DEFAULT NULL,
   PRIMARY KEY (`id`)
@@ -502,10 +523,10 @@ CREATE TABLE `utilisateurs` (
   `affiche_chat` int(11) NOT NULL DEFAULT '0',
   `public` int(11) NOT NULL DEFAULT '0',
   `pageouverte` int(11) NOT NULL DEFAULT '0',
-  `question1` varchar(255) DEFAULT NULL,
+  `question1` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `reponse1` varchar(255) DEFAULT NULL,
+  `reponse1` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `question2` varchar(255) DEFAULT NULL,
+  `question2` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `reponse2` varchar(255) DEFAULT NULL,
+  `reponse2` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
   `bloquecommentaire` int(11) NOT NULL DEFAULT '0',
   `last_activity` int(11) NOT NULL DEFAULT '1',
   `bloquenotification` int(11) NOT NULL DEFAULT '1',
@@ -538,3 +559,12 @@ CREATE TABLE `utilisateurs` (
   `lang` varchar(4) DEFAULT 'en',
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+
+DROP TABLE IF EXISTS `comunic_custom_emojis`;
+CREATE TABLE `comunic_custom_emojis` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `user_id` INT NULL,
+  `shortcut` VARCHAR(45) NULL,
+  `path` VARCHAR(255) NULL,
+  PRIMARY KEY (`id`));

functions/user.php

@@ -58,4 +58,21 @@ function check_post_password(int $userID, string $name) : bool {
     
     //Else the password seems to be valid
     return TRUE;
+}
+
+/**
+ * Update last user activity if the user allows it
+ * 
+ * This function do not do anything if the incognito mode
+ * has been enabled by the user
+ */
+function update_last_user_activity_if_allowed() {
+
+    //Check if incognito mode is enabled
+    if(isset($_POST["incognito"]))
+        return;
+    
+    //Update last activity time of the user
+    CS::get()->components->user->updateLastActivity(userID);
+
 }