From 3d85c4fa950a070f765e8ba7cd9f9cc72ba680c9 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 3 Oct 2013 10:48:41 +0200 Subject: [PATCH] Correctly remove parameters array in role files (so we can add/remove email and display name) --- root/etc/e-smith/events/actions/ajaxplorer-user-rights | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/root/etc/e-smith/events/actions/ajaxplorer-user-rights b/root/etc/e-smith/events/actions/ajaxplorer-user-rights index 124825d..a65e575 100644 --- a/root/etc/e-smith/events/actions/ajaxplorer-user-rights +++ b/root/etc/e-smith/events/actions/ajaxplorer-user-rights @@ -89,11 +89,9 @@ foreach my $user (($a->users),$a->get('admin')){ } } # As we're here, lets update the email address and the display name - # First, delete parameter if it's an array (meaning it's empty - delete $data->{"\0*\0parameters"} unless( - defined $data->{"\0*\0parameters"}->{'AJXP_REPO_SCOPE_ALL'}->{'core.conf'}->{'email'} || - defined $data->{"\0*\0parameters"}->{'AJXP_REPO_SCOPE_ALL'}->{'core.conf'}->{'USER_DISPLAY_NAME'} - ); + # First, delete parameter if it's an array (meaning it's empty) + delete $data->{"\0*\0parameters"} if (ref ($data->{"\0*\0parameters"})=~ m/ARRAY/i); + $data->{"\0*\0parameters"}->{'AJXP_REPO_SCOPE_ALL'}->{'core.conf'}->{'email'} = "$name\@$domain"; $data->{"\0*\0parameters"}->{'AJXP_REPO_SCOPE_ALL'}->{'core.conf'}->{'USER_DISPLAY_NAME'} = "$first $last";