From 1004b6872922ad369d4c7686bd2adda1cc19d94a Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sun, 10 Jun 2012 13:43:31 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9finition=20des=20constantes=20READONLY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/usr/share/sogosync/config.php/45Backend60Caldav | 7 ++----- .../templates/usr/share/sogosync/config.php/45Backend70Carddav | 8 ++------ smeserver-sogosync.spec | 5 ++++- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend60Caldav b/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend60Caldav index 2bcd445..3c957d7 100644 --- a/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend60Caldav +++ b/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend60Caldav @@ -3,10 +3,7 @@ define('CALDAV_PERSONAL', 'personal'); define('CALDAV_URL', 'http://localhost:{$sogod{'TCPPort'}}/SOGo/dav/%u'); { - my $ro = $sogosync{'ReadOnly'} || 'disabled'; - -$OUT .= " define('CALDAV_READONLY', true);\n" - if ($ro =~ m/^yes|enabled|1$/); - +$ro = ($ro =~ m/^yes|enabled|1$/) ? 'true':'false'; +$OUT .= " define('CALDAV_READONLY', $ro);\n"; } diff --git a/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend70Carddav b/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend70Carddav index 075afb9..74e1210 100644 --- a/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend70Carddav +++ b/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend70Carddav @@ -1,11 +1,7 @@ define('CARDDAV_PERSONAL', 'personal'); define('CARDDAV_URL', 'http://localhost:{$sogod{'TCPPort'}}/SOGo/dav/%u/Contacts/'); { - my $ro = $sogosync{'ReadOnly'} || 'disabled'; - -$OUT .= " define('CARDDAV_READONLY', true);\n" - if ($ro =~ m/^yes|enabled|1$/); - +$ro = ($ro =~ m/^yes|enabled|1$/) ? 'true':'false'; +$OUT .= " define('CARDDAV_READONLY', $ro);\n"; } - diff --git a/smeserver-sogosync.spec b/smeserver-sogosync.spec index 58f4a7e..3512e63 100644 --- a/smeserver-sogosync.spec +++ b/smeserver-sogosync.spec @@ -1,5 +1,5 @@ Name: smeserver-sogosync -Version: 0.1.6 +Version: 0.1.7 Release: 0.beta5%{?dist} Summary: SME Server integration for sogosync @@ -41,6 +41,9 @@ echo "%doc CHANGELOG.git" >> %{name}-%{version}-filelist rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 10 2012 Daniel Berteaud 0.1.7-1 +- Define *_READONLY constant event when set to false + * Sun Jun 10 2012 Daniel Berteaud 0.1.6-1 - Correction des templates