comparison: squirrelmail/squirrelmail.patch.plugins
squirrelmail/squirrelmail.patch.plugins
- changeset 162
- f38ce52e77c3
- parent 157
- 3214ed6c04f6
- child 164
- 3a96478f1303
equal
deleted
inserted
replaced
| 0:80ea3daf9d8e | 1:8f6dec6f8bd6 |
|---|---|
| 1 Index: etc/squirrelmail/config.php | 1 Index: etc/squirrelmail/config.php |
| 2 diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php | 2 diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php |
| 3 --- etc/squirrelmail/config.php.orig 2005-03-16 13:02:25 +0100 | 3 --- etc/squirrelmail/config.php.orig 2005-03-16 13:02:25 +0100 |
| 4 +++ etc/squirrelmail/config.php 2005-03-16 12:31:51 +0100 | 4 +++ etc/squirrelmail/config.php 2005-03-16 12:31:51 +0100 |
| 5 @@ -89,6 +89,19 @@ | 5 @@ -88,6 +88,24 @@ |
| 6 $plugins[13] = 'squirrel_logger'; | 6 $plugins[12] = 'squirrel_logger'; |
| 7 $plugins[14] = 'translate'; | 7 $plugins[13] = 'translate'; |
| 8 | 8 |
| 9 +$plugins[15] = 'addgraphics'; | 9 +$plugins[14] = 'addgraphics'; |
| 10 +$plugins[16] = 'avelsieve'; | 10 +$plugins[15] = 'avelsieve'; |
| 11 +$plugins[17] = 'check_quota'; | 11 +$plugins[16] = 'check_quota'; |
| 12 +$plugins[18] = 'chg_sasl_passwd'; | 12 +$plugins[17] = 'chg_sasl_passwd'; |
| 13 +$plugins[18] = 'change_ldappass'; | |
| 13 +$plugins[19] = 'folder_sizes'; | 14 +$plugins[19] = 'folder_sizes'; |
| 14 +$plugins[20] = 'gpg'; | 15 +$plugins[20] = 'gpg'; |
| 15 +$plugins[21] = 'ldifimport'; | 16 +$plugins[21] = 'ldifimport'; |
| 16 +$plugins[22] = 'pupdate'; | 17 +$plugins[22] = 'pupdate'; |
| 17 +$plugins[23] = 'show_user_and_ip'; | 18 +$plugins[23] = 'show_user_and_ip'; |
| 18 +$plugins[24] = 'smallcal'; | 19 +$plugins[24] = 'smallcal'; |
| 19 +$plugins[25] = 'vkeyboard'; | 20 +$plugins[25] = 'vkeyboard'; |
| 20 +$plugins[26] = 'username'; | 21 +$plugins[26] = 'username'; |
| 22 +$plugins[27] = 'login_notes'; | |
| 23 +$plugins[28] = 'password_forget'; | |
| 24 +$plugins[39] = 'captcha'; | |
| 25 +$plugins[30] = 'smime'; | |
| 21 + | 26 + |
| 22 /* NOP, for patch line placeholder (avoids fuzz) */ | 27 /* NOP, for patch line placeholder (avoids fuzz) */ |
| 23 $theme_css = ''; | 28 $theme_css = ''; |
| 24 $theme_default = 0; | 29 $theme_default = 0; |
| 25 Index: share/squirrelmail/plugins/gpg/setup.php | 30 Index: share/squirrelmail/plugins/gpg/setup.php |
| 26 diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php | 31 diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php |
| 27 --- share/squirrelmail/plugins/gpg/setup.php.orig 2005-03-18 12:01:39.398171000 +0100 | 32 --- share/squirrelmail/plugins/gpg/setup.php.orig 2005-03-18 12:01:39.398171000 +0100 |
| 28 +++ share/squirrelmail/plugins/gpg/setup.php 2005-03-18 12:03:35.986216000 +0100 | 33 +++ share/squirrelmail/plugins/gpg/setup.php 2005-03-18 12:03:35.986216000 +0100 |
| 29 @@ -14,7 +14,9 @@ | 34 @@ -23,7 +23,9 @@ |
| 30 * | 35 |
| 31 */ | 36 //define SM_PATH |
| 32 if (!defined (SM_PATH)){ | 37 if (!defined ('SM_PATH')){ |
| 33 - if (file_exists('./gpg_functions.php')){ | 38 - if (file_exists('./gpg_functions.php')){ |
| 34 + if (file_exists('../../../plugins/gpg/gpg_functions.php')){ | 39 + if (file_exists('../../../plugins/gpg/gpg_functions.php')){ |
| 35 + define (SM_PATH , '../../../'); | 40 + define ('SM_PATH' , '../../../'); |
| 36 + } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){ | 41 + } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){ |
| 37 define (SM_PATH , '../../'); | 42 define ('SM_PATH' , '../../'); |
| 38 } elseif (file_exists('../plugins/gpg/gpg_functions.php')) { | 43 } elseif (file_exists('../plugins/gpg/gpg_functions.php')) { |
| 39 define (SM_PATH, '../'); | 44 define ('SM_PATH', '../'); |
| 40 Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php | 45 Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php |
| 41 diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php | 46 diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php |
| 42 --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig 2005-03-17 21:00:03.157951000 +0100 | 47 --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig 2005-03-17 21:00:03.157951000 +0100 |
| 43 +++ share/squirrelmail/plugins/chg_sasl_passwd/options.php 2005-03-18 14:16:40.480988000 +0100 | 48 +++ share/squirrelmail/plugins/chg_sasl_passwd/options.php 2005-03-18 14:16:40.480988000 +0100 |
| 44 @@ -70,8 +70,8 @@ | 49 @@ -70,8 +70,8 @@ |
| 82 -$settings['quota_type'] = 0; | 87 -$settings['quota_type'] = 0; |
| 83 +$settings['quota_type'] = 1; | 88 +$settings['quota_type'] = 1; |
| 84 | 89 |
| 85 | 90 |
| 86 /* | 91 /* |
| 87 | 92 Index: share/squirrelmail/plugins/captcha/functions.php |
| 93 diff -uaN share/squirrelmail/plugins/captcha/functions.php.orig share/squirrelmail/plugins/captcha/functions.php | |
| 94 --- share/squirrelmail/plugins/captcha/functions.php.orig 2009-02-02 16:13:12.000000000 +0100 | |
| 95 +++ share/squirrelmail/plugins/captcha/functions.php 2009-04-17 22:30:41.804849878 +0200 | |
| 96 @@ -122,13 +122,15 @@ | |
| 97 | |
| 98 if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)) | |
| 99 { | |
| 100 - include_once(SM_PATH . 'plugins/user_info/functions.php'); | |
| 101 + if (include_once(SM_PATH . 'plugins/user_info/functions.php')) | |
| 102 + { | |
| 103 $user_info = get_user_info(); | |
| 104 if (empty($user_info['country_code'])) | |
| 105 { | |
| 106 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); | |
| 107 return TRUE; | |
| 108 } | |
| 109 + } | |
| 110 } | |
| 111 } | |
| 112 | |
| 113 @@ -183,7 +185,8 @@ | |
| 114 if (!empty($hide_captcha_ips) || !empty($show_captcha_ips) | |
| 115 && file_exists(SM_PATH . 'plugins/user_info/functions.php')) | |
| 116 { | |
| 117 - include_once(SM_PATH . 'plugins/user_info/functions.php'); | |
| 118 + if (include_once(SM_PATH . 'plugins/user_info/functions.php')) | |
| 119 + { | |
| 120 $user_info = get_user_info(); | |
| 121 if (!empty($user_info['ip_address'])) | |
| 122 { | |
| 123 @@ -194,6 +197,7 @@ | |
| 124 && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips)) | |
| 125 return; | |
| 126 } | |
| 127 + } | |
| 128 } | |
| 129 | |
| 130 | |
| 131 @@ -203,7 +207,8 @@ | |
| 132 if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries) | |
| 133 && file_exists(SM_PATH . 'plugins/user_info/functions.php')) | |
| 134 { | |
| 135 - include_once(SM_PATH . 'plugins/user_info/functions.php'); | |
| 136 + if (include_once(SM_PATH . 'plugins/user_info/functions.php')) | |
| 137 + { | |
| 138 $user_info = get_user_info(); | |
| 139 if (!empty($user_info['country_code'])) | |
| 140 { | |
| 141 @@ -214,6 +219,7 @@ | |
| 142 && !in_array($user_info['country_code'], $show_captcha_countries)) | |
| 143 return; | |
| 144 } | |
| 145 + } | |
| 146 } | |
| 147 | |
| 148 | |
| 149 @@ -257,7 +263,8 @@ | |
| 150 if (!empty($hide_captcha_ips) || !empty($show_captcha_ips) | |
| 151 && file_exists(SM_PATH . 'plugins/user_info/functions.php')) | |
| 152 { | |
| 153 - include_once(SM_PATH . 'plugins/user_info/functions.php'); | |
| 154 + if (include_once(SM_PATH . 'plugins/user_info/functions.php')) | |
| 155 + { | |
| 156 $user_info = get_user_info(); | |
| 157 if (!empty($user_info['ip_address'])) | |
| 158 { | |
| 159 @@ -268,6 +275,7 @@ | |
| 160 && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips)) | |
| 161 return; | |
| 162 } | |
| 163 + } | |
| 164 } | |
| 165 | |
| 166 | |
| 167 @@ -277,7 +285,8 @@ | |
| 168 if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries) | |
| 169 && file_exists(SM_PATH . 'plugins/user_info/functions.php')) | |
| 170 { | |
| 171 - include_once(SM_PATH . 'plugins/user_info/functions.php'); | |
| 172 + if (include_once(SM_PATH . 'plugins/user_info/functions.php')) | |
| 173 + { | |
| 174 $user_info = get_user_info(); | |
| 175 if (!empty($user_info['country_code'])) | |
| 176 { | |
| 177 @@ -288,6 +297,7 @@ | |
| 178 && !in_array($user_info['country_code'], $show_captcha_countries)) | |
| 179 return; | |
| 180 } | |
| 181 + } | |
| 182 } | |
| 183 | |
| 184 |
