Skip to content

Commit

Permalink
2.0.17
Browse files Browse the repository at this point in the history
  • Loading branch information
smusman98 committed Jul 18, 2022
1 parent 701720b commit f2e5c90
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 29 deletions.
6 changes: 3 additions & 3 deletions Postman/Extensions/License/PostmanLicenseHandler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function hooks() {
// Display notices to admins
add_action( 'admin_notices', array( $this, 'notices' ) );

add_action( 'in_plugin_update_message-' . plugin_basename( $this->file ), array( $this, 'plugin_row_license_missing' ), 10, 2 );
//add_action( 'in_plugin_update_message-' . plugin_basename( $this->file ), array( $this, 'plugin_row_license_missing' ), 10, 2 );
}

/**
Expand Down Expand Up @@ -344,7 +344,7 @@ public function validate_license() {

if ( $interval->days == 0 ) {
add_action( 'admin_notices', function () use ( $license_data ) {
echo $this->item_name . ' license expire today at: ' . $license_data->expires;
//echo $this->item_name . ' license expire today at: ' . $license_data->expires;
});

return;
Expand All @@ -353,7 +353,7 @@ public function validate_license() {

if ( $license_data->activations_left == 0 ) {
add_action( 'admin_notices', function () use ( $license_data ) {
echo $this->item_name . ' has no activations';
//echo $this->item_name . ' has no activations';
});

return;
Expand Down
12 changes: 6 additions & 6 deletions Postman/Postman.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ class Postman {
const MANAGE_POSTMAN_CAPABILITY_LOGS = 'manage_postman_logs';

/**
* Use the text domain directly instead of this constant, as it
* Use the text domain directly instead of this constant, as it
* causes issues with https://translate.wordpress.org.
*
*
* @deprecated
* @see https://github.com/yehudah/Post-SMTP/issues/1#issuecomment-421940923
*/
Expand Down Expand Up @@ -97,7 +97,7 @@ public function __construct( $rootPluginFilenameAndPath, $version ) {
}

// register the email transports

// store an instance of the WpMailBinder
$this->wpMailBinder = PostmanWpMailBinder::getInstance();

