Skip to content

Issue 11 - Multisite compatibility #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Issue 11 - Multisite compatibility #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9117d37
Adding wp nonce
guillaumemolter Aug 6, 2016
df1e2d1
Checking for user permission
guillaumemolter Aug 6, 2016
aa8e0a2
Adding strong data validation to settings
guillaumemolter Aug 6, 2016
65a4d7e
Adding strong data validation to test email
guillaumemolter Aug 6, 2016
48646a2
Indentation fix
guillaumemolter Aug 6, 2016
cf10b7f
Escaping form data/values
guillaumemolter Aug 6, 2016
7c3dc8b
Removing duplicate check
guillaumemolter Aug 6, 2016
9dfe2f3
If multisite move admin page to network admin
guillaumemolter Aug 6, 2016
a1b8cd0
If multisite use manage_network_options priviledge
guillaumemolter Aug 6, 2016
9a67361
If multisite use network wide option
guillaumemolter Aug 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions page-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
<script>
(function($) {
$(function() {
var settings = <?php echo json_encode( $this->settings ); ?>;
$('.pm-enabled').prop('checked', settings.enabled);
$('.pm-api-key').val(settings.api_key);
$('.pm-sender-address').val(settings.sender_address);
$('.pm-force-html').prop('checked', settings.force_html);
$('.pm-track-opens').prop('checked', settings.track_opens);

$(document).on('click', '.save-settings', function() {
var data = {
'enabled': $('.pm-enabled').is(':checked') ? 1 : 0,
Expand All @@ -19,7 +12,8 @@

$.post(ajaxurl, {
'action': 'postmark_save',
'data': JSON.stringify(data)
'data': JSON.stringify(data),
'_wpnonce': $('[name=_wpnonce]').val()
}, function(response) {
$('.pm-notice').html('<p>' + response + '</p>');
$('.pm-notice').removeClass('hidden');
Expand All @@ -31,7 +25,8 @@
'action': 'postmark_test',
'email': $('.pm-test-email').val(),
'with_tracking_and_html': $('.pm-test-with-opens').is(':checked') ? 1 : 0,
'override_from_address' : $('.pm-test-email-sender').val()
'override_from_address' : $('.pm-test-email-sender').val(),
'_wpnonce': $('[name=_wpnonce]').val()
}, function(response) {
$('.pm-notice').html('<p>' + response + '</p>');
$('.pm-notice').removeClass('hidden');
Expand Down Expand Up @@ -71,25 +66,26 @@
</div>
<br/>
<div class="updated notice pm-notice hidden"></div>
<?php wp_nonce_field( 'postmark_nonce' ); ?>
<table class="form-table" style="max-width:740px;">
<tr>
<th><label>Enabled?</label></th>
<td>
<input type="checkbox" class="pm-enabled" value="1" />
<input type="checkbox" class="pm-enabled" value="1" <?php checked($this->settings['enabled']); ?> />
<span class="footnote">Send emails using Postmark's REST API</span>
</td>
</tr>
<tr>
<th><label>API Key</label></th>
<td>
<input type="text" class="pm-api-key" value="" />
<input type="text" class="pm-api-key" value="<?php echo esc_attr($this->settings['api_key']); ?>" />
<div class="footnote">Your API key is available in the <strong>Credentials</strong> screen of your <a href="https://account.postmarkapp.com/servers" target="_blank">Postmark Server</a>.</div>
</td>
</tr>
<tr>
<th><label>Sender Email Address</label></th>
<td>
<input type="text" class="pm-sender-address" value="" />
<input type="email" class="pm-sender-address" value="<?php echo esc_attr($this->settings['sender_address']); ?>" />
<div class="footnote">This email must be a verified <a href="https://account.postmarkapp.com/signatures" target="_blank">Sender Signature</a>. It will appear as the "from" address on all outbound emails.<br/><br/>
You may override the "From" address set here on individual emails, by including a 'From' header with the address you wish to send from. <a href="#example">See the example below.</a>
</div>
Expand All @@ -98,15 +94,15 @@
<tr>
<th><label>Force HTML</label></th>
<td>
<input type="checkbox" class="pm-force-html" value="1" />
<input type="checkbox" class="pm-force-html" value="1" <?php checked($this->settings['force_html']); ?> />
<span class="footnote">Force emails to be sent as HTML.<br/><br/>DEPRECATED: Instead of enabling this feature, add a header to your HTML message with name 'Content-Type' and value 'text/html'. <a href="#example">See the example below.</a>
</span>
</td>
</tr>
<tr>
<th><label>Track Opens</label></th>
<td>
<input type="checkbox" class="pm-track-opens" value="1" />
<input type="checkbox" class="pm-track-opens" value="1" <?php checked($this->settings['track_opens']); ?> />
<span class="footnote">Track email opens (which also requires emails to be "forced" to HTML).<br/><br/>DEPRECATED: Instead of enabling this feature, add a header to your HTML message called 'X-PM-Track-Opens' and a value of 'true'. <a href="#example">See the example below.</a>
</td>
</tr>
Expand All @@ -120,11 +116,11 @@
<table class="form-table">
<tr>
<th><label>Recipient</label></th>
<td><input type="text" class="pm-test-email" value="" placeholder="[email protected]" /></td>
<td><input type="email" class="pm-test-email" value="" placeholder="[email protected]" /></td>
</tr>
<tr>
<th><label>Override Sender Email Address</label></th>
<td><input type="text" class="pm-test-email-sender" value="" placeholder="[email protected]" /></td>
<td><input type="email" class="pm-test-email-sender" value="" placeholder="[email protected]" /></td>
</tr>
<tr>
<td colspan="2"><input type="checkbox" name="with_tracking_and_html" class="pm-test-with-opens" value="" />Send test as HTML, with Open Tracking Enabled.</td>
Expand Down
198 changes: 162 additions & 36 deletions postmark.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,55 @@ function __construct() {


function init() {
if ( ! current_user_can( 'manage_options' ) ) {
return;
}

if( is_multisite() ) {
add_action( 'network_admin_menu', array( $this, 'network_admin_menu' ) );
}
else {
add_action( 'admin_menu', array( $this, 'admin_menu' ) );
}

add_action( 'admin_menu', array( $this, 'admin_menu' ) );
add_action( 'wp_ajax_postmark_save', array( $this, 'save_settings' ) );
add_action( 'wp_ajax_postmark_test', array( $this, 'send_test_email' ) );
}


function load_settings() {
$settings = get_option( 'postmark_settings' );

// If on a multisite instance, get the network wide option
if ( is_multisite() ){
$settings = get_site_option( 'postmark_settings' );
}
else {
$settings = get_option( 'postmark_settings' );
}



if ( false === $settings ) {
$settings = array(
'enabled' => get_option( 'postmark_enabled', 0 ),
'api_key' => get_option( 'postmark_api_key', '' ),
'sender_address' => get_option( 'postmark_sender_address', '' ),
'force_html' => get_option( 'postmark_force_html', 0 ),
'track_opens' => get_option( 'postmark_trackopens', 0 )
);

update_option( 'postmark_settings', json_encode( $settings ) );


// If on a multisite instance, update the network wide option
if ( is_multisite() ){
$settings = array(
'enabled' => get_site_option( 'postmark_enabled', 0 ),
'api_key' => get_site_option( 'postmark_api_key', '' ),
'sender_address' => get_site_option( 'postmark_sender_address', '' ),
'force_html' => get_site_option( 'postmark_force_html', 0 ),
'track_opens' => get_site_option( 'postmark_trackopens', 0 )
);
update_site_option( 'postmark_settings', json_encode( $settings ) );
}
else {
$settings = array(
'enabled' => get_option( 'postmark_enabled', 0 ),
'api_key' => get_option( 'postmark_api_key', '' ),
'sender_address' => get_option( 'postmark_sender_address', '' ),
'force_html' => get_option( 'postmark_force_html', 0 ),
'track_opens' => get_option( 'postmark_trackopens', 0 )
);
update_option( 'postmark_settings', json_encode( $settings ) );
}

return $settings;
}

Expand All @@ -58,51 +83,152 @@ function load_settings() {
function admin_menu() {
add_options_page( 'Postmark', 'Postmark', 'manage_options', 'pm_admin', array( $this, 'settings_html' ) );
}

function network_admin_menu() {
add_options_page( 'Postmark', 'Postmark', 'manage_network_options', 'pm_admin', array( $this, 'settings_html' ) );
}


function send_test_email() {
$to = $_POST['email'];
$with_tracking_and_html = $_POST['with_tracking_and_html'];

// We check the wp_nonce.
if ( ! isset($_POST['_wpnonce']) || ! wp_verify_nonce( $_POST['_wpnonce'], 'postmark_nonce' ) ) {
wp_die(__('Cheatin’ uh?'));
}

// We check that the current user is allowed to update settings.
if ( ( is_multisite() && ! current_user_can('manage_network_options') ) || ! current_user_can('manage_options') ) {
wp_die(__('Cheatin’ uh?'));
}

// We validate that 'email' is a valid email address
if ( isset($_POST['email']) && is_email($_POST['email']) ) {
$to = sanitize_email($_POST['email']);
}
else {
wp_die(__('You need to specify a valid recipient email address.', 'postmark-wordpress'));
}

// We validate that 'with_tracking_and_html' is a numeric boolean
if ( isset($_POST['with_tracking_and_html']) && 1 === $_POST['with_tracking_and_html'] ) {
$with_tracking_and_html = true;
}
else {
$with_tracking_and_html = false;
}

// We validate that 'override_from_address' is a valid email address
if ( isset($_POST['override_from_address']) && is_email($_POST['override_from_address']) ) {
$override_from = sanitize_email($_POST['override_from_address']);
}
else {
$override_from = false;
}

$subject = 'Postmark Test: ' . get_bloginfo( 'name' );
$override_from = $_POST['override_from_address'];
$headers = array();

if( $with_tracking_and_html ){
$message = 'This is an <strong>HTML test</strong> email sent using the Postmark plugin. It has Open Tracking enabled.';
array_push($headers, 'X-PM-Track-Opens: true');
}else{
}
else{
$message = 'This is a test email sent using the Postmark plugin.';
}


if( isset( $override_from ) && $override_from != '' ) {
if( false !== $override_from ) {
array_push($headers, 'From: ' . $override_from);
}

$response = wp_mail( $to, $subject, $message, $headers );

if ( false !== $response ) {
echo 'Test sent';
}
else{
$dump = print_r(Postmark_Mail::$LAST_ERROR, true);
echo 'Test failed, the following is the error generated when running the test send:<br/><pre class="diagnostics">'.$dump.'</pre>';
}
wp_die();
echo 'Test sent';
}
else{
$dump = print_r(Postmark_Mail::$LAST_ERROR, true);
echo 'Test failed, the following is the error generated when running the test send:<br/><pre class="diagnostics">'.$dump.'</pre>';
}

wp_die();
}

function save_settings() {
$settings = stripslashes( $_POST['data'] );
$json_test = json_decode( $settings, true );

// Check for valid JSON
if ( isset( $json_test['enabled'] ) ) {
update_option( 'postmark_settings', $settings );
echo 'Settings saved';

// We check the wp_nonce.
if ( ! isset($_POST['_wpnonce']) || ! wp_verify_nonce( $_POST['_wpnonce'], 'postmark_nonce' ) ) {
wp_die(__('Cheatin’ uh?'));
}

// We check that the current user is allowed to update settings.
if ( ( is_multisite() && ! current_user_can('manage_network_options') ) || ! current_user_can('manage_options') ) {
wp_die(__('Cheatin’ uh?'));
}

// We check that we have received some data.
if ( ! isset($_POST['data']) ) {
wp_die(__('Cheatin’ uh?'));
}

$data = json_decode( stripslashes( $_POST['data'] ), true);

$settings = array();

// We check that we were able to decode data.
if ( ! is_array($data) ) {
wp_die(__('Something went wrong!', 'postmark-wordpress'));
}

// We validate that 'enabled' is a numeric boolean
if ( isset($data['enabled']) && 1 === $data['enabled'] ) {
$settings['enabled'] = 1;
}
else {
$settings['enabled'] = 0;
}

// We validate that 'api_key' contains only allowed caracters [letters, numbers, dash]
if ( isset($data['api_key']) && 1 === preg_match('/^[A-Za-z0-9\-]*$/', $data['api_key']) ) {
$settings['api_key'] = $data['api_key'];
}
else {
$settings['api_key'] = '';
}

// We validate that 'sender_address' is a valid email address
if ( isset($data['sender_address']) && is_email($data['sender_address']) ) {
$settings['sender_address'] = sanitize_email($data['sender_address']);
}
else {
$settings['sender_address'] = '';
}

// We validate that 'force_html' is a numeric boolean
if ( isset($data['force_html']) && 1 === $data['force_html'] ) {
$settings['force_html'] = 1;
}
else {
$settings['force_html'] = 0;
}

// We validate that 'track_opens' is a numeric boolean
if ( isset($data['track_opens']) && 1 === $data['track_opens'] ) {
$settings['track_opens'] = 1;
}
else {
echo 'Error: invalid JSON';
$settings['track_opens'] = 0;
}
wp_die();

// If on a multisite instance, get the network wide option
if ( is_multisite() ){
update_site_option( 'postmark_settings', json_encode($settings) );
}
else {
update_option( 'postmark_settings', json_encode($settings) );
}

wp_die('Settings saved');
}


Expand Down
8 changes: 7 additions & 1 deletion wp-mail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
// Compact the input, apply the filters, and extract them back out
extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) ) );

$settings = json_decode( get_option( 'postmark_settings' ), true );
if (is_multisite()){
$settings = json_decode( get_site_option( 'postmark_settings' ), true );
}
else {
$settings = json_decode( get_option( 'postmark_settings' ), true );
}


if ( ! is_array( $attachments ) ) {
$attachments = explode( "\n", str_replace( "\r\n", "\n", $attachments ) );
Expand Down