From 8a5bcc850ce890e92dc5a4165ab2aa66844e3a6a Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 2 Mar 2016 16:36:42 +0100
Subject: [PATCH] Fix ExpireWarnUser prop name

---
 root/etc/e-smith/web/functions/expireaccounts                           | 2 +-
 .../share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/root/etc/e-smith/web/functions/expireaccounts b/root/etc/e-smith/web/functions/expireaccounts
index 68de411..5d4a90f 100755
--- a/root/etc/e-smith/web/functions/expireaccounts
+++ b/root/etc/e-smith/web/functions/expireaccounts
@@ -80,7 +80,7 @@ __DATA__
             <description>DESC_LOCK_ON_DATE</description>
             <label>LABEL_LOCK_ON_DATE</label>
         </field>
-        <field type="select" id="WarnUsers" value="get_user_bool('WarnUser')" options="'enabled' => 'ENABLED', 'disabled' => 'DISABLED'">
+        <field type="select" id="ExpireWarnUser" value="get_user_bool('ExpireWarnUser')" options="'enabled' => 'ENABLED', 'disabled' => 'DISABLED'">
             <description>DESC_WARN_USER</description>
             <label>LABEL_WARN_USER</label>
         </field>
diff --git a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm
index bfdbe2c..8b464ef 100644
--- a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm
+++ b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm
@@ -271,7 +271,7 @@ sub modify_user {
         );
     }
     my %new_props = ();
-    foreach my $prop (qw(ExpireLockOn ExpireForwardAfterLock ExpireAutoReply ExpireDeleteAfterLock WarnUser)){
+    foreach my $prop (qw(ExpireLockOn ExpireForwardAfterLock ExpireAutoReply ExpireDeleteAfterLock ExpireWarnUser)){
         if (!$self->{cgi}->param($prop) || $self->{cgi}->param($prop) eq ''){
             $acct->delete_prop($prop);
         }