Mailgun for WordPress - Version 1.5.2

Version Description

(2016-12-22): = * Added option fields for setting a From name and address

Release Info

Developer	Mailgun
Plugin	Mailgun for WordPress
Version	1.5.2
Comparing to
See all releases

Code changes from version 1.5.1 to 1.5.2

Files changed (6) hide show

CHANGELOG.md +3 -0
includes/options-page.php +18 -0
includes/wp-mail.php +15 -6
languages/mailgun-template.po +193 -49
mailgun.php +1 -1
readme.txt +4 -1

CHANGELOG.md CHANGED Viewed

	@@ -1,6 +1,9 @@
1	Changelog
2	=========
3



4	1.5.1 (2016-12-21):
5	* Fixed an issue causing plugin upgrades from <1.5 -> >=1.5 to deactivate
6


1	Changelog
2	=========
3
4	+ 1.5.2 (2016-12-22):
5	+ * Added option fields for setting a From name and address
6	+
7	1.5.1 (2016-12-21):
8	* Fixed an issue causing plugin upgrades from <1.5 -> >=1.5 to deactivate
9

includes/options-page.php CHANGED Viewed

@@ -115,6 +115,24 @@
                                         <p class="description"><?php _e('If enabled, HTML messages will include an open tracking beacon.', 'mailgun'); ?> <a href="http://documentation.mailgun.com/user_manual.html#tracking-opens" target="_blank">Open Tracking Documentation</a></p>
                                     </td>
                                 </tr>
                                 <tr valign="top">
                                     <th scope="row">
                                         <?php _e('Tag', 'mailgun'); ?>


115	<p class="description"><?php _e('If enabled, HTML messages will include an open tracking beacon.', 'mailgun'); ?> <a href="http://documentation.mailgun.com/user_manual.html#tracking-opens" target="_blank">Open Tracking Documentation</a></p>
116	</td>
117	</tr>
118	+ <tr valign="top">
119	+ <th scope="row">
120	+ <?php _e('From Address', 'mailgun'); ?>
121	+ </th>
122	+ <td>
123	+ <input type="text" class="regular-text" name="mailgun[from-address]" value="<?php esc_attr_e($this->get_option('from-address')); ?>" placeholder="wordpress@mydomain.com" />
124	+ <p class="description"><?php _e('The <address@mydomain.com> part of the sender information (<code>"Excited User <user@samples.mailgun.org>"</code>). This address will appear as the `From` address on sent mail. It is recommended that the @mydomain portion matches your WordPress domain.', 'mailgun'); ?></p>
125	+ </td>
126	+ </tr>
127	+ <tr valign="top">
128	+ <th scope="row">
129	+ <?php _e('From Name', 'mailgun'); ?>
130	+ </th>
131	+ <td>
132	+ <input type="text" class="regular-text" name="mailgun[from-name]" value="<?php esc_attr_e($this->get_option('from-name')); ?>" placeholder="WordPress" />
133	+ <p class="description"><?php _e('The "User Name" part of the sender information (<code>"Excited User <user@samples.mailgun.org>"</code>).', 'mailgun'); ?></p>
134	+ </td>
135	+ </tr>
136	<tr valign="top">
137	<th scope="row">
138	<?php _e('Tag', 'mailgun'); ?>

includes/wp-mail.php CHANGED Viewed

	@@ -155,9 +155,20 @@ function wp_mail($to, $subject, $message, $headers = '', $attachments = [])
155	}
156	}
157









158	// From email and name
159	// If we don't have a name from the input headers
160	- if (!isset($from_name)) {


161	$from_name = 'WordPress';
162	}
163
	@@ -168,7 +179,9 @@ function wp_mail($to, $subject, $message, $headers = '', $attachments = [])
