Changeset 1954572
- Timestamp:
- 10/10/2018 01:38:13 PM (7 years ago)
- Location:
- mailgun
- Files:
-
- 5 edited
- 10 copied
-
tags/1.6.1 (copied) (copied from mailgun/trunk)
-
tags/1.6.1/CHANGELOG.md (copied) (copied from mailgun/trunk/CHANGELOG.md) (1 diff)
-
tags/1.6.1/includes/admin.php (copied) (copied from mailgun/trunk/includes/admin.php) (1 diff)
-
tags/1.6.1/includes/lists-page.php (copied) (copied from mailgun/trunk/includes/lists-page.php)
-
tags/1.6.1/includes/mg-filter.php (copied) (copied from mailgun/trunk/includes/mg-filter.php)
-
tags/1.6.1/includes/options-page.php (copied) (copied from mailgun/trunk/includes/options-page.php) (5 diffs)
-
tags/1.6.1/includes/wp-mail-api.php (copied) (copied from mailgun/trunk/includes/wp-mail-api.php)
-
tags/1.6.1/languages/mailgun-template.po (copied) (copied from mailgun/trunk/languages/mailgun-template.po)
-
tags/1.6.1/mailgun.php (copied) (copied from mailgun/trunk/mailgun.php) (1 diff)
-
tags/1.6.1/readme.txt (copied) (copied from mailgun/trunk/readme.txt) (3 diffs)
-
trunk/CHANGELOG.md (modified) (1 diff)
-
trunk/includes/admin.php (modified) (1 diff)
-
trunk/includes/options-page.php (modified) (5 diffs)
-
trunk/mailgun.php (modified) (1 diff)
-
trunk/readme.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
mailgun/tags/1.6.1/CHANGELOG.md
r1951605 r1954572 1 1 Changelog 2 2 ========= 3 4 1.6.1 (2018-10-08) 5 - Restore Settings page form for all install types. 3 6 4 7 1.6 (2018-9-21) -
mailgun/tags/1.6.1/includes/admin.php
r1951605 r1954572 321 321 endif; 322 322 323 if ((defined('WP_ALLOW_MULTISITE') && !defined('MAILGUN_REGION')) 324 || (!$this->get_option('apiKey') && $this->get_option('useAPI') === '1') 323 if ((!$this->get_option('apiKey') && $this->get_option('useAPI') === '1') 325 324 || (!$this->get_option('password') && $this->get_option('useAPI') === '0') 326 325 || (!$this->get_option('region') && $this->get_option('useAPI') === '1') -
mailgun/tags/1.6.1/includes/options-page.php
r1951605 r1954572 63 63 64 64 <h3><?php _e('Configuration', 'mailgun'); ?></h3> 65 66 <?php67 $isMultisite = defined('WP_ALLOW_MULTISITE');68 if (!$isMultisite):69 ?>70 65 <form id="mailgun-form" action="options.php" method="post"> 71 66 <?php settings_fields('mailgun'); ?> … … 326 321 $link = sprintf( 327 322 wp_kses( 328 __('<a href="%1$s" target="%3$s">Tracking</a> and <a href="%2$s" >Tagging</a>', 'mailgun'),323 __('<a href="%1$s" target="%3$s">Tracking</a> and <a href="%2$s" target="%3$s">Tagging</a>', 'mailgun'), 329 324 array('a' => array( 330 325 'href' => array(), … … 340 335 </tr> 341 336 </table> 342 <?php else: ?>343 <p>344 <?php345 _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_APIKEY355 MAILGUN_DOMAIN356 MAILGUN_USERNAME357 MAILGUN_PASSWORD358 MAILGUN_SECURE359 MAILGUN_SECTYPE Choices: 'ssl' or 'tls'360 MAILGUN_FROM_NAME361 MAILGUN_FROM_ADDRESS362 </pre>363 </p>364 <?php endif; ?>365 337 <h3><?php _e('Lists', 'mailgun'); ?></h3> 366 338 <table class="form-table"> … … 395 367 array('a' => array( 396 368 'href' => array(), 397 'target' => array()398 369 ) 399 370 ) 400 ), esc_url($url) , '_blank'371 ), esc_url($url) 401 372 ); 402 373 echo $link; … … 405 376 </tr> 406 377 </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; ?> 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> 434 394 </form> 435 395 </div> -
mailgun/tags/1.6.1/mailgun.php
r1951605 r1954572 5 5 * Plugin URI: http://wordpress.org/extend/plugins/mailgun/ 6 6 * Description: Mailgun integration for WordPress 7 * Version: 1.6 7 * Version: 1.6.1 8 8 * Author: Mailgun 9 9 * Author URI: http://www.mailgun.com/ -
mailgun/tags/1.6.1/readme.txt
r1951605 r1954572 6 6 Requires at least: 3.3 7 7 Tested up to: 4.9.8 8 Stable tag: 1.6 8 Stable tag: 1.6.1 9 9 License: GPLv2 or later 10 10 … … 61 61 MAILGUN_USERNAME Type: string 62 62 MAILGUN_PASSWORD Type: string 63 MAILGUN_SECURE Type: boolean 63 MAILGUN_SECURE Type: boolean Choices: '0' or '1' (0 = false/no) 64 64 MAILGUN_SECTYPE Type: string Choices: 'ssl' or 'tls' 65 65 MAILGUN_FROM_NAME Type: string … … 129 129 130 130 == Changelog == 131 132 = 1.6.1 (2018-10-08): = 133 - Restore Settings page form for all install types. 131 134 132 135 = 1.6 (2018-9-21): = -
mailgun/trunk/CHANGELOG.md
r1951605 r1954572 1 1 Changelog 2 2 ========= 3 4 1.6.1 (2018-10-08) 5 - Restore Settings page form for all install types. 3 6 4 7 1.6 (2018-9-21) -
mailgun/trunk/includes/admin.php
r1951605 r1954572 321 321 endif; 322 322 323 if ((defined('WP_ALLOW_MULTISITE') && !defined('MAILGUN_REGION')) 324 || (!$this->get_option('apiKey') && $this->get_option('useAPI') === '1') 323 if ((!$this->get_option('apiKey') && $this->get_option('useAPI') === '1') 325 324 || (!$this->get_option('password') && $this->get_option('useAPI') === '0') 326 325 || (!$this->get_option('region') && $this->get_option('useAPI') === '1') -
mailgun/trunk/includes/options-page.php
r1951605 r1954572 63 63 64 64 <h3><?php _e('Configuration', 'mailgun'); ?></h3> 65 66 <?php67 $isMultisite = defined('WP_ALLOW_MULTISITE');68 if (!$isMultisite):69 ?>70 65 <form id="mailgun-form" action="options.php" method="post"> 71 66 <?php settings_fields('mailgun'); ?> … … 326 321 $link = sprintf( 327 322 wp_kses( 328 __('<a href="%1$s" target="%3$s">Tracking</a> and <a href="%2$s" >Tagging</a>', 'mailgun'),323 __('<a href="%1$s" target="%3$s">Tracking</a> and <a href="%2$s" target="%3$s">Tagging</a>', 'mailgun'), 329 324 array('a' => array( 330 325 'href' => array(), … … 340 335 </tr> 341 336 </table> 342 <?php else: ?>343 <p>344 <?php345 _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_APIKEY355 MAILGUN_DOMAIN356 MAILGUN_USERNAME357 MAILGUN_PASSWORD358 MAILGUN_SECURE359 MAILGUN_SECTYPE Choices: 'ssl' or 'tls'360 MAILGUN_FROM_NAME361 MAILGUN_FROM_ADDRESS362 </pre>363 </p>364 <?php endif; ?>365 337 <h3><?php _e('Lists', 'mailgun'); ?></h3> 366 338 <table class="form-table"> … … 395 367 array('a' => array( 396 368 'href' => array(), 397 'target' => array()398 369 ) 399 370 ) 400 ), esc_url($url) , '_blank'371 ), esc_url($url) 401 372 ); 402 373 echo $link; … … 405 376 </tr> 406 377 </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; ?> 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> 434 394 </form> 435 395 </div> -
mailgun/trunk/mailgun.php
r1951605 r1954572 5 5 * Plugin URI: http://wordpress.org/extend/plugins/mailgun/ 6 6 * Description: Mailgun integration for WordPress 7 * Version: 1.6 7 * Version: 1.6.1 8 8 * Author: Mailgun 9 9 * Author URI: http://www.mailgun.com/ -
mailgun/trunk/readme.txt
r1951605 r1954572 6 6 Requires at least: 3.3 7 7 Tested up to: 4.9.8 8 Stable tag: 1.6 8 Stable tag: 1.6.1 9 9 License: GPLv2 or later 10 10 … … 61 61 MAILGUN_USERNAME Type: string 62 62 MAILGUN_PASSWORD Type: string 63 MAILGUN_SECURE Type: boolean 63 MAILGUN_SECURE Type: boolean Choices: '0' or '1' (0 = false/no) 64 64 MAILGUN_SECTYPE Type: string Choices: 'ssl' or 'tls' 65 65 MAILGUN_FROM_NAME Type: string … … 129 129 130 130 == Changelog == 131 132 = 1.6.1 (2018-10-08): = 133 - Restore Settings page form for all install types. 131 134 132 135 = 1.6 (2018-9-21): =
Note: See TracChangeset
for help on using the changeset viewer.