Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-06-06 14:46:27 +02:00
Code Issues Projects Releases Wiki Activity

fix style

Browse source
This commit is contained in:
osaajani 2021-01-14 03:32:17 +01:00
parent cc233f726a
commit aac464704e
34 changed files with 147 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

6
controllers/internals/ConditionalGroup.php
View file

@ -114,11 +114,11 @@ namespace controllers\internals;
{
$contact['datas'] = json_decode($contact['datas']);
$contact = (object) $contact;
//Add metas of contact by adding contact without datas
$metas = clone $contact;
unset($metas->datas);
unset($metas->id_user);
$metas->datas = null;
$metas->id_user = null;
$datas = ['contact' => $contact->datas, 'contact_metas' => $metas];
$is_valid = $ruler->evaluate_condition($condition, $datas);

19
controllers/internals/Console.php
View file

@ -68,9 +68,10 @@ namespace controllers\internals;
}
/**
* Check if a user exists based on email
* Check if a user exists based on email.
*
* @param string $email : User email
*
* @param string $email : User email
* @return exit code 1 on false, 0 else
*/
public function user_exists(string $email)
@ -79,6 +80,7 @@ namespace controllers\internals;
$internal_user = new \controllers\internals\User($bdd);
$user = $internal_user->get_by_email($email);
exit($user ? 0 : 1);
}
@ -105,18 +107,20 @@ namespace controllers\internals;
$api_key = $api_key ?? $internal_user->generate_random_api_key();
$success = $internal_user->update($user['id'], $email, $password, $admin, $api_key, $status, $encrypt_password);
echo json_encode(['id' => $user['id']]);
exit($success ? 0 : 1);
}
$new_user_id = $internal_user->create($email, $password, $admin, $api_key, $status, $encrypt_password);
echo json_encode(['id' => $new_user_id]);
exit($new_user_id ? 0 : 1);
}
/**
* Update a user status.
*
* @param string $id : User id
* @param string $id : User id
* @param string $status : User status, default \models\User::STATUS_ACTIVE
*/
public function update_user_status(string $id, string $status)
@ -131,14 +135,14 @@ namespace controllers\internals;
}
$success = $internal_user->update_status($user['id'], $status);
exit($success ? 0 : 1);
}
/**
* Delete a user
* Delete a user.
*
* @param string $id : User id
* @param string $id : User id
*/
public function delete_user(string $id)
{
@ -146,6 +150,7 @@ namespace controllers\internals;
$internal_user = new \controllers\internals\User($bdd);
$success = $internal_user->delete($id);
exit($success ? 0 : 1);
}
}

2
controllers/internals/Phone.php
View file

@ -60,7 +60,7 @@ namespace controllers\internals;
* @param string $adapter : The adapter to use the phone
* @param string json $adapter_datas : A JSON string representing adapter's datas (for example credentials for an api)
*
* @return int|bool : false on error, new id on success
* @return bool|int : false on error, new id on success
*/
public function create(int $id_user, string $name, string $adapter, string $adapter_datas)
{

10
controllers/internals/Scheduled.php
View file

@ -244,7 +244,7 @@ namespace controllers\internals;
if (!isset($users_phones[$scheduled['id_user']]))
{
$phones = $internal_phone->gets_for_user($scheduled['id_user']);
$users_phones[$scheduled['id_user']] = $phones ? $phones : [];
$users_phones[$scheduled['id_user']] = $phones ?: [];
}
$phone_to_use = null;
@ -335,14 +335,12 @@ namespace controllers\internals;
if ((int) ($users_settings[$scheduled['id_user']]['templating'] ?? false))
{
$contact['datas'] = json_decode($contact['datas'], true);
//Add metas of contact by adding contact without datas
$metas = $contact;
unset($metas['datas']);
unset($metas['id_user']);
$datas = ['contact' => $contact['datas'], 'contact_metas' => $metas];
unset($metas['datas'], $metas['id_user']);
$datas = ['contact' => $contact['datas'], 'contact_metas' => $metas];
$render = $internal_templating->render($scheduled['text'], $datas);

21
controllers/internals/Tool.php
View file

@ -97,26 +97,32 @@ namespace controllers\internals;
$logo = 'fa-user';
break;
case 'CONTACT_ADD':
$logo = 'fa-user';
break;
case 'GROUP_ADD':
$logo = 'fa-group';
break;
case 'CONDITIONAL_GROUP_ADD':
$logo = 'fa-bullseye';
break;
case 'SCHEDULED_ADD':
$logo = 'fa-calendar';
break;
case 'COMMAND_ADD':
$logo = 'fa-terminal';
break;
default:
$logo = 'fa-question';
}
@ -169,7 +175,8 @@ namespace controllers\internals;
if (!isset($_SESSION['connect']) || !$_SESSION['connect'])
{
header('Location: /');
die();
exit();
}
}
@ -217,26 +224,32 @@ namespace controllers\internals;
$result['content'] = 'Impossible de télécharger le fichier car il dépasse les ' . ini_get('upload_max_filesize') / (1000 * 1000) . ' Mégaoctets.';
break;
case UPLOAD_ERR_FORM_SIZE:
$result['content'] = 'Le fichier dépasse la limite de taille.';
break;
case UPLOAD_ERR_PARTIAL:
$result['content'] = 'L\'envoi du fichier a été interrompu.';
break;
case UPLOAD_ERR_NO_FILE:
$result['content'] = 'Aucun fichier n\'a été envoyé.';
break;
case UPLOAD_ERR_NO_TMP_DIR:
$result['content'] = 'Le serveur ne dispose pas de fichier temporaire permettant l\'envoi de fichiers.';
break;
case UPLOAD_ERR_CANT_WRITE:
$result['content'] = 'Impossible d\'envoyer le fichier car il n\'y a plus de place sur le serveur.';
break;
case UPLOAD_ERR_EXTENSION:
$result['content'] = 'Le serveur a interrompu l\'envoi du fichier.';
@ -284,26 +297,32 @@ namespace controllers\internals;
$result['content'] = 'Impossible de télécharger le fichier car il dépasse les ' . ini_get('upload_max_filesize') / (1000 * 1000) . ' Mégaoctets.';
break;
case UPLOAD_ERR_FORM_SIZE:
$result['content'] = 'Le fichier dépasse la limite de taille.';
break;
case UPLOAD_ERR_PARTIAL:
$result['content'] = 'L\'envoi du fichier a été interrompu.';
break;
case UPLOAD_ERR_NO_FILE:
$result['content'] = 'Aucun fichier n\'a été envoyé.';
break;
case UPLOAD_ERR_NO_TMP_DIR:
$result['content'] = 'Le serveur ne dispose pas de fichier temporaire permettant l\'envoi de fichiers.';
break;
case UPLOAD_ERR_CANT_WRITE:
$result['content'] = 'Impossible d\'envoyer le fichier car il n\'y a plus de place sur le serveur.';
break;
case UPLOAD_ERR_EXTENSION:
$result['content'] = 'Le serveur a interrompu l\'envoi du fichier.';

