gunnar: server/horde/horde-turba ChangeLog, 1.5, 1.6 conf.php, 1.1, 1.2 horde-turba-kolab.spec, 1.19, 1.20 sources.php, 1.4, 1.5 HK-GW-Changes_after_ALPHA.patch, 1.1, NONE HK-GW-Fix_address_book_deletion_1.patch, 1.1, NONE HK-GW-Fix_notice_on_addressbook_creation.patch, 1.1, NONE attributes.php, 1.1, NONE config-sources.php.dist.patch, 1.1, NONE
cvs at kolab.org
cvs at kolab.org
Thu Nov 29 09:25:55 CET 2007
- Previous message: gunnar: server/horde/horde-kolab-client ChangeLog,1.1,1.2
- Next message: gunnar: server/horde/horde-framework ChangeLog, 1.11, 1.12 horde-framework-kolab.spec, 1.30, 1.31 HK-GW-Fix_annotation_use.patch, 1.1, NONE HK-GW-Fix_contact_XML.patch, 1.1, NONE HK-GW-Fix_the_share_params.patch, 1.1, NONE HK-GW-Kolab_extensions.patch, 1.4, NONE HK-GW-Kolab_issue_2138.patch, 1.1, NONE HK-GW-Kolab_issue_2144.patch, 1.1, NONE HK-GW-Share_caching.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv8296/horde/horde-turba
Modified Files:
ChangeLog conf.php horde-turba-kolab.spec sources.php
Removed Files:
HK-GW-Changes_after_ALPHA.patch
HK-GW-Fix_address_book_deletion_1.patch
HK-GW-Fix_notice_on_addressbook_creation.patch attributes.php
config-sources.php.dist.patch
Log Message:
Horde packages updated to the newest RC1 release.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog 19 Nov 2007 19:31:27 -0000 1.5
+++ ChangeLog 29 Nov 2007 08:25:53 -0000 1.6
@@ -1,3 +1,7 @@
+2007-11-29 Gunnar Wrobel <p at rdus.de>
+
+ * horde-turba-kolab.spec: Update to RC1
+
2007-11-19 Gunnar Wrobel <p at rdus.de>
* horde-turba-kolab.spec:
Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/conf.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- conf.php 25 May 2007 12:07:17 -0000 1.1
+++ conf.php 29 Nov 2007 08:25:53 -0000 1.2
@@ -1,6 +1,6 @@
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-// $Horde: turba/config/conf.xml,v 1.20 2006/05/09 14:22:18 jan Exp $
+// $Horde: turba/config/conf.xml,v 1.21 2007/10/16 16:14:48 mrubinsk Exp $
$conf['menu']['import_export'] = true;
$conf['menu']['apps'] = array();
$conf['client']['addressbook'] = 'kolab_local';
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- horde-turba-kolab.spec 19 Nov 2007 19:56:16 -0000 1.19
+++ horde-turba-kolab.spec 29 Nov 2007 08:25:53 -0000 1.20
@@ -3,9 +3,9 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 11
-%define V_day 19
-%define V_version 2.2_alpha
-%define V_uver 2.2-alpha
+%define V_day 28
+%define V_version 2.2_rc1
+%define V_uver 2.2-rc1
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
@@ -25,14 +25,10 @@
Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
Source1: conf.php
Source2: sources.php
-Source3: attributes.php
-Patch0: HK-GW-Fix_notice_on_addressbook_creation.patch
-Patch1: HK-GW-Fix_address_book_deletion_1.patch
-Patch2: HK-GW-Changes_after_ALPHA.patch
-Patch3: HK-GW-Fix_share_id_change.patch
-Patch4: HK-GW-Fix_editing_contacts.patch
-Patch5: HK-GW-Ldap_read_only_fix.patch
+Patch0: HK-GW-Fix_share_id_change.patch
+Patch1: HK-GW-Fix_editing_contacts.patch
+Patch2: HK-GW-Ldap_read_only_fix.patch
# Build Info
Prefix: %{l_prefix}
@@ -69,9 +65,6 @@
%patch -p2 -P 0
%patch -p2 -P 1
%patch -p2 -P 2
- %patch -p2 -P 3
- %patch -p2 -P 4
- %patch -p2 -P 5
cd ..
%build
@@ -88,12 +81,13 @@
cd ..
- %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} %{S:3} \
+ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php' \
- '%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/sources.php'
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+ '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php \
+ '%config(noreplace)' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php \
+ '%config(noreplace)' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/sources.php
%clean
rm -rf $RPM_BUILD_ROOT
Index: sources.php
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/sources.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sources.php 19 Nov 2007 19:31:27 -0000 1.4
+++ sources.php 29 Nov 2007 08:25:53 -0000 1.5
@@ -1,613 +1,4 @@
<?php
-/**
- * $Horde: turba/config/sources.php.dist,v 1.187 2007/11/16 23:27:50 jan Exp $
- *
- * This file is where you specify the sources of contacts available to users
- * at your installation. It contains a large number of EXAMPLES. Please
- * remove or comment out those examples that YOU DON'T NEED. There are a
- * number of properties that you can set for each server, including:
- *
- * title: This is the common (user-visible) name that you want displayed
- * in the contact source drop-down box.
- *
- * type: The types 'ldap', 'sql', 'imsp', 'group', 'favourites' and
- * 'prefs' are currently supported. Preferences-based address
- * books are not intended for production installs unless you
- * really know what you're doing - they are not searchable, and
- * they won't scale well if a user has a large number of entries.
- *
- * params: These are the connection parameters specific to the contact
- * source. See below for examples of how to set these.
- *
- * Special params settings:
- *
- * charset: The character set that the backend stores data in. Many
- * LDAP servers use utf-8. Database servers typically use
- * iso-8859-1.
- *
- * tls: Only applies to LDAP servers. If true, then try to use a
- * TLS connection to the server.
- *
- * scope: Only applies to LDAP servers. Can be set to 'one' to
- * search one level of the LDAP directory, or 'sub' to search
- * all levels. 'one' will work for most setups and should be
- * much faster. However we default to 'sub' for backwards
- * compatibility.
- *
- * checkrequired: Only applies to LDAP servers. If present, this value causes
- * the driver to consult the LDAP schema for any attributes
- * that are required by the given objectclass(es). Required
- * attributes will be provided automatically if the
- * 'checkrequired_string' parameter is present.
- * *NOTE* You must have the Net_LDAP PEAR library installed
- * for this to work.
- *
- * checksyntax: Only applies to LDAP servers. If present, this value causes
- * the driver to inspect the LDAP schema for particular
- * attributes by the type defined in the corresponding schema
- * *NOTE* You must have the Net_LDAP PEAR library installed
- * for this to work.
- *
- * deref: Only applies to LDAP servers. If set, should be one of:
- * LDAP_DEREF_NEVER
- * LDAP_DEREF_SEARCHING
- * LDAP_DEREF_FINDING
- * LDAP_DEREF_ALWAYS
- * This tells the LDAP server when to dereference
- * aliases. See http://www.php.net/ldap for more
- * information.
- *
- * dn: Only applies to LDAP servers. Defines the list of LDAP
- * attributes that build a valid DN.
- *
- * objectclass: Only applies to LDAP servers. Defines a list of
- * objectclasses that contacts must belong to, and
- * that new objects will be created with.
- *
- * filter: Filter helps to filter your result based on certain
- * condition in SQL and LDAP backends. A filter can be
- * specified to avoid some unwanted data. For example, if the
- * source is an external sql database, to select records with
- * the delete flag = 0:
- * 'filter' = 'deleted=0'
- *
- * map: This is a list of mappings from the Turba attribute
- * names (on the left) to the attribute names by which
- * they are known in this contact source (on the
- * right). Turba also supports composite fields. A
- * composite field is defined by mapping the field name
- * to an array containing a list of component fields and
- * a format string (similar to a printf() format string;
- * however, note that positioned parameters like %1$s
- * will NOT work). 'attribute' defines where the composed
- * value is saved, and can be left out. Here is an
- * example:
- * ...
- * 'name' => array('fields' => array('firstname', 'lastname'),
- * 'format' => '%s %s',
- * 'attribute' => 'object_name'),
- * 'firstname' => 'object_firstname',
- * 'lastname' => 'object_lastname',
- * ...
- *
- * Standard Turba attributes are:
- * __key : A backend-specific ID for the entry (any value
- * as long as it is unique inside that source;
- * required)
- * __uid : Globally unique ID of the entry (used for
- * synchronizing and must be able to be set to any
- * value)
- * __owner : User name of the contact's owner
- * __type : Either 'Object' or 'Group'
- * __members : Serialized PHP array with list of Group members.
- * More Turba attributes are defined in config/attributes.php.
- *
- * tabs: All fields can be grouped into tabs with this optional entry.
- * This list is multidimensional hash, the keys are the tab
- * titles.
- * Here is an example:
- * 'tabs' => array(
- * 'Names' => array('firstname', 'lastname', 'alias'),
- * 'Addresses' => array('homeAddress', 'workAddress')
- * );
- *
- * search: A list of Turba attribute names that can be searched for this
- * source.
- *
- * strict: A list of native field/attribute names that must
- * always be matched exactly in a search.
- *
- * approximate: Only applies to LDAP servers. If set, should be an
- * array of native field/attribute names to search
- * "approximately" (for example, "Sánchez", "Sanchez",
- * and "Sanchéz" will all match a search string of
- * "sanchez").
- *
- * export: If set to true, this source will appear on the Export menu,
- * allowing users to export the contacts to a CSV (etc.) file.
- *
- * browse: If set to true, this source will be browseable via the Browse
- * menu item, and empty searches against the source will return
- * all contacts.
- *
- * use_shares: If this is present and true, Horde_Share functionality will
- * be enabled for this source - allowing users to share their
- * personal address books as well as to create new ones. Since
- * Turba only supports having one backend configured for
- * creating new shares, use the 'shares' configuration option to
- * specify which backend will be used for creating new shares.
- * All permission checking will be done against Horde_Share, but
- * note that any 'extended' permissions (such as max_contacts)
- * will still be enforced. Also note that the backend driver
- * must have support for using this. Currently SQL and IMSP.
- *
- * list_name_field: If this is present and non-empty, it will be taken as the
- * name of the turba field to store contact list names in.
- * This is required when using a composite field as the 'name'
- * field.
- * Here are some example configurations:
- */
-
-/**
- * A local address book in an LDAP directory. This implements a public
- * (shared) address book.
- *
- * To store distribution lists in the LDAP directory, you'll need to include
- * horde/scripts/ldap/horde.schema in your LDAP configuration.
- *
- * To store freebusy information in the LDAP directory, you'll need to include
- * turba/scripts/ldap/rfc2739.schema in your LDAP configuration.
- */
-// $cfgSources['localldap'] = array(
-// 'title' => _("Shared Directory"),
-// 'type' => 'ldap',
-// 'params' => array(
-// 'server' => 'ldap.example.com',
-// 'port' => 389,
-// 'tls' => false,
-// 'root' => 'dc=example,dc=com',
-// 'bind_dn' => 'cn=admin,ou=users,dc=example,dc=com',
-// 'bind_password' => '********',
-// 'sizelimit' => 200,
-// 'dn' => array('cn'),
-// 'objectclass' => array('top',
-// 'person',
-// 'organizationalPerson',
-// 'inetOrgPerson'),
-// 'scope' => 'one',
-// 'charset' => 'iso-8859-1',
-// // Consult the LDAP schema to verify that all required attributes for
-// // an entry are set and add them if needed.
-// 'checkrequired' => false,
-// // Value used to fill in missing required attributes.
-// 'checkrequired_string' => ' ',
-// // Check LDAP schema for valid syntax. If this is false an address
-// // field is assumed to have postalAddress syntax; otherwise the schema
-// // is consulted for the syntax to use.
-// 'checksyntax' => false,
-// 'version' => 3
-// ),
-// 'map' => array(
-// '__key' => 'dn',
-// '__uid' => 'uid',
-//
-// // From horde.schema:
-// // '__type' => 'turbaType',
-// // '__members' => 'turbaMembers'
-//
-// 'name' => 'cn',
-// 'email' => 'mail',
-// 'homePhone' => 'homephone',
-// 'workPhone' => 'telephonenumber',
-// 'cellPhone' => 'mobiletelephonenumber',
-// 'homeAddress' => 'homepostaladdress',
-//
-// // From rfc2739.schema:
-// // 'freebusyUrl' => 'calFBURL',
-// ),
-// 'search' => array(
-// 'name',
-// 'email',
-// 'homePhone',
-// 'workPhone',
-// 'cellPhone',
-// 'homeAddress'
-// ),
-// 'strict' => array(
-// 'dn',
-// ),
-// 'approximate' => array(
-// 'cn',
-// ),
-// 'export' => true,
-// 'browse' => true,
-// );
-
-/**
- * A personal LDAP address book. This assumes that the login is
- * <username>@domain.com and that the users are stored on the same LDAP
- * server. Thus it is possible to bind with the username and password from the
- * user. For more info; please refer to the docs/LDAP file in the Turba
- * distribution.
- *
- * To store distribution lists in the LDAP directory, you'll need to include
- * horde/scripts/ldap/horde.schema in your LDAP configuration.
- *
- * To store freebusy information in the LDAP directory, you'll need to include
- * turba/scripts/ldap/rfc2739.schema in your LDAP configuration.
- */
-/* First we need to get the uid. */
-// $_ldap_uid = Auth::getBareAuth();
-// $_ldap_basedn = 'dc=example,dc=com';
-// $cfgSources['personal_ldap'] = array(
-// 'title' => _("My Address Book"),
-// 'type' => 'ldap',
-// 'params' => array(
-// 'server' => 'localhost',
-// 'tls' => false,
-// 'root' => 'ou=' . $_ldap_uid . ',ou=personal_addressbook,' . $_ldap_basedn,
-// 'bind_dn' => 'uid=' . $_ldap_uid . ',ou=People,' . $_ldap_basedn,
-// 'bind_password' => Auth::getCredential('password'),
-// 'dn' => array('cn', 'uid'),
-// 'objectclass' => array('top',
-// 'person',
-// // 'turbaContact',
-// 'inetOrgPerson',
-// // 'calEntry',
-// 'organizationalPerson'),
-// 'scope' => 'one',
-// 'charset' => 'utf-8',
-// 'version' => 3
-// ),
-// 'map' => array(
-// '__key' => 'dn',
-// '__uid' => 'uid',
-//
-// // From horde.schema:
-// // '__type' => 'turbaType',
-// // '__members' => 'turbaMembers'
-//
-// 'name' => 'cn',
-// 'email' => 'mail',
-// 'lastname' => 'sn',
-// 'title' => 'title',
-// 'company' => 'organizationname',
-// 'businessCategory' => 'businesscategory',
-// 'workAddress' => 'postaladdress',
-// 'workPostalCode' => 'postalcode',
-// 'workPhone' => 'telephonenumber',
-// 'fax' => 'facsimiletelephonenumber',
-// 'homeAddress' => 'homepostaladdress',
-// 'homePhone' => 'homephone',
-// 'cellPhone' => 'mobile',
-// 'notes' => 'description',
-//
-// // Evolution interopt attributes: (those that do not require the
-// // evolution.schema)
-// 'office' => 'roomNumber',
-// 'department' => 'ou',
-// 'nickname' => 'displayName',
-// 'website' => 'labeledURI',
-//
-// // These are not stored on the LDAP server.
-// 'pgpPublicKey' => 'object_pgppublickey',
-// 'smimePublicKey' => 'object_smimepublickey',
-//
-// // From rfc2739.schema:
-// // 'freebusyUrl' => 'calFBURL',
-// ),
-// 'search' => array(
-// 'name',
-// 'email',
-// 'businessCategory',
-// 'title',
-// 'homePhone',
-// 'workPhone',
-// 'cellPhone',
-// 'homeAddress'
-// ),
-// 'strict' => array(
-// 'dn',
-// ),
-// 'approximate' => array(
-// 'cn',
-// ),
-// 'export' => true,
-// 'browse' => true,
-// );
-
-/**
- * Public netcenter and verisign LDAP directories.
- */
-// $cfgSources['netcenter'] = array(
-// 'title' => _("Netcenter Member Directory"),
-// 'type' => 'ldap',
-// 'params' => array(
-// 'server' => 'memberdir.netscape.com',
-// 'port' => 389,
-// 'tls' => false,
-// 'root' => 'ou=member_directory,o=netcenter.com',
-// 'dn' => array('cn'),
-// 'objectclass' => 'person',
-// 'filter' => '',
-// 'scope' => 'sub',
-// 'charset' => 'iso-8859-1'
-// ),
-// 'map' => array(
-// '__key' => 'dn',
-// 'name' => 'cn',
-// 'email' => 'mail',
-// 'alias' => 'givenname'
-// ),
-// 'search' => array(
-// 'name',
-// 'email',
-// 'alias'
-// ),
-// 'strict' => array(
-// 'dn'
-// ),
-// 'approximate' => array(
-// 'cn',
-// ),
-// 'export' => false,
-// 'browse' => false,
-// );
-//
-// $cfgSources['verisign'] = array(
-// 'title' => _("Verisign Directory"),
-// 'type' => 'ldap',
-// 'params' => array(
-// 'server' => 'directory.verisign.com',
-// 'port' => 389,
-// 'tls' => false,
-// 'root' => '',
-// 'scope' => 'sub',
-// 'charset' => 'iso-8859-1'
-// ),
-// 'map' => array(
-// '__key' => 'dn',
-// 'name' => 'cn',
-// 'email' => 'mail'
-// ),
-// 'search' => array(
-// 'name',
-// 'email'
-// ),
-// 'strict' => array(
-// 'dn'
-// ),
-// 'approximate' => array(
-// 'cn',
-// ),
-// 'export' => false,
-// 'browse' => false,
-// );
-
-/**
- * A preferences-based address book. This will always be private. You can add
- * any attributes you like to the map and it will just work; you can also
- * create multiple prefs-based address books by changing the 'name' parameter.
- * This is best for address books that are expected to remain small; it's not
- * the most efficient, but it can't be beat for getting up and running
- * quickly, especially if you already have Horde preferences working. Note
- * that it is not searchable, though - searches will simply return the whole
- * address book.
- */
-// $cfgSources['prefs'] = array(
-// 'title' => _("Private Address Book"),
-// 'type' => 'prefs',
-// 'params' => array(
-// 'name' => 'prefs',
-// 'charset' => NLS::getCharset()
-// ),
-// 'map' => array(
-// '__key' => 'id',
-// '__type' => '_type',
-// '__members' => '_members',
-// '__uid' => 'uid',
-// 'name' => 'name',
-// 'email' => 'mail',
-// 'alias' => 'alias'
-// ),
-// 'search' => array(
-// 'name',
-// 'email',
-// 'alias'
-// ),
-// 'strict' => array(
-// 'id',
-// '_type',
-// ),
-// 'export' => true,
-// 'browse' => true,
-// );
-
-/**
- * This source creates an address book for each group the current user is a
- * member in. The address book will always be read only, and the group members
- * must have an email address entered in their default identity. No email
- * address will result in that member not being included in the address book.
- */
-//$grpSource = array(
-// 'title' => _("Group"),
-// 'type' => 'group',
-// 'params' => array(
-// 'name' => ''
-// ),
-// 'map' => array(
-// '__key' => 'email',
-// 'name' => 'name',
-// 'email' => 'email'
-// ),
-// 'search' => array(
-// 'name',
-// 'email'
-// ),
-// 'export' => true,
-// 'browse' => true,
-//);
-
-//require_once 'Horde/Group.php';
-//$_group_driver = &Group::singleton();
-//$_group_list = $_group_driver->getGroupMemberships(Auth::getAuth());
-//foreach ($_group_list as $_group_id => $_group_name) {
-// $cfgSources['group_' . $_group_id] = $grpSource;
-// $cfgSources['group_' . $_group_id]['params'] = array('gid' => $_group_id);
-// $cfgSources['group_' . $_group_id]['title'] = $_group_name;
-//}
-
-/**
- * IMSP based address book.
- *
- * Communicates with an IMSP backend server.
- *
- * Notes:
- * You should configure the user's "main" address book here. The name of the
- * address book is set in the 'name' element of the params array. It should
- * be configured to be the same as the IMSP server username. Any other
- * address books the user has access to will automatically be configured at
- * runtime.
- *
- * In the params array, accepted values for auth_method are 'cram_md5',
- * 'imtest', and 'plaintext' - these must match a IMSP_Auth_ driver. If you
- * are using the imtest driver for Cyrus, please read the
- * framework/Net_IMSP/Auth/imtest.php file for more configuration information.
- *
- * Groups in other IMSP-aware applications are just entries with multiple
- * email addresses in the email field and a 'group' field set to flag the
- * entry as a group. (The Cyrusoft applications, Mulberry and Silkymail both
- * use a field named 'group' set to equal 'group' to signify this). A
- * Turba_Object_Group is basically a List of existing Turba_Objects. The IMSP
- * driver will map between these two structures when reading and writing
- * groups.
- * The only caveat is that IMSP groups that contain email addresses which do
- * not have a cooresponding contact entry will be ignored. The group_id_field
- * should be set to the IMSP field that flags the entry as a 'group' entry and
- * the group_id_value should be set to the value given to that field.
- *
- * By default, the username and password that were used to login to Horde is
- * used to login to the IMSP server. If these credentials are different,
- * there is a user preference in Horde to allow another username / password to
- * be entered. The alternate credentials are always used if present.
- *
- * In the map array, since IMSP uses the 'name' attribute as a key, this is
- * what __key is mapped to ... and a dynamic field 'fullname' is added and
- * mapped to the horde 'name' field. This is populated with the IMSP 'name'
- * field when the object is read from the server.
- *
- * If you wish to keep track of ownership of individual contacts, set
- * 'contact_ownership' = true. Note that entries created using other clients
- * will not be created this way and will therefore have no 'owner'. Set
- * 'contact_ownership' = false and the __owner field will be automatically
- * populated with the current username.
- *
- * To integrate with Horde_Share (requires Horde 3.2 or better) set use_shares
- * to true, and uncomment the IMSP Horde_Share hooks in horde/config/hooks.php.
- */
-// Check that IMSP is configured in Horde but fall through if there is no
-// configuration at all - in case we don't have at least a 3.0.6 Horde
-// install. (In that case, be sure to change the params array below to suit
-// your needs.
-if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
- !isset($GLOBALS['conf']['imsp']['enabled'])) {
- // First, get the user name to login to IMSP server with.
- $_imsp_auth_user = $GLOBALS['prefs']->getValue('imsp_auth_user');
- $_imsp_auth_pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
- if (!strlen($_imsp_auth_user)) {
- $_imsp_auth_user = Auth::getBareAuth();
- $_imsp_auth_pass = Auth::getCredential('password');
- }
- $cfgSources['imsp'] = array(
- 'title' => _("IMSP"),
- 'type' => 'imsp',
- 'params' => array(
- 'server' => $GLOBALS['conf']['imsp']['server'],
- 'port' => $GLOBALS['conf']['imsp']['port'],
- 'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
- // socket, command, and auth_mechanism are for imtest driver.
- 'socket' => isset($GLOBALS['conf']['imsp']['socket']) ?
- $GLOBALS['conf']['imsp']['socket'] . $_imsp_auth_user . '.sck' :
- '',
- 'command' => isset($GLOBALS['conf']['imsp']['command']) ?
- $GLOBALS['conf']['imsp']['command'] : '' ,
- 'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
- $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
- 'username' => $_imsp_auth_user,
- 'password' => $_imsp_auth_pass,
- 'name' => $_imsp_auth_user,
- 'group_id_field' => 'group',
- 'group_id_value' => 'group',
- 'contact_ownership' => false,
- // Dynamically generated acl rights for current user.
- 'my_rights' => '',
- ),
- 'map' => array(
- '__key' => 'name',
- '__type' => '__type',
- '__members' => '__members',
- '__owner' => '__owner',
- '__uid' => '__uid',
- 'email' => 'email',
- 'alias' => 'alias',
- 'company' => 'company',
- 'notes' => 'notes',
- 'workPhone' => 'phone-work',
- 'fax' => 'fax',
- 'homePhone' => 'phone-home',
- 'cellPhone' => 'cellphone',
- 'freebusyUrl' => 'freebusyUrl'
- ),
- 'search' => array(
- 'name',
- 'email',
- 'alias',
- 'company',
- 'homePhone'
- ),
- 'strict' => array(),
- 'export' => true,
- 'browse' => true,
- 'use_shares' => false,
- );
-
- /**
- * Get any other address books this user might be privy to.
- * The values for attributes such as 'export' and 'browse' for books
- * that are added below will be the same as the values set in the default
- * book above. Any entries defined explicitly in cfgSources[]
- * will override any entries gathered dynamically below.
- */
- if (empty($cfgSources['imsp']['use_shares'])) {
- require_once 'Net/IMSP/Utils.php';
- $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
-
- if (!is_a($result, 'PEAR_Error')) {
- $resultCount = count($result);
- for ($i = 0; $i < $resultCount; $i++) {
- // Make sure we didn't define this source explicitly,
- // but set the acls from the server regardless.
- $dup = false;
- foreach ($cfgSources as $key => $thisSource) {
- if (($thisSource['type'] == 'imsp') &&
- ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
-
- $dup = true;
- $acl = $result[$i]['params']['my_rights'];
- $cfgSources[$key]['params']['my_rights'] = $acl;
- break;
- }
- }
- if (!$dup) {
- $cfgSources[$result[$i]['params']['name']] = $result[$i];
- }
- }
- } else {
- $notification->push($result);
- }
- }
-}
-/* End IMSP sources. */
/* Begin Kolab sources. */
if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
@@ -644,7 +35,8 @@
'version' => 3,
'bind_dn' => '',
'bind_password' => '',
- ),
+ 'read_only' => true,
+ ),
'map' => array(
'__key' => 'dn',
'name' => 'cn',
@@ -695,6 +87,10 @@
/**
* The local address books for a Kolab user. These are stored in specially
* flagged contact folder within the users Cyrus IMAP mailbox.
+ *
+ * Still missing attributes are:
+ *
+ * picture, sensitivity
*/
$cfgSources['kolab'] = array(
@@ -716,7 +112,7 @@
'namePrefix' => 'prefix',
'nameSuffix' => 'suffix',
'initials' => 'initials',
- 'alias' => 'nick-name',
+ 'nickname' => 'nick-name',
'gender' => 'gender',
'birthday' => 'birthday',
'spouse' => 'spouse-name',
@@ -756,11 +152,10 @@
'language' => 'language',
'latitude' => 'latitude',
'longitude' => 'longitude',
- // MISSING: picture, sensitivity
),
'tabs' => array(
_("Personal") => array('name', 'firstname', 'lastname', 'middlenames',
- 'namePrefix', 'nameSuffix', 'initials', 'alias',
+ 'namePrefix', 'nameSuffix', 'initials', 'nickname',
'gender', 'birthday', 'spouse', 'anniversary',
'children'),
_("Location") => array('homeStreet', 'homeCity', 'homeProvince',
@@ -782,7 +177,7 @@
'namePrefix',
'nameSuffix',
'initials',
- 'alias',
+ 'nickname',
'gender',
'birthday',
'spouse',
--- HK-GW-Changes_after_ALPHA.patch DELETED ---
--- HK-GW-Fix_address_book_deletion_1.patch DELETED ---
--- HK-GW-Fix_notice_on_addressbook_creation.patch DELETED ---
--- attributes.php DELETED ---
--- config-sources.php.dist.patch DELETED ---
- Previous message: gunnar: server/horde/horde-kolab-client ChangeLog,1.1,1.2
- Next message: gunnar: server/horde/horde-framework ChangeLog, 1.11, 1.12 horde-framework-kolab.spec, 1.30, 1.31 HK-GW-Fix_annotation_use.patch, 1.1, NONE HK-GW-Fix_contact_XML.patch, 1.1, NONE HK-GW-Fix_the_share_params.patch, 1.1, NONE HK-GW-Kolab_extensions.patch, 1.4, NONE HK-GW-Kolab_issue_2138.patch, 1.1, NONE HK-GW-Kolab_issue_2144.patch, 1.1, NONE HK-GW-Share_caching.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list