From 16182e748770f74f001b7c04fad97396f96a63b0 Mon Sep 17 00:00:00 2001
From: Christoph Haas <christoph.h@sprinternet.at>
Date: Tue, 1 Nov 2016 01:14:46 +0100
Subject: [PATCH] Small update for Kopano Webapp 3.1

---
 Makefile                       | 2 ++
 README.md                      | 4 +++-
 changelog.txt                  | 7 ++++++-
 config.php                     | 2 +-
 manifest.xml                   | 2 +-
 php/module.contact.php         | 2 +-
 php/plugin.contactimporter.php | 4 +---
 7 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..39d1531
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+default:
+	ant deploy; cp -r /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/contactimporter /usr/share/kopano-webapp/plugins/
diff --git a/README.md b/README.md
index 77f8c7a..60447e3 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,11 @@ cd contactimporter
 ant deploy
 ```
 
+Make sure to run "composer install" in the php directory!
+
 ### Usage
 Rightclick a contactfolder or contact entry to export it as vCard.
 
 Rightclick a contactfolder to import a vCard.
 
-Rightclick a vCard attachment to import it.
\ No newline at end of file
+Rightclick a vCard attachment to import it.
diff --git a/changelog.txt b/changelog.txt
index 2dd26af..5fa2da5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+v2.0.1: 01.11.2016
+ - compatible with Kopano Webapp 3.1
+ - exporting contacts implemented
+ - GUI improvements
+
 v1.0.3: 01.05.2014
  - compatible with WebApp 1.5 and WebApp 1.6
 
@@ -12,4 +17,4 @@ v1.0.1: 03.10.2013
 
 v1.0: 24.6.2013
  - import vcards (1 or more vcards in a file)
- - chooseable destination addressbook
\ No newline at end of file
+ - chooseable destination addressbook
diff --git a/config.php b/config.php
index ac536fc..3788267 100644
--- a/config.php
+++ b/config.php
@@ -6,5 +6,5 @@ define('PLUGIN_CONTACTIMPORTER_USER_DEFAULT_ENABLE', false);
 define('PLUGIN_CONTACTIMPORTER_DEFAULT', "Kontakte");
 
 /** Tempory path for uploaded files... */
-define('PLUGIN_CONTACTIMPORTER_TMP_UPLOAD', "/var/lib/zarafa-webapp/tmp/");
+define('PLUGIN_CONTACTIMPORTER_TMP_UPLOAD', "/var/lib/kopano-webapp/tmp/");
 ?>
diff --git a/manifest.xml b/manifest.xml
index 592c620..32a0584 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin SYSTEM "manifest.dtd">
 <plugin version="2">
 	<info>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 		<name>contactimporter</name>
 		<title>VCF Contact Importer/Exporter</title>
 		<author>Christoph Haas</author>
diff --git a/php/module.contact.php b/php/module.contact.php
index 95be98b..b653b94 100644
--- a/php/module.contact.php
+++ b/php/module.contact.php
@@ -38,7 +38,7 @@ class ContactModule extends Module
 	 */
 	public function __construct($id, $data)
 	{
-		parent::Module($id, $data);
+		parent::__construct($id, $data);
 	}
 
 	/**
diff --git a/php/plugin.contactimporter.php b/php/plugin.contactimporter.php
index 5484993..f30b830 100644
--- a/php/plugin.contactimporter.php
+++ b/php/plugin.contactimporter.php
@@ -33,9 +33,7 @@ class Plugincontactimporter extends Plugin
 	/**
 	 * Constructor
 	 */
-	function Plugincontactimporter()
-	{
-	}
+	function __construct() {}
 
 	/**
 	 * Function initializes the Plugin and registers all hooks