Site URL: %s
SSL: %s
Port: %s', 'mailjet-for-wordpress'), get_home_url(), Mailjet::getOption('mailjet_ssl') ? 'On' : 'Off', Mailjet::getOption('mailjet_port')); return wp_mail(Mailjet::getOption('mailjet_test_address'), $subject, $message); } - public static function set_html_content_type() - { + public static function set_html_content_type() { return 'text/html'; } - public function wp_sender_email($original_email_address) - { + public function wp_sender_email( $original_email_address ) { return Mailjet::getOption('mailjet_from_email'); } - public function wp_sender_name($original_email_from) - { + public function wp_sender_name( $original_email_from ) { return Mailjet::getOption('mailjet_from_name'); } } diff --git a/src/includes/MailjetMenu.php b/src/includes/MailjetMenu.php index 584fb781..34768c0b 100644 --- a/src/includes/MailjetMenu.php +++ b/src/includes/MailjetMenu.php @@ -22,41 +22,42 @@ * Maintain a list of all hooks that are registered throughout * the plugin, and register them with the WordPress API. Call the * run function to execute the list of actions and filters. + * * @package Mailjet * @subpackage Mailjet/includes * @author Your Name
';
try {
$mailjetIframe = $this->getMailjetIframe();
$mailjetIframe->setInitialPage(MailjetIframe::PAGE_CAMPAIGNS);
echo '
';
}
- public function show_stats_page()
- {
+ public function show_stats_page() {
echo '
- ) . 'src/admin/images/LogoMJ_White_RVB.svg)
+ ) . 'src/admin/images/LogoMJ_White_RVB.svg)
+
';
- echo wp_kses($mailjetIframe->getHtml(), [
- 'iframe' => [
- 'align' => true,
- 'width' => true,
- 'height' => true,
- 'frameborder' => true,
- 'name' => true,
- 'src' => true,
- 'id' => true,
- 'class' => true,
- 'style' => true,
- 'scrolling' => true,
- 'marginwidth' => true,
- 'marginheight' => true,
- ],
- ]);
+ echo wp_kses(
+ $mailjetIframe->getHtml(),
+ array(
+ 'iframe' => array(
+ 'align' => true,
+ 'width' => true,
+ 'height' => true,
+ 'frameborder' => true,
+ 'name' => true,
+ 'src' => true,
+ 'id' => true,
+ 'class' => true,
+ 'style' => true,
+ 'scrolling' => true,
+ 'marginwidth' => true,
+ 'marginheight' => true,
+ ),
+ )
+ );
echo '
';
} catch (MailjetException $e) {
MailjetLogger::error('[ Mailjet ] [ ' . __METHOD__ . ' ] [ Line #' . __LINE__ . ' ] [ ' . $e->getMessage() . ' ]');
@@ -136,25 +136,27 @@ public function show_campaigns_page()
echo '';
try {
$mailjetIframe = $this->getMailjetIframe();
$mailjetIframe->setInitialPage(MailjetIframe::PAGE_STATS);
echo '
';
}
- public function show_contacts_page()
- {
+ public function show_contacts_page() {
echo '
-
+
+
';
- echo wp_kses($mailjetIframe->getHtml(), [
- 'iframe' => [
- 'src' => true,
- 'height' => true,
- 'width' => true,
- 'frameborder' => true,
- 'allowfullscreen' => true,
- ],
- ]);
+ echo wp_kses(
+ $mailjetIframe->getHtml(),
+ array(
+ 'iframe' => array(
+ 'src' => true,
+ 'height' => true,
+ 'width' => true,
+ 'frameborder' => true,
+ 'allowfullscreen' => true,
+ ),
+ )
+ );
echo '
';
} catch (MailjetException $e) {
MailjetLogger::error('[ Mailjet ] [ ' . __METHOD__ . ' ] [ Line #' . __LINE__ . ' ] [ ' . $e->getMessage() . ' ]');
@@ -167,25 +169,27 @@ public function show_stats_page()
echo '';
try {
$mailjetIframe = $this->getMailjetIframe();
$mailjetIframe->setInitialPage(MailjetIframe::PAGE_CONTACTS);
echo '
';
}
- public function show_template_page()
- {
+ public function show_template_page() {
try {
$mailjetIframe = $this->getMailjetIframe();
- $templateId = sanitize_text_field($_GET['id'] ?? '');
+ $templateId = sanitize_text_field($_GET['id'] ?? '');
if (isset($templateId)) {
$mailjetIframe->setInitialPage(MailjetIframe::PAGE_EDIT_TEMPLATE, $templateId);
} else {
diff --git a/src/includes/MailjetSettings.php b/src/includes/MailjetSettings.php
index b0b79cce..59a9762e 100644
--- a/src/includes/MailjetSettings.php
+++ b/src/includes/MailjetSettings.php
@@ -19,14 +19,13 @@
* @subpackage Mailjet/includes
* @author Your Name
-
+
+
';
- echo wp_kses($mailjetIframe->getHtml(), [
- 'iframe' => [
- 'src' => true,
- 'height' => true,
- 'width' => true,
- 'frameborder' => true,
- 'allowfullscreen' => true,
- ],
- ]);
+ echo wp_kses(
+ $mailjetIframe->getHtml(),
+ array(
+ 'iframe' => array(
+ 'src' => true,
+ 'height' => true,
+ 'width' => true,
+ 'frameborder' => true,
+ 'allowfullscreen' => true,
+ ),
+ )
+ );
echo '
';
} catch (MailjetException $e) {
MailjetLogger::error('[ Mailjet ] [ ' . __METHOD__ . ' ] [ Line #' . __LINE__ . ' ] [ ' . $e->getMessage() . ' ]');
@@ -198,11 +202,10 @@ public function show_contacts_page()
echo '' . __('You have been successfully subscribed to a Mailjet contact list', 'mailjet-for-wordpress') . '
';
+ // echo '' . __('You have been successfully subscribed to a Mailjet contact list', 'mailjet-for-wordpress') . '
';
} else {
echo '' . 'You have been successfully unsubscribed from a Mailjet contact list' . '
';
}
die;
- //We die here to not continue loading rest of the WP home page
+ // We die here to not continue loading rest of the WP home page
}
/**
* @return void
*/
- public function subsctiptionConfirmationAdminNoticeFailed()
- {
+ public function subsctiptionConfirmationAdminNoticeFailed() {
echo '' . __('Something went wrong with adding a contact to Mailjet contact list', 'mailjet-for-wordpress') . '
';
die;
- //We die here to not continue loading rest of the WP home page
+ // We die here to not continue loading rest of the WP home page
}
/**
* Automatically redirect to the next step - we use javascript to prevent the WP issue when using `wp_redirect` method and headers already sent
*
* @param $urlToRedirect
*/
- public static function redirectJs($urlToRedirect)
- {
+ public static function redirectJs( $urlToRedirect ) {
if (empty($urlToRedirect)) {
return;
}
?>
');
@@ -345,8 +339,7 @@ public static function redirectJs($urlToRedirect)
* @return false|mixed|null
* @throws \Exception
*/
- public static function getCryptoHash()
- {
+ public static function getCryptoHash() {
$hash = Mailjet::getOption('crypto_hash');
if (empty($hash)) {
try {
diff --git a/src/includes/MailjetUpdate.php b/src/includes/MailjetUpdate.php
index 6d0d813f..4a553104 100644
--- a/src/includes/MailjetUpdate.php
+++ b/src/includes/MailjetUpdate.php
@@ -2,11 +2,10 @@
namespace MailjetWp\MailjetPlugin\Includes;
-class MailjetUpdate
-{
- public static function updateToV5()
- {
- $apikey = Mailjet::getOption('mailjet_apikey');
+class MailjetUpdate {
+
+ public static function updateToV5() {
+ $apikey = Mailjet::getOption('mailjet_apikey');
$apisecret = Mailjet::getOption('mailjet_apisecret');
// Check if transition from v4 to v5 is already done
if ($apikey != false && $apisecret != false) {
@@ -38,13 +37,12 @@ public static function updateToV5()
$authorSync = $commentAuthorsListId > 0 ? 1 : '';
add_option('activate_mailjet_comment_authors_sync', $authorSync);
// Delete unused options
- $deleteOptions = array('mailjet_username', 'mailjet_password', 'mailjet_initial_sync_list_id', 'mailjet_comment_authors_list_id', 'mailjet_initial_sync_last_date', 'mailjet_comment_authors_list_date', 'mailjet_auto_subscribe_list_id', 'mailjet_user_api_version');
+ $deleteOptions = array( 'mailjet_username', 'mailjet_password', 'mailjet_initial_sync_list_id', 'mailjet_comment_authors_list_id', 'mailjet_initial_sync_last_date', 'mailjet_comment_authors_list_date', 'mailjet_auto_subscribe_list_id', 'mailjet_user_api_version' );
foreach ($deleteOptions as $option) {
delete_option($option);
}
}
- public static function updateToV5_2()
- {
+ public static function updateToV5_2() {
$activateMailjetWooSync = Mailjet::getOption('activate_mailjet_woo_sync');
if (empty($activateMailjetWooSync)) {
return;
@@ -53,10 +51,9 @@ public static function updateToV5_2()
add_option('mailjet_woo_register_checkbox', $activateMailjetWooSync);
delete_option('activate_mailjet_woo_sync');
}
- public static function updateToV5_2_1()
- {
+ public static function updateToV5_2_1() {
$pluginVersion = Mailjet::getOption('mailjet_plugin_version');
- if (!empty($pluginVersion)) {
+ if ( ! empty($pluginVersion)) {
return;
}
add_option('mailjet_plugin_version', '5.2.17');
diff --git a/src/includes/Mailjeti18n.php b/src/includes/Mailjeti18n.php
index 469550ce..30a9aa7f 100644
--- a/src/includes/Mailjeti18n.php
+++ b/src/includes/Mailjeti18n.php
@@ -13,18 +13,23 @@
* @subpackage Mailjet/includes
* @author Your Name )) . '/admin/images/LogoMJ_White_RVB.svg';
- ?>)
@@ -119,36 +134,50 @@ public function mailjet_abandoned_cart_settings_page_html()
?>
-