head 1.6; access; symbols OPENPKG_E1_MP_HEAD:1.5 OPENPKG_E1_MP:1.5 OPENPKG_E1_MP_2_STABLE:1.5.2.2 OPENPKG_E1_FP:1.5.2.2 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.5.2.2 OPENPKG_2_STABLE:1.5.0.2 OPENPKG_CW_FP:1.4; locks; strict; comment @# @; 1.6 date 2008.01.04.13.19.20; author rse; state Exp; branches; next 1.5; commitid 7WRubZtHAL9Mc6Ms; 1.5 date 2006.10.15.12.00.47; author rse; state Exp; branches 1.5.2.1; next 1.4; commitid bx9ZE2JrwydF6MQr; 1.4 date 2005.03.22.15.17.53; author ms; state Exp; branches; next 1.3; 1.3 date 2005.03.20.16.06.38; author ms; state Exp; branches; next 1.2; 1.2 date 2005.03.17.21.06.08; author ms; state Exp; branches; next 1.1; 1.1 date 2005.03.16.18.23.45; author ms; state Exp; branches; next ; 1.5.2.1 date 2006.10.15.12.00.47; author rse; state dead; branches; next 1.5.2.2; commitid iZxwRSmmWscPXUQr; 1.5.2.2 date 2006.10.16.14.56.46; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.6 log @apply patches contributed by Alain Spineux @ text @Index: etc/squirrelmail/config.php 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 @@@@ -89,6 +89,19 @@@@ $plugins[13] = 'squirrel_logger'; $plugins[14] = 'translate'; +$plugins[15] = 'addgraphics'; +$plugins[16] = 'avelsieve'; +$plugins[17] = 'check_quota'; +$plugins[18] = 'chg_sasl_passwd'; +$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'; + /* NOP, for patch line placeholder (avoids fuzz) */ $theme_css = ''; $theme_default = 0; 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 +++ share/squirrelmail/plugins/gpg/setup.php 2005-03-18 12:03:35.986216000 +0100 @@@@ -14,7 +14,9 @@@@ * */ if (!defined (SM_PATH)){ - if (file_exists('./gpg_functions.php')){ + if (file_exists('../../../plugins/gpg/gpg_functions.php')){ + define (SM_PATH , '../../../'); + } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){ define (SM_PATH , '../../'); } elseif (file_exists('../plugins/gpg/gpg_functions.php')) { define (SM_PATH, '../'); Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig 2005-03-17 21:00:03.157951000 +0100 +++ share/squirrelmail/plugins/chg_sasl_passwd/options.php 2005-03-18 14:16:40.480988000 +0100 @@@@ -70,8 +70,8 @@@@ ' "" + dir_path + "/../../src/signout.php?chg_sasl_passwd";' . "', 0);\n" . "//-->\n\n"; - echo "

" . _("Your password has successfully been changed.") . "

\n"; - echo '
' . _("Please") . '
" . _("Your password has successfully been changed.") . "
\n"; + echo '
' . _("Please, ") . '' . _("logout and log back in using your new password.") . "
\n"; } Index: share/squirrelmail/plugins/chg_sasl_passwd/setup.php diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig share/squirrelmail/plugins/chg_sasl_passwd/setup.php --- share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig 2005-03-03 00:38:44.000000000 +0100 +++ share/squirrelmail/plugins/chg_sasl_passwd/setup.php 2005-03-18 14:29:52.513613000 +0100 @@@@ -32,8 +32,12 @@@@ if (isset($_SERVER['QUERY_STRING']) && stristr($_SERVER['QUERY_STRING'], 'chg_sasl_passwd') ) - echo "
" . _("Your password has been changed. This requires that you logout and then log back in with the new password.") . - "


\n" . _("Logging out automagically") . ".

\n"; + echo "

" . + "
" . _("Your password has been changed.") . + "
" . _("This requires that you logout and then") . + "
" . _("log back in with the new password.") . + "

" . _("Logging out automatically...") . + "



\n"; /* Switch back to the SquirrelMail domain */ textdomain('squirrelmail'); Index: share/squirrelmail/plugins/check_quota/config.sample.php diff -uaN share/squirrelmail/plugins/check_quota/config.sample.php.orig share/squirrelmail/plugins/check_quota/config.sample.php --- share/squirrelmail/plugins/check_quota/config.sample.php.orig 2008-01-03 06:39:34.000000000 +0100 +++ share/squirrelmail/plugins/check_quota/config.sample.php 2008-01-03 06:39:48.000000000 +0100 @@@@ -25,7 +25,7 @@@@ * 0: UNIX / 1: IMAP / 2: cPanel */ -$settings['quota_type'] = 0; +$settings['quota_type'] = 1; /* @ 1.5 log @package cleanups and addition of 'username' module -- taken over from Michael Schloh's patch set @ text @d74 14 @ 1.5.2.1 log @file squirrelmail.patch.plugins was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:46 +0000 @ text @d1 73 @ 1.5.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 73 Index: etc/squirrelmail/config.php 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 @@@@ -89,6 +89,19 @@@@ $plugins[13] = 'squirrel_logger'; $plugins[14] = 'translate'; +$plugins[15] = 'addgraphics'; +$plugins[16] = 'avelsieve'; +$plugins[17] = 'check_quota'; +$plugins[18] = 'chg_sasl_passwd'; +$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'; + /* NOP, for patch line placeholder (avoids fuzz) */ $theme_css = ''; $theme_default = 0; 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 +++ share/squirrelmail/plugins/gpg/setup.php 2005-03-18 12:03:35.986216000 +0100 @@@@ -14,7 +14,9 @@@@ * */ if (!defined (SM_PATH)){ - if (file_exists('./gpg_functions.php')){ + if (file_exists('../../../plugins/gpg/gpg_functions.php')){ + define (SM_PATH , '../../../'); + } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){ define (SM_PATH , '../../'); } elseif (file_exists('../plugins/gpg/gpg_functions.php')) { define (SM_PATH, '../'); Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig 2005-03-17 21:00:03.157951000 +0100 +++ share/squirrelmail/plugins/chg_sasl_passwd/options.php 2005-03-18 14:16:40.480988000 +0100 @@@@ -70,8 +70,8 @@@@ ' "" + dir_path + "/../../src/signout.php?chg_sasl_passwd";' . "', 0);\n" . "//-->\n\n"; - echo "

