- Update to 3.2-rc2

- Many changes, see the following for details:
  http://www.horde.org/horde/docs/?f=CHANGES.html

2 files changed, 264 insertions, 187 deletions

diff --git a/www/horde4-base/files/patch-config_conf.xml b/www/horde4-base/files/patch-config_conf.xml
index 56f6f6a346f7..e24d3d03928d 100644
--- a/www/horde4-base/files/patch-config_conf.xml
+++ b/www/horde4-base/files/patch-config_conf.xml
@@ -1,15 +1,15 @@
---- config/conf.xml.orig	Fri Nov  5 10:54:09 2004
-+++ config/conf.xml	Sat Nov 27 23:20:31 2004
-@@ -276,7 +276,7 @@
- 
+--- config/conf.xml.orig	2007-12-02 19:56:48.000000000 -0900
++++ config/conf.xml	2007-12-02 22:06:39.000000000 -0900
+@@ -337,7 +337,7 @@
      <case name="login" desc="Login (su) authentication">
       <configsection name="params">
--      <configstring name="location" desc="Location of the su binary">/bin/su</configstring>
-+      <configstring name="location" desc="Location of the su binary">/usr/bin/su</configstring>
+       <configstring name="location" desc="Location of the su binary">
+-      /bin/su</configstring>
++      /usr/bin/su</configstring>
       </configsection>
      </case>
  
-@@ -932,7 +932,7 @@
+@@ -1076,7 +1076,7 @@
       <configsection name="params">
        <configstring name="sendmail_path" required="false" desc="The location
        of the sendmail binary on the filesystem
diff --git a/www/horde4-base/files/patch-config_mime_drivers.php.dist b/www/horde4-base/files/patch-config_mime_drivers.php.dist
index 5725bdac7928..562a2e799bdf 100644
--- a/www/horde4-base/files/patch-config_mime_drivers.php.dist
+++ b/www/horde4-base/files/patch-config_mime_drivers.php.dist
@@ -1,17 +1,40 @@
---- config/mime_drivers.php.dist.orig	Thu Apr  6 22:32:14 2006
-+++ config/mime_drivers.php.dist	Thu Jul 20 22:10:57 2006
-@@ -37,14 +37,21 @@
-  * zip            Zip files
+--- config/mime_drivers.php.dist.orig	2007-12-02 22:13:52.000000000 -0900
++++ config/mime_drivers.php.dist	2007-12-11 17:17:21.000000000 -0900
+@@ -42,40 +42,23 @@
   */
  $mime_drivers_map['horde']['registered'] = array(
--    'css', 'enriched', 'html', 'images', 'ooo', 'pdf', 'php', 'plain', 'rar',
--    'report', 'rfc822', 'richtext', 'security', 'simple', 'tgz', 'tnef',
--    'vcard', 'zip',
--    // The following mime drivers require external applications to be
--    // installed.
--    // 'deb', 'enscript', 'msword', 'msexcel', 'mspowerpoint', 'rpm',
--    // 'srchighlite', 'webcpp'
--);
+     'audio',
+-    'css',
+-    'enriched',
+-    'html',
+-    'images',
+-    'ooo',
+-    'pdf',
+-    'php',
+-    'plain',
+-    'rar',
+-    'report',
+-    'rfc822',
+-    'richtext',
+-    'security',
+-    'simple',
+-    'smil',
+-    'tgz',
+-    'tnef',
+-    'vcard',
+-    'zip',
+-    /* The following mime drivers require external applications to be
+-     * installed and are disabled by default. */
+-    // 'deb',
+-    // 'enscript',
+-    // 'msword',
+-    // 'msexcel',
+-    // 'mspowerpoint',
+-    // 'rpm',
+-    // 'rtf',
+-    // 'srchighlite',
+-    // 'webcpp',
+-    // 'wordperfect',
 +    'css'
 +//UNCOMMENTIFDEB , 'deb'
 +   , 'enriched'
