[Kolab-devel] server/horde Makefile,1.1,1.2 horde.spec,1.2,1.3 horde_horde.php,1.1,1.2 horde_registry.php,1.1,1.2 imp_conf.php,1.1,1.2 imp_servers.php,1.1,1.2 turba_sources.php,1.1,1.2 by stephan at doto.intevation.de

root at intevation.de root at intevation.de
Thu Jul 31 08:31:13 CEST 2003


Update of /kolabrepository/server/horde
In directory doto:/tmp/cvs-serv24552

Modified Files:
	Makefile horde.spec horde_horde.php horde_registry.php 
	imp_conf.php imp_servers.php turba_sources.php 
Log Message:
Webmail only Horde. Should be _almos_ working for Address book and mail
functionality. Need to update Makefile to take care of LOCALBASEDN value
in turba_sources.php file.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	7 Jun 2003 06:53:25 -0000	1.1
+++ Makefile	31 Jul 2003 06:31:11 -0000	1.2
@@ -5,7 +5,7 @@
 all:
        #test -d $(KOLABRPMSRC)/kolab && mkdir $(KOLABRPMSRC)/kolab
 	test -d $(KOLABRPMSRC)/horde || mkdir $(KOLABRPMSRC)/horde
-	#cp Makefile horde-2.2.3.tar.gz pear-1.0.1.1.tar.gz imp-3.2.1.tar.gz \
+	cp Makefile horde-2.2.3.tar.gz pear-1.0.1.1.tar.gz imp-3.2.1.tar.gz \
 	turba-1.2.tar.gz kronolith-1.1.tar.gz mnemo-1.1.tar.gz nag-1.1.tar.gz \
 	horde.spec $(KOLABRPMSRC)/horde/
 	cp Makefile horde.spec $(KOLABRPMSRC)/horde/

Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde.spec	17 Jun 2003 18:18:47 -0000	1.2
+++ horde.spec	31 Jul 2003 06:31:11 -0000	1.3
@@ -23,7 +23,7 @@
 
 #   package versions
 %define       V_horde         2.2.3
-%define       V_pear          1.1
+%define       V_pear          1.0.1.1
 %define       V_imp           3.2.1
 %define       V_turba         1.2
 %define       V_kronolith     1.1

Index: horde_horde.php
===================================================================
RCS file: /kolabrepository/server/horde/horde_horde.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde_horde.php	7 Jun 2003 06:53:25 -0000	1.1
+++ horde_horde.php	31 Jul 2003 06:31:11 -0000	1.2
@@ -73,7 +73,7 @@
 // What umask should we run with? This will affect the permissions on
 // any temporary files that are created. This value is an integer
 // (specify it WITHOUT quotes).
-$conf['umask'] = 077;
+$conf['umask'] = 022;
 
 // If you want to use a temporary directory other than the system
 // default or the one specified in php's upload_tmp_dir value, enter
@@ -134,7 +134,7 @@
 // and for sql it would be the table name to use. For the 'syslog'
 // driver it is the facility as a _constant_ (with no quotes), e.g.:
 // ... = LOG_LOCAL0;
-$conf['log']['name'] = '/tmp/horde.log';
+$conf['log']['name'] = '/kolab/var/apache/log/horde.log';
 
 // What level of messages should we log? The values are LOG_EMERG,
 // LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
@@ -215,16 +215,16 @@
 
 // What method should we use for sending mail? Valid options are
 // currently 'sendmail' and 'smtp'.
-$conf['mailer']['type'] = 'sendmail';
+$conf['mailer']['type'] = 'smtp';
 
 // An array holding any parameters that the Mail object will need to
 // function correctly. For sendmail, this is mainly the sendmail_path
 // option; SMTP requires at least a server and a port (if nonstandard).
 // SMTP authentication can be enabled by setting the 'auth' parameter
 // to true.
-$conf['mailer']['params'] = array();
+// $conf['mailer']['params'] = array();
 // $conf['mailer']['params'] = array('sendmail_path' => '/usr/lib/sendmail');
