Changeset 12279

Timestamp:

05/06/07 10:00:37 (1 year ago)

Author:

GamerZ

Message:

WP-Email 2.11

Files:

• wp-email/trunk/email/email-manager.php (modified) (3 diffs)
• wp-email/trunk/email/email-options.php (modified) (7 diffs)
• wp-email/trunk/email/email.php (modified) (13 diffs)
• wp-email/trunk/email/wp-email.pot (modified) (6 diffs)
• wp-email/trunk/readme.html (modified) (2 diffs)

wp-email/trunk/email/email-manager.php

@@ -225 +225 @@
-                              <?php
-                                    if($email_page > 1 && ((($email_page*$email_log_perpage)-($email_log_perpage-1)) <= $total_email)) {
-
+$email_sort_url.
-                                    } else {
-                                          echo '&nbsp;';
@@ -234 +234 @@
-                              <?php
-                                    if($email_page >= 1 && ((($email_page*$email_log_perpage)+1) <=  $total_email)) {
-
+$email_sort_url.
-                                    } else {
-                                          echo '&nbsp;';
@@ -246 +246 @@
-                              <?php
-                                    if ($email_page >= 4) {
-$email_sort_url.
+
-                                    }
-                                    if($email_page > 1) {

wp-email/trunk/email/email-options.php

@@ -54 +54 @@
-      $email_multiple = intval(trim($_POST['email_multiple']));
-      $email_imageverify = intval(trim($_POST['email_imageverify']));
+      $email_template_title = trim($_POST['email_template_title']);
+      $email_template_subtitle = trim($_POST['email_template_subtitle']);
-      $email_template_subject = strip_tags(trim($_POST['email_template_subject']));
-      $email_template_body = trim($_POST['email_template_body']);
@@ -71 +73 @@
-      $update_email_queries[] = update_option('email_multiple', $email_multiple);
-      $update_email_queries[] = update_option('email_imageverify', $email_imageverify);
+      $update_email_queries[] = update_option('email_template_title', $email_template_title);
+      $update_email_queries[] = update_option('email_template_subtitle', $email_template_subtitle);
-      $update_email_queries[] = update_option('email_template_subject', $email_template_subject);
-      $update_email_queries[] = update_option('email_template_body', $email_template_body);
@@ -86 +90 @@
-      $update_email_text[] = __('Multiple E-Mails Option', 'wp-email');
-      $update_email_text[] = __('Image Verification Option', 'wp-email');
+      $update_email_text[] = __('Page Title Template', 'wp-email');
+      $update_email_text[] = __('Page Subtitle Template', 'wp-email');
-      $update_email_text[] = __('Subject Template', 'wp-email');
-      $update_email_text[] = __('Body Template', 'wp-email');
@@ -112 +118 @@
-            var default_template;
-            switch(template) {
+                  case "title":
+                        default_template = "<?php _e('E-Mail \'%EMAIL_POST_TITLE%\' To A Friend', 'wp-email'); ?>";
+                        break;
+                  case "subtitle":
+                        default_template = "<p style=\"text-align: center;\"><?php _e('Email a copy of <strong>\'%EMAIL_POST_TITLE%\'</strong> to a friend', 'wp-email'); ?></p>";
+                        break;
-                  case "subject":
-                        default_template = "<?php _e('Recommended Article By %EMAIL_YOUR_NAME%: %EMAIL_POST_TITLE%', 'wp-email'); ?>";
@@ -119 +131 @@
-                        break;
-                  case "bodyalt":
-s
+
-                        break;
-                  case "sentsuccess":
@@ -343 +355 @@
-                  </table>
-            </fieldset>
+      <fieldset class="options">
+                  <legend><?php _e('E-Mail Page Templates', 'wp-email'); ?></legend>
+                  <table width="100%"  border="0" cellspacing="3" cellpadding="3">
+                         <tr valign="top">
+                              <td align="left" width="30%">
+                                    <strong><?php _e('E-Mail Page Title:', 'wp-email'); ?></strong><br /><br />
+                                    <?php _e('Allowed Variables:', 'wp-email'); ?><br />
+                                    - %EMAIL_POST_TITLE%<br />
+                                    - %EMAIL_POST_AUTHOR%<br />
+                                    - %EMAIL_POST_DATE%<br />
+                                    - %EMAIL_POST_CATEGORY%<br />
+                                    - %EMAIL_BLOG_NAME%<br />
+                                    - %EMAIL_BLOG_URL%<br />
+                                    - %EMAIL_PERMALINK%<br /><br />
+                                    <input type="button" name="RestoreDefault" value="<?php _e('Restore Default Template', 'wp-email'); ?>" onclick="javascript: email_default_templates('title');" class="button" />
+                              </td>
+                              <td align="left"><input type="text" id="email_template_title" name="email_template_title" value="<?php echo htmlspecialchars(stripslashes(get_option('email_template_title'))); ?>" size="82" /></td>
+                        </tr>
+                        <tr valign="top"> 
+                              <td align="left" width="30%">
+                                    <strong><?php _e('E-Mail Page Subtitle:', 'wp-email'); ?></strong><br /><br />
+                                    <?php _e('Allowed Variables:', 'wp-email'); ?><br />
+                                    - %EMAIL_POST_TITLE%<br />
+                                    - %EMAIL_POST_AUTHOR%<br />
+                                    - %EMAIL_POST_DATE%<br />
+                                    - %EMAIL_POST_CATEGORY%<br />
+                                    - %EMAIL_BLOG_NAME%<br />
+                                    - %EMAIL_BLOG_URL%<br />
+                                    - %EMAIL_PERMALINK%<br /><br />
+                                    <input type="button" name="RestoreDefault" value="<?php _e('Restore Default Template', 'wp-email'); ?>" onclick="javascript: email_default_templates('subtitle');" class="button" />
+                              </td>
+                              <td align="left"><input type="text" id="email_template_subtitle" name="email_template_subtitle" value="<?php echo htmlspecialchars(stripslashes(get_option('email_template_subtitle'))); ?>" size="82" /></td> 
+                        </tr>
+                  </table>
+            </fieldset>
-            <fieldset class="options">
-                  <legend><?php _e('E-Mail Templates', 'wp-email'); ?></legend>
@@ -461 +508 @@
-            </fieldset>
-            <div align="center">
-V
+v
-            </div>
-      </form> 

wp-email/trunk/email/email.php

@@ -90 +90 @@
-add_action('wp_head', 'email_js');
-function email_js() {
-0
+1
-      echo '<script type="text/javascript">'."\n";
-      echo '/* <![CDATA[ */'."\n";
@@ -99 +99 @@
-      echo '</script>'."\n";
-      echo '<link rel="stylesheet" href="'.get_option('siteurl').'/wp-content/plugins/email/email-css.css" type="text/css" media="screen" />'."\n";
-0
+1
-}
-
-
-### Function: Display E-Mail Link
-
+, $echo = true
-      global $id;
+      $output = '';
-      $using_permalink = get_option('permalink_structure');
-      $email_options = get_option('email_options');
@@ -160 +161 @@
-            // Icon + Text Link
-            case 1:
-echo '<img class="WP-EmailIcon" src="'.$email_icon.'" alt="'.$email_text.'" title="'.$email_text.'" style="border: 0px;" />&nbsp;<a href="'.$email_link.'"'.$onclick.' title="'.$email_text.'" rel="nofollow">'.$email_text.'</a>'."\n"
+$output = '<img class="WP-EmailIcon" src="'.$email_icon.'" alt="'.$email_text.'" title="'.$email_text.'" style="border: 0px;" />&nbsp;<a href="'.$email_link.'"'.$onclick.' title="'.$email_text.'" rel="nofollow">'.$email_text.'</a>'
-                  break;
-            // Icon Only
-            case 2:
-echo '<a href="'.$email_link.'"'.$onclick.' title="'.$email_text.'" rel="nofollow"><img class="WP-EmailIcon" src="'.$email_icon.'" alt="'.$email_text.'" title="'.$email_text.'" style="border: 0px;" /></a>'."\n"
+$output = '<a href="'.$email_link.'"'.$onclick.' title="'.$email_text.'" rel="nofollow"><img class="WP-EmailIcon" src="'.$email_icon.'" alt="'.$email_text.'" title="'.$email_text.'" style="border: 0px;" /></a>'
-                  break;
-            // Text Link Only
-            case 3:
-echo '<a href="'.$email_link.'"'.$onclick.' title="'.$email_text.'" rel="nofollow">'.$email_text.'</a>'."\n"
+$output = '<a href="'.$email_link.'"'.$onclick.' title="'.$email_text.'" rel="nofollow">'.$email_text.'</a>'
-                  break;
-            case 4:
@@ -175 +176 @@
-                  $email_html = str_replace("%EMAIL_TEXT%", $email_text, $email_html);
-                  $email_html = str_replace("%EMAIL_ICON_URL%", $email_icon, $email_html);
-echo
+$output =
-                  break;
+      }
+      if($echo) {
+            echo $output."\n";
+      } else {
+            return $output;
-      }
-}
@@ -185 +191 @@
-function email_popup($deprecated = '', $deprecated2 ='') { email_link(); }
-function email_popup_image() { email_link(); }
+
+
+### Function: Place E-Mail Link
+add_filter('the_content', 'place_emaillink', 7);
+function place_emaillink($content){
+      if(!is_feed()) {
+             $content = preg_replace("/\[email_link\]/ise", "email_link('', '', false)", $content);
+      } else {
+            $content = preg_replace("/\[email_link\]/ise", __('Note: You can email this post by visiting the site.', 'wp-email'), $content);
+      }   
+      return $content;
+}
-
-
@@ -225 +243 @@
-
-### Function: E-Mail Title
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -579 +609 @@
-      global $post_excerpt, $post_content, $post_content_alt, $wpdb;
-      // Variables
+      $post_title = get_the_title();
+      $post_author = the_author('', false);                 
+      $post_date = get_the_time(get_option('date_format').' ('.get_option('time_format').')', '', '', false);
+      $post_category = email_category();              
+      $post_category_alt = strip_tags($post_category);
-      $email_fields = get_option('email_fields');
-      $email_image_verify = intval(get_option('email_imageverify'));
@@ -587 +622 @@
-      $friendemail = strip_tags(stripslashes(trim($_POST['friendemail'])));
-      $output = '<div class="wp-email">'."\n";
-
+
+
+
+
+
+
+
+
+
-      // If User Click On Mail
-      if(!empty($_POST['wp-email'])) {
@@ -618 +661 @@
-            if(intval($email_fields['yourremarks']) == 1) {
-                  if(!is_valid_remarks($yourremarks)) {
-s
+
-                  }
-            }
@@ -680 +723 @@
-            if(empty($error) && not_spamming()) {
-                  // If Remarks Is Empty, Assign N/A
-'N/A'
+__('N/A', 'wp-email')
-                  // Variables Variables Variables
-                  remove_filter('the_content', 'email_form');
-                  $post_title = get_the_title();
-                  $post_author = the_author('', false);                 
-                  $post_date = get_the_time(get_option('date_format').' ('.get_option('time_format').')', '', '', false);
-                  $post_category = email_category();              
-                  $post_category_alt = strip_tags($post_category);
-                  // Template For E-Mail Subject
-                  $template_email_subject = stripslashes(get_option('email_template_subject'));
@@ -830 +868 @@
-                        if(intval($email_fields['yourremarks']) == 1) {
-                              $output .= '<p>'."\n";
-s
+
-                              $output .= '      <textarea cols="49" rows="8" id="yourremarks" name="yourremarks" class="Forms">'.$yourremarks.'</textarea>'."\n";
-                              $output .= '</p>'."\n";
@@ -933 +971 @@
-      add_option('email_mailer', 'php', 'Your Mailer Type');
-      add_option('email_template_subject', __('Recommended Article By %EMAIL_YOUR_NAME%: %EMAIL_POST_TITLE%', 'wp-email'), 'Template For E-Mail Subject');
-s
+
-      add_option('email_template_bodyalt', __('Hi %EMAIL_FRIEND_NAME%,'."\n".
-      'Your friend, %EMAIL_YOUR_NAME%, has recommended this article entitled \'%EMAIL_POST_TITLE%\' to you.'."\n\n".
@@ -956 +994 @@
-      add_option('email_options', $email_options, 'Email Options');
-      add_option('email_fields', $email_fields, 'Email Fields');
+      // Version 2.11 Options
+      add_option('email_template_title', __('E-Mail \'%EMAIL_POST_TITLE%\' To A Friend', 'wp-email'), 'Template For E-Mail Page Title');
+      add_option('email_template_subtitle', '<p style="text-align: center;">'.__('Email a copy of <strong>\'%EMAIL_POST_TITLE%\'</strong> to a friend', 'wp-email').'</p>', 'Template For E-Mail Page SubTitle');
-      // Set 'manage_email' Capabilities To Administrator   
-      $role = get_role('administrator');

wp-email/trunk/email/wp-email.pot

@@ -3 +3 @@
-"Project-Id-Version: WP-EMail 2.10\n"
-"POT-Creation-Date: \n"
-3-22 02:01
+5-06 16:12
-"Last-Translator: Lester 'GaMerZ' Chan <gamerz84@hotmail.com>\n"
-"Language-Team: Lester Chan <gamerz84@hotmail.com>\n"
@@ -92 +92 @@
-
-#: email-manager.php:126
-5
-473
-4
-79
+8
+515
+9
+84
-msgid "Success"
-msgstr ""
-
-#: email-manager.php:127
-487
-75
+529
+80
-msgid "Failed"
-msgstr ""
@@ -221 +221 @@
-msgstr ""
-
-79
+83
-msgid "SMTP Information"
-msgstr ""
-
-0
+4
-msgid "E-Mail Style"
-msgstr ""
-
-1
+5
-msgid "E-Mail Fields"
-msgstr ""
-
-2
+6
-msgid "E-Mail Content Type"
-msgstr ""
-
-3
+7
-msgid "Send E-Mail Method"
-msgstr ""
-
-4
+8
-msgid "Snippet Option"
-msgstr ""
-
-5
+9
-msgid "Interval Option"
-msgstr ""
-
-86
+90
-msgid "Multiple E-Mails Option"
-msgstr ""
-
-87
+91
-msgid "Image Verification Option"
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
-msgid "Subject Template"
-msgstr ""
-
-89
+95
-msgid "Body Template"
-msgstr ""
-
-0
+6
-msgid "Alternate Body Template"
-msgstr ""
-
-1
+7
-msgid "Sent Success Template"
-msgstr ""
-
-2
+8
-msgid "Sent Failed Template"
-msgstr ""
-
-3
+9
-msgid "Error Template"
-msgstr ""
-
-98
+104
-msgid "Updated"
-msgstr ""
-
-3
+9
-msgid "No E-Mail Option Updated"
-msgstr ""
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Recommended Article By %EMAIL_YOUR_NAME%: %EMAIL_POST_TITLE%"
-msgstr ""
-
-18
+30
-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 remarks:</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 ""
-
-21
+33
-msgid ""
-"Hi %EMAIL_FRIEND_NAME%,\\n"
-"Your friend, %EMAIL_YOUR_NAME%, has recommended this article entitled '%EMAIL_POST_TITLE%' to you.\\n"
-"\\n"
-s
+
-"%EMAIL_YOUR_REMARKS%\\n"
-"\\n"
@@ -313 +331 @@
-msgstr ""
-
-24
+36
-msgid "Article: <strong>%EMAIL_POST_TITLE%</strong> Has Been Sent To <strong>%EMAIL_FRIEND_NAME% (%EMAIL_FRIEND_EMAIL%)</strong>"
-msgstr ""
-
-27
-3
+39
+8
-msgid "An Error Has Occured When Trying To Send The E-Mail"
-msgstr ""
-
-30
-3
+42
+8
-msgid "An Error Has Occured"
-msgstr ""
-
-52
+64
-#: email.php:47
-msgid "E-Mail Options"
-msgstr ""
-
-55
+67
-msgid "SMTP Settings"
-msgstr ""
-
-62
+74
-msgid "SMTP Username:"
-msgstr ""
-
-66
+78
-msgid "SMTP Password:"
-msgstr ""
-
-70
+82
-msgid "SMTP Server:"
-msgstr ""
-
-71
+83
-msgid "You may leave the above fields blank if you do not use a SMTP server."
-msgstr ""
-
-77
+89
-msgid "E-Mail Styles"
-msgstr ""
-
-80
+92
-msgid "E-Mail Text Link For Post"
-msgstr ""
-
-86
+98
-msgid "E-Mail Text Link For Page"
-msgstr ""
-
-192
+204
-msgid "E-Mail Icon"
-msgstr ""
-
-20
+32
-msgid "E-Mail Link Type"
-msgstr ""
-
-23
+35
-msgid "E-Mail Standalone Page"
-msgstr ""
-
-24
+36
-msgid "E-Mail Popup"
-msgstr ""
-
-29
+41
-msgid "E-Mail Text Link Style"
-msgstr ""
-
-32
+44
-msgid "E-Mail Icon With Text Link"
-msgstr ""
-
-33
+45
-msgid "E-Mail Icon Only"
-msgstr ""
-
-34
+46
-msgid "E-Mail Text Link Only"
-msgstr ""
-
-35
+47
-msgid "Custom"
-msgstr ""
-
-39
+51
-msgid "HTML is allowed."
-msgstr ""
-
-40
+52
-msgid "URL to the email post/page."
-msgstr ""
-
-41
+53
-msgid "It will produce the onclick html code which is nescassary for popup."
-msgstr ""
-
-42
+54
-msgid "Example Popup Template:"
-msgstr ""
-
-44
+56
-msgid "E-Mail text link of the post/page that you have typed in above."
-msgstr ""
-
-45
+57
-msgid "URL to the email icon you have chosen above."
-msgstr ""
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-msgid "Restore Default Template"
-msgstr ""
-
-53
+65
-msgid "E-Mail Settings"
-msgstr ""
-
-56
+68
-msgid "E-Mail Fields:"
-msgstr ""
-
-58
+70
-msgid "Your Name"
-msgstr ""
-
-59
+71
-msgid "Your E-Mail"
-msgstr ""
-
-60
+72
-msgid "Your Remarks"
-msgstr ""
-
-61
+73
-msgid "Friend's Name"
-msgstr ""
-
-62
+74
-msgid "Friend's E-Mail"
-msgstr ""
-
-66
+78
-msgid "E-Mail Content Type:"
-msgstr ""
-
-69
+81
-msgid "Plain Text"
-msgstr ""
-
-70
+82
-msgid "HTML"
-msgstr ""
-
-75
+87
-msgid "Method Used To Send E-Mail:"
-msgstr ""
-
-78
+90
-msgid "PHP"
-msgstr ""
-
-79
+91
-msgid "SendMail"
-msgstr ""
-
-80
+92
-msgid "SMTP"
-msgstr ""
-
-82
+94
-msgid "If you ARE NOT using a smtp server of if there is a problem sending out email using your smtp server. Please Choose PHP or Send Mail."
-msgstr ""
-
-86
+98
-msgid "No. Of Words Before Cutting Off:"
-msgstr ""
-
-87
+99
-msgid "Setting this value more than 0 will enable the snippet feature. This feature will allow you to send a portion (defined by the text field above) of the article to your friend instead of the whole article."
-msgstr ""
-
-290
+302
-msgid "Interval Between E-Mails:"
-msgstr ""
-
-291
+303
-msgid "Mins"
-msgstr ""
-
-291
+303
-msgid "It allows you to specify the interval in minutes between each email sent per user based on IP to prevent spam and flood."
-msgstr ""
-
-294
+306
-msgid "Max Number Of Multiple E-Mails:"
-msgstr ""
-
-295
+307
-msgid "Setting this value more than 1 will enable this feature. It allows the maximum number of multiple e-mails that can be send at one go."
-msgstr ""
-
-298
+310
-msgid "Enable Image Verification:"
-msgstr ""
-
-01
+13
-msgid "Yes"
-msgstr ""
-
-02
+14
-msgid "No"
-msgstr ""
-
-03
+15
-msgid "It is recommanded to choose <strong>Yes</strong> unless your server does not support PHP GD Library."
-msgstr ""
-
-09
+21
-msgid "Template Variables"
-msgstr ""
-
-12
+24
-msgid "Display the sender's name"
-msgstr ""
-
-13
+25
-msgid "Display the post's title"
-msgstr ""
-
-16
+28
-msgid "Display the sender's email"
-msgstr ""
-
-17
+29
-msgid "Display the post's author"
-msgstr ""
-
-20
+32
-msgid "Display the sender's remarks"
-msgstr ""
-
-21
+33
-msgid "Display the post's date"
-msgstr ""
-
-24
+36
-msgid "Display the friend's name"
-msgstr ""
-
-25
+37
-msgid "Display the post's category"
-msgstr ""
-
-28
+40
-msgid "Display the friend's email"
-msgstr ""
-
-29
+41
-msgid "Display the post's excerpt"
-msgstr ""
-
-32
+44
-msgid "Display the error message"
-msgstr ""
-
-33
+45
-msgid "Display the post's content"
-msgstr ""
-
-36
+48
-msgid "Display the blog's name"
-msgstr ""
-
-37
+49
-msgid "Display the permalink of the post"
-msgstr ""
-
-40
+52
-msgid "Display the blog's url"
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "E-Mail Templates"
-msgstr ""
-
-50
+97
-msgid "E-Mail Subject:"
-msgstr ""
-
-
-
-
-
-
-
-
-
-
-
+
-msgid "E-Mail Body:"
-msgstr ""
-
-389
+436
-msgid "E-Mail Alternate Body:"
-msgstr ""
-
-12
+59
-msgid "After Sending E-Mail Templates"
-msgstr ""
-
-16
+63
-msgid "Sent Successfully:"
-msgstr ""
-
-30
+77
-msgid "Sent Failed:"
-msgstr ""
-
-46
+93
-msgid "E-Mail Misc Templates"
-msgstr ""
-
-50
+97
-msgid "E-Mail Error:"
-msgstr ""
-
-463
+510
-msgid "Update Options"
-msgstr ""
-
-463
+510
-msgid "Cancel"
-msgstr ""
-
-#: email.php:43
-12
+30
-msgid "E-Mail"
-msgstr ""
@@ -664 +698 @@
-msgstr ""
-
-
-
-
-
-
-
+
+
+
+
+
-msgid "Password Protected Post"
-msgstr ""
-
-45
+87
-#, php-format
-msgid "Separate multiple entries with a comma. Maximum %s entries."
-msgstr ""
-
-14
-20
+56
+62
-msgid "Emails"
-msgstr ""
-
-
-
+
+
+
-msgid "N/A"
-msgstr ""
-
-
-
-
-
-
-
+
-msgid "Your name is empty."
-msgstr ""
-
-02
+57
-msgid "Your email is invalid or is empty."
-msgstr ""
-
-08
-s
-
-
-17
+63
+
+
+
+72
-#, php-format
-msgid "Friend's name (%s) is empty."
-msgstr ""
-
-34
+89
-#, php-format
-msgid "Friend's email (%s) is invalid or is empty."
-msgstr ""
-
-648
+703
-#, php-format
-msgid "Maximum %s entries allowed"