@@ -22,43 +45,50 @@
 +   , 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
 +    'rfc822', 'richtext'
 +//UNCOMMENTIFRPM , 'rpm'
-+   , 'security', 'simple'
++   , 'security', 'simple', 'smil'
 +//UNCOMMENTIFSRCHIGH , 'srchighlite'
 +   , 'tgz', 'tnef', 'vcard'
 +//UNCOMMENTIFWCPP , 'webcpp'
-+   , 'zip');
- 
++   , 'zip'
+ );
  
+-
  /**
-@@ -161,66 +172,66 @@
+  * If you want to specifically override any MIME type to be handled by
+  * a specific driver, then enter it here.  Normally, this is safe to
+@@ -255,78 +238,79 @@
   * Web C Plus Plus driver settings
   * http://webcpp.sourceforge.net/
   */
--$mime_drivers['horde']['webcpp']['location'] = '/usr/bin/webcpp';
--$mime_drivers['horde']['webcpp']['inline'] = true;
--$mime_drivers['horde']['webcpp']['handles'] = array(
--    'text/xml', 'text/sgml', 'application/xml',
--    'application/x-sh', 'application/x-javascript', 'application/x-tcl',
--    'x-extension/asm', 'application/x-asp', 'x-extension/bas',
--    'x-extension/cs', 'text/x-csrc', 'x-extension/rc',
--    'text/x-c++src', 'text/x-c++src', 'text/x-c++src',
--    'text/x-chdr', 'x-extension/bat', 'text/x-fortran',
--    'x-extension/f77', 'x-extension/f90', 'x-extension/for',
--    'x-extension/ftn', 'text/x-java', 'application/x-javascript',
--    'text/sgml', 'text/xml', 'text/x-pascal',
--    'application/x-cgi', 'application/x-perl', 'application/x-python',
--    'text/x-sql', 'text/x-tcl',
--    'application/x-shellscript', 'x-extension/vhd', 'x-extension/vhdl');
--$mime_drivers['horde']['webcpp']['icons'] = array(
--    'default'                  => 'text.png',
--    'text/xml'                 => 'xml.png',
--    'text/x-csrc'              => 'source-c.png',
--    'text/x-chdr'              => 'source-h.png',
--    'text/x-java'              => 'source-java.png',
--    'application/x-javascript' => 'script-js.png');
-+//UNCOMMENTIFWCPP$mime_drivers['horde']['webcpp']['location'] = '%%LOCALBASE%%/bin/webcpp';
-+//UNCOMMENTIFWCPP$mime_drivers['horde']['webcpp']['inline'] = true;
-+//UNCOMMENTIFWCPP$mime_drivers['horde']['webcpp']['handles'] = array(
+-$mime_drivers['horde']['webcpp'] = array(
+-    'location' => '/usr/bin/webcpp',
+-    'inline' => true,
+-    'handles' => array(
+-        'text/xml', 'text/sgml', 'application/xml', 'application/x-sh',
+-        'application/x-javascript', 'application/x-tcl', 'x-extension/asm',
+-        'application/x-asp', 'x-extension/bas', 'x-extension/cs',
+-        'text/x-csrc', 'x-extension/rc', 'text/x-c++src', 'text/x-c++src',
+-        'text/x-c++src', 'text/x-chdr', 'x-extension/bat', 'text/x-fortran',
+-        'x-extension/f77', 'x-extension/f90', 'x-extension/for',
+-        'x-extension/ftn', 'text/x-java', 'application/x-javascript',
+-        'text/sgml', 'text/xml', 'text/x-pascal', 'application/x-cgi',
+-        'application/x-perl', 'application/x-python', 'text/x-sql',
+-        'text/x-tcl', 'application/x-shellscript', 'x-extension/vhd',
+-        'x-extension/vhdl'
+-    ),
+-    'icons' => array(
+-        'default'                  => 'text.png',
+-        'text/xml'                 => 'xml.png',
+-        'text/x-csrc'              => 'source-c.png',
+-        'text/x-chdr'              => 'source-h.png',
+-        'text/x-java'              => 'source-java.png',
+-        'application/x-javascript' => 'script-js.png'
+-    )
+-);
++//UNCOMMENTIFWCPP$mime_drivers['horde']['webcpp'] = array(
++//UNCOMMENTIFWCPP    'location' => '%%LOCALBASE%%/bin/webcpp',
++//UNCOMMENTIFWCPP    'inline' => true,
++//UNCOMMENTIFWCPP    'handles' => array(
 +//UNCOMMENTIFWCPP    'text/xml', 'text/sgml', 'application/xml',
 +//UNCOMMENTIFWCPP    'application/x-sh', 'application/x-javascript', 'application/x-tcl',
 +//UNCOMMENTIFWCPP    'x-extension/asm', 'application/x-asp', 'x-extension/bas',