22
controllers/publics/Api.php
View file

@ -307,18 +307,18 @@ namespace controllers\publics;
}
/**
* Create a new phone
*
* @param string $_POST['name'] : Phone name
* @param string $_POST['adapter'] : Phone adapter
* @param array $_POST['adapter_datas'] : Phone adapter datas
* Create a new phone.
*
* @param string $_POST['name'] : Phone name
* @param string $_POST['adapter'] : Phone adapter
* @param array $_POST['adapter_datas'] : Phone adapter datas
*
* @return int : id phone the new phone on success
*/
public function post_phone()
{
$return = self::DEFAULT_RETURN;
$name = $_POST['name'] ?? false;
$adapter = $_POST['adapter'] ?? false;
$adapter_datas = !empty($_POST['adapter_datas']) ? $_POST['adapter_datas'] : [];
@ -331,7 +331,7 @@ namespace controllers\publics;
return $this->json($return);
}
if (!$adapter)
{
$return['error'] = self::ERROR_CODES['MISSING_PARAMETER'];
@ -409,7 +409,7 @@ namespace controllers\publics;
continue;
}
}
$return['error'] = self::ERROR_CODES['INVALID_PARAMETER'];
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'] . ' field ' . $field['name'] . ' is not a valid phone number.';
$this->auto_http_code(false);
@ -434,7 +434,7 @@ namespace controllers\publics;
}
$phone_id = $this->internal_phone->create($this->user['id'], $name, $adapter, $adapter_datas);
if ($phone_id === false)
if (false === $phone_id)
{
$return['error'] = self::ERROR_CODES['CANNOT_CREATE'];
$return['message'] = self::ERROR_MESSAGES['CANNOT_CREATE'];
@ -445,10 +445,10 @@ namespace controllers\publics;
$return['response'] = $phone_id;
$this->auto_http_code(true);
return $this->json($return);
}
/**
* Delete a phone.
*

1
controllers/publics/Callback.php
View file

@ -52,6 +52,7 @@ use Monolog\Logger;
http_response_code(401);
echo json_encode(['error' => 'Invalid API key. You must provide a valid GET or POST api_key param.']);
$this->logger->error('Callback call failed with invalid api key : ' . $api_key);
exit(1);
}

4
controllers/publics/Command.php
View file

@ -44,9 +44,9 @@ namespace controllers\publics;
{
$this->render('command/list');
}
/**
* Return commands as json
* Return commands as json.
*/
public function list_json()
{

4
controllers/publics/ConditionalGroup.php
View file

@ -48,9 +48,9 @@ namespace controllers\publics;
{
$this->render('conditional_group/list');
}
/**
* Return conditionnals groups as json
* Return conditionnals groups as json.
*/
public function list_json()
{

10
controllers/publics/Contact.php
View file

@ -42,9 +42,9 @@ namespace controllers\publics;
{
return $this->render('contact/list');
}
/**
* Return contacts as json
* Return contacts as json.
*/
public function list_json()
{
@ -288,16 +288,19 @@ namespace controllers\publics;
//Try to import file
$invalid_type = false;
switch ($read_file['mime_type'])
{
case 'text/csv':
$result = $this->internal_contact->import_csv($id_user, $read_file['content']);
break;
case 'application/json':
$result = $this->internal_contact->import_json($id_user, $read_file['content']);
break;
default:
$invalid_type = true;
}
@ -338,16 +341,19 @@ namespace controllers\publics;
//Try to export contacts
$invalid_type = false;
switch ($format)
{
case 'csv':
$result = $this->internal_contact->export_csv($id_user);
break;
case 'json':
$result = $this->internal_contact->export_json($id_user);
break;
default:
$invalid_type = true;
}

4
controllers/publics/Discussion.php
View file

@ -48,9 +48,9 @@ namespace controllers\publics;
{
$this->render('discussion/list');
}
/**
* Return discussions as json
* Return discussions as json.
*/
public function list_json()
{

4
controllers/publics/Event.php
View file

@ -44,7 +44,7 @@ namespace controllers\publics;
}
/**
* Return events as json
* Return events as json.
*/
public function list_json()
{
@ -74,7 +74,7 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('Event', 'list'));
}
if (!\controllers\internals\Tool::is_admin())
{
\FlashMessage\FlashMessage::push('danger', 'Vous devez être administrateur pour supprimer un event !');

5
controllers/publics/Group.php
View file

@ -44,10 +44,9 @@ namespace controllers\publics;
{
$this->render('group/list');
}
/**
* Return groups as json
* Return groups as json.
*/
public function list_json()
{

2
controllers/publics/Phone.php
View file

@ -73,7 +73,7 @@ class Phone extends \descartes\Controller
}
/**
* Return phones as json with additionnals datas about callbacks
* Return phones as json with additionnals datas about callbacks.
*/
public function list_json()
{

20
controllers/publics/Received.php
View file

@ -43,9 +43,9 @@ namespace controllers\publics;
{
$this->render('received/list', ['is_unread' => false]);
}
/**
* Return received as json
* Return received as json.
*/
public function list_json()
{
@ -66,9 +66,9 @@ namespace controllers\publics;
{
$this->render('received/list', ['is_unread' => true]);
}
/**
* Return unred received as json
* Return unred received as json.
*/
public function list_unread_json()
{
@ -83,15 +83,15 @@ namespace controllers\publics;
}
/**
* Mark messages as
* Mark messages as.
*
* @param string $status : New status of the message, read or unread
* @param string $status : New status of the message, read or unread
* @param array int $_GET['ids'] : Ids of receiveds to delete
* @param mixed $csrf
*
* @return boolean;
*/
public function mark_as ($status, $csrf)
public function mark_as($status, $csrf)
{
if (!$this->verify_csrf($csrf))
{
@ -99,15 +99,15 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('Received', 'list'));
}
$ids = $_GET['ids'] ?? [];
foreach ($ids as $id)
{
if ($status === \models\Received::STATUS_UNREAD)
if (\models\Received::STATUS_UNREAD === $status)
{
$this->internal_received->mark_as_unread_for_user($_SESSION['user']['id'], $id);
}
elseif ($status === \models\Received::STATUS_READ)
elseif (\models\Received::STATUS_READ === $status)
{
$this->internal_received->mark_as_read_for_user($_SESSION['user']['id'], $id);
}

4
controllers/publics/Scheduled.php
View file

@ -49,9 +49,9 @@ namespace controllers\publics;
{
$this->render('scheduled/list');
}
/**
* Return scheduleds as json
* Return scheduleds as json.
*/
public function list_json()
{

3
controllers/publics/Sended.php
View file

@ -46,7 +46,7 @@ namespace controllers\publics;
}
/**
* Return sendeds as json
* Return sendeds as json.
*/
public function list_json()
{
@ -59,7 +59,6 @@ namespace controllers\publics;
header('Content-Type: application/json');
echo json_encode(['data' => $entities]);
}
/**
* Cette fonction va supprimer une liste de sendeds.

4
controllers/publics/SmsStop.php
View file

@ -41,9 +41,9 @@ namespace controllers\publics;
{
$this->render('smsstop/list');
}
/**
* Return smsstops as json
* Return smsstops as json.
*/
public function list_json()
{

3
controllers/publics/Templating.php
View file

@ -70,8 +70,7 @@ namespace controllers\publics;
//Add metas of contact by adding contact without datas
$metas = $contact;
unset($metas['datas']);
unset($metas['id_user']);
unset($metas['datas'], $metas['id_user']);
$datas = [
'contact' => $contact['datas'],

4
controllers/publics/User.php
View file

@ -44,9 +44,9 @@ class User extends \descartes\Controller
{
$this->render('user/list');
}
/**
* Return users as json
* Return users as json.
*/
public function list_json()
{

4
controllers/publics/Webhook.php
View file

@ -38,9 +38,9 @@ namespace controllers\publics;
{
$this->render('webhook/list');
}
/**
* Return commands as json
* Return commands as json.
*/
public function list_json()
{