From 08dfc9125edf35ccbe3a6e21d9a9918c4b7fd6e9 Mon Sep 17 00:00:00 2001 From: polo Date: Fri, 8 May 2026 18:14:38 +0200 Subject: page maintenance: voir/supprimer les logs et lien vers voir les e-mails, suppression des modes de fonctionnement --- src/service/AppMode.php | 56 -------------------------------------------- src/service/Config.php | 10 ++++---- src/service/EmailService.php | 8 ++++--- src/service/router.php | 12 +++++++++- 4 files changed, 22 insertions(+), 64 deletions(-) delete mode 100644 src/service/AppMode.php (limited to 'src/service') diff --git a/src/service/AppMode.php b/src/service/AppMode.php deleted file mode 100644 index 60b58bd..0000000 --- a/src/service/AppMode.php +++ /dev/null @@ -1,56 +0,0 @@ -getRepository(AppMetadata::class)->find('mode'); - if(!$metadata){ - self::$mode = 'maintenance'; - } - else{ - self::$mode = $metadata->getValue(); - } - } - - public static function is(string $mode): bool - { - return self::$mode === $mode; - } - - public static function get(): string - { - return self::$mode; - } - - public static function set(EntityManager $entityManager, string $mode): void - { - self::$mode = $mode; - - $metadata = $entityManager->find(AppMetadata::class, 'mode'); - if($metadata){ - $metadata->setValue($mode); - } - else{ - $metadata = new AppMetadata('mode', $mode); - $entityManager->persist($metadata); - } - $entityManager->flush(); - - /*self::$data = [ - 'mode' => $mode, - 'since' => (new DateTimeImmutable())->format('c'), - 'by' => $by, - ];*/ - } -} \ No newline at end of file diff --git a/src/service/Config.php b/src/service/Config.php index e59f728..7077e01 100644 --- a/src/service/Config.php +++ b/src/service/Config.php @@ -18,15 +18,17 @@ class Config static public string $index_path = ''; static public string $port = '80'; - // e-mails + // envoi e-mails static public string $smtp_host = ''; static public string $smtp_username = ''; static public string $smtp_password = ''; static public string $smtp_secure = ''; // tls (smarttls) ou ssl (smtps) ou plain_text/chaine vide - static public string $email_from = 'mon_adresse@email.fr'; + + // destination e-mails + static public string $email_from = ''; // correspondant affiché dans la boite de réception static public string $email_from_name = 'site web'; - static public string $email_dest = ''; - static public string $email_dest_name = 'destinataire formulaire'; + static public string $email_dest = ''; // destinataire affiché dans la boite de réception + static public string $email_dest_name = 'moi'; // copier dans ce tableau les variables contenant des chemins static private array $path_vars = []; diff --git a/src/service/EmailService.php b/src/service/EmailService.php index 6f4e93d..0ea8f39 100644 --- a/src/service/EmailService.php +++ b/src/service/EmailService.php @@ -22,8 +22,10 @@ class EmailService $smtp_secure = $form_data->getData()['smtp_secure'] ?? Config::$smtp_secure; $smtp_username = $form_data->getData()['smtp_username'] ?? Config::$smtp_username; $smtp_password = $form_data->getData()['smtp_password'] ?? Config::$smtp_password; - $email_from = $form_data->getData()['email_from'] ?? Config::$email_from; // une adresse bidon est donnée à setFrom() - $email_from_name = $form_data->getData()['email_from_name'] ?? Config::$email_from_name; // = site web + + $email_from = $form_data->getData()['email_from'] ?? Config::$email_from; // adresse de l'expéditeur affichée + $email_from = empty($email_from) ? $smtp_username : $email_from; // si vide + $email_from_name = $form_data->getData()['email_from_name'] ?? Config::$email_from_name; // = nom de l'expéditeur affiché $email_dest = $form_data->getData()['email_dest'] ?? Config::$email_dest; $email_dest_name = $form_data->getData()['email_dest_name'] ?? Config::$email_dest_name; // = destinataire formulaire @@ -67,7 +69,7 @@ class EmailService // copie en BDD if(!$test_email && ($form_data->getData()['keep_emails'] ?? self::KEEP_EMAILS_DEFAULT)){ - $db_email = new Email($name, $email, Config::$email_dest, $message, $form_data); + $db_email = new Email($name, $email, $email_dest, $message, $form_data); $entityManager->persist($db_email); self::updateLastContactDate($entityManager, $email); $entityManager->flush(); diff --git a/src/service/router.php b/src/service/router.php index fc6b028..508721c 100644 --- a/src/service/router.php +++ b/src/service/router.php @@ -39,7 +39,7 @@ if($request->getMethod() === 'GET'){ } // pages interdites - if(!IS_ADMIN && in_array(CURRENT_PAGE, ['menu_paths', 'new_page', 'user_edit', 'emails'])){ + if(!IS_ADMIN && in_array(CURRENT_PAGE, ['menu_paths', 'new_page', 'user_edit', 'emails', 'maintenance'])){ header('Location: ' . new URL); die; } @@ -154,6 +154,16 @@ elseif($request->getMethod() === 'POST'){ elseif($request->query->get('action') === 'remove_event'){ CalendarController::removeEvent($json, $entityManager); } + + /* -- mode maintenance -- */ + elseif($request->query->get('action') === 'get_logs'){ + MaintenanceController::getLogs($entityManager); + die; + } + elseif($request->query->get('action') === 'erase_logs'){ + MaintenanceController::eraseLogs($entityManager); + die; + } else{ echo json_encode(['success' => false]); die; -- cgit v1.2.3