Merge pull request #6 from yalh76/ldap_gal

Ldap gal

conf/backend/config-searchldap.php

@@ -0,0 +1,56 @@
+<?php
+/***********************************************
+* File      :   searchldap/config.php
+* Project   :   Z-Push
+* Descr     :   configuration file for the
+*               BackendSearchLDAP backend.
+*
+* Created   :   03.08.2010
+*
+* Copyright 2007 - 2016 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.
+*
+* 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 <http://www.gnu.org/licenses/>.
+*
+* Consult LICENSE file for details
+************************************************/
+
+// LDAP host and port
+define("LDAP_HOST", "ldap://127.0.0.1/");
+define("LDAP_PORT", "389");
+
+// Set USER and PASSWORD if not using anonymous bind
+define("ANONYMOUS_BIND", true);
+define("LDAP_BIND_USER", "cn=searchuser,dc=test,dc=net");
+define("LDAP_BIND_PASSWORD", "");
+
+// Search base & filter
+// the SEARCHVALUE string is substituded by the value inserted into the search field
+define("LDAP_SEARCH_BASE", "ou=users,dc=yunohost,dc=org");
+define("LDAP_SEARCH_FILTER", "(|(cn=*SEARCHVALUE*)(mail=*SEARCHVALUE*))");
+
+// LDAP field mapping.
+// values correspond to an inetOrgPerson class
+global $ldap_field_map;
+$ldap_field_map = array(
+                    SYNC_GAL_DISPLAYNAME    => 'cn',
+                    SYNC_GAL_PHONE          => 'telephonenumber',
+                    SYNC_GAL_OFFICE         => '',
+                    SYNC_GAL_TITLE          => 'title',
+                    SYNC_GAL_COMPANY        => 'ou',
+                    SYNC_GAL_ALIAS          => 'uid',
+                    SYNC_GAL_FIRSTNAME      => 'givenname',
+                    SYNC_GAL_LASTNAME       => 'sn',
+                    SYNC_GAL_HOMEPHONE      => 'homephone',
+                    SYNC_GAL_MOBILEPHONE    => 'mobile',
+                    SYNC_GAL_EMAILADDRESS   => 'mail',
+                );

conf/config.php

@@ -276,7 +276,7 @@
  *  If set, the Search Provider will always be preferred.
  *  Use 'BackendSearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
  */
-    define('SEARCH_PROVIDER', '');
+    define('SEARCH_PROVIDER', 'BackendSearchLDAP');
     // Time in seconds for the server search. Setting it too high might result in timeout.
     // Setting it too low might not return all results. Default is 10.
     define('SEARCH_WAIT', 10);

scripts/install

@@ -189,6 +189,7 @@ fi
 # Copy config
 cp ../conf/config.php $final_path/config.php
 cp ../conf/backend/config-autodiscover.php $final_path/autodiscover/config.php
+cp ../conf/backend/config-searchldap.php $final_path/backend/searchldap/config.php
 
 #Copy XMLElement.php
 ln -s /usr/share/awl/inc/XML* /var/www/$app/include/

scripts/upgrade

@@ -141,42 +141,76 @@ ynh_replace_string __STATEDIR__ $statedir ../conf/config.php
 # Enable caldav carddav support
 if yunohost app list --installed -f baikal | grep -q id ; then
 	echo "Detected Baikal"
-	caldavdomain=$(ynh_app_setting_get baikal domain)
+	bailkaldomain=$(ynh_app_setting_get baikal domain)
-	caldavpath=$(ynh_app_setting_get baikal path)
+	bailkalpath=$(ynh_app_setting_get baikal path)
-	caldavpath=${caldavpath%/}
+	bailkalpath=${bailkalpath%/}
 
 	# Configuration of backend
 	ynh_replace_string __BACKEND__ BackendCombined ../conf/config.php
 	ynh_replace_string __BACKEND__ BackendCombined ../conf/backend/config-autodiscover.php
 
 	# Configuration baikal
-	ynh_replace_string __BAIKALDOMAIN__ $caldavdomain ../conf/backend/config-caldav.php
+	ynh_replace_string __CALDAV_SERVER__ "${bailkaldomain}" ../conf/backend/config-caldav.php
-	ynh_replace_string __BAIKALDOMAIN__ $caldavdomain ../conf/backend/config-carddav.php
+	ynh_replace_string __CALDAV_PATH__ "${bailkalpath}/cal.php/calendars/%u/" ../conf/backend/config-caldav.php
-	ynh_replace_string __BAIKALPATH__ $caldavpath ../conf/backend/config-caldav.php
+	ynh_replace_string __CALDAV_PERSONAL__ "default" ../conf/backend/config-caldav.php
-	ynh_replace_string __BAIKALPATH__ $caldavpath ../conf/backend/config-carddav.php
+
-	ynh_replace_string __DOMAINTOCHANGE__ $domain ../conf/backend/config-imap.php
+	ynh_replace_string __CARDDAV_SERVER__ "${bailkaldomain}" ../conf/backend/config-carddav.php
+	ynh_replace_string __CARDDAV_PATH__ "${bailkalpath}/card.php/addressbooks/%u/" ../conf/backend/config-carddav.php
+	ynh_replace_string __CARDDAV_DEFAULT_PATH__ "${bailkalpath}/card.php/addressbooks/%u/default" ../conf/backend/config-carddav.php
+
+	ynh_replace_string __IMAP_SERVER__ "${domain}" ../conf/backend/config-imap.php
 	ynh_replace_string __FLAGTOCHANGE__ true ../conf/backend/config-imap.php
 
 	# Copy config
