fix: changing orgs for pro moderators (#8149)

openfoodfacts · Mar 1, 2023 · d7b8592 · d7b8592
1 parent 112b378
commit d7b8592
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/cgi/user.pl b/cgi/user.pl
@@ -116,7 +116,7 @@
 	}
 
 	# change organization
-	if ($type eq 'edit_owner' && $admin) {
+	if ($type eq 'edit_owner') {
 		# only admin and pro moderators can change organization freely
 		if ($admin or $User{pro_moderator}) {
 			ProductOpener::Users::check_edit_owner($user_ref, \@errors);

diff --git a/lib/ProductOpener/Users.pm b/lib/ProductOpener/Users.pm
@@ -319,7 +319,7 @@ sub check_user_form ($type, $user_ref, $errors_ref) {
 
 	$log->debug("check_user_form", {type => $type, user_ref => $user_ref, email => $email}) if $log->is_debug();
 
-	if ($user_ref->{email} ne $email) {
+	if ((defined $email) and ($email ne '') and ($user_ref->{email} ne $email)) {
 
 		# check that the email is not already used
 		my $emails_ref = retrieve("$data_root/users/users_emails.sto");

diff --git a/scripts/snippets/remove_broken_entry_with_empty_email.pl b/scripts/snippets/remove_broken_entry_with_empty_email.pl
@@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use ProductOpener::PerlStandards;
+
+use ProductOpener::Config qw/:all/;
+use ProductOpener::Store qw/:all/;
+
+my $emails_ref = retrieve("$data_root/users/users_emails.sto");
+
+if (defined $emails_ref->{''}) {
+	delete $emails_ref->{''};
+	store("$data_root/users/users_emails.sto", $emails_ref);
+}