From 7b81ea183463ed4d4085c8bd48345cb036135503 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Tue, 12 Aug 2014 11:12:10 +0000 Subject: [PATCH] simplify zpush configuration files, no need to preserve copyright message --- conf/zpush/backend_caldav.php | 49 +------------- conf/zpush/backend_carddav.php | 81 ++---------------------- conf/zpush/backend_combined.php | 57 +---------------- conf/zpush/backend_imap.php | 109 +------------------------------- 4 files changed, 9 insertions(+), 287 deletions(-) diff --git a/conf/zpush/backend_caldav.php b/conf/zpush/backend_caldav.php index 7ad7642..ebe27ac 100644 --- a/conf/zpush/backend_caldav.php +++ b/conf/zpush/backend_caldav.php @@ -3,58 +3,11 @@ * File : config.php * Project : Z-Push * Descr : CalDAV backend configuration file -* -* Created : 27.11.2012 -* -* Copyright 2007 - 2013 Zarafa Deutschland GmbH -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU Affero General Public License, version 3, -* as published by the Free Software Foundation with the following additional -* term according to sec. 7: -* -* According to sec. 7 of the GNU Affero General Public License, version 3, -* the terms of the AGPL are supplemented with the following terms: -* -* "Zarafa" is a registered trademark of Zarafa B.V. -* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH -* The licensing of the Program under the AGPL does not imply a trademark license. -* Therefore any rights, title and interest in our trademarks remain entirely with us. -* -* However, if you propagate an unmodified version of the Program you are -* allowed to use the term "Z-Push" to indicate that you distribute the Program. -* Furthermore you may use our trademarks where it is necessary to indicate -* the intended purpose of a product or service provided you use it in accordance -* with honest practices in industrial or commercial matters. -* If you want to propagate modified versions of the Program under the name "Z-Push", -* you may only do so if you have a written permission by Zarafa Deutschland GmbH -* (to acquire a permission please contact Zarafa at trademark@zarafa.com). -* -* This program 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 Affero General Public License for more details. -* -* You should have received a copy of the GNU Affero General Public License -* along with this program. If not, see . -* -* Consult LICENSE file for details ************************************************/ -// ************************ -// BackendCalDAV settings -// ************************ - -// Server address define('CALDAV_SERVER', 'https://localhost'); - -// Port define('CALDAV_PORT', '443'); - -// Path define('CALDAV_PATH', '/remote.php/caldav/calendars/%u/'); - -// Personal CalDAV folder (calendar folder/principal) define('CALDAV_PERSONAL', ''); // If the CalDAV server supports the sync-collection operation @@ -62,4 +15,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 eca3c53..4dd1a74 100644 --- a/conf/zpush/backend_carddav.php +++ b/conf/zpush/backend_carddav.php @@ -3,89 +3,16 @@ * File : config.php * Project : Z-Push * Descr : CardDAV backend configuration file -* -* Created : 16.03.2013 -* -* Copyright 2007 - 2013 Zarafa Deutschland GmbH -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU Affero General Public License, version 3, -* as published by the Free Software Foundation with the following additional -* term according to sec. 7: -* -* According to sec. 7 of the GNU Affero General Public License, version 3, -* the terms of the AGPL are supplemented with the following terms: -* -* "Zarafa" is a registered trademark of Zarafa B.V. -* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH -* The licensing of the Program under the AGPL does not imply a trademark license. -* Therefore any rights, title and interest in our trademarks remain entirely with us. -* -* However, if you propagate an unmodified version of the Program you are -* allowed to use the term "Z-Push" to indicate that you distribute the Program. -* Furthermore you may use our trademarks where it is necessary to indicate -* the intended purpose of a product or service provided you use it in accordance -* with honest practices in industrial or commercial matters. -* If you want to propagate modified versions of the Program under the name "Z-Push", -* you may only do so if you have a written permission by Zarafa Deutschland GmbH -* (to acquire a permission please contact Zarafa at trademark@zarafa.com). -* -* This program 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 Affero General Public License for more details. -* -* You should have received a copy of the GNU Affero General Public License -* along with this program. If not, see . -* -* Consult LICENSE file for details ************************************************/ -// ************************ -// BackendCardDAV settings -// ************************ -// Server protocol: http or https -define('CARDDAV_PROTOCOL', 'https'); - -// Server name +define('CARDDAV_PROTOCOL', 'https'); /* http or https */ define('CARDDAV_SERVER', 'localhost'); - -// Server port define('CARDDAV_PORT', '443'); - -// Server path to the addressbook, or the principal with the addressbooks -// If your user has more than 1 addressbook point it to the principal. -// Example: user test@domain.com will have 2 addressbooks -// http://localhost/caldav.php/test@domain.com/addresses/personal -// http://localhost/caldav.php/test@domain.com/addresses/work -// You set the CARDDAV_PATH to '/caldav.php/%u/addresses/' and personal and work will be autodiscovered -// %u: replaced with the username -// %d: replaced with the domain -// Add the trailing / define('CARDDAV_PATH', '/remote.php/carddav/addressbooks/%u/'); - - -// Server path to the default addressbook -// Mobile device will create new contacts here. It must be under CARDDAV_PATH -// %u: replaced with the username -// %d: replaced with the domain -// Add the trailing / -define('CARDDAV_DEFAULT_PATH', '/remote.php/carddav/addressbooks/%u/contacts/'); - -// Server path to the GAL addressbook. This addressbook is readonly and searchable by the user, but it will NOT be synced. -// If you don't want GAL, comment it -// %u: replaced with the username -// %d: replaced with the domain -// Add the trailing / -define('CARDDAV_GAL_PATH', '/caldav.php/%d/GAL/'); - -// Minimal length for the search pattern to do the real search. +define('CARDDAV_DEFAULT_PATH', '/remote.php/carddav/addressbooks/%u/contacts/'); /* subdirectory of the main path */ +define('CARDDAV_GAL_PATH', '/caldav.php/%d/GAL/'); /* readonly, searchable, not syncd */ define('CARDDAV_GAL_MIN_LENGTH', 5); - -// Addressbook display name, the name showed in the mobile device -// %u: replaced with the username -// %d: replaced with the domain define('CARDDAV_CONTACTS_FOLDER_NAME', '%u Addressbook'); @@ -107,4 +34,4 @@ define('CARDDAV_SUPPORTS_FN_SEARCH', false); // 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 +?> diff --git a/conf/zpush/backend_combined.php b/conf/zpush/backend_combined.php index f02bac6..9d5aea2 100644 --- a/conf/zpush/backend_combined.php +++ b/conf/zpush/backend_combined.php @@ -4,63 +4,11 @@ * Project : Z-Push * Descr : configuration file for the * combined backend. -* -* Created : 29.11.2010 -* -* Copyright 2007 - 2013 Zarafa Deutschland GmbH -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU Affero General Public License, version 3, -* as published by the Free Software Foundation with the following additional -* term according to sec. 7: -* -* According to sec. 7 of the GNU Affero General Public License, version 3, -* the terms of the AGPL are supplemented with the following terms: -* -* "Zarafa" is a registered trademark of Zarafa B.V. -* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH -* The licensing of the Program under the AGPL does not imply a trademark license. -* Therefore any rights, title and interest in our trademarks remain entirely with us. -* -* However, if you propagate an unmodified version of the Program you are -* allowed to use the term "Z-Push" to indicate that you distribute the Program. -* Furthermore you may use our trademarks where it is necessary to indicate -* the intended purpose of a product or service provided you use it in accordance -* with honest practices in industrial or commercial matters. -* If you want to propagate modified versions of the Program under the name "Z-Push", -* you may only do so if you have a written permission by Zarafa Deutschland GmbH -* (to acquire a permission please contact Zarafa at trademark@zarafa.com). -* -* This program 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 Affero General Public License for more details. -* -* You should have received a copy of the GNU Affero General Public License -* along with this program. If not, see . -* -* Consult LICENSE file for details ************************************************/ class BackendCombinedConfig { - - // ************************* - // BackendCombined settings - // ************************* - /** - * Returns the configuration of the combined backend - * - * @access public - * @return array - * - */ public static function GetBackendCombinedConfig() { - //use a function for it because php does not allow - //assigning variables to the class members (expecting T_STRING) return array( - //the order in which the backends are loaded. - //login only succeeds if all backend return true on login - //sending mail: the mail is sent with first backend that is able to send the mail 'backends' => array( 'i' => array( 'name' => 'BackendIMAP', @@ -73,8 +21,6 @@ class BackendCombinedConfig { ), ), 'delimiter' => '/', - //force one type of folder to one backend - //it must match one of the above defined backends 'folderbackend' => array( SYNC_FOLDER_TYPE_INBOX => 'i', SYNC_FOLDER_TYPE_DRAFTS => 'i', @@ -95,10 +41,9 @@ class BackendCombinedConfig { SYNC_FOLDER_TYPE_USER_NOTE => 'c', SYNC_FOLDER_TYPE_UNKNOWN => 'i', ), - //creating a new folder in the root folder should create a folder in one backend 'rootcreatefolderbackend' => 'i', ); } } -?> \ No newline at end of file +?> diff --git a/conf/zpush/backend_imap.php b/conf/zpush/backend_imap.php index 4095e1d..252814a 100644 --- a/conf/zpush/backend_imap.php +++ b/conf/zpush/backend_imap.php @@ -3,75 +3,14 @@ * File : config.php * Project : Z-Push * Descr : IMAP backend configuration file -* -* Created : 27.11.2012 -* -* Copyright 2007 - 2013 Zarafa Deutschland GmbH -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU Affero General Public License, version 3, -* as published by the Free Software Foundation with the following additional -* term according to sec. 7: -* -* According to sec. 7 of the GNU Affero General Public License, version 3, -* the terms of the AGPL are supplemented with the following terms: -* -* "Zarafa" is a registered trademark of Zarafa B.V. -* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH -* The licensing of the Program under the AGPL does not imply a trademark license. -* Therefore any rights, title and interest in our trademarks remain entirely with us. -* -* However, if you propagate an unmodified version of the Program you are -* allowed to use the term "Z-Push" to indicate that you distribute the Program. -* Furthermore you may use our trademarks where it is necessary to indicate -* the intended purpose of a product or service provided you use it in accordance -* with honest practices in industrial or commercial matters. -* If you want to propagate modified versions of the Program under the name "Z-Push", -* you may only do so if you have a written permission by Zarafa Deutschland GmbH -* (to acquire a permission please contact Zarafa at trademark@zarafa.com). -* -* This program 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 Affero General Public License for more details. -* -* You should have received a copy of the GNU Affero General Public License -* along with this program. If not, see . -* -* Consult LICENSE file for details ************************************************/ -// ************************ -// BackendIMAP settings -// ************************ - -// Defines the server to which we want to connect define('IMAP_SERVER', 'localhost'); - -// connecting to default port (143) define('IMAP_PORT', 993); - -// best cross-platform compatibility (see http://php.net/imap_open for options) define('IMAP_OPTIONS', '/ssl/norsh/novalidate-cert'); - -// overwrite the "from" header with some value -// options: -// '' - do nothing, use the From header -// 'username' - the username will be set (usefull if your login is equal to your emailaddress) -// 'domain' - the value of the "domain" field is used -// 'sql' - the username will be the result of a sql query. REMEMBER TO INSTALL PHP-PDO AND PHP-DATABASE -// 'ldap' - the username will be the result of a ldap query. REMEMBER TO INSTALL PHP-LDAP!! -// '@mydomain.com' - the username is used and the given string will be appended define('IMAP_DEFAULTFROM', ''); -// DSN: formatted PDO connection string -// mysql:host=xxx;port=xxx;dbname=xxx -// USER: username to DB -// PASSWORD: password to DB -// OPTIONS: array with options needed -// QUERY: query to execute -// FIELDS: columns in the query -// FROM: string that will be the from, replacing the column names with the values +// not used define('IMAP_FROM_SQL_DSN', ''); define('IMAP_FROM_SQL_USER', ''); define('IMAP_FROM_SQL_PASSWORD', ''); @@ -79,15 +18,7 @@ define('IMAP_FROM_SQL_OPTIONS', serialize(array(PDO::ATTR_PERSISTENT => true))); define('IMAP_FROM_SQL_QUERY', "select first_name, last_name, mail_address from users where mail_address = '#username@#domain'"); define('IMAP_FROM_SQL_FIELDS', serialize(array('first_name', 'last_name', 'mail_address'))); define('IMAP_FROM_SQL_FROM', '#first_name #last_name <#mail_address>'); - -// SERVER: ldap server -// SERVER_PORT: ldap port -// USER: dn to use for connecting -// PASSWORD: password -// QUERY: query to execute -// FIELDS: columns in the query -// FROM: string that will be the from, replacing the field names with the values -define('IMAP_FROM_LDAP_SERVER', 'localhost'); +define('IMAP_FROM_LDAP_SERVER', ''); define('IMAP_FROM_LDAP_SERVER_PORT', '389'); define('IMAP_FROM_LDAP_USER', 'cn=zpush,ou=servers,dc=zpush,dc=org'); define('IMAP_FROM_LDAP_PASSWORD', 'password'); @@ -99,47 +30,13 @@ define('IMAP_FROM_LDAP_FROM', '#givenname #sn <#mail>'); // copy outgoing mail to this folder. If not set z-push will try the default folders define('IMAP_SENTFOLDER', ''); - -// forward messages inline (default true - inlined) define('IMAP_INLINE_FORWARD', true); - -// list of folders we want to exclude from sync. Names, or part of it, separated by | -// example: dovecot.sieve|archive|spam define('IMAP_EXCLUDED_FOLDERS', ''); - - -// Method used for sending mail -// mail => mail() php function -// sendmail => sendmail executable -// smtp => direct connection against SMTP define('IMAP_SMTP_METHOD', 'smtp'); global $imap_smtp_params; -// SMTP Parameters -// mail : no params -//$imap_smtp_params = array(); -// sendmail -//$imap_smtp_params = array('sendmail_path' => '/usr/bin/sendmail', 'sendmail_args' => '-i'); -// smtp -// "host" - The server to connect. Default is localhost. -// "port" - The port to connect. Default is 25. -// "auth" - Whether or not to use SMTP authentication. Default is FALSE. -// "username" - The username to use for SMTP authentication. "imap_username" for using the same username as the imap server -// "password" - The password to use for SMTP authentication. "imap_password" for using the same password as the imap server -// "localhost" - The value to give when sending EHLO or HELO. Default is localhost -// "timeout" - The SMTP connection timeout. Default is NULL (no timeout). -// "verp" - Whether to use VERP or not. Default is FALSE. -// "debug" - Whether to enable SMTP debug mode or not. Default is FALSE. -// "persist" - Indicates whether or not the SMTP connection should persist over multiple calls to the send() method. -// "pipelining" - Indicates whether or not the SMTP commands pipelining should be used. -//$imap_smtp_params = array('host' => 'localhost', 'port' => 25, 'auth' => false); -// If you want to use SSL with port 25 or port 465 you must preppend "ssl://" before the hostname or IP of your SMTP server -// IMPORTANT: To use SSL you must use PHP 5.1 or later, install openssl libs and use ssl:// within the host variable $imap_smtp_params = array('host' => 'ssl://localhost', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password'); - -// If you are using IMAP_SMTP_METHOD = mail or sendmail and your sent messages are not correctly displayed you can change this to "\n". -// BUT, it doesn't with RFC 2822 and will break if using smp method define('MAIL_MIMEPART_CRLF', "\r\n"); -?> \ No newline at end of file +?>