From aa46c9fb27bf0eaaccc7a36d17992332caa4c0db Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 8 Oct 2014 10:39:51 +0900
Subject: [PATCH] =?UTF-8?q?sms5=20=EB=AC=B8=EC=9E=90=20=EB=B3=B4=EB=82=B4?=
 =?UTF-8?q?=EA=B8=B0=20=EC=98=A4=EB=A5=98=20=EC=BD=94=EB=93=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/sms_admin/history_send.php         |  4 +++-
 adm/sms_admin/history_view.php         |  9 +++++++--
 adm/sms_admin/sms_write_send.php       |  3 ++-
 plugin/editor/smarteditor2/license.txt | 16 ++++++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 plugin/editor/smarteditor2/license.txt

diff --git a/adm/sms_admin/history_send.php b/adm/sms_admin/history_send.php
index 488e25db5..5f6b468b7 100644
--- a/adm/sms_admin/history_send.php
+++ b/adm/sms_admin/history_send.php
@@ -116,7 +116,9 @@ if ($result)
             $row['bk_hp'] = get_hp($row['bk_hp'], 1);
 
             $log = array_shift($SMS->Log);
-            sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='{$row['hs_name']}', hs_hp='{$row['hs_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'");
+            $log = @iconv('UTF-8', 'UTF-8//IGNORE', $log);
+
+            sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='{$row['hs_name']}', hs_hp='{$row['hs_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'", false);
         }
         $SMS->Init(); // 보관하고 있던 결과값을 지웁니다.
 
diff --git a/adm/sms_admin/history_view.php b/adm/sms_admin/history_view.php
index d65672290..8acd6396b 100644
--- a/adm/sms_admin/history_view.php
+++ b/adm/sms_admin/history_view.php
@@ -143,13 +143,18 @@ function all_send()
     if( $write['wr_memo'] ){
         $tmp_wr_memo = @unserialize($write['wr_memo']);
         if( count($tmp_wr_memo) && is_array($tmp_wr_memo) ){
-        $arr_wr_memo = array_count_values( $tmp_wr_memo['hp'] );
+            if(function_exists('array_fill_keys')){
+                $tmp_wr_hp = array_replace($tmp_wr_memo['hp'],array_fill_keys(array_keys($tmp_wr_memo['hp'], null),''));
+            } else {
+                $tmp_wr_hp = $tmp_wr_memo['hp'];
+            }
+            $arr_wr_memo = @array_count_values( $tmp_wr_hp );
     ?>
     <h2>중복번호 <?php echo $tmp_wr_memo['total'];?>건</h2>
     <ul id="sent_overlap">
         <?php
         foreach( $arr_wr_memo as $key=>$v){
-        if( empty($v) ) continue;
+        if( empty($v) || $key == '' ) continue;
         ?>
         <li><b><?php echo $key;?></b> 중복 <?php echo $v;?>건</li>
         <?php } ?>
diff --git a/adm/sms_admin/sms_write_send.php b/adm/sms_admin/sms_write_send.php
index d11a5b0fd..5265708ce 100644
--- a/adm/sms_admin/sms_write_send.php
+++ b/adm/sms_admin/sms_write_send.php
@@ -199,8 +199,9 @@ if ($result)
             $row['bk_hp'] = get_hp($row['bk_hp'], 1);
 
             $log = array_shift($SMS->Log);
+            $log = @iconv('UTF-8', 'UTF-8//IGNORE', $log);
 
-            sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum=0, bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='".addslashes($row['bk_name'])."', hs_hp='{$row['bk_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'");
+            sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum=0, bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='".addslashes($row['bk_name'])."', hs_hp='{$row['bk_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'", false);
         }
         $SMS->Init(); // 보관하고 있던 결과값을 지웁니다.
 
diff --git a/plugin/editor/smarteditor2/license.txt b/plugin/editor/smarteditor2/license.txt
new file mode 100644
index 000000000..63c490dad
--- /dev/null
+++ b/plugin/editor/smarteditor2/license.txt
@@ -0,0 +1,16 @@
+SmartEditor2 is web based Javascript HTML WYSIWYG Editor released as Open Source under LGPL
+Copyright (C) 2008-2014 NAVER Corp.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
\ No newline at end of file