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

Add support for numbers with data on scheduled + add support for sending sms to a csv file

Browse source
This commit is contained in:
osaajani 2022-03-15 02:24:28 +01:00
parent 7fc7a8f245
commit 81fb987740
22 changed files with 635 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

59
controllers/publics/Api.php
View file

@ -222,6 +222,7 @@ namespace controllers\publics;
$groups = $_POST['groups'] ?? [];
$conditional_groups = $_POST['conditional_groups'] ?? [];
$files = $_FILES['medias'] ?? false;
$csv_file = $_FILES['numbers_csv'] ?? false;
$numbers = \is_array($numbers) ? $numbers : [$numbers];
$contacts = \is_array($contacts) ? $contacts : [$contacts];
@ -315,22 +316,66 @@ namespace controllers\publics;
return $this->json($return);
}
if ($csv_file)
{
$uploaded_file = \controllers\internals\Tool::read_uploaded_file($csv_file);
if (!$uploaded_file['success'])
{
$return = self::DEFAULT_RETURN;
$return['error'] = self::ERROR_CODES['INVALID_PARAMETER'];
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'] . 'csv : ' . $uploaded_file['content'];
$this->auto_http_code(false);
return $this->json($return);
}
try
{
$csv_numbers = $this->internal_scheduled->parse_csv_numbers_file($uploaded_file['content'], true);
if (!$csv_numbers)
{
throw new \Exception('no valid number in csv file.');
}
foreach ($csv_numbers as $csv_number)
{
$csv_number['data'] = json_encode($csv_number['data']);
$numbers[] = $csv_number;
}
}
catch (\Exception $e)
{
$return = self::DEFAULT_RETURN;
$return['error'] = self::ERROR_CODES['INVALID_PARAMETER'];
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'] . 'csv : ' . $e->getMessage();
$this->auto_http_code(false);
return $this->json($return);
}
}
foreach ($numbers as $key => $number)
{
if (!is_string($number))
// If number is not an array turn it into an array
$number = is_array($number) ? $number : ['number' => $number, 'data' => '[]'];
$number['data'] = $number['data'] ?? '[]';
$number['number'] = \controllers\internals\Tool::parse_phone($number['number'] ?? '');
if (!$number['number'])
{
unset($numbers[$key]);
continue;
}
$number = \controllers\internals\Tool::parse_phone($number);
if (!$number)
if (null === json_decode($number['data']))
{
unset($numbers[$key]);
$return = self::DEFAULT_RETURN;
$return['error'] = self::ERROR_CODES['INVALID_PARAMETER'];
$return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'] . 'number data must be a valid json or leave not set.';
$this->auto_http_code(false);
continue;
return $this->json($return);
}
$numbers[$key] = $number;
@ -368,7 +413,7 @@ namespace controllers\publics;
{
try
{
$new_media_id = $this->internal_media->upload_and_create_for_user($this->user['id'], $file);
$new_media_id = $this->internal_media->create_from_uploaded_file_for_user($this->user['id'], $file);
}
catch (\Exception $e)
{

1
controllers/publics/Contact.php
View file

@ -45,7 +45,6 @@ namespace controllers\publics;
return $this->render('contact/list');
}
/**
* Return contacts as json.
*/

2
controllers/publics/Discussion.php
View file

@ -313,7 +313,7 @@ namespace controllers\publics;
$mms = (bool) count($media_ids);
//Destinations must be an array of number
$destinations = [$destination];
$destinations = [['number' => $destination]];
if (!$this->internal_scheduled->create($id_user, $at, $text, $id_phone, false, $mms, $destinations, [], [], [], $media_ids))
{

2
controllers/publics/Event.php
View file

@ -42,7 +42,7 @@ namespace controllers\publics;
{
$this->render('event/list');
}
/**
* Return events as json.
*/

2
controllers/publics/Received.php
View file

@ -173,7 +173,7 @@ namespace controllers\publics;
foreach ($receiveds as $key => $received)
{
$receiveds[$key]['text'] = $this->s($received['text'], false, true, false);
if (!$contact = $this->internal_contact->get_by_number_and_user($_SESSION['user']['id'], $received['origin']))
{
continue;

104
controllers/publics/Scheduled.php
View file

@ -197,7 +197,8 @@ namespace controllers\publics;
$numbers = $this->internal_scheduled->get_numbers($scheduled['id']);
foreach ($numbers as $number)
{
$scheduleds[$key]['numbers'][] = $number['number'];
$number['data'] = json_decode($number['data'] ?? '[]');
$scheduleds[$key]['numbers'][] = $number;
}
$contacts = $this->internal_scheduled->get_contacts($scheduled['id']);
@ -259,10 +260,12 @@ namespace controllers\publics;
$flash = (bool) ($_POST['flash'] ?? false);
$id_phone = empty($_POST['id_phone']) ? null : $_POST['id_phone'];
$numbers = $_POST['numbers'] ?? [];
$numbers = is_array($numbers) ? $numbers : [$numbers];
$contacts = $_POST['contacts'] ?? [];
$groups = $_POST['groups'] ?? [];
$conditional_groups = $_POST['conditional_groups'] ?? [];
$files = $_FILES['medias'] ?? false;
$csv_file = $_FILES['csv'] ?? false;
//Iterate over files to re-create individual $_FILES array
$files_arrays = [];
@ -326,17 +329,64 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
if ($csv_file)
{
$uploaded_file = \controllers\internals\Tool::read_uploaded_file($csv_file);
if (!$uploaded_file['success'])
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de traiter ce fichier CSV : ' . $uploaded_file['content']);
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
try
{
$csv_numbers = $this->internal_scheduled->parse_csv_numbers_file($uploaded_file['content']);
if (!$csv_numbers)
{
\FlashMessage\FlashMessage::push('danger', 'Aucun destinataire valide dans le fichier CSV, assurez-vous de fournir un fichier CSV valide.');
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
$numbers = array_merge($csv_numbers, $numbers);
}
catch (\Exception $e)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de traiter ce fichier CSV : ' . $e->getMessage());
return $this->redirect(\descartes\Router::url('Scheduled', 'add'));
}
}
foreach ($numbers as $key => $number)
{
$number = \controllers\internals\Tool::parse_phone($number);
// If number is not an array turn it into an array
$number = is_array($number) ? $number : ['number' => $number, 'data' => []];
$number['data'] = $number['data'] ?? [];
$number['number'] = \controllers\internals\Tool::parse_phone($number['number'] ?? '');
if (!$number)
if (!$number['number'])
{
unset($numbers[$key]);
continue;
}
$clean_data = [];
foreach ($number['data'] as $data_key => $value)
{
if ('' === $value)
{
continue;
}
$data_key = mb_ereg_replace('[\W]', '', $data_key);
$clean_data[$data_key] = (string) $value;
}
$clean_data = json_encode($clean_data);
$number['data'] = $clean_data;
$numbers[$key] = $number;
}
@ -415,6 +465,7 @@ namespace controllers\publics;
$groups = $scheduled['groups'] ?? [];
$conditional_groups = $scheduled['conditional_groups'] ?? [];
$files = $_FILES['scheduleds_' . $id_scheduled . '_medias'] ?? false;
$csv_file = $_FILES['scheduleds_' . $id_scheduled . '_csv'] ?? false;
$media_ids = $scheduled['media_ids'] ?? [];
//Check scheduled exists and belong to user
@ -482,16 +533,59 @@ namespace controllers\publics;
continue;
}
if ($csv_file)
{
$uploaded_file = \controllers\internals\Tool::read_uploaded_file($csv_file);
if (!$uploaded_file['success'])
{
continue;
}
try
{
$csv_numbers = $this->internal_scheduled->parse_csv_numbers_file($uploaded_file['content']);
if (!$csv_numbers)
{
continue;
}
$numbers = array_merge($csv_numbers, $numbers);
}
catch (\Exception $e)
{
continue;
}
}
$numbers = is_array($numbers) ? $numbers : [$numbers];
foreach ($numbers as $key => $number)
{
$number = \controllers\internals\Tool::parse_phone($number);
if (!$number)
// If number is not an array turn it into an array
$number = is_array($number) ? $number : ['number' => $number, 'data' => []];
$number['data'] = $number['data'] ?? [];
$number['number'] = \controllers\internals\Tool::parse_phone($number['number'] ?? '');
if (!$number['number'])
{
unset($numbers[$key]);
continue;
}
$clean_data = [];
foreach ($number['data'] as $data_key => $value)
{
if ('' === $value)
{
continue;
}
$data_key = mb_ereg_replace('[\W]', '', $data_key);
$clean_data[$data_key] = (string) $value;
}
$clean_data = json_encode($clean_data);
$number['data'] = $clean_data;
$numbers[$key] = $number;
}