From 54fe92615b5a76356c9e73fc1001d738c1df7360 Mon Sep 17 00:00:00 2001
From: jkaberg <joel@jkaberg.com>
Date: Mon, 11 Aug 2014 23:43:16 +0200
Subject: [PATCH] include php-libawl and cleanup

---
 conf/zpush/backend_caldav.php   | 1 -
 conf/zpush/backend_carddav.php  | 4 +++-
 conf/zpush/backend_combined.php | 1 +
 setup/zpush.sh                  | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/zpush/backend_caldav.php b/conf/zpush/backend_caldav.php
index 4170fed..7ad7642 100644
--- a/conf/zpush/backend_caldav.php
+++ b/conf/zpush/backend_caldav.php
@@ -62,5 +62,4 @@ define('CALDAV_PERSONAL', '');
 // Setting this to false will work with most servers, but it will be slower
 define('CALDAV_SUPPORTS_SYNC', false);
 
-
 ?>
\ No newline at end of file
diff --git a/conf/zpush/backend_carddav.php b/conf/zpush/backend_carddav.php
index 0e91f2a..eca3c53 100644
--- a/conf/zpush/backend_carddav.php
+++ b/conf/zpush/backend_carddav.php
@@ -105,4 +105,6 @@ define('CARDDAV_SUPPORTS_FN_SEARCH', false);
 // If your carddav server needs to use file extension to recover a vcard.
 //    Davical needs it
 //    SOGo official demo online needs it, but some SOGo installation don't need it, so test it
-define('CARDDAV_URL_VCARD_EXTENSION', '.vcf');
\ No newline at end of file
+define('CARDDAV_URL_VCARD_EXTENSION', '.vcf');
+
+?>
\ No newline at end of file
diff --git a/conf/zpush/backend_combined.php b/conf/zpush/backend_combined.php
index 47550c3..f02bac6 100644
--- a/conf/zpush/backend_combined.php
+++ b/conf/zpush/backend_combined.php
@@ -100,4 +100,5 @@ class BackendCombinedConfig {
 		);
     }
 }
+
 ?>
\ No newline at end of file
diff --git a/setup/zpush.sh b/setup/zpush.sh
index 3ec36b1..c9e0efb 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -14,7 +14,7 @@ source /etc/mailinabox.conf # load global vars
 # Prereqs.
 
 apt_install \
-	php-soap php5-imap
+	php-soap php5-imap libawl-php
 
 php5enmod imap