Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix and update models for new descartes version

This commit is contained in:
osaajani 2019-10-29 18:33:49 +01:00
parent e15fb3cf8c
commit cf1746ff13
11 changed files with 967 additions and 972 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
models/Command.php
View File

@ -1,9 +1,10 @@
<?php <?php
namespace models; namespace models;
/** /**
* Cette classe gère les accès bdd pour les commandes * Cette classe gère les accès bdd pour les commandes
*/ */
class Command extends \Model class Command extends \descartes\Model
{ {
/** /**
* Retourne une entrée par son id * Retourne une entrée par son id
@ -12,7 +13,7 @@
*/ */
public function get_by_id($id) public function get_by_id($id)
{ {
$commands = $this->select('command', ['id' => $id]); $commands = $this->_select('command', ['id' => $id]);
return isset($commands[0]) ? $commands[0] : false; return isset($commands[0]) ? $commands[0] : false;
} }
@ -23,7 +24,7 @@
*/ */
public function list($limit, $offset) public function list($limit, $offset)
{ {
$commands = $this->select('command', [], '', false, $limit, $offset); $commands = $this->_select('command', [], '', false, $limit, $offset);
return $commands; return $commands;
} }
@ -40,11 +41,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->generateInFromArray($ids); $generated_in = $this->_generate_in_from_array($ids);
$query .= $generated_in['QUERY']; $query .= $generated_in['QUERY'];
$params = $generated_in['PARAMS']; $params = $generated_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
* Supprime une commande * Supprime une commande
@ -59,7 +60,7 @@
$params = ['id' => $id]; $params = ['id' => $id];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -69,14 +70,13 @@
*/ */
public function insert($command) public function insert($command)
{ {
$result = $this->insertIntoTable('command', $command); $result = $this->_insert('command', $command);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -87,7 +87,7 @@
*/ */
public function update($id, $command) public function update($id, $command)
{ {
return $this->updateTableWhere('command', $command, ['id' => $id]); return $this->_update('command', $command, ['id' => $id]);
} }
/** /**
@ -96,6 +96,6 @@
*/ */
public function count() public function count()
{ {
return $this->countTable('command'); return $this->_count('command');
} }
} }

28
models/Contact.php
View File

@ -1,9 +1,10 @@
<?php <?php
namespace models; namespace models;
/** /**
* Cette classe gère les accès bdd pour les contactes * Cette classe gère les accès bdd pour les contactes
*/ */
class Contact extends \Model class Contact extends \descartes\Model
{ {
/** /**
* Retourne une entrée par son id * Retourne une entrée par son id
@ -12,7 +13,7 @@
*/ */
public function get_by_id($id) public function get_by_id($id)
{ {
$contacts = $this->select('contact', ['id' => $id]); $contacts = $this->_select('contact', ['id' => $id]);
return isset($contacts[0]) ? $contacts[0] : false; return isset($contacts[0]) ? $contacts[0] : false;
} }
@ -23,7 +24,7 @@
*/ */
public function get_by_number($number) public function get_by_number($number)
{ {
$contacts = $this->select('contact', ['number' => $number]); $contacts = $this->_select('contact', ['number' => $number]);
return isset($contacts[0]) ? $contacts[0] : false; return isset($contacts[0]) ? $contacts[0] : false;
} }
@ -34,7 +35,7 @@
*/ */
public function get_by_name($name) public function get_by_name($name)
{ {
$contacts = $this->select('contact', ['name' => $name]); $contacts = $this->_select('contact', ['name' => $name]);
return isset($contacts[0]) ? $contacts[0] : false; return isset($contacts[0]) ? $contacts[0] : false;
} }
@ -45,7 +46,7 @@
*/ */
public function get_list($limit, $offset) public function get_list($limit, $offset)
{ {
$contacts = $this->select('contact', [], '', false, $limit, $offset); $contacts = $this->_select('contact', [], '', false, $limit, $offset);
return $contacts; return $contacts;
} }
@ -62,11 +63,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->generateInFromArray($ids); $generated_in = $this->_generate_in_from_array($ids);
$query .= $generated_in['QUERY']; $query .= $generated_in['QUERY'];
$params = $generated_in['PARAMS']; $params = $generated_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -81,7 +82,7 @@
WHERE id = :id"; WHERE id = :id";
$params = ['id' => $id]; $params = ['id' => $id];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -91,14 +92,13 @@
*/ */
public function insert($contact) public function insert($contact)
{ {
$result = $this->insertIntoTable('contact', $contact); $result = $this->_insert('contact', $contact);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -109,7 +109,7 @@
*/ */
public function update($id, $contact) public function update($id, $contact)
{ {
return $this->updateTableWhere('contact', $contact, ['id' => $id]); return $this->_update('contact', $contact, ['id' => $id]);
} }
/** /**
@ -118,6 +118,6 @@
*/ */
public function count() public function count()
{ {
return $this->countTable('contact'); return $this->_count('contact');
} }
} }

137
models/DataBase.php
View File

@ -1,5 +1,7 @@
<?php <?php
class DataBase extends Model namespace models;
class DataBase extends \descartes\Model
{ {
/*******************************/ /*******************************/
/* PARTIE DES REQUETES SENDEDS */ /* PARTIE DES REQUETES SENDEDS */
@ -23,7 +25,7 @@
'date' => $date, 'date' => $date,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -42,7 +44,7 @@
'id' => $id 'id' => $id
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -57,11 +59,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($sendeds_ids); $generted_in = $this->_generate_in_from_array($sendeds_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/*********************************/ /*********************************/
@ -90,7 +92,7 @@
'is_command' => $is_command, 'is_command' => $is_command,
); );
return $this->runQuery($query, $params, self::ROWCOUNT); //On retourne le nombre de lignes ajoutés return $this->_run_query($query, $params, self::ROWCOUNT); //On retourne le nombre de lignes ajoutés
} }
/** /**
@ -111,7 +113,7 @@
'date' => $date, 'date' => $date,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -131,7 +133,7 @@
'date' => $date, 'date' => $date,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -155,7 +157,7 @@
'number' => $number 'number' => $number
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -171,11 +173,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($receiveds_ids); $generted_in = $this->_generate_in_from_array($receiveds_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -190,11 +192,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($receiveds_ids); $generted_in = $this->_generate_in_from_array($receiveds_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/********************************/ /********************************/
@ -213,11 +215,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($contacts_ids); $generted_in = $this->_generate_in_from_array($contacts_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -233,11 +235,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($contacts_ids); $generted_in = $this->_generate_in_from_array($contacts_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/******************************/ /******************************/
@ -260,7 +262,7 @@
'name' => $name, 'name' => $name,
); );
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -276,11 +278,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($groups_ids); $generted_in = $this->_generate_in_from_array($groups_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -295,11 +297,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($groups_ids); $generted_in = $this->_generate_in_from_array($groups_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/***************************************/ /***************************************/
@ -325,7 +327,7 @@
'id_group' => $id_group, 'id_group' => $id_group,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -342,35 +344,35 @@
GROUP BY id GROUP BY id
"; ";
if ($order_by) if ($order_by) {
{ $orders = [
if($this->fieldExist($order_by, 'contact')) 'id',
'name',
'number',
];
if (in_array($order_by, $orders))
{ {
$query .= ' ORDER BY '. $order_by; $query .= ' ORDER BY '. $order_by;
if ($desc) if ($desc) {
{
$query .= ' DESC'; $query .= ' DESC';
} }
} }
} }
if ($limit !== false) if ($limit !== false) {
{
$query .= ' LIMIT :limit'; $query .= ' LIMIT :limit';
if ($offset !== false) if ($offset !== false) {
{
$query .= ' OFFSET :offset'; $query .= ' OFFSET :offset';
} }
} }
$req = $this->bdd->prepare($query); $req = $this->pdo->prepare($query);
if ($limit !== false) if ($limit !== false) {
{ $req->bindParam(':limit', $limit, \PDO::PARAM_INT);
$req->bindParam(':limit', $limit, PDO::PARAM_INT); if ($offset !== false) {
if ($offset !== false) $req->bindParam(':offset', $offset, \PDO::PARAM_INT);
{
$req->bindParam(':offset', $offset, PDO::PARAM_INT);
} }
} }
@ -400,7 +402,7 @@
'date' => $date, 'date' => $date,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -422,7 +424,7 @@
'progress' => false, 'progress' => false,
); );
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -437,11 +439,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($scheduleds_ids); $generted_in = $this->_generate_in_from_array($scheduleds_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -492,7 +494,7 @@
'number' => $number, 'number' => $number,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/********************************/ /********************************/
@ -512,11 +514,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($commands_ids); $generted_in = $this->_generate_in_from_array($commands_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -531,11 +533,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($commands_ids); $generted_in = $this->_generate_in_from_array($commands_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/*******************************************/ /*******************************************/
@ -561,7 +563,7 @@
'id_scheduled' => $id_scheduled, 'id_scheduled' => $id_scheduled,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -580,7 +582,7 @@
'id_scheduled' => $id_scheduled 'id_scheduled' => $id_scheduled
); );
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -596,12 +598,12 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($scheduleds_ids); $generted_in = $this->_generate_in_from_array($scheduleds_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
$params['progress'] = (boolean)$progress; $params['progress'] = (boolean)$progress;
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/******************************************/ /******************************************/
@ -624,7 +626,7 @@
'id_scheduled' => $id_scheduled 'id_scheduled' => $id_scheduled
); );
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -644,7 +646,7 @@
'id_scheduled' => $id_scheduled, 'id_scheduled' => $id_scheduled,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/*****************************************/ /*****************************************/
@ -667,7 +669,7 @@
'id_scheduled' => $id_scheduled 'id_scheduled' => $id_scheduled
); );
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -689,7 +691,7 @@
'id_scheduled' => $id_scheduled, 'id_scheduled' => $id_scheduled,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/*****************************/ /*****************************/
@ -712,7 +714,7 @@
'email' => $email 'email' => $email
); );
return $this->runQuery($query, $params, self::FETCH); return $this->_run_query($query, $params, self::FETCH);
} }
/** /**
@ -727,11 +729,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($users_ids); $generted_in = $this->_generate_in_from_array($users_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/*********************************/ /*********************************/
@ -751,12 +753,12 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($transfers_ids); $generted_in = $this->_generate_in_from_array($transfers_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
$params['progress'] = (boolean)$progress; $params['progress'] = (boolean)$progress;
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -771,11 +773,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($transfers_ids); $generted_in = $this->_generate_in_from_array($transfers_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/******************************/ /******************************/
@ -794,11 +796,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($events_ids); $generted_in = $this->_generate_in_from_array($events_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/********************************/ /********************************/
@ -817,11 +819,10 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generted_in = $this->generateInFromArray($sms_stops_ids); $generted_in = $this->_generate_in_from_array($sms_stops_ids);
$query .= $generted_in['QUERY']; $query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS']; $params = $generted_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
} }

25
models/Event.php
View File

@ -1,9 +1,10 @@
<?php <?php
namespace models; namespace models;
/** /**
* Cette classe gère les accès bdd pour les eventes * Cette classe gère les accès bdd pour les eventes
*/ */
class Event extends \Model class Event extends \descartes\Model
{ {
/** /**
* Retourne une entrée par son id * Retourne une entrée par son id
@ -12,7 +13,7 @@
*/ */
public function get_by_id($id) public function get_by_id($id)
{ {
$events = $this->select('event', ['id' => $id]); $events = $this->_select('event', ['id' => $id]);
return isset($events[0]) ? $events[0] : false; return isset($events[0]) ? $events[0] : false;
} }
@ -23,7 +24,7 @@
*/ */
public function get_list($limit, $offset) public function get_list($limit, $offset)
{ {
$events = $this->select('event', [], '', false, $limit, $offset); $events = $this->_select('event', [], '', false, $limit, $offset);
return $events; return $events;
} }
@ -34,7 +35,7 @@
*/ */
public function get_lasts_by_date($nb_entry) public function get_lasts_by_date($nb_entry)
{ {
$events = $this->select('event', [], 'at', true, $nb_entry); $events = $this->_select('event', [], 'at', true, $nb_entry);
return $events; return $events;
} }
@ -50,11 +51,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->generateInFromArray($ids); $generated_in = $this->_generate_in_from_array($ids);
$query .= $generated_in['QUERY']; $query .= $generated_in['QUERY'];
$params = $generated_in['PARAMS']; $params = $generated_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -70,7 +71,7 @@
$params = ['id' => $id]; $params = ['id' => $id];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -80,14 +81,13 @@
*/ */
public function insert($event) public function insert($event)
{ {
$result = $this->insertIntoTable('event', $event); $result = $this->_insert('event', $event);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -96,7 +96,6 @@
*/ */
public function count() public function count()
{ {
return $this->countTable('event'); return $this->_count('event');
} }
} }

39
models/Groupe.php
View File

@ -1,9 +1,10 @@
<?php <?php
namespace models; namespace models;
/** /**
* Cette classe gère les accès bdd pour les groupes * Cette classe gère les accès bdd pour les groupes
*/ */
class Groupe extends \Model class Groupe extends \descartes\Model
{ {
/** /**
* Retourne une entrée par son id * Retourne une entrée par son id
@ -12,7 +13,7 @@
*/ */
public function get_by_id($id) public function get_by_id($id)
{ {
$groupes = $this->select('groupe', ['id' => $id]); $groupes = $this->_select('groupe', ['id' => $id]);
return isset($groupes[0]) ? $groupes[0] : false; return isset($groupes[0]) ? $groupes[0] : false;
} }
@ -23,7 +24,7 @@
*/ */
public function get_by_name($name) public function get_by_name($name)
{ {
$groupes = $this->select('groupe', ['name' => $name]); $groupes = $this->_select('groupe', ['name' => $name]);
return isset($groupes[0]) ? $groupes[0] : false; return isset($groupes[0]) ? $groupes[0] : false;
} }
@ -34,7 +35,7 @@
*/ */
public function get_list($limit, $offset) public function get_list($limit, $offset)
{ {
$groupes = $this->select('groupe', [], '', false, $limit, $offset); $groupes = $this->_select('groupe', [], '', false, $limit, $offset);
return $groupes; return $groupes;
} }
@ -51,11 +52,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->generateInFromArray($ids); $generated_in = $this->_generate_in_from_array($ids);
$query .= $generated_in['QUERY']; $query .= $generated_in['QUERY'];
$params = $generated_in['PARAMS']; $params = $generated_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -70,11 +71,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->generateInFromArray($ids); $generated_in = $this->_generate_in_from_array($ids);
$query .= $generated_in['QUERY']; $query .= $generated_in['QUERY'];
$params = $generated_in['PARAMS']; $params = $generated_in['PARAMS'];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -84,7 +85,7 @@
*/ */
public function delete_groupe_contact($id_groupe) public function delete_groupe_contact($id_groupe)
{ {
return $this->deleteFromTableWhere('groupe_contact', ['id_groupe' => $id_groupe]); return $this->_delete('groupe_contact', ['id_groupe' => $id_groupe]);
} }
/** /**
@ -94,14 +95,13 @@
*/ */
public function insert($groupe) public function insert($groupe)
{ {
$result = $this->insertIntoTable('groupe', $groupe); $result = $this->_insert('groupe', $groupe);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -112,14 +112,13 @@
*/ */
public function insert_groupe_contact($id_groupe, $id_contact) public function insert_groupe_contact($id_groupe, $id_contact)
{ {
$result = $this->insertIntoTable('groupe_contact', ['id_groupe' => $id_groupe, 'id_contact' => $id_contact]); $result = $this->_insert('groupe_contact', ['id_groupe' => $id_groupe, 'id_contact' => $id_contact]);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -130,7 +129,7 @@
*/ */
public function update($id, $groupe) public function update($id, $groupe)
{ {
return $this->updateTableWhere('groupe', $groupe, ['id' => $id]); return $this->_update('groupe', $groupe, ['id' => $id]);
} }
/** /**
@ -139,7 +138,7 @@
*/ */
public function count() public function count()
{ {
return $this->countTable('groupe'); return $this->_count('groupe');
} }
/** /**
@ -159,6 +158,6 @@
'id' => $id, 'id' => $id,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
} }

36
models/Received.php
View File

@ -1,9 +1,10 @@
<?php <?php
namespace models; namespace models;
/** /**
* Cette classe gère les accès bdd pour les receivedes * Cette classe gère les accès bdd pour les receivedes
*/ */
class Received extends \Model class Received extends \descartes\Model
{ {
/** /**
* Retourne une entrée par son id * Retourne une entrée par son id
@ -12,7 +13,7 @@
*/ */
public function get_by_id($id) public function get_by_id($id)
{ {
$receiveds = $this->select('received', ['id' => $id]); $receiveds = $this->_select('received', ['id' => $id]);
return isset($receiveds[0]) ? $receiveds[0] : false; return isset($receiveds[0]) ? $receiveds[0] : false;
} }
@ -23,7 +24,7 @@
*/ */
public function get_list($limit, $offset) public function get_list($limit, $offset)
{ {
$receiveds = $this->select('received', [], '', false, $limit, $offset); $receiveds = $this->_select('received', [], '', false, $limit, $offset);
return $receiveds; return $receiveds;
} }
@ -35,7 +36,7 @@
*/ */
public function get_lasts_by_date($nb_entry) public function get_lasts_by_date($nb_entry)
{ {
$receiveds = $this->select('received', [], 'at', true, $nb_entry); $receiveds = $this->_select('received', [], 'at', true, $nb_entry);
return $receiveds; return $receiveds;
} }
@ -46,7 +47,7 @@
*/ */
public function get_by_origin($origin) public function get_by_origin($origin)
{ {
$receiveds = $this->select('received', ['origin' => $origin]); $receiveds = $this->_select('received', ['origin' => $origin]);
return $receiveds; return $receiveds;
} }
@ -63,11 +64,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->generateInFromArray($ids); $generated_in = $this->_generate_in_from_array($ids);
$query .= $generated_in['QUERY']; $query .= $generated_in['QUERY'];
$params = $generated_in['PARAMS']; $params = $generated_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
* Retourne une liste de receivedes sous forme d'un tableau * Retourne une liste de receivedes sous forme d'un tableau
@ -82,7 +83,7 @@
$params = ['id' => $id]; $params = ['id' => $id];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -92,14 +93,13 @@
*/ */
public function insert($received) public function insert($received)
{ {
$result = $this->insertIntoTable('received', $receiveds); $result = $this->_insert('received', $received);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -110,7 +110,7 @@
*/ */
public function update($id, $received) public function update($id, $received)
{ {
return $this->updateTableWhere('received', $received, ['id' => $id]); return $this->_update('received', $received, ['id' => $id]);
} }
/** /**
@ -119,7 +119,7 @@
*/ */
public function count() public function count()
{ {
return $this->countTable('received'); return $this->_count('received');
} }
/** /**
@ -140,7 +140,7 @@
'date' => $date, 'date' => $date,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -155,7 +155,7 @@
ORDER BY at DESC ORDER BY at DESC
"; ";
return $this->runQuery($query); return $this->_run_query($query);
} }
/** /**
@ -176,7 +176,7 @@
'date' => $date, 'date' => $date,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -200,6 +200,6 @@
'origin' => $origin 'origin' => $origin
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
} }

59
models/Scheduled.php
View File

@ -1,9 +1,10 @@
<?php <?php
namespace models; namespace models;
/** /**
* Cette classe gère les accès bdd pour les scheduledes * Cette classe gère les accès bdd pour les scheduledes
*/ */
class Scheduled extends \Model class Scheduled extends \descartes\Model
{ {
/** /**
* Retourne une entrée par son id * Retourne une entrée par son id
@ -12,7 +13,7 @@
*/ */
public function get_by_id($id) public function get_by_id($id)
{ {
$scheduleds = $this->select('scheduled', ['id' => $id]); $scheduleds = $this->_select('scheduled', ['id' => $id]);
return isset($scheduleds[0]) ? $scheduleds[0] : false; return isset($scheduleds[0]) ? $scheduleds[0] : false;
} }
@ -23,7 +24,7 @@
*/ */
public function get_list($limit, $offset) public function get_list($limit, $offset)
{ {
$scheduleds = $this->select('scheduled', [], '', false, $limit, $offset); $scheduleds = $this->_select('scheduled', [], '', false, $limit, $offset);
return $scheduleds; return $scheduleds;
} }
@ -40,11 +41,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->generateInFromArray($ids); $generated_in = $this->_generate_in_from_array($ids);
$query .= $generated_in['QUERY']; $query .= $generated_in['QUERY'];
$params = $generated_in['PARAMS']; $params = $generated_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -95,7 +96,7 @@
'number' => $number, 'number' => $number,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -112,7 +113,7 @@
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$params = ['id' => $id]; $params = ['id' => $id];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -122,14 +123,13 @@
*/ */
public function insert($scheduled) public function insert($scheduled)
{ {
$result = $this->insertIntoTable('scheduled', $scheduled); $result = $this->_insert('scheduled', $scheduled);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -140,7 +140,7 @@
*/ */
public function update($id, $scheduled) public function update($id, $scheduled)
{ {
return $this->updateTableWhere('scheduled', $scheduled, ['id' => $id]); return $this->_update('scheduled', $scheduled, ['id' => $id]);
} }
/** /**
@ -149,7 +149,7 @@
*/ */
public function count() public function count()
{ {
return $this->countTable('scheduled'); return $this->_count('scheduled');
} }
/** /**
@ -159,7 +159,7 @@
*/ */
public function get_number($id_scheduled) public function get_number($id_scheduled)
{ {
return $this->select('scheduled_number', ['id_scheduled' => $id_scheduled]); return $this->_select('scheduled_number', ['id_scheduled' => $id_scheduled]);
} }
/** /**
@ -173,7 +173,7 @@
$params = ['id_scheduled' => $id_scheduled]; $params = ['id_scheduled' => $id_scheduled];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -187,7 +187,7 @@
$params = ['id_scheduled' => $id_scheduled]; $params = ['id_scheduled' => $id_scheduled];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -198,14 +198,13 @@
*/ */
public function insert_scheduled_number($id_scheduled, $number) public function insert_scheduled_number($id_scheduled, $number)
{ {
$result = $this->insertIntoTable('scheduled_number', ['id_scheduled' => $id_scheduled, 'number' => $number]); $result = $this->_insert('scheduled_number', ['id_scheduled' => $id_scheduled, 'number' => $number]);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -216,14 +215,13 @@
*/ */
public function insert_scheduled_contact($id_scheduled, $id_contact) public function insert_scheduled_contact($id_scheduled, $id_contact)
{ {
$result = $this->insertIntoTable('scheduled_contact', ['id_scheduled' => $id_scheduled, 'id_contact' => $id_contact]); $result = $this->_insert('scheduled_contact', ['id_scheduled' => $id_scheduled, 'id_contact' => $id_contact]);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -234,14 +232,13 @@
*/ */
public function insert_scheduled_groupe($id_scheduled, $id_group) public function insert_scheduled_groupe($id_scheduled, $id_group)
{ {
$result = $this->insertIntoTable('scheduled_groupe', ['id_scheduled' => $id_scheduled, 'id_group' => $id_group]); $result = $this->_insert('scheduled_groupe', ['id_scheduled' => $id_scheduled, 'id_group' => $id_group]);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -251,7 +248,7 @@
*/ */
public function delete_scheduled_number($id_scheduled) public function delete_scheduled_number($id_scheduled)
{ {
return $this->deleteFromTableWhere('scheduled_number', ['id_scheduled' => $id_scheduled]); return $this->_delete('scheduled_number', ['id_scheduled' => $id_scheduled]);
} }
/** /**
@ -261,7 +258,7 @@
*/ */
public function delete_scheduled_contact($id_scheduled) public function delete_scheduled_contact($id_scheduled)
{ {
return $this->deleteFromTableWhere('scheduled_contact', ['id_scheduled' => $id_scheduled]); return $this->_delete('scheduled_contact', ['id_scheduled' => $id_scheduled]);
} }
/** /**
@ -271,6 +268,6 @@
*/ */
public function delete_scheduled_groupe($id_scheduled) public function delete_scheduled_groupe($id_scheduled)
{ {
return $this->deleteFromTableWhere('scheduled_groupe', ['id_scheduled' => $id_scheduled]); return $this->_delete('scheduled_groupe', ['id_scheduled' => $id_scheduled]);
} }
} }

31
models/Sended.php
View File

@ -1,9 +1,10 @@
<?php <?php
namespace models; namespace models;
/** /**
* Cette classe gère les accès bdd pour les sendedes * Cette classe gère les accès bdd pour les sendedes
*/ */
class Sended extends \Model class Sended extends \descartes\Model
{ {
/** /**
* Retourne une entrée par son id * Retourne une entrée par son id
@ -12,7 +13,7 @@
*/ */
public function get_by_id($id) public function get_by_id($id)
{ {
$sendeds = $this->select('sended', ['id' => $id]); $sendeds = $this->_select('sended', ['id' => $id]);
return isset($sendeds[0]) ? $sendeds[0] : false; return isset($sendeds[0]) ? $sendeds[0] : false;
} }
@ -23,7 +24,7 @@
*/ */
public function get_list($limit, $offset) public function get_list($limit, $offset)
{ {
$sendeds = $this->select('sended', [], '', false, $limit, $offset); $sendeds = $this->_select('sended', [], '', false, $limit, $offset);
return $sendeds; return $sendeds;
} }
@ -40,11 +41,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->generateInFromArray($ids); $generated_in = $this->_generate_in_from_array($ids);
$query .= $generated_in['QUERY']; $query .= $generated_in['QUERY'];
$params = $generated_in['PARAMS']; $params = $generated_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -54,7 +55,7 @@
*/ */
public function get_lasts_by_date($nb_entry) public function get_lasts_by_date($nb_entry)
{ {
$sendeds = $this->select('sended', [], 'at', true, $nb_entry); $sendeds = $this->_select('sended', [], 'at', true, $nb_entry);
return $sendeds; return $sendeds;
} }
@ -65,7 +66,7 @@
*/ */
public function get_by_target($target) public function get_by_target($target)
{ {
$sendeds = $this->select('sended', ['target' => $target]); $sendeds = $this->_select('sended', ['target' => $target]);
return $sendeds; return $sendeds;
} }
@ -83,7 +84,7 @@
$params = ['id' => $id]; $params = ['id' => $id];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -93,14 +94,13 @@
*/ */
public function insert($sended) public function insert($sended)
{ {
$result = $this->insertIntoTable('sended', $sendeds); $result = $this->_insert('sended', $sended);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -111,7 +111,7 @@
*/ */
public function update($id, $sended) public function update($id, $sended)
{ {
return $this->updateTableWhere('sended', $sended, ['id' => $id]); return $this->_update('sended', $sended, ['id' => $id]);
} }
/** /**
@ -120,7 +120,7 @@
*/ */
public function count() public function count()
{ {
return $this->countTable('sended'); return $this->_count('sended');
} }
/** /**
@ -141,7 +141,6 @@
'date' => $date, 'date' => $date,
); );
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
} }

8
models/Setting.php
View File

@ -1,16 +1,17 @@
<?php <?php
namespace models; namespace models;
/** /**
* Cette classe gère les accès bdd pour les settinges * Cette classe gère les accès bdd pour les settinges
*/ */
class Setting extends \Model class Setting extends \descartes\Model
{ {
/** /**
* Return array of all settings * Return array of all settings
*/ */
public function all() : array public function all() : array
{ {
return $this->select('setting', [], '', false, $limit, $offset); return $this->_select('setting', [], '', false);
} }
/** /**
@ -19,7 +20,6 @@
*/ */
public function update(string $name, $value) : int public function update(string $name, $value) : int
{ {
return $this->update('setting', ['value' => $value], ['name' => $name]); return $this->_update('setting', ['value' => $value], ['name' => $name]);
} }
} }

26
models/SMSStop.php → models/SmsStop.php
View File

@ -1,9 +1,10 @@
<?php <?php
namespace models; namespace models;
/** /**
* Cette classe gère les accès bdd pour les smsstopes * Cette classe gère les accès bdd pour les smsstopes
*/ */
class SMSStop extends \Model class SmsStop extends \descartes\Model
{ {
/** /**
* Retourne une entrée par son id * Retourne une entrée par son id
@ -12,7 +13,7 @@
*/ */
public function get_by_id($id) public function get_by_id($id)
{ {
$smsstops = $this->select('smsstop', ['id' => $id]); $smsstops = $this->_select('smsstop', ['id' => $id]);
return isset($smsstops[0]) ? $smsstops[0] : false; return isset($smsstops[0]) ? $smsstops[0] : false;
} }
@ -23,7 +24,7 @@
*/ */
public function get_by_number($number) public function get_by_number($number)
{ {
$smsstops = $this->select('smsstop', ['number' => $number]); $smsstops = $this->_select('smsstop', ['number' => $number]);
return isset($smsstops[0]) ? $smsstops[0] : false; return isset($smsstops[0]) ? $smsstops[0] : false;
} }
@ -34,7 +35,7 @@
*/ */
public function get_list($limit, $offset) public function get_list($limit, $offset)
{ {
$smsstops = $this->select('smsstop', [], '', false, $limit, $offset); $smsstops = $this->_select('smsstop', [], '', false, $limit, $offset);
return $smsstops; return $smsstops;
} }
@ -51,11 +52,11 @@
WHERE id "; WHERE id ";
//On génère la clause IN et les paramètres adaptés depuis le tableau des id //On génère la clause IN et les paramètres adaptés depuis le tableau des id
$generated_in = $this->generateInFromArray($ids); $generated_in = $this->_generate_in_from_array($ids);
$query .= $generated_in['QUERY']; $query .= $generated_in['QUERY'];
$params = $generated_in['PARAMS']; $params = $generated_in['PARAMS'];
return $this->runQuery($query, $params); return $this->_run_query($query, $params);
} }
/** /**
@ -71,7 +72,7 @@
$params = ['id' => $id]; $params = ['id' => $id];
return $this->runQuery($query, $params, self::ROWCOUNT); return $this->_run_query($query, $params, self::ROWCOUNT);
} }
/** /**
@ -81,14 +82,13 @@
*/ */
public function insert($smsstop) public function insert($smsstop)
{ {
$result = $this->insertIntoTable('smsstop', $smsstops); $result = $this->_insert('smsstop', $smsstop);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -99,7 +99,7 @@
*/ */
public function update($id, $smsstop) public function update($id, $smsstop)
{ {
return $this->updateTableWhere('smsstop', $smsstop, ['id' => $id]); return $this->_update('smsstop', $smsstop, ['id' => $id]);
} }
/** /**
@ -108,6 +108,6 @@
*/ */
public function count() public function count()
{ {
return $this->countTable('smsstop'); return $this->_count('smsstop');
} }
} }

24
models/User.php
View File

@ -1,6 +1,7 @@
<?php <?php
namespace models; namespace models;
class User extends \Model
class User extends \descartes\Model
{ {
/** /**
* Retourne un user par son email * Retourne un user par son email
@ -9,7 +10,7 @@
*/ */
public function get_by_email($email) public function get_by_email($email)
{ {
return $this->select_one('user', ['email' => $email]); return $this->_select_one('user', ['email' => $email]);
} }
/** /**
@ -19,7 +20,7 @@
*/ */
public function list($limit, $offset) public function list($limit, $offset)
{ {
return $this->select('user', [], '', false, $limit, $offset); return $this->_select('user', [], '', false, $limit, $offset);
} }
/** /**
@ -29,7 +30,7 @@
*/ */
public function remove($id) public function remove($id)
{ {
return $this->delete('user', ['id' => $id]); return $this->_delete('user', ['id' => $id]);
} }
/** /**
@ -39,14 +40,13 @@
*/ */
public function insert($user) public function insert($user)
{ {
$result = $this->insertIntoTable('user', $user); $result = $this->_insert('user', $user);
if (!$result) if (!$result) {
{
return false; return false;
} }
return $this->lastId(); return $this->_last_id();
} }
/** /**
@ -57,7 +57,7 @@
*/ */
public function update($id, $user) public function update($id, $user)
{ {
return $this->updateTableWhere('user', $user, ['id' => $id]); return $this->_update('user', $user, ['id' => $id]);
} }
/** /**
@ -68,7 +68,7 @@
*/ */
public function update_password($id, $password) public function update_password($id, $password)
{ {
return $this->update('user', ['password' => $password], ['id' => $id]); return $this->_update('user', ['password' => $password], ['id' => $id]);
} }
/** /**
@ -79,7 +79,7 @@
*/ */
public function update_transfer($id, $transfer) public function update_transfer($id, $transfer)
{ {
return $this->update('user', ['transfer' => $transfer], ['id' => $id]); return $this->_update('user', ['transfer' => $transfer], ['id' => $id]);
} }
/** /**
@ -90,6 +90,6 @@
*/ */
public function update_email($id, $email) public function update_email($id, $email)
{ {
return $this->update('user', ['email' => $email], ['id' => $id]); return $this->_update('user', ['email' => $email], ['id' => $id]);
} }
} }