" . _("Your password has successfully been changed.") . "

\n"; - echo '
' . _("Please") . '
" . _("Your password has successfully been changed.") . "
\n"; + echo '
' . _("Please, ") . '' . _("logout and log back in using your new password.") . "
\n"; } Index: share/squirrelmail/plugins/chg_sasl_passwd/setup.php diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig share/squirrelmail/plugins/chg_sasl_passwd/setup.php --- share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig 2005-03-03 00:38:44.000000000 +0100 +++ share/squirrelmail/plugins/chg_sasl_passwd/setup.php 2005-03-18 14:29:52.513613000 +0100 @@@@ -32,8 +32,12 @@@@ if (isset($_SERVER['QUERY_STRING']) && stristr($_SERVER['QUERY_STRING'], 'chg_sasl_passwd') ) - echo "
" . _("Your password has been changed. This requires that you logout and then log back in with the new password.") . - "


\n" . _("Logging out automagically") . ".

\n"; + echo "

" . + "
" . _("Your password has been changed.") . + "
" . _("This requires that you logout and then") . + "
" . _("log back in with the new password.") . + "

" . _("Logging out automatically...") . + "



\n"; /* Switch back to the SquirrelMail domain */ textdomain('squirrelmail'); @ 1.4 log @add avelsieve script management plugin, correct chk_sasl_passwd default config paths, and display message sizes by default @ text @d5 1 a5 1 @@@@ -89,6 +89,18 @@@@ d20 1 @ 1.3 log @make compatibility and logger plugins mandatory, add rc file for log rotation, install better PNG files, and correct GPG plugin paths @ text @d5 1 a5 1 @@@@ -88,6 +88,17 @@@@ d10 10 a19 9 +$plugins[16] = 'check_quota'; +$plugins[17] = 'chg_sasl_passwd'; +$plugins[18] = 'folder_sizes'; +$plugins[19] = 'gpg'; +$plugins[20] = 'ldifimport'; +$plugins[21] = 'pupdate'; +$plugins[22] = 'show_user_and_ip'; +$plugins[23] = 'smallcal'; +$plugins[24] = 'vkeyboard'; a23 21 Index: share/squirrelmail/plugins/gpg/gpg_local_prefs.txt diff -Nau share/squirrelmail/plugins/gpg/gpg_local_prefs.txt.orig share/squirrelmail/plugins/gpg/gpg_local_prefs.txt.php --- share/squirrelmail/plugins/gpg/gpg_local_prefs.txt.orig 2005-03-17 13:05:32.171844020 +0100 +++ share/squirrelmail/plugins/gpg/gpg_local_prefs.txt 2005-03-17 13:06:31.730254296 +0100 @@@@ -4,7 +4,7 @@@@ # # $Id: squirrelmail.patch.plugins,v 1.2 2005/03/17 21:06:08 ms Exp $ # -path_to_gpg=/usr/bin/gpg +path_to_gpg=@@l_prefix@@/bin/gpg allowprivatekeys=true allowkeygeneration=true systemkeyring=false @@@@ -14,6 +14,6 @@@@ maxfilesize=100000 allowpassphrasecaching=false insecure_mem_warning=1 -default_keystrength=1024 +default_keystrength=2048 default_keyexpires=2y debug=0 @ 1.2 log @add GnuPG configuration, abstract and improve default prefs, correctly install docs, activate pupdate (auto plugin update checks), and repair config attributes @ text @d5 3 a7 3 @@@@ -88,6 +88,18 @@@@ $plugins[12] = 'translate'; $plugins[13] = 'compat'; d9 3 a11 4 +$plugins[14] = 'addgraphics'; +$plugins[15] = 'check_quota'; +$plugins[16] = 'chg_sasl_passwd'; +$plugins[17] = 'compatibility'; d29 1 a29 1 # $Id: gpg_local_prefs.txt,v 1.12 2003/10/17 12:50:20 brian Exp $ d44 49 @ 1.1 log @overhaul everything, don't install development 1.5.x trunk, new with_plugins option @ text @d1 4 a4 4 Index: config.php diff -Nau config.php.orig config.php --- config.php.orig 2005-03-16 13:02:25 +0100 +++ config.php 2005-03-16 12:31:51 +0100 d24 21 @