Changeset 21514 for branches/version-2_12-dev/data/class/SC_SendMail.php

Timestamp:

2012/02/15 19:56:17 (12 years ago)

Author:

Seasoft

Message:

#1625 (typo修正・ソース整形・ソースコメントの改善)

File:

• branches/version-2_12-dev/data/class/SC_SendMail.php (modified) (11 diffs)

branches/version-2_12-dev/data/class/SC_SendMail.php

@@ -37 +37 @@
     function SC_SendMail() {
         $this->arrRecip = array();
-        $this->to = "";
-        $this->subject = "";
-        $this->body = "";
-        $this->cc = "";
-        $this->bcc = "";
-        $this->replay_to = "";
-        $this->return_path = "";
+        $this->to = '';
+        $this->subject = '';
+        $this->body = '';
+        $this->cc = '';
+        $this->bcc = '';
+        $this->replay_to = '';
+        $this->return_path = '';
         $this->backend = MAIL_BACKEND;
         $this->host = SMTP_HOST;
@@ -60 +60 @@
 
     // 宛先の設定
-    function setTo($to, $to_name = "") {
-        if ($to != "") {
+    function setTo($to, $to_name = '') {
+        if ($to != '') {
             $this->to = $this->getNameAddress($to_name, $to);
             $this->setRecip('To', $to);
@@ -68 +68 @@
 
     // 送信元の設定
-    function setFrom($from, $from_name = "") {
+    function setFrom($from, $from_name = '') {
         $this->from = $this->getNameAddress($from_name, $from);
     }
 
     // CCの設定
-    function setCc($cc, $cc_name = "") {
-        if ($cc != "") {
+    function setCc($cc, $cc_name = '') {
+        if ($cc != '') {
             $this->cc = $this->getNameAddress($cc_name, $cc);
             $this->setRecip('Cc', $cc);
@@ -82 +82 @@
     // BCCの設定
     function setBCc($bcc) {
-        if ($bcc != "") {
+        if ($bcc != '') {
             $this->bcc = $bcc;
             $this->setRecip('Bcc', $bcc);
@@ -90 +90 @@
     // Reply-Toの設定
     function setReplyTo($reply_to) {
-        if ($reply_to != "") {
+        if ($reply_to != '') {
             $this->reply_to = $reply_to;
         }
@@ -138 +138 @@
     // 名前<メールアドレス>の形式を生成
     function getNameAddress($name, $mail_address) {
-            if ($name != "") {
+            if ($name != '') {
                 // 制御文字を変換する。
                 $_name = $name;
-                $_name = ereg_replace("<","＜", $_name);
-                $_name = ereg_replace(">","＞", $_name);
+                $_name = ereg_replace('<','＜', $_name);
+                $_name = ereg_replace('>','＞', $_name);
                 $_name = mb_encode_mimeheader($_name, 'JIS', 'B', "\n");
                 $name_address = "\"". $_name . "\"<" . $mail_address . ">";
@@ -151 +151 @@
     }
 
-    function setItem($to, $subject, $body, $fromaddress, $from_name, $reply_to="", $return_path="", $errors_to="", $bcc="", $cc ="") {
+    function setItem($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to="", $bcc="", $cc ="") {
         $this->setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc);
     }
 
-    function setItemHtml($to, $subject, $body, $fromaddress, $from_name, $reply_to="", $return_path="", $errors_to="", $bcc="", $cc ="") {
+    function setItemHtml($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to="", $bcc="", $cc ="") {
         $this->setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc);
     }
@@ -171 +171 @@
          $bcc           -> ブラインドカーボンコピー
     */
-    function setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to="", $return_path="", $errors_to="", $bcc="", $cc ="") {
+    function setBase($to, $subject, $body, $fromaddress, $from_name, $reply_to='', $return_path='', $errors_to="", $bcc="", $cc ="") {
         // 宛先設定
         $this->setTo($to);
@@ -188 +188 @@
 
         // Errors-Toは、ほとんどのSMTPで無視され、Return-Pathが優先されるためReturn_Pathに設定する。
-        if ($errors_to != "") {
+        if ($errors_to != '') {
             $this->return_path = $errors_to;
-        } else if ($return_path != "") {
+        } else if ($return_path != '') {
             $this->return_path = $return_path;
         } else {
@@ -205 +205 @@
         $arrHeader['From'] = $this->from;
         $arrHeader['Return-Path'] = $this->return_path;
-        if ($this->reply_to != "") {
+        if ($this->reply_to != '') {
             $arrHeader['Reply-To'] = $this->reply_to;
         }
-        if ($this->cc != "") {
+        if ($this->cc != '') {
             $arrHeader['Cc'] = $this->cc;
         }
-        if ($this->bcc != "") {
+        if ($this->bcc != '') {
             $arrHeader['Bcc'] = $this->bcc;
         }
-        $arrHeader['Date'] = date("D, j M Y H:i:s O");
+        $arrHeader['Date'] = date('D, j M Y H:i:s O');
         return $arrHeader;
     }
@@ -230 +230 @@
         $arrHeader = $this->getBaseHeader();
         $arrHeader['Content-Type'] = "text/html; charset=\"ISO-2022-JP\"";
-        $arrHeader['Content-Transfer-Encoding'] = "ISO-2022-JP";
+        $arrHeader['Content-Transfer-Encoding'] = 'ISO-2022-JP';
         return $arrHeader;
     }