Index: npl/mailserver/kopano_conf/root/etc/cron.weekly/kopano_clean
===================================================================
--- npl/mailserver/kopano_conf/root/etc/cron.weekly/kopano_clean	(revision bd5cb293413fa6ff1ca56e0be8355363c49c7759)
+++ npl/mailserver/kopano_conf/root/etc/cron.weekly/kopano_clean	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
@@ -17,5 +17,5 @@
 if ! [ -e /var/lib/kopano/kopano_upgrade_fix ]; then
 	syn3-state kopano OK "$TXT kopano 7 upgrade bugfix aan het uitvoeren (eenmalig)" 
-	mysql -p`cat /etc/my.passwd` kopano -e "
+	mysql -p`cat /etc/my.passwd` zarafa -e "
 		begin;
 		truncate table tproperties;
@@ -35,5 +35,5 @@
 
 syn3-state kopano OK "$TXT database optimalisatie"
-mysqlcheck --optimize -p`cat /etc/my.passwd` kopano || abort "database optimalisatie mislukt"
+mysqlcheck --optimize -p`cat /etc/my.passwd` zarafa || abort "database optimalisatie mislukt"
 
 syn3-state kopano OK "$TXT kopano search xapian compact"
Index: npl/mailserver/kopano_conf/root/etc/kopano/userscripts/kopano-dspam-retrain
===================================================================
--- npl/mailserver/kopano_conf/root/etc/kopano/userscripts/kopano-dspam-retrain	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
+++ npl/mailserver/kopano_conf/root/etc/kopano/userscripts/kopano-dspam-retrain	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+#SYN-3 dspam training script for kopano-dspam. see https://github.com/psy0rz/kopano-dspam
+
+SPAM_USER="$1"
+SPAM_ID="$2"
+CLASSIFICATION="$3"
+UNDO="$4"
+
+
+/usr/bin/dspamc --source=error --class="$CLASSIFICATION" --signature="$SPAM_ID" --user "$SPAM_USER"
Index: npl/mailserver/kopano_conf/root/etc/kopano/userscripts/kopano-spamd-retrain
===================================================================
--- npl/mailserver/kopano_conf/root/etc/kopano/userscripts/kopano-spamd-retrain	(revision bd5cb293413fa6ff1ca56e0be8355363c49c7759)
+++ 	(revision )
@@ -1,11 +1,0 @@
-#!/bin/bash
-
-#SYN-3 dspam training script for kopano-spamd. see https://github.com/psy0rz/kopano-spamd
-
-SPAM_USER="$1"
-SPAM_ID="$2"
-CLASSIFICATION="$3"
-UNDO="$4"
-
-
-/usr/bin/dspamc --source=error --class="$CLASSIFICATION" --signature="$SPAM_ID" --user "$SPAM_USER"
Index: npl/mailserver/kopano_conf/root/etc/postinst.d/post.kopano_conf
===================================================================
--- npl/mailserver/kopano_conf/root/etc/postinst.d/post.kopano_conf	(revision bd5cb293413fa6ff1ca56e0be8355363c49c7759)
+++ npl/mailserver/kopano_conf/root/etc/postinst.d/post.kopano_conf	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
@@ -54,4 +54,5 @@
 groupadd kopano
 useradd kopano-gateway
+svcrestart /service/nscd
 
 #create and own stuff
@@ -65,4 +66,7 @@
 chown kopano:kopano /var/lib/kopano
 
+mkdir /home/system/kopano_webapp
+chown nobody /home/system/kopano_webapp
+
 #logging
 mkdir /var/log/kopano
@@ -72,9 +76,10 @@
 #migrate from zarafa?
 if [ -e /home/system/zarafa ]; then
-	chown kopano:kopano /home/system/zarafa
+	mv /home/system/kopano /home/system/kopano.old
 	mv /home/system/zarafa /home/system/kopano
+	chown -R kopano:kopano /home/system/kopano
 else
 	mkdir /home/system/kopano
-	chown kopano /home/system/kopano || exit 1
+	chown kopano:kopano /home/system/kopano || exit 1
 fi
 
