koozali/ipasserelle-groupware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove EMailAlarm option, and force it to disabled, it's not working

Browse Source
This commit is contained in:
Daniel Berteaud 2013-12-20 10:36:56 +01:00
parent a541bc2d1b
commit c8237a1b31
8 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
createlinks
View File

@ -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));

1
root/etc/e-smith/db/configuration/defaults/sogod/EMailAlarms
View File

@ -1 +0,0 @@
no

2
root/etc/e-smith/events/actions/sogo-upgrade
View File

@ -6,3 +6,5 @@ if [ $? -eq 0 ]; then
fi
rm -f /var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
rm -f /etc/cron.d/sogo-alarm

8
root/etc/e-smith/locale/fr/etc/e-smith/web/functions/sogo
View File

@ -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>

7
root/etc/e-smith/templates/etc/cron.d/sogo-alarm/10All
View File

@ -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";
}

2
root/etc/e-smith/templates/etc/sogo/sogo.conf/25notifications
View File

@ -1,4 +1,4 @@
SOGoEnableEMailAlarms = {uc($sogod{'EMailAlarms'} || "no")};
SOGoEnableEMailAlarms = NO;
SOGoACLsSendEMailNotifications = {uc($sogod{'ACLsSendEMailNotifications'} || "no")};
SOGoAppointmentSendEMailNotifications = YES;
SOGoAppointmentSendEMailReceipts = YES;

6
root/etc/e-smith/web/functions/sogo
View File

@ -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')">

1
root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/sogo.pm
View File

@ -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")));