diff -Nur e-smith-base-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/useraccounts.pm e-smith-base-5.6.0_bz9174/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/useraccounts.pm --- e-smith-base-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/useraccounts.pm 2013-01-31 16:52:03.000000000 +0100 +++ e-smith-base-5.6.0_bz9174/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/useraccounts.pm 2016-01-31 23:26:27.939642143 +0100 @@ -160,6 +160,7 @@ esmith::cgi::genSmallCell($q, $self->localise($account),"header"), esmith::cgi::genSmallCell($q, $self->localise($acctName),"header"), esmith::cgi::genSmallCell($q, $self->localise('VPN_CLIENT_ACCESS'), "header"), + esmith::cgi::genSmallCell($q, $self->localise('FORWARDING_ADDRESS'), "header"), esmith::cgi::genSmallCell($q, $self->localise('ACTION'),"header",4)); my $scriptname = basename($0); @@ -171,6 +172,8 @@ my $last = $u->prop('LastName'); my $lockable = $u->prop('Lockable') || 'yes'; my $removable = $u->prop('Removable') || 'yes'; + my $fwd = (($u->prop('EmailForward') || 'local') =~ m/^forward|both$/) ? + $u->prop('ForwardAddress') : ''; my $vpnaccess = $u->prop('VPNClientAccess') || 'no'; $vpnaccess = $vpnaccess eq 'yes' ? $self->localise('YES') : $self->localise('NO'); @@ -204,6 +207,7 @@ print $q->Tr(esmith::cgi::genSmallCell($q, $username,"normal")," ", esmith::cgi::genSmallCell($q, "$first $last","normal")," ", esmith::cgi::genSmallCell($q, $vpnaccess), + esmith::cgi::genSmallCell($q, $fwd), esmith::cgi::genSmallCell($q, "$action1","normal")," ", esmith::cgi::genSmallCell($q, "$action2","normal")," ", esmith::cgi::genSmallCell($q, "$lock_url","normal")," ",