Changeset 39610

Timestamp:

04/10/08 18:18:07 (3 months ago)

Author:

GamerZ

Message:

Added Back Remarks Column

Files:

• wp-email/trunk/email-manager.php (modified) (4 diffs)
• wp-email/trunk/readme.html (modified) (2 diffs)
• wp-email/trunk/wp-email.mo (modified) (previous)
• wp-email/trunk/wp-email.php (modified) (1 diff)
• wp-email/trunk/wp-email.pot (modified) (8 diffs)

wp-email/trunk/email-manager.php

@@ -168 +168 @@
-      <p><?php printf(__('Dispaying <strong>%s</strong> To <strong>%s</strong> Of <strong>%s</strong> E-Mail Logs', 'wp-email'), $display_on_page, $max_on_page, $total_email); ?></p>
-      <p><?php printf(__('Sorted By <strong>%s</strong> In <strong>%s</strong> Order', 'wp-email'), $email_sortby_text, $email_sortorder_text); ?></p>
+      <?php
+            $colspan = 7;
+            if(EMAIL_SHOW_REMARKS) {
+                  $colspan++;
+            }
+      ?>    
-      <table class="widefat">
-            <thead>
-            <tr>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            </tr>
-      </thead>
@@ -195 +206 @@
-                        $email_friendemail = stripslashes($email_log->email_friendemail);
-                        $email_postid = intval($email_log->email_postid);
+                        $email_remarks = htmlspecialchars(stripslashes($email_log->email_yourremarks));
-                        $email_posttitle = htmlspecialchars(stripslashes($email_log->email_posttitle));
-                        $email_date = mysql2date(sprintf(__('%s @ %s', 'wp-email'), get_option('date_format'), get_option('time_format')), gmdate('Y-m-d H:i:s', $email_log->email_timestamp));
@@ -206 +218 @@
-                        echo "<td>$email_date</td>\n";
-                        echo "<td>$email_ip<br />$email_host</td>\n";
+                        if(EMAIL_SHOW_REMARKS) {
+                              echo '<td>'.$email_remarks.'</td>';
+                        }
-                        echo "<td>$email_posttitle</td>\n";
-                        echo "<td>$email_status</td>\n";
@@ -212 +227 @@
-                  }
-            } else {
-7
+'.$colspan.'
-            }
-      ?>

wp-email/trunk/readme.html

@@ -292 +292 @@
-                                    <li>NEW: Changed wp-email-popup.php To email-popup.php</li>
-                                    <li>NEW: Use number_format_i18n() Instead</li>
+                                    <li>NEW: Show 'Remarks' In 'WP-Admin -> E-Mail -> E-Mail Logs' Page By Default. See Usage Tab On How To Hide It.</li>
-                              </ul>
-                        </li>
@@ -599 +600 @@
-                        </li>
-                  </ul>
+                  <div class="SubSubTitle">To Hide Remarks When Viewing Email Logs In WP-Admin</div>
+                  <ol>
+                        <li>
+                              Open <strong>wp-email.php</strong>
+                        </li>
+                        <li>
+                              Find:
+                              <blockquote>
+                                          define('EMAIL_SHOW_REMARKS', true);
+                              </blockquote>
+                        </li>
+                        <li>
+                              Replace:
+                              <blockquote>
+                                          define('EMAIL_SHOW_REMARKS', false);
+                              </blockquote>
+                        </li>
+                  </ol>
-                  <div class="SubSubTitle">Note</div>
-                  <ul>

wp-email/trunk/wp-email.php

@@ -27 +27 @@
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+
+
+### Define: Show Email Remarks In Logs?
+define('EMAIL_SHOW_REMARKS', true);
-
-

wp-email/trunk/wp-email.pot

