Changes 2.2.7:

* Fixed potential XSS vulnerability in the help window
* Restored compatibility with PHP 4.1
* Fixed charset of Latvian translation

4 files changed, 46 insertions, 25 deletions

diff --git a/www/horde/Makefile b/www/horde/Makefile
index 32fa69f7e10..4a971812d3b 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2004/10/31 23:47:33 jdolecek Exp $
+# $NetBSD: Makefile,v 1.29 2004/11/09 16:23:02 adam Exp $
 
-DISTNAME=	horde-2.2.4
+DISTNAME=	horde-2.2.7
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
diff --git a/www/horde/PLIST b/www/horde/PLIST
index ee6c65bdffb..bd2b328ecd6 100644
--- a/www/horde/PLIST
+++ b/www/horde/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/09/14 21:26:41 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/11/09 16:23:02 adam Exp $
 
 
 share/horde/config/horde.php.dist
@@ -130,6 +130,7 @@ share/horde/lib/Notification.php
 share/horde/lib/Notification/status.php
 share/horde/lib/Perms.php
 share/horde/lib/Prefs.php
+share/horde/lib/Prefs/UI.php
 share/horde/lib/Prefs/ldap.php
 share/horde/lib/Prefs/session.php
 share/horde/lib/Prefs/sql.php
@@ -172,7 +173,9 @@ share/horde/locale/et_EE/LC_MESSAGES/horde.mo
 share/horde/locale/fi_FI/LC_MESSAGES/horde.mo
 share/horde/locale/fi_FI/help.xml
 share/horde/locale/fr_FR/LC_MESSAGES/horde.mo
+share/horde/locale/gl_ES/LC_MESSAGES/horde.mo
 share/horde/locale/hu_HU/LC_MESSAGES/horde.mo
+share/horde/locale/id_ID/LC_MESSAGES/horde.mo
 share/horde/locale/it_IT/LC_MESSAGES/horde.mo
 share/horde/locale/ja_JP/LC_MESSAGES/horde.mo
 share/horde/locale/ko_KR/LC_MESSAGES/horde.mo
@@ -213,8 +216,10 @@ share/horde/po/et_EE.po
 share/horde/po/extract.pl
 share/horde/po/fi_FI.po
 share/horde/po/fr_FR.po
+share/horde/po/gl_ES.po
 share/horde/po/horde.pot
 share/horde/po/hu_HU.po
+share/horde/po/id_ID.po
 share/horde/po/it_IT.po
 share/horde/po/ja_JP.po
 share/horde/po/ko_KR.po
@@ -252,6 +257,8 @@ share/horde/scripts/db/mysql_drop.sql
 share/horde/scripts/db/pgsql_create.sql
 share/horde/scripts/db/pgsql_drop.sql
 share/horde/scripts/db/prefs.sql
+share/horde/scripts/db/sessionhandler_oracle.sql
+share/horde/scripts/db/sessionhandler_pgsql.sql
 share/horde/scripts/db/sessionhandler_sapdb.sql
 share/horde/scripts/db/sessionhandler.sql
 share/horde/scripts/db/vfs.sql
@@ -318,10 +325,10 @@ share/doc/horde/CONTRIBUTING
 share/doc/horde/CREDITS
 share/doc/horde/HACKING
 share/doc/horde/INSTALL
-share/doc/horde/TRANSLATIONS
+share/doc/horde/RELEASE_NOTES
 share/doc/horde/SECURITY
+share/doc/horde/TRANSLATIONS
 share/examples/horde/horde.conf
-
 @dirrm share/horde/util
 @dirrm share/horde/templates/wml/login
 @dirrm share/horde/templates/wml
@@ -384,8 +391,12 @@ share/examples/horde/horde.conf
 @dirrm share/horde/locale/ja_JP
 @dirrm share/horde/locale/it_IT/LC_MESSAGES
 @dirrm share/horde/locale/it_IT
+@dirrm share/horde/locale/id_ID/LC_MESSAGES
+@dirrm share/horde/locale/id_ID
 @dirrm share/horde/locale/hu_HU/LC_MESSAGES
 @dirrm share/horde/locale/hu_HU
+@dirrm share/horde/locale/gl_ES/LC_MESSAGES
+@dirrm share/horde/locale/gl_ES
 @dirrm share/horde/locale/fr_FR/LC_MESSAGES
 @dirrm share/horde/locale/fr_FR
 @dirrm share/horde/locale/fi_FI/LC_MESSAGES
diff --git a/www/horde/distinfo b/www/horde/distinfo
index 5b08a80d509..56de431aabf 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2003/09/14 21:26:41 bouyer Exp $
+$NetBSD: distinfo,v 1.10 2004/11/09 16:23:02 adam Exp $
 
