Add support for mms

This commit is contained in:
osaajani 2019-12-04 03:04:45 +01:00
parent 88b00e4e9f
commit fb10b9cdfd
20 changed files with 979 additions and 118 deletions

View file

@ -83,21 +83,5 @@
</div>
</div>
</div>
<script>
jQuery(document).ready(function ()
{
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});
window.location = url;
});
});
</script>
<?php
$this->render('incs/footer');

View file

@ -83,7 +83,10 @@
hiddenInput: 'number',
defaultCountry: '<?php $this->s($_SESSION['user']['settings']['default_phone_country']); ?>',
preferredCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['preferred_phone_country'])), false, false); ?>,
nationalMode: true,
nationalMode: true,
<?php if ($_SESSION['user']['settings']['authorized_phone_country'] ?? false) { ?>
onlyCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['authorized_phone_country'])), false, false); ?>,
<?php } ?>
utilsScript: '<?php echo HTTP_PWD_JS; ?>/intlTelInput/utils.js'
});

View file

@ -107,6 +107,9 @@
hiddenInput: hidden_input_name,
defaultCountry: '<?php $this->s($_SESSION['user']['settings']['default_phone_country']); ?>',
preferredCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['preferred_phone_country'])), false, false); ?>,
<?php if ($_SESSION['user']['settings']['authorized_phone_country'] ?? false) { ?>
onlyCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['authorized_phone_country'])), false, false); ?>,
<?php } ?>
nationalMode: true,
utilsScript: '<?php echo HTTP_PWD_JS; ?>/intlTelInput/utils.js'
});

View file

@ -82,7 +82,12 @@
</li>
<li <?php echo $page == 'commands' ? 'class="active"' : ''; ?>>
<a href="<?php echo \descartes\Router::url('Command', 'list'); ?>"><i class="fa fa-fw fa-terminal"></i> Commandes</a>
</li>
</li>
<?php if ($_SESSION['user']['settings']['webhook'] ?? false) { ?>
<li <?php echo $page == 'webhooks' ? 'class="active"' : ''; ?>>
<a href="<?php echo \descartes\Router::url('Webhook', 'list'); ?>"><i class="fa fa-fw fa-plug"></i> Webhooks</a>
</li>
<?php } ?>
<li <?php echo $page == 'phones' ? 'class="active"' : ''; ?>>
<a href="<?php echo \descartes\Router::url('Phone', 'list'); ?>"><i class="fa fa-fw fa-phone"></i> Téléphones</a>
</li>

View file

@ -37,7 +37,7 @@
<h3 class="panel-title"><i class="fa fa-calendar fa-fw"></i> Ajout d'un SMS programmé</h3>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Scheduled', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<form action="<?php echo \descartes\Router::url('Scheduled', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST" enctype="multipart/form-data">
<div class="form-group">
<label>Texte du SMS</label>
<?php if ($_SESSION['user']['settings']['templating']) { ?>
@ -59,6 +59,16 @@
</div>
<?php } ?>
</div>
<?php if ($_SESSION['user']['settings']['mms'] ?? false) { ?>
<div class="form-group">
<label>Ajouter un média</label>
<p class="italic small help description-scheduled-media">
Le média sera utilisé uniquement si le téléphone utilisé supporte l'envoi de MMS. Pour plus d'information, consultez la documentation sur <a href="#">l'utilisation des MMS.</a>
</p>
<input class="" name="media" value="" type="file" />
</div>
<?php } ?>
<div class="form-group">
<label>Date d'envoi du SMS</label>
<input name="at" class="form-control form-datetime" type="text" value="<?php $this->s($now); ?>" readonly>
@ -195,6 +205,9 @@
hiddenInput: 'numbers[]',
defaultCountry: '<?php $this->s($_SESSION['user']['settings']['default_phone_country']); ?>',
preferredCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['preferred_phone_country'])), false, false); ?>,
<?php if ($_SESSION['user']['settings']['authorized_phone_country'] ?? false) { ?>
onlyCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['authorized_phone_country'])), false, false); ?>,
<?php } ?>
nationalMode: true,
utilsScript: '<?php echo HTTP_PWD_JS; ?>/intlTelInput/utils.js'
});
@ -210,6 +223,9 @@
hiddenInput: 'numbers[]',
defaultCountry: '<?php $this->s($_SESSION['user']['settings']['default_phone_country']); ?>',
preferredCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['preferred_phone_country'])), false, false); ?>,
<?php if ($_SESSION['user']['settings']['authorized_phone_country'] ?? false) { ?>
onlyCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['authorized_phone_country'])), false, false); ?>,
<?php } ?>
nationalMode: true,
utilsScript: '<?php echo HTTP_PWD_JS; ?>/intlTelInput/utils.js'
});

