Changeset 12940

Timestamp:

2007/05/17 18:29:06 (17 years ago)

Author:

matsumoto

Message:

 

File:

• branches/dev/html/admin/mail/sendmail.php (modified) (2 diffs)

branches/dev/html/admin/mail/sendmail.php

@@ -77 +77 @@
 
 
-        //-- ¥á¡¼¥ëÇÛ¿®¥Ö¥ì¥¤¥óÏ¢·È¤Î¾ì¹ç   
-        if(MELMAGA_MOBIE_SEND){
-            return true;
-        ¡¡¡¡} else {
-                //-- ¥Æ¥­¥¹¥È¥á¡¼¥ëÇÛ¿®¤Î¾ì¹ç
-                if( $mail_data[$i][0]["mail_method"] == 2 ) {
+            //-- ¥Æ¥­¥¹¥È¥á¡¼¥ëÇÛ¿®¤Î¾ì¹ç
+            if( $mail_data[$i][0]["mail_method"] == 2 ) {
 
-                    $sendResut = MAIL_SENDING(
-                                             $list_data[$i][$j]["email"]                //¡¡¸ÜµÒ°¸Àè
-                                            ,$subjectBody                               //¡¡Subject
-                                            ,$mailBody                                  //¡¡¥á¡¼¥ëËÜʸ
-                                            ,$objSite->data["email03"]                  //¡¡Á÷¿®¸µ¥á¡¼¥ë¥¢¥É¥ì¥¹
-                                            ,$objSite->data["company_name"]             //¡¡Á÷¿®¸µÌ¾
-                                            ,$objSite->data["email03"]                  //¡¡reply_to
-                                            ,$objSite->data["email04"]                  //¡¡return_path
-                                            ,$objSite->data["email04"]                  //¡¡errors_to
-                                                                             );
+                $sendResut = MAIL_SENDING(
+                                         $list_data[$i][$j]["email"]                //¡¡¸ÜµÒ°¸Àè
+                                        ,$subjectBody                               //¡¡Subject
+                                        ,$mailBody                                  //¡¡¥á¡¼¥ëËÜʸ
+                                        ,$objSite->data["email03"]                  //¡¡Á÷¿®¸µ¥á¡¼¥ë¥¢¥É¥ì¥¹
+                                        ,$objSite->data["company_name"]             //¡¡Á÷¿®¸µÌ¾
+                                        ,$objSite->data["email03"]                  //¡¡reply_to
+                                        ,$objSite->data["email04"]                  //¡¡return_path
+                                        ,$objSite->data["email04"]                  //¡¡errors_to
+                                                                         );
 
-                //--  HTML¥á¡¼¥ëÇÛ¿®¤Î¾ì¹ç  
-                } elseif( $mail_data[$i][0]["mail_method"] == 1 || $mail_data[$i][0]["mail_method"] == 3) {
+            //--  HTML¥á¡¼¥ëÇÛ¿®¤Î¾ì¹ç  
+            } elseif( $mail_data[$i][0]["mail_method"] == 1 || $mail_data[$i][0]["mail_method"] == 3) {
             
-                    $sendResut = HTML_MAIL_SENDING(
-                                                 $list_data[$i][$j]["email"]
-                                                ,$subjectBody
-                                                ,$mailBody
-                                                ,$objSite->data["email03"]                  //¡¡Á÷¿®¸µ¥á¡¼¥ë¥¢¥É¥ì¥¹
-                                                ,$objSite->data["company_name"]             //¡¡Á÷¿®¸µÌ¾
-                                                ,$objSite->data["email03"]                  //¡¡reply_to
-                                                ,$objSite->data["email04"]                  //¡¡return_path
-                                                ,$objSite->data["email04"]                  //¡¡errors_to
-                                                                         );
-                }
-            }
-        
-    
+                $sendResut = HTML_MAIL_SENDING(
+                                             $list_data[$i][$j]["email"]
+                                            ,$subjectBody
+                                            ,$mailBody
+                                            ,$objSite->data["email03"]                  //¡¡Á÷¿®¸µ¥á¡¼¥ë¥¢¥É¥ì¥¹
+                                            ,$objSite->data["company_name"]             //¡¡Á÷¿®¸µÌ¾
+                                            ,$objSite->data["email03"]                  //¡¡reply_to
+                                            ,$objSite->data["email04"]                  //¡¡return_path
+                                            ,$objSite->data["email04"]                  //¡¡errors_to
+                                                                     );
+            }
+  
         //-- Á÷¿®´°Î»¤Ê¤é1¡¢¼ºÇԤʤé0¤ò¥á¡¼¥ëÁ÷¿®·ë²Ì¥Õ¥é¥°¤È¤·¤ÆDB¤ËÁÞÆþ
         if( ! $sendResut ){
@@ -124 +118 @@
 
         $conn->query( $sql_flag, array( $sendFlag, $mail_data[$i][0]["send_id"], $list_data[$i][$j]["customer_id"] ) );
+        
+        
 
     }