-	cp ../conf/config.php $final_path/config.php
-	cp ../conf/backend/config-imap.php $final_path/backend/imap/config.php
-	cp ../conf/backend/config-carddav.php $final_path/backend/carddav/config.php
 	cp ../conf/backend/config-caldav.php $final_path/backend/caldav/config.php
+	cp ../conf/backend/config-carddav.php $final_path/backend/carddav/config.php
+	cp ../conf/backend/config-imap.php $final_path/backend/imap/config.php
+	cp ../conf/backend/config-combined.php $final_path/backend/combined/config.php
+
+elif yunohost app list --installed -f nextcloud | grep -q id ; then
+	echo "Detected NextCloud"
+	nextclouddomain=$(ynh_app_setting_get nextcloud domain)
+	nextcloudpath=$(ynh_app_setting_get nextcloud path)
+	nextcloudpath=${nextcloudpath%/}
+
+	# Configuration of backend
+	ynh_replace_string __BACKEND__ BackendCombined ../conf/config.php
+	ynh_replace_string __BACKEND__ BackendCombined ../conf/backend/config-autodiscover.php
+
+	# Configuration nextcloud
+	ynh_replace_string __CALDAV_SERVER__ "${nextclouddomain}" ../conf/backend/config-caldav.php
+	ynh_replace_string __CALDAV_PATH__ "${nextcloudpath}/remote.php/dav/calendars/%u/" ../conf/backend/config-caldav.php
+	ynh_replace_string __CALDAV_PERSONAL__ "personal" ../conf/backend/config-caldav.php
+
+	ynh_replace_string __CARDDAV_SERVER__ "${nextclouddomain}" ../conf/backend/config-carddav.php
+	ynh_replace_string __CARDDAV_PATH__ "${nextcloudpath}/remote.php/dav/addressbooks/users/%u/contacts/" ../conf/backend/config-carddav.php
+	ynh_replace_string __CARDDAV_DEFAULT_PATH__ "${nextcloudpath}/remote.php/dav/addressbooks/users/%u/contacts/" ../conf/backend/config-carddav.php
+
+	ynh_replace_string __IMAP_SERVER__ "${domain}" ../conf/backend/config-imap.php
+	ynh_replace_string __FLAGTOCHANGE__ true ../conf/backend/config-imap.php
+
+	# Copy config
+	cp ../conf/backend/config-caldav.php $final_path/backend/caldav/config.php
+	cp ../conf/backend/config-carddav.php $final_path/backend/carddav/config.php
+	cp ../conf/backend/config-imap.php $final_path/backend/imap/config.php
 	cp ../conf/backend/config-combined.php $final_path/backend/combined/config.php
-	cp ../conf/backend/config-autodiscover.php $final_path/autodiscover/config.php
 else
 	# Configuration of backend
 	ynh_replace_string __BACKEND__ BackendIMAP ../conf/config.php
 	ynh_replace_string __BACKEND__ BackendIMAP ../conf/backend/config-autodiscover.php
 
-	# Copy config
+	# Configuration imap
-	cp ../conf/config.php $final_path/config.php
+	ynh_replace_string __IMAP_SERVER__ "${domain}" ../conf/backend/config-imap.php
-	ynh_replace_string __DOMAINTOCHANGE__ $domain ../conf/backend/config-imap.php
 	ynh_replace_string __FLAGTOCHANGE__ false ../conf/backend/config-imap.php
-	cp ../conf/backend/config-imap.php $final_path/backend/imap/config.php
+
-	cp ../conf/backend/config-autodiscover.php $final_path/autodiscover/config.php
+	# Copy config
+	cp ../conf/backend/config-imap.php $final_path/backend/imap/config.php	
 fi
 
+# Copy config
+cp ../conf/config.php $final_path/config.php
+cp ../conf/backend/config-autodiscover.php $final_path/autodiscover/config.php
+
 # Fixstates to avoid full resync of devices after version upgrades
 $final_path/z-push-admin.php -a fixstates