squirrelmail/squirrelmail.patch.plugins@5524672ebbe7
squirrelmail/squirrelmail.patch.plugins
Fri, 17 Apr 2009 23:40:08 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 17 Apr 2009 23:40:08 +0200
- changeset 159
- 5524672ebbe7
- parent 157
- 3214ed6c04f6
- child 164
- 3a96478f1303
- permissions
- -rw-r--r--
Update and completely overhaul packaging and build configuration.
1 Index: 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
4 +++ etc/squirrelmail/config.php 2005-03-16 12:31:51 +0100
5 @@ -88,6 +88,24 @@
6 $plugins[12] = 'squirrel_logger';
7 $plugins[13] = 'translate';
9 +$plugins[14] = 'addgraphics';
10 +$plugins[15] = 'avelsieve';
11 +$plugins[16] = 'check_quota';
12 +$plugins[17] = 'chg_sasl_passwd';
13 +$plugins[18] = 'change_ldappass';
14 +$plugins[19] = 'folder_sizes';
15 +$plugins[20] = 'gpg';
16 +$plugins[21] = 'ldifimport';
17 +$plugins[22] = 'pupdate';
18 +$plugins[23] = 'show_user_and_ip';
19 +$plugins[24] = 'smallcal';
20 +$plugins[25] = 'vkeyboard';
21 +$plugins[26] = 'username';
22 +$plugins[27] = 'login_notes';
23 +$plugins[28] = 'password_forget';
24 +$plugins[39] = 'captcha';
25 +$plugins[30] = 'smime';
26 +
27 /* NOP, for patch line placeholder (avoids fuzz) */
28 $theme_css = '';
29 $theme_default = 0;
30 Index: share/squirrelmail/plugins/gpg/setup.php
31 diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php
32 --- share/squirrelmail/plugins/gpg/setup.php.orig 2005-03-18 12:01:39.398171000 +0100
33 +++ share/squirrelmail/plugins/gpg/setup.php 2005-03-18 12:03:35.986216000 +0100
34 @@ -23,7 +23,9 @@
36 //define SM_PATH
37 if (!defined ('SM_PATH')){
38 - if (file_exists('./gpg_functions.php')){
39 + if (file_exists('../../../plugins/gpg/gpg_functions.php')){
40 + define ('SM_PATH' , '../../../');
41 + } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){
42 define ('SM_PATH' , '../../');
43 } elseif (file_exists('../plugins/gpg/gpg_functions.php')) {
44 define ('SM_PATH', '../');
45 Index: 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
47 --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig 2005-03-17 21:00:03.157951000 +0100
48 +++ share/squirrelmail/plugins/chg_sasl_passwd/options.php 2005-03-18 14:16:40.480988000 +0100
49 @@ -70,8 +70,8 @@
50 ' "" + dir_path + "/../../src/signout.php?chg_sasl_passwd";' . "', 0);\n" .
51 "//-->\n</script>\n";
53 - echo "<H2>" . _("Your password has successfully been changed.") . "</H2>\n";
54 - echo '<div align=center>' . _("Please") . '<a href="' . SM_PATH .
55 + echo "<H2><div align=center>" . _("Your password has successfully been changed.") . "</div></H2>\n";
56 + echo '<div align=center>' . _("Please, ") . '<a href="' . SM_PATH .
57 'src/signout.php?chg_sasl_passwd" TARGET=_top>' .
58 _("logout and log back in using your new password.") . "</div>\n";
59 }
60 Index: share/squirrelmail/plugins/chg_sasl_passwd/setup.php
61 diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig share/squirrelmail/plugins/chg_sasl_passwd/setup.php
62 --- share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig 2005-03-03 00:38:44.000000000 +0100
63 +++ share/squirrelmail/plugins/chg_sasl_passwd/setup.php 2005-03-18 14:29:52.513613000 +0100
64 @@ -32,8 +32,12 @@
66 if (isset($_SERVER['QUERY_STRING']) &&
67 stristr($_SERVER['QUERY_STRING'], 'chg_sasl_passwd') )
68 - echo "<br><b>" . _("Your password has been changed. This requires that you logout and then log back in with the new password.") .
69 - "<br><p><br>\n" . _("Logging out automagically") . ".<br><br>\n";
70 + echo "<center>" .
71 + "<br /><b>" . _("Your password has been changed.") .
72 + "</b><br />" . _("This requires that you logout and then") .
73 + "<br />" . _("log back in with the new password.") .
74 + "<br /><br />" . _("Logging out automatically...") .
75 + "</center><br /><br /><br />\n";
77 /* Switch back to the SquirrelMail domain */
78 textdomain('squirrelmail');
79 Index: share/squirrelmail/plugins/check_quota/config.sample.php
80 diff -uaN share/squirrelmail/plugins/check_quota/config.sample.php.orig share/squirrelmail/plugins/check_quota/config.sample.php
81 --- share/squirrelmail/plugins/check_quota/config.sample.php.orig 2008-01-03 06:39:34.000000000 +0100
82 +++ share/squirrelmail/plugins/check_quota/config.sample.php 2008-01-03 06:39:48.000000000 +0100
83 @@ -25,7 +25,7 @@
84 * 0: UNIX / 1: IMAP / 2: cPanel
85 */
87 -$settings['quota_type'] = 0;
88 +$settings['quota_type'] = 1;
91 /*
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 @@
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 }
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 }
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 }
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 }
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 }
