Index: branches/dev/html/admin/mail/sendmail.php
===================================================================
--- branches/dev/html/admin/mail/sendmail.php (revision 12819)
+++ branches/dev/html/admin/mail/sendmail.php (revision 12820)
@@ -11,23 +11,23 @@
if(MELMAGA_SEND != true) {
- exit;
+ exit;
}
+
if($_GET['mode'] == 'now') {
- //----¡¡Ì¤Á÷¿®¥Ç¡¼¥¿¤ò¼èÆÀ¤¹¤ë
- $time_data = $conn->getAll( "SELECT send_id FROM dtb_send_history WHERE complete_count = 0 AND del_flg = 0 ORDER BY send_id ASC, start_date ASC" );
+ //----¡¡Ì¤Á÷¿®¥Ç¡¼¥¿¤ò¼èÆÀ¤¹¤ë
+ $time_data = $conn->getAll( "SELECT send_id FROM dtb_send_history WHERE complete_count = 0 AND del_flg = 0 ORDER BY send_id ASC, start_date ASC" );
} else {
-
- // postgresql ¤È mysql ¤È¤ÇSQL¤ò¤ï¤±¤ë
- if (DB_TYPE == "pgsql") {
- $sql = "SELECT send_id FROM dtb_send_history ";
- $sql.= "WHERE start_date BETWEEN current_timestamp + '- 5 minutes' AND current_timestamp + '5 minutes' AND del_flg = 0 ORDER BY send_id ASC, start_date ASC";
- }else if (DB_TYPE == "mysql") {
- $sql = "SELECT send_id FROM dtb_send_history ";
- $sql.= "WHERE start_date BETWEEN date_add(now(),INTERVAL -5 minute) AND date_add(now(),INTERVAL 5 minute) AND del_flg = 0 ORDER BY send_id ASC, start_date ASC";
- }
- //----¡¡30ʬËè¤ËCron¤¬Á÷¿®»þ´Ö¥Ç¡¼¥¿³Îǧ
- $time_data = $conn->getAll($sql);
- print_r($time_data);
+
+ // postgresql ¤È mysql ¤È¤ÇSQL¤ò¤ï¤±¤ë
+ if (DB_TYPE == "pgsql") {
+ $sql = "SELECT send_id FROM dtb_send_history ";
+ $sql.= "WHERE start_date BETWEEN current_timestamp + '- 5 minutes' AND current_timestamp + '5 minutes' AND del_flg = 0 ORDER BY send_id ASC, start_date ASC";
+ }else if (DB_TYPE == "mysql") {
+ $sql = "SELECT send_id FROM dtb_send_history ";
+ $sql.= "WHERE start_date BETWEEN date_add(now(),INTERVAL -5 minute) AND date_add(now(),INTERVAL 5 minute) AND del_flg = 0 ORDER BY send_id ASC, start_date ASC";
+ }
+ //----¡¡30ʬËè¤ËCron¤¬Á÷¿®»þ´Ö¥Ç¡¼¥¿³Îǧ
+ $time_data = $conn->getAll($sql);
}
@@ -35,8 +35,8 @@
if( $count > 0 ){
- print("start sending
\n");
+ print("start sending
\n");
} else {
- print("not found !
\n");
- exit;
+ print("not found
\n");
+ exit;
}
@@ -44,9 +44,9 @@
for( $i = 0; $i < count( $time_data ); $i++ ) {
- $sql = "SELECT * FROM dtb_send_customer WHERE send_id = ? AND (send_flag = 2 OR send_flag IS NULL)";
- $list_data[] = $conn->getAll( $sql, array( $time_data[$i]["send_id"] ) );
-
- $sql = "SELECT * FROM dtb_send_history WHERE send_id = ?";
- $mail_data[] = $conn->getAll( $sql, array( $time_data[$i]["send_id"] ) );
+ $sql = "SELECT * FROM dtb_send_customer WHERE send_id = ? AND (send_flag = 2 OR send_flag IS NULL)";
+ $list_data[] = $conn->getAll( $sql, array( $time_data[$i]["send_id"] ) );
+
+ $sql = "SELECT * FROM dtb_send_history WHERE send_id = ?";
+ $mail_data[] = $conn->getAll( $sql, array( $time_data[$i]["send_id"] ) );
}
@@ -59,89 +59,89 @@
for( $i = 0; $i < count( $time_data ); $i++ ) {
- for( $j = 0; $j < count( $list_data[$i] ); $j ++ ) {
+ for( $j = 0; $j < count( $list_data[$i] ); $j ++ ) {
- $customerName = "";
- $mailBody = "";
- $sendFlag = "";
+ $customerName = "";
+ $mailBody = "";
+ $sendFlag = "";
- //-- ¸ÜµÒ̾¤ÎÊÑ´¹
- $name = trim($list_data[$i][$j]["name"]);
-
- if ($name == "") {
- $name = "¤ªµÒ";
- }
-
- $customerName = htmlspecialchars($name);
- $subjectBody = ereg_replace( "{name}", $customerName , $mail_data[$i][0]["subject"] );
- $mailBody = ereg_replace( "{name}", $customerName , $mail_data[$i][0]["body"] );
-
- //-- ¥Æ¥¥¹¥È¥á¡¼¥ëÇÛ¿®¤Î¾ì¹ç
- if( $mail_data[$i][0]["mail_method"] == 2 ) {
+ //-- ¸ÜµÒ̾¤ÎÊÑ´¹
+ $name = trim($list_data[$i][$j]["name"]);
+
+ if ($name == "") {
+ $name = "¤ªµÒ";
+ }
+
+ $customerName = htmlspecialchars($name);
+ $subjectBody = ereg_replace( "{name}", $customerName , $mail_data[$i][0]["subject"] );
+ $mailBody = ereg_replace( "{name}", $customerName , $mail_data[$i][0]["body"] );
- $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
- );
+ //-- ¥Æ¥¥¹¥È¥á¡¼¥ëÇÛ¿®¤Î¾ì¹ç
+ if( $mail_data[$i][0]["mail_method"] == 2 ) {
- //-- 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
- );
- }
-
- //-- Á÷¿®´°Î»¤Ê¤é1¡¢¼ºÇԤʤé0¤ò¥á¡¼¥ëÁ÷¿®·ë²Ì¥Õ¥é¥°¤È¤·¤ÆDB¤ËÁÞÆþ
- if( ! $sendResut ){
- $sendFlag = "-1";
- } else {
- $sendFlag = "1";
-
- // ´°Î»¤ò1¤³Áý¤ä¤¹
- $sql = "UPDATE dtb_send_history SET complete_count = complete_count + 1 WHERE send_id = ?";
- $conn->query( $sql, array($mail_data[$i][0]["send_id"]) );
- }
+ $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
+ );
- $conn->query( $sql_flag, array( $sendFlag, $mail_data[$i][0]["send_id"], $list_data[$i][$j]["customer_id"] ) );
-
-
+ //-- 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
+ );
+ }
+
+ //-- Á÷¿®´°Î»¤Ê¤é1¡¢¼ºÇԤʤé0¤ò¥á¡¼¥ëÁ÷¿®·ë²Ì¥Õ¥é¥°¤È¤·¤ÆDB¤ËÁÞÆþ
+ if( ! $sendResut ){
+ $sendFlag = "-1";
+ } else {
+ $sendFlag = "1";
+
+ // ´°Î»¤ò1¤³Áý¤ä¤¹
+ $sql = "UPDATE dtb_send_history SET complete_count = complete_count + 1 WHERE send_id = ?";
+ $conn->query( $sql, array($mail_data[$i][0]["send_id"]) );
+ }
- }
+ $conn->query( $sql_flag, array( $sendFlag, $mail_data[$i][0]["send_id"], $list_data[$i][$j]["customer_id"] ) );
+
+
- //--- ¥á¡¼¥ëÁ´·ïÁ÷¿®´°Î»¸å¤Î½èÍý
- $completeSql = "UPDATE dtb_send_history SET end_date = now() WHERE send_id = ?";
- $conn->query( $completeSql, array( $time_data[$i]["send_id"] ) );
+ }
- //---¡¡Á÷¿®´°Î»¡¡Êó¹ð¥á¡¼¥ë
- $compData = date("Yǯm·îdÆüH»þiʬ" . " ²¼µ¥á¡¼¥ë¤ÎÇÛ¿®¤¬´°Î»¤·¤Þ¤·¤¿¡£" );
+ //--- ¥á¡¼¥ëÁ´·ïÁ÷¿®´°Î»¸å¤Î½èÍý
+ $completeSql = "UPDATE dtb_send_history SET end_date = now() WHERE send_id = ?";
+ $conn->query( $completeSql, array( $time_data[$i]["send_id"] ) );
- HTML_MAIL_SENDING(
- $objSite->data["email03"]
- ,$compData
- ,$mail_data[$i][0]["body"]
- ,$objSite->data["email03"] //¡¡Á÷¿®¸µ¥á¡¼¥ë¥¢¥É¥ì¥¹
- ,$objSite->data["company_name"] //¡¡Á÷¿®¸µÌ¾
- ,$objSite->data["email03"] //¡¡reply_to
- ,$objSite->data["email04"] //¡¡return_path
- ,$objSite->data["email04"] //¡¡errors_to
- );
-
- if ($_GET['mode'] = "now") {
- header("Location: " . URL_DIR . "admin/mail/history.php");
- }
- echo "complete\n";
+ //---¡¡Á÷¿®´°Î»¡¡Êó¹ð¥á¡¼¥ë
+ $compData = date("Yǯm·îdÆüH»þiʬ" . " ²¼µ¥á¡¼¥ë¤ÎÇÛ¿®¤¬´°Î»¤·¤Þ¤·¤¿¡£" );
+
+ HTML_MAIL_SENDING(
+ $objSite->data["email03"]
+ ,$compData
+ ,$mail_data[$i][0]["body"]
+ ,$objSite->data["email03"] //¡¡Á÷¿®¸µ¥á¡¼¥ë¥¢¥É¥ì¥¹
+ ,$objSite->data["company_name"] //¡¡Á÷¿®¸µÌ¾
+ ,$objSite->data["email03"] //¡¡reply_to
+ ,$objSite->data["email04"] //¡¡return_path
+ ,$objSite->data["email04"] //¡¡errors_to
+ );
+
+ if ($_GET['mode'] = "now") {
+ header("Location: " . URL_DIR . "admin/mail/history.php");
+ }
+ echo "complete\n";
}
@@ -152,11 +152,11 @@
- $mail_obj = new GC_SendMail();
- $mail_obj->setItem( $to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc );
-
- if( $mail_obj->sendMail() ) {
- return true;
- }
-
+ $mail_obj = new GC_SendMail();
+ $mail_obj->setItem( $to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc );
+
+ if( $mail_obj->sendMail() ) {
+ return true;
+ }
+
}
@@ -165,12 +165,12 @@
- $html_mail_obj = new GC_SendMail();
- $html_mail_obj->setItemHtml( $to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc );
+ $html_mail_obj = new GC_SendMail();
+ $html_mail_obj->setItemHtml( $to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to, $bcc, $cc );
-
- if( $html_mail_obj->sendHtmlMail() ) {
- return true;
- }
-
+
+ if( $html_mail_obj->sendHtmlMail() ) {
+ return true;
+ }
+
}