@@ -70,188 +100,235 @@
 +//UNCOMMENTIFWCPP    'text/sgml', 'text/xml', 'text/x-pascal',
 +//UNCOMMENTIFWCPP    'application/x-cgi', 'application/x-perl', 'application/x-python',
 +//UNCOMMENTIFWCPP    'text/x-sql', 'text/x-tcl',
-+//UNCOMMENTIFWCPP    'application/x-shellscript', 'x-extension/vhd', 'x-extension/vhdl');
-+//UNCOMMENTIFWCPP$mime_drivers['horde']['webcpp']['icons'] = array(
++//UNCOMMENTIFWCPP    'application/x-shellscript', 'x-extension/vhd', 'x-extension/vhdl'
++//UNCOMMENTIFWCPP    ),
++//UNCOMMENTIFWCPP    'icons' => array(
 +//UNCOMMENTIFWCPP    'default'                  => 'text.png',
 +//UNCOMMENTIFWCPP    'text/xml'                 => 'xml.png',
 +//UNCOMMENTIFWCPP    'text/x-csrc'              => 'source-c.png',
 +//UNCOMMENTIFWCPP    'text/x-chdr'              => 'source-h.png',
 +//UNCOMMENTIFWCPP    'text/x-java'              => 'source-java.png',
-+//UNCOMMENTIFWCPP    'application/x-javascript' => 'script-js.png');
++//UNCOMMENTIFWCPP    'application/x-javascript' => 'script-js.png'
++//UNCOMMENTIFWCPP    )
++//UNCOMMENTIFWCPP);
+ 
  
  /**
   * Source-Highlight driver settings
   * http://www.gnu.org/software/src-highlite/
   */
