From c8237a1b31d415bc3af25aced9258b4485ec8894 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 20 Dec 2013 10:36:56 +0100
Subject: [PATCH] Remove EMailAlarm option, and force it to disabled, it's not
 working

---
 createlinks                                               | 1 -
 .../e-smith/db/configuration/defaults/sogod/EMailAlarms   | 1 -
 root/etc/e-smith/events/actions/sogo-upgrade              | 2 ++
 root/etc/e-smith/locale/fr/etc/e-smith/web/functions/sogo | 8 --------
 root/etc/e-smith/templates/etc/cron.d/sogo-alarm/10All    | 7 -------
 .../e-smith/templates/etc/sogo/sogo.conf/25notifications  | 2 +-
 root/etc/e-smith/web/functions/sogo                       | 6 ------
 .../lib/perl5/site_perl/esmith/FormMagick/Panel/sogo.pm   | 1 -
 8 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 root/etc/e-smith/db/configuration/defaults/sogod/EMailAlarms
 delete mode 100644 root/etc/e-smith/templates/etc/cron.d/sogo-alarm/10All

diff --git a/createlinks b/createlinks
index 494e7c8..1564aa9 100755
--- a/createlinks
+++ b/createlinks
@@ -6,7 +6,6 @@ service_link_enhanced("memcached-sogo", "S55", "7");
 service_link_enhanced("sogod", "S85", "7");
 
 templates2events("/etc/e-smith/sql/init/sogo", qw(email-update bootstrap-console-save));
-templates2events("/etc/cron.d/sogo-alarm", qw(email-update bootstrap-console-save));
 templates2events("/etc/sogo/sogo.conf", qw(email-update bootstrap-console-save pre-backup));
 templates2events("/etc/sysconfig/sogo", qw(email-update bootstrap-console-save));
 templates2events("/etc/logrotate.d/sogo", qw(email-update bootstrap-console-save));
diff --git a/root/etc/e-smith/db/configuration/defaults/sogod/EMailAlarms b/root/etc/e-smith/db/configuration/defaults/sogod/EMailAlarms
deleted file mode 100644
index 7ecb56e..0000000
--- a/root/etc/e-smith/db/configuration/defaults/sogod/EMailAlarms
+++ /dev/null
@@ -1 +0,0 @@
-no
diff --git a/root/etc/e-smith/events/actions/sogo-upgrade b/root/etc/e-smith/events/actions/sogo-upgrade
index 8e53e65..d9fb31a 100644
--- a/root/etc/e-smith/events/actions/sogo-upgrade
+++ b/root/etc/e-smith/events/actions/sogo-upgrade
@@ -6,3 +6,5 @@ if [ $? -eq 0 ]; then
 fi
 
 rm -f /var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
+
+rm -f /etc/cron.d/sogo-alarm
diff --git a/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/sogo b/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/sogo
index 8391aa4..ff1bd89 100644
--- a/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/sogo
+++ b/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/sogo
@@ -23,14 +23,6 @@
         <base>SEND_ACL_MAIL</base>
         <trans>Notification des changements de droit d'accès</trans>
     </entry>
-    <entry>
-        <base>MAIL_ALARM_DESC</base>
-        <trans>Par défaut, SOGo affiche un pop-up pour vous rappeler vos rendez-vous. Si vous activez cette fonction, les utilisateurs pourront également recevoir un mail de rappel</trans>
-    </entry>
-    <entry>
-        <base>MAIL_ALARM</base>
-        <trans>Rappel par mail</trans>
-    </entry>
     <entry>
         <base>AUX_ACCOUNTS_DESC</base>
         <trans>Si cette fonction est activée, les utilisateurs pourront s'abonner à des comptes IMAP externes. Ils pourront ainsi gérer tous leurs comptes emails depuis l'interface web. Souhaitez-vous activer cette fonction ?</trans>
diff --git a/root/etc/e-smith/templates/etc/cron.d/sogo-alarm/10All b/root/etc/e-smith/templates/etc/cron.d/sogo-alarm/10All
deleted file mode 100644
index 9f6b57c..0000000
--- a/root/etc/e-smith/templates/etc/cron.d/sogo-alarm/10All
+++ /dev/null
@@ -1,7 +0,0 @@
-# SOGo Email Alarms
-{
-if (($sogod{'EMailAlarms'} || 'no') =~ m/^no$/i){
-    $OUT .= "# Email alarms are disabled\n# ";
-}
-$OUT .= "* * * * * sogo /usr/sbin/sogo-ealarms-notify\n";
-}
diff --git a/root/etc/e-smith/templates/etc/sogo/sogo.conf/25notifications b/root/etc/e-smith/templates/etc/sogo/sogo.conf/25notifications
index 6f4c0c0..40eb4ac 100644
--- a/root/etc/e-smith/templates/etc/sogo/sogo.conf/25notifications
+++ b/root/etc/e-smith/templates/etc/sogo/sogo.conf/25notifications
@@ -1,4 +1,4 @@
-        SOGoEnableEMailAlarms = {uc($sogod{'EMailAlarms'} || "no")};
+        SOGoEnableEMailAlarms = NO;
         SOGoACLsSendEMailNotifications = {uc($sogod{'ACLsSendEMailNotifications'} || "no")};
         SOGoAppointmentSendEMailNotifications = YES;
         SOGoAppointmentSendEMailReceipts = YES;
diff --git a/root/etc/e-smith/web/functions/sogo b/root/etc/e-smith/web/functions/sogo
index 897a274..27aea16 100644
--- a/root/etc/e-smith/web/functions/sogo
+++ b/root/etc/e-smith/web/functions/sogo
@@ -47,12 +47,6 @@ __DATA__
             <description>SEND_ACL_MAIL_DESC</description>
             <label>SEND_ACL_MAIL</label>
         </field>
-        <field type="select" id="mailAlarm" options="'yes' =>
-            'YES', 'no' => 'NO'"
-            value="get_prop('EMailAlarms')">
-            <description>MAIL_ALARM_DESC</description>
-            <label>MAIL_ALARM</label>
-        </field>
         <field type="select" id="auxAccounts" options="'yes' =>
             'YES', 'no' => 'NO'"
             value="get_prop('AuxiliaryUserAccounts')">
diff --git a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/sogo.pm b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/sogo.pm
index a8fe0d5..f3fddff 100644
--- a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/sogo.pm
+++ b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/sogo.pm
@@ -107,7 +107,6 @@ sub apply {
 
     $configdb->set_prop('sogod', 'status', $q->param("status"));
     $configdb->set_prop('sogod', 'ACLsSendEMailNotifications', $q->param("aclSendMail"));
-    $configdb->set_prop('sogod', 'EMailAlarms', $q->param("mailAlarm"));
     $configdb->set_prop('sogod', 'AuxiliaryUserAccounts', $q->param("auxAccounts"));
     $configdb->set_prop('sogod', 'PublicAccess', $q->param("publicAccess"));
     $configdb->set_prop('sogod', 'AllowedGroups', join(',', $q->param("allowedGroups")));