# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1240056974 -7200
# Node ID 3a96478f130330eadb9f666cbfb523f369f9b243
# Parent  53d3d1f9b8955d5a8c4ac41034e861912764bfc6
Correct and improve patch logic of optional plugin list.
Move core plugins to static config.php file, remove ldifimport which
conflicts with change_ldappass and otherwise appears broken, reorder
remaining plugins, and specify default theme (the one called 'Default'.)

diff -r 53d3d1f9b895 -r 3a96478f1303 squirrelmail/squirrelmail.patch.plugins
--- a/squirrelmail/squirrelmail.patch.plugins	Sat Apr 18 14:15:58 2009 +0200
+++ b/squirrelmail/squirrelmail.patch.plugins	Sat Apr 18 14:16:14 2009 +0200
@@ -2,31 +2,30 @@
 diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php
 --- etc/squirrelmail/config.php.orig	2005-03-16 13:02:25 +0100
 +++ etc/squirrelmail/config.php	2005-03-16 12:31:51 +0100
-@@ -88,6 +88,24 @@
- $plugins[12] = 'squirrel_logger';
- $plugins[13] = 'translate';
+@@ -90,6 +90,23 @@
+ $plugins[15] = 'squirrelspell';
+ $plugins[16] = 'translate';
  
-+$plugins[14] = 'addgraphics';
-+$plugins[15] = 'avelsieve';
-+$plugins[16] = 'check_quota';
-+$plugins[17] = 'chg_sasl_passwd';
-+$plugins[18] = 'change_ldappass';
-+$plugins[19] = 'folder_sizes';
-+$plugins[20] = 'gpg';
-+$plugins[21] = 'ldifimport';
-+$plugins[22] = 'pupdate';
-+$plugins[23] = 'show_user_and_ip';
-+$plugins[24] = 'smallcal';
-+$plugins[25] = 'vkeyboard';
-+$plugins[26] = 'username';
-+$plugins[27] = 'login_notes';
-+$plugins[28] = 'password_forget';
-+$plugins[39] = 'captcha';
++$plugins[17] = 'addgraphics';
++$plugins[18] = 'avelsieve';
++$plugins[19] = 'captcha';
++$plugins[20] = 'change_ldappass';
++$plugins[21] = 'check_quota';
++$plugins[22] = 'chg_sasl_passwd';
++$plugins[23] = 'folder_sizes';
++$plugins[24] = 'gpg';
++$plugins[25] = 'login_notes';
++$plugins[26] = 'password_forget';
++$plugins[27] = 'pupdate';
++$plugins[28] = 'show_user_and_ip';
++$plugins[29] = 'smallcal';
 +$plugins[30] = 'smime';
++$plugins[31] = 'username';
++$plugins[32] = 'vkeyboard';
 +
  /* NOP, for patch line placeholder (avoids fuzz) */
  $theme_css = '';
- $theme_default = 0;
+ $theme_default = 4;
 Index: share/squirrelmail/plugins/gpg/setup.php
 diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php
 --- share/squirrelmail/plugins/gpg/setup.php.orig	2005-03-18 12:01:39.398171000 +0100