1.1 --- a/squirrelmail/squirrelmail.patch.plugins Fri Apr 17 23:07:57 2009 +0200
1.2 +++ b/squirrelmail/squirrelmail.patch.plugins Fri Apr 17 23:40:08 2009 +0200
1.3 @@ -2,14 +2,15 @@
1.4 diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php
1.5 --- etc/squirrelmail/config.php.orig 2005-03-16 13:02:25 +0100
1.6 +++ etc/squirrelmail/config.php 2005-03-16 12:31:51 +0100
1.7 -@@ -89,6 +89,19 @@
1.8 - $plugins[13] = 'squirrel_logger';
1.9 - $plugins[14] = 'translate';
1.10 +@@ -88,6 +88,24 @@
1.11 + $plugins[12] = 'squirrel_logger';
1.12 + $plugins[13] = 'translate';
1.13
1.14 -+$plugins[15] = 'addgraphics';
1.15 -+$plugins[16] = 'avelsieve';
1.16 -+$plugins[17] = 'check_quota';
1.17 -+$plugins[18] = 'chg_sasl_passwd';
1.18 ++$plugins[14] = 'addgraphics';
1.19 ++$plugins[15] = 'avelsieve';
1.20 ++$plugins[16] = 'check_quota';
1.21 ++$plugins[17] = 'chg_sasl_passwd';
1.22 ++$plugins[18] = 'change_ldappass';
1.23 +$plugins[19] = 'folder_sizes';
1.24 +$plugins[20] = 'gpg';
1.25 +$plugins[21] = 'ldifimport';
1.26 @@ -18,6 +19,10 @@
1.27 +$plugins[24] = 'smallcal';
1.28 +$plugins[25] = 'vkeyboard';
1.29 +$plugins[26] = 'username';
1.30 ++$plugins[27] = 'login_notes';
1.31 ++$plugins[28] = 'password_forget';
1.32 ++$plugins[39] = 'captcha';
1.33 ++$plugins[30] = 'smime';
1.34 +
1.35 /* NOP, for patch line placeholder (avoids fuzz) */
1.36 $theme_css = '';
1.37 @@ -26,17 +31,17 @@
1.38 diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php
1.39 --- share/squirrelmail/plugins/gpg/setup.php.orig 2005-03-18 12:01:39.398171000 +0100
1.40 +++ share/squirrelmail/plugins/gpg/setup.php 2005-03-18 12:03:35.986216000 +0100
1.41 -@@ -14,7 +14,9 @@
1.42 - *
1.43 - */
1.44 - if (!defined (SM_PATH)){
1.45 +@@ -23,7 +23,9 @@
1.46 +
1.47 + //define SM_PATH
1.48 + if (!defined ('SM_PATH')){
1.49 - if (file_exists('./gpg_functions.php')){
1.50 + if (file_exists('../../../plugins/gpg/gpg_functions.php')){
1.51 -+ define (SM_PATH , '../../../');
1.52 ++ define ('SM_PATH' , '../../../');
1.53 + } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){
1.54 - define (SM_PATH , '../../');
1.55 + define ('SM_PATH' , '../../');
1.56 } elseif (file_exists('../plugins/gpg/gpg_functions.php')) {
1.57 - define (SM_PATH, '../');
1.58 + define ('SM_PATH', '../');
1.59 Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php
1.60 diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php
1.61 --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig 2005-03-17 21:00:03.157951000 +0100
1.62 @@ -84,4 +89,96 @@
1.63
1.64
1.65 /*
1.66 -
1.67 +Index: share/squirrelmail/plugins/captcha/functions.php
1.68 +diff -uaN share/squirrelmail/plugins/captcha/functions.php.orig share/squirrelmail/plugins/captcha/functions.php
1.69 +--- share/squirrelmail/plugins/captcha/functions.php.orig 2009-02-02 16:13:12.000000000 +0100
1.70 ++++ share/squirrelmail/plugins/captcha/functions.php 2009-04-17 22:30:41.804849878 +0200
1.71 +@@ -122,13 +122,15 @@
1.72 +
1.73 + if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries))
1.74 + {
1.75 +- include_once(SM_PATH . 'plugins/user_info/functions.php');
1.76 ++ if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
1.77 ++ {
1.78 + $user_info = get_user_info();
1.79 + if (empty($user_info['country_code']))
1.80 + {
1.81 + do_err('CAPTCHA plugin used with $show_captcha_countries or $do_not_show_captcha_countries requires the User Information plugin with a IP-to-country module', FALSE);
1.82 + return TRUE;
1.83 + }
1.84 ++ }
1.85 + }
1.86 + }
1.87 +
1.88 +@@ -183,7 +185,8 @@
1.89 + if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
1.90 + && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
1.91 + {
1.92 +- include_once(SM_PATH . 'plugins/user_info/functions.php');
1.93 ++ if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
1.94 ++ {
1.95 + $user_info = get_user_info();
1.96 + if (!empty($user_info['ip_address']))
1.97 + {
1.98 +@@ -194,6 +197,7 @@
1.99 + && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
1.100 + return;
1.101 + }
1.102 ++ }
1.103 + }
1.104 +
1.105 +
1.106 +@@ -203,7 +207,8 @@
1.107 + if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
1.108 + && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
1.109 + {
1.110 +- include_once(SM_PATH . 'plugins/user_info/functions.php');
1.111 ++ if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
1.112 ++ {
1.113 + $user_info = get_user_info();
1.114 + if (!empty($user_info['country_code']))
1.115 + {
1.116 +@@ -214,6 +219,7 @@
1.117 + && !in_array($user_info['country_code'], $show_captcha_countries))
1.118 + return;
1.119 + }
1.120 ++ }
1.121 + }
1.122 +
1.123 +
1.124 +@@ -257,7 +263,8 @@
1.125 + if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
1.126 + && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
1.127 + {
1.128 +- include_once(SM_PATH . 'plugins/user_info/functions.php');
1.129 ++ if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
1.130 ++ {
1.131 + $user_info = get_user_info();
1.132 + if (!empty($user_info['ip_address']))
1.133 + {
1.134 +@@ -268,6 +275,7 @@
1.135 + && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
1.136 + return;
1.137 + }
1.138 ++ }
1.139 + }
1.140 +
1.141 +
1.142 +@@ -277,7 +285,8 @@
1.143 + if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
1.144 + && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
1.145 + {
1.146 +- include_once(SM_PATH . 'plugins/user_info/functions.php');
1.147 ++ if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
1.148 ++ {
1.149 + $user_info = get_user_info();
1.150 + if (!empty($user_info['country_code']))
1.151 + {
1.152 +@@ -288,6 +297,7 @@
1.153 + && !in_array($user_info['country_code'], $show_captcha_countries))
1.154 + return;
1.155 + }
1.156 ++ }
1.157 + }
1.158 +
1.159 +