Index: npl/mailserver/kopano_conf/root/service/kopano-dspam/run
===================================================================
--- npl/mailserver/kopano_conf/root/service/kopano-dspam/run	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
+++ npl/mailserver/kopano_conf/root/service/kopano-dspam/run	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec pgrphack kopano-dspam -F
Index: npl/mailserver/kopano_conf/root/service/kopano-spamd/run
===================================================================
--- npl/mailserver/kopano_conf/root/service/kopano-spamd/run	(revision bd5cb293413fa6ff1ca56e0be8355363c49c7759)
+++ 	(revision )
@@ -1,2 +1,0 @@
-#!/bin/bash
-exec pgrphack kopano-spamd -F
Index: npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano-webapp/config.php
===================================================================
--- npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano-webapp/config.php	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
+++ npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano-webapp/config.php	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
@@ -0,0 +1,221 @@
+<?php
+/*
+	config.php
+
+	The config file for the webapp.
+	All possible web client settings can be set in this file. Some settings
+	(language) can also be set per user or logon.
+
+*/
+	// Comment next line to disable the config check (or set FALSE to log the config errors)
+	define("CONFIG_CHECK", TRUE);
+
+	// Use these options to optionally disable some PHP configuration checks.
+	// WARNING: these checks will disable checks regarding the security of the WebApp site configuration,
+	// only change them if you know the consequences - improper use will lead to an insecure installation!
+	define("CONFIG_CHECK_COOKIES_HTTP", FALSE);
+	define("CONFIG_CHECK_COOKIES_SSL", FALSE);
+
+	// The default Kopano server socket location changed in ZCP 7.2.2 to /var/run/kopanod/server.sock.
+	// The "default:" option tries both the old and new socket locations.
+	// It is advisable to change the lines below to one define with your ZCP socket location e.g.
+	// define("DEFAULT_SERVER", "file:///var/run/kopanod/server.sock");
+	if(version_compare(phpversion('mapi'), '7.2.2', '>=')) {
+		define("DEFAULT_SERVER", "default:");
+	} else {
+		#define("DEFAULT_SERVER","http://localhost:236/kopano");
+		define("DEFAULT_SERVER","file:///var/run/kopano");
+	}
+
+	// When using a single-signon system on your webserver, but Kopano is on another server
+	// you can use https to access the kopano server, and authenticate using an SSL certificate.
+	define("SSLCERT_FILE", NULL);
+	define("SSLCERT_PASS", NULL);
+
+	// set to 'true' to strip domain from login name found from Single Signon webservers
+	define("LOGINNAME_STRIP_DOMAIN", false);
+
+	// Name of the cookie that is used for the session
+	define("COOKIE_NAME", "KOPANO_WEBAPP");
+
+	// The timeout (in seconds) for the session. User will be logged out of WebApp
+	// when he has not actively used the WebApp for this time.
+	// Set to 0 (or remove) for no timeout during browser session.
+	define('CLIENT_TIMEOUT', 0);
+	
+	// Defines the domains from which cross domain authentication requests
+	// are allowed. E.g. if WebMeetings runs under a different domain than
+	// the WebApp then add this domain here. Add http(s):// to the domains
+	// and separate domains with spaces.
+	// Set to empty string (default) to only allow authentication requests
+	// from within the same domain.
+	// Set to "*" to allow authentication requests from any domain. (not
+	// recommended)
+	define('CROSS_DOMAIN_AUTHENTICATION_ALLOWED_DOMAINS', "");
+
+	// Defines the base url and end with a slash.
+	$base_url = dirname($_SERVER["PHP_SELF"]);
+	if(substr($base_url,-1)!="/") $base_url .="/";
+	define("BASE_URL", $base_url);
+
+	// Defines the temp path (absolute). Here uploaded attachments will be saved.
+	// The web client doesn't work without this directory.
+	define("TMP_PATH", "/home/system/kopano_webapp");
+
+	// Define the path to the plugin directory (No slash at the end)
+	define("PATH_PLUGIN_DIR", "plugins");
+
+	// Enable the plugins
+	define("ENABLE_PLUGINS", true);
+
+	// Define list of disabled plugins separated by semicolon
+	define("DISABLED_PLUGINS_LIST", '');
+	
+	// General WebApp theme. This will be loaded by default for every user
+	// (if the theme is installed as a plugin)
+	// Users can override the 'logged-in' theme in the settings.
+	define("THEME", '');
+	
+	// The title that will be shown in the title bar of the browser
+	define("WEBAPP_TITLE", 'Kopano WebApp (powered by SYN-3)');
+
+	// Set addressbook for GAB not to show any users unless searching for a specific user
+	define("DISABLE_FULL_GAB", false);
+
+	// Set true to hide public contact folders in address-book folder list,
+	// false will show public contact folders in address-book folder list.
+	define("DISABLE_PUBLIC_CONTACT_FOLDERS", true);
+
+	// Set the threshold for the addressnook to only show a full contactlist when the number of rows
+	// do not exeed this threshold. Otherwise the user can only use the search. Enter any number above
+	// zero to set the threshold or -1 to always show the list or 0 to always hide the full list.
+	define("DISABLE_FULL_CONTACTLIST_THRESHOLD", -1);
+
+	// Set true to show public folders in hierarchy, false will disable public folders in hierarchy.
+	define('ENABLE_PUBLIC_FOLDERS', true);
+
+	// Booking method (true = direct booking, false = send meeting request)
+	define('ENABLE_DIRECT_BOOKING', true);
+
+	// Enable GZIP compression for responses
+	define('ENABLE_RESPONSE_COMPRESSION', true);
+
+	// When set to true this disables the welcome screen to be shown for first time users.
+	define('DISABLE_WELCOME_SCREEN', false);
+
+	// When set to false it will disable showing of advanced settings.
+	define('ENABLE_ADVANCED_SETTINGS', true);
+
+	// Freebusy start offset that will be used to load freebusy data in appointments, number is subtracted from current time
+	define('FREEBUSY_LOAD_START_OFFSET', 7);
+
+	// Freebusy end offset that will be used to load freebusy data in appointments, number is added to current time
+	define('FREEBUSY_LOAD_END_OFFSET', 90);
+
+	// Maximum eml files to be included in a single ZIP archive
+	define('MAX_EML_FILES_IN_ZIP', 50);
+
+	// Additional color schemes for the calendars can be added by uncommenting and editing the following define.
+	// The format is the same as the format of COLOR_SCHEMES which is defined in default.php
+	// To change the default colors, COLOR_SCHEMES can also be defined here.
+	// Note: Every color should have a unique name, because it is used to identify the color
+	// define('ADDITIONAL_COLOR_SCHEMES', json_encode(array(
+	// 		array(
+	//			'name' => 'pink',
+	//			'displayName' => _('Pink'),
+	//			'base' => '#ff0099'
+	//		)
+	// )));
+
+	// Additional Prefix for the Contact name can be added by uncommenting and editing the following define.
+	// define('CONTACT_PREFIX', json_encode(array(
+	//  	array(_('Er.')),
+	//  	array(_('Gr.'))
+	// )));
+
+	// Additional Suffix for the Contact name can be added by uncommenting and editing the following define.
+	// define('CONTACT_SUFFIX', json_encode(array(
+	//  	array(_('A')),
+	//  	array(_('B'))
+	// )));
+
+
+	/**************************************\
+	* Memory usage and timeouts            *
+	\**************************************/
+
+	// This sets the maximum time in seconds that is allowed to run before it is terminated by the parser.
+	ini_set('max_execution_time', 300); // 5 minutes
+
+	// BLOCK_SIZE (in bytes) is used for attachments by mapi_stream_read/mapi_stream_write
+	define('BLOCK_SIZE', 1048576);
+
+	// Time that static files may exist in the client's cache (13 weeks)
+	define('EXPIRES_TIME', 60*60*24*7*13);
+
+	// Time that the state files are allowed to survive (in seconds)
+	// For filesystems on which relatime is used, this value should be larger then the relatime_interval
+	// for kernels 2.6.30 and above relatime is enabled by default, and the relatime_interval is set to
+	// 24 hours.
+	define('STATE_FILE_MAX_LIFETIME', 28*60*60);
+
+	// Time that attachments are allowed to survive (in seconds)
+	define('UPLOADED_ATTACHMENT_MAX_LIFETIME', 6*60*60);
+
+	/**************************************\
+	* Languages                            *
+	\**************************************/
+
+	// Location to the translations
+	define("LANGUAGE_DIR", "server/language/");
+
+	// Defines the default interface language. This can be overriden by the user.
+	// This language is also used on the login page
+	if (isset($_ENV['LANG']) && $_ENV['LANG']!="C"){
+		define('LANG', $_ENV["LANG"]); // This means the server environment language determines the web client language.
+	}else{
+		define('LANG', 'en_GB'); // default fallback language
+	}
+
+	// List of languages that should be enabled in the logon
+	// screen's language drop down.  Languages should be specified
+	// using <languagecode>_<regioncode>[.UTF-8], and separated with
+	// semicolon.  A list of available languages can be found in
+	// the manual or by looking at the list of directories in
+	// /usr/share/kopano-webapp/server/language .
+	define("ENABLED_LANGUAGES", "de_DE;en_EN;en_US;fr_FR;he_IL;it_IT;nl_NL;ru_RU;zh_CN;nb_NO");
+
+	// Defines the default time zone, change e.g. to "Europe/London" when needed
+	if(function_exists("date_default_timezone_set")) {
+		if(!ini_get('date.timezone')) {
+			date_default_timezone_set('Europe/London');
+		}
+	}
+
+	/**************************************\
+	* Powerpaste                           *
+	\**************************************/
+
+	// Options for TinyMCE's powerpaste plugin, see https://www.tinymce.com/docs/enterprise/paste-from-word/#configurationoptions
+	// for more details.
+	define('POWERPASTE_WORD_IMPORT', 'merge');
+	define('POWERPASTE_HTML_IMPORT', 'merge');
+	define('POWERPASTE_ALLOW_LOCAL_IMAGES', true);
+
+	/**************************************\
+	* Debugging                            *
+	\**************************************/
+
+	ini_set("display_errors", false);
+	error_reporting(0);
+
+	if (file_exists('debug.php')){
+		include_once('debug.php');
+	}else{
+		// define empty dump function in case we still use it somewhere
+		function dump(){}
+	}
+
+
+
+?>
Index: npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano-webapp/webportal.desc
===================================================================
--- npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano-webapp/webportal.desc	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
+++ npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano-webapp/webportal.desc	(revision 1163be4bf981a8724c99a3990fcf4e43b12eb510)
@@ -0,0 +1,1 @@
+Kopano webapp
Index: npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano_webapp/config.php
===================================================================
--- npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano_webapp/config.php	(revision bd5cb293413fa6ff1ca56e0be8355363c49c7759)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?php
-/*
-	config.php
-
-	The config file for the webapp.
-	All possible web client settings can be set in this file. Some settings
-	(language) can also be set per user or logon.
-
-*/
-	// Comment next line to disable the config check (or set FALSE to log the config errors)
-	define("CONFIG_CHECK", TRUE);
-
-	// Use these options to optionally disable some PHP configuration checks.
-	// WARNING: these checks will disable checks regarding the security of the WebApp site configuration,
-	// only change them if you know the consequences - improper use will lead to an insecure installation!
-	define("CONFIG_CHECK_COOKIES_HTTP", FALSE);
-	define("CONFIG_CHECK_COOKIES_SSL", FALSE);
-
-	// The default Kopano server socket location changed in ZCP 7.2.2 to /var/run/kopanod/server.sock.
-	// The "default:" option tries both the old and new socket locations.
-	// It is advisable to change the lines below to one define with your ZCP socket location e.g.
-	// define("DEFAULT_SERVER", "file:///var/run/kopanod/server.sock");
-	if(version_compare(phpversion('mapi'), '7.2.2', '>=')) {
-		define("DEFAULT_SERVER", "default:");
-	} else {
-		#define("DEFAULT_SERVER","http://localhost:236/kopano");
-		define("DEFAULT_SERVER","file:///var/run/kopano");
-	}
-
-	// When using a single-signon system on your webserver, but Kopano is on another server
-	// you can use https to access the kopano server, and authenticate using an SSL certificate.
-	define("SSLCERT_FILE", NULL);
-	define("SSLCERT_PASS", NULL);
-
-	// set to 'true' to strip domain from login name found from Single Signon webservers
-	define("LOGINNAME_STRIP_DOMAIN", false);
-
-	// Name of the cookie that is used for the session
-	define("COOKIE_NAME", "KOPANO_WEBAPP");
-
-	// The timeout (in seconds) for the session. User will be logged out of WebApp
-	// when he has not actively used the WebApp for this time.
-	// Set to 0 (or remove) for no timeout during browser session.
-	define('CLIENT_TIMEOUT', 0);
-	
-	// Defines the domains from which cross domain authentication requests
-	// are allowed. E.g. if WebMeetings runs under a different domain than
-	// the WebApp then add this domain here. Add http(s):// to the domains
-	// and separate domains with spaces.
-	// Set to empty string (default) to only allow authentication requests
-	// from within the same domain.
-	// Set to "*" to allow authentication requests from any domain. (not
-	// recommended)
-	define('CROSS_DOMAIN_AUTHENTICATION_ALLOWED_DOMAINS', "");
-
-	// Defines the base url and end with a slash.
-	$base_url = dirname($_SERVER["PHP_SELF"]);
-	if(substr($base_url,-1)!="/") $base_url .="/";
-	define("BASE_URL", $base_url);
-
-	// Defines the temp path (absolute). Here uploaded attachments will be saved.
-	// The web client doesn't work without this directory.
-	define("TMP_PATH", "/home/system/kopano_webapp");
-
-	// Define the path to the plugin directory (No slash at the end)
-	define("PATH_PLUGIN_DIR", "plugins");
-
-	// Enable the plugins
-	define("ENABLE_PLUGINS", true);
-
-	// Define list of disabled plugins separated by semicolon
-	define("DISABLED_PLUGINS_LIST", '');
-	
-	// General WebApp theme. This will be loaded by default for every user
-	// (if the theme is installed as a plugin)
-	// Users can override the 'logged-in' theme in the settings.
-	define("THEME", '');
-	
-	// The title that will be shown in the title bar of the browser
-	define("WEBAPP_TITLE", 'Kopano WebApp (powered by SYN-3)');
-
-	// Set addressbook for GAB not to show any users unless searching for a specific user
-	define("DISABLE_FULL_GAB", false);
-
-	// Set true to hide public contact folders in address-book folder list,
-	// false will show public contact folders in address-book folder list.
-	define("DISABLE_PUBLIC_CONTACT_FOLDERS", true);
-
-	// Set the threshold for the addressnook to only show a full contactlist when the number of rows
-	// do not exeed this threshold. Otherwise the user can only use the search. Enter any number above
-	// zero to set the threshold or -1 to always show the list or 0 to always hide the full list.
-	define("DISABLE_FULL_CONTACTLIST_THRESHOLD", -1);
-
-	// Set true to show public folders in hierarchy, false will disable public folders in hierarchy.
-	define('ENABLE_PUBLIC_FOLDERS', true);
-
-	// Booking method (true = direct booking, false = send meeting request)
-	define('ENABLE_DIRECT_BOOKING', true);
-
-	// Enable GZIP compression for responses
-	define('ENABLE_RESPONSE_COMPRESSION', true);
-
-	// When set to true this disables the welcome screen to be shown for first time users.
-	define('DISABLE_WELCOME_SCREEN', false);
-
-	// When set to false it will disable showing of advanced settings.
-	define('ENABLE_ADVANCED_SETTINGS', true);
-
-	// Freebusy start offset that will be used to load freebusy data in appointments, number is subtracted from current time
-	define('FREEBUSY_LOAD_START_OFFSET', 7);
-
-	// Freebusy end offset that will be used to load freebusy data in appointments, number is added to current time
-	define('FREEBUSY_LOAD_END_OFFSET', 90);
-
-	// Maximum eml files to be included in a single ZIP archive
-	define('MAX_EML_FILES_IN_ZIP', 50);
-
-	// Additional color schemes for the calendars can be added by uncommenting and editing the following define.
-	// The format is the same as the format of COLOR_SCHEMES which is defined in default.php
-	// To change the default colors, COLOR_SCHEMES can also be defined here.
-	// Note: Every color should have a unique name, because it is used to identify the color
-	// define('ADDITIONAL_COLOR_SCHEMES', json_encode(array(
-	// 		array(
-	//			'name' => 'pink',
-	//			'displayName' => _('Pink'),
-	//			'base' => '#ff0099'
-	//		)
-	// )));
-
-	// Additional Prefix for the Contact name can be added by uncommenting and editing the following define.
-	// define('CONTACT_PREFIX', json_encode(array(
-	//  	array(_('Er.')),
-	//  	array(_('Gr.'))
-	// )));
-
-	// Additional Suffix for the Contact name can be added by uncommenting and editing the following define.
-	// define('CONTACT_SUFFIX', json_encode(array(
-	//  	array(_('A')),
-	//  	array(_('B'))
-	// )));
-
-
-	/**************************************\
-	* Memory usage and timeouts            *
-	\**************************************/
-
-	// This sets the maximum time in seconds that is allowed to run before it is terminated by the parser.
-	ini_set('max_execution_time', 300); // 5 minutes
-
-	// BLOCK_SIZE (in bytes) is used for attachments by mapi_stream_read/mapi_stream_write
-	define('BLOCK_SIZE', 1048576);
-
-	// Time that static files may exist in the client's cache (13 weeks)
-	define('EXPIRES_TIME', 60*60*24*7*13);
-
-	// Time that the state files are allowed to survive (in seconds)
-	// For filesystems on which relatime is used, this value should be larger then the relatime_interval
-	// for kernels 2.6.30 and above relatime is enabled by default, and the relatime_interval is set to
-	// 24 hours.
-	define('STATE_FILE_MAX_LIFETIME', 28*60*60);
-
-	// Time that attachments are allowed to survive (in seconds)
-	define('UPLOADED_ATTACHMENT_MAX_LIFETIME', 6*60*60);
-
-	/**************************************\
-	* Languages                            *
-	\**************************************/
-
-	// Location to the translations
-	define("LANGUAGE_DIR", "server/language/");
-
-	// Defines the default interface language. This can be overriden by the user.
-	// This language is also used on the login page
-	if (isset($_ENV['LANG']) && $_ENV['LANG']!="C"){
-		define('LANG', $_ENV["LANG"]); // This means the server environment language determines the web client language.
-	}else{
-		define('LANG', 'en_GB'); // default fallback language
-	}
-
-	// List of languages that should be enabled in the logon
-	// screen's language drop down.  Languages should be specified
-	// using <languagecode>_<regioncode>[.UTF-8], and separated with
-	// semicolon.  A list of available languages can be found in
-	// the manual or by looking at the list of directories in
-	// /usr/share/kopano-webapp/server/language .
-	define("ENABLED_LANGUAGES", "de_DE;en_EN;en_US;fr_FR;he_IL;it_IT;nl_NL;ru_RU;zh_CN;nb_NO");
-
-	// Defines the default time zone, change e.g. to "Europe/London" when needed
-	if(function_exists("date_default_timezone_set")) {
-		if(!ini_get('date.timezone')) {
-			date_default_timezone_set('Europe/London');
-		}
-	}
-
-	/**************************************\
-	* Powerpaste                           *
-	\**************************************/
-
-	// Options for TinyMCE's powerpaste plugin, see https://www.tinymce.com/docs/enterprise/paste-from-word/#configurationoptions
-	// for more details.
-	define('POWERPASTE_WORD_IMPORT', 'merge');
-	define('POWERPASTE_HTML_IMPORT', 'merge');
-	define('POWERPASTE_ALLOW_LOCAL_IMAGES', true);
-
-	/**************************************\
-	* Debugging                            *
-	\**************************************/
-
-	ini_set("display_errors", false);
-	error_reporting(0);
-
-	if (file_exists('debug.php')){
-		include_once('debug.php');
-	}else{
-		// define empty dump function in case we still use it somewhere
-		function dump(){}
-	}
-
-
-
-?>
Index: npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano_webapp/webportal.desc
===================================================================
--- npl/mailserver/kopano_conf/root/var/www/htdocs/syn3/kopano_webapp/webportal.desc	(revision bd5cb293413fa6ff1ca56e0be8355363c49c7759)
+++ 	(revision )
@@ -1,1 +1,0 @@
-Kopano webapp
