diff --git a/assets/js/scripts.js b/assets/js/scripts.js index b160d77..548435f 100644 --- a/assets/js/scripts.js +++ b/assets/js/scripts.js @@ -157,19 +157,19 @@ function levelChange() { $('#f1-imapAutoDetect').prop('checked',false); $('.f1-format').show(); $('.form-group.imapAutoDetect').show(); - $('#f1-folderBeginner').hide(); + $('.f1-folderBeginner').hide(); // Intermédiaire } else if ($('#f1-level').val() == 2) { $('#f1-imapAutoDetect').prop('checked',true); $('.form-group.imapAutoDetect').show(); $('.f1-format').show(); - $('#f1-folderBeginner').hide(); + $('.f1-folderBeginner').hide(); // Novice } else if ($('#f1-level').val() == 1) { $('#f1-imapAutoDetect').prop('checked',true); $('.form-group.imapAutoDetect').hide(); $('.f1-format').hide(); - $('#f1-folderBeginner').show(); + $('.f1-folderBeginner').show(); $('#howto-video-fr').show(); } } diff --git a/daemon.php b/daemon.php index 1639aae..f822450 100644 --- a/daemon.php +++ b/daemon.php @@ -132,7 +132,7 @@ while (true) { $req = $db->prepare("UPDATE spooler SET status = 5, password = null WHERE id = :id"); $req->bindParam('id', $spoolerNextArray['id'], PDO::PARAM_INT); $req->execute(); - $mailSend_return = mailSend(username2email($spoolerNextArray['user'], $spoolerNextArray['domain']), _('Archive ready to download'), _('Hello').'

+ $mailSend_return = mailSend(username2email($spoolerNextArray['user'], $spoolerNextArray['domain']), _('You have relieved your mailbox'), _('Hello').'

'._('Congratulations, you have relieved your mailbox of').' '.$spoolerNextArray['total_nb'].' '._('emails').' ('.convertOctect2humain($spoolerNextArray['total_size']).')'); if ($mailSend_return != true) { diff --git a/index.php b/index.php index 4d21009..8200a22 100644 --- a/index.php +++ b/index.php @@ -217,6 +217,10 @@ if (isset($_GET['DeleteApproval']) && isset($_GET['session_id'])) { } $spoolerArchiveFetch = $spoolerArchive->fetch(); echo status2humain($spoolerArchiveFetch['status']); + // Stop refresh si terminé + if ($spoolerArchiveFetch['status'] == 5) { + unset($refreshAuto); + } $spoolerWaitBefore=spoolerWaitBefore($_GET['session_id']); if ($spoolerArchiveFetch['status'] == 2 && $spoolerWaitBefore != 0) { echo " ";