Changeset 6084

Show
Ignore:
Timestamp:
06/01/06 11:08:23 (2 years ago)
Author:
GamerZ
Message:

Version 2.05 Update

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r5976 r6084  
    104104 
    105105    /** 
    106      * Method to send mail: ("mail", "sendmail", or "smtp"). 
     106     * Method to send mail: ("php", "sendmail", or "smtp"). 
    107107     * @var string 
    108108     */ 
    109     var $Mailer            = "mail"; 
     109    var $Mailer            = "php"; 
    110110 
    111111    /** 
    …… 
    253253     */ 
    254254    function IsMail() { 
    255         $this->Mailer = "mail"; 
     255        $this->Mailer = "php"; 
    256256    } 
    257257 
    …… 
    770770         
    771771        // To be created automatically by mail() 
    772         if($this->Mailer != "mail") 
     772        if($this->Mailer != "php") 
    773773        { 
    774774            if(count($this->to) > 0) 
    …… 
    786786 
    787787        // sendmail and mail() extract Bcc from the header before sending 
    788         if((($this->Mailer == "sendmail") || ($this->Mailer == "mail")) && (count($this->bcc) > 0)) 
     788        if((($this->Mailer == "sendmail") || ($this->Mailer == "php")) && (count($this->bcc) > 0)) 
    789789            $result .= $this->AddrAppend("Bcc", $this->bcc); 
    790790 
    …… 
    793793 
    794794        // mail() sets the subject itself 
    795         if($this->Mailer != "mail") 
     795        if($this->Mailer != "php") 
    796796            $result .= $this->HeaderLine("Subject", $this->EncodeHeader(trim($this->Subject))); 
    797797 
    …… 
    842842        } 
    843843 
    844         if($this->Mailer != "mail") 
     844        if($this->Mailer != "php") 
    845845            $result .= $this->LE.$this->LE; 
    846846 

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

    r6073 r6084  
    174174                        </tr> 
    175175                        <tr valign="top">  
     176                                    <th align="left" width="30%"><?php _e('Max Number Of Multiple E-Mails:'); ?></th> 
     177                                    <td align="left"><input type="text" id="email_multiple" name="email_multiple" value="<?php echo  get_settings('email_multiple'); ?>" size="5" maxlength="3"><br />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.</td>  
     178                        </tr>  
     179                        <tr valign="top">  
    176180                              <th align="left" width="30%"><?php _e('Enable Image Verification:'); ?></th> 
    177181                              <td align="left"> 

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

    r6073 r6084  
    198198### Function: E-Mail Alternate Content 
    199199function email_content_alt() { 
     200      remove_filter('the_content', 'wptexturize'); 
    200201      $content = get_email_content(); 
    201202      $content = clean_pre($content); 

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

    r6073 r6084  
    259259                        $email_yourremarks = addslashes($yourremarks); 
    260260                        $email_postid = email_id(); 
    261                         $email_posttitle = addslashes(email_title()); 
     261                        $email_posttitle = addslashes($post_title); 
    262262                        $email_timestamp = current_time('timestamp'); 
    263263                        $email_ip = get_email_ipaddress(); 

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

    r6073 r6084  
    247247                  $email_yourremarks = addslashes($yourremarks); 
    248248                  $email_postid = email_id(); 
    249                   $email_posttitle = addslashes(email_title()); 
     249                  $email_posttitle = addslashes($post_title); 
    250250                  $email_timestamp = current_time('timestamp'); 
    251251                  $email_ip = get_email_ipaddress(); 

  • wp-email/trunk/readme.html

    r6074 r6084  
    221221                                    <li>NEW: Added &lt;label&gt; Tag For Form Fields</li> 
    222222                                    <li>FIXED: Remarks Column Removed From E-Mail Logs Due To Privacy Issue</li> 
     223                                    <li>FIXED: Duplicate Subject/Name When Sent Using PHP</li> 
    223224                                    <li>FIXED: Quotes Not Displaying When Sending In Plain Text</li> 
    224225                              </ul>