From 7d04a7220a831543a5a5c4a86f4f4692fcd03856 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 6 Dec 2017 17:36:02 +0100 Subject: [PATCH] Add support for buisnessCategory LDAP field --- root/etc/e-smith/events/actions/ldap-update-info | 5 ++++- root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo | 4 ++++ root/etc/e-smith/web/functions/userinfo | 4 ++++ root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/userinfo.pm | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/root/etc/e-smith/events/actions/ldap-update-info b/root/etc/e-smith/events/actions/ldap-update-info index 1cfd44c..c3ddc0a 100644 --- a/root/etc/e-smith/events/actions/ldap-update-info +++ b/root/etc/e-smith/events/actions/ldap-update-info @@ -69,14 +69,16 @@ foreach my $acc (@accounts){ my $initials = $acc->prop('Initials') || ''; my $dshell = $acc->prop('DesktopShell') || ''; my $preferredemail = $acc->prop('PreferredEmail') || ''; + my $category = $acc->prop('Category') || ''; $preferredemail = "$user\@$domain" if ($preferredemail eq ''); my $web = $acc->prop('Url') || ''; - my (@postalcode,@mobile,@extension,@fax,@titles,@initials,@dshell,@preferredemail,@web) = (); + my (@postalcode,@mobile,@extension,@fax,@titles,@initials,@dshell,@preferredemail,@category,@web) = (); @postalcode = ($postalcode) unless ($postalcode eq ''); @mobile = ($mobile) unless ($mobile eq ''); @extension = ($extension) unless ($extension eq ''); @fax = ($fax) unless ($fax eq ''); + @category = ($category) unless ($category eq ''); foreach ($function1, $function2, $function3, $function4){ push @titles, $_ if ($_ ne ''); } @@ -94,6 +96,7 @@ foreach my $acc (@accounts){ initials => \@initials, desktopLoginShell => \@dshell, preferredMail => \@preferredemail, + businessCategory => \@category, labeledURI => \@web } ); diff --git a/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo b/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo index 9ac1f5a..2472b26 100644 --- a/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo +++ b/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo @@ -64,6 +64,10 @@ Société + CATEGORY + Catégorie + + STREET_ADDRESS Adresse diff --git a/root/etc/e-smith/web/functions/userinfo b/root/etc/e-smith/web/functions/userinfo index 7510750..036dab0 100644 --- a/root/etc/e-smith/web/functions/userinfo +++ b/root/etc/e-smith/web/functions/userinfo @@ -78,6 +78,10 @@ __DATA__ value="get_ldap_value('Company')"> + + + diff --git a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/userinfo.pm b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/userinfo.pm index 15d093a..5b557df 100644 --- a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/userinfo.pm +++ b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/userinfo.pm @@ -213,6 +213,7 @@ sub modify_user { 'AltEmail3' => $self->{cgi}->param('AltEmail3'), 'AltEmail4' => $self->{cgi}->param('AltEmail4'), 'PreferredEmail' => $self->{cgi}->param('PreferredEmail'), + 'Category' => $self->{cgi}->param('PreferredCategory'), 'Url' => $self->{cgi}->param('Url'), 'Shell' => $self->{cgi}->param('Shell'), 'DesktopShell' => $self->{cgi}->param('DesktopShell'),