168	* http://trac.wordpress.org/ticket/5007.
169	*/
170
171	- if (!isset($from_email)) {


172	// Get the site domain and get rid of www.
173	$sitename = strtolower($_SERVER['SERVER_NAME']);
174	if (substr($sitename, 0, 4) == 'www.') {
	@@ -178,10 +191,6 @@ function wp_mail($to, $subject, $message, $headers = '', $attachments = [])
178	$from_email = 'wordpress@'.$sitename;
179	}
180
181	- // Plugin authors can override the potentially troublesome default
182	- $from_email = apply_filters('wp_mail_from', $from_email);
183	- $from_name = apply_filters('wp_mail_from_name', $from_name);
184	-
185	$body = [
186	'from' => "{$from_name} <{$from_email}>",
187	'to' => $to,


155	}
156	}
157
158	+ // Attempt to apply external filters to these values before using our own.
159	+ if (has_filter('wp_mail_from')) {
160	+ $from_email = apply_filters('wp_mail_from', $from_email);
161	+ }
162	+
163	+ if (has_filter('wp_mail_from_name')) {
164	+ $from_name = apply_filters('wp_mail_from_name', $from_name);
165	+ }
166	+
167	// From email and name
168	// If we don't have a name from the input headers
169	+ if (!isset($from_name) && !empty($mailgun['from-name'])) {
170	+ $from_name = $mailgun['from-name'];
171	+ } else {
172	$from_name = 'WordPress';
173	}
174

