Changeset 1643029

Timestamp:

04/22/2017 04:00:40 PM (9 years ago)

Author:

turtlepod

Message:

Prevent fatal error when logging invalid usage of wp_mail.

Location:

fx-email-log/trunk

Files:

• fx-email-log.php (modified) (1 diff)
• includes/log-email.php (modified) (1 diff)
• languages/fx-email-log.pot (modified) (4 diffs)
• readme.txt (modified) (2 diffs)

fx-email-log/trunk/fx-email-log.php

@@ -4 +4 @@
  * Plugin URI: http://genbumedia.com/plugins/fx-email-log/
  * Description: Simple plugin to log all email sent via WordPress.
- * Version: 1.0.2
+ * Version: 1.0.3
  * Author: David Chandra Purnama
  * Author URI: http://shellcreeper.com/

fx-email-log/trunk/includes/log-email.php

@@ -32 +32 @@
      */
     public function log_email( $mail_info ) {
+
+        $defaults = array(
+            'to'          => '',
+            'subject'     => '',
+            'message'     => '',
+            'headers'     => '',
+            'attachments' => 'false',
+        );
+        $mail_info = wp_parse_args( $mail_info, $defaults );
+
+        /* Do not log invalid email  */
+        if ( empty( $mail_info['to'] ) && ! is_email( $mail_info['to'] ) ) {
+            return false;
+        }
+
+        /* Table name */
         global $wpdb;
         $table_name = "{$wpdb->prefix}fx_email_log";

fx-email-log/trunk/languages/fx-email-log.pot

@@ -4 +4 @@
 "Project-Id-Version: Genbu Media f(x) Plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-17 15:04+0700\n"
+"POT-Creation-Date: 2017-04-22 22:56+0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: David Chandra Purnama <[email protected]>\n"
@@ -15 +15 @@
 "_n;_x:1,2c;_n:1,2\n"
 "X-Poedit-Basepath: ..\n"
-"X-Generator: Poedit 1.8.8\n"
+"X-Generator: Poedit 2.0.1\n"
 "X-Poedit-SearchPath-0: .\n"
 
@@ -51 +51 @@
 
 #: includes/log-list-table.php:113
-msgid "Email Content"
-msgstr ""
-
-#: includes/log-list-table.php:114
 msgid "View Content"
 msgstr ""
 
-#: includes/log-list-table.php:118 includes/log-list-table.php:203
+#: includes/log-list-table.php:117 includes/log-list-table.php:202
 msgid "Delete"
 msgstr ""
 
-#: includes/log-list-table.php:180
+#: includes/log-list-table.php:179
 msgid "No"
 msgstr ""
 
-#: includes/log-list-table.php:180
+#: includes/log-list-table.php:179
 msgid "Yes"
 msgstr ""
 
-#: includes/log-list-table.php:204
+#: includes/log-list-table.php:203
 msgid "Delete All Logs"
 msgstr ""
 
-#: includes/log-list-table.php:251
+#: includes/log-list-table.php:250
 msgid "Email Log Deleted."
 msgstr ""
 
-#: includes/log-list-table.php:259
+#: includes/log-list-table.php:258
 msgid "Fail to Delete Email Log. Please try again."
 msgstr ""
 
+#: includes/log-list-table.php:266
+msgid "Cheatin&#8217; uh?"
+msgstr ""
+
 #: includes/log-list-table.php:267
-msgid "Cheatin&#8217; uh?"
-msgstr ""
-
-#: includes/log-list-table.php:268
 msgid "Sorry, you are not allowed to delete email log."
 msgstr ""
 
-#: includes/log-list-table.php:357
+#: includes/log-list-table.php:356
 msgid "Your email log is empty"
 msgstr ""
@@ -126 +122 @@
 msgstr ""
 
-#: includes/settings.php:47 includes/settings.php:48 includes/settings.php:95
+#: includes/settings.php:50 includes/settings.php:51 includes/settings.php:107
 msgid "Email Log"
 msgstr ""
 
-#: includes/settings.php:71
+#: includes/settings.php:84
 msgid "Entries per page"
 msgstr ""
 
-#: includes/settings.php:100
+#: includes/settings.php:112
 msgid "Search Logs"
+msgstr ""
+
+#: includes/settings.php:125
+msgid "Email Content"
 msgstr ""
 

fx-email-log/trunk/readme.txt

@@ -3 +3 @@
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TT23LVNKA3AU2
 Tags: Email,Email Log,Database,Log,Contact Form,Contact Form 7
-Requires at least: 4.4
-Tested up to: 4.6
-Stable tag: 1.0.2
+Requires at least: 4.5
+Tested up to: 4.7
+Stable tag: 1.0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -51 +51 @@
 == Changelog ==
 
+= 1.0.3 - 22 Apr 2017 =
+* Prevent fatal error when logging invalid usage of wp_mail.
+
 = 1.0.2 - 23 Oct 2016 =
 * Responsive modal box (no longer use wp core thickbox).