From b9b43d1455cb0ff60103d23719c68909b90319af Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 21 Feb 2024 10:00:58 +0700 Subject: [PATCH] Update to v10 --- conf/config.php | 2 ++ conf/version.json | 6 +++--- manifest.toml | 6 +++--- sources/patches/main-01-mail.patch | 16 ++++++++++------ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/conf/config.php b/conf/config.php index 04f2655..f4ced39 100644 --- a/conf/config.php +++ b/conf/config.php @@ -25,3 +25,5 @@ define("CONNEXION_COMPTE", true); define("CSV_SEP", ";"); +define("PHP_SECURE_COOKIES", true); + diff --git a/conf/version.json b/conf/version.json index c38e093..38a35cc 100644 --- a/conf/version.json +++ b/conf/version.json @@ -1,6 +1,6 @@ { "app": "moncycle.app", - "version": "9.0~ynh7", - "build": "2024-02-19", - "commit": "2eaf8d5" + "version": "10.0~ynh1", + "build": "2024-02-20", + "commit": "31f2dd5" } diff --git a/manifest.toml b/manifest.toml index ed6360f..4bfda05 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Moncycle" description.en = "Menstrual cycle follow-up for natural family planning" description.fr = "Suivi de cycle pour les méthodes naturelles de régulation de naissance" -version = "9.0~ynh7" +version = "10.0~ynh1" maintainers = ["Raoul de Limezy"] @@ -34,8 +34,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/jean-io/moncycle.app/archive/2eaf8d5765423276f2f16816fb62218f6b311555.zip" - sha256 = "a193698c38d3d22eacbd41f9c8a1c9253748469571711c7781868521bf678da7" + url = "https://github.com/jean-io/moncycle.app/archive/31f2dd5272d617de30ee58e79052b3af7ae5b5d4.zip" + sha256 = "7f8fd2f7b28c16a308a67f476b34f2797b10a8f6285c36aa71b6876b845baf80" [resources.system_user] diff --git a/sources/patches/main-01-mail.patch b/sources/patches/main-01-mail.patch index 4936806..0e2a784 100644 --- a/sources/patches/main-01-mail.patch +++ b/sources/patches/main-01-mail.patch @@ -1,19 +1,23 @@ diff --git a/www_data/lib/mail.php b/www_data/lib/mail.php -index 9b58b50..1a538e6 100644 +index 9b58b50..0112cc5 100644 --- a/www_data/lib/mail.php +++ b/www_data/lib/mail.php -@@ -15,12 +15,12 @@ function mail_init(){ +@@ -12,16 +12,14 @@ use PHPMailer\PHPMailer\PHPMailer; + function mail_init(){ + $mail = new PHPMailer(); +- $mail->isSMTP(); $mail->Host = SMTP_HOST; - $mail->SMTPAuth = true; ++ $mail->SMTPAuth = false; $mail->Username = SMTP_MAIL; $mail->Password = SMTP_PASSWORD; - $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; ++ $mail->SMTPSecure = false; $mail->Port = SMTP_PORT; $mail->CharSet = 'UTF-8'; -+ $mail->SMTPAuth = false; -+ $mail->SMTPSecure = false; - +- $mail->setFrom(SMTP_MAIL, 'moncycle.app'); - return $mail; \ No newline at end of file + return $mail; + } \ No newline at end of file