Mailgun for WordPress - Version 1.6.1

Version Description

(2018-10-08): = - Restore Settings page form for all install types.

Download this release

Release Info

Developer Mailgun
Plugin Icon 128x128 Mailgun for WordPress
Version 1.6.1
Comparing to
See all releases

Code changes from version 1.6 to 1.6.1

Files changed (5) hide show
  1. CHANGELOG.md +3 -0
  2. includes/admin.php +1 -2
  3. includes/options-page.php +18 -58
  4. mailgun.php +1 -1
  5. readme.txt +5 -2
CHANGELOG.md CHANGED
@@ -1,6 +1,9 @@
1
  Changelog
2
  =========
3
 
 
 
 
4
  1.6 (2018-9-21)
5
  - Refactor admin notifications
6
  - Enable Settings page for all WordPress install types
1
  Changelog
2
  =========
3
 
4
+ 1.6.1 (2018-10-08)
5
+ - Restore Settings page form for all install types.
6
+
7
  1.6 (2018-9-21)
8
  - Refactor admin notifications
9
  - Enable Settings page for all WordPress install types
includes/admin.php CHANGED
@@ -320,8 +320,7 @@
320
  return;
321
  endif;
322
 
323
- if ((defined('WP_ALLOW_MULTISITE') && !defined('MAILGUN_REGION'))
324
- || (!$this->get_option('apiKey') && $this->get_option('useAPI') === '1')
325
  || (!$this->get_option('password') && $this->get_option('useAPI') === '0')
326
  || (!$this->get_option('region') && $this->get_option('useAPI') === '1')
327
  ):
320
  return;
321
  endif;
322
 
323
+ if ((!$this->get_option('apiKey') && $this->get_option('useAPI') === '1')
 
324
  || (!$this->get_option('password') && $this->get_option('useAPI') === '0')
325
  || (!$this->get_option('region') && $this->get_option('useAPI') === '1')
326
  ):
includes/options-page.php CHANGED
@@ -62,11 +62,6 @@
62
  </p>
63
 
64
  <h3><?php _e('Configuration', 'mailgun'); ?></h3>
65
-
66
- <?php
67
- $isMultisite = defined('WP_ALLOW_MULTISITE');
68
- if (!$isMultisite):
69
- ?>
70
  <form id="mailgun-form" action="options.php" method="post">
71
  <?php settings_fields('mailgun'); ?>
72
 
@@ -325,7 +320,7 @@
325
  $url2 = 'https://documentation.mailgun.com/user_manual.html#tagging';
