stephan: server/horde Makefile, 1.3, 1.4 horde.spec, 1.5, 1.6 horde_registry.php, 1.2, 1.3 mnemo_conf.php, 1.1, 1.2 turba_attributes.php, 1.1, 1.2 turba_sources.php, 1.2, 1.3
cvs at intevation.de
cvs at intevation.de
Fri Aug 22 15:29:57 CEST 2003
- Previous message: jan: doc/raw-howtos migrate_kmail_client_account_to_use_kolab.txt, 1.1, 1.2
- Next message: stephan: server/horde Makefile, 1.4, 1.5 horde.spec, 1.6, 1.7 horde_registry.php, 1.3, 1.4 imp_servers.php, 1.3, 1.4 kronolith_conf.php, 1.1, 1.2 nag_conf.php, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stephan
Update of /kolabrepository/server/horde
In directory doto:/tmp/cvs-serv31288
Modified Files:
Makefile horde.spec horde_registry.php mnemo_conf.php
turba_attributes.php turba_sources.php
Log Message:
Latest and greatest version on the Kolab webclient.
Mnemo (Memos) works with one or two small bugs
Turba (Contacts) should work.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 31 Jul 2003 11:56:05 -0000 1.3
+++ Makefile 22 Aug 2003 13:29:55 -0000 1.4
@@ -11,6 +11,11 @@
cp Makefile horde.spec $(KOLABRPMSRC)/horde/
cp *.php $(KOLABRPMSRC)/horde/
cd $(KOLABRPMSRC)/horde && rpm --fetch horde.spec && rpm -ba horde.spec
+
+dev:
+ test -d $(KOLABRPMSRC)/horde || mkdir $(KOLABRPMSRC)/horde
+ cp Makefile horde.spec $(KOLABRPMSRC)/horde/
+
binary:
rpm -bB horde.spec
Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde.spec 31 Jul 2003 12:12:12 -0000 1.5
+++ horde.spec 22 Aug 2003 13:29:55 -0000 1.6
@@ -27,7 +27,7 @@
%define V_imp 3.2.1
%define V_turba 1.2
#%define V_kronolith 1.1
-#%define V_mnemo 1.1
+%define V_mnemo 1.1
#%define V_nag 1.1
# package information
@@ -51,7 +51,7 @@
Source2: ftp://ftp.horde.org/pub/imp/imp-%{V_imp}.tar.gz
Source3: ftp://ftp.horde.org/pub/turba/turba-%{V_turba}.tar.gz
#Source4: ftp://ftp.horde.org/pub/kronolith/kronolith-%{V_kronolith}.tar.gz
-#Source5: ftp://ftp.horde.org/pub/mnemo/mnemo-%{V_mnemo}.tar.gz
+Source5: ftp://ftp.horde.org/pub/mnemo/mnemo-%{V_mnemo}.tar.gz
#Source6: ftp://ftp.horde.org/pub/nag/nag-%{V_nag}.tar.gz
Source7: horde_horde.php
Source8: horde_html.php
@@ -73,9 +73,11 @@
Source24: kronolith_prefs.php
Source25: mnemo_conf.php
Source26: mnemo_prefs.php
-Source27: nag_conf.php
-Source28: nag_prefs.php
-Source29: nag_html.php
+Source27: mnemo_kolab.php
+Source28: nag_conf.php
+Source29: nag_prefs.php
+Source30: nag_html.php
+Source31: turba_kolab.php
# build information
Prefix: %{l_prefix}
@@ -95,7 +97,7 @@
%setup2 -q -T -D -a 2
%setup3 -q -T -D -a 3
# %setup4 -q -T -D -a 4
-# %setup5 -q -T -D -a 5
+ %setup5 -q -T -D -a 5
# %setup6 -q -T -D -a 6
%build
@@ -117,8 +119,8 @@
cp -r turba/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
# %{l_shtool} move kronolith-%{V_kronolith} kronolith
# cp -r kronolith/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
-# %{l_shtool} move mnemo-%{V_mnemo} mnemo
-# cp -r mnemo/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
+ %{l_shtool} move mnemo-%{V_mnemo} mnemo
+ cp -r mnemo/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
# %{l_shtool} move nag-%{V_nag} nag
# cp -r nag/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
)
@@ -144,13 +146,15 @@
%{l_shtool} install -c -m 755 %{SOURCE turba_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/turba/config/prefs.php
%{l_shtool} install -c -m 755 %{SOURCE turba_sources.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/turba/config/sources.php
%{l_shtool} install -c -m 755 %{SOURCE turba_attributes.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/turba/config/attributes.php
+ %{l_shtool} install -c -m 755 %{SOURCE turba_kolab.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/turba/lib/Driver/kolab.php
# Handle Kronolith configuration files
# %{l_shtool} install -c -m 755 %{SOURCE kronolith_conf.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/config/conf.php
# %{l_shtool} install -c -m 755 %{SOURCE kronolith_html.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/config/html.php
# %{l_shtool} install -c -m 755 %{SOURCE kronolith_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/config/prefs.php
# Handle Mnemo configuration files
-# %{l_shtool} install -c -m 755 %{SOURCE mnemo_conf.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/mnemo/config/conf.php
-# %{l_shtool} install -c -m 755 %{SOURCE mnemo_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/mnemo/config/prefs.php
+ %{l_shtool} install -c -m 755 %{SOURCE mnemo_conf.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/mnemo/config/conf.php
+ %{l_shtool} install -c -m 755 %{SOURCE mnemo_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/mnemo/config/prefs.php
+ %{l_shtool} install -c -m 755 %{SOURCE mnemo_kolab.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/mnemo/lib/Driver/kolab.php
# Handle Nag configuration files
# %{l_shtool} install -c -m 755 %{SOURCE nag_conf.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/nag/config/conf.php
# %{l_shtool} install -c -m 755 %{SOURCE nag_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/nag/config/prefs.php
Index: horde_registry.php
===================================================================
RCS file: /kolabrepository/server/horde/horde_registry.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde_registry.php 31 Jul 2003 06:31:11 -0000 1.2
+++ horde_registry.php 22 Aug 2003 13:29:55 -0000 1.3
@@ -140,7 +140,7 @@
'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
'name' => _("Memos"),
'allow_guests' => false,
- 'status' => 'inactive'
+ 'status' => 'active'
);
$this->applications['nag'] = array(
Index: mnemo_conf.php
===================================================================
RCS file: /kolabrepository/server/horde/mnemo_conf.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mnemo_conf.php 7 Jun 2003 06:53:25 -0000 1.1
+++ mnemo_conf.php 22 Aug 2003 13:29:55 -0000 1.2
@@ -35,13 +35,16 @@
**/
// What storage driver should we use? Valid values are 'sql'.
-$conf['storage']['driver'] = 'sql';
+//$conf['storage']['driver'] = 'sql';
+$conf['storage']['driver'] = 'kolab';
// Any parameters that the storage driver needs. This includes
// database or ldap server, username/password to connect with, etc.
// Below is an example configuration for an sql driver, in this case
// MySQL.
$conf['storage']['params'] = array();
+$conf['storage']['params']['folder'] = 'INBOX/Notes';
+$conf['storage']['params']['server'] = 'localhost';
// $conf['storage']['params']['phptype'] = 'mysql';
// $conf['storage']['params']['hostspec'] = 'localhost';
// $conf['storage']['params']['username'] = 'horde';
Index: turba_attributes.php
===================================================================
RCS file: /kolabrepository/server/horde/turba_attributes.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- turba_attributes.php 7 Jun 2003 06:53:25 -0000 1.1
+++ turba_attributes.php 22 Aug 2003 13:29:55 -0000 1.2
@@ -6,11 +6,8 @@
* types. It may be safely edited by hand. Use attributes.php.dist as
* a reference.
*
- * General configuration is in 'conf.php'.
- * Contact sources are defined in 'sources.php'.
- * Default user preferences are defined in 'prefs.php'.
- *
- * $Horde: turba/config/attributes.php.dist,v 1.9.2.3 2002/06/19 22:36:23 jan Exp $
+ * This has been changed to be used with the Turba Kolab driver.
+ * Adriaan Putter <kougom at yahoo.com>
*/
$attributes['name'] = array(
@@ -37,9 +34,49 @@
'type' => 'multiline',
'desc' => _("Home Address")
);
+$attributes['homeBox'] = array(
+ 'type' => 'text',
+ 'desc' => _("Home Postal Box")
+);
+$attributes['homeLocality'] = array(
+ 'type' => 'text',
+ 'desc' => _("Home Locality")
+);
+$attributes['homeRegion'] = array(
+ 'type' => 'text',
+ 'desc' => _("Home Region")
+);
+$attributes['homePostalCode'] = array(
+ 'type' => 'text',
+ 'desc' => _("Home Postal Code")
+);
+$attributes['homeCountry'] = array(
+ 'type' => 'text',
+ 'desc' => _("Home Country")
+);
$attributes['workAddress'] = array(
'type' => 'multiline',
'desc' => _("Work Address")
+);
+$attributes['workBox'] = array(
+ 'type' => 'text',
+ 'desc' => _("Work Postal Box")
+);
+$attributes['workLocality'] = array(
+ 'type' => 'text',
+ 'desc' => _("Work Locality")
+);
+$attributes['workRegion'] = array(
+ 'type' => 'text',
+ 'desc' => _("Work Region")
+);
+$attributes['workPostalCode'] = array(
+ 'type' => 'text',
+ 'desc' => _("Work Postal Code")
+);
+$attributes['workCountry'] = array(
+ 'type' => 'text',
+ 'desc' => _("Work Country")
);
$attributes['homePhone'] = array(
'type' => 'phone',
Index: turba_sources.php
===================================================================
RCS file: /kolabrepository/server/horde/turba_sources.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- turba_sources.php 31 Jul 2003 06:31:11 -0000 1.2
+++ turba_sources.php 22 Aug 2003 13:29:55 -0000 1.3
@@ -43,77 +43,6 @@
* Here are some example configurations:
*/
-/*
- * Public netcenter and bigfoot addressbooks.
- */
-/*$cfgSources['localhost'] = array(
- 'title' => 'LDAP Addres book',
- 'type' => 'ldap',
- 'params' => array(
- 'server' => 'localhost',
- 'port' => 389,
- 'root' => ''
- ),
- 'map' => array(
- '__key' => 'dn',
- 'name' => 'cn',
- 'email' => 'mail',
- 'alias' => 'givenname'
- ),
- 'search' => array(
- 'name',
- 'email',
- 'alias'
- ),
- 'strict' => array(
- 'dn'
- ),
- 'public' => true,
- 'readonly' => true,
- 'export' => false
-);
-
-$cfgSources['localsql'] = array(
- 'title' => 'My Addressbook',
- 'type' => 'sql',
- 'params' => array(
- 'phptype' => 'mysql',
- 'hostspec' => 'localhost',
- 'username' => 'horde',
- 'password' => '*****',
- 'database' => 'horde',
- 'table' => 'turba_objects'
- ),
- 'map' => array(
- '__key' => 'object_id',
- '__owner' => 'owner_id',
- '__type' => 'object_type',
- '__members' => 'object_members',
- 'name' => 'object_name',
- 'email' => 'object_email',
- 'homeAddress' => 'object_homeaddress',
- 'workAddress' => 'object_workaddress',
- 'homePhone' => 'object_homephone',
- 'workPhone' => 'object_workphone',
- 'cellPhone' => 'object_cellphone',
- 'fax' => 'object_fax',
- 'title' => 'object_title',
- 'company' => 'object_company',
- 'notes' => 'object_notes'
- ),
- 'search' => array(
- 'name',
- 'email'
- ),
- 'strict' => array(
- 'object_id'
- ),
- 'public' => false,
- 'readonly' => false,
- 'admin' => array(),
- 'export' => true
-);
-*/
/**
* A local address book in an LDAP directory. This implements a public
* (shared) address book.
@@ -125,8 +54,6 @@
'server' => 'localhost',
'port' => 389,
'root' => 'LOCALBASEDN',
-// 'bind_dn' => 'cn=admin,ou=users,dc=example,dc=com',
-// 'bind_password' => '********',
'dn' => array('cn'),
'objectclass' => 'inetOrgPerson',
'version' => 3
@@ -158,104 +85,50 @@
);
/**
- * A personal adressbook. 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.
+ * A kolab source
+ * Adriaan Putter <kougom at yahoo.com>
*/
-/*
-// First we need to get the uid.
-//$uid = Auth::getAuth();
-//preg_match('/(^.*)@/', $uid, $uid);
-//$uid = $uid[1];
-$basedn = 'dc=example, dc=com';
-$cfgSources['personal_ldap'] = array(
- 'title' => 'My Addressbook',
- 'type' => 'ldap',
- 'params' => array(
- 'server' => 'localhost',
- 'root' => 'ou=' . $uid . ',ou=personal_addressbook' . $basedn,
- 'bind_dn' => 'uid=' . $uid . ',ou=People,' . $basedn,
- 'bind_password' => Auth::getCredential('password'),
- 'dn' => array('cn', 'uid'),
- 'objectclass' => array('person',
- 'pilotPerson',
- 'organizationalPerson'),
- 'encoding' => 'utf8',
- 'version' => 3
- ),
- 'map' => array(
- '__key' => 'dn',
- 'name' => 'cn',
- 'email' => 'mail',
- 'sirname' => 'sn',
- 'title' => 'title',
- 'company' => 'organizationname',
- 'businesscategory' => 'businesscategory',
- 'companyaddress' => 'postaladdress',
- 'zip' => 'postalcode',
- 'workphone' => 'telephonenumber',
- 'fax' => 'facsimiletelephonenumber',
- 'homeaddress' => 'homepostaladdress',
- 'homephone' => 'homephone',
- 'cellphone' => 'mobile',
- 'notes' => 'description',
- 'pgpPublicKey' => 'object_pgppublickey'
- ),
- 'search' => array(
- 'name',
- 'email',
- 'businesscategory',
- 'title',
- 'homephone',
- 'workphone',
- 'cellphone',
- 'homeaddress'
- ),
- 'strict' => array(
- 'dn'
- ),
- 'public' => true,
- 'readonly' => false,
- 'admin' => array($uid),
- 'export' => true
-);
-/**
- * A preferences-based adressbook. 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 addressbooks by changing
- * the 'name' parameter. This is best for addressbooks 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.
- */
- /*
-$cfgSources['prefs'] = array(
- 'title' => 'Private AddressBook',
- 'type' => 'prefs',
+$cfgSources['kolab'] = array(
+ 'title' => 'Kolab server',
+ 'type' => 'kolab',
'params' => array(
- 'name' => 'prefs'
+ 'folder' => 'INBOX/Contacts',
+ 'server' => 'localhost'
),
'map' => array(
- '__key' => 'id',
- '__type' => '_type',
- '__members' => '_members',
- 'name' => 'name',
- 'email' => 'mail',
- 'alias' => 'alias'
+ '__key' => 'uid',
+ 'name' => 'fn',
+ 'alias' => 'nickname',
+ 'email' => 'email',
+ 'company' => 'org',
+ 'homeAddress' => 'home_street',
+ 'homeBox' => 'home_postalbox',
+ 'homeLocality' => 'home_locality',
+ 'homeRegion' => 'home_region',
+ 'homePostalCode' => 'home_code',
+ 'homeCountry' => 'home_country',
+ 'workAddress' => 'work_street',
+ 'workBox' => 'work_postalbox',
+ 'workLocality' => 'work_locality',
+ 'workRegion' => 'work_region',
+ 'workPostalCode' => 'work_code',
+ 'workCountry' => 'work_country',
+ 'workPhone' => 'work_phone',
+ 'homePhone' => 'home_phone',
+ 'cellPhone' => 'cell_phone',
+ 'fax' => 'fax',
+ 'notes' => 'note'
),
'search' => array(
'name',
- 'email',
- 'alias'
+ 'email'
),
'strict' => array(
- 'id'
+ 'uid'
),
'public' => false,
'readonly' => false,
- 'export' => true);
-
- */
+ 'admin' => array(),
+ 'export' => true
+);
- Previous message: jan: doc/raw-howtos migrate_kmail_client_account_to_use_kolab.txt, 1.1, 1.2
- Next message: stephan: server/horde Makefile, 1.4, 1.5 horde.spec, 1.6, 1.7 horde_registry.php, 1.3, 1.4 imp_servers.php, 1.3, 1.4 kronolith_conf.php, 1.1, 1.2 nag_conf.php, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list