@@ -2 +2 @@
-msgstr ""
-"Project-Id-Version: WP-EMail 2.30\n"
-
-
-
+
+
+
+
-"Language-Team: Lester Chan <lesterchan@gmail.com>\n"
-"MIME-Version: 1.0\n"
-utf
+UTF
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: English\n"
@@ -16 +17 @@
-
-#: email-manager.php:54
-3
-82
+9
+97
-msgid "ID"
-msgstr ""
-
-#: email-manager.php:58
-83
+98
-msgid "From Name"
-msgstr ""
-
-#: email-manager.php:62
-84
+99
-msgid "From E-Mail"
-msgstr ""
-
-#: email-manager.php:66
-285
+300
-msgid "To Name"
-msgstr ""
-
-#: email-manager.php:70
-286
+301
-msgid "To E-Mail"
-msgstr ""
-
-#: email-manager.php:74
-288
+303
-msgid "Post ID"
-msgstr ""
-
-#: email-manager.php:78
-78
-289
+89
+304
-msgid "Post Title"
-msgstr ""
-
-#: email-manager.php:82
-290
+305
-msgid "IP"
-msgstr ""
-
-#: email-manager.php:86
-291
+306
-msgid "Host"
-msgstr ""
-
-#: email-manager.php:90
-79
-292
+90
+307
-msgid "Status"
-msgstr ""
-
-#: email-manager.php:95
-287
+302
-msgid "Date"
-msgstr ""
-
-#: email-manager.php:103
-296
+311
-msgid "Ascending"
-msgstr ""
-
-#: email-manager.php:108
-297
+312
-msgid "Descending"
-msgstr ""
@@ -92 +93 @@
-
-#: email-manager.php:126
-3
-0
-3
-0
-1
+7
+4
+7
+4
+5
-msgid "Success"
-msgstr ""
-
-#: email-manager.php:127
-4
-5
-2
+8
+9
+6
-msgid "Failed"
-msgstr ""
@@ -121 +122 @@
-msgstr ""
-
-74
+80
-msgid "From"
-msgstr ""
-
-75
+81
-msgid "To"
-msgstr ""
-
-76
+82
-msgid "Date / Time"
-msgstr ""
-
-77
+83
-msgid "IP / Host"
-msgstr ""
-
-
+
+
+
+
+
-#, php-format
-msgid "%s @ %s"
-msgstr ""
-
-14
+29
-msgid "No E-Mail Logs Found"
-msgstr ""
-
-28
+43
-msgid "Previous Page"
-msgstr ""
-
-37
+52
-msgid "Next Page"
-msgstr ""
-
-46
+61
-msgid "Pages"
-msgstr ""
-
-49
+64
-msgid "Go to First Page"
-msgstr ""
-
-49
+64
-msgid "First"
-msgstr ""
-
-52
-64
+67
+79
-msgid "Go to Page"
-msgstr ""
-
-59
+74
-#: wp-email-widget.php:84
-msgid "Page"
-msgstr ""
-
-67
+82
-msgid "Go to Last Page"
-msgstr ""
-
-67
+82
-msgid "Last"
-msgstr ""
-
-80
+95
-msgid "Sort Options:"
-msgstr ""
-
-04
-06
+19
+21
-msgid "Per Page"
-msgstr ""
-
-11
+26
-msgid "Sort"
-msgstr ""
-
-18
+33
-msgid "E-Mail Logs Stats"
-msgstr ""
-
-22
+37
-msgid "Total E-Mails:"
-msgstr ""
-
-26
+41
-msgid "Total E-Mail Sent:"
-msgstr ""
-
-30
+45
-msgid "Total E-Mail Failed:"
-msgstr ""
-
-39
+54
-msgid "Delete E-Mail Logs"
-msgstr ""
-
-43
+58
-msgid "Are You Sure You Want To Delete All E-Mail Logs?"
-msgstr ""
-
-45
+60
-msgid ""
-"You Are About To Delete All E-Mail Logs\\n"
@@ -306 +311 @@
-
-#: email-options.php:122
-79
+83
-msgid "E-Mail '%EMAIL_POST_TITLE%' To A Friend"
-msgstr ""
-
-#: email-options.php:125
-0
+4
-msgid "Email a copy of <strong>'%EMAIL_POST_TITLE%'</strong> to a friend"
-msgstr ""
-
-#: email-options.php:128
-4
+8
-msgid "Recommended Article By %EMAIL_YOUR_NAME%: %EMAIL_POST_TITLE%"
-msgstr ""
@@ -344 +349 @@
-
-#: email-options.php:137
-5
+9
-msgid "Back to %EMAIL_POST_TITLE%"
-msgstr ""
-
-#: email-options.php:140
-66
+70
-msgid "An error has occurred when trying to send this email: "
-msgstr ""
-
-#: email-options.php:143
-67
+71
-msgid "An error has occurred: "
-msgstr ""
-
-#: email-options.php:166
-57
+61
-msgid "E-Mail Options"
-msgstr ""
@@ -729 +734 @@
-#: email-uninstall.php:81
-#: email-uninstall.php:91
-58
+62
-msgid "Uninstall WP-EMail"
-msgstr ""
@@ -806 +811 @@
-msgstr ""
-
-3
-0
+7
+4
-msgid "E-Mail"
-msgstr ""
-
-56
+60
-msgid "Manage E-Mail"
-msgstr ""
-
-1
+5
-msgid "The Following Error Occurs:"
-msgstr ""
-
-2
+6
-msgid "- Your Name is empty/invalid"
-msgstr ""
-
-3
+7
-msgid "- Your Email is empty/invalid"
-msgstr ""
-
-4
+8
-msgid "- Your Remarks is invalid"
-msgstr ""
-
-5
+9
-msgid "- Friend Name(s) is empty"
-msgstr ""
-
-56
+60
-msgid "- Friend Name is empty/invalid:"
-msgstr ""
-
-57
+61
-#, php-format
-msgid "- Maximum %s Friend Name(s) allowed"
-msgstr ""
-
-58
+62
-msgid "- Friend Email(s) is empty"
-msgstr ""
-
-59
+63
-msgid "- Friend Email is invalid:"
-msgstr ""
-
-0
+4
-#, php-format
-msgid "- Maximum %s Friend Email(s) allowed"
-msgstr ""
-
-1
+5
-msgid "- Friend Name(s) count does not tally with Friend Email(s) count"
-msgstr ""
-
-2
+6
-msgid "- Image Verification is empty"
-msgstr ""
-
-88
+92
-msgid "Note: There is an email link embedded within this post, please visit this post to email it."
-msgstr ""
-
-59
+63
-#, php-format
-msgid "Protected: %s"
-msgstr ""
-
-1
+5
-#, php-format
-msgid "Private: %s"
-msgstr ""
-
-28
+32
-msgid "Password Protected Post"
-msgstr ""
-
-2
+6
-#, php-format
-msgid "Separate multiple entries with a comma. Maximum %s entries."
-msgstr ""
-
-1
-07
+5
+11
-msgid "emails"
-msgstr ""
-
-1
-2
-4
+5
+6
+8
-msgid "N/A"
-msgstr ""
-
-4
+8
-msgid "Your Name is empty"
-msgstr ""
-
-797
+801
-msgid "Your Name is invalid"
-msgstr ""
-
-3
+7
-msgid "Your Email is empty"
-msgstr ""
-
-06
+10
-msgid "Your Email is invalid"
-msgstr ""
-
-2
+6
-msgid "Your Remarks is invalid"
-msgstr ""
-
-18
+22
-msgid "Friend Name(s) is empty"
-msgstr ""
-
-4
+8
-#, php-format
-msgid "Friend Name is empty: %s"
-msgstr ""
-
-26
+30
-#, php-format
-msgid "Friend Name is invalid: %s"
-msgstr ""
-
-0
+4
-msgid "Friend Email(s) is empty"
-msgstr ""
-
-46
+50
-#, php-format
-msgid "Friend Email is empty: %s"
-msgstr ""
-
-48
+52
-#, php-format
-msgid "Friend Email is invalid: %s"
-msgstr ""
-
-1
+5
-#, php-format
-msgid "Maximum %s Friend(s) allowed"
-msgstr ""
-
-5
+9
-msgid "Friend Name(s) count does not tally with Friend Email(s) count"
-msgstr ""
-
-2
+6
-msgid "Image Verification is empty"
-msgstr ""
-
-5
+9
-msgid "Image Verification failed"
-msgstr ""
-
-57
+61
-msgid "* Required Field"
-msgstr ""
-
-0
+4
-msgid "Your Name: *"
-msgstr ""
-
-66
+70
-msgid "Your E-Mail: *"
-msgstr ""
-
-2
+6
-msgid "Your Remark:"
-msgstr ""
-
-78
+82
-msgid "Friend's Name: *"
-msgstr ""
-
-3
+7
-msgid "Friend's E-Mail: *"
-msgstr ""
-
-88
+92
-msgid "Image Verification: *"
-msgstr ""
-
-89
+93
-msgid "E-Mail Image Verification"
-msgstr ""
-
-2
+6
-msgid "     Mail It!     "
-msgstr ""
-
-098
+102
-#, php-format
-msgid "Please wait for <strong>%s Minutes</strong> before sending the next article."
-msgstr ""
-
-0
+4
-msgid "Loading"
-msgstr ""
-
-3
-5
-198
+7
+9
+202
-msgid "WP-EMail"
-msgstr ""
-
-76
-78
+80
+82
-msgid "Most Emailed Posts"
-msgstr ""
-
-0
+4
-msgid "emails were sent."
-msgstr ""
-
-1
+5
-msgid "emails were sent successfully."
-msgstr ""
-
-2
+6
-msgid "emails failed to send."
-msgstr ""
-
-4
+8
-msgid "Most Emailed Post"
-msgstr ""
-
-5
+9
-msgid "<p>Hi <strong>%EMAIL_FRIEND_NAME%</strong>,<br />Your friend, <strong>%EMAIL_YOUR_NAME%</strong>, has recommended this article entitled '<strong>%EMAIL_POST_TITLE%</strong>' to you.</p><p><strong>Here is his/her remark:</strong><br />%EMAIL_YOUR_REMARKS%</p><p><strong>%EMAIL_POST_TITLE%</strong><br />Posted By %EMAIL_POST_AUTHOR% On %EMAIL_POST_DATE% In %EMAIL_POST_CATEGORY%</p>%EMAIL_POST_CONTENT%<p>Article taken from %EMAIL_BLOG_NAME% - <a href=\"%EMAIL_BLOG_URL%\">%EMAIL_BLOG_URL%</a><br />URL to article: <a href=\"%EMAIL_PERMALINK%\">%EMAIL_PERMALINK%</a></p>"
-msgstr ""
-
-#: wp-email.php:1256
-msgid "Hi %EMAIL_FRIEND_NAME%,"
-msgstr ""
-
-#: wp-email.php:1256
-#: wp-email.php:1258
-#: wp-email.php:1260
-#: wp-email.php:1261
-#: wp-email.php:1262
-#: wp-email.php:1263
-msgid "\n"
-msgstr ""
-
-#: wp-email.php:1257
-msgid "Your friend, %EMAIL_YOUR_NAME%, has recommended this article entitled '%EMAIL_POST_TITLE%' to you."
-msgstr ""
-
-#: wp-email.php:1257
-#: wp-email.php:1259
-msgid ""
+"Hi %EMAIL_FRIEND_NAME%,\n"
+"Your friend, %EMAIL_YOUR_NAME%, has recommended this article entitled '%EMAIL_POST_TITLE%' to you.\n"
-"\n"
+"Here is his/her remarks:\n"
+"%EMAIL_YOUR_REMARKS%\n"
-"\n"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-msgid "Article: <strong>%EMAIL_POST_TITLE%</strong> has been sent to <strong>%EMAIL_FRIEND_NAME% (%EMAIL_FRIEND_EMAIL%)</strong></p><p>&laquo; <a href=\"%EMAIL_PERMALINK%\">"
-msgstr ""
-
-
-
-
-
-
+
-msgid "Email This Post"
-msgstr ""
-
-4
+8
-msgid "Email This Page"
-msgstr ""