--$mime_drivers['horde']['srchighlite']['location'] = '/usr/bin/source-highlight';
--$mime_drivers['horde']['srchighlite']['inline'] = true;
--$mime_drivers['horde']['srchighlite']['handles'] = array(
--    'text/x-csrc', 'text/x-c++src', 'text/x-java',
--    'application/x-perl', 'application/x-python', 'text/x-c++src',
--    'text/cpp');
--$mime_drivers['horde']['srchighlite']['icons'] = array(
--    'default'                  => 'text.png',
--    'text/x-csrc'              => 'source-c.png',
--    'text/x-c++src'            => 'source-c.png',
--    'text/cpp'                 => 'source-c.png',
--    'text/x-java'              => 'source-java.png');
-+//UNCOMMENTIFSRCHIGH$mime_drivers['horde']['srchighlite']['location'] = '%%LOCALBASE%%/bin/source-highlight';
-+//UNCOMMENTIFSRCHIGH$mime_drivers['horde']['srchighlite']['inline'] = true;
-+//UNCOMMENTIFSRCHIGH$mime_drivers['horde']['srchighlite']['handles'] = array(
-+//UNCOMMENTIFSRCHIGH    'text/x-csrc', 'text/x-c++src', 'text/x-java',
-+//UNCOMMENTIFSRCHIGH    'application/x-perl', 'application/x-python', 'text/x-c++src',
-+//UNCOMMENTIFSRCHIGH    'text/cpp');
-+//UNCOMMENTIFSRCHIGH$mime_drivers['horde']['srchighlite']['icons'] = array(
-+//UNCOMMENTIFSRCHIGH    'default'                  => 'text.png',
-+//UNCOMMENTIFSRCHIGH    'text/x-csrc'              => 'source-c.png',
-+//UNCOMMENTIFSRCHIGH    'text/x-c++src'            => 'source-c.png',
-+//UNCOMMENTIFSRCHIGH    'text/cpp'                 => 'source-c.png',
-+//UNCOMMENTIFSRCHIGH    'text/x-java'              => 'source-java.png');
+-$mime_drivers['horde']['srchighlite'] = array(
+-    'location' => '/usr/bin/source-highlight',
+-    'inline' => true,
+-    'handles' => array(
+-        'text/x-csrc', 'text/x-c++src', 'text/x-java', 'application/x-perl',
+-        'application/x-python', 'text/x-c++src', 'text/cpp'
+-    ),
+-    'icons' => array(
+-        'default'       => 'text.png',
+-        'text/x-csrc'   => 'source-c.png',
+-        'text/x-c++src' => 'source-c.png',
+-        'text/cpp'      => 'source-c.png',
+-        'text/x-java'   => 'source-java.png'
+-    )
+-);
++//UNCOMMENTIFSRCHIGH$mime_drivers['horde']['srchighlite'] = array(
++//UNCOMMENTIFSRCHIGH    'location' => '%%LOCALBASE%%/source-highlight',
++//UNCOMMENTIFSRCHIGH    'inline' => true,
++//UNCOMMENTIFSRCHIGH    'handles' => array(
++//UNCOMMENTIFSRCHIGH        'text/x-csrc', 'text/x-c++src', 'text/x-java', 'application/x-perl',
++//UNCOMMENTIFSRCHIGH        'application/x-python', 'text/x-c++src', 'text/cpp'
++//UNCOMMENTIFSRCHIGH    ),
++//UNCOMMENTIFSRCHIGH    'icons' => array(
++//UNCOMMENTIFSRCHIGH        'default'       => 'text.png',
++//UNCOMMENTIFSRCHIGH        'text/x-csrc'   => 'source-c.png',
++//UNCOMMENTIFSRCHIGH        'text/x-c++src' => 'source-c.png',
++//UNCOMMENTIFSRCHIGH        'text/cpp'      => 'source-c.png',
++//UNCOMMENTIFSRCHIGH        'text/x-java'   => 'source-java.png'
++//UNCOMMENTIFSRCHIGH    )
++//UNCOMMENTIFSRCHIGH);
+ 
  
  /**
   * GNU Enscript driver settings
   */
