From af4e70d17d058b38bb03a60f74f2f4f16ea0b463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Mon, 25 Jul 2022 09:38:41 +0200
Subject: [PATCH 1/3] fix: finish cookie / init_request refactor

---
 cgi/login.pl   | 2 +-
 cgi/session.pl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cgi/login.pl b/cgi/login.pl
index b011f59d9e944..fbcbce51aa669 100644
--- a/cgi/login.pl
+++ b/cgi/login.pl
@@ -49,7 +49,7 @@
 if (defined $User_id) {
 	my $loc = $redirect || $formatted_subdomain;
 	$r->headers_out->set(Location => $loc);
-	$r->err_headers_out->add('Set-Cookie' => $cookie);
+	$r->err_headers_out->add('Set-Cookie' => $request_ref->{cookie});
 	$r->status(302);
 	return Apache2::Const::OK;
 }
diff --git a/cgi/session.pl b/cgi/session.pl
index d72b2d9f05283..be0a0e2950588 100755
--- a/cgi/session.pl
+++ b/cgi/session.pl
@@ -78,8 +78,8 @@
 
 		$r->err_headers_out->add('Set-Cookie' => $request_ref->{cookie});
 		$r->headers_out->set(Location => "$url");
-		$r->status(301);
-		return 301;
+		$r->status(302);
+		return 302;
 	}
 }
 

From b41dbb131948cf17efb35052ccc3412ef29828bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Mon, 25 Jul 2022 10:44:55 +0200
Subject: [PATCH 2/3] fix: finish cookie / init_request refactor

---
 cgi/product_image.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cgi/product_image.pl b/cgi/product_image.pl
index a1da3cb8cedfb..75f81838b03ae 100644
--- a/cgi/product_image.pl
+++ b/cgi/product_image.pl
@@ -174,7 +174,7 @@
 process_template('product_image.tt.html', $template_data_ref, \$html) or $html = '';
 $html .= "<p>" . $tt->error() . "</p>";
 
-$request_ref->{title} = $title;
+$request_ref->{title} = $alt;
 $request_ref->{content_ref} = \$html;
 $request_ref->{full_width} = 0;
 display_page($request_ref);

From f04c4532ef92fadf40bfa9150f32bcbdae79a236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Mon, 25 Jul 2022 10:59:45 +0200
Subject: [PATCH 3/3] fix: finish cookie / init_request refactor

---
 cgi/reset_password.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cgi/reset_password.pl b/cgi/reset_password.pl
index 64d9f0fbe2c4f..51323a03f7393 100755
--- a/cgi/reset_password.pl
+++ b/cgi/reset_password.pl
@@ -199,7 +199,7 @@
 
 process_template('web/pages/reset_password/reset_password.tt.html', $template_data_ref, \$html) or $html = "<p>" . $tt->error() . "</p>";
 
-$request_ref->{title} = $title;
+$request_ref->{title} = $Lang{'reset_password'}{$lang};
 $request_ref->{content_ref} = \$html;
 display_page($request_ref);