e-smith-base/sme9/e-smith-base-5.6.0-add_forward_column.patch

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"),"        ",
1	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
2	--- 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
3	+++ 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
4	@@ -160,6 +160,7 @@
5	esmith::cgi::genSmallCell($q, $self->localise($account),"header"),
6	esmith::cgi::genSmallCell($q, $self->localise($acctName),"header"),
7	esmith::cgi::genSmallCell($q, $self->localise('VPN_CLIENT_ACCESS'), "header"),
8	+ esmith::cgi::genSmallCell($q, $self->localise('FORWARDING_ADDRESS'), "header"),
9	esmith::cgi::genSmallCell($q, $self->localise('ACTION'),"header",4));
10
11	my $scriptname = basename($0);
12	@@ -171,6 +172,8 @@
13	my $last = $u->prop('LastName');
14	my $lockable = $u->prop('Lockable') \|\| 'yes';
15	my $removable = $u->prop('Removable') \|\| 'yes';
16	+ my $fwd = (($u->prop('EmailForward') \|\| 'local') =~ m/^forward\|both$/) ?
17	+ $u->prop('ForwardAddress') : '';
18	my $vpnaccess = $u->prop('VPNClientAccess') \|\| 'no';
19	$vpnaccess = $vpnaccess eq 'yes' ? $self->localise('YES') :
20	$self->localise('NO');
21	@@ -204,6 +207,7 @@
22	print $q->Tr(esmith::cgi::genSmallCell($q, $username,"normal")," ",
23	esmith::cgi::genSmallCell($q, "$first $last","normal")," ",
24	esmith::cgi::genSmallCell($q, $vpnaccess),
25	+ esmith::cgi::genSmallCell($q, $fwd),
26	esmith::cgi::genSmallCell($q, "$action1","normal")," ",
27	esmith::cgi::genSmallCell($q, "$action2","normal")," ",
28	esmith::cgi::genSmallCell($q, "$lock_url","normal")," ",