179	* http://trac.wordpress.org/ticket/5007.
180	*/
181
182	+ if (!isset($from_email) && !empty($mailgun['from-address'])) {
183	+ $from_email = $mailgun['from-address'];
184	+ } else {
185	// Get the site domain and get rid of www.
186	$sitename = strtolower($_SERVER['SERVER_NAME']);
187	if (substr($sitename, 0, 4) == 'www.') {

191	$from_email = 'wordpress@'.$sitename;
192	}
193




194	$body = [
195	'from' => "{$from_name} <{$from_email}>",
196	'to' => $to,

languages/mailgun-template.po CHANGED Viewed

@@ -1,88 +1,95 @@
             msgid ""
             msgstr ""
-            -
            "Project-Id-Version: Mailgun\n"
-            -
            "POT-Creation-Date: 2012-11-20 13:54-0600\n"
-            -
            "PO-Revision-Date: 2012-11-20 13:54-0600\n"
-            -
            "Last-Translator: Matt Martz <matt@sivel.net>\n"
-            -
            "Language-Team: Mailgun <matt@sivel.net>\n"
-            -
            "Language: en_US\n"
             "MIME-Version: 1.0\n"
             "Content-Type: text/plain; charset=UTF-8\n"
             "Content-Transfer-Encoding: 8bit\n"
-            -
-            -
            #: mailgun.php:89
-            -
            #, php-format
-            -
            msgid ""
-            -
            "Mailgun has been automatically deactivated because the file <strong>%s</"
-            -
            "strong> is missing. Please reinstall the plugin and reactivate."
             msgstr ""
-            -
            #: includes/admin.php:60 includes/options-page.php:4
-            -
            msgid "Mailgun"
             msgstr ""
-            -
            #: includes/admin.php:105
             msgid ""
             "The Mailgun plugin configuration has changed since you last saved. Do you "
             "wish to test anyway?\\n\\nClick \"Cancel\" and then \"Save Changes\" if you "
             "wish to save your changes."
             msgstr ""
-            -
            #: includes/admin.php:110
             msgid "Testing..."
             msgstr ""
-            -
            #: includes/admin.php:120 includes/options-page.php:75
             msgid "Test Configuration"
             msgstr ""
-            -
            #: includes/admin.php:126 includes/admin.php:288
             msgid "Failure"
             msgstr ""
-            -
            #: includes/admin.php:146
-            -
            #, php-format
             msgid ""
             "<div id=\"message\" class=\"updated fade\"><p>The options page for the "
             "<strong>Mailgun</strong> plugin cannot be displayed. The file <strong>%s</"
             "strong> is missing.  Please reinstall the plugin.</p></div>"
             msgstr ""
-            -
            #: includes/admin.php:223
             msgid "Mailgun is almost ready. "
             msgstr ""
-            -
            #: includes/admin.php:223
-            -
            #, php-format
             msgid "You must <a href=\"%1$s\">configure Mailgun</a> for it to work."
             msgstr ""
-            -
            #: includes/admin.php:235
             msgid "Settings"
             msgstr ""
-            -
            #: includes/admin.php:254
             msgid "Unauthorized"
             msgstr ""
-            -
            #: includes/admin.php:264
             msgid "HTTP API"
             msgstr ""
-            -
            #: includes/admin.php:266
             msgid "Secure SMTP"
             msgstr ""
-            -
            #: includes/admin.php:266
             msgid "SMTP"
             msgstr ""
-            -
            #: includes/admin.php:271
             msgid "Mailgun WordPress Plugin Test"
             msgstr ""
-            -
            #: includes/admin.php:272
-            -
            #, php-format
             msgid ""
             "This is a test email generated by the Mailgun WordPress plugin.\n"
             "\n"
@@ -91,85 +98,222 @@ msgid ""
             "The method used to send this email was: %s."
             msgstr ""
-            -
            #: includes/admin.php:279
             msgid "Success"
             msgstr ""
-            -
            #: includes/options-page.php:9
             msgid "Configuration"
             msgstr ""
-            -
            #: includes/options-page.php:13
             msgid "Use HTTP API"
             msgstr ""
-            -
            #: includes/options-page.php:17 includes/options-page.php:65
             msgid "Yes"
             msgstr ""
-            -
            #: includes/options-page.php:18 includes/options-page.php:66
             msgid "No"
             msgstr ""
-            -
            #: includes/options-page.php:20
             msgid ""
             "Set this to \"No\" if your server cannot make outbound HTTP connections or "
             "if emails are not being delivered. \"No\" will cause this plugin to use "
             "SMTP. Default \"Yes\"."
             msgstr ""
-            -
            #: includes/options-page.php:25
             msgid "Mailgun Domain Name"
             msgstr ""
-            -
            #: includes/options-page.php:29
             msgid "Your Mailgun Domain Name."
             msgstr ""
-            -
            #: includes/options-page.php:34
             msgid "API Key"
             msgstr ""
-            -
            #: includes/options-page.php:38
             msgid ""
             "Your Mailgun API key, that starts with and includes \"key-\". Only valid for "
             "use with the API."
             msgstr ""
-            -
            #: includes/options-page.php:43
             msgid "Username"
             msgstr ""
-            -
            #: includes/options-page.php:47
             msgid "Your Mailgun SMTP username. Only valid for use with SMTP."
             msgstr ""
-            -
            #: includes/options-page.php:52
             msgid "Password"
             msgstr ""
-            -
            #: includes/options-page.php:56
             msgid ""
             "Your Mailgun SMTP password that goes with the above username. Only valid for "
             "use with SMTP."
             msgstr ""
-            -
            #: includes/options-page.php:61
             msgid "Use Secure SMTP"
             msgstr ""
-            -
            #: includes/options-page.php:68
             msgid ""
             "Set this to \"No\" if your server cannot establish SSL SMTP connections or "
             "if emails are not being delivered. If you set this to \"No\" your password "
             "will be sent in plain text. Only valid for use with SMTP. Default \"Yes\"."
             msgstr ""
-            -
            #: includes/options-page.php:72
             msgid ""
             "Before attempting to test the configuration, please click \"Save Changes\"."
             msgstr ""
-            -
            #: includes/options-page.php:74
             msgid "Save Changes"
             msgstr ""


1	+ # Copyright (C) 2016 Mailgun
2	+ # This file is distributed under the same license as the Mailgun package.
3	msgid ""
4	msgstr ""
5	+ "Project-Id-Version: Mailgun 1.5.2\n"
6	+ "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mailgun\n"
7	+ "POT-Creation-Date: 2016-12-21 20:39:18+00:00\n"



8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"
11	+ "PO-Revision-Date: 2016-12-21 14:49-0600\n"
12	+ "Last-Translator: Sean Johnson <sean@mailgun.com>\n"
13	+ "Language-Team: Mailgun <support@mailgun.com>\n"
14	+
15	+ #. #-#-#-#-# plugin.pot (Mailgun 1.5.2) #-#-#-#-#
16	+ #. Plugin Name of the plugin/theme
17	+ #. #-#-#-#-# plugin.pot (Mailgun 1.5.2) #-#-#-#-#
18	+ #. Author of the plugin/theme
19	+ #: includes/admin.php:95 includes/options-page.php:26
20	+ msgid "Mailgun"
21	msgstr ""
22
23	+ #: includes/admin.php:96 includes/lists-page.php:51
24	+ msgid "Mailgun Lists"
25	msgstr ""
26
27	+ #: includes/admin.php:144
28	msgid ""
29	"The Mailgun plugin configuration has changed since you last saved. Do you "
30	"wish to test anyway?\\n\\nClick \"Cancel\" and then \"Save Changes\" if you "
31	"wish to save your changes."
32	msgstr ""
33
34	+ #: includes/admin.php:149
35	msgid "Testing..."
36	msgstr ""
37
38	+ #: includes/admin.php:159 includes/options-page.php:174
39	msgid "Test Configuration"
40	msgstr ""
41
42	+ #: includes/admin.php:168 includes/admin.php:372
43	msgid "Failure"
44	msgstr ""
45
46	+ #: includes/admin.php:191

47	msgid ""
48	"<div id=\"message\" class=\"updated fade\"><p>The options page for the "
49	"<strong>Mailgun</strong> plugin cannot be displayed. The file <strong>%s</"
50	"strong> is missing. Please reinstall the plugin.</p></div>"
51	msgstr ""
52
53	+ #: includes/admin.php:205
54	+ msgid ""
55	+ "<div id=\"message\" class=\"updated fade\"><p>The lists page for the "
56	+ "<strong>Mailgun</strong> plugin cannot be displayed. The file <strong>%s</"
57	+ "strong> is missing. Please reinstall the plugin.</p></div>"
58	+ msgstr ""
59	+
60	+ #: includes/admin.php:297
61	msgid "Mailgun is almost ready. "
62	msgstr ""
63
64	+ #: includes/admin.php:297

65	msgid "You must <a href=\"%1$s\">configure Mailgun</a> for it to work."
66	msgstr ""
67
68	+ #: includes/admin.php:313
69	msgid "Settings"
70	msgstr ""
71
72	+ #: includes/admin.php:335
73	msgid "Unauthorized"
74	msgstr ""
75
76	+ #: includes/admin.php:345
77	msgid "HTTP API"
78	msgstr ""
79
80	+ #: includes/admin.php:347
81	msgid "Secure SMTP"
82	msgstr ""
83
84	+ #: includes/admin.php:347
85	msgid "SMTP"
86	msgstr ""
87
88	+ #: includes/admin.php:353
89	msgid "Mailgun WordPress Plugin Test"
90	msgstr ""
91
92	+ #: includes/admin.php:354

93	msgid ""
94	"This is a test email generated by the Mailgun WordPress plugin.\n"
95	"\n"

98	"The method used to send this email was: %s."
99	msgstr ""
100
101	+ #: includes/admin.php:362 includes/admin.php:364
102	msgid "Success"
103	msgstr ""
104
105	+ #: includes/lists-page.php:55
106	+ msgid "Available Mailing Lists"
107	+ msgstr ""
108	+
109	+ #: includes/lists-page.php:87
110	+ msgid ""
111	+ "To allow users to subscribe to multiple lists on a single form, comma-"
112	+ "separate the Mailgun list ids."
113	+ msgstr ""
114	+
115	+ #: includes/lists-page.php:89
116	+ msgid ""
117	+ "<strong>Example:</strong> [mailgun id=\"list1@mydomain.com,list2@mydomain.com"
118	+ "\"]"
119	+ msgstr ""
120	+
121	+ #: includes/options-page.php:31
122	msgid "Configuration"
123	msgstr ""
124
125	+ #: includes/options-page.php:35
126	msgid "Use HTTP API"
127	msgstr ""
128
129	+ #: includes/options-page.php:39 includes/options-page.php:87
130	+ #: includes/options-page.php:99 includes/options-page.php:112
131	msgid "Yes"
132	msgstr ""
133
134	+ #: includes/options-page.php:40 includes/options-page.php:88
135	+ #: includes/options-page.php:101 includes/options-page.php:113
136	msgid "No"
137	msgstr ""
138
139	+ #: includes/options-page.php:42
140	msgid ""
141	"Set this to \"No\" if your server cannot make outbound HTTP connections or "
142	"if emails are not being delivered. \"No\" will cause this plugin to use "
143	"SMTP. Default \"Yes\"."
144	msgstr ""
145
146	+ #: includes/options-page.php:47
147	msgid "Mailgun Domain Name"
148	msgstr ""
149
150	+ #: includes/options-page.php:51
151	msgid "Your Mailgun Domain Name."
152	msgstr ""
153
154	+ #: includes/options-page.php:56
155	msgid "API Key"
156	msgstr ""
157
158	+ #: includes/options-page.php:60
159	msgid ""
160	"Your Mailgun API key, that starts with and includes \"key-\". Only valid for "
161	"use with the API."
162	msgstr ""
163
164	+ #: includes/options-page.php:65
165	msgid "Username"
166	msgstr ""
167
168	+ #: includes/options-page.php:69
169	msgid "Your Mailgun SMTP username. Only valid for use with SMTP."
170	msgstr ""
171
172	+ #: includes/options-page.php:74
173	msgid "Password"
174	msgstr ""
175
176	+ #: includes/options-page.php:78
177	msgid ""
178	"Your Mailgun SMTP password that goes with the above username. Only valid for "
179	"use with SMTP."
180	msgstr ""
181
182	+ #: includes/options-page.php:83
183	msgid "Use Secure SMTP"
184	msgstr ""
185
186	+ #: includes/options-page.php:90
187	msgid ""
188	"Set this to \"No\" if your server cannot establish SSL SMTP connections or "
189	"if emails are not being delivered. If you set this to \"No\" your password "
190	"will be sent in plain text. Only valid for use with SMTP. Default \"Yes\"."
191	msgstr ""
192
193	+ #: includes/options-page.php:95
194	+ msgid "Click Tracking"
195	+ msgstr ""
196	+
197	+ #: includes/options-page.php:100
198	+ msgid "HTML Only"
199	+ msgstr ""
200	+
201	+ #: includes/options-page.php:103
202	+ msgid "If enabled, Mailgun will and track links."
203	+ msgstr ""
204	+
205	+ #: includes/options-page.php:108
206	+ msgid "Open Tracking"
207	+ msgstr ""
208	+
209	+ #: includes/options-page.php:115
210	+ msgid "If enabled, HTML messages will include an open tracking beacon."
211	+ msgstr ""
212	+
213	+ #: includes/options-page.php:120
214	+ msgid "From Address"
215	+ msgstr ""
216	+
217	+ #: includes/options-page.php:124
218	+ msgid ""
219	+ "The <address@mydomain.com> part of the sender information (<code>\"Excited "
220	+ "User <user@samples.mailgun.org>\"</code>). This address will appear as "
221	+ "the `From` address on sent mail. It is recommended that the @mydomain "
222	+ "portion matches your WordPress domain."
223	+ msgstr ""
224	+
225	+ #: includes/options-page.php:129
226	+ msgid "From Name"
227	+ msgstr ""
228	+
229	+ #: includes/options-page.php:133
230	+ msgid ""
231	+ "The \"User Name\" part of the sender information (<code>\"Excited User <"
232	+ "user@samples.mailgun.org>\"</code>)."
233	+ msgstr ""
234	+
235	+ #: includes/options-page.php:138
236	+ msgid "Tag"
237	+ msgstr ""
238	+
239	+ #: includes/options-page.php:142
240	+ msgid ""
241	+ "If added, this tag will exist on every outbound message. Statistics will be "
242	+ "populated in the Mailgun Control Panel. Use a comma to define multiple tags."
243	+ msgstr ""
244	+
245	+ #: includes/options-page.php:142
246	+ msgid "Learn more about"
247	+ msgstr ""
248	+
249	+ #: includes/options-page.php:142
250	+ msgid "and"
251	+ msgstr ""
252	+
253	+ #: includes/options-page.php:146 includes/options-page.php:163
254	+ msgid "Lists"
255	+ msgstr ""
256	+
257	+ #: includes/options-page.php:150
258	+ msgid "Shortcode"
259	+ msgstr ""
260	+
261	+ #: includes/options-page.php:157
262	+ msgid ""
263	+ "Use the shortcode above to associate a widget instance with a mailgun list"
264	+ msgstr ""
265	+
266	+ #: includes/options-page.php:171
267	msgid ""
268	"Before attempting to test the configuration, please click \"Save Changes\"."
269	msgstr ""
270
271	+ #: includes/options-page.php:173
272	msgid "Save Changes"
273	msgstr ""
274	+
275	+ #: includes/widget.php:30
276	+ msgid "Mailgun List Widget"
277	+ msgstr ""
278	+
279	+ #: includes/widget.php:32
280	+ msgid "Mailgun list widget"
281	+ msgstr ""
282	+
283	+ #: includes/widget.php:68
284	+ msgid "New list_address"
285	+ msgstr ""
286	+
287	+ #: includes/widget.php:84
288	+ msgid "Title (optional):"
289	+ msgstr ""
290	+
291	+ #: includes/widget.php:88
292	+ msgid "Description (optional):"
293	+ msgstr ""
294	+
295	+ #: includes/widget.php:92
296	+ msgid "List addresses (required):"
297	+ msgstr ""
298	+
299	+ #: includes/widget.php:96
300	+ msgid "Collect name:"
301	+ msgstr ""
302	+
303	+ #: mailgun.php:122
304	+ msgid ""
305	+ "Mailgun has been automatically deactivated because the file <strong>%s</"
306	+ "strong> is missing. Please reinstall the plugin and reactivate."
307	+ msgstr ""
308	+
309	+ #. Plugin URI of the plugin/theme
310	+ msgid "http://wordpress.org/extend/plugins/mailgun/"
311	+ msgstr ""
312	+
313	+ #. Description of the plugin/theme
314	+ msgid "Mailgun integration for WordPress"
315	+ msgstr ""
316	+
317	+ #. Author URI of the plugin/theme
318	+ msgid "http://www.mailgun.com/"
319	+ msgstr ""

mailgun.php CHANGED Viewed

	@@ -23,7 +23,7 @@
23	* Plugin Name: Mailgun
24	* Plugin URI: http://wordpress.org/extend/plugins/mailgun/
25	* Description: Mailgun integration for WordPress
26	- * Version: 1.5.1
27	* Author: Mailgun
28	* Author URI: http://www.mailgun.com/
29	* License: GPLv2 or later


23	* Plugin Name: Mailgun
24	* Plugin URI: http://wordpress.org/extend/plugins/mailgun/
25	* Description: Mailgun integration for WordPress
26	+ * Version: 1.5.2
27	* Author: Mailgun
28	* Author URI: http://www.mailgun.com/
29	* License: GPLv2 or later

readme.txt CHANGED Viewed

	@@ -5,7 +5,7 @@ Contributors: Mailgun, sivel, lookahead.io, m35dev
5	Tags: mailgun, smtp, http, api, mail, email
6	Requires at least: 3.3
7	Tested up to: 4.7
8	- Stable tag: 1.5.1
9	License: GPLv2 or later
10
11
	@@ -68,6 +68,9 @@ MAILGUN_SECURE Type: boolean
68
69	== Changelog ==
70



71	= 1.5.1 (2016-12-21): =
72	* Fixed an issue causing plugin upgrades from <1.5 -> >=1.5 to deactivate
73


5	Tags: mailgun, smtp, http, api, mail, email
6	Requires at least: 3.3
7	Tested up to: 4.7
8	+ Stable tag: 1.5.2
9	License: GPLv2 or later
10
11

68
69	== Changelog ==
70
71	+ = 1.5.2 (2016-12-22): =
72	+ * Added option fields for setting a From name and address
73	+
74	= 1.5.1 (2016-12-21): =
75	* Fixed an issue causing plugin upgrades from <1.5 -> >=1.5 to deactivate
76