--$mime_drivers['horde']['enscript']['location'] = '/usr/bin/enscript';
--$mime_drivers['horde']['enscript']['inline'] = true;
--$mime_drivers['horde']['enscript']['handles'] = array(
--    'application/x-cgi', 'application/x-shellscript', 'application/x-javascript',
--    'application/x-perl', 'application/xml', 'text/xml',
--    'text/diff', 'text/x-diff', 'text/x-patch', 'text/x-csrc',
--    'x-extension/cs', 'text/x-java', 'text/x-chdr', 'text/x-c++src',
--    'text/x-c++hdr', 'x-extension/vhd', 'x-extension/vhdl', 'text/x-sql',
--    'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp', 'text/x-tex');
--$mime_drivers['horde']['enscript']['icons'] = array(
--    'default'                  => 'text.png',
--    'text/xml'                 => 'xml.png',
--    'application/xml'          => 'xml.png',
--    'text/x-csrc'              => 'source-c.png',
--    'text/x-chdr'              => 'source-h.png',
--    'text/x-java'              => 'source-java.png',
--    'application/x-javascript' => 'script-js.png');
-+//UNCOMMENTIFES$mime_drivers['horde']['enscript']['location'] = '%%LOCALBASE%%/bin/enscript';
-+//UNCOMMENTIFES$mime_drivers['horde']['enscript']['inline'] = true;
-+//UNCOMMENTIFES$mime_drivers['horde']['enscript']['handles'] = array(
-+//UNCOMMENTIFES    'application/x-cgi', 'application/x-shellscript', 'application/x-javascript',
-+//UNCOMMENTIFES    'application/x-perl', 'application/xml', 'text/xml',
-+//UNCOMMENTIFES    'text/diff', 'text/x-diff', 'text/x-patch', 'text/x-csrc',
-+//UNCOMMENTIFES    'x-extension/cs', 'text/x-java', 'text/x-chdr', 'text/x-c++src',
-+//UNCOMMENTIFES    'text/x-c++hdr', 'x-extension/vhd', 'x-extension/vhdl', 'text/x-sql',
-+//UNCOMMENTIFES    'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp', 'text/x-tex');
-+//UNCOMMENTIFES$mime_drivers['horde']['enscript']['icons'] = array(
-+//UNCOMMENTIFES    'default'                  => 'text.png',
-+//UNCOMMENTIFES    'text/xml'                 => 'xml.png',
-+//UNCOMMENTIFES    'application/xml'          => 'xml.png',
-+//UNCOMMENTIFES    'text/x-csrc'              => 'source-c.png',
-+//UNCOMMENTIFES    'text/x-chdr'              => 'source-h.png',
-+//UNCOMMENTIFES    'text/x-java'              => 'source-java.png',
-+//UNCOMMENTIFES    'application/x-javascript' => 'script-js.png');
+-$mime_drivers['horde']['enscript'] = array(
+-    'location' => '/usr/bin/enscript',
+-    'inline' => true,
+-    'handles' => array(
+-        'application/x-cgi', 'application/x-shellscript',
+-        'application/x-javascript', 'application/x-perl', 'application/xml',
+-        'text/xml', 'text/diff', 'text/x-diff', 'text/x-patch', 'text/x-csrc',
+-        'x-extension/cs', 'text/x-java', 'text/x-chdr', 'text/x-c++src',
+-        'text/x-c++hdr', 'x-extension/vhd', 'x-extension/vhdl', 'text/x-sql',
+-        'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp', 'text/x-tex'
+-    ),
+-    'icons' => array(
+-        'default'                  => 'text.png',
+-        'text/xml'                 => 'xml.png',
+-        'application/xml'          => 'xml.png',
+-        'text/x-csrc'              => 'source-c.png',
+-        'text/x-chdr'              => 'source-h.png',
+-        'text/x-java'              => 'source-java.png',
+-        'application/x-javascript' => 'script-js.png'
+-    )
+-);
++//UNCOMMENTIFES$mime_drivers['horde']['enscript'] = array(
++//UNCOMMENTIFES    'location' => '%%LOCALBASE%%/enscript',
++//UNCOMMENTIFES    'inline' => true,
++//UNCOMMENTIFES    'handles' => array(
++//UNCOMMENTIFES        'application/x-cgi', 'application/x-shellscript',
++//UNCOMMENTIFES        'application/x-javascript', 'application/x-perl', 'application/xml',
++//UNCOMMENTIFES        'text/xml', 'text/diff', 'text/x-diff', 'text/x-patch', 'text/x-csrc',
++//UNCOMMENTIFES        'x-extension/cs', 'text/x-java', 'text/x-chdr', 'text/x-c++src',
++//UNCOMMENTIFES        'text/x-c++hdr', 'x-extension/vhd', 'x-extension/vhdl', 'text/x-sql',
++//UNCOMMENTIFES        'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp', 'text/x-tex'
++//UNCOMMENTIFES    ),
++//UNCOMMENTIFES    'icons' => array(
++//UNCOMMENTIFES        'default'                  => 'text.png',
++//UNCOMMENTIFES        'text/xml'                 => 'xml.png',
++//UNCOMMENTIFES        'application/xml'          => 'xml.png',
++//UNCOMMENTIFES        'text/x-csrc'              => 'source-c.png',
++//UNCOMMENTIFES        'text/x-chdr'              => 'source-h.png',
++//UNCOMMENTIFES        'text/x-java'              => 'source-java.png',
++//UNCOMMENTIFES        'application/x-javascript' => 'script-js.png'
++//UNCOMMENTIFES    )
++//UNCOMMENTIFES);
  
  
  /**
-@@ -272,15 +283,15 @@
-  * The 'location' entry should point to the 'wvHtml' program, NOT the
-  * 'wvWare' program.
+@@ -387,16 +371,16 @@
+  * Embedded images in Word documents need extra configuration. See 
+  * http://wiki.horde.org/GraphicswvHtml 
   */