View file

@ -37,7 +37,7 @@
<h3 class="panel-title"><i class="fa fa-edit fa-fw"></i> Modification des SMS programmés</h3>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Scheduled', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<form action="<?php echo \descartes\Router::url('Scheduled', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST" enctype="multipart/form-data">
<?php foreach ($scheduleds as $scheduled) { ?>
<div class="form-group">
<label>Texte du SMS</label>
@ -60,6 +60,24 @@
</div>
<?php } ?>
</div>
<?php if ($_SESSION['user']['settings']['mms'] ?? false) { ?>
<div class="form-group">
<label>Ajouter un média</label>
<p class="italic small help description-scheduled-media">
Le média sera utilisé uniquement si le téléphone utilisé supporte l'envoi de MMS. Pour plus d'information, consultez la documentation sur <a href="#">l'utilisation des MMS.</a>
</p>
<?php if ($scheduled['media']) { ?>
<div class="current-media-container">
<input type="hidden" name="scheduleds[<?php $this->s($scheduled['id']); ?>][current_media]" value="1">
<p class="inline-block">Un média est déjà lié à ce message.</p>
<a href="#" class="btn btn-warning btn-delete-media">Supprimer le média</a>
</div>
<input class="hidden" name="media_<?php $this->s($scheduled['id']); ?>" type="file" />
<?php } else { ?>
<input name="media_<?php $this->s($scheduled['id']); ?>" type="file" />
<?php } ?>
</div>
<?php } ?>
<div class="form-group">
<label>Date d'envoi du SMS</label>
<input name="scheduleds[<?php $this->s($scheduled['id']); ?>][at]" class="form-control form-datetime" type="text" value="<?php $this->s($scheduled['at']); ?>" readonly>
@ -187,6 +205,9 @@
hiddenInput: hidden_input_name,
defaultCountry: '<?php $this->s($_SESSION['user']['settings']['default_phone_country']); ?>',
preferredCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['preferred_phone_country'])), false, false); ?>,
<?php if ($_SESSION['user']['settings']['authorized_phone_country'] ?? false) { ?>
onlyCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['authorized_phone_country'])), false, false); ?>,
<?php } ?>
nationalMode: true,
utilsScript: '<?php echo HTTP_PWD_JS; ?>/intlTelInput/utils.js'
});
@ -210,11 +231,21 @@
hiddenInput: hidden_input_name,
defaultCountry: '<?php $this->s($_SESSION['user']['settings']['default_phone_country']); ?>',
preferredCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['preferred_phone_country'])), false, false); ?>,
<?php if ($_SESSION['user']['settings']['authorized_phone_country'] ?? false) { ?>
onlyCountries: <?php $this->s(json_encode(explode(',', $_SESSION['user']['settings']['authorized_phone_country'])), false, false); ?>,
<?php } ?>
nationalMode: true,
utilsScript: '<?php echo HTTP_PWD_JS; ?>/intlTelInput/utils.js'
});
});
});
jQuery('body').on('click', '.btn-delete-media', function (e)
{
e.preventDefault();
jQuery(this).parents('.form-group').find('input').removeClass('hidden');
jQuery(this).parents('.form-group').find('.current-media-container').remove();
});
jQuery('body').on('click', '.preview-button', function (e)
{

View file

@ -54,6 +54,25 @@
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title"><i class="fa fa-picture-o fa-fw"></i> Support des MMS</h4>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'mms', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
<div class="form-group">
<label>Activer les MMS : </label>
<select name="setting_value" class="form-control">
<option value="0">Non</option>
<option value="1" <?php echo $_SESSION['user']['settings']['mms'] ? 'selected' : ''; ?>>Oui</option>
</select>
</div>
<div class="text-center">
<button class="btn btn-success">Mettre à jour les données</button>
</div>
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title"><i class="fa fa-link fa-fw"></i> Détection des URL dans les discussions</h4>
@ -89,6 +108,22 @@
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title"><i class="fa fa-flag fa-fw"></i> Pays autorisés pour l'envoi</h4>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'preferred_phone_country', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
<div class="form-group">
<label>Code des pays (norme ISO 3166-1 alpha-2) séparés par des virgules (laissez vide pour tout autoriser) : </label>
<input name="setting_value" class="form-control" value="<?php $this->s($_SESSION['user']['settings']['authorized_phone_country']); ?>" />
</div>
<div class="text-center">
<button class="btn btn-success">Mettre à jour les données</button>
</div>
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title"><i class="fa fa-music fa-fw"></i> Son sur reception d'un SMS</h4>
@ -148,6 +183,25 @@
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title"><i class="fa fa-plug fa-fw"></i> Activation de Webhooks</h4>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'webhook', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
<div class="form-group">
<label>Webhooks activé : </label>
<select name="setting_value" class="form-control">
<option value="0">Non</option>
<option value="1" <?php echo $_SESSION['user']['settings']['webhook'] ? 'selected' : ''; ?>>Oui</option>
</select>
</div>
<div class="text-center">
<button class="btn btn-success">Mettre à jour les données</button>
</div>
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title"><i class="fa fa-phone fa-fw"></i> Pays par défaut numéros internationaux</h4>

View file

@ -1,11 +1,9 @@
<?php
//Template dashboard
$incs = new internalIncs();
$incs->head('Webhook - Add');
$this->render('incs/head', ['title' => 'Webhooks - Add'])
?>
<div id="wrapper">
<?php
$incs->nav('webhooks');
$this->render('incs/nav', ['page' => 'webhooks'])
?>
<div id="page-wrapper">
<div class="container-fluid">
@ -20,7 +18,7 @@
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
</li>
<li>
<i class="fa fa-plug"></i> <a href="<?php echo \descartes\Router::url('webhooks'); ?>">Webhooks</a>
<i class="fa fa-plug"></i> <a href="<?php echo \descartes\Router::url('Webhook', 'list'); ?>">Webhooks</a>
</li>
<li class="active">
<i class="fa fa-plus"></i> Nouveau
@ -37,7 +35,7 @@
<h3 class="panel-title"><i class="fa fa-plug fa-fw"></i> Ajout d'un nouveau webhook</h3>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('webhooks', 'create', [$_SESSION['csrf']]);?>" method="POST">
<form action="<?php echo \descartes\Router::url('Webhook', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<div class="form-group">
<label>URL cible</label>
<div class="form-group">
@ -47,12 +45,11 @@
<div class="form-group">
<label>Type de Webhook</label>
<select name="type" class="form-control" required>
<?php foreach (internalConstants::WEBHOOK_TYPE as $key => $value) { ?>
<option value="<?php $this->s($value); ?>"><?php $this->s($key); ?></option>
<?php } ?>
<option value="receive_sms">Réception d'un SMS</option>
<option value="send_sms">Envoi d'un SMS</option>
</select>
</div>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('webhooks'); ?>">Annuler</a>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Webhook', 'list'); ?>">Annuler</a>
<input type="submit" class="btn btn-success" value="Enregistrer le webhook" />
</form>
</div>
@ -63,4 +60,4 @@
</div>
</div>
<?php
$incs->footer();
$this->render('incs/footer');

View file

@ -1,11 +1,10 @@
<?php
//Template dashboard
$incs = new internalIncs();
$incs->head('Webhook - Edit');
$this->render('incs/head', ['title' => 'Webhooks - Edit'])
?>
<div id="wrapper">
<?php
$incs->nav('webhooks');
$this->render('incs/nav', ['page' => 'webhooks'])
?>
<div id="page-wrapper">
<div class="container-fluid">
@ -20,7 +19,7 @@
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
</li>
<li>
<i class="fa fa-plug"></i> <a href="<?php echo \descartes\Router::url('webhooks'); ?>">Webhooks</a>
<i class="fa fa-plug"></i> <a href="<?php echo \descartes\Router::url('Webhook', 'list'); ?>">Webhooks</a>
</li>
<li class="active">
<i class="fa fa-edit"></i> Modifier
@ -37,8 +36,9 @@
<h3 class="panel-title"><i class="fa fa-edit fa-fw"></i>Modification de webhooks</h3>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('webhooks', 'update', [$_SESSION['csrf']]);?>" method="POST">
<form action="<?php echo \descartes\Router::url('Webhook', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<?php foreach ($webhooks as $webhook) { ?>
<input type="hidden" value="<?php $this->s($webhook['id']); ?>" name="webhooks[<?php $this->s($webhook['id']); ?>][id]" />
<div class="form-group">
<label>URL cible</label>
<div class="form-group">
@ -48,14 +48,13 @@
<div class="form-group">
<label>Type de Webhook</label>
<select name="webhooks[<?php $this->s($webhook['id']); ?>][type]" class="form-control" required>
<?php foreach (internalConstants::WEBHOOK_TYPE as $key => $value) { ?>
<option <?php echo ($webhook['type'] == $value ? 'selected' : ''); ?> value="<?php $this->s($value); ?>"><?php $this->s($key); ?></option>
<?php } ?>
<option <?php echo $webhook['type'] == 'receive_sms' ? 'selected="selected"' : '' ?> value="receive_sms">Réception d'un SMS</option>
<option <?php echo $webhook['type'] == 'send_sms' ? 'selected="selected"' : '' ?> value="send_sms">Envoi d'un SMS</option>
</select>
</div>
<hr/>
<?php } ?>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('webhooks'); ?>">Annuler</a>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Webhook', 'list'); ?>">Annuler</a>
<input type="submit" class="btn btn-success" value="Enregistrer la webhook" />
</form>
</div>
@ -66,4 +65,4 @@
</div>
</div>
<?php
$incs->footer();
$this->render('incs/footer');

View file

@ -1,11 +1,9 @@
<?php
//Template dashboard
$incs = new internalIncs();
$incs->head('Webhooks - Show All');
$this->render('incs/head', ['title' => 'Webhooks - Show All'])
?>
<div id="wrapper">
<?php
$incs->nav('webhooks');
$this->render('incs/nav', ['page' => 'webhooks'])
?>
<div id="page-wrapper">
<div class="container-fluid">
@ -33,44 +31,47 @@
<div class="panel-heading">
<h3 class="panel-title"><i class="fa fa-plug fa-fw"></i> Liste des webhooks</h3>
</div>
<div class="panel-body">
<div class="table-responsive">
<table class="table table-bordered table-hover table-striped" id="table-webhooks">
<thead>
<tr>
<th>#</th>
<th>Url</th>
<th>Type de Webhook</th>
<th style="width:5%;">Sélectionner</th>
</tr>
</thead>
<tbody>
<?php foreach ($webhooks as $webhook) { ?>
<tr>
<td><?php $this->s($webhook['id']); ?></td>
<td><?php $this->s($webhook['url']); ?></td>
<td><?php echo array_search($webhook['type'], internalConstants::WEBHOOK_TYPE); ?></td>
<td><input type="checkbox" value="<?php $this->s($webhook['id']); ?>"></td>
</tr>
<div class="panel-body">
<form method="GET">
<?php if (!$webhooks) { ?>
<p>Aucun webhook n'a été créé pour le moment.</p>
<?php } else { ?>
<div class="table-responsive">
<table class="table table-bordered table-hover table-striped" id="table-webhooks">
<thead>
<tr>
<th>#</th>
<th>Url</th>
<th>Type de webhook</th>
<th style="width:5%;">Sélectionner</th>
</tr>
</thead>
<tbody>
<?php foreach ($webhooks as $webhook) { ?>
<tr>
<td><?php $this->s($webhook['id']); ?></td>
<td><?php $this->s($webhook['url']); ?></td>
<td><?php $this->s($webhook['type'] == 'send_sms' ? 'Envoi de SMS' : 'Reception de SMS'); ?></td>
<td><input type="checkbox" name="ids[]" value="<?php $this->s($webhook['id']); ?>"></td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
<?php } ?>
<div>
<div class="col-xs-6 no-padding">
<a class="btn btn-success" href="<?php echo \descartes\Router::url('Webhook', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un webhook</a>
</div>
<?php if ($webhooks) { ?>
<div class="text-right col-xs-6 no-padding">
<strong>Action pour la séléction :</strong>
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Webhook', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
<button class="btn btn-default btn-confirm" type="submit" formaction="<?php echo \descartes\Router::url('Webhook', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
</div>
<?php } ?>
</tbody>
</table>
</div>
<div>
<div class="col-xs-6 no-padding">
<a class="btn btn-success" href="<?php echo \descartes\Router::url('webhooks', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un webhook</a>
</div>
<div class="text-right col-xs-6 no-padding">
<strong>Action pour la séléction :</strong>
<div class="btn-groupe action-dropdown" destination="#table-webhooks">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action pour la sélection <span class="caret"></span></button>
<ul class="dropdown-menu pull-right" role="menu">
<li><a href="<?php echo \descartes\Router::url('webhooks', 'edit', [$_SESSION['csrf']]); ?>"><span class="fa fa-edit"></span> Modifier</a></li>
<li><a href="<?php echo \descartes\Router::url('webhooks', 'delete', [$_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</a></li>
</ul>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
@ -78,21 +79,5 @@
</div>
</div>
</div>
<script>
jQuery(document).ready(function ()
{
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});
window.location = url;
});
});
</script>
<?php
$incs->footer();
$this->render('incs/footer');