fix a lot a errors probably due to migration

This commit is contained in:
osaajani 2019-11-10 00:27:42 +01:00
parent afb899c003
commit ae42484a60
37 changed files with 561 additions and 581 deletions

View file

@ -49,7 +49,7 @@
<h4 class="panel-title"><i class="fa fa-key fa-fw"></i> Modifier mot de passe</h4>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Account', 'change_password', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
<form action="<?php echo \descartes\Router::url('Account', 'update_password', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
<div class="form-group">
<label>Mot de passe :</label>
<input name="password" type="password" class="form-control" placeholder="Nouveau mot de passe" />
@ -84,7 +84,7 @@
<h4 class="panel-title"><i class="fa fa-at fa-fw"></i> Modifier e-mail</h4>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Account', 'change_email', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
<form action="<?php echo \descartes\Router::url('Account', 'update_email', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
<div class="form-group">
<label>Adresse e-mail :</label>
<input name="email" type="email" class="form-control" placeholder="Nouvelle adresse e-mail" />
@ -100,7 +100,7 @@
<h4 class="panel-title"><i class="fa fa-share fa-fw"></i> Transfert des SMS par e-mail</h4>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Account', 'change_transfer', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
<form action="<?php echo \descartes\Router::url('Account', 'update_transfer', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
<div class="form-group">
<label>Transfert activé : </label>
<select name="transfer" class="form-control">

View file

@ -48,7 +48,7 @@
<div class="form-group">
<label>Numéro de téléphone du contact</label>
<div class="form-group">
<input name="" class="form-control" type="tel" id="phone-international-input">
<input name="number" class="form-control" type="tel" id="phone-international-input">
<input name="number" type="hidden" id="phone-hidden-input" required>
</div>
</div>
@ -64,18 +64,19 @@
</div>
<script>
jQuery('document').ready(function($)
{
jQuery('#phone-international-input').intlTelInput({
{
var number_input = jQuery('#phone-international-input')[0];
var iti_number_input = window.intlTelInput(number_input, {
defaultCountry: '<?php $this->s(RASPISMS_SETTINGS_DEFAULT_PHONE_COUNTRY); ?>',
preferredCountries: <?php $this->s(json_encode(explode(',', RASPISMS_SETTINGS_PREFERRED_PHONE_COUNTRY)), false, false); ?>,
nationalMode: true,
utilsScript: '<?php echo HTTP_PWD; ?>/js/intlTelInput/lib/libphonenumber/utils.js'
});
utilsScript: '<?php echo HTTP_PWD_JS; ?>/intlTelInput/utils.js'
});
jQuery('form').on('submit', function(e)
{
e.preventDefault();
jQuery('#phone-hidden-input').val(jQuery('#phone-international-input').intlTelInput("getNumber"));
e.preventDefault();
jQuery('#phone-hidden-input').val(iti_number_input.getNumber())
this.submit();
});
});

View file

@ -38,7 +38,7 @@
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Contact', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<?php foreach ($contacts as $contact) } ?>
<?php foreach ($contacts as $contact) { ?>
<div class="form-group">
<input name="contacts[<?php $this->s($contact['id']); ?>][id]" type="hidden" value="<?php $this->s($contact['id']); ?>">
<label>Nom contact</label>
@ -68,24 +68,24 @@
</div>
<script>
jQuery('document').ready(function($)
{
jQuery('.phone-international-input').intlTelInput({
defaultCountry: '<?php $this->s(RASPISMS_SETTINGS_DEFAULT_PHONE_COUNTRY); ?>',
preferredCountries: <?php $this->s(json_encode(explode(',', RASPISMS_SETTINGS_PREFERRED_PHONE_COUNTRY)), false, false); ?>,
nationalMode: true,
utilsScript: '<?php echo HTTP_PWD; ?>/js/intlTelInput/lib/libphonenumber/utils.js'
});
jQuery('form').on('submit', function(e)
{
e.preventDefault();
jQuery('.phone-international-input').each(function(key, value)
{
jQuery('#phone-hidden-input-' + jQuery(this).attr('contact-id')).val(jQuery(this).intlTelInput("getNumber"));
});
this.submit();
});
{
jQuery('.phone-international-input').each(function()
{
var number_input = this;
var iti_number_input = window.intlTelInput(number_input, {
defaultCountry: '<?php $this->s(RASPISMS_SETTINGS_DEFAULT_PHONE_COUNTRY); ?>',
preferredCountries: <?php $this->s(json_encode(explode(',', RASPISMS_SETTINGS_PREFERRED_PHONE_COUNTRY)), false, false); ?>,
nationalMode: true,
utilsScript: '<?php echo HTTP_PWD_JS; ?>/intlTelInput/utils.js'
});
jQuery('form').on('submit', function(e)
{
e.preventDefault();
jQuery('#phone-hidden-input-' + jQuery(number_input).attr('contact-id')).val(iti_number_input.getNumber())
this.submit();
});
});
});
</script>
<?php

View file

@ -49,7 +49,7 @@
</tr>
</thead>
<tbody>
<?php foreach ($contacts as $contact) } ?>
<?php foreach ($contacts as $contact) { ?>
<tr>
<td><?php $this->s($contact['id']); ?></td>
<td><?php $this->s($contact['name']); ?></td>

View file

@ -17,7 +17,7 @@
</h1>
<ol class="breadcrumb">
<li>
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'list'); ?>">Dashboard</a>
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
</li>
<li class="active">
<i class="fa fa-comments-o"></i> Discussions

View file

@ -1,6 +1,7 @@
Votre compte a été créé sur le site <?php echo HTTP_PWD; ?> avec les identifiants suivants :
Adresse e-mail : <?php echo $email; ?>
Mot de passe : <?php echo $password; ?>
--------------------------------------------------------------------------------------------
Pour plus d'informations sur le système RaspiSMS, rendez-vous sur le site http://raspbian-france.fr
Pour plus d'informations sur le système RaspiSMS, rendez-vous sur le site https://raspisms.raspberry-pi.fr

View file

@ -1,2 +1,5 @@
Vous avez demandé la -initialisation de votre mot de passe pour le site <?php echo HTTP_PWD; ?>.
Pour -initialisez votre mot de passe, rendez-vous à l'adresse suivante : <?php echo $reset_link; ?>.
--------------------------------------------------------------------------------------------
Pour plus d'informations sur le système RaspiSMS, rendez-vous sur le site https://raspisms.raspberry-pi.fr

View file

@ -46,7 +46,7 @@
</div>
</div>
<div class="form-group">
<label>Contacts au groupe</label>
<label>Contacts du groupe</label>
<input class="add-contacts form-control" name="contacts[]"/>
</div>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Group', 'list'); ?>">Annuler</a>

View file

@ -39,27 +39,27 @@
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Group', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<?php
foreach ($groupes as $groupe)
foreach ($groups as $group)
{
$contacts = array();
foreach ($groupe['contacts'] as $contact)
foreach ($group['contacts'] as $contact)
{
$contacts[] = (int)$contact['id'];
}
$contacts = json_encode($contacts);
?>
<input name="groupes[<?php $this->s($groupe['id']); ?>][groupe][id]" type="hidden" value="<?php $this->s($groupe['id']); ?>">
<input name="groupes[<?php $this->s($group['id']); ?>][groupe][id]" type="hidden" value="<?php $this->s($group['id']); ?>">
<div class="form-group">
<label>Nom groupe</label>
<div class="form-group input-group">
<span class="input-group-addon"><span class="fa fa-user"></span></span>
<input name="groupes[<?php $this->s($groupe['id']); ?>][name]" class="form-control" type="text" placeholder="Nom groupe" autofocus required value="<?php $this->s($groupe['name']); ?>">
<input name="groupes[<?php $this->s($group['id']); ?>][name]" class="form-control" type="text" placeholder="Nom groupe" autofocus required value="<?php $this->s($group['name']); ?>">
</div>
</div>
<div class="form-group">
<label>Contacts du groupe</label>
<input class="add-contacts form-control" name="groupes[<?php $this->s($groupe['id']); ?>][contacts_ids][]" value="<?php $this->s($contacts); ?>"/>
<input class="add-contacts form-control" name="groupes[<?php $this->s($group['id']); ?>][contacts_ids][]" value="<?php $this->s($contacts); ?>"/>
</div>
<hr/>
<?php

View file

@ -35,7 +35,7 @@
</div>
<div class="panel-body">
<form method="GET">
<?php if (!$groupes) { ?>
<?php if (!$groups) { ?>
<p>Aucun groupe n'a été formé pour le moment.</p>
<?php } else { ?>
<div class="table-responsive">
@ -49,12 +49,12 @@
</tr>
</thead>
<tbody>
<?php foreach ($groupes as $groupe) { ?>
<?php foreach ($groups as $group) { ?>
<tr>
<td><?php $this->s($groupe['id']); ?></td>
<td><?php $this->s($groupe['name']); ?></td>
<td><?php $this->s($groupe['nb_contacts']); ?></td>
<td><input type="checkbox" name="ids[]" value="<?php $this->s($groupe['id']); ?>"></td>
<td><?php $this->s($group['id']); ?></td>
<td><?php $this->s($group['name']); ?></td>
<td><?php $this->s($group['nb_contacts']); ?></td>
<td><input type="checkbox" name="ids[]" value="<?php $this->s($group['id']); ?>"></td>
</tr>
<?php } ?>
</tbody>
@ -65,7 +65,7 @@
<div class="col-xs-6 no-padding">
<a class="btn btn-success" href="<?php echo \descartes\Router::url('Group', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un groupe</a>
</div>
<?php if ($groupes) { ?>
<?php if ($groups) { ?>
<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('Group', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>

View file

@ -35,7 +35,7 @@
<link href="<?php echo HTTP_PWD_CSS; ?>/bootstrap-datetimepicker.min.css" rel="stylesheet">
<!-- International Phone Number, JS and CSS -->
<script src="<?php echo HTTP_PWD_JS; ?>/intlTelInput/intlTelInput.min.js"></script>
<link href="<?php echo HTTP_PWD_CSS; ?>/intlTelInput.css" rel="stylesheet">
<link href="<?php echo HTTP_PWD_CSS; ?>/intlTelInput.min.css" rel="stylesheet">
<!-- Custom JS -->
<script src="<?php echo HTTP_PWD_JS; ?>/custom.js"></script>

View file

@ -17,7 +17,7 @@
</h1>
<ol class="breadcrumb">
<li>
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'list'); ?>">Dashboard</a>
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
</li>
<li>
<i class="fa fa-calendar"></i> <a href="<?php echo \descartes\Router::url('Scheduled', 'list'); ?>">Scheduleds</a>

View file

@ -17,7 +17,7 @@
</h1>
<ol class="breadcrumb">
<li>
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'list'); ?>">Dashboard</a>
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
</li>
<li class="active">
<i class="fa fa-calendar"></i> Scheduleds

View file

@ -120,7 +120,7 @@
<label>SMS STOP activé : </label>
<select name="setting_value" class="form-control">
<option value="0">Non</option>
<option value="1" <?php echo RASPISMS_SETTINGS_SMSSTOPS ? 'selected' : ''; ?>>Oui</option>
<option value="1" <?php echo RASPISMS_SETTINGS_SMSSTOP ? 'selected' : ''; ?>>Oui</option>
</select>
</div>
<div class="text-center">