From c2547531f2bea948464fb199735e3f46bbd2c136 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sun, 11 Mar 2012 01:27:14 +0100 Subject: [PATCH] small panels cleanup --- .../site_perl/esmith/FormMagick/Panel/userinfo.pm | 21 +++++++-------------- .../esmith/FormMagick/Panel/userpanelViewgroups.pm | 6 +++--- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm index c2dc7f0..ee2251d 100644 --- a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm +++ b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userinfo.pm @@ -62,8 +62,7 @@ sub print_user_table { my @users = $accountdb->get('admin'); push @users, $accountdb->users(); - unless ( scalar @users ) - { + unless ( scalar @users ) { print $q->Tr($q->td($self->localise('NO_USER_ACCOUNTS'))); return ""; } @@ -125,8 +124,7 @@ sub modify_user { my $acct = $accountdb->get($acctName); my $acctType = $acct->prop('type'); - if ($acctType eq "user" || $acctName eq 'admin') - { + if ($acctType eq "user" || $acctName eq 'admin') { $accountdb->remove_user_auto_pseudonyms($acctName); my %newProperties = ( 'FirstName' => $self->{cgi}->param('FirstName'), @@ -193,26 +191,21 @@ sub pseudonym_clash { my $da = $dp->prop('Account') if $dp; my $ua = $up->prop('Account') if $up; - if ($dp and $da and $da ne $acctName) - { - return $self->localise('PSEUDONYM_CLASH', - { + if ($dp and $da and $da ne $acctName) { + return $self->localise('PSEUDONYM_CLASH', { acctName => $acctName, clashName => $da, pseudonym => $dp->key }); } - elsif ($up and $ua and $ua ne $acctName) - { - return $self->localise('PSEUDONYM_CLASH', - { + elsif ($up and $ua and $ua ne $acctName) { + return $self->localise('PSEUDONYM_CLASH', { acctName => $acctName, clashName => $ua, pseudonym => $up->key }); } - else - { + else { return "OK"; } } diff --git a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelViewgroups.pm b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelViewgroups.pm index 07e8aab..018c101 100644 --- a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelViewgroups.pm +++ b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelViewgroups.pm @@ -14,7 +14,6 @@ use Carp; our @ISA = qw(esmith::FormMagick Exporter); our @EXPORT = qw( - show_initial genUsers get_accounts_prop @@ -72,7 +71,7 @@ sub get_description { =head2 get_group_mail -Get the mail address for the group named in the CGI argument "GroupName" +Get the mail address for the group named in the CGI argument "groupName" =cut @@ -164,7 +163,7 @@ in $fm->{cgi}->parm('groupName')checked. =cut sub genUsers () { - my $fm = shift; + my $fm = shift; my $members = ""; my $group = $fm->{'cgi'}->param('groupName'); @@ -189,3 +188,4 @@ sub genUsers () { return $out; } +1;