Update to horde 2.0, as 1.2.7 doesn't work with the new php.

"has been released. The 2.0 release is a massive upgrade of the Horde Application Framework. Many components have been added or streamlined. Inter-application support is much more robust, a generic MIME_Viewer framework is included, a new preferences system supports global or application scope for preferences, and more!"

5 files changed, 123 insertions, 106 deletions

diff --git a/www/horde/patches/patch-aa b/www/horde/patches/patch-aa
index ff753f5b4cc..a26e7d11c29 100644
--- a/www/horde/patches/patch-aa
+++ b/www/horde/patches/patch-aa
@@ -1,45 +1,124 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/02/01 22:41:17 bouyer Exp $
 
---- phplib/local.inc.dist.orig	Thu Sep 21 09:48:43 2000
-+++ phplib/local.inc.dist
-@@ -27,23 +27,23 @@
-  */
- 
- /* To use an SQL database, uncomment and edit the following: */
--#class HordeDB extends DB_Sql {
--#  var $Host = 'localhost';
--#  var $Database = 'horde';
--#  var $User = 'hordemgr';
--#  var $Password = 'hordemgr';
--#  var $Port = '';
--#
--#  function halt($msg) {
--#    // Printing here causes race condition trouble, so don't.
--#    //printf("<b>Database error (HordeDB):</b> %s<br>\n", $msg);
--#  }
--#}
--#
--#class HordeCT extends CT_Sql {
--#  var $database_class = 'HordeDB';         // Which database class to use...
--#  var $database_table = 'active_sessions'; // and find our data in this table.
--#}
-+class HordeDB extends DB_Sql {
-+  var $Host = 'localhost';
-+  var $Database = 'horde';
-+  var $User = 'hordemgr';
-+  var $Password = 'hordemgr';
-+  var $Port = '';
-+
-+  function halt($msg) {
-+    // Printing here causes race condition trouble, so don't.
-+    //printf("<b>Database error (HordeDB):</b> %s<br>\n", $msg);
-+  }
-+}
-+
-+class HordeCT extends CT_Sql {
-+  var $database_class = 'HordeDB';         // Which database class to use...
-+  var $database_table = 'active_sessions'; // and find our data in this table.
-+}
- 
- /* To use shared memory, uncomment and edit the following: */
- /* NOTE: If you do this, you must edit prepend.php3 to include ct_shm.inc
+--- config/horde.php.dist.orig	Wed Jan 30 01:15:31 2002
++++ config/horde.php.dist	Wed Jan 30 11:01:55 2002
+@@ -84,11 +84,11 @@
+ /* Which users should be treated as administrators (root, super-user)
+  * by Horde? Example: $conf['auth']['admins'] = array('admin', 'john');
+  */
+-$conf['auth']['admins'] = array();
++$conf['auth']['admins'] = array('root');
+ 
+ // What backend should we use for authenticating users to Horde? Valid
+ // options are currently 'imap', 'ldap', 'mcal', 'sql', and 'ftp'.
+-$conf['auth']['driver'] = '';
++$conf['auth']['driver'] = 'imap';
+ 
+ /* An array holding any parameters that the Auth object will need to
+  * function correctly. For IMAP, this is the server name, port,
+@@ -98,8 +98,8 @@
+  * authentication driver. A SQL script can be found in 
+  * horde/scripts/db/auth.sql .
+  */
+-$conf['auth']['params'] = array();
+-//$conf['auth']['params']['dsn'] = '{imap.example.com/imap:143}INBOX';
++//$conf['auth']['params'] = array();
++$conf['auth']['params']['dsn'] = '{localhost/imap:143}INBOX';
+ 
+ 
+ /**
+@@ -112,7 +112,7 @@
+ /* What log driver should we use? Valid values are 'file', 'mcal',
+  * 'sql', and 'syslog'.
+  */
+-$conf['log']['type'] = 'file';
++$conf['log']['type'] = 'syslog';
+ 
+ /* What is the name of the log? For the 'file' driver, this is the
+  * path to a text file; for mcal, it would be the name of a calendar,
+@@ -120,7 +120,7 @@
+  * driver it is the facility as a _constant_ (with no quotes), e.g.:
+  * ... = LOG_LOCAL0;
+  */
+-$conf['log']['name'] = '/tmp/horde.log';
++$conf['log']['name'] = 'LOG_MAIL';
+ 
+ /* What level of messages should we log? The values are LOG_EMERG,
+  * LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
+@@ -148,23 +148,23 @@
+  * 'session' (preferences only persist during the login), 'ldap', 
+  * and 'sql'.
+  */
+-$conf['prefs']['driver'] = 'none';
++$conf['prefs']['driver'] = 'sql';
+ 
+ /* Any parameters that the preferences driver needs. This includes
+  * database or ldap server, username/password to connect with, etc.
+  */
+-$conf['prefs']['params'] = array();
++//$conf['prefs']['params'] = array();
+ 
+ /* This is an example configuration for a MySQL preference backend. 
+  * Be sure to set the prefs driver to 'sql' above if you use this
+  * configuration. 
+  */
+-// $conf['prefs']['params']['phptype'] = 'mysql';
+-// $conf['prefs']['params']['hostspec'] = 'localhost';
+-// $conf['prefs']['params']['username'] = 'horde';
+-// $conf['prefs']['params']['password'] = '*****';
+-// $conf['prefs']['params']['database'] = 'horde';
+-// $conf['prefs']['params']['table'] = 'horde_prefs';
++$conf['prefs']['params']['phptype'] = 'mysql';
++$conf['prefs']['params']['hostspec'] = 'localhost';
++$conf['prefs']['params']['username'] = 'hordemgr';
++$conf['prefs']['params']['password'] = 'hordemgr';
++$conf['prefs']['params']['database'] = 'horde';
++$conf['prefs']['params']['table'] = 'horde_prefs';
+ 
+ 
+ /**
+@@ -176,13 +176,17 @@
+  * only live for the duration of a single request - they are NOT
+  * stored in the user's session.
+  */
+-$conf['category']['driver'] = 'none';
++$conf['category']['driver'] = 'sql';
+ 
+ /* An array holding any parameters that the Category object will need
+  * to function correctly.
+  */
+-$conf['category']['params'] = array();
+-
++$conf['category']['params']['phptype'] = 'mysql';
++$conf['category']['params']['hostspec'] = 'localhost';
++$conf['category']['params']['username'] = 'hordemgr';
++$conf['category']['params']['password'] = 'hordemgr';
++$conf['category']['params']['database'] = 'horde';
++$conf['category']['params']['table'] = 'horde_categories';
+ 
+ /**
+  ** Cache System Settings
+@@ -215,8 +219,8 @@
+  * function correctly. For sendmail, this is mainly the sendmail_path
+  * option; SMTP requires at least a server and a port (if nonstandard).
+  */
+-$conf['mailer']['params'] = array();
+-// $conf['mailer']['params'] = array('sendmail_path' => '/usr/lib/sendmail');
++//$conf['mailer']['params'] = array();
++$conf['mailer']['params'] = array('sendmail_path' => '/usr/sbin/sendmail');
+ // $conf['mailer']['params'] = array('server' => 'smtp.example.com');
+ 
+ /**
+@@ -226,10 +230,10 @@
+ /* Should we display a problem reporting link in Horde application
+  * menus?
+  */
+-$conf['problems']['enabled'] = false;
++$conf['problems']['enabled'] = true;
+ 
+ /* If so, where should problem report emails be sent? */
+-$conf['problems']['email'] = 'postmaster@example.com';
++$conf['problems']['email'] = 'postmaster';
+ 
+ 
+ /**
diff --git a/www/horde/patches/patch-ab b/www/horde/patches/patch-ab
deleted file mode 100644
index fa587f1221e..00000000000
--- a/www/horde/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
-
---- scripts/database/dbpasswd.sh.orig	Fri Sep 29 15:13:55 2000
-+++ scripts/database/dbpasswd.sh
-@@ -17,7 +17,7 @@
- # Determine OS and its techniques.
- #
- case "`uname -s`" in
--Linux|FreeBSD|OpenBSD)
-+Linux|FreeBSD|NetBSD|OpenBSD)
-     N="-n"; C=""
-     ;;
- *)
diff --git a/www/horde/patches/patch-ac b/www/horde/patches/patch-ac
deleted file mode 100644
index 7ffa8022ec7..00000000000
--- a/www/horde/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
-
---- setup.php3.orig	Wed Sep 20 12:18:50 2000
-+++ setup.php3
-@@ -634,7 +634,7 @@
-   */
-   $form_title = '';
-   include( './templates/setup/form_header.inc' );
--  echo '<p>Please go to the top level directory for your installation and run "sh ./install.sh"; this will enable the configuration manager.</p>';
-+  echo '<p>Please run "horde_setup"; this will enable the configuration manager.</p>';
-   
- } else if (
- 	   ! is_writeable( './config/horde.php3' )
-@@ -642,7 +642,7 @@
- 	   ) {
-   $form_title = '';
-   include './templates/setup/form_header.inc';
--  echo '<p>Please go to the top level directory for your installation and run "sh ./install.sh"; this will enable the configuration manager.</p>';
-+  echo '<p>Please run "horde_setup"; this will enable the configuration manager.</p>';
- } else {
- 
- 
diff --git a/www/horde/patches/patch-ad b/www/horde/patches/patch-ad
deleted file mode 100644
index 1e7039cb62f..00000000000
--- a/www/horde/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
-
---- templates/index/horde_notconfigured.inc.orig	Wed Oct 18 15:52:49 2000
-+++ templates/index/horde_notconfigured.inc
-@@ -11,8 +11,7 @@
- <p>You can also use the horde setup wizard. In order to use the setup wizard you will need to enable write privileges to your configuration files by running the following commands:
- <ul>
- <li>UN*X People: <br><br>
--<code>cd &lt;your horde root&gt;</code><br>
--<code>sh ./install.sh</code><br>
-+<code>horde_setup</code><br>
- Click here: <a href="setup.php3">setup.php3</a>
- <br><br>
- <li>win32: The best option at this time is to build the libs and defaults files on a unix machine, and transfer them over. If you're a win32 scripting wizard and want to provide win32 setup scripts, that'd be great! Let us know: <a href="mailto:dev@lists.horde.org">dev@lists.horde.org</a>.
diff --git a/www/horde/patches/patch-ae b/www/horde/patches/patch-ae
deleted file mode 100644
index 26b9346bcf3..00000000000
--- a/www/horde/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $
-
---- templates/setup/imp/write_file.inc.orig	Wed Sep 13 13:08:39 2000
-+++ templates/setup/imp/write_file.inc
-@@ -26,7 +26,7 @@
-       <br> 
-          <ul>
-          <?php echo $lang->go_run_unix ?><br>
--         sh ./secure.sh
-+         horde_secure
-          </ul>
-       </td>
-    </tr>