--$mime_drivers['horde']['msword']['location'] = '/usr/bin/wvHtml';
--$mime_drivers['horde']['msword']['inline'] = false;
--$mime_drivers['horde']['msword']['handles'] = array(
--    'application/vnd.ms-word',
--    'application/msword',
+-$mime_drivers['horde']['msword'] = array(
+-    'location' => '/usr/bin/wvHtml',
+-    'inline' => false,
+-    'handles' => array(
+-        'application/vnd.ms-word', 'application/msword'
+-    ),
+-    'icons' => array(
+-        'default' => 'msword.png'
+-    )
 -);
--$mime_drivers['horde']['msword']['icons'] = array(
--    'default' => 'msword.png',
--);
-+//UNCOMMENTIFWV$mime_drivers['horde']['msword']['location'] = '%%LOCALBASE%%/bin/wvHtml';
-+//UNCOMMENTIFWV$mime_drivers['horde']['msword']['inline'] = false;
-+//UNCOMMENTIFWV$mime_drivers['horde']['msword']['handles'] = array(
-+//UNCOMMENTIFWV    'application/vnd.ms-word',
-+//UNCOMMENTIFWV    'application/msword',
-+//UNCOMMENTIFWV);
-+//UNCOMMENTIFWV$mime_drivers['horde']['msword']['icons'] = array(
-+//UNCOMMENTIFWV    'default' => 'msword.png',
++//UNCOMMENTIFWV$mime_drivers['horde']['msword'] = array(
++//UNCOMMENTIFWV    'location' => '%%LOCALBASE%%/wvHtml',
++//UNCOMMENTIFWV    'inline' => false,
++//UNCOMMENTIFWV    'handles' => array(
++//UNCOMMENTIFWV        'application/vnd.ms-word', 'application/msword'
++//UNCOMMENTIFWV    ),
++//UNCOMMENTIFWV    'icons' => array(
++//UNCOMMENTIFWV        'default' => 'msword.png'
++//UNCOMMENTIFWV    )
 +//UNCOMMENTIFWV);
  
  
  /**
-@@ -288,14 +299,14 @@
+@@ -404,17 +388,17 @@
   * This driver requires xlhtml to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
--$mime_drivers['horde']['msexcel']['location'] = '/usr/local/bin/xlhtml';
--$mime_drivers['horde']['msexcel']['inline'] = false;
--$mime_drivers['horde']['msexcel']['handles'] = array(
--    'application/vnd.ms-excel',
--    'application/msexcel',
--    'application/x-msexcel');
--$mime_drivers['horde']['msexcel']['icons'] = array(
--    'default' => 'msexcel.png');
-+//UNCOMMENTIFXL$mime_drivers['horde']['msexcel']['location'] = '%%LOCALBASE%%/bin/xlhtml';
-+//UNCOMMENTIFXL$mime_drivers['horde']['msexcel']['inline'] = false;
-+//UNCOMMENTIFXL$mime_drivers['horde']['msexcel']['handles'] = array(
-+//UNCOMMENTIFXL    'application/vnd.ms-excel',
-+//UNCOMMENTIFXL    'application/msexcel',
-+//UNCOMMENTIFXL    'application/x-msexcel');
-+//UNCOMMENTIFXL$mime_drivers['horde']['msexcel']['icons'] = array(
-+//UNCOMMENTIFXL    'default' => 'msexcel.png');
+-$mime_drivers['horde']['msexcel'] = array(
+-    'location' => '/usr/local/bin/xlhtml',
+-    'inline' => false,
+-    'handles' => array(
+-        'application/vnd.ms-excel', 'application/msexcel',
+-        'application/x-msexcel'
+-    ),
+-    'icons' => array(
+-        'default' => 'msexcel.png'
+-    )
+-);
++//UNCOMMENTIFXL$mime_drivers['horde']['msexcel'] = array(
++//UNCOMMENTIFXL    'location' => '%%LOCALBASE%%/bin/xlhtml',
++//UNCOMMENTIFXL    'inline' => false,
++//UNCOMMENTIFXL    'handles' => array(
++//UNCOMMENTIFXL        'application/vnd.ms-excel', 'application/msexcel',
++//UNCOMMENTIFXL        'application/x-msexcel'
++//UNCOMMENTIFXL    ),
++//UNCOMMENTIFXL    'icons' => array(
++//UNCOMMENTIFXL        'default' => 'msexcel.png'
++//UNCOMMENTIFXL    )
++//UNCOMMENTIFXL);
  
  
  /**
-@@ -303,13 +314,13 @@
+@@ -422,16 +406,16 @@
   * This driver requires ppthtml, included with xlhtml, to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
--$mime_drivers['horde']['mspowerpoint']['location'] = '/usr/local/bin/ppthtml';
--$mime_drivers['horde']['mspowerpoint']['inline'] = false;
--$mime_drivers['horde']['mspowerpoint']['handles'] = array(
--    'application/vnd.ms-powerpoint',
--    'application/mspowerpoint');
--$mime_drivers['horde']['mspowerpoint']['icons'] = array(
--    'default' => 'mspowerpoint.png');
-+//UNCOMMENTIFXL$mime_drivers['horde']['mspowerpoint']['location'] = '%%LOCALBASE%%/bin/ppthtml';
-+//UNCOMMENTIFXL$mime_drivers['horde']['mspowerpoint']['inline'] = false;
-+//UNCOMMENTIFXL$mime_drivers['horde']['mspowerpoint']['handles'] = array(
-+//UNCOMMENTIFXL    'application/vnd.ms-powerpoint',
-+//UNCOMMENTIFXL    'application/mspowerpoint');
-+//UNCOMMENTIFXL$mime_drivers['horde']['mspowerpoint']['icons'] = array(
-+//UNCOMMENTIFXL    'default' => 'mspowerpoint.png');
+-$mime_drivers['horde']['mspowerpoint'] = array(
+-    'location' => '/usr/local/bin/ppthtml',
+-    'inline' => false,
+-    'handles' => array(
+-        'application/vnd.ms-powerpoint', 'application/mspowerpoint'
+-    ),
+-    'icons' => array(
+-        'default' => 'mspowerpoint.png'
+-    )
+-);
++//UNCOMMENTIFXL$mime_drivers['horde']['mspowerpoint'] = array(
++//UNCOMMENTIFXL    'location' => '%%LOCALBASE%%/bin/ppthtml',
++//UNCOMMENTIFXL    'inline' => false,
++//UNCOMMENTIFXL    'handles' => array(
++//UNCOMMENTIFXL        'application/vnd.ms-powerpoint', 'application/mspowerpoint'
++//UNCOMMENTIFXL    ),
++//UNCOMMENTIFXL    'icons' => array(
++//UNCOMMENTIFXL        'default' => 'mspowerpoint.png'
++//UNCOMMENTIFXL    )
++//UNCOMMENTIFXL);
  
  
  /**
-@@ -325,24 +336,24 @@
+@@ -450,31 +434,31 @@
  /**
   * RPM driver settings
   */
--$mime_drivers['horde']['rpm']['location'] = '/usr/bin/rpm';
--$mime_drivers['horde']['rpm']['inline'] = false;
--$mime_drivers['horde']['rpm']['handles'] = array(
--    'application/x-rpm');
--$mime_drivers['horde']['rpm']['icons'] = array(
--    'default' => 'rpm.png');
-+//UNCOMMENTIFRPM$mime_drivers['horde']['rpm']['location'] = '%%LOCALBASE%%/bin/rpm';
-+//UNCOMMENTIFRPM$mime_drivers['horde']['rpm']['inline'] = false;
-+//UNCOMMENTIFRPM$mime_drivers['horde']['rpm']['handles'] = array(
-+//UNCOMMENTIFRPM    'application/x-rpm');
-+//UNCOMMENTIFRPM$mime_drivers['horde']['rpm']['icons'] = array(
-+//UNCOMMENTIFRPM    'default' => 'rpm.png');
+-$mime_drivers['horde']['rpm'] = array(
+-    'location' => '/usr/bin/rpm',
+-    'inline' => false,
+-    'handles' => array(
+-        'application/x-rpm'
+-    ),
+-    'icons' => array(
+-        'default' => 'rpm.png'
+-    )
+-);
++//UNCOMMENTIFRPM$mime_drivers['horde']['rpm'] = array(
++//UNCOMMENTIFRPM    'location' => '%%LOCALBASE%%/bin/rpm',
++//UNCOMMENTIFRPM    'inline' => false,
++//UNCOMMENTIFRPM    'handles' => array(
++//UNCOMMENTIFRPM        'application/x-rpm'
++//UNCOMMENTIFRPM    ),
++//UNCOMMENTIFRPM    'icons' => array(
++//UNCOMMENTIFRPM        'default' => 'rpm.png'
++//UNCOMMENTIFRPM    )
++//UNCOMMENTIFRPM);
  
  
  /**
   * Debian package driver settings
   */
--$mime_drivers['horde']['deb']['location'] = '/usr/bin/dpkg';
--$mime_drivers['horde']['deb']['inline'] = false;
--$mime_drivers['horde']['deb']['handles'] = array(
--    'application/x-deb',
--    'application/x-debian-package');
--$mime_drivers['horde']['deb']['icons'] = array(
--    'default' => 'deb.png');
-+//UNCOMMENTIFDEB$mime_drivers['horde']['deb']['location'] = '%%LOCALBASE%%/bin/dpkg';
-+//UNCOMMENTIFDEB$mime_drivers['horde']['deb']['inline'] = false;
-+//UNCOMMENTIFDEB$mime_drivers['horde']['deb']['handles'] = array(
-+//UNCOMMENTIFDEB    'application/x-deb',
-+//UNCOMMENTIFDEB    'application/x-debian-package');
-+//UNCOMMENTIFDEB$mime_drivers['horde']['deb']['icons'] = array(
-+//UNCOMMENTIFDEB    'default' => 'deb.png');
+-$mime_drivers['horde']['deb'] = array(
+-    'location' => '/usr/bin/dpkg',
+-    'inline' => false,
+-    'handles' => array(
+-        'application/x-deb', 'application/x-debian-package'
+-    ),
+-    'icons' => array(
+-        'default' => 'deb.png'
+-    )
+-);
++//UNCOMMENTIFDEB$mime_drivers['horde']['deb'] = array(
++//UNCOMMENTIFDEB    'location' => '%%LOCALHOST%%/bin/dpkg',
++//UNCOMMENTIFDEB    'inline' => false,
++//UNCOMMENTIFDEB    'handles' => array(
++//UNCOMMENTIFDEB        'application/x-deb', 'application/x-debian-package'
++//UNCOMMENTIFDEB    ),
++//UNCOMMENTIFDEB    'icons' => array(
++//UNCOMMENTIFDEB        'default' => 'deb.png'
++//UNCOMMENTIFDEB    )
++//UNCOMMENTIFDEB);
  
  
  /**