326
  $link = sprintf(
327
  wp_kses(
328
- __('<a href="%1$s" target="%3$s">Tracking</a> and <a href="%2$s">Tagging</a>', 'mailgun'),
329
  array('a' => array(
330
  'href' => array(),
331
  'target' => array()
@@ -339,29 +334,6 @@
339
  </td>
340
  </tr>
341
  </table>
342
- <?php else: ?>
343
- <p>
344
- <?php
345
- _e('Once you have configured the plugin settings in your wp-config.php, you can test it here.', 'mailgun');
346
- ?>
347
- </p>
348
- <p><?php _e('The definitions are as follows:', 'mailgun'); ?></p>
349
- <p>
350
- <pre>
351
- MAILGUN_REGION Choices: 'us' or 'eu'
352
- ex. define('MAILGUN_REGION', 'us');
353
- MAILGUN_USEAPI Choices: '0' or '1' (0 = false/no)
354
- MAILGUN_APIKEY
355
- MAILGUN_DOMAIN
356
- MAILGUN_USERNAME
357
- MAILGUN_PASSWORD
358
- MAILGUN_SECURE
359
- MAILGUN_SECTYPE Choices: 'ssl' or 'tls'
360
- MAILGUN_FROM_NAME
361
- MAILGUN_FROM_ADDRESS
362
- </pre>
363
- </p>
364
- <?php endif; ?>
365
  <h3><?php _e('Lists', 'mailgun'); ?></h3>
366
  <table class="form-table">
367
  <tr valign="top">
@@ -394,42 +366,30 @@ MAILGUN_FROM_ADDRESS
394
  __('<a href="%1$s" target="%2$s">View available lists</a>.', 'mailgun'),
395
  array('a' => array(
396
  'href' => array(),
397
- 'target' => array()
398
  )
399
  )
400
- ), esc_url($url), '_blank'
401
  );
402
  echo $link;
403
  ?>
404
  </td>
405
  </tr>
406
  </table>
407
-
408
- <?php if (!$isMultisite): ?>
409
- <p>
410
- <?php
411
- _e('Before attempting to test the configuration, please click "Save Changes".', 'mailgun');
412
- ?>
413
- </p>
414
- <p class="submit">
415
- <input type="submit"
416
- class="button-primary"
417
- value="<?php _e('Save Changes', 'mailgun'); ?>"
418
- />
419
- <input type="button"
420
- id="mailgun-test"
421
- class="button-secondary"
422
- value="<?php _e('Test Configuration', 'mailgun'); ?>"
423
- />
424
- </p>
425
- <?php else: ?>
426
- <p class="submit">
427
- <input type="button"
428
- id="mailgun-test"
429
- class="button-secondary"
430
- value="<?php _e('Test Configuration', 'mailgun'); ?>"
431
- />
432
- </p>
433
- <?php endif; ?>
434
  </form>
435
  </div>
62
  </p>
63
 
64
  <h3><?php _e('Configuration', 'mailgun'); ?></h3>
 
 
 
 
 
65
  <form id="mailgun-form" action="options.php" method="post">
66
  <?php settings_fields('mailgun'); ?>
67
 
320
  $url2 = 'https://documentation.mailgun.com/user_manual.html#tagging';
321
  $link = sprintf(
322
  wp_kses(
323
+ __('<a href="%1$s" target="%3$s">Tracking</a> and <a href="%2$s" target="%3$s">Tagging</a>', 'mailgun'),
324
  array('a' => array(
325
  'href' => array(),
326
  'target' => array()
334
  </td>
335
  </tr>
336
  </table>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
337
  <h3><?php _e('Lists', 'mailgun'); ?></h3>
338
  <table class="form-table">
339
  <tr valign="top">
366
  __('<a href="%1$s" target="%2$s">View available lists</a>.', 'mailgun'),
367
  array('a' => array(
368
  'href' => array(),
 
369
  )
370
  )
371
+ ), esc_url($url)
372
  );
373
  echo $link;
374
  ?>
375
  </td>
376
  </tr>
377
  </table>
378
+ <p>
379
+ <?php
380
+ _e('Before attempting to test the configuration, please click "Save Changes".', 'mailgun');
381
+ ?>
382
+ </p>
383
+ <p class="submit">
384
+ <input type="submit"
385
+ class="button-primary"
386
+ value="<?php _e('Save Changes', 'mailgun'); ?>"
387
+ />
388
+ <input type="button"
389
+ id="mailgun-test"
390
+ class="button-secondary"
391
+ value="<?php _e('Test Configuration', 'mailgun'); ?>"
392
+ />
393
+ </p>
 
 
 
 
 
 
 
 
 
 
 
394
  </form>
395
  </div>
mailgun.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin Name: Mailgun
5
  * Plugin URI: http://wordpress.org/extend/plugins/mailgun/
6
  * Description: Mailgun integration for WordPress
7
- * Version: 1.6
8
  * Author: Mailgun
9
  * Author URI: http://www.mailgun.com/
10
  * License: GPLv2 or later
4
  * Plugin Name: Mailgun
5
  * Plugin URI: http://wordpress.org/extend/plugins/mailgun/
6
  * Description: Mailgun integration for WordPress
7
+ * Version: 1.6.1
8
  * Author: Mailgun
9
  * Author URI: http://www.mailgun.com/
10
  * License: GPLv2 or later
readme.txt CHANGED
@@ -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.9.8
8
- Stable tag: 1.6
9
  License: GPLv2 or later
10
 
11
 
@@ -60,7 +60,7 @@ MAILGUN_APIKEY Type: string
60
  MAILGUN_DOMAIN Type: string
61
  MAILGUN_USERNAME Type: string
62
  MAILGUN_PASSWORD Type: string
63
- MAILGUN_SECURE Type: boolean
64
  MAILGUN_SECTYPE Type: string Choices: 'ssl' or 'tls'
65
  MAILGUN_FROM_NAME Type: string
66
  MAILGUN_FROM_ADDRESS Type: string
@@ -129,6 +129,9 @@ MAILGUN_FROM_ADDRESS Type: string
129
 
130
  == Changelog ==
131
 
 
 
 
132
  = 1.6 (2018-9-21): =
133
  - Refactor admin notifications
134
  - Enable Settings page for all WordPress install types
5
  Tags: mailgun, smtp, http, api, mail, email
6
  Requires at least: 3.3
7
  Tested up to: 4.9.8
8
+ Stable tag: 1.6.1
9
  License: GPLv2 or later
10
 
11
 
60
  MAILGUN_DOMAIN Type: string
61
  MAILGUN_USERNAME Type: string
62
  MAILGUN_PASSWORD Type: string
63
+ MAILGUN_SECURE Type: boolean Choices: '0' or '1' (0 = false/no)
64
  MAILGUN_SECTYPE Type: string Choices: 'ssl' or 'tls'
65
  MAILGUN_FROM_NAME Type: string
66
  MAILGUN_FROM_ADDRESS Type: string
129
 
130
  == Changelog ==
131
 
132
+ = 1.6.1 (2018-10-08): =
133
+ - Restore Settings page form for all install types.
134
+
135
  = 1.6 (2018-9-21): =
136
  - Refactor admin notifications
137
  - Enable Settings page for all WordPress install types