Merge pull request #21 from JWardee/v1.2.0

+Added support for foreign letters #16
JWardee · Aug 20, 2018 · d54ada0 · d54ada0
2 parents f737ac5 + 82a4cc7
commit d54ada0
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 21 deletions.
diff --git a/build/js/admin.js b/build/js/admin.js
@@ -99,11 +99,4 @@ jQuery(function($) {
         $(this).closest('.field-block').remove();
         return false;
     });
-
-    $('[data-html-preview]').each(function() {
-        var html = window.atob($(this).data('html-preview'));
-        console.log(html);
-        $(this)[0].src = 'data:text/html, ' + encodeURIComponent(html);
-        $(this).removeAttr('data-html-preview');
-    });
-});
+});
diff --git a/build/scss/admin.scss b/build/scss/admin.scss
@@ -95,6 +95,16 @@
   margin: 10px 0;
 }
 
+.is-html-email {
+  display: block;
+  margin: 30px 0;
+  font-weight: bold;
+
+  input {
+    margin-right: 30px;
+  }
+}
+
 .-icon {
   position: relative;
   top: 50%;
@@ -278,4 +288,4 @@
 
 .html-preview {
   width: 100%;
-}
+}
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
@@ -59,6 +59,8 @@ public function route()
 		if (isset($_GET['page'])) {
 		    if ($_GET['page'] == GeneralHelper::$adminPageSlug) {
                 if (current_user_can(Settings::get('default_view_role'))) {
+
+                    /** Export message(s) */
                     if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'export' ||
                         isset($_REQUEST['action2']) && $_REQUEST['action2'] == 'export') {
                         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'bulk-logs')) {
@@ -68,6 +70,7 @@ public function route()
                         Mail::export($_REQUEST['id']);
                     }
 
+                    /** Resend message(s) */
                     if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'resend' &&
                         isset($_REQUEST['id']) && !empty($_REQUEST['id'])) {
                         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'bulk-logs')) {
@@ -78,6 +81,7 @@ public function route()
                         GeneralHelper::redirectToThisHomeScreen();
                     }
 
+                    /** Delete message(s) */
                     if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete' &&
                         isset($_REQUEST['id']) && !empty($_REQUEST['id'])) {
                         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'bulk-logs')) {
@@ -88,6 +92,7 @@ public function route()
                         GeneralHelper::redirectToThisHomeScreen();
                     }
 
+                    /** Send mail */
                     if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'new_mail') {
                         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'new_mail')) {
                             wp_die(GeneralHelper::$failedNonceMessage);
@@ -97,6 +102,13 @@ public function route()
                             $_POST['subject'], $_POST['message']);
                         GeneralHelper::redirectToThisHomeScreen();
                     }
+
+                    if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'single_mail' &&
+                        isset($_REQUEST['id']) && !empty($_REQUEST['id'])) {
+                        $log = Logs::get(['post__in' => [$_REQUEST['id']]]);
+                        echo $log[0]['message'];
+                        exit;
+                    }
                 }
 
 

diff --git a/src/GeneralHelper.php b/src/GeneralHelper.php
@@ -41,7 +41,7 @@ static public function setSettings()
 	 * Flattens an array to dot notation.
 	 *
 	 * @param array  $array     An array
-	 * @param string $separator The characater to flatten with
+	 * @param string $separator The character to flatten with
 	 * @param string $parent    The parent passed to the child (private)
 	 *
 	 * @return array Flattened array to one level

diff --git a/src/Loggers/Logger.php b/src/Loggers/Logger.php
@@ -77,7 +77,7 @@ protected function getMailArgs($args)
 			'time' => time(),
 			'email_to' => GeneralHelper::arrayToString($args['to']),
 			'subject' => $args['subject'],
-			'message' => $args['message'],
+			'message' => strip_tags($args['message']),
 			'backtrace_segment' => json_encode($this->getBacktrace()),
 			'status' => 1,
 			'attachments' => json_encode($this->getAttachmentLocations($args['attachments'])),

diff --git a/src/Models/Logs.php b/src/Models/Logs.php
@@ -133,11 +133,4 @@ static public function truncate()
 
 		$wpdb->query("TRUNCATE TABLE " . $wpdb->prefix . GeneralHelper::$tableName);
 	}
-
-	static private function hasHtmlHeader($additionalHeaders)
-    {
-        foreach ($additionalHeaders as $additionalHeader) {
-
-        }
-    }
 }
diff --git a/src/Views/LogModal.php b/src/Views/LogModal.php
@@ -1,4 +1,8 @@
-<?php if (isset($log)) : ?>
+<?php
+use WpMailCatcher\GeneralHelper;
+
+if (isset($log)) :
+?>
 	<div id="<?php echo $log['id']; ?>" class="modal">
 		<div class="modal-content <?php echo $log['is_html'] ? 'is-html' : 'is-not-html'; ?>">
 			<div class="modal-body">
@@ -9,7 +13,7 @@
 				</h2>
 				<div class="content-container">
 					<div class="content -active">
-						<iframe class="html-preview" data-html-preview="<?php echo base64_encode($log['message']); ?>"></iframe>
+						<iframe class="html-preview" src="?page=<?php echo GeneralHelper::$adminPageSlug; ?>&action=single_mail&id=<?php echo $log['id']; ?>"></iframe>
 					</div>
 					<div class="content">
 						<?php if (empty($log['attachments']) && empty($log['additional_headers'])) : ?>

diff --git a/src/Views/NewMessageModal.php b/src/Views/NewMessageModal.php
@@ -24,12 +24,14 @@
 										<option value="to"><?php _e('To', 'WpMailCatcher'); ?></option>
 										<option value="cc"><?php _e('Cc', 'WpMailCatcher'); ?></option>
 										<option value="bcc"><?php _e('Bcc', 'WpMailCatcher'); ?></option>
-										<option value="custom"><?php _e('Custom', 'WpMailCatcher'); ?></option>
+                                        <option value="custom"><?php _e('Custom', 'WpMailCatcher'); ?></option>
 									</select>
 
 									<input name="header_values[]" type="text" class="field -input" />
 								</div>
 							</div>
+
+                            <label class="is-html-email"><input type="checkbox" value="Content-Type: text/html" name="header_keys[]" /> Is HTML email? </label>
 						</div>
 						<div>
 							<h2><?php _e('Subject', 'WpMailCatcher'); ?></h2>