From 07907c03152f8efc06fd891e58325f206d126f4e Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 29 May 2014 10:40:53 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EB=B0=9C=EC=86=A1=20?=
 =?UTF-8?q?=EB=95=8C=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=A0=81=EC=9A=A9=EB=90=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/couponformupdate.php | 3 +--
 adm/shop_admin/ordermail.inc.php    | 4 +---
 shop/ordererrormail.php             | 8 +++-----
 shop/ordermail2.inc.php             | 8 +++-----
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/adm/shop_admin/couponformupdate.php b/adm/shop_admin/couponformupdate.php
index 7ddfa0c01..6d907567f 100644
--- a/adm/shop_admin/couponformupdate.php
+++ b/adm/shop_admin/couponformupdate.php
@@ -143,7 +143,6 @@ if($w == '' && ($_POST['cp_sms_send'] || $_POST['cp_email_send'])) {
     }
 
     $count = count($arr_send_list);
-    $admin = get_admin('super');
 
     for($i=0; $i<$count; $i++) {
         if(!$arr_send_list[$i]['mb_id'])
@@ -191,7 +190,7 @@ if($w == '' && ($_POST['cp_sms_send'] || $_POST['cp_email_send'])) {
             $content = ob_get_contents();
             ob_end_clean();
 
-            mailer($config['cf_title'], $admin['mb_email'], $email, $title, $content, 1);
+            mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $email, $title, $content, 1);
         }
     }
 
diff --git a/adm/shop_admin/ordermail.inc.php b/adm/shop_admin/ordermail.inc.php
index 2dad63e5c..f24dd1981 100644
--- a/adm/shop_admin/ordermail.inc.php
+++ b/adm/shop_admin/ordermail.inc.php
@@ -103,9 +103,7 @@ if ($od_send_mail)
 
         sql_query(" update {$g5['g5_shop_order_table']} set od_shop_memo = '$od_shop_memo' where od_id = '$od_id' ");
 
-        $admin = get_admin('super');
-
-        mailer($config['cf_title'], $admin['mb_email'], $email, $title, $content, 1);
+        mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $email, $title, $content, 1);
     }
 }
 ?>
diff --git a/shop/ordererrormail.php b/shop/ordererrormail.php
index cb7d11548..dff63266b 100644
--- a/shop/ordererrormail.php
+++ b/shop/ordererrormail.php
@@ -3,8 +3,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
-$admin = get_admin('super');
-
 $subject = $config['cf_title'].' 주문 오류 알림 메일';
 
 if($error == 'order') {
@@ -14,15 +12,15 @@ if($error == 'order') {
 }
 
 if($tno) {
-    $content .= '<p>KCP의 '.$od_settle_case.'는 자동 취소되었습니다.</p>';
-    $content .= '<p>취소 내역은 KCP 상점관리자에서 확인할 수 있습니다.</p>';
+    $content .= '<p>PG사의 '.$od_settle_case.'는 자동 취소되었습니다.</p>';
+    $content .= '<p>취소 내역은 PG사 상점관리자에서 확인할 수 있습니다.</p>';
 }
 
 $content .= '<p>오류내용</p>';
 $content .= '<p>'.$sql.'</p><p>'.mysql_errno().' : '.mysql_error().'<p>error file : '.$_SERVER['PHP_SELF'].'</p>';
 
 // 메일발송
-mailer($od_name, $od_email, $admin['mb_email'], $subject, $content, 1);
+mailer($od_name, $od_email, $config['cf_admin_email'], $subject, $content, 1);
 
 unset($error);
 ?>
\ No newline at end of file
diff --git a/shop/ordermail2.inc.php b/shop/ordermail2.inc.php
index 03996e394..d5ab9c677 100644
--- a/shop/ordermail2.inc.php
+++ b/shop/ordermail2.inc.php
@@ -3,8 +3,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
-$admin = get_admin('super');
-
 //------------------------------------------------------------------------------
 // 운영자에게 메일보내기
 //------------------------------------------------------------------------------
@@ -14,7 +12,7 @@ include G5_SHOP_PATH.'/mail/orderupdate1.mail.php';
 $content = ob_get_contents();
 ob_end_clean();
 
-mailer($od_name, $od_email, $admin['mb_email'], $subject, $content, 1);
+mailer($od_name, $od_email, $config['cf_admin_email'], $subject, $content, 1);
 //------------------------------------------------------------------------------
 
 //------------------------------------------------------------------------------
@@ -26,7 +24,7 @@ include G5_SHOP_PATH.'/mail/orderupdate2.mail.php';
 $content = ob_get_contents();
 ob_end_clean();
 
-mailer($config['cf_title'], $admin['mb_email'], $od_email, $subject, $content, 1);
+mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $od_email, $subject, $content, 1);
 //------------------------------------------------------------------------------
 
 
@@ -90,7 +88,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $content = ob_get_contents();
     ob_end_clean();
 
-    mailer($config['cf_title'], $admin['mb_email'],  $row['it_sell_email'], $subject, $content, 1);
+    mailer($config['cf_admin_email_name'], $config['cf_admin_email'],  $row['it_sell_email'], $subject, $content, 1);
 }
 //==============================================================================
 ?>
\ No newline at end of file