2.2.2 release, updated documentation, copyright updates

.gitignore

@@ -1 +1,2 @@
 .idea/
+.vs/

README.md

@@ -1,20 +1,124 @@
 CALENDAR IMPORTER AND EXPORTER:
 ===
 
-Building the calendar importer plugin for Zarafa WebApp:
+## Building the calendar importer plugin from source:
 
+### Dependencies
+ - Kopano WebApp Source Code (https://stash.kopano.io/projects/KW/repos/kopano-webapp/browse)
+ - PHP >= 5 (7 or higher recommended)
+ - composer (https://getcomposer.org/)
+ - JDK 1.8 (http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html)
+ - ant (http://ant.apache.org/)
+
+Add JAVA_HOME (e.g. C:\Program Files\Java\jdk1.8.0_161) to your path. Also add Ant, Composer, PHP and Java to the global PATH variable!
+
+### Compiling the plugin
+Unzip (or use git clone) the sourcecode of Kopano WebApp to a new directory. In this README we call the source folder of WebApp "kopano-webapp-source".
+
+Then generate the WebApp build utils:
 ```
-cd /zarafa/webapp/
+cd kopano-webapp-source
 ant tools
-cd /zarafa/webapp/plugins/
+```
+
+Next clone the plugin to the WebApp plugin directory:
+```
+cd kopano-webapp-source\plugins
 git clone https://git.sprinternet.at/zarafa_webapp/calendarimporter.git
-cd calendarimporter
+```
+
+Now lets build the plugin:
+```
+cd kopano-webapp-source\plugins\calendarimporter\php
+composer install
+cd kopano-webapp-source\plugins\calendarimporter
 ant deploy
 ```
 
-### Usage
-Rightclick a calendarfolder or calendar entry to export it as iCal.
+The compiled plugin is saved to `kopano-webapp-source\deploy\plugins\calendarimporter`.
 
-Rightclick a calendarfolder to import a iCal file.
+## Installing the plugin
 
-Rightclick a iCal attachment to import it.
+### From compiled source
+Copy the whole folder "calendarimporter" to your production WebApp (`kopano-webapp-production\plugins\calendarimporter`)
+
+For example:
+```
+cp -r kopano-webapp-source\deploy\plugins\calendarimporter kopano-webapp-production\plugins\
+```
+
+## Installing the sync backend
+
+### From source
+Copy the whole folder "kopano-webapp-source\plugins\calendarimporter\backend" to a destination of cour choice.
+
+For example:
+```
+cp -r kopano-webapp-source\plugins\calendarimporter\backend /opt/ical-sync/backend
+```
+
+### From precompiled download
+Download the newest backend release from https://git.sprinternet.at/zarafa_webapp/calendarimporter/tree/master/DIST.
+
+Unzip the downloaded file and copy the backend folder to a destination of cour choice.
+
+For example:
+```
+cp -r Downloads\calendarimporter_backend /opt/ical-sync/backend
+```
+
+## WebApp Plugin Configuration
+Edit the config.php file in the plugin root path to fit your needs.
+
+Available configuration values:
+
+| Configuration Value        | Type           | Default  | Desctription |
+| ------------- |:-------------:| ----- | ----- |
+| PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE     | boolean | false | Set to true to enable the plugin for all users |
+| PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE_SYNC     | string | true | Set to true to enable the sync feature for all users |
+| PLUGIN_CALENDARIMPORTER_DEFAULT     | string | "Kalender" | Default calendar folder name (might be "Calendar" on english installations) |
+| PLUGIN_CALENDARIMPORTER_DEFAULT_TIMEZONE     | string | "Europe/Vienna" | The local Timezone |
+| PLUGIN_CALENDARIMPORTER_TMP_UPLOAD     | string | "/var/lib/kopano-webapp/tmp/" | Temporary path to store uploaded iCal files |
+
+## Sync Backend Configuration
+First you have to create a new Kopano user with admin rights.
+For example:
+```
+kopano-admin -c adminuser -e admin@domain.com -f "Calendar Sync Admin" -p topsecretpw -a 1
+```
+Then edit the config.php file of the sync backend to fit your needs.
+
+Available configuration values:
+
+| Configuration Value        | Type           | Default  | Desctription |
+| ------------- |:-------------:| ----- | ----- |
+| $ADMINUSERNAME     | string | "adminuser" | The newly created Kopano admin user |
+| $ADMINPASSWORD     | string | "topsecretpw" | The password of the admin user |
+| $SERVER     | string | "http://localhost:236/kopano" | Kopano Socket or HTTP(S) connection string |
+| $CALDAVURL     | string | "http://localhost:8080/ical/" | Kopano CalDAV URL |
+| $TEMPDIR     | string | "/tmp/" | Temporary path to store synchronised iCal files (must be writeable by the user executing the sync script) |
+
+Next set up a cronjob to allow periodic syncing of ical items.
+
+For example: (`/etc/crontab`):
+```
+# sync ics calendars every minute (interval can be changed by the user)
+* * * * * icssync /opt/ical-sync/backend/sync.php > /var/log/icssync.log 2>&1
+```
+
+If you get an error, make sure that the mapi module is loaded for php-cli. Therefore create or modify: `/etc/php7/cli/conf.d/50-mapi.ini`
+``` 
+extension=mapi.so 
+```
+
+Do no run the sync script as root! Create a user without admin rights (`adduser icssync`), and change permissions of the tmp folder accordingly.
+
+## Usage
+
+The plugin add context menu entries to calendar folders.
+
+![Plugin Context Menus](https://git.sprinternet.at/zarafa_webapp/calendarimporter/raw/master/usage.png "Kopano Webapp Context Menu")
+
+If syncing is enabled, the calendar section in the WebApp settings gets extended with a synchronisation overview. There you can add new iCal URLs for syncing.
+
+![Plugin Settings Menus](https://git.sprinternet.at/zarafa_webapp/calendarimporter/raw/master/usage_sync.png "Kopano Webapp Settings Menu")

backend/README.txt

@@ -1,14 +1,54 @@
-Backend setup:
+# Backend setup:
 
-1. Create a Admin User in Zarafa:
-zarafa-admin -c adminuser -e admin@domain.com -f "Calendar Sync Admin" -p topsecretpw -a 1
+## Installing the sync backend
 
-2. Edit the config.php to fit your needs.
+### From source
+Copy the whole folder "kopano-webapp-source\plugins\calendarimporter\backend" to a destination of cour choice.
 
-3. Setup cron to run your script every 10 minutes (or whatever...)
+For example:
+```
+cp -r kopano-webapp-source\plugins\calendarimporter\backend /opt/ical-sync/backend
+```
 
-4. If you get an error, make sure that the mapi module is loaded for php-cli:
- * Add: /etc/php5/cli/conf.d/50-mapi.ini
- * Content: extension=mapi.so
+### From precompiled download
+Download the newest backend release from https://git.sprinternet.at/zarafa_webapp/calendarimporter/tree/master/DIST.
 
-Never run the backend script as root!
+Unzip the downloaded file and copy the backend folder to a destination of cour choice.
+
+For example:
+```
+cp -r Downloads\calendarimporter_backend /opt/ical-sync/backend
+```
+
+## Sync Backend Configuration
+First you have to create a new Kopano user with admin rights.
+For example:
+```
+kopano-admin -c adminuser -e admin@domain.com -f "Calendar Sync Admin" -p topsecretpw -a 1
+```
+Then edit the config.php file of the sync backend to fit your needs.
+
+Available configuration values:
+
+| Configuration Value        | Type           | Default  | Desctription |
+| ------------- |:-------------:| ----- | ----- |
+| $ADMINUSERNAME     | string | "adminuser" | The newly created Kopano admin user |
+| $ADMINPASSWORD     | string | "topsecretpw" | The password of the admin user |
+| $SERVER     | string | "http://localhost:236/kopano" | Kopano Socket or HTTP(S) connection string |
+| $CALDAVURL     | string | "http://localhost:8080/ical/" | Kopano CalDAV URL |
+| $TEMPDIR     | string | "/tmp/" | Temporary path to store synchronised iCal files (must be writeable by the user executing the sync script) |
+
+Next set up a cronjob to allow periodic syncing of ical items.
+
+For example: (`/etc/crontab`):
+```
+# sync ics calendars every minute (interval can be changed by the user)
+* * * * * icssync /opt/ical-sync/backend/sync.php > /var/log/icssync.log 2>&1
+```
+
+If you get an error, make sure that the mapi module is loaded for php-cli. Therefore create or modify: `/etc/php7/cli/conf.d/50-mapi.ini`
+``` 
+extension=mapi.so 
+```
+
+Do no run the sync script as root! Create a user without admin rights (`adduser icssync`), and change permissions of the tmp folder accordingly.

backend/config.php

@@ -1,8 +1,7 @@
 <?php
 // config options
-$ADMINUSERNAME = "admin";
-$ADMINPASSWORD = "admin";
-$SERVER = "file:///var/run/zarafa";
-$CALDAVURL = "http://localhost:8080/ical/";
-$TEMPDIR = "/tmp/";
-?>
+$ADMINUSERNAME = "admin";                   // Kopano administrative user
+$ADMINPASSWORD = "admin";                   // Kopano administrative user password
+$SERVER = "http://localhost:236/kopano";         // Kopano socket or http(s) connection
+$CALDAVURL = "http://localhost:8080/ical/"; // Caldav URL
+$TEMPDIR = "/tmp/";                         // Temporary directory for storing downloaded ics files

backend/functions.php

@@ -1,9 +1,9 @@
 <?php
 /**
- * functions.php, zarafa calender to ics im/exporter backend
+ * functions.php, Kopano calender to ics im/exporter backend
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,10 +18,16 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
  
-/* gets the data from a URL */
+/**
+ * gets the data from a URL
+ *
+ * @param $url
+ * @param null $username
+ * @param null $password
+ * @return mixed|null
+ */
 function curl_get_data($url, $username = NULL, $password = NULL) {
 	$ch = curl_init();
 	$timeout = 5;
@@ -44,7 +50,12 @@ function curl_get_data($url, $username = NULL, $password = NULL) {
 	return $data;
 }
 
-/* gets all zarafa users */
+/**
+ * gets all zarafa users
+ *
+ * @param $userStore
+ * @return null|void
+ */
 function get_user_ics_list($userStore) {
 	// get settings
 	// first check if property exist and we can open that using mapi_openproperty
@@ -89,7 +100,13 @@ function get_user_ics_list($userStore) {
 	}
 }
 
-/* updates the webapp settings */
+/**
+ * updates the webapp settings
+ *
+ * @param $userStore
+ * @param $icsentry
+ * @return bool|void
+ */
 function update_last_sync_date($userStore, $icsentry) {
 	// get settings
 	// first check if property exist and we can open that using mapi_openproperty
@@ -134,7 +151,17 @@ function update_last_sync_date($userStore, $icsentry) {
 	return false;
 }
 
-/* upload a file */
+/**
+ * upload a file
+ *
+ * @param $filename
+ * @param $caldavurl
+ * @param $username
+ * @param $calendarname
+ * @param null $authuser
+ * @param null $authpass
+ * @return int
+ */
 function upload_ics_to_caldav($filename, $caldavurl, $username, $calendarname, $authuser = NULL, $authpass = NULL) {
 	$url = $caldavurl . $username . "/" . rawurlencode($calendarname) . "/";
 	$post = array('file'=>'@'.$filename);
@@ -162,4 +189,3 @@ function upload_ics_to_caldav($filename, $caldavurl, $username, $calendarname, $
 	
 	return $http_status;
 }
-?>

backend/sync.php

@@ -1,10 +1,10 @@
 #!/usr/bin/php
 <?php
 /**
- * sync.php, zarafa calender to ics im/exporter backend
+ * sync.php, Kopano calender to ics im/exporter backend
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,17 +26,17 @@ if(php_sapi_name() !== 'cli') {
 }
 
 /**
- * Make sure that the zarafa mapi extension is enabled in cli mode:
+ * Make sure that the kopano mapi extension is enabled in cli mode:
  * Add: /etc/php5/cli/conf.d/50-mapi.ini
  * Content: extension=mapi.so
  */
 
 // MAPI includes
-include('/usr/share/php/mapi/mapi.util.php');
-include('/usr/share/php/mapi/mapidefs.php');
-include('/usr/share/php/mapi/mapicode.php');
-include('/usr/share/php/mapi/mapitags.php');
-include('/usr/share/php/mapi/mapiguid.php');
+include('mapi/mapi.util.php');
+include('mapi/mapidefs.php');
+include('mapi/mapicode.php');
+include('mapi/mapitags.php');
+include('mapi/mapiguid.php');
 include('config.php');
 include('functions.php');
 
@@ -134,7 +134,7 @@ foreach($userList as $userName => $userData) {
 						echo "Import completed: $result\n";
 						$result = update_last_sync_date($userStore, $syncItemName);
 						$res = $result ? "true":"false";
-						echo "Updated Zarafa settings: " . $res . "\n";
+						echo "Updated Kopano settings: " . $res . "\n";
 					} else {
 						echo "Uploading failed: " . $result . "\n";
 					}
@@ -147,4 +147,3 @@ foreach($userList as $userName => $userData) {
 	
 	echo "###Done sync for user: " . $userName . "\n\n";
 }
-?>

changelog.txt

@@ -1,3 +1,6 @@
+calendarimporter 2.2.2:
+ - updated documentation
+
 calendarimporter 2.2.1:
  - finally supporting Kopano Webapp 3.1.x
  - translation to german added

js/ABOUT.js

@@ -2,7 +2,7 @@
  * ABOUT.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@ Ext.namespace('Zarafa.plugins.calendarimporter');
  * The copyright string holding the copyright notice for the Zarafa calendarimporter Plugin.
  */
 Zarafa.plugins.calendarimporter.ABOUT = ""
-    + "<p>Copyright (C) 2012-2016  Christoph Haas &lt;christoph.h@sprinternet.at&gt;</p>"
+    + "<p>Copyright (C) 2012-2018  Christoph Haas &lt;christoph.h@sprinternet.at&gt;</p>"
 
     + "<p>This program is free software; you can redistribute it and/or "
     + "modify it under the terms of the GNU Lesser General Public "
@@ -49,18 +49,8 @@ Zarafa.plugins.calendarimporter.ABOUT = ""
 
     + "<p>The calendarimporter plugin contains the following third-party components:</p>"
 
-    + "<h1>iCalcreator v2.16.12</h1>"
+    + "<h1>sabre-io/vobject v4.1</h1>"
 
-    + "<p>Copyright 2007-2013 Kjell-Inge Gustafsson kigkonsult</p>"
+    + "<p>Copyright (C) 2011-2016 fruux GmbH (https://fruux.com/)</p>"
     
-    + "<p>This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.</p>"
-
-    + "<p>This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.</p>"
-
-    + "<h1>Ics-parser</h1>"
-
-    + "<p>Copyright 2002-2007 Martin Thoma &lt;info@martin-thoma.de&gt;</p>"
-
-    + "<p>Licensed under the MIT License.</p>"
-
-    + "<p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>";
+    + "<p>Licensed under the BSD 3-Clause \"New\" or \"Revised\" License</p>";

js/data/Actions.js

@@ -2,7 +2,7 @@
  * Actions.js zarafa calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/data/ResponseHandler.js

@@ -2,7 +2,7 @@
  * ResponseHandler.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/data/timezones.js

@@ -2,7 +2,7 @@
  * timezones.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/dialogs/ImportContentPanel.js

@@ -2,7 +2,7 @@
  * ImportContentPanel.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/dialogs/ImportPanel.js

@@ -2,7 +2,7 @@
  * ImportPanel.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/plugin.calendarimporter.js

@@ -2,7 +2,7 @@
  * plugin.calendarimporter.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/settings/SettingsCalSyncWidget.js

@@ -2,7 +2,7 @@
  * SettingsCalSyncWidget.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/settings/SettingsWidget.js

@@ -2,7 +2,7 @@
  * SettingsWidget.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/settings/dialogs/CalSyncEditContentPanel.js

@@ -2,7 +2,7 @@
  * CalSyncEditContentPanel.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/settings/dialogs/CalSyncEditPanel.js

@@ -2,7 +2,7 @@
  * CalSyncEditPanel.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/settings/ui/CalSyncGrid.js

@@ -2,7 +2,7 @@
  * CalSyncGrid.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/settings/ui/CalSyncPanel.js

@@ -2,7 +2,7 @@
  * CalSyncPanel.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

js/ui/ContextMenu.js

@@ -2,7 +2,7 @@
  * ContectMenu.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

manifest.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE plugin SYSTEM "manifest.dtd">
 <plugin version="2">
     <info>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
         <name>calendarimporter</name>
         <title>ICS Calendar Importer/Exporter</title>
         <author>Christoph Haas</author>
         <authorURL>http://www.sprinternet.at</authorURL>
-        <description>Import or Export a ICS file to/from the Kopano calendar</description>
+        <description>Import or export a ICS file to/from the Kopano calendar</description>
     </info>
     <translations>
         <translationsdir>languages</translationsdir>

php/composer.json

@@ -1,5 +1,5 @@
 {
   "require": {
-    "sabre/vobject": "3.5.3"
+    "sabre/vobject": "4.1"
   }
 }

php/download.php

@@ -3,7 +3,7 @@
  * download.php, Kopano calendar to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

php/helper.php

@@ -3,7 +3,7 @@
  * helper.php, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

php/module.calendar.php

@@ -3,7 +3,7 @@
  * module.calendar.php, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -287,9 +287,8 @@ class CalendarModule extends Module
                 ]);
 
                 // Add organizer
-                $organizer = $this->getProp($messageProps, "sender_email_address");
-                if(!empty($organizer)) {
-                    $vEvent->add('ORGANIZER', 'mailto:' . $organizer);
+                if(!empty( $this->getProp($messageProps, "sender_email_address"))) {
+                    $vEvent->add('ORGANIZER', 'mailto:' . $this->getProp($messageProps, "sender_email_address"));
                     $vEvent->ORGANIZER['CN'] = $this->getProp($messageProps, "sender_name");
                 }
 
@@ -303,8 +302,7 @@ class CalendarModule extends Module
                 }
 
                 // Add alarms
-                $reminder = $this->getProp($messageProps, "reminder");
-                if (!empty($reminder) && $this->getProp($messageProps, "reminder") == 1) {
+                if (!empty($this->getProp($messageProps, "reminder")) && $this->getProp($messageProps, "reminder") == 1) {
                     $vAlarm = $vEvent->add('VALARM', [
                         'ACTION' => 'DISPLAY',
                         'DESCRIPTION' => $this->getProp($messageProps, "subject") // reuse the event summary
@@ -321,8 +319,7 @@ class CalendarModule extends Module
                 }
 
                 // Add location
-                $location = $this->getProp($messageProps, "location");
-                if (!empty($location)) {
+                if (!empty($this->getProp($messageProps, "location"))) {
                     $vEvent->add('LOCATION', $this->getProp($messageProps, "location"));
                 }
 
@@ -333,11 +330,10 @@ class CalendarModule extends Module
                 }
 
                 // Add categories
-                $categories = $this->getProp($messageProps, "categories");
-                if (!empty($categories)) {
-                    $categoryArray = array_map('trim', explode(';', trim($categories, " ;")));
+                if (!empty($this->getProp($messageProps, "categories"))) {
+                    $categories = array_map('trim', explode(';', trim($this->getProp($messageProps, "categories"), " ;")));
 
-                    $vEvent->add('CATEGORIES', $categoryArray);
+                    $vEvent->add('CATEGORIES', $categories);
                 }
             }
 
@@ -693,16 +689,12 @@ class CalendarModule extends Module
             $properties["comment"] = (string)$vEvent->COMMENT;
             $properties["timezone"] = (string)$vEvent->DTSTART["TZID"];
             $properties["organizer"] = (string)$vEvent->ORGANIZER;
-
-            $fbType = (string)$vEvent->FBTYPE;
-            $msIntendedStatus = (string)$vEvent->{'X-MICROSOFT-CDO-INTENDEDSTATUS'};
-            $msBusyStatus = (string)$vEvent->{'X-MICROSOFT-CDO-BUSYSTATUS'};
-            if(!empty($fbType)) {
-                $properties["busystatus"] = array_search($fbType, $this->freeBusyStates);
-            } else if(!empty($msIntendedStatus)) {
-                $properties["busystatus"] = array_search($msIntendedStatus, $this->busyStates);
-            } else if(!empty($msBusyStatus)) {
-                $properties["busystatus"] = array_search($msBusyStatus, $this->busyStates);
+            if(!empty((string)$vEvent->FBTYPE)) {
+                $properties["busystatus"] = array_search((string)$vEvent->FBTYPE, $this->freeBusyStates);
+            } else if(!empty((string)$vEvent->{'X-MICROSOFT-CDO-INTENDEDSTATUS'})) {
+                $properties["busystatus"] = array_search((string)$vEvent->{'X-MICROSOFT-CDO-INTENDEDSTATUS'}, $this->busyStates);
+            } else if(!empty((string)$vEvent->{'X-MICROSOFT-CDO-BUSYSTATUS'})) {
+                $properties["busystatus"] = array_search((string)$vEvent->{'X-MICROSOFT-CDO-BUSYSTATUS'}, $this->busyStates);
             } else {
                 $properties["busystatus"] = array_search("BUSY", $this->busyStates);
             }
@@ -710,18 +702,15 @@ class CalendarModule extends Module
             //$properties["trigger"] = (string)$vEvent->COMMENT;
             $properties["priority"] = (string)$vEvent->PRIORITY;
             $properties["private"] = ((string)$vEvent->CLASS) == "PRIVATE" ? true : false;
-            $zLabel = (string)$vEvent->{'X-ZARAFA-LABEL'};
-            if (!empty($zLabel)) {
-                $properties["label"] = array_search($zLabel, $this->labels);
+            if (!empty((string)$vEvent->{'X-ZARAFA-LABEL'})) {
+                $properties["label"] = array_search((string)$vEvent->{'X-ZARAFA-LABEL'}, $this->labels);
             }
-            $lastModified = (string)$vEvent->{'LAST-MODIFIED'};
-            if (!empty($lastModified)) {
+            if (!empty((string)$vEvent->{'LAST-MODIFIED'})) {
                 $properties["last_modification_time"] = (string)$vEvent->{'LAST-MODIFIED'}->getDateTime()->getTimestamp();
             } else {
                 $properties["last_modification_time"] = time();
             }
-            $created = (string)$vEvent->CREATED;
-            if (!empty($created)) {
+            if (!empty((string)$vEvent->CREATED)) {
                 $properties["creation_time"] = (string)$vEvent->CREATED->getDateTime()->getTimestamp();
             } else {
                 $properties["creation_time"] = time();

php/plugin.calendarimporter.php

@@ -3,7 +3,7 @@
  * plugin.calendarimporter.php, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

php/upload.php

@@ -3,7 +3,7 @@
  * upload.php, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2016 Christoph Haas
+ * Copyright (C) 2012-2018 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public