-// $conf['mailer']['params'] = array('host' => 'smtp.example.com');
+$conf['mailer']['params'] = array('host' => 'localhost');
 
 
 /**
@@ -299,7 +299,7 @@
 $conf['problems']['enabled'] = false;
 
 // If so, where should problem report emails be sent?
-$conf['problems']['email'] = 'webmaster at example.com';
+$conf['problems']['email'] = 'postmaster';
 
 
 /**

Index: horde_registry.php
===================================================================
RCS file: /kolabrepository/server/horde/horde_registry.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde_registry.php	7 Jun 2003 06:53:25 -0000	1.1
+++ horde_registry.php	31 Jul 2003 06:31:11 -0000	1.2
@@ -131,7 +131,7 @@
     'icon' => $this->applications['horde']['webroot'] . '/kronolith/graphics/kronolith.gif',
     'name' => _("Calendar"),
     'allow_guests' => false,
-    'status' => 'active'
+    'status' => 'inactive'
 );
 
 $this->applications['mnemo'] = array(
@@ -140,7 +140,7 @@
     'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
     'name' => _("Memos"),
     'allow_guests' => false,
-    'status' => 'active'
+    'status' => 'inactive'
 );
 
 $this->applications['nag'] = array(
@@ -149,7 +149,7 @@
     'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
     'name' => _("Tasks"),
     'allow_guests' => false,
-    'status' => 'active'
+    'status' => 'inactive'
 );
 
 $this->applications['chora'] = array(

Index: imp_conf.php
===================================================================
RCS file: /kolabrepository/server/horde/imp_conf.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imp_conf.php	7 Jun 2003 06:53:25 -0000	1.1
+++ imp_conf.php	31 Jul 2003 06:31:11 -0000	1.2
@@ -91,7 +91,7 @@
 // be able to pick from any of the options. If none, no server list
 // will be shown and the defaults will be used unless another
 // mechanism changes them.
-$conf['server']['server_list'] = 'none';
+$conf['server']['server_list'] = 'shown';
 
 // If we are not using the server list, should we allow users to type
 // in a mail server?

Index: imp_servers.php
===================================================================
RCS file: /kolabrepository/server/horde/imp_servers.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imp_servers.php	7 Jun 2003 06:53:25 -0000	1.1
+++ imp_servers.php	31 Jul 2003 06:31:11 -0000	1.2
@@ -81,55 +81,19 @@
 // won't be able to log in to them. The only property these entries
 // need is 'name'. This lets you put labels in the list, like this
 // example:
-$servers['_prompt'] = array(
-    'name' => _("Choose a mail server:")
-);
-
-$servers['imap'] = array(
-    'name' => 'IMAP Server',
-    'server' => 'imap.example.com',
-    'protocol' => 'imap/notls',
-    'port' => 143,
-    'folders' => 'mail/',
-    'namespace' => '',
-    'maildomain' => 'example.com',
-    'smtphost' => 'smtp.example.com',
-    'realm' => 'example.com',
-    'preferred' => ''
-);
+//$servers['_prompt'] = array(
+//    'name' => _("Choose a mail server:")
+//);
 
-$servers['cyrus'] = array(
-    'name' => 'Cyrus IMAP Server',
-    'server' => 'cyrus.example.com',
+$servers['localhost'] = array(
+    'name' => 'Local IMAP Server',
+    'server' => 'localhost',
     'protocol' => 'imap/notls',
     'port' => 143,
     'folders' => '',
     'namespace' => 'INBOX.',
-    'maildomain' => 'example.com',
-    'realm' => 'example.com',
-    'preferred' => ''
-);
-
-$servers['pop'] = array(
-    'name' => 'POP3 Server',
-    'server' => 'pop.example.com',
-    'protocol' => 'pop3',
-    'port' => 110,
-    'folders' => '',
-    'namespace' => '',
-    'maildomain' => 'example.com',
-    'realm' => 'example.com',
+    'maildomain' => 'kolabtest.co.za',
+    'realm' => 'kolabtest.co.za',
     'preferred' => ''
 );
 
-$servers['exchange'] = array(
-    'name' => 'Exchange 5.5 server',
-    'server' => 'exchange.example.com',
-    'protocol' => 'imap',
-    'port' => 143,
-    'folders' => '',
-    'namespace' => '',
-    'maildomain' => 'example.com',
-    'realm' => '',
-    'preferred' => ''
-);

Index: turba_sources.php
===================================================================
RCS file: /kolabrepository/server/horde/turba_sources.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- turba_sources.php	7 Jun 2003 06:53:25 -0000	1.1
+++ turba_sources.php	31 Jul 2003 06:31:11 -0000	1.2
@@ -46,41 +46,11 @@
 /*
  * Public netcenter and bigfoot addressbooks.
  */