-SHA1 (horde-2.2.4.tar.gz) = d7b185f0a9e07a9121985d6f6e8aa428d76a83a7
-Size (horde-2.2.4.tar.gz) = 630886 bytes
-SHA1 (patch-aa) = 1fe41104d78cd1224c831b4521700191c08dc453
+SHA1 (horde-2.2.7.tar.gz) = 89762cd6fb078178971f0585973584962f25210f
+Size (horde-2.2.7.tar.gz) = 680591 bytes
+SHA1 (patch-aa) = b96dfde62079c89245588f5fe97fa2585210da0f
diff --git a/www/horde/patches/patch-aa b/www/horde/patches/patch-aa
index c69e6d76087..f6a6b40ded9 100644
--- a/www/horde/patches/patch-aa
+++ b/www/horde/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/08/16 21:07:17 bouyer Exp $
+$NetBSD: patch-aa,v 1.5 2004/11/09 16:23:02 adam Exp $
 
---- config/horde.php.dist.orig	Mon May 19 17:56:12 2003
-+++ config/horde.php.dist	Fri Aug 15 23:36:57 2003
-@@ -94,7 +94,7 @@
+--- config/horde.php.dist.orig	2003-10-14 16:52:31.000000000 +0000
++++ config/horde.php.dist
+@@ -94,7 +94,7 @@ $conf['tmpdir'] = null;
  // What backend should we use for authenticating users to Horde? Valid
  // options are currently 'imap', 'ldap', 'mcal', 'sql', 'ftp', 'smb',
  // 'krb5' and 'radius'.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2003/08/16 21:07:17 bouyer Exp $
  
  // An array holding any parameters that the Auth object will need to
  // function correctly.
-@@ -105,7 +105,7 @@
+@@ -105,7 +105,7 @@ $conf['auth']['params'] = array();
  // c-client version 2000c or older), 'imap/ssl', or imap/ssl/novalidate-cert
  // (for a self-signed certificate).  Default ports are 143 for imap and
  // 993 for imap over ssl.
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2003/08/16 21:07:17 bouyer Exp $
  
  // See $conf['prefs']['params'] further down for an example how to
  // setup a SQL backend. But you must use the horde_users SQL table for
-@@ -127,14 +127,14 @@
+@@ -127,14 +127,14 @@ $conf['log']['enabled'] = true;
  
  // What log driver should we use? Valid values are 'file', 'mcal',
  // 'sql', and 'syslog'.
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.4 2003/08/16 21:07:17 bouyer Exp $
  
  // What level of messages should we log? The values are LOG_EMERG,
  // LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ $conf['log']['params'] = array();
  // (meaning use system defaults and don't save any user preferences),
  // 'session' (preferences only persist during the login), 'ldap',
  // and 'sql'.
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.4 2003/08/16 21:07:17 bouyer Exp $
  
  // Any parameters that the preferences driver needs. This includes
  // database or ldap server, username/password to connect with, etc.
-@@ -168,12 +168,12 @@
+@@ -168,12 +168,12 @@ $conf['prefs']['params'] = array();
  // This is an example configuration for a MySQL preference backend.
  // The SQL script to setup the preference database is placed in
  // horde/scripts/db/prefs.sql.
@@ -65,18 +65,28 @@ $NetBSD: patch-aa,v 1.4 2003/08/16 21:07:17 bouyer Exp $
  
  // This is an example configuration for an LDAP preference backend.
  // The schemas needed for ldap are in horde/scripts/ldap.  For more
-@@ -222,8 +222,8 @@
- // option; SMTP requires at least a server and a port (if nonstandard).
- // SMTP authentication can be enabled by setting the 'auth' parameter
- // to true.
+@@ -219,15 +219,15 @@ $conf['mailer']['type'] = 'sendmail';
+ 
+ // An array holding any parameters that the Mail object will need to
+ // function correctly.
 -$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('host' => 'smtp.example.com');
  
+ // For sendmail, this is mainly the 'sendmail_path option. Additionally, we
+ // want to use the '-oi' argument so that sendmail does not interpret a
+ // single '.' in the body of a message as the end of input.
+-// $conf['mailer']['params'] = array(
+-//     'sendmail_path' => '/usr/lib/sendmail',
+-//     'sendmail_args' => '-oi'
+-// );
++$conf['mailer']['params'] = array(
++     'sendmail_path' => '/usr/sbin/sendmail',
++     'sendmail_args' => '-oi'
++);
  
-@@ -298,10 +298,10 @@
+ // The 'smtp' driver normally will require a server name. Additional
+ // parameters can also be defined - see below for more details.
+@@ -318,10 +318,10 @@ $conf['sessionhandler']['type'] = 'none'
  
  // Should we display a problem reporting link in Horde application
  // menus?