Comunic/ComunicAPI
1
0
Fork 0
mirror of https://github.com/pierre42100/ComunicAPI synced 2025-11-04 04:04:20 +00:00
Code Issues Projects Releases Wiki Activity

Updated tables name

Browse Source
This commit is contained in:
Pierre
2017-06-07 14:53:58 +02:00
parent 7c9224d82e
commit 2840a1401c
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
classes/components/user.php
View File

@@ -12,6 +12,18 @@ class User{
*/ */
private $userTable = "utilisateurs"; private $userTable = "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 * Try to login user with returning a service token
* *
@@ -49,10 +61,10 @@ class User{
$token2 = random_str(75); $token2 = random_str(75);
//Insert token in the database //Insert token in the database
$tableName = "API_userLoginToken"; $tableName = $this->userLoginAPItable;
$insertValues = array( $insertValues = array(
"ID_utilisateurs" => $userID, "ID_utilisateurs" => $userID,
"ID_API_ServicesToken" => $serviceID, "ID_".CS::get()->config->get("dbprefix")."API_ServicesToken" => $serviceID,
"token1" => $token1, "token1" => $token1,
"token2" => $token2 "token2" => $token2
); );
@@ -72,12 +84,12 @@ class User{
*/ */
public function getUserLoginTokenByIDs($userID, $serviceID){ public function getUserLoginTokenByIDs($userID, $serviceID){
//Prepare database request //Prepare database request
$conditions = "WHERE ID_utilisateurs = ? AND ID_API_ServicesToken = ?"; $conditions = "WHERE ID_utilisateurs = ? AND ID_".CS::get()->config->get("dbprefix")."API_ServicesToken = ?";
$values = array( $values = array(
$userID, $userID,
$serviceID $serviceID
); );
$tokenInfos = CS::get()->db->select("API_userLoginToken", $conditions, $values); $tokenInfos = CS::get()->db->select($this->userLoginAPItable, $conditions, $values);
if(count($tokenInfos) == 0) if(count($tokenInfos) == 0)
return false; //There is nobody at this address return false; //There is nobody at this address
@@ -99,14 +111,14 @@ class User{
public function deleteUserLoginToken($userID, $serviceID){ public function deleteUserLoginToken($userID, $serviceID){
//Prepare database request //Prepare database request
$condition = "ID_utilisateurs = ? AND ID_API_ServicesToken = ?"; $condition = "ID_utilisateurs = ? AND ID_".CS::get()->config->get("dbprefix")."API_ServicesToken = ?";
$values = array( $values = array(
$userID, $userID,
$serviceID $serviceID
); );
//Try to perform request //Try to perform request
if(!CS::get()->db->deleteEntry("API_userLoginToken", $condition, $values)) if(!CS::get()->db->deleteEntry($this->userLoginAPItable, $condition, $values))
return false; //Something went wrong during the request return false; //Something went wrong during the request
//Everything is ok //Everything is ok
@@ -126,8 +138,8 @@ class User{
return 0; return 0;
//Prepare database request //Prepare database request
$tablesName = "API_userLoginToken"; $tablesName = $this->userLoginAPItable;
$conditions = "WHERE API_userLoginToken.ID_API_ServicesToken = ? AND API_userLoginToken.token1 = ? AND API_userLoginToken.token2 = ?"; $conditions = "WHERE ".$this->userLoginAPItable.".ID_".CS::get()->config->get("dbprefix")."API_ServicesToken = ? AND ".$this->userLoginAPItable.".token1 = ? AND ".$this->userLoginAPItable.".token2 = ?";
$conditionsValues = array( $conditionsValues = array(
$serviceID, $serviceID,
$tokens[0], $tokens[0],

2
classes/tokens.php
View File

@@ -36,7 +36,7 @@ class Tokens{
*/ */
private function validateClientTokens($serviceName, $token){ private function validateClientTokens($serviceName, $token){
//Prepare DataBase request //Prepare DataBase request
$tableName = "API_ServicesToken"; $tableName = CS::get()->config->get("dbprefix")."API_ServicesToken";
$conditions = "WHERE serviceName = ? AND token = ?"; $conditions = "WHERE serviceName = ? AND token = ?";
$values = array( $values = array(
$serviceName, $serviceName,