-$cfgSources['netcenter'] = array(
-    'title' => 'Netcenter Member Directory',
-    'type' => 'ldap',
-    'params' => array(
-        'server' => 'memberdir.netscape.com',
-        'port' => 389,
-        'root' => 'ou=member_directory,o=netcenter.com',
-        'dn' => array('cn'),
-        'objectclass' => 'person',
-        'filter' => ''
-    ),
-    '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['bigfoot'] = array(
-    'title' => 'Bigfoot',
+/*$cfgSources['localhost'] = array(
+    'title' => 'LDAP Addres book',
     'type' => 'ldap',
     'params' => array(
-        'server' => 'ldap.bigfoot.com',
+        'server' => 'localhost',
         'port' => 389,
         'root' => ''
     ),
@@ -103,39 +73,6 @@
     'export' => false
 );
 
-$cfgSources['verisign'] = array(
-    'title' => 'Verisign Directory',
-    'type' => 'ldap',
-    'params' => array(
-        'server' => 'directory.verisign.com',
-        'port' => 389,
-        'root' => '',
-    ),
-    'map' => array(
-        '__key' => 'dn',
-        'name' => 'cn',
-        'email' => 'mail',
-    ),
-    'search' => array(
-        'name',
-        'email'
-    ),
-    'strict' => array(
-        'dn'
-    ),
-    'public' => true,
-    'readonly' => true,
-    'export' => false
-);
-
-/**
- * A local address book in an SQL database. This implements a per-user
- * address book.
- *
- * Be sure to create a turba_objects table in your Horde database
- * from the schema in turba/scripts/drivers/turba.sql if you use
- * this source.
- */
 $cfgSources['localsql'] = array(
     'title' => 'My Addressbook',
     'type' => 'sql',
@@ -176,22 +113,22 @@
     'admin' => array(),
     'export' => true
 );
-
+*/
 /**
  * A local address book in an LDAP directory. This implements a public
  * (shared) address book.
  */
-$cfgSources['localldap'] = array(
+ $cfgSources['localldap'] = array(
     'title' => 'Shared Directory',
     'type' => 'ldap',
     'params' => array(
-        'server' => 'ldap.example.com',
+        'server' => 'localhost',
         'port' => 389,
-        'root' => 'dc=example,dc=com',
-        'bind_dn' => 'cn=admin,ou=users,dc=example,dc=com',
-        'bind_password' => '********',
+        'root' => 'LOCALBASEDN',
+//        'bind_dn' => 'cn=admin,ou=users,dc=example,dc=com',
+//        'bind_password' => '********',
         'dn' => array('cn'),
-        'objectclass' => 'person',
+        'objectclass' => 'inetOrgPerson',
         'version' => 3
     ),
     'map' => array(
@@ -215,7 +152,7 @@
         'dn'
     ),
     'public' => true,
-    'readonly' => false,
+    'readonly' => true,
     'admin' => array(),
     'export' => true
 );
@@ -227,11 +164,11 @@
  * password from the user. For more info; please refer to the
  * docs/LDAP file in the Turba distribution.
  */
-
+/*
 // First we need to get the uid.
-$uid = Auth::getAuth();
-preg_match('/(^.*)@/', $uid, $uid);
-$uid = $uid[1];
+//$uid = Auth::getAuth();
+//preg_match('/(^.*)@/', $uid, $uid);
+//$uid = $uid[1];
 $basedn = 'dc=example, dc=com';
 $cfgSources['personal_ldap'] = array(
     'title' => 'My Addressbook',
@@ -294,6 +231,7 @@
  * be beat for getting up and running quickly, especially if you
  * already have Horde preferences working.
  */
+ /*
 $cfgSources['prefs'] = array(
     'title' => 'Private AddressBook',
     'type' => 'prefs',
@@ -319,3 +257,5 @@
     'public' => false,
     'readonly' => false,
     'export' => true);
+
+   */





More information about the devel mailing list