Expand Down Expand Up @@ -187,11 +187,11 @@ public function __construct( $rootPluginFilenameAndPath, $version ) {
*/
public function on_plugins_loaded() {

PostmanLicenseManager::get_instance()->init();

// register the email transports
$this->registerTransports( $this->rootPluginFilenameAndPath );

PostmanLicenseManager::get_instance()->init();

// load the text domain
$this->loadTextDomain();

Expand Down Expand Up @@ -415,7 +415,7 @@ public function display_configuration_required_warning() {
}
$message .= (sprintf( ' %s | %s', $goToEmailLog, $goToSettings ));
$message .= '<input type="hidden" name="security" class="security" value="' . wp_create_nonce('postsmtp') . '">';

$hide = get_option('postman_release_version' );

if ( $msg['error'] == true && ! $hide ) {
Expand Down
22 changes: 16 additions & 6 deletions Postman/PostmanViewController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,13 @@ private function displayTopNavigation() {
echo '<div class="twitter-wrap">';
print '<div id="postman-main-menu" class="welcome-panel">';
print '<div class="welcome-panel-content">';
print '<div class="welcome-panel-column-container">';
print '<div class="welcome-panel-column">';
print '<div class="welcome-panel-column-container" style="display: flex; flex-wrap: wrap; justify-content: space-around; align-items: flex-start;">';
print '<div class="ps-welcome-panel-column">';
printf( '<h4>%s</h4>', __( 'Configuration', 'post-smtp' ) );
printf( '<a class="button button-primary button-hero" href="%s">%s</a>', $this->getPageUrl( PostmanConfigurationController::CONFIGURATION_WIZARD_SLUG ), __( 'Start the Wizard', 'post-smtp' ) );
printf( '<p class="">%s <a href="%s" class="configure_manually">%s</a></p>', __( 'or', 'post-smtp' ), $this->getPageUrl( PostmanConfigurationController::CONFIGURATION_SLUG ), __( 'Show All Settings', 'post-smtp' ) );
print '</div>';
print '<div class="welcome-panel-column">';
print '<div class="ps-welcome-panel-column">';
printf( '<h4>%s</h4>', _x( 'Actions', 'Main Menu', 'post-smtp' ) );
print '<ul>';

Expand Down Expand Up @@ -372,15 +372,25 @@ private function displayTopNavigation() {
printf( $purgeLinkPattern, $this->getPageUrl( PostmanAdminController::MANAGE_OPTIONS_PAGE_SLUG ), sprintf( '%s', $importExportReset ) );
print '</ul>';
print '</div>';
print '<div class="welcome-panel-column welcome-panel-last">';
?>

<div class="ps-welcome-panel-column">
<h4><img class="align-middle" src="<?php echo plugins_url( 'style/images/new.gif', dirname( __DIR__ ) . '/postman-smtp.php' ); ?>"><a style="color: black;" target="_blank" href="https://postmansmtp.com/extensions/">Extensions</a></h4>
<ul>
<li><a target="_blank" href="https://postmansmtp.com/extensions/office-365-for-post-smtp-extension/">Office 365 API</a></li>
</ul>
</div>

<?php
print '<div class="ps-welcome-panel-column welcome-panel-last">';
printf( '<h4>%s</h4>', _x( 'Troubleshooting', 'Main Menu', 'post-smtp' ) );
print '<ul>';
printf( '<li><a href="%s" class="welcome-icon run-port-test">%s</a></li>', $this->getPageUrl( PostmanConnectivityTestController::PORT_TEST_SLUG ), __( 'Connectivity Test', 'post-smtp' ) );
printf( '<li><a href="%s" class="welcome-icon run-port-test">%s</a></li>', $this->getPageUrl( PostmanDiagnosticTestController::DIAGNOSTICS_SLUG ), __( 'Diagnostic Test', 'post-smtp' ) );
printf( '<li><a href="%s" data-security="%s" class="welcome-icon release-lock-file">%s</a></li>', '#', wp_create_nonce( "postman" ), __( 'Release Lock File Error', 'post-smtp' ) );
printf( '<li><a href="https://wordpress.org/support/plugin/post-smtp/" class="welcome-icon postman_support">%s</a></li>', __( 'Online Support', 'post-smtp' ) );
printf( '<li><a target="blank" class="align-middle" href="https://postmansmtp.com/category/guides/" class="welcome-icon postman_guides">%s</a></li>', __( 'Guides', 'post-smtp' ) );
printf( '<li><img class="align-middle" src="' . plugins_url( 'style/images/new.gif', dirname( __DIR__ ) . '/postman-smtp.php' ) . '"><a target="blank" class="align-middle" href="https://www.facebook.com/groups/post.smtp" class="welcome-icon postman_guides">%s</a></li>', __( 'Facebook Group', 'post-smtp' ) );
printf( '<li><a target="blank" class="align-middle" href="https://www.facebook.com/groups/post.smtp" class="welcome-icon postman_guides">%s</a></li>', __( 'Facebook Group', 'post-smtp' ) );
printf( '<li><a target="blank" class="align-middle" href="https://postmansmtp.com/category/guides/" class="welcome-icon postman_guides">%s</a></li>', __( 'Guides', 'post-smtp' ) );
print '</ul></div></div></div></div>';
?>
</div>
Expand Down
8 changes: 4 additions & 4 deletions postman-smtp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Plugin Name: Post SMTP
* Plugin URI: https://wordpress.org/plugins/post-smtp/
* Description: Email not reliable? Post SMTP is the first and only WordPress SMTP plugin to implement OAuth 2.0 for Gmail, Hotmail and Yahoo Mail. Setup is a breeze with the Configuration Wizard and integrated Port Tester. Enjoy worry-free delivery even if your password changes!
* Version: 2.0.16
* Version: 2.0.17
* Author: Yehuda Hassine
* Text Domain: post-smtp
* Author URI: https://postmansmtp.com
Expand Down Expand Up @@ -35,10 +35,10 @@
define( 'POST_SMTP_BASE', __FILE__ );
define( 'POST_SMTP_PATH', __DIR__ );
define( 'POST_SMTP_URL', plugins_url('', POST_SMTP_BASE ) );
define( 'POST_SMTP_VER', '2.0.16' );
define( 'POST_SMTP_VER', '2.0.17' );
define( 'POST_SMTP_SHOW_RELEASE_MESSAGE', true );
define( 'POST_SMTP_RELEASE_MESSAGE', "I have released a new Google Analytics AIO plugin, if you liked it please leave a review." );
define( 'POST_SMTP_RELEASE_URL', 'https://wordpress.org/plugins/metrics-query/' );
define( 'POST_SMTP_RELEASE_MESSAGE', "Post SMTP v2.0.17 - Extensions" );
define( 'POST_SMTP_RELEASE_URL', 'https://postmansmtp.com/post-smtp-2-0-17-extensions/' );

$postman_smtp_exist = in_array( 'postman-smtp/postman-smtp.php', (array) get_option( 'active_plugins', array() ) );
$required_php_version = version_compare( PHP_VERSION, '5.6.0', '<' );
Expand Down
13 changes: 8 additions & 5 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=yehudaha
Tags: postman smtp, postman, smtp, email, mail, mailer, email log, oauth2, gmail, google apps, hotmail, yahoo, mandrill api, sendgrid api, elastic email, office365, mailgun
Requires at least: 3.9
Tested up to: 5.6
Stable tag: 2.0.16
Stable tag: 2.0.17
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Send, log and troubleshoot your Outgoing Email easily. Supports everything: SMTP, Gmail, Mailgun, Mandril, SendGrid, Elastic Email and OAuth 2.0!
Send, log and troubleshoot your Outgoing Email easily. Supports everything: SMTP, Gmail, Mailgun, office365, SendGrid, Elastic Email and OAuth 2.0!

== Description ==

= Looking for Google Analytics AIO plugin? =
If you used the good and old Google Analytics Dashboard For WP, I have forked the original plugin here:
[https://wordpress.org/plugins/metrics-query/](https://wordpress.org/plugins/metrics-query/)
= Looking for Office 365 API delivery? =
Check this extensions page, it will update with more extensions so don't forget to follow:
[https://postmansmtp.com/extensions/](https://postmansmtp.com/extensions/)

= The Only SMTP plugin with chrome Notifications =
Get notified if your emails are failing inside your Chrome browser. [Download here](https://chrome.google.com/webstore/detail/post-smtp-notifications/npklmbkpbknkmbohdbpikeidiaekjoch?hl=en-US)
Expand Down Expand Up @@ -281,6 +281,9 @@ To avoid being flagged as spam, you need to prove your email isn't forged. On a

== Changelog ==

= 2.0.17 - 2020-01-17
* New: Plugin Extensions

= 2.0.16 - 2020-12-13
* Update: General Info

Expand Down
9 changes: 4 additions & 5 deletions style/postman.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
margin: 0;
margin-right: 10px;
overflow: hidden;
max-height: 300px;
border-radius: 5px;
}

Expand Down Expand Up @@ -98,7 +97,7 @@ p#back_to_main_menu {
padding-right: 10px;
}

.welcome-panel-column welcome-panel-last {
.welcome-panel-column.welcome-panel-last {
padding-bottom: 10px;
}

Expand All @@ -124,7 +123,7 @@ p#back_to_main_menu {
.post-badge {
position: absolute;
top: 0;
right: 0;
right: 0;
padding-top: 142px;
height: 50px;
width: 173px;
Expand All @@ -133,7 +132,7 @@ p#back_to_main_menu {
font-size: 14px;
text-align: center;
margin: 0 -5px;
background: url(images/badge.png) no-repeat;
background: url(images/badge.png) no-repeat;
}


Expand All @@ -157,4 +156,4 @@ p#back_to_main_menu {
100% {
opacity: 1;
}
}
}

0 comments on commit f2e5c90

Please sign in to comment.