#1 Arrêt page status si état terminé + bug affichage formulaire sur la localisation des répertoires

This commit is contained in:
David 2020-11-21 23:38:01 +01:00
parent 1588810de6
commit 69db3a5e1e
3 changed files with 8 additions and 4 deletions

View file

@ -157,19 +157,19 @@ function levelChange() {
$('#f1-imapAutoDetect').prop('checked',false); $('#f1-imapAutoDetect').prop('checked',false);
$('.f1-format').show(); $('.f1-format').show();
$('.form-group.imapAutoDetect').show(); $('.form-group.imapAutoDetect').show();
$('#f1-folderBeginner').hide(); $('.f1-folderBeginner').hide();
// Intermédiaire // Intermédiaire
} else if ($('#f1-level').val() == 2) { } else if ($('#f1-level').val() == 2) {
$('#f1-imapAutoDetect').prop('checked',true); $('#f1-imapAutoDetect').prop('checked',true);
$('.form-group.imapAutoDetect').show(); $('.form-group.imapAutoDetect').show();
$('.f1-format').show(); $('.f1-format').show();
$('#f1-folderBeginner').hide(); $('.f1-folderBeginner').hide();
// Novice // Novice
} else if ($('#f1-level').val() == 1) { } else if ($('#f1-level').val() == 1) {
$('#f1-imapAutoDetect').prop('checked',true); $('#f1-imapAutoDetect').prop('checked',true);
$('.form-group.imapAutoDetect').hide(); $('.form-group.imapAutoDetect').hide();
$('.f1-format').hide(); $('.f1-format').hide();
$('#f1-folderBeginner').show(); $('.f1-folderBeginner').show();
$('#howto-video-fr').show(); $('#howto-video-fr').show();
} }
} }

View file

@ -132,7 +132,7 @@ while (true) {
$req = $db->prepare("UPDATE spooler SET status = 5, password = null WHERE id = :id"); $req = $db->prepare("UPDATE spooler SET status = 5, password = null WHERE id = :id");
$req->bindParam('id', $spoolerNextArray['id'], PDO::PARAM_INT); $req->bindParam('id', $spoolerNextArray['id'], PDO::PARAM_INT);
$req->execute(); $req->execute();
$mailSend_return = mailSend(username2email($spoolerNextArray['user'], $spoolerNextArray['domain']), _('Archive ready to download'), _('Hello').'<br /></br> $mailSend_return = mailSend(username2email($spoolerNextArray['user'], $spoolerNextArray['domain']), _('You have relieved your mailbox'), _('Hello').'<br /></br>
'._('Congratulations, you have relieved your mailbox of').' '.$spoolerNextArray['total_nb'].' '._('emails').' ('.convertOctect2humain($spoolerNextArray['total_size']).')'); '._('Congratulations, you have relieved your mailbox of').' '.$spoolerNextArray['total_nb'].' '._('emails').' ('.convertOctect2humain($spoolerNextArray['total_size']).')');
if ($mailSend_return != true) { if ($mailSend_return != true) {

View file

@ -217,6 +217,10 @@ if (isset($_GET['DeleteApproval']) && isset($_GET['session_id'])) {
} }
$spoolerArchiveFetch = $spoolerArchive->fetch(); $spoolerArchiveFetch = $spoolerArchive->fetch();
echo status2humain($spoolerArchiveFetch['status']); echo status2humain($spoolerArchiveFetch['status']);
// Stop refresh si terminé
if ($spoolerArchiveFetch['status'] == 5) {
unset($refreshAuto);
}
$spoolerWaitBefore=spoolerWaitBefore($_GET['session_id']); $spoolerWaitBefore=spoolerWaitBefore($_GET['session_id']);
if ($spoolerArchiveFetch['status'] == 2 && $spoolerWaitBefore != 0) { if ($spoolerArchiveFetch['status'] == 2 && $spoolerWaitBefore != 0) {
echo " "; echo " ";