Changeset 18658

Show
Ignore:
Timestamp:
09/13/07 07:43:51 (10 months ago)
Author:
GamerZ
Message:

Remove PHPMailer

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r15943 r18658  
    285285                              <td align="left"> 
    286286                                    <select name="email_mailer" size="1"> 
    287                                           <option value="php"<?php selected('php', get_option('email_mailer')); ?>><?php _e('PHP', 'wp-email'); ?></option> 
     287                                          <option value="mail"<?php selected('mail', get_option('email_mailer')); ?>><?php _e('PHP', 'wp-email'); ?></option> 
    288288                                          <option value="sendmail"<?php selected('sendmail', get_option('email_mailer')); ?>><?php _e('SendMail', 'wp-email'); ?></option> 
    289289                                          <option value="smtp"<?php selected('smtp', get_option('email_mailer')); ?>><?php _e('SMTP', 'wp-email'); ?></option> 

  • wp-email/trunk/email/email.php

    r17967 r18658  
    851851                  $template_email_bodyalt = str_replace("%EMAIL_PERMALINK%", get_permalink(), $template_email_bodyalt); 
    852852                  // PHP Mailer Variables 
    853                   require(ABSPATH.'wp-content/plugins/email/class-phpmailer.php'); 
     853                  if (!class_exists("phpmailer")) { 
     854                        require_once(ABSPATH.'wp-includes/class-phpmailer.php'); 
     855                  }            
    854856                  $mail = new PHPMailer(); 
    855857                  $mail->From     = $youremail; 
    …… 
    862864                  $mail->Host     = $email_smtp['server']; 
    863865                  $mail->Mailer   = get_option('email_mailer'); 
     866                  if($mail->IsSMTP()) { 
     867                        $mail->SMTPAuth = true; 
     868                  } 
    864869                  $mail->ContentType =  get_option('email_contenttype'); 
    865870                  $mail->Subject = $template_email_subject; 
    …… 
    12011206      add_option('email_template_title', __('E-Mail \'%EMAIL_POST_TITLE%\' To A Friend', 'wp-email'), 'Template For E-Mail Page Title'); 
    12021207      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'); 
     1208      // Version 2.20 Upgrade 
     1209      $email_mailer = get_option('email_mailer'); 
     1210      if($email_mailer == 'php') { 
     1211            update_option('email_mailer', 'mail'); 
     1212      } 
    12031213      // Set 'manage_email' Capabilities To Administrator    
    12041214      $role = get_role('administrator'); 

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

    r17967 r18658  
    33"Project-Id-Version: WP-EMail 2.20\n" 
    44"POT-Creation-Date: \n" 
    5 "PO-Revision-Date: 2007-09-06 22:49+0800\n" 
     5"PO-Revision-Date: 2007-09-13 15:42+0800\n" 
    66"Last-Translator: Lester 'GaMerZ' Chan <gamerz84@hotmail.com>\n" 
    77"Language-Team: Lester Chan <gamerz84@hotmail.com>\n" 
    …… 
    160160#: email.php:450 
    161161#: email.php:587 
    162 #: email.php:874 
    163 #: email.php:911 
    164 #: email.php:1123 
     162#: email.php:879 
     163#: email.php:916 
     164#: email.php:1128 
    165165msgid "Success" 
    166166msgstr "" 
    …… 
    168168#: email-manager.php:127 
    169169#: email.php:601 
    170 #: email.php:886 
    171 #: email.php:1124 
     170#: email.php:891 
     171#: email.php:1129 
    172172msgid "Failed" 
    173173msgstr "" 
    …… 
    372372 
    373373#: email-options.php:122 
    374 #: email.php:1201 
     374#: email.php:1206 
    375375msgid "E-Mail '%EMAIL_POST_TITLE%' To A Friend" 
    376376msgstr "" 
    377377 
    378378#: email-options.php:125 
    379 #: email.php:1202 
     379#: email.php:1207 
    380380msgid "Email a copy of <strong>'%EMAIL_POST_TITLE%'</strong> to a friend" 
    381381msgstr "" 
    382382 
    383383#: email-options.php:128 
    384 #: email.php:1176 
     384#: email.php:1181 
    385385msgid "Recommended Article By %EMAIL_YOUR_NAME%: %EMAIL_POST_TITLE%" 
    386386msgstr "" 
    …… 
    410410 
    411411#: email-options.php:137 
    412 #: email.php:1187 
     412#: email.php:1192 
    413413msgid "Back to %EMAIL_POST_TITLE%" 
    414414msgstr "" 
    415415 
    416416#: email-options.php:140 
    417 #: email.php:1188 
     417#: email.php:1193 
    418418msgid "An error has occurred when trying to send this email: " 
    419419msgstr "" 
    420420 
    421421#: email-options.php:143 
    422 #: email.php:1189 
     422#: email.php:1194 
    423423msgid "An error has occurred: " 
    424424msgstr "" 
    …… 
    907907#: email.php:638 
    908908#: email.php:808 
    909 #: email.php:885 
     909#: email.php:890 
    910910msgid "N/A" 
    911911msgstr "" 
    …… 
    976976msgstr "" 
    977977 
    978 #: email.php:978 
     978#: email.php:983 
    979979msgid "* Required Field" 
    980980msgstr "" 
    981981 
    982 #: email.php:981 
     982#: email.php:986 
    983983msgid "Your Name: *" 
    984984msgstr "" 
    985985 
    986 #: email.php:987 
     986#: email.php:992 
    987987msgid "Your E-Mail: *" 
    988988msgstr "" 
    989989 
    990 #: email.php:993 
     990#: email.php:998 
    991991msgid "Your Remark:" 
    992992msgstr "" 
    993993 
    994 #: email.php:999 
     994#: email.php:1004 
    995995msgid "Friend's Name: *" 
    996996msgstr "" 
    997997 
    998 #: email.php:1004 
     998#: email.php:1009 
    999999msgid "Friend's E-Mail: *" 
    10001000msgstr "" 
    10011001 
    1002 #: email.php:1009 
     1002#: email.php:1014 
    10031003msgid "Image Verification: *" 
    10041004msgstr "" 
    10051005 
    1006 #: email.php:1010 
     1006#: email.php:1015 
    10071007msgid "E-Mail Image Verification" 
    10081008msgstr "" 
    10091009 
    1010 #: email.php:1013 
     1010#: email.php:1018 
    10111011msgid "     Mail It!     " 
    10121012msgstr "" 
    10131013 
    1014 #: email.php:1019 
     1014#: email.php:1024 
    10151015#, php-format 
    10161016msgid "Please wait for <strong>%s Minutes</strong> before sending the next article." 
    10171017msgstr "" 
    10181018 
    1019 #: email.php:1021 
     1019#: email.php:1026 
    10201020msgid "Loading" 
    10211021msgstr "" 
    10221022 
    1023 #: email.php:1085 
    1024 #: email.php:1087 
    1025 #: email.php:1120 
     1023#: email.php:1090 
     1024#: email.php:1092 
     1025#: email.php:1125 
    10261026msgid "WP-EMail" 
    10271027msgstr "" 
    10281028 
    1029 #: email.php:1098 
    1030 #: email.php:1100 
     1029#: email.php:1103 
     1030#: email.php:1105 
    10311031msgid "Most Emailed Posts" 
    10321032msgstr "" 
    10331033 
    1034 #: email.php:1122 
     1034#: email.php:1127 
    10351035msgid "emails were sent." 
    10361036msgstr "" 
    10371037 
    1038 #: email.php:1123 
     1038#: email.php:1128 
    10391039msgid "emails were sent successfully." 
    10401040msgstr "" 
    10411041 
    1042 #: email.php:1124 
     1042#: email.php:1129 
    10431043msgid "emails failed to send." 
    10441044msgstr "" 
    10451045 
    1046 #: email.php:1136 
     1046#: email.php:1141 
    10471047msgid "Most Emailed Post" 
    10481048msgstr "" 
    10491049 
    1050 #: email.php:1177 
     1050#: email.php:1182 
    10511051msgid "<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>" 
    10521052msgstr "" 
    10531053 
    1054 #: email.php:1178 
     1054#: email.php:1183 
    10551055msgid "Hi %EMAIL_FRIEND_NAME%," 
    10561056msgstr "" 
    10571057 
    1058 #: email.php:1178 
    1059 #: email.php:1180 
    1060 #: email.php:1182 
    10611058#: email.php:1183 
     1059#: email.php:1185 
     1060#: email.php:1187 
     1061#: email.php:1188 
     1062#: email.php:1189 
     1063#: email.php:1190 
     1064msgid "\n" 
     1065msgstr "" 
     1066 
    10621067#: email.php:1184 
    1063 #: email.php:1185 
    1064 msgid "\n" 
    1065 msgstr "" 
    1066  
    1067 #: email.php:1179 
    10681068msgid "Your friend, %EMAIL_YOUR_NAME%, has recommended this article entitled '%EMAIL_POST_TITLE%' to you." 
    10691069msgstr "" 
    10701070 
    1071 #: email.php:1179 
    1072 #: email.php:1181 
     1071#: email.php:1184 
     1072#: email.php:1186 
    10731073msgid "" 
    10741074"\n" 
    …… 
    10761076msgstr "" 
    10771077 
    1078 #: email.php:1180 
     1078#: email.php:1185 
    10791079msgid "Here is his/her remarks:" 
    10801080msgstr "" 
    10811081 
    1082 #: email.php:1181 
     1082#: email.php:1186 
    10831083msgid "%EMAIL_YOUR_REMARKS%" 
    10841084msgstr "" 
    10851085 
    1086 #: email.php:1182 
     1086#: email.php:1187 
    10871087msgid "%EMAIL_POST_TITLE%" 
    10881088msgstr "" 
    10891089 
    1090 #: email.php:1183 
     1090#: email.php:1188 
    10911091msgid "Posted By %EMAIL_POST_AUTHOR% On %EMAIL_POST_DATE% In %EMAIL_POST_CATEGORY%" 
    10921092msgstr "" 
    10931093 
    1094 #: email.php:1184 
     1094#: email.php:1189 
    10951095msgid "%EMAIL_POST_CONTENT%" 
    10961096msgstr "" 
    10971097 
    1098 #: email.php:1185 
     1098#: email.php:1190 
    10991099msgid "Article taken from %EMAIL_BLOG_NAME% - %EMAIL_BLOG_URL%" 
    11001100msgstr "" 
    11011101 
    1102 #: email.php:1186 
     1102#: email.php:1191 
    11031103msgid "URL to article: %EMAIL_PERMALINK%" 
    11041104msgstr "" 
    11051105 
    1106 #: email.php:1187 
     1106#: email.php:1192 
    11071107msgid "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%\">" 
    11081108msgstr "" 
    11091109 
    1110 #: email.php:1187 
     1110#: email.php:1192 
    11111111msgid "</a></p>" 
    11121112msgstr "" 
    11131113 
    1114 #: email.php:1196 
     1114#: email.php:1201 
    11151115msgid "Email This Post" 
    11161116msgstr "" 
    11171117 
    1118 #: email.php:1196 
     1118#: email.php:1201 
    11191119msgid "Email This Page" 
    11201120msgstr "" 

  • wp-email/trunk/readme.html

    r17536 r18658  
    297297                              <ul> 
    298298                                    <li>NEW: Works For WordPress 2.3 Only</li> 
     299                                    <li>NEW: Removed PHPMailer Files From The Zip As It Is Included In WordPress</li> 
    299300                                    <li>NEW: Ability To Embed [email_link] Into Excerpt</li> 
    300301                                    <li>NEW: AJAX Used To Email The Post/Page</li>