Merge branch 'master' of github.com:gnuboard/g5

empty_mb_name is a function checking name from user input form. But it
was not checked by empty_mb_name function. So I fix it.

adm/admin.head.php

@@ -101,7 +101,7 @@ function imageview(id, w, h)
     <h1><?php echo $config['cf_title'] ?></h1>
     <div id="hd_top">
         <button type="button" id="btn_gnb" class="btn_gnb_close <?php echo $adm_menu_cookie['btn_gnb'];?>">메뉴</button>
-       <div id="logo"><a href="<?php echo correct_goto_url(G5_ADMIN_URL); ?>"><img src="<?php echo G5_ADMIN_URL ?>/img/logo.png" alt="<?php echo $config['cf_title'] ?> 관리자"></a></div>
+       <div id="logo"><a href="<?php echo correct_goto_url(G5_ADMIN_URL); ?>"><img src="<?php echo G5_ADMIN_URL ?>/img/logo.png" alt="<?php echo get_text($config['cf_title']); ?> 관리자"></a></div>
 
         <div id="tnb">
             <ul>

adm/admin.lib.php

@@ -477,8 +477,8 @@ function admin_check_xss_params($params){
 
         if( is_array($value) ){
             admin_check_xss_params($value);
-        } else if ( preg_match('/<\s?[^\>]*\/?\s?>/i', $value) && (preg_match('/script.*?\/script/ius', $value) || preg_match('/[onload|onerror]=.*/ius', $value)) ){
-            alert('요청 쿼리에 잘못된 스크립트문장이 있습니다.\\nXSS 공격일수도 있습니다.');
+        } else if ( (preg_match('/<\s?[^\>]*\/?\s?>/i', $value) && (preg_match('/script.*?\/script/ius', $value) || preg_match('/[onload|onerror]=.*/ius', $value))) || preg_match('/^(?=.*token\()(?=.*xmlhttprequest\()(?=.*send\().*$/im', $value) || (preg_match('/[onload|onerror]=.*/ius', $value) && preg_match('/(eval|expression|exec|prompt)(\s*)\((.*)\)/ius', $value)) ){
+            alert('요청 쿼리에 잘못된 스크립트문장이 있습니다.\\nXSS 공격일수도 있습니다.', G5_URL);
             die();
         }
     }

adm/board_copy.php

@@ -31,7 +31,7 @@ include_once(G5_PATH.'/head.sub.php');
             </tr>
             <tr>
                 <th scope="col"><label for="target_subject">게시판 제목<strong class="sound_only">필수</strong></label></th>
-                <td><input type="text" name="target_subject" value="[복사본] <?php echo $board['bo_subject'] ?>" id="target_subject" required class="required frm_input" maxlength="120"></td>
+                <td><input type="text" name="target_subject" value="[복사본] <?php echo get_sanitize_input($board['bo_subject']); ?>" id="target_subject" required class="required frm_input" maxlength="120"></td>
             </tr>
             <tr>
                 <th scope="col">복사 유형</th>

adm/board_copy_update.php

@@ -11,6 +11,8 @@ check_admin_token();
 $target_table   = trim($_POST['target_table']);
 $target_subject = trim($_POST['target_subject']);
 
+$target_subject = strip_tags(clean_xss_attributes($target_subject));
+
 if (!preg_match('/[A-Za-z0-9_]{1,20}/', $target_table)) {
     alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)');
 }

adm/board_delete.inc.php

@@ -26,6 +26,9 @@ sql_query(" delete from {$g5['board_file_table']} where bo_table = '{$tmp_bo_tab
 // 게시판 테이블 DROP
 sql_query(" drop table {$g5['write_prefix']}{$tmp_bo_table} ", FALSE);
 
+// 좋아요 테이블에서 기록 삭제
+sql_query(" delete from {$g5['board_good_table']} where bo_table = '{$tmp_bo_table}' ");
+
 delete_cache_latest($tmp_bo_table);
 
 // 게시판 폴더 전체 삭제

adm/board_form.php

@@ -82,6 +82,7 @@ if (!isset($board['bo_use_captcha'])) {
 
 $required = "";
 $readonly = "";
+$sound_only = "";
 if ($w == '') {
 
     $html_title .= ' 생성';

adm/board_form_update.php

@@ -60,6 +60,11 @@ if(!is_include_path_check($bo_include_tail, 1)) {
     alert('하단 파일 경로에 포함시킬수 없는 문자열이 있습니다.');
 }
 
+if( function_exists('filter_input_include_path') ){
+    $bo_include_head = filter_input_include_path($bo_include_head);
+    $bo_include_tail = filter_input_include_path($bo_include_tail);
+}
+
 $board_path = G5_DATA_PATH.'/file/'.$bo_table;
 
 // 게시판 디렉토리 생성
@@ -80,8 +85,8 @@ $bo_category_list = isset($_POST['bo_category_list']) ? str_replace($src_char, $
 //https://github.com/gnuboard/gnuboard5/commit/f5f4925d4eb28ba1af728e1065fc2bdd9ce1da58 에 따른 조치
 $str_bo_category_list = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", "", $bo_category_list);
 
-$_POST['bo_subject'] = strip_tags($_POST['bo_subject']);
-$_POST['bo_mobile_subject'] = strip_tags($_POST['bo_mobile_subject']);
+$_POST['bo_subject'] = strip_tags(clean_xss_attributes($_POST['bo_subject']));
+$_POST['bo_mobile_subject'] = strip_tags(clean_xss_attributes($_POST['bo_mobile_subject']));
 
 $sql_common = " gr_id               = '{$gr_id}',
                 bo_subject          = '{$_POST['bo_subject']}',
@@ -199,7 +204,7 @@ if ($w == '') {
     $file = file('./sql_write.sql');
     $file = get_db_create_replace($file);
 
-    $sql = implode($file, "\n");
+    $sql = implode("\n", $file);
 
     $create_table = $g5['write_prefix'] . $bo_table;
 

adm/board_list_update.php

@@ -33,7 +33,7 @@ if ($_POST['act_button'] == "선택수정") {
                 alert('최고관리자가 아닌 경우 다른 관리자의 게시판('.$board_table[$k].')은 수정이 불가합니다.');
         }
 
-        $p_bo_subject = is_array($_POST['bo_subject']) ? strip_tags($_POST['bo_subject'][$k]) : '';
+        $p_bo_subject = is_array($_POST['bo_subject']) ? strip_tags(clean_xss_attributes($_POST['bo_subject'][$k])) : '';
 
         $sql = " update {$g5['board_table']}
                     set gr_id               = '".sql_real_escape_string(strip_tags($_POST['gr_id'][$k]))."',

adm/boardgroup_form_update.php

@@ -16,7 +16,7 @@ if (!preg_match("/^([A-Za-z0-9_]{1,10})$/", $_POST['gr_id']))
 
 if (!$gr_subject) alert('그룹 제목을 입력하세요.');
 
-$gr_subject = isset($_POST['gr_subject']) ? strip_tags($_POST['gr_subject']) : '';
+$gr_subject = isset($_POST['gr_subject']) ? strip_tags(clean_xss_attributes($_POST['gr_subject'])) : '';
 
 $sql_common = " gr_subject = '{$gr_subject}',
                 gr_device = '{$_POST['gr_device']}',

adm/boardgroup_list.php

@@ -124,7 +124,7 @@ $colspan = 10;
     <tr class="<?php echo $bg; ?>">
         <td class="td_chk">
             <input type="hidden" name="group_id[<?php echo $i ?>]" value="<?php echo $row['gr_id'] ?>">
-            <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['gr_subject'] ?> 그룹</label>
+            <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo get_text($row['gr_subject']); ?> 그룹</label>
             <input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
         </td>
         <td class="td_left"><a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_id'] ?></a></td>
@@ -135,9 +135,9 @@ $colspan = 10;
         <td class="td_mng td_input">
         <?php if ($is_admin == 'super'){ ?>
             <label for="gr_admin_<?php echo $i; ?>" class="sound_only">그룹관리자</label>
-            <input type="text" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>" id="gr_admin_<?php echo $i ?>" class="tbl_input" size="10" maxlength="20">
+            <input type="text" name="gr_admin[<?php echo $i ?>]" value="<?php echo get_sanitize_input($row['gr_admin']); ?>" id="gr_admin_<?php echo $i ?>" class="tbl_input" size="10" maxlength="20">
         <?php }else{ ?>
-            <input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>"><?php echo $row['gr_admin'] ?>
+            <input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo get_sanitize_input($row['gr_admin']); ?>"><?php echo get_text($row['gr_admin']); ?>
         <?php } ?>
         </td>
         <td class="td_num"><a href="./board_list.php?sfl=a.gr_id&amp;stx=<?php echo $row['gr_id'] ?>"><?php echo $row2['cnt'] ?></a></td>

adm/boardgroup_list_update.php

@@ -19,8 +19,8 @@ for ($i=0; $i<$count; $i++)
 {
     $k     = $_POST['chk'][$i];
     $gr_id = preg_replace('/[^a-z0-9_]/i', '', $_POST['group_id'][$k]);
-    $gr_subject = is_array($_POST['gr_subject']) ? strip_tags($_POST['gr_subject'][$k]) : '';
-    $gr_admin = is_array($_POST['gr_admin']) ? strip_tags($_POST['gr_admin'][$k]) : '';
+    $gr_subject = is_array($_POST['gr_subject']) ? strip_tags(clean_xss_attributes($_POST['gr_subject'][$k])) : '';
+    $gr_admin = is_array($_POST['gr_admin']) ? strip_tags(clean_xss_attributes($_POST['gr_admin'][$k])) : '';
 
     if($_POST['act_button'] == '선택수정') {
         $sql = " update {$g5['group_table']}

adm/config_form.php

@@ -271,6 +271,13 @@ if(!isset($member['mb_scrap_cnt'])) {
                 ADD `mb_scrap_cnt` int(11) NOT NULL DEFAULT '0' AFTER `mb_memo_cnt`", true);
 }
 
+// 아이코드 토큰키 추가
+if( ! isset($config['cf_icode_token_key']) ){
+    $sql = "ALTER TABLE `{$g5['config_table']}` 
+            ADD COLUMN `cf_icode_token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `cf_icode_server_port`; ";
+    sql_query($sql, false);
+}
+
 if(!$config['cf_faq_skin']) $config['cf_faq_skin'] = "basic";
 if(!$config['cf_mobile_faq_skin']) $config['cf_mobile_faq_skin'] = "basic";
 
@@ -321,7 +328,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
         <tbody>
         <tr>
             <th scope="row"><label for="cf_title">홈페이지 제목<strong class="sound_only">필수</strong></label></th>
-            <td colspan="3"><input type="text" name="cf_title" value="<?php echo $config['cf_title'] ?>" id="cf_title" required class="required frm_input" size="40"></td>
+            <td colspan="3"><input type="text" name="cf_title" value="<?php echo get_sanitize_input($config['cf_title']); ?>" id="cf_title" required class="required frm_input" size="40"></td>
         </tr>
         <tr>
             <th scope="row"><label for="cf_admin">최고관리자<strong class="sound_only">필수</strong></label></th>
@@ -1257,29 +1264,29 @@ include_once('_rewrite_config_form.php');
         <tr>
             <th scope="row"><label for="cf_sms_type">SMS 전송유형</label></th>
             <td>
-                <?php echo help("전송유형을 SMS로 선택하시면 최대 80바이트까지 전송하실 수 있으며<br>LMS로 선택하시면 90바이트 이하는 SMS로, 그 이상은 1500바이트까지 LMS로 전송됩니다.<br>요금은 건당 SMS는 16원, LMS는 48원입니다."); ?>
+                <?php echo help("전송유형을 SMS로 선택하시면 최대 80바이트까지 전송하실 수 있으며<br>LMS로 선택하시면 90바이트 이하는 SMS로, 그 이상은 ".G5_ICODE_LMS_MAX_LENGTH."바이트까지 LMS로 전송됩니다.<br>요금은 건당 SMS는 16원, LMS는 48원입니다."); ?>
                 <select id="cf_sms_type" name="cf_sms_type">
                     <option value="" <?php echo get_selected($config['cf_sms_type'], ''); ?>>SMS</option>
                     <option value="LMS" <?php echo get_selected($config['cf_sms_type'], 'LMS'); ?>>LMS</option>
                 </select>
             </td>
         </tr>
-        <tr>
-            <th scope="row"><label for="cf_icode_id">아이코드 회원아이디</label></th>
+        <tr class="icode_old_version">
+            <th scope="row"><label for="cf_icode_id">아이코드 회원아이디<br>(구버전)</label></th>
             <td>
                 <?php echo help("아이코드에서 사용하시는 회원아이디를 입력합니다."); ?>
                 <input type="text" name="cf_icode_id" value="<?php echo $config['cf_icode_id']; ?>" id="cf_icode_id" class="frm_input" size="20">
             </td>
         </tr>
-        <tr>
-            <th scope="row"><label for="cf_icode_pw">아이코드 비밀번호</label></th>
+        <tr class="icode_old_version">
+            <th scope="row"><label for="cf_icode_pw">아이코드 비밀번호<br>(구버전)</label></th>
             <td>
                 <?php echo help("아이코드에서 사용하시는 비밀번호를 입력합니다."); ?>
                 <input type="password" name="cf_icode_pw" value="<?php echo $config['cf_icode_pw']; ?>" id="cf_icode_pw" class="frm_input">
             </td>
         </tr>
-        <tr>
-            <th scope="row">요금제</th>
+        <tr class="icode_old_version <?php if(!(isset($userinfo['payment']) && $userinfo['payment'])){ echo 'cf_tr_hide'; } ?>">
+            <th scope="row">요금제<br>(구버전)</th>
             <td>
                 <input type="hidden" name="cf_icode_server_ip" value="<?php echo $config['cf_icode_server_ip']; ?>">
                 <?php
@@ -1296,21 +1303,31 @@ include_once('_rewrite_config_form.php');
                 ?>
             </td>
         </tr>
-        <tr>
-            <th scope="row">아이코드 SMS 신청<br>회원가입</th>
-            <td>
-                <a href="http://icodekorea.com/res/join_company_fix_a.php?sellid=sir2" target="_blank" class="btn_frmline">아이코드 회원가입</a>
-            </td>
-        </tr>
-         <?php if ($userinfo['payment'] == 'A') { ?>
-        <tr>
-            <th scope="row">충전 잔액</th>
+        <?php if ($userinfo['payment'] == 'A') { ?>
+        <tr class="icode_old_version">
+            <th scope="row">충전 잔액<br>(구버전)</th>
             <td>
                 <?php echo number_format($userinfo['coin']); ?> 원.
                 <a href="http://www.icodekorea.com/smsbiz/credit_card_amt.php?icode_id=<?php echo $config['cf_icode_id']; ?>&amp;icode_passwd=<?php echo $config['cf_icode_pw']; ?>" target="_blank" class="btn_frmline">충전하기</a>
             </td>
         </tr>
         <?php } ?>
+        <tr class="icode_json_version">
+            <th scope="row"><label for="cf_icode_token_key">아이코드 토큰키<br>(JSON버전)</label></th>
+            <td>
+                <?php echo help("아이코드 JSON 버전의 경우 아이코드 토큰키를 입력시 실행됩니다.<br>SMS 전송유형을 LMS로 설정시 90바이트 이내는 SMS, 90 ~ 2000 바이트는 LMS 그 이상은 절삭 되어 LMS로 발송됩니다."); ?>
+                <input type="text" name="cf_icode_token_key" value="<?php echo $config['cf_icode_token_key']; ?>" id="cf_icode_token_key" class="frm_input" size="40">
+                <?php echo help("아이코드 사이트 -> 토큰키관리 메뉴에서 생성한 토큰키를 입력합니다."); ?>
+                <br>
+                서버아이피 : <?php echo $_SERVER['SERVER_ADDR']; ?>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">아이코드 SMS 신청<br>회원가입</th>
+            <td>
+                <a href="http://icodekorea.com/res/join_company_fix_a.php?sellid=sir2" target="_blank" class="btn_frmline">아이코드 회원가입</a>
+            </td>
+        </tr>
         </tbody>
         </table>
     </div>

adm/config_form_update.php

@@ -26,7 +26,7 @@ if(!$_POST['cf_cert_use']) {
 
 $cf_social_servicelist = !empty($_POST['cf_social_servicelist']) ? implode(',', $_POST['cf_social_servicelist']) : '';
 
-$_POST['cf_title'] = strip_tags($_POST['cf_title']);
+$_POST['cf_title'] = strip_tags(clean_xss_attributes($_POST['cf_title']));
 
 $check_keys = array('cf_lg_mid', 'cf_lg_mert_key', 'cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret');
 
@@ -36,6 +36,8 @@ foreach( $check_keys as $key ){
     }
 }
 
+$_POST['cf_icode_server_port'] = isset($_POST['cf_icode_server_port']) ? preg_replace('/[^0-9]/', '', $_POST['cf_icode_server_port']) : '7295';
+
 $sql = " update {$g5['config_table']}
             set cf_title = '{$_POST['cf_title']}',
                 cf_admin = '{$_POST['cf_admin']}',
@@ -143,6 +145,7 @@ $sql = " update {$g5['config_table']}
                 cf_sms_type = '{$_POST['cf_sms_type']}',
                 cf_icode_id = '{$_POST['cf_icode_id']}',
                 cf_icode_pw = '{$_POST['cf_icode_pw']}',
+                cf_icode_token_key = '{$_POST['cf_icode_token_key']}',
                 cf_icode_server_ip = '{$_POST['cf_icode_server_ip']}',
                 cf_icode_server_port = '{$_POST['cf_icode_server_port']}',
                 cf_googl_shorturl_apikey = '{$_POST['cf_googl_shorturl_apikey']}',

adm/contentformupdate.php

@@ -21,7 +21,7 @@ if ($w == "" || $w == "u")
 }
 
 $co_id = preg_replace('/[^a-z0-9_]/i', '', $co_id);
-$co_subject = strip_tags($co_subject);
+$co_subject = strip_tags(clean_xss_attributes($co_subject));
 $co_include_head = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($co_include_head, 0, 255));
 $co_include_tail = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($co_include_tail, 0, 255));
 $co_tag_filter_use = isset($_POST['co_tag_filter_use']) ? (int) $_POST['co_tag_filter_use'] : 1;
@@ -71,6 +71,11 @@ if( $co_include_tail && ! is_include_path_check($co_include_tail, 1) ){
     $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.';
 }
 
+if( function_exists('filter_input_include_path') ){
+    $co_include_head = filter_input_include_path($co_include_head);
+    $co_include_tail = filter_input_include_path($co_include_tail);
+}
+
 $co_seo_title = exist_seo_title_recursive('content', generate_seo_title($co_subject), $g5['content_table'], $co_id);
 
 $sql_common = " co_include_head     = '$co_include_head',

adm/css/admin.css

@@ -528,6 +528,10 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
 .is_rewrite .info-success{color:#155724}
 .is_rewrite .info-warning{color:#856404}
 
+.icode_old_version th{background-color:#FFFCED}
+.icode_json_version th{background-color:#F6F1FF}
+.cf_tr_hide {display:none}
+
 /* 관리권한설정 */
 #add_admin fieldset {margin-top:20px;overflow:auto;padding:2px 6px;line-height:1.4;resize:vertical}
 

adm/faqlist.php

@@ -68,15 +68,17 @@ $result = sql_query($sql);
         $num = $i + 1;
 
         $bg = 'bg'.($i%2);
+
+        $fa_subject = conv_content($row['fa_subject'], 1);
     ?>
 
     <tr class="<?php echo $bg; ?>">
         <td class="td_num"><?php echo $num; ?></td>
-        <td class="td_left"><?php echo stripslashes($row['fa_subject']); ?></td>
+        <td class="td_left"><?php echo $fa_subject; ?></td>
         <td class="td_num"><?php echo $row['fa_order']; ?></td>
         <td class="td_mng td_mng_m">
-            <a href="./faqform.php?w=u&amp;fm_id=<?php echo $row['fm_id']; ?>&amp;fa_id=<?php echo $row['fa_id']; ?>" class="btn btn_03"><span class="sound_only"><?php echo stripslashes($row['fa_subject']); ?> </span>수정</a>
-            <a href="./faqformupdate.php?w=d&amp;fm_id=<?php echo $row['fm_id']; ?>&amp;fa_id=<?php echo $row['fa_id']; ?>" onclick="return delete_confirm(this);" class="btn btn_02"><span class="sound_only"><?php echo stripslashes($row['fa_subject']); ?> </span>삭제</a>
+            <a href="./faqform.php?w=u&amp;fm_id=<?php echo $row['fm_id']; ?>&amp;fa_id=<?php echo $row['fa_id']; ?>" class="btn btn_03"><span class="sound_only"><?php echo $fa_subject; ?> </span>수정</a>
+            <a href="./faqformupdate.php?w=d&amp;fm_id=<?php echo $row['fm_id']; ?>&amp;fa_id=<?php echo $row['fa_id']; ?>" onclick="return delete_confirm(this);" class="btn btn_02"><span class="sound_only"><?php echo $fa_subject; ?> </span>삭제</a>
         </td>
     </tr>
 

adm/faqmasterformupdate.php

@@ -18,7 +18,7 @@ check_admin_token();
 if ($fm_himg_del)  @unlink(G5_DATA_PATH."/faq/{$fm_id}_h");
 if ($fm_timg_del)  @unlink(G5_DATA_PATH."/faq/{$fm_id}_t");
 
-$fm_subject = strip_tags($fm_subject);
+$fm_subject = strip_tags(clean_xss_attributes($fm_subject));
 
 $sql_common = " set fm_subject = '$fm_subject',
                     fm_head_html = '$fm_head_html',

adm/mail_form.php

@@ -42,7 +42,7 @@ include_once('./admin.head.php');
     <tbody>
     <tr>
         <th scope="row"><label for="ma_subject">메일 제목<strong class="sound_only">필수</strong></label></th>
-        <td><input type="text" name="ma_subject" value="<?php echo $ma['ma_subject'] ?>" id="ma_subject" required class="required frm_input" size="100"></td>
+        <td><input type="text" name="ma_subject" value="<?php echo get_sanitize_input($ma['ma_subject']); ?>" id="ma_subject" required class="required frm_input" size="100"></td>
     </tr>
     <tr>
         <th scope="row"><label for="ma_content">메일 내용<strong class="sound_only">필수</strong></label></th>

adm/mail_update.php

@@ -10,7 +10,7 @@ auth_check($auth[$sub_menu], 'w');
 check_admin_token();
 
 $ma_id = isset($_POST['ma_id']) ? (int) $_POST['ma_id'] : 0;
-$ma_subject = isset($_POST['ma_subject']) ? strip_tags($_POST['ma_subject']) : '';
+$ma_subject = isset($_POST['ma_subject']) ? strip_tags(clean_xss_attributes($_POST['ma_subject'])) : '';
 
 if ($w == '')
 {

adm/menu_form.php

@@ -159,11 +159,11 @@ function add_menu_list(name, link, code)
     list += "<option value=\"0\">사용안함</option>";
     list += "</select>";
     list += "</td>";
-    list += "<td class=\"td_mngsmall\">";
+    list += "<td class=\"td_mng\">";
     <?php if($new == 'new') { ?>
-    list += "<button type=\"button\" class=\"btn_add_submenu btn\">추가</button>";
+    list += "<button type=\"button\" class=\"btn_add_submenu btn_03\">추가</button>\n";
     <?php } ?>
-    list += "<button type=\"button\" class=\"btn_del_menu btn\">삭제</button>";
+    list += "<button type=\"button\" class=\"btn_del_menu btn_02\">삭제</button>";
     list += "</td>";
     list += "</tr>";
 

adm/menu_list_update.php

@@ -21,11 +21,11 @@ for ($i=0; $i<$count; $i++)
 {
     $_POST = array_map_deep('trim', $_POST);
     
-    $_POST['me_link'][$i] = is_array($_POST['me_link']) ? clean_xss_tags($_POST['me_link'][$i], 1) : '';
+    $_POST['me_link'][$i] = is_array($_POST['me_link']) ? clean_xss_tags(clean_xss_attributes($_POST['me_link'][$i], 1)) : '';
 
     $code    = is_array($_POST['code']) ? strip_tags($_POST['code'][$i]) : '';
     $me_name = is_array($_POST['me_name']) ? strip_tags($_POST['me_name'][$i]) : '';
-    $me_link = (preg_match('/^javascript/i', $_POST['me_link'][$i]) || preg_match('/script:/i', $_POST['me_link'][$i])) ? G5_URL : strip_tags($_POST['me_link'][$i]);
+    $me_link = (preg_match('/^javascript/i', $_POST['me_link'][$i]) || preg_match('/script:/i', $_POST['me_link'][$i])) ? G5_URL : strip_tags(clean_xss_attributes($_POST['me_link'][$i]));
     
     if(!$code || !$me_name || !$me_link)
         continue;

adm/newwinformupdate.php

@@ -12,7 +12,7 @@ else
 
 check_admin_token();
 
-$nw_subject = isset($_POST['nw_subject']) ? strip_tags($_POST['nw_subject']) : '';
+$nw_subject = isset($_POST['nw_subject']) ? strip_tags(clean_xss_attributes($_POST['nw_subject'])) : '';
 
 $sql_common = " nw_device = '{$_POST['nw_device']}',
                 nw_begin_time = '{$_POST['nw_begin_time']}',

adm/point_update.php

@@ -6,9 +6,9 @@ auth_check($auth[$sub_menu], 'w');
 
 check_admin_token();
 
-$mb_id = strip_tags($_POST['mb_id']);
-$po_point = strip_tags($_POST['po_point']);
-$po_content = strip_tags($_POST['po_content']);
+$mb_id = strip_tags(clean_xss_attributes($_POST['mb_id']));
+$po_point = strip_tags(clean_xss_attributes($_POST['po_point']));
+$po_content = strip_tags(clean_xss_attributes($_POST['po_content']));
 $expire = preg_replace('/[^0-9]/', '', $_POST['po_expire_term']);
 
 $mb = get_member($mb_id);

adm/poll_form.php

@@ -37,7 +37,7 @@ include_once('./admin.head.php');
     <tbody>
     <tr>
         <th scope="row"><label for="po_subject">투표 제목<strong class="sound_only">필수</strong></label></th>
-        <td><input type="text" name="po_subject" value="<?php echo $po['po_subject'] ?>" id="po_subject" required class="required frm_input" size="80" maxlength="125"></td>
+        <td><input type="text" name="po_subject" value="<?php echo get_sanitize_input($po['po_subject']); ?>" id="po_subject" required class="required frm_input" size="80" maxlength="125"></td>
     </tr>
 
     <?php

adm/poll_form_update.php

@@ -40,7 +40,7 @@ foreach( $_POST as $key=>$value ){
     if( empty($value) ) continue;
 
     if( in_array($key, $check_keys) ) {
-        $_POST[$key] = strip_tags($value);
+        $_POST[$key] = strip_tags(clean_xss_attributes($value));
     }
 }
 

adm/qa_config.php

@@ -133,7 +133,7 @@ if(!isset($qaconfig['qa_include_head'])) {
         <tr>
             <th scope="row"><label for="qa_title">타이틀<strong class="sound_only">필수</strong></label></th>
             <td>
-                <input type="text" name="qa_title" value="<?php echo $qaconfig['qa_title'] ?>" id="qa_title" required class="required frm_input" size="40">
+                <input type="text" name="qa_title" value="<?php echo get_sanitize_input($qaconfig['qa_title']); ?>" id="qa_title" required class="required frm_input" size="40">
                 <a href="<?php echo G5_BBS_URL; ?>/qalist.php" class="btn_frmline">1:1문의 바로가기</a>
             </td>
         </tr>
@@ -141,7 +141,7 @@ if(!isset($qaconfig['qa_include_head'])) {
             <th scope="row"><label for="qa_category">분류<strong class="sound_only">필수</strong></label></th>
             <td>
                 <?php echo help('분류와 분류 사이는 | 로 구분하세요. (예: 질문|답변) 첫자로 #은 입력하지 마세요. (예: #질문|#답변 [X])') ?>
-                <input type="text" name="qa_category" value="<?php echo $qaconfig['qa_category'] ?>" id="qa_category" required class="required frm_input" size="70">
+                <input type="text" name="qa_category" value="<?php echo get_sanitize_input($qaconfig['qa_category']); ?>" id="qa_category" required class="required frm_input" size="70">
             </td>
         </tr>
         <tr>
@@ -184,21 +184,21 @@ if(!isset($qaconfig['qa_include_head'])) {
             <th scope="row"><label for="qa_send_number">SMS 발신번호</label></th>
             <td>
                 <?php echo help('SMS 알림 전송시 발신번호로 사용됩니다.'); ?>
-                <input type="text" name="qa_send_number" value="<?php echo $qaconfig['qa_send_number'] ?>" id="qa_send_number" class="frm_input"  size="30">
+                <input type="text" name="qa_send_number" value="<?php echo get_sanitize_input($qaconfig['qa_send_number']); ?>" id="qa_send_number" class="frm_input"  size="30">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="qa_admin_hp">관리자 휴대폰번호</label></th>
             <td>
                 <?php echo help('관리자 휴대폰번호를 입력하시면 문의글 등록시 등록하신 번호로 SMS 알림이 전송됩니다.<br>SMS 알림을 사용하지 않으시면 알림이 전송되지 않습니다.'); ?>
-                <input type="text" name="qa_admin_hp" value="<?php echo $qaconfig['qa_admin_hp'] ?>" id="qa_admin_hp" class="frm_input"  size="30">
+                <input type="text" name="qa_admin_hp" value="<?php echo get_sanitize_input($qaconfig['qa_admin_hp']); ?>" id="qa_admin_hp" class="frm_input"  size="30">
             </td>
         </tr>
         <tr>
             <th scope="row"><label for="qa_admin_email">관리자 이메일</label></th>
             <td>
                 <?php echo help('관리자 이메일을 입력하시면 문의글 등록시 등록하신 이메일로 알림이 전송됩니다.'); ?>
-                <input type="text" name="qa_admin_email" value="<?php echo $qaconfig['qa_admin_email'] ?>" id="qa_admin_email" class="frm_input"  size="50">
+                <input type="text" name="qa_admin_email" value="<?php echo get_sanitize_input($qaconfig['qa_admin_email']); ?>" id="qa_admin_email" class="frm_input"  size="50">
             </td>
         </tr>
         <tr>

adm/qa_config_update.php

@@ -15,7 +15,7 @@ $qaconfig = get_qa_config();
 $check_keys = array('qa_title', 'qa_category', 'qa_skin', 'qa_mobile_skin', 'qa_use_email', 'qa_req_email', 'qa_use_hp', 'qa_req_hp', 'qa_use_sms', 'qa_send_number', 'qa_admin_hp', 'qa_admin_email', 'qa_subject_len', 'qa_mobile_subject_len', 'qa_page_rows', 'qa_mobile_page_rows', 'qa_image_width', 'qa_upload_size');
 
 foreach($check_keys as $key){
-	$$key = $_POST[$key] = isset($_POST[$key]) ? strip_tags($_POST[$key]) : '';
+	$$key = $_POST[$key] = isset($_POST[$key]) ? strip_tags(clean_xss_attributes($_POST[$key])) : '';
 }
 
 $qa_include_head = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($qa_include_head, 0, 255));
@@ -56,6 +56,11 @@ if( $qa_include_tail && ! is_include_path_check($qa_include_tail, 1) ){
     $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.';
 }
 
+if( function_exists('filter_input_include_path') ){
+    $qa_include_head = filter_input_include_path($qa_include_head);
+    $qa_include_tail = filter_input_include_path($qa_include_tail);
+}
+
 $sql = " update {$g5['qa_config_table']}
             set qa_title                = '{$_POST['qa_title']}',
                 qa_category             = '{$_POST['qa_category']}',

adm/sms_admin/config.php

@@ -9,6 +9,14 @@ $g5['title'] = "SMS 기본설정";
 if (!$config['cf_icode_server_ip'])   $config['cf_icode_server_ip'] = '211.172.232.124';
 if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295';
 
+// 아이코드 토큰키 추가
+if( ! isset($config['cf_icode_token_key']) ){
+    $sql = "ALTER TABLE `{$g5['config_table']}` 
+            ADD COLUMN `cf_icode_token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `cf_icode_server_port`; ";
+    sql_query($sql, false);
+    $config['cf_icode_token_key'] = '';
+}
+
 if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw'])
 {
     $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']);
@@ -23,7 +31,7 @@ if (!$sms5['cf_skin'])
 include_once(G5_ADMIN_PATH.'/admin.head.php');
 
 ?>
-<?php if (!$config['cf_icode_pw']) { ?>
+<?php if (!($config['cf_icode_pw'] || $config['cf_icode_token_key'])) { ?>
 <div class="local_desc01 local_desc">
     <p>
         SMS 기능을 사용하시려면 먼저 아이코드에 서비스 신청을 하셔야 합니다.<br>
@@ -47,22 +55,31 @@ if ($config['cf_sms_use'] == 'icode') { // 아이코드 사용
     </colgroup>
     <tbody>
     <tr>
-        <th scope="row"><label for="cf_icode_id">아이코드 회원아이디<strong class="sound_only"> 필수</strong></label></th>
+        <th scope="row"><label for="cf_sms_type">SMS 전송유형</label></th>
+        <td>
+            <?php echo help("전송유형을 SMS로 선택하시면 최대 80바이트까지 전송하실 수 있으며<br>LMS로 선택하시면 90바이트 이하는 SMS로, 그 이상은 ".G5_ICODE_LMS_MAX_LENGTH."바이트까지 LMS로 전송됩니다.<br>요금은 건당 SMS는 16원, LMS는 48원입니다."); ?>
+            <select id="cf_sms_type" name="cf_sms_type">
+                <option value="" <?php echo get_selected($config['cf_sms_type'], ''); ?>>SMS</option>
+                <option value="LMS" <?php echo get_selected($config['cf_sms_type'], 'LMS'); ?>>LMS</option>
+            </select>
+        </td>
+    </tr>
+    <tr class="icode_old_version">
+        <th scope="row"><label for="cf_icode_id">아이코드 회원아이디<br>(구버전)<strong class="sound_only"> 필수</strong></label></th>
         <td>
             <?php echo help("아이코드에서 사용하시는 회원아이디를 입력합니다."); ?>
-            <input type="text" name="cf_icode_id" value="<?php echo $config['cf_icode_id']; ?>" id="cf_icode_id" required class="frm_input required">
+            <input type="text" name="cf_icode_id" value="<?php echo $config['cf_icode_id']; ?>" id="cf_icode_id" class="frm_input">
         </td>
     </tr>
-    <tr>
-        <th scope="row"><label for="cf_icode_pw">아이코드 비밀번호<strong class="sound_only"> 필수</strong></label></th>
+    <tr class="icode_old_version">
+        <th scope="row"><label for="cf_icode_pw">아이코드 비밀번호<br>(구버전)<strong class="sound_only"> 필수</strong></label></th>
         <td>
             <?php echo help("아이코드에서 사용하시는 비밀번호를 입력합니다."); ?>
-            <input type="password" name="cf_icode_pw" value="<?php echo $config['cf_icode_pw']; ?>" id="cf_icode_pw" required class="frm_input required">
-            <?php if (!$config['cf_icode_pw']) { ?>현재 비밀번호가 입력되어 있지 않습니다.<?php } ?>
+            <input type="password" name="cf_icode_pw" value="<?php echo $config['cf_icode_pw']; ?>" id="cf_icode_pw" class="frm_input">
         </td>
     </tr>
-    <tr>
-        <th scope="row">요금제</th>
+    <tr class="icode_old_version <?php if(!(isset($userinfo['payment']) && $userinfo['payment'])){ echo 'cf_tr_hide'; } ?>">
+        <th scope="row">요금제<br>(구버전)</th>
         <td>
             <?php
                 if ($userinfo['payment'] == 'A') {
@@ -72,21 +89,30 @@ if ($config['cf_sms_use'] == 'icode') { // 아이코드 사용
                     echo '정액제';
                     echo '<input type="hidden" name="cf_icode_server_port" value="7296">';
                 } else {
-                    echo '가입해주세요.';
                     echo '<input type="hidden" name="cf_icode_server_port" value="7295">';
                 }
             ?>
         </td>
     </tr>
     <?php if ($userinfo['payment'] == 'A') { ?>
-    <tr>
-        <th scope="row">충전 잔액</th>
+    <tr class="icode_old_version">
+        <th scope="row">충전 잔액<br>(구버전)</th>
         <td>
             <?php echo number_format($userinfo['coin'])?> 원
             <a href="http://www.icodekorea.com/smsbiz/credit_card_amt.php?icode_id=<?php echo $config['cf_icode_id']; ?>&amp;icode_passwd=<?php echo $config['cf_icode_pw']; ?>" target="_blank" class="btn_frmline">충전하기</a>
         </td>
     </tr>
     <?php } ?>
+    <tr class="icode_json_version">
+        <th scope="row"><label for="cf_icode_token_key">아이코드 토큰키<br>(JSON버전)</label></th>
+        <td>
+            <?php echo help("아이코드 JSON 버전의 경우 아이코드 토큰키를 입력시 실행됩니다.<br>SMS 전송유형을 LMS로 설정시 90바이트 이내는 SMS, 90 ~ 2000 바이트는 LMS 그 이상은 절삭 되어 LMS로 발송됩니다."); ?>
+            <input type="text" name="cf_icode_token_key" value="<?php echo $config['cf_icode_token_key']; ?>" id="cf_icode_token_key" class="frm_input" size="40">
+            <?php echo help("아이코드 사이트 -> 토큰키관리 메뉴에서 생성한 토큰키를 입력합니다."); ?>
+            <br>
+            서버아이피 : <?php echo $_SERVER['SERVER_ADDR']; ?>
+        </td>
+    </tr>
     <tr>
         <th scope="row"><label for="cf_phone">회신번호<strong class="sound_only"> 필수</strong></label></th>
         <td>

adm/sms_admin/config_update.php

@@ -15,6 +15,7 @@ if(!check_vaild_callback($cf_phone))
     alert('회신번호가 올바르지 않습니다.');
 
 $userinfo = get_icode_userinfo($cf_icode_id, $cf_icode_pw);
+$cf_icode_server_port = isset($cf_icode_server_port) ? preg_replace('/[^0-9]/', '', $cf_icode_server_port) : '7295';
 
 if ($userinfo['code'] == '202')
     alert('아이코드 아이디와 패스워드가 맞지 않습니다.');
@@ -33,10 +34,12 @@ sql_query($sql);
 // 아이코드 설정
 $sql = " update {$g5['config_table']}
             set cf_sms_use              = '$cf_sms_use',
+                cf_sms_type             = '$cf_sms_type',
                 cf_icode_id             = '$cf_icode_id',
                 cf_icode_pw             = '$cf_icode_pw',
                 cf_icode_server_ip      = '$cf_icode_server_ip',
-                cf_icode_server_port    = '$cf_icode_server_port' ";
+                cf_icode_server_port    = '$cf_icode_server_port',
+                cf_icode_token_key      = '$cf_icode_token_key'";
 sql_query($sql);
 
 goto_url("./config.php");

adm/sms_admin/css/sms5.css

@@ -22,6 +22,7 @@
 .sms5_box {position:relative;padding:10px;border-radius:5px;background:#fbec99}
 .sms5_box .box_ico {position:absolute;top:20px;left:-7px;width:7px;height:13px;background:url('../img/box_ico.gif') no-repeat}
 .sms5_box .box_txt {border:0;background:transparent;word-break:break-all;resize:none;overflow:hidden}
+.sms5_box textarea.box_txt.is_overview{overflow:visible;min-height:130px}
 .sms5_box .box_square {width:100px;height:90px}
 
 #write_wrap {z-index:9}

adm/sms_admin/form_update.php

@@ -4,8 +4,8 @@ include_once("./_common.php");
 
 auth_check($auth[$sub_menu], "w");
 
-$fo_name = isset($fo_name) ? strip_tags($fo_name) : '';
-$fo_content = isset($fo_content) ? strip_tags($fo_content) : '';
+$fo_name = isset($fo_name) ? strip_tags(clean_xss_attributes($fo_name)) : '';
+$fo_content = isset($fo_content) ? strip_tags(clean_xss_attributes($fo_content)) : '';
 
 $g5['title'] = "이모티콘 업데이트";
 

adm/sms_admin/form_write.php

@@ -6,6 +6,8 @@ auth_check($auth[$sub_menu], "w");
 
 $g5['title'] = "이모티콘 ";
 
+$fg_no = isset($fg_no) ? (int) $fg_no : '';
+
 if ($w == 'u' && is_numeric($fo_no)) {
     $write = sql_fetch("select * from {$g5['sms5_form_table']} where fo_no='$fo_no'");
     $g5['title'] .= '수정';
@@ -48,7 +50,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
     </tr>
     <tr>
         <th scope="row"><label for="fo_name">제목<strong class="sound_only"> 필수</strong></label></th>
-        <td><input type="text" name="fo_name" id="fo_name" required value="<?php echo $write['fo_name']?>" class="frm_input required" size="70"></td>
+        <td><input type="text" name="fo_name" id="fo_name" required value="<?php echo get_sanitize_input($write['fo_name']); ?>" class="frm_input required" size="70"></td>
     </tr>
     <tr>
         <th scope="row">메세지</th>

adm/sms_admin/history_send.php

@@ -224,8 +224,8 @@ if($config['cf_sms_type'] == 'LMS') {
 
 ?>
 <script>
-act = window.open('sms_ing.php', 'act', 'width=300, height=200');
-act.close();
+//act = window.open('sms_ing.php', 'act', 'width=300, height=200');
+//act.close();
 location.href = 'history_view.php?wr_no=<?php echo $wr_no?>&wr_renum=<?php echo $new_wr_renum?>';
 </script>
 <?php

adm/sms_admin/history_view.php

@@ -60,8 +60,8 @@ function re_send()
     if (!confirm('전송에 실패한 SMS 를 재전송 하시겠습니까?'))
         return;
 
-    act = window.open('sms_ing.php', 'act', 'width=300, height=200');
-    act.focus();
+    //act = window.open('sms_ing.php', 'act', 'width=300, height=200');
+    //act.focus();
 
     location.href = './history_send.php?w=f&page=<?php echo $page?>&st=<?php echo  $st?>&sv=<?php echo $sv?>&wr_no=<?php echo $wr_no?>&wr_renum=<?php echo $wr_renum?>';
     <?php } ?>
@@ -104,7 +104,7 @@ function all_send()
 
     <div id="con_sms" class="sms5_box">
         <span class="box_ico"></span>
-        <textarea class="box_txt" readonly><?php echo $write['wr_message'];?></textarea>
+        <textarea class="box_txt is_overview" readonly><?php echo $write['wr_message'];?></textarea>
     </div>
 
     <?php if ($write['wr_re_total'] && !$wr_renum) { ?>

adm/sms_admin/install.php

@@ -53,6 +53,7 @@ eval("\$file = \"$file\";");
 $f = explode(";", $file);
 for ($i=0; $i<count($f); $i++) {
     if (trim($f[$i]) == "") continue;
+	$f[$i] = get_db_create_replace($f[$i]);
     sql_query($f[$i]) or die(mysqli_error());
 }
 // 테이블 생성 ------------------------------------

adm/sms_admin/num_book.php

@@ -16,6 +16,8 @@ if ($page < 1) $page = 1;
 $bg_no = isset($bg_no) ? (int) $bg_no : 0;
 $st = isset($st) ? preg_replace('/[^a-z0-9]/i', '', $st) : '';
 
+$sql_korean = $sql_group = $sql_search = $sql_no_hp = '';
+
 if (is_numeric($bg_no))
     $sql_group = " and bg_no='$bg_no' ";
 else
@@ -127,9 +129,9 @@ function no_hp_click(val)
 <label for="bg_no" class="sound_only">그룹명</label>
 <select name="bg_no" id="bg_no" onchange="location.href='<?php echo $_SERVER['SCRIPT_NAME']?>?bg_no='+this.value;">
     <option value=""<?php echo get_selected('', $bg_no); ?>> 전체 </option>
-    <option value="<?php echo $no_group['bg_no']?>"<?php echo get_selected($bg_no, $no_group['bg_no']); ?>> <?php echo $no_group['bg_name']?> (<?php echo number_format($no_group['bg_count'])?> 명) </option>
+    <option value="<?php echo $no_group['bg_no']?>"<?php echo get_selected($no_group['bg_no'], $bg_no); ?>> <?php echo $no_group['bg_name']?> (<?php echo number_format($no_group['bg_count'])?> 명) </option>
     <?php for($i=0; $i<count($group); $i++) {?>
-    <option value="<?php echo $group[$i]['bg_no']?>"<?php echo get_selected($bg_no, $group[$i]['bg_no']);?>> <?php echo $group[$i]['bg_name']?> (<?php echo number_format($group[$i]['bg_count'])?> 명) </option>
+    <option value="<?php echo $group[$i]['bg_no']?>"<?php echo get_selected($group[$i]['bg_no'], $bg_no);?>> <?php echo $group[$i]['bg_name']?> (<?php echo number_format($group[$i]['bg_count'])?> 명) </option>
     <?php } ?>
 </select>
 <input type="checkbox" name="no_hp" id="no_hp" <?php echo $no_hp_checked?> onclick="no_hp_click(this.checked)">

adm/sms_admin/num_group.php

@@ -129,7 +129,7 @@ function num_group_submit(f)
             <select name="select_bg_no_999" id="select_bg_no_999" onchange="move(<?php echo $no_group['bg_no']?>, '<?php echo $no_group['bg_name']?>', this);" >
                 <option value=""></option>
                 <?php for ($i=0; $i<count($group); $i++) { ?>
-                <option value="<?php echo $group[$i]['bg_no']?>"> <?php echo $group[$i]['bg_name']?> </option>
+                <option value="<?php echo $group[$i]['bg_no']?>"> <?php echo get_sanitize_input($group[$i]['bg_name']); ?> </option>
                 <?php } ?>
             </select>
         </td>
@@ -150,7 +150,7 @@ function num_group_submit(f)
         </td>
         <td>
             <label for="bg_name_<?php echo $i; ?>" class="sound_only">그룹명</label>
-            <input type="text" name="bg_name[<?php echo $i; ?>]" value="<?php echo $group[$i]['bg_name']?>" id="bg_name_<?php echo $i; ?>" class="frm_input">
+            <input type="text" name="bg_name[<?php echo $i; ?>]" value="<?php echo get_sanitize_input($group[$i]['bg_name']); ?>" id="bg_name_<?php echo $i; ?>" class="frm_input">
         </td>
         <td class="td_num"><?php echo number_format($group[$i]['bg_count'])?></td>
         <td class="td_num"><?php echo number_format($group[$i]['bg_member'])?></td>

adm/sms_admin/num_group_update.php

@@ -11,7 +11,7 @@ if ($w == 'u') // 업데이트
         // 실제 번호를 넘김
         $k = $_POST['chk'][$i];
         $bg_no = (int) $_POST['bg_no'][$k];
-        $bg_name = strip_tags($_POST['bg_name'][$k]);
+        $bg_name = strip_tags(clean_xss_attributes($_POST['bg_name'][$k]));
 
         if (!is_numeric($bg_no))
             alert('그룹 고유번호가 없습니다.');
@@ -23,11 +23,11 @@ if ($w == 'u') // 업데이트
         if (!strlen(trim($bg_name)))
             alert('그룹명을 입력해주세요');
 
-        $res = sql_fetch("select bg_name from {$g5['sms5_book_group_table']} where bg_no<>'$bg_no' and bg_name='$bg_name'");
+        $res = sql_fetch("select bg_name from {$g5['sms5_book_group_table']} where bg_no<>'$bg_no' and bg_name='".sql_real_escape_string($bg_name)."'");
         if ($res)
             alert('같은 그룹명이 존재합니다.');
 
-        sql_query("update {$g5['sms5_book_group_table']} set bg_name='".addslashes($bg_name)."' where bg_no='$bg_no'");
+        sql_query("update {$g5['sms5_book_group_table']} set bg_name='".sql_real_escape_string($bg_name)."' where bg_no='$bg_no'");
     }
 }
 else if ($w == 'de') // 그룹삭제
@@ -63,7 +63,7 @@ else if ($w == 'em') // 비우기
 }
 else // 등록
 {
-    $bg_name = strip_tags($bg_name);
+    $bg_name = strip_tags(clean_xss_attributes($bg_name));
 
     if (!strlen(trim($bg_name)))
         alert('그룹명을 입력해주세요');
@@ -72,7 +72,7 @@ else // 등록
     if ($res)
         alert('같은 그룹명이 존재합니다.');
 
-    sql_query("insert into {$g5['sms5_book_group_table']} set bg_name='".addslashes($bg_name)."'");
+    sql_query("insert into {$g5['sms5_book_group_table']} set bg_name='$bg_name'");
 }
 
 goto_url('./num_group.php');

adm/sms_admin/sms5.sql

@@ -149,7 +149,7 @@ CREATE TABLE `{$g5['sms5_write_table']}` (
   `wr_no` int(11) NOT NULL default '1',
   `wr_renum` int(11) NOT NULL default '0',
   `wr_reply` varchar(255) NOT NULL default '',
-  `wr_message` varchar(255) NOT NULL default '',
+  `wr_message` text NOT NULL,
   `wr_booking` datetime NOT NULL default '0000-00-00 00:00:00',
   `wr_total` int(11) NOT NULL default '0',
   `wr_re_total` int(11) NOT NULL default '0',

adm/sms_admin/sms_write.php

@@ -266,8 +266,8 @@ function sms5_chk_send(f)
 
         w = document.body.clientWidth/2 - 200;
         h = document.body.clientHeight/2 - 100;
-        act = window.open('sms_ing.php', 'act', 'width=300, height=200, left=' + w + ', top=' + h);
-        act.focus();
+        //act = window.open('sms_ing.php', 'act', 'width=300, height=200, left=' + w + ', top=' + h);
+        //act.focus();
 
         f.send_list.value = list;
         return true;
@@ -407,6 +407,7 @@ function byte_check(wr_message, sms_bytes)
     var conts = document.getElementById(wr_message);
     var bytes = document.getElementById(sms_bytes);
     var max_bytes = document.getElementById("sms_max_bytes");
+    var lms_max_length = <?php echo G5_ICODE_LMS_MAX_LENGTH;?>
 
     var i = 0;
     var cnt = 0;
@@ -427,14 +428,14 @@ function byte_check(wr_message, sms_bytes)
 
     <?php if($config['cf_sms_type'] == 'LMS') { ?>
     if(cnt > 90)
-        max_bytes.innerHTML = 1500;
+        max_bytes.innerHTML = lms_max_length;
     else
         max_bytes.innerHTML = 90;
 
-    if (cnt > 1500)
+    if (cnt > lms_max_length)
     {
-        exceed = cnt - 1500;
-        alert('메시지 내용은 1500바이트를 넘을수 없습니다.\n\n작성하신 메세지 내용은 '+ exceed +'byte가 초과되었습니다.\n\n초과된 부분은 자동으로 삭제됩니다.');
+        exceed = cnt - lms_max_length;
+        alert('메시지 내용은 '+ lms_max_length +'바이트를 넘을수 없습니다.\n\n작성하신 메세지 내용은 '+ exceed +'byte가 초과되었습니다.\n\n초과된 부분은 자동으로 삭제됩니다.');
         var tcnt = 0;
         var xcnt = 0;
         var tmp = conts.value;
@@ -447,7 +448,7 @@ function byte_check(wr_message, sms_bytes)
                 tcnt += 1;
             }
 
-            if (tcnt > 1500) {
+            if (tcnt > lms_max_length) {
                 tmp = tmp.substring(0,i);
                 break;
             } else {

adm/sms_admin/sms_write_form.php

@@ -7,6 +7,8 @@ while ($res = sql_fetch_array($qry)) array_push($group, $res);
 
 $res = sql_fetch("select count(*) as cnt from `{$g5['sms5_form_table']}` where fg_no=0");
 $no_count = $res['cnt'];
+
+$fg_no = isset($fg_no) ? (int) $fg_no : '';
 ?>
 
 <form name="emo_frm">

adm/sms_admin/sms_write_send.php

@@ -6,8 +6,24 @@ auth_check($auth[$sub_menu], "w");
 
 check_admin_token();
 
+$result = sql_query("describe `{$g5['sms5_write_table']}`");
+while ($row = sql_fetch_array($result)){
+    if( $row['Field'] === 'wr_message' && $row['Type'] === 'varchar(255)' ){
+        sql_query("ALTER TABLE `{$g5['sms5_write_table']}` MODIFY wr_message TEXT NOT NULL;", false);
+        break;
+    }
+}
+
 $g5['title'] = "문자전송중";
 
+if ($config['cf_sms_use'] != 'icode') {
+    alert('기본환경설정에서 icode sms 사용이 비활성화 되어 있습니다.');
+}
+
+if ( ! (($config['cf_icode_id'] && $config['cf_icode_pw']) || $config['cf_icode_token_key']) ) {
+    alert('아이코드 설정값이 존재하지 않습니다.');
+}
+
 $wr_reply   = preg_replace('#[^0-9\-]#', '', trim($wr_reply));
 $wr_message = clean_xss_tags(trim($wr_message));
 
@@ -94,12 +110,12 @@ while ($row = array_shift($send_list))
                 $hp = get_hp($item[$i][1], 0);
                 $name = $item[$i][0];
 
-                if(!$hp) continue;
+                if(!$hp) continue 2;
 
                 if ($wr_overlap && array_overlap($hps, $hp)) {
                     $overlap++;
                     array_push( $duplicate_data['hp'], $row['bk_hp'] );
-                    continue;
+                    continue 2;
                 }
 
                 array_push($list, array('bk_hp' => $hp, 'bk_name' => $name));
@@ -111,12 +127,12 @@ while ($row = array_shift($send_list))
                 $row = sql_fetch("select * from {$g5['sms5_book_table']} where bk_no='$item[$i]'");
                 $row['bk_hp'] = get_hp($row['bk_hp'], 0);
 
-                if(!$row['bk_hp']) continue;
+                if(!$row['bk_hp']) continue 2;
 
                 if ($wr_overlap && array_overlap($hps, $row['bk_hp'])) {
                     $overlap++;
                     array_push( $duplicate_data['hp'], $row['bk_hp'] );
-                    continue;
+                    continue 2;
                 }
                 array_push($list, $row);
                 array_push($hps, $row['bk_hp']);
@@ -141,14 +157,11 @@ if ($wr_by && $wr_bm && $wr_bd && $wr_bh && $wr_bi) {
     $booking = '';
 }
 
-if ($config['cf_sms_use'] != 'icode') {
-    alert('기본환경설정에서 icode sms 사용이 비활성화 되어 있습니다.');
-}
-
 include_once(G5_ADMIN_PATH.'/admin.head.php');
 
 $reply = str_replace('-', '', trim($wr_reply));
-$wr_message = conv_unescape_nl($wr_message);
+$db_wr_message = conv_unescape_nl($wr_message);
+$wr_message = conv_unescape_nl(stripslashes($wr_message));
 
 $SMS = new SMS5;
 
@@ -186,7 +199,7 @@ if($config['cf_sms_type'] == 'LMS') {
 
             if($result) {
                 $result = $SMS->Send();
-
+                
                 if ($result) //SMS 서버에 접속했습니다.
                 {
                     foreach ($SMS->Result as $result)
@@ -242,7 +255,7 @@ if($config['cf_sms_type'] == 'LMS') {
             }
         }
 
-        sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum=0, wr_reply='$wr_reply', wr_message='$wr_message', wr_success='$wr_success', wr_failure='$wr_failure', wr_memo='$str_serialize', wr_booking='$wr_booking', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'");
+        sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum=0, wr_reply='$wr_reply', wr_message='$db_wr_message', wr_success='$wr_success', wr_failure='$wr_failure', wr_memo='$str_serialize', wr_booking='$wr_booking', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'");
     }
 } else {
     $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']);
@@ -260,7 +273,7 @@ if($config['cf_sms_type'] == 'LMS') {
             else
                 $wr_no = 1;
 
-            sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum=0, wr_reply='$wr_reply', wr_message='$wr_message', wr_booking='$wr_booking', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'");
+            sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum=0, wr_reply='$wr_reply', wr_message='$db_wr_message', wr_booking='$wr_booking', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'");
 
             $wr_success = 0;
             $wr_failure = 0;
@@ -324,11 +337,16 @@ if($config['cf_sms_type'] == 'LMS') {
 
 function win_close_alert($msg) {
 
-    $html = "<script>
-    act = window.open('sms_ing.php', 'act', 'width=300, height=200');
-    act.close();
-    alert('$msg');
-    history.back();</script>";
+    $html = "<script>".PHP_EOL;
+    //$html .= "act = window.open('sms_ing.php', 'act', 'width=300, height=200');".PHP_EOL;
+    //$html .= "act.close();".PHP_EOL;
+    $html .= "alert('$msg');
+        if ('referrer' in document) {
+            window.location = document.referrer;
+        } else {
+            window.history.back();
+        }
+    </script>";
 
     echo $html;
     exit;
@@ -336,8 +354,8 @@ function win_close_alert($msg) {
 
 ?>
 <script>
-act = window.open('sms_ing.php', 'act', 'width=300, height=200');
-act.close();
+//act = window.open('sms_ing.php', 'act', 'width=300, height=200');
+//act.close();
 location.href = 'history_view.php?wr_no=<?php echo $wr_no?>';
 </script>
 <?php

adm/theme_detail.php

@@ -12,13 +12,13 @@ if(!in_array($theme, $theme_dir))
     die('선택하신 테마가 설치되어 있지 않습니다.');
 
 $info = get_theme_info($theme);
+$name = get_text($info['theme_name']);
 
 if($info['screenshot'])
     $screenshot = '<img src="'.$info['screenshot'].'" alt="'.$name.'">';
 else
     $screenshot = '<img src="'.G5_ADMIN_URL.'/img/theme_img.jpg" alt="">';
 
-$name = get_text($info['theme_name']);
 if($info['theme_uri']) {
     $name = '<a href="'.set_http($info['theme_uri']).'" target="_blank" class="thdt_home">'.$name.'</a>';
 }

adm/visit_search.php

@@ -11,6 +11,11 @@ include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
 
 $colspan = 6;
 $listall = '<a href="'.$_SERVER['SCRIPT_NAME'].'">처음</a>'; //페이지 처음으로 (초기화용도)
+$sql_search = '';
+
+if(isset($sfl) && $sfl && !in_array($sfl, array('vi_ip','vi_date','vi_time','vi_referer','vi_agent','vi_browser','vi_os','vi_device')) ) {
+    $sfl = '';
+}
 ?>
 
 <div class="local_sch local_sch01">

bbs/db_table.optimize.php

@@ -53,7 +53,7 @@ if($config['cf_leave_day'] > 0) {
 }
 
 // 음성 캡챠 파일 삭제
-$captcha_mp3 = glob(G5_PATH.'/data/cache/kcaptcha-*.mp3');
+$captcha_mp3 = glob(G5_DATA_PATH.'/cache/kcaptcha-*.mp3');
 if($captcha_mp3 && is_array($captcha_mp3)) {
     foreach ($captcha_mp3 as $file) {
         if (filemtime($file) + 86400 < G5_SERVER_TIME) {

bbs/download.php

@@ -108,17 +108,17 @@ run_event('download_file_header', $file, $file_exist_check);
 
 if(preg_match("/msie/i", $_SERVER['HTTP_USER_AGENT']) && preg_match("/5\.5/", $_SERVER['HTTP_USER_AGENT'])) {
     header("content-type: doesn/matter");
-    header("content-length: ".filesize("$filepath"));
+    header("content-length: ".filesize($filepath));
     header("content-disposition: attachment; filename=\"$original\"");
     header("content-transfer-encoding: binary");
 } else if (preg_match("/Firefox/i", $_SERVER['HTTP_USER_AGENT'])){
     header("content-type: file/unknown");
-    header("content-length: ".filesize("$filepath"));
+    header("content-length: ".filesize($filepath));
     header("content-disposition: attachment; filename=\"".basename($file['bf_source'])."\"");
     header("content-description: php generated data");
 } else {
     header("content-type: file/unknown");
-    header("content-length: ".filesize("$filepath"));
+    header("content-length: ".filesize($filepath));
     header("content-disposition: attachment; filename=\"$original\"");
     header("content-description: php generated data");
 }

bbs/group.php

@@ -39,7 +39,7 @@ $sql .= " order by bo_order ";
 $result = sql_query($sql);
 for ($i=0; $row=sql_fetch_array($result); $i++) {
     $lt_style = "";
-    if ($i%2==1) $lt_style = "margin-left:2%";
+    if ($i%3 !== 0) $lt_style = "margin-left:2%";
     else $lt_style = "";
 ?>
     <div style="float:left;<?php echo $lt_style ?>"  class="lt_wr">

bbs/memo_view.php

@@ -31,14 +31,17 @@ else
     alert($kind.' 값을 넘겨주세요.');
 }
 
-$g5['title'] = $t.' 쪽지 보기';
-include_once(G5_PATH.'/head.sub.php');
-
 $sql = " select * from {$g5['memo_table']}
             where me_id = '$me_id'
             and me_{$kind}_mb_id = '{$member['mb_id']}' ";
 $memo = sql_fetch($sql);
 
+set_session('ss_memo_delete_token', $token = uniqid(time()));
+$del_link = 'memo_delete.php?me_id='.$memo['me_id'].'&token='.$token.'&kind='.$kind;
+
+$g5['title'] = $t.' 쪽지 보기';
+include_once(G5_PATH.'/head.sub.php');
+
 // 이전 쪽지
 $sql = " select me.*, a.rownum from `{$g5['memo_table']}` as me inner join ( select me_id , (@rownum:=@rownum+1) as rownum from `{$g5['memo_table']}` as memo, (select @rownum:=0) tmp where me_{$kind}_mb_id = '{$member['mb_id']}' and memo.me_type = '$kind' order by me_id desc ) as a on a.me_id = me.me_id where me.me_id < '$me_id' and me.me_{$kind}_mb_id = '{$member['mb_id']}' and me.me_type = '$kind' order by me.me_id desc limit 1 ";
 

bbs/move_update.php

@@ -192,6 +192,8 @@ while ($row = sql_fetch_array($result))
 
         sql_query(" update {$g5['board_table']} set bo_count_write = bo_count_write + '$count_write' where bo_table = '$move_bo_table' ");
         sql_query(" update {$g5['board_table']} set bo_count_comment = bo_count_comment + '$count_comment' where bo_table = '$move_bo_table' ");
+        
+        run_event('bbs_move_copy', $row2, $move_bo_table, $insert_id, $next_wr_num, $sw);
 
         delete_cache_latest($move_bo_table);
     }

bbs/password.php

@@ -3,6 +3,10 @@ include_once('./_common.php');
 
 $g5['title'] = '비밀번호 입력';
 
+if( isset($comment_id) ){
+    $comment_id = (int) $comment_id;
+}
+
 switch ($w) {
     case 'u' :
         $action = G5_HTTP_BBS_URL.'/write.php';

bbs/qadownload.php

@@ -22,21 +22,26 @@ if($is_guest) {
 
 $filepath = G5_DATA_PATH.'/qa/'.$file['qa_file'.$no];
 $filepath = addslashes($filepath);
-if (!is_file($filepath) || !file_exists($filepath))
+$file_exist_check = (!is_file($filepath) || !file_exists($filepath)) ? false : true;
+
+if ( false === run_replace('qa_download_file_exist_check', $file_exist_check, $file) ){
     alert('파일이 존재하지 않습니다.');
+}
 
 $g5['title'] = '다운로드 > '.conv_subject($file['qa_subject'], 255);
 
+run_event('qa_download_file_header', $file, $file_exist_check);
+
 $original = urlencode($file['qa_source'.$no]);
 
 if(preg_match("/msie/i", $_SERVER['HTTP_USER_AGENT']) && preg_match("/5\.5/", $_SERVER['HTTP_USER_AGENT'])) {
     header("content-type: doesn/matter");
-    header("content-length: ".filesize("$filepath"));
+    header("content-length: ".filesize($filepath));
     header("content-disposition: attachment; filename=\"$original\"");
     header("content-transfer-encoding: binary");
 } else {
     header("content-type: file/unknown");
-    header("content-length: ".filesize("$filepath"));
+    header("content-length: ".filesize($filepath));
     header("content-disposition: attachment; filename=\"$original\"");
     header("content-description: php generated data");
 }

bbs/register_form.php

@@ -12,10 +12,13 @@ set_session("ss_cert_no",   "");
 set_session("ss_cert_hash", "");
 set_session("ss_cert_type", "");
 
+$is_social_login_modify = false;
+
 if( $provider && function_exists('social_nonce_is_valid') ){   //모바일로 소셜 연결을 했다면
     if( social_nonce_is_valid(get_session("social_link_token"), $provider) ){  //토큰값이 유효한지 체크
         $w = 'u';   //회원 수정으로 처리
         $_POST['mb_id'] = $member['mb_id'];
+        $is_social_login_modify = true;
     }
 }
 
@@ -75,8 +78,14 @@ if ($w == "") {
     // 수정 후 다시 이 폼으로 돌아오기 위해 임시로 저장해 놓음
     set_session("ss_tmp_password", $_POST[mb_password]);
     */
+    
+    if($_POST['mb_id'] && ! (isset($_POST['mb_password']) && $_POST['mb_password'])){
+        if( ! $is_social_login_modify ){
+            alert('비밀번호를 입력해 주세요.');
+        }
+    }
 
-    if ($_POST['mb_password']) {
+    if (isset($_POST['mb_password'])) {
         // 수정된 정보를 업데이트후 되돌아 온것이라면 비밀번호가 암호화 된채로 넘어온것임
         if ($_POST['is_update']) {
             $tmp_password = $_POST['mb_password'];

bbs/write_update.php

@@ -466,9 +466,9 @@ for ($i=0; $i<count($_FILES['bf_file']['name']); $i++) {
     $upload[$i]['source']   = '';
     $upload[$i]['filesize'] = 0;
     $upload[$i]['image']    = array();
-    $upload[$i]['image'][0] = '';
-    $upload[$i]['image'][1] = '';
-    $upload[$i]['image'][2] = '';
+    $upload[$i]['image'][0] = 0;
+    $upload[$i]['image'][1] = 0;
+    $upload[$i]['image'][2] = 0;
     $upload[$i]['fileurl'] = '';
     $upload[$i]['thumburl'] = '';
     $upload[$i]['storage'] = '';
@@ -593,10 +593,10 @@ for ($i=0; $i<count($upload); $i++)
                              bf_fileurl = '{$upload[$i]['fileurl']}',
                              bf_thumburl = '{$upload[$i]['thumburl']}',
                              bf_storage = '{$upload[$i]['storage']}',
-                             bf_filesize = '{$upload[$i]['filesize']}',
-                             bf_width = '{$upload[$i]['image']['0']}',
-                             bf_height = '{$upload[$i]['image']['1']}',
-                             bf_type = '{$upload[$i]['image']['2']}',
+                             bf_filesize = '".(int)$upload[$i]['filesize']."',
+                             bf_width = '".(int)$upload[$i]['image'][0]."',
+                             bf_height = '".(int)$upload[$i]['image'][1]."',
+                             bf_type = '".(int)$upload[$i]['image'][2]."',
                              bf_datetime = '".G5_TIME_YMDHIS."'
                       where bo_table = '{$bo_table}'
                                 and wr_id = '{$wr_id}'
@@ -626,10 +626,10 @@ for ($i=0; $i<count($upload); $i++)
                          bf_thumburl = '{$upload[$i]['thumburl']}',
                          bf_storage = '{$upload[$i]['storage']}',
                          bf_download = 0,
-                         bf_filesize = '{$upload[$i]['filesize']}',
-                         bf_width = '{$upload[$i]['image']['0']}',
-                         bf_height = '{$upload[$i]['image']['1']}',
-                         bf_type = '{$upload[$i]['image']['2']}',
+                         bf_filesize = '".(int)$upload[$i]['filesize']."',
+                         bf_width = '".(int)$upload[$i]['image'][0]."',
+                         bf_height = '".(int)$upload[$i]['image'][1]."',
+                         bf_type = '".(int)$upload[$i]['image'][2]."',
                          bf_datetime = '".G5_TIME_YMDHIS."' ";
         sql_query($sql);
 

common.php

@@ -216,10 +216,6 @@ ini_set("session.gc_divisor", 100); // session.gc_divisor는 session.gc_probabil
 session_set_cookie_params(0, '/');
 ini_set("session.cookie_domain", G5_COOKIE_DOMAIN);
 
-@session_start();
-//==============================================================================
-
-
 //==============================================================================
 // 공용 변수
 //------------------------------------------------------------------------------
@@ -227,6 +223,41 @@ ini_set("session.cookie_domain", G5_COOKIE_DOMAIN);
 // 기본적으로 사용하는 필드만 얻은 후 상황에 따라 필드를 추가로 얻음
 $config = get_config();
 
+// 본인인증 또는 쇼핑몰 사용시에만 secure; SameSite=None 로 설정합니다.
+if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER) ) {
+	// Chrome 80 버전부터 아래 이슈 대응
+	// https://developers-kr.googleblog.com/2020/01/developers-get-ready-for-new.html?fbclid=IwAR0wnJFGd6Fg9_WIbQPK3_FxSSpFLqDCr9bjicXdzy--CCLJhJgC9pJe5ss
+	if(!function_exists('session_start_samesite')) {
+		function session_start_samesite($options = array())
+		{
+            global $g5;
+    
+			$res = @session_start($options);
+			
+            // IE 브라우저 또는 엣지브라우저 일때는 secure; SameSite=None, http 환경에서는 설정하지 않습니다.
+            if( preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~Trident/7.0(; Touch)?; rv:11.0~',$_SERVER['HTTP_USER_AGENT']) || ! (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ){
+                return $res;
+            }
+
+			$headers = headers_list();
+			krsort($headers);
+			foreach ($headers as $header) {
+				if (!preg_match('~^Set-Cookie: PHPSESSID=~', $header)) continue;
+				$header = preg_replace('~; secure(; HttpOnly)?$~', '', $header) . '; secure; SameSite=None';
+				header($header, false);
+                $g5['session_cookie_samesite'] = 'none';
+				break;
+			}
+			return $res;
+		}
+	}
+
+	session_start_samesite();
+} else {
+	@session_start();
+}
+//==============================================================================
+
 define('G5_HTTP_BBS_URL',  https_url(G5_BBS_DIR, false));
 define('G5_HTTPS_BBS_URL', https_url(G5_BBS_DIR, true));
 if ($config['cf_editor'])
@@ -432,7 +463,7 @@ if ($bo_table) {
     }
 }
 
-if ($gr_id) {
+if ($gr_id && !is_array($gr_id)) {
     $group = get_group($gr_id);
 }
 

config.php

@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.1.4');
+define('G5_GNUBOARD_VER', '5.4.2.5');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);

extend/default.config.php

@@ -2,7 +2,7 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // 유저 사이드뷰에서 아이콘 지정 안했을시 기본 no 프로필 이미지
-define('G5_NO_PROFILE_IMG', '<span class="profile_img"><img src="'.G5_IMG_URL.'/no_profile.gif" alt="no_profile" width="20" height="20"></span>');
+define('G5_NO_PROFILE_IMG', '<span class="profile_img"><img src="'.G5_IMG_URL.'/no_profile.gif" alt="no_profile" width="'.$config['cf_member_icon_width'].'" height="'.$config['cf_member_icon_height'].'"></span>');
 
 // 썸네일 처리 방식, 비율유지 하지 않고 썸네일을 생성하려면 주석을 풀고 값은 false 입력합니다. ( true 또는 주석으로 된 경우에는 비율 유지합니다. )
 //define('G5_USE_THUMB_RATIO', false);

extend/sms5.extend.php

@@ -13,6 +13,12 @@ define('G5_SMS5_ADMIN_DIR',        'sms_admin');
 define('G5_SMS5_ADMIN_PATH',       G5_ADMIN_PATH.'/'.G5_SMS5_ADMIN_DIR);
 define('G5_SMS5_ADMIN_URL',        G5_ADMIN_URL.'/'.G5_SMS5_ADMIN_DIR);
 
+define('ICODE_JSON_SOCKET_HOST', '211.172.232.124');
+define('ICODE_JSON_SOCKET_PORT', '9201');
+
+define('G5_ICODE_LMS_MAX_LENGTH', 1500);    // 구버전 LMS 최대길이
+define('G5_ICODE_JSON_MAX_LENGTH', 2000);   // JSON 버전 LMS 최대길이
+
 // SMS 테이블명
 $g5['sms5_prefix']                = 'sms5_';
 $g5['sms5_config_table']          = $g5['sms5_prefix'] . 'config';

g4_import_run.php

@@ -337,7 +337,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     // 게시판 테이블 생성
     $bo_table = $row['bo_table'];
     $file = file(G5_ADMIN_PATH.'/sql_write.sql');
-    $sql = implode($file, "\n");
+    $sql = implode("\n", $file);
 
     $create_table = $g5['write_prefix'] . $bo_table;
 

install/ajax.install.check.php

@@ -15,6 +15,10 @@ if (file_exists($dbconfig_file)) {
     die(install_json_msg('프로그램이 이미 설치되어 있습니다.'));
 }
 
+if (preg_match("/[^0-9a-z_]+/i", $_POST['table_prefix']) ) {
+    die(install_json_msg('TABLE명 접두사는 영문자, 숫자, _ 만 입력하세요.'));
+}
+
 $mysql_host  = safe_install_string_check($_POST['mysql_host'], 'json');
 $mysql_user  = safe_install_string_check($_POST['mysql_user'], 'json');
 $mysql_pass  = safe_install_string_check($_POST['mysql_pass'], 'json');

install/install_config.php

@@ -61,7 +61,7 @@ $ajax_token = md5($tmp_str.$_SERVER['REMOTE_ADDR'].$_SERVER['DOCUMENT_ROOT']);
         <th scope="row"><label for="table_prefix">TABLE명 접두사</label></th>
         <td>
             <input name="table_prefix" type="text" value="g5_" id="table_prefix">
-            <span>가능한 변경하지 마십시오.</span>
+            <span>TABLE명 접두사는 영문자, 숫자, _ 만 입력 가능합니다.</span>
         </td>
     </tr>
     </tbody>

install/install_db.php

@@ -33,6 +33,10 @@ $admin_pass  = $_POST['admin_pass'];
 $admin_name  = $_POST['admin_name'];
 $admin_email = $_POST['admin_email'];
 
+if (preg_match("/[^0-9a-z_]+/i", $table_prefix) ) {
+    die('<div class="ins_inner"><p>TABLE명 접두사는 영문자, 숫자, _ 만 입력하세요.</p><div class="inner_btn"><a href="./install_config.php">뒤로가기</a></div></div>');
+}
+
 if (preg_match("/[^0-9a-z_]+/i", $admin_id)) {
     die('<div class="ins_inner"><p>관리자 아이디는 영문자, 숫자, _ 만 입력하세요.</p><div class="inner_btn"><a href="./install_config.php">뒤로가기</a></div></div>');
 }
@@ -292,7 +296,7 @@ for ($i=0; $i<count($tmp_bo_table); $i++)
     // 게시판 테이블 생성
     $file = file("../".G5_ADMIN_DIR."/sql_write.sql");
     $file = get_db_create_replace($file);
-    $sql = implode($file, "\n");
+    $sql = implode("\n", $file);
 
     $create_table = $table_prefix.'write_' . $tmp_bo_table[$i];
 
@@ -340,10 +344,10 @@ $f = @fopen($file, 'a');
 
 fwrite($f, "<?php\n");
 fwrite($f, "if (!defined('_GNUBOARD_')) exit;\n");
-fwrite($f, "define('G5_MYSQL_HOST', '{$mysql_host}');\n");
-fwrite($f, "define('G5_MYSQL_USER', '{$mysql_user}');\n");
-fwrite($f, "define('G5_MYSQL_PASSWORD', '{$mysql_pass}');\n");
-fwrite($f, "define('G5_MYSQL_DB', '{$mysql_db}');\n");
+fwrite($f, "define('G5_MYSQL_HOST', '".addcslashes($mysql_host, "\\'")."');\n");
+fwrite($f, "define('G5_MYSQL_USER', '".addcslashes($mysql_user, "\\'")."');\n");
+fwrite($f, "define('G5_MYSQL_PASSWORD', '".addcslashes($mysql_pass, "\\'")."');\n");
+fwrite($f, "define('G5_MYSQL_DB', '".addcslashes($mysql_db, "\\'")."');\n");
 fwrite($f, "define('G5_MYSQL_SET_MODE', {$mysql_set_mode});\n\n");
 fwrite($f, "define('G5_TABLE_PREFIX', '{$table_prefix}');\n\n");
 fwrite($f, "\$g5['write_prefix'] = G5_TABLE_PREFIX.'write_'; // 게시판 테이블명 접두사\n\n");

lib/Cache/FileCache.class.php

@@ -67,8 +67,14 @@ class FileCache
 		{
 			return FALSE;
 		}
-
-		$data = unserialize(file_get_contents( $cache_file_path ));
+        
+        try{
+            $file_contents = file_get_contents($cache_file_path);
+            $file_ex = explode("\n\n", $file_contents);
+            $data = unserialize(base64_decode($file_ex[1]));
+        } catch(Exception $e){
+            $data = array('ttl'=>1, 'time'=>time() - 1000);
+        }
 
 		if ($data['ttl'] > 0 && time() > $data['time'] + $data['ttl'])
 		{
@@ -135,7 +141,10 @@ class FileCache
 			'data'		=> $data
 		);
 
-		if ($this->write_file($cache_file_path, serialize($contents)))
+        $cache_content = "<?php if (!defined('_GNUBOARD_')) exit; ?>\n\n";
+        $cache_content .= base64_encode(serialize($contents));
+
+		if ($this->write_file($cache_file_path, $cache_content))
 		{
 			chmod($cache_file_path, G5_FILE_PERMISSION);
 			return TRUE;
@@ -167,7 +176,7 @@ class FileCache
         if ($ttl !== null) {
             $expire = time() + $ttl;
         }
-        return serialize(array($data, $expire));
+        return base64_encode(serialize(array($data, $expire)));
     }
 
     /**
@@ -181,7 +190,7 @@ class FileCache
      */
     public function decode($data)
     {
-        return unserialize($data);
+        return unserialize(base64_decode($data));
     }
 }
 ?>

lib/common.lib.php

@@ -116,6 +116,19 @@ function goto_url($url)
 // 세션변수 생성
 function set_session($session_name, $value)
 {
+	global $g5;
+
+	static $check_cookie = null;
+	
+	if( $check_cookie === null ){
+		$cookie_session_name = session_name();
+		if( ! isset($g5['session_cookie_samesite']) && ! ($cookie_session_name && isset($_COOKIE[$cookie_session_name]) && $_COOKIE[$cookie_session_name]) && ! headers_sent() ){
+			@session_regenerate_id(false);
+		}
+
+		$check_cookie = 1;
+	}
+
     if (PHP_VERSION < '5.3.0')
         session_register($session_name);
     // PHP 버전별 차이를 없애기 위한 방법
@@ -733,6 +746,10 @@ function get_next_num($table)
 function get_group($gr_id, $is_cache=false)
 {
     global $g5;
+    
+    if( is_array($gr_id) ){
+        return array();
+    }
 
     static $cache = array();
 
@@ -1788,7 +1805,7 @@ function get_table_define($table, $crlf="\n")
 
     $schema_create .= $crlf . ') ENGINE=MyISAM DEFAULT CHARSET=utf8';
 
-    return $schema_create;
+    return get_db_create_replace($schema_create);
 } // end of the 'PMA_getTableDef()' function
 
 
@@ -2581,7 +2598,7 @@ class html_process {
                 if(!trim($js[1]))
                     continue;
 
-                $js[1] = preg_replace('#\.js([\'\"]?>)$#i', '.js?ver='.G5_JS_VER.'$1', $js[1]);
+                $js[1] = preg_replace('#\.js([\'\"]?>)<\/script>$#i', '.js?ver='.G5_JS_VER.'$1</script>', $js[1]);
 
                 $javascript .= $php_eol.$js[1];
                 $php_eol = PHP_EOL;
@@ -3009,6 +3026,9 @@ function clean_xss_tags($str, $check_entities=0)
         if( $check_entities ){
             $result = str_replace(array('&colon;', '&lpar;', '&rpar;', '&NewLine;', '&Tab;'), '', $result);
         }
+        
+        $result = preg_replace('#([^\p{L}]|^)(?:javascript|jar|applescript|vbscript|vbs|wscript|jscript|behavior|mocha|livescript|view-source)\s*:(?:.*?([/\\\;()\'">]|$))#ius',
+                '$1$2', $result);
 
         if((string)$result === (string)$str) break;
 
@@ -3022,11 +3042,50 @@ function clean_xss_tags($str, $check_entities=0)
 // XSS 어트리뷰트 태그 제거
 function clean_xss_attributes($str)
 {
-    $str = preg_replace('#(onabort|onactivate|onafterprint|onafterupdate|onbeforeactivate|onbeforecopy|onbeforecut|onbeforedeactivate|onbeforeeditfocus|onbeforepaste|onbeforeprint|onbeforeunload|onbeforeupdate|onblur|onbounce|oncellchange|onchange|onclick|oncontextmenu|oncontrolselect|oncopy|oncut|ondataavaible|ondatasetchanged|ondatasetcomplete|ondblclick|ondeactivate|ondrag|ondragdrop|ondragend|ondragenter|ondragleave|ondragover|ondragstart|ondrop|onerror|onerrorupdate|onfilterupdate|onfinish|onfocus|onfocusin|onfocusout|onhelp|onkeydown|onkeypress|onkeyup|onlayoutcomplete|onload|onlosecapture|onmousedown|onmouseenter|onmouseleave|onmousemove|onmoveout|onmouseover|onmouseup|onmousewheel|onmove|onmoveend|onmovestart|onpaste|onpropertychange|onreadystatechange|onreset|onresize|onresizeend|onresizestart|onrowexit|onrowsdelete|onrowsinserted|onscroll|onselect|onselectionchange|onselectstart|onstart|onstop|onsubmit|onunload)\\s*=\\s*\\\?".*?"#is', '', $str);
+    $xss_attributes_string = 'onAbort|onActivate|onAttribute|onAfterPrint|onAfterScriptExecute|onAfterUpdate|onAnimationCancel|onAnimationEnd|onAnimationIteration|onAnimationStart|onAriaRequest|onAutoComplete|onAutoCompleteError|onAuxClick|onBeforeActivate|onBeforeCopy|onBeforeCut|onBeforeDeactivate|onBeforeEditFocus|onBeforePaste|onBeforePrint|onBeforeScriptExecute|onBeforeUnload|onBeforeUpdate|onBegin|onBlur|onBounce|onCancel|onCanPlay|onCanPlayThrough|onCellChange|onChange|onClick|onClose|onCommand|onCompassNeedsCalibration|onContextMenu|onControlSelect|onCopy|onCueChange|onCut|onDataAvailable|onDataSetChanged|onDataSetComplete|onDblClick|onDeactivate|onDeviceLight|onDeviceMotion|onDeviceOrientation|onDeviceProximity|onDrag|onDragDrop|onDragEnd|onDragEnter|onDragLeave|onDragOver|onDragStart|onDrop|onDurationChange|onEmptied|onEnd|onEnded|onError|onErrorUpdate|onExit|onFilterChange|onFinish|onFocus|onFocusIn|onFocusOut|onFormChange|onFormInput|onFullScreenChange|onFullScreenError|onGotPointerCapture|onHashChange|onHelp|onInput|onInvalid|onKeyDown|onKeyPress|onKeyUp|onLanguageChange|onLayoutComplete|onLoad|onLoadedData|onLoadedMetaData|onLoadStart|onLoseCapture|onLostPointerCapture|onMediaComplete|onMediaError|onMessage|onMouseDown|onMouseEnter|onMouseLeave|onMouseMove|onMouseOut|onMouseOver|onMouseUp|onMouseWheel|onMove|onMoveEnd|onMoveStart|onMozFullScreenChange|onMozFullScreenError|onMozPointerLockChange|onMozPointerLockError|onMsContentZoom|onMsFullScreenChange|onMsFullScreenError|onMsGestureChange|onMsGestureDoubleTap|onMsGestureEnd|onMsGestureHold|onMsGestureStart|onMsGestureTap|onMsGotPointerCapture|onMsInertiaStart|onMsLostPointerCapture|onMsManipulationStateChanged|onMsPointerCancel|onMsPointerDown|onMsPointerEnter|onMsPointerLeave|onMsPointerMove|onMsPointerOut|onMsPointerOver|onMsPointerUp|onMsSiteModeJumpListItemRemoved|onMsThumbnailClick|onOffline|onOnline|onOutOfSync|onPage|onPageHide|onPageShow|onPaste|onPause|onPlay|onPlaying|onPointerCancel|onPointerDown|onPointerEnter|onPointerLeave|onPointerLockChange|onPointerLockError|onPointerMove|onPointerOut|onPointerOver|onPointerUp|onPopState|onProgress|onPropertyChange|onqt_error|onRateChange|onReadyStateChange|onReceived|onRepeat|onReset|onResize|onResizeEnd|onResizeStart|onResume|onReverse|onRowDelete|onRowEnter|onRowExit|onRowInserted|onRowsDelete|onRowsEnter|onRowsExit|onRowsInserted|onScroll|onSearch|onSeek|onSeeked|onSeeking|onSelect|onSelectionChange|onSelectStart|onStalled|onStorage|onStorageCommit|onStart|onStop|onShow|onSyncRestored|onSubmit|onSuspend|onSynchRestored|onTimeError|onTimeUpdate|onTimer|onTrackChange|onTransitionEnd|onToggle|onTouchCancel|onTouchEnd|onTouchLeave|onTouchMove|onTouchStart|onTransitionCancel|onTransitionEnd|onUnload|onURLFlip|onUserProximity|onVolumeChange|onWaiting|onWebKitAnimationEnd|onWebKitAnimationIteration|onWebKitAnimationStart|onWebKitFullScreenChange|onWebKitFullScreenError|onWebKitTransitionEnd|onWheel';
+    
+    do {
+        $count = $temp_count = 0;
+
+        $str = preg_replace(
+            '/(.*)(?:' . $xss_attributes_string . ')(?:\s*=\s*)(?:\'(?:.*?)\'|"(?:.*?)")(.*)/ius',
+            '$1-$2-$3-$4',
+            $str,
+            -1,
+            $temp_count
+        );
+        $count += $temp_count;
+
+        $str = preg_replace(
+            '/(.*)(?:' . $xss_attributes_string . ')\s*=\s*(?:[^\s>]*)(.*)/ius',
+            '$1$2',
+            $str,
+            -1,
+            $temp_count
+        );
+        $count += $temp_count;
+
+    } while ($count);
 
     return $str;
 }
 
+function clean_relative_paths($path){
+    $path_len = strlen($path);
+    
+    $i = 0;
+    while($i <= $path_len){
+        $result = str_replace('../', '', str_replace('\\', '/', $path));
+
+        if((string)$result === (string)$path) break;
+
+        $path = $result;
+        $i++;
+    }
+
+    return $path;
+}
+
 // unescape nl 얻기
 function conv_unescape_nl($str)
 {
@@ -3548,7 +3607,7 @@ function get_member_profile_img($mb_id='', $width='', $height='', $alt='profile_
             // 프로필 이미지가 없을때 기본 이미지
             $no_profile_img = (defined('G5_THEME_NO_PROFILE_IMG') && G5_THEME_NO_PROFILE_IMG) ? G5_THEME_NO_PROFILE_IMG : G5_NO_PROFILE_IMG;
             $tmp = array();
-            preg_match( '/src="([^"]*)"/i', $foo, $tmp );
+            preg_match( '/src="([^"]*)"/i', $no_profile_img, $tmp );
             $no_profile_cache = $src = isset($tmp[1]) ? $tmp[1] : G5_IMG_URL.'/no_profile.gif';
         }
     }
@@ -3580,6 +3639,36 @@ function get_head_title($title){
     return $title;
 }
 
+function is_sms_send($is_type=''){
+    global $config;
+    
+    $is_sms_send = false;
+    
+    // 토큰키를 사용한다면
+    if(isset($config['cf_icode_token_key']) && $config['cf_icode_token_key']){
+        $is_sms_send = true;
+    } else if($config['cf_icode_id'] && $config['cf_icode_pw']) {
+        // 충전식일 경우 잔액이 있는지 체크
+
+        $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']);
+
+        if($userinfo['code'] == 0) {
+            if($userinfo['payment'] == 'C') { // 정액제
+                $is_sms_send = true;
+            } else {
+                $minimum_coin = 100;
+                if(defined('G5_ICODE_COIN'))
+                    $minimum_coin = intval(G5_ICODE_COIN);
+
+                if((int)$userinfo['coin'] >= $minimum_coin)
+                    $is_sms_send = true;
+            }
+        }
+    }
+
+    return $is_sms_send;
+}
+
 function is_use_email_certify(){
     global $config;
 
@@ -3659,10 +3748,10 @@ function is_include_path_check($path='', $is_input='')
             // 장태진 @jtjisgod <jtjisgod@gmail.com> 추가
             // 보안 목적 : rar wrapper 차단
 
-            if( stripos($path, 'rar:') !== false || stripos($path, 'php:') !== false || stripos($path, 'zlib:') !== false || stripos($path, 'bzip2:') !== false || stripos($path, 'zip:') !== false || stripos($path, 'data:') !== false || stripos($path, 'phar:') !== false || stripos($path, 'file:') !== false ){
+            if( stripos($path, 'rar:') !== false || stripos($path, 'php:') !== false || stripos($path, 'zlib:') !== false || stripos($path, 'bzip2:') !== false || stripos($path, 'zip:') !== false || stripos($path, 'data:') !== false || stripos($path, 'phar:') !== false || stripos($path, 'file:') !== false || stripos($path, '://') !== false ){
                 return false;
             }
-            
+
             $replace_path = str_replace('\\', '/', $path);
             $slash_count = substr_count(str_replace('\\', '/', $_SERVER['SCRIPT_NAME']), '/');
             $peer_count = substr_count($replace_path, '../');
@@ -3673,12 +3762,12 @@ function is_include_path_check($path='', $is_input='')
 
             try {
                 // whether $path is unix or not
-                $unipath = strlen($path)==0 || $path{0}!='/';
+                $unipath = strlen($path)==0 || substr($path, 0, 1) != '/';
                 $unc = substr($path,0,2)=='\\\\'?true:false;
                 // attempts to detect if path is relative in which case, add cwd
                 if(strpos($path,':') === false && $unipath && !$unc){
                     $path=getcwd().DIRECTORY_SEPARATOR.$path;
-                    if($path{0}=='/'){
+                    if(substr($path, 0, 1) == '/'){
                         $unipath = false;
                     }
                 }
@@ -3731,6 +3820,10 @@ function is_include_path_check($path='', $is_input='')
     return true;
 }
 
+function filter_input_include_path($path){
+    return str_replace('//', '/', $path);
+}
+
 function option_array_checked($option, $arr=array()){
     $checked = '';
 

lib/get_data.lib.php

@@ -329,7 +329,7 @@ function get_db_create_replace($sql_str){
 function get_class_encrypt(){
     static $cache;
 
-    if( $cache && is_object($obj) ){
+    if( $cache && is_object($cache) ){
         return $cache;
     }
 

lib/icode.lms.lib.php

@@ -4,12 +4,19 @@ if (!defined('_GNUBOARD_')) exit;
 // 요금제에 따른 port 구분
 function get_icode_port_type($id, $pw)
 {
+    global $config;
+    
+    // 토큰키를 사용한다면 true 로 리턴
+    if( isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'] ){
+        return 1;
+    }
+
     $userinfo = get_icode_userinfo($id, $pw);
 
     if($userinfo['payment'] == 'A') { // 충전제
         return 1;
     } else if($userinfo['payment'] == 'C') { // 정액제
-        return 1;
+        return 2;
     } else {
         return false;
     }
@@ -28,10 +35,21 @@ class LMS {
 	var $socket_portcode;
 	var $Data = array();
 	var $Result = array();
+    var $icode_key;
 
 	// SMS 서버 접속
 	function SMS_con($host, $id, $pw, $portcode) {
-		$this->socket_host	    = $host;
+        global $config;
+        
+        // 토큰키를 사용한다면
+        if(isset($config['cf_icode_token_key']) && $config['cf_icode_token_key']){
+            $this->icode_key = $config['cf_icode_token_key'];
+            $this->socket_host = ICODE_JSON_SOCKET_HOST;
+            $this->socket_port = ICODE_JSON_SOCKET_PORT;
+        } else {
+            $this->socket_host	    = $host;
+        }
+
 		$this->socket_portcode	= $portcode;
 		$this->icode_id		    = FillSpace($id, 10);
 		$this->icode_pw		    = FillSpace($pw, 10);
@@ -43,32 +61,63 @@ class LMS {
 	}
 
 	function Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate="", $nCount) {
+        global $config;
 
 		// 문자 타입별 Port 설정.
 		$sendType = strlen($strData) > 90 ? 1 : 0; // 0: SMS / 1: LMS
 
-		/* 개발 완료 후 아래 포트를 rand 함수를 이용하는 라인으로 변경 바랍니다.*/
+        // 토큰키를 사용한다면
+        if( isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'] === $this->icode_key ){
+            
+            // 개행치환
+            $strData = preg_replace("/\r\n/","\n",$strData);
+            $strData = preg_replace("/\r/","\n",$strData);
 
-		// 충전식
-		if ($this->socket_portcode == 1) {
-				if($sendType && $sendType == 1) {
-					//$this->socket_port = 8200;		// LMS
-					$this->socket_port=(int)rand(8200,8201);	// LMS
-				} else {
-					//$this->socket_port = 6295;		// SMS
-					$this->socket_port=(int)rand(6295,6297);	// SMS
-				}
-		}
-		// 정액제
-		else {
-			if($sendType && $sendType == 1) {
-				//$this->socket_port = 8300; //	LMS
-				$this->socket_port=(int)rand(8300,8301); //	LMS
-			} else {
-				//$this->socket_port = 6291; //	SMS
-				$this->socket_port=(int)rand(6291,6293); //	SMS
-			}
-		}
+            $checks = array('msg'=>$strData, 'subject'=>$strSubject);
+            $tmps = array();
+
+            foreach( $checks as $k=>$v ){
+
+                // 문자 내용이 euc-kr 인지 체크합니다.
+                $enc = mb_detect_encoding($v, array('EUC-KR', 'UTF-8'));
+
+                // 문자 내용이 euc-kr 이면 json_encode 에서 깨지기 때문에 utf-8 로 변환합니다.
+                $tmps[$k] = ($enc === 'EUC-KR') ? iconv_utf8($v) : $v;
+            }
+
+            $strData = $tmps['msg'];
+            $strSubject = $tmps['subject'];
+
+            // 문자 타입별 Port 설정.
+            $sendType = strlen($strData)>90 ? 1 : 0; // 0: SMS / 1: LMS
+            if($sendType==0) $strSubject = "";
+            
+            $is_use_json = true;
+
+        } else {
+            /* 개발 완료 후 아래 포트를 rand 함수를 이용하는 라인으로 변경 바랍니다.*/
+
+            // 충전식
+            if ($this->socket_portcode == 1) {
+                    if($sendType && $sendType == 1) {
+                        //$this->socket_port = 8200;		// LMS
+                        $this->socket_port=(int)rand(8200,8201);	// LMS
+                    } else {
+                        //$this->socket_port = 6295;		// SMS
+                        $this->socket_port=(int)rand(6295,6297);	// SMS
+                    }
+            }
+            // 정액제
+            else {
+                if($sendType && $sendType == 1) {
+                    //$this->socket_port = 8300; //	LMS
+                    $this->socket_port=(int)rand(8300,8301); //	LMS
+                } else {
+                    //$this->socket_port = 6291; //	SMS
+                    $this->socket_port=(int)rand(6291,6293); //	SMS
+                }
+            }
+        }
 
 		$strCallBack	= FillSpace($strCallBack, 11);       // 회신번호
 		$strDate			= FillSpace($strDate, 12);           // 즉시(12byte 공백), 예약전송(YmdHi)
@@ -88,9 +137,9 @@ class LMS {
 			$strSubject = str_replace(">", "]", $strSubject);
 
 			$strSubject = FillSpace($strSubject,30);
-			$strData	= FillSpace(CutChar($strData,1500),1500);
+			$strData	= $is_use_json ? CutCharUtf8($strData, G5_ICODE_JSON_MAX_LENGTH) : FillSpace(CutChar($strData, G5_ICODE_LMS_MAX_LENGTH), G5_ICODE_LMS_MAX_LENGTH);
 		} else if (!$strURL) {
-			$strData	= FillSpace(CutChar($strData,90),90);
+			$strData	= $is_use_json ? CutCharUtf8($strData, G5_ICODE_JSON_MAX_LENGTH) : FillSpace(CutChar($strData,90),90);
 			$strCaller  = FillSpace($strCaller,10);
 		} else {
 			$strURL		= FillSpace($strURL,50);
@@ -102,39 +151,85 @@ class LMS {
 
 		for ($i=0; $i<$nCount; $i++) {
 
-			$strDest[$i] = FillSpace($strDest[$i],11);
-			if ($sendType && $sendType == 1) {
-				$this->Data[$i]	= '01144 '.$this->icode_id.$this->icode_pw.$strDest[$i].$strCallBack.$strSubject.$strDate.$strData;
-			} else if (!$strURL) {
-				$this->Data[$i]	= '01144 '.$this->icode_id.$this->icode_pw.$strDest[$i].$strCallBack.$strCaller.$strDate.$strData;
-			} else {
-				$strData = FillSpace(CheckCallCenter($strURL, $strDest[$i], $strData),80);
-				$this->Data[$i]	= '05173 '.$this->icode_id.$this->icode_pw.$strDest[$i].$strCallBack.$strURL.$strDate.$strData;
-			}
+            if($is_use_json) {
+                $strDest[$i] = $strDest[$i];
+                $list = array(
+                    "key" => $this->icode_key, 
+                    "tel" => $strDest[$i],
+                    "cb" => $strCallBack,
+                    "msg" => $strData,
+                    "title" => $strSubject?$strSubject:"",
+                    "date" => $strDate?$strDate:""
+                );
+                $packet = json_encode($list);
+
+                if( !$packet ){ // json_encode가 잘못되었으면 보내지 않습니다.
+                    continue;
+                }
+                $this->Data[$i]    = '06'.str_pad(strlen($packet), 4, "0", STR_PAD_LEFT).$packet;
+            } else {
+                $strDest[$i] = FillSpace($strDest[$i],11);
+                if ($sendType && $sendType == 1) {
+                    $this->Data[$i]	= '01144 '.$this->icode_id.$this->icode_pw.$strDest[$i].$strCallBack.$strSubject.$strDate.$strData;
+                } else if (!$strURL) {
+                    $this->Data[$i]	= '01144 '.$this->icode_id.$this->icode_pw.$strDest[$i].$strCallBack.$strCaller.$strDate.$strData;
+                } else {
+                    $strData = FillSpace(CheckCallCenter($strURL, $strDest[$i], $strData),80);
+                    $this->Data[$i]	= '05173 '.$this->icode_id.$this->icode_pw.$strDest[$i].$strCallBack.$strURL.$strDate.$strData;
+                }
+            }
 		}
 		return true;
 	}
 
 
 	function Send() {
-		$fsocket = fsockopen($this->socket_host,$this->socket_port, $errno, $errstr, 2);
-		if (!$fsocket) return false;
-		set_time_limit(60);
+        global $config;
 
-		foreach($this->Data as $puts) {
-			fputs($fsocket, $puts);
-			while(!$gets) { $gets = fgets($fsocket,30); }
-			$dest = substr($puts,26,11);
-			if (substr($gets,0,19) == "0223  00".$dest) {
-				$this->Result[] = $dest.":".substr($gets,19,10);
-			} else {
-				$this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
-			}
-			$gets = "";
-		}
+        // 토큰키를 사용한다면
+        if( isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'] === $this->icode_key ){
+            $fsocket = @fsockopen($this->socket_host,$this->socket_port, $errno, $errstr, 2);
+            if (!$fsocket) return false;
+            set_time_limit(300);
 
-		fclose($fsocket);
-		$this->Data = "";
+            foreach($this->Data as $puts) {
+                fputs($fsocket, $puts);
+                while(!$gets) { $gets = fgets($fsocket,32); }
+                $json = json_decode(substr($puts,6), true);
+
+                $dest = $json["tel"];
+                if (substr($gets,0,20) == "0225  00".FillSpace($dest,12)) {
+                    $this->Result[] = $dest.":".substr($gets,20,11);
+
+                } else {
+                    $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
+                    if(substr($gets,6,2) >= "80") break;
+                }
+                $gets = "";
+            }
+
+            fclose($fsocket);
+        } else {
+            $fsocket = @fsockopen($this->socket_host,$this->socket_port, $errno, $errstr, 2);
+            if (!$fsocket) return false;
+            set_time_limit(300);
+
+            foreach($this->Data as $puts) {
+                fputs($fsocket, $puts);
+                while(!$gets) { $gets = fgets($fsocket,30); }
+                $dest = substr($puts,26,11);
+                if (substr($gets,0,19) == "0223  00".$dest) {
+                    $this->Result[] = $dest.":".substr($gets,19,10);
+                } else {
+                    $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
+                }
+                $gets = "";
+            }
+
+            fclose($fsocket);
+        }
+
+		$this->Data = array();
 		return true;
 	}
 }
@@ -168,6 +263,24 @@ function CutChar($word, $cut) {
 	return $word;
 }
 
+function CutCharUtf8($word, $cut) {
+  preg_match_all('/[\xE0-\xFF][\x80-\xFF]{2}|./', $word, $match); // target for BMP
+
+  $m = $match[0];
+  $slen = strlen($word); // length of source string
+  if ($slen <= $cut) return $word;
+  
+  $ret = array();
+  $count = 0;
+  for ($i=0; $i < $cut; $i++) {
+      $count += (strlen($m[$i]) > 1)?2:1;
+      if ($count > $cut) break;
+      $ret[] = $m[$i];
+  }
+
+  return join('', $ret);
+}
+
 /**
 * 수신번호의 값이 정확한 값인지 확인합니다.
 *
@@ -183,7 +296,6 @@ function CheckCommonTypeDest($strDest, $nCount) {
 	}
 }
 
-
 /**
 * 회신번호 유효성 여부조회 *
 * @param		string callback	회신번호

lib/icode.sms.lib.php

@@ -44,8 +44,20 @@ class SMS {
 	var $SMS_Port;
 	var $Data = array();
 	var $Result = array();
+    var $icode_key;
+    var $socket_port;
+    var $socket_host;
 
 	function SMS_con($sms_server,$sms_id,$sms_pw,$port) {
+        global $config;
+
+        // 토큰키를 사용한다면
+        if(isset($config['cf_icode_token_key']) && $config['cf_icode_token_key']){
+            $this->icode_key = $config['cf_icode_token_key'];
+            $this->socket_host = ICODE_JSON_SOCKET_HOST;
+            $this->socket_port = ICODE_JSON_SOCKET_PORT;
+        }
+
 		$this->ID=$sms_id;		// 계약 후 지정
 		$this->PWD=$sms_pw;		// 계약 후 지정
 		$this->SMS_Server=$sms_server;
@@ -60,25 +72,82 @@ class SMS {
 	}
 
 	function Add($dest, $callBack, $Caller, $msg, $rsvTime="") {
-        global $g5;
+        global $g5, $config;
 
-		// 내용 검사 1
-		$Error = CheckCommonType($dest, $rsvTime);
-		if ($Error) return $Error;
-		// 내용 검사 2
-		//if ( eregi("[^0-9]",$callBack) ) return "회신 전화번호가 잘못되었습니다";
-		if ( preg_match("/[^0-9]/i",$callBack) ) return "회신 전화번호가 잘못되었습니다";
+        // 토큰키를 사용한다면
+        if( isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'] === $this->icode_key ){
 
-        $msg=cut_char($msg,80); // 80자 제한
-		// 보낼 내용을 배열에 집어넣기
-		$dest = spacing($dest,11);
-		$callBack = spacing($callBack,11);
-		$Caller = spacing($Caller,10);
-		$rsvTime = spacing($rsvTime,12);
-		$msg = spacing($msg,80);
+            // 내용 검사 1
+            $Error = CheckCommonType($dest, $rsvTime);
+            if ($Error) return $Error;
+            if ( preg_match("/[^0-9]/i",$callBack) ) return "회신 전화번호가 잘못되었습니다";
 
-		$this->Data[] = '01144 '.$this->ID.$this->PWD.$dest.$callBack.$Caller.$rsvTime.$msg;
-		return "";
+            // 개행치환
+            $msg = preg_replace("/\r\n/", "\n", $msg);
+            $msg = preg_replace("/\r/", "\n", $msg);
+            // 90byte 이내는 SMS, 90 ~ 2000 byte 는 LMS 그 이상은 절삭 되어 LMS로 발송
+            // SMS 이기 때문에 90byte 이내로 합니다.
+            $msg=cut_char($msg, 90);
+            $msg = spacing($msg, 90);
+
+            // 한글 깨진것이 있는지 체크합니다.
+            if( preg_match('/^([\x00-\x7e]|.{2})*/', $msg, $z) ){
+                $msg = $z[0];
+            }
+
+            // 문자 내용이 euc-kr 인지 체크합니다.
+            $enc = mb_detect_encoding($msg, array('EUC-KR', 'UTF-8'));
+
+            // 문자 내용이 euc-kr 이면 json_encode 에서 깨지기 때문에  utf-8 로 변환합니다.
+            if($enc === 'EUC-KR'){
+                $msg = iconv_utf8($msg);
+            }
+            
+            // 보낼 내용을 배열에 집어넣기
+            $dest = spacing($dest,11);
+            $callBack = spacing($callBack,11);
+            $Caller = spacing($Caller,10);
+            $rsvTime = $rsvTime ? spacing($rsvTime,12) : '';
+
+            $list = array(
+                "key" => $this->icode_key, 
+                "tel" => $dest,
+                "cb" => $callBack,
+                "msg" => $msg,
+                "title" => "",      //SMS 의 경우 타이틀을 지정할수 없습니다.
+                "date" => $rsvTime
+            );
+
+            $packet = json_encode($list);
+
+            if( !$packet ){ // json_encode가 잘못되었으면 보내지 않습니다.
+                return "json_encode error";
+            }
+            $this->Data[]    = '06'.str_pad(strlen($packet), 4, "0", STR_PAD_LEFT).$packet;
+
+            return ''; 
+
+        } else {
+            // 기존 OLD SMS
+
+            // 내용 검사 1
+            $Error = CheckCommonType($dest, $rsvTime);
+            if ($Error) return $Error;
+            // 내용 검사 2
+            //if ( eregi("[^0-9]",$callBack) ) return "회신 전화번호가 잘못되었습니다";
+            if ( preg_match("/[^0-9]/i",$callBack) ) return "회신 전화번호가 잘못되었습니다";
+
+            $msg=cut_char($msg,80); // 80자 제한
+            // 보낼 내용을 배열에 집어넣기
+            $dest = spacing($dest,11);
+            $callBack = spacing($callBack,11);
+            $Caller = spacing($Caller,10);
+            $rsvTime = spacing($rsvTime,12);
+            $msg = spacing($msg,80);
+
+            $this->Data[] = '01144 '.$this->ID.$this->PWD.$dest.$callBack.$Caller.$rsvTime.$msg;
+            return "";
+        }
 	}
 
 	function AddURL($dest, $callBack, $URL, $msg, $rsvTime="") {
@@ -121,26 +190,53 @@ class SMS {
 		return "";
 	}
 
-	function Send () {
-		$fp=@fsockopen(trim($this->SMS_Server),trim($this->SMS_Port), $errno, $errstr, 2);
-		if (!$fp) return false;
-		set_time_limit(60);
+    function Send() {
+        global $config;
 
-		## php4.3.10일경우
-        ## zend 최신버전으로 업해주세요..
-        ## 또는 122번째 줄을 $this->Data as $tmp => $puts 로 변경해 주세요.
+        // 토큰키를 사용한다면
+        if( isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'] === $this->icode_key ){
+            $fsocket = @fsockopen(trim($this->socket_host),trim($this->socket_port), $errno, $errstr, 2);
+            if (!$fsocket) return false;
+            set_time_limit(300);
 
-		foreach($this->Data as $puts) {
-			$dest = substr($puts,26,11);
-			fputs($fp,$puts);
-			while(!$gets) { $gets=fgets($fp,30); }
-			if (substr($gets,0,19)=="0223  00".$dest) $this->Result[]=$dest.":".substr($gets,19,10);
-			else $this->Result[$dest]=$dest.":Error";
-			$gets="";
-		}
-		fclose($fp);
-		$this->Data="";
-		return true;
+            foreach($this->Data as $puts) {
+                fputs($fsocket, $puts);
+                while(!$gets) { $gets = fgets($fsocket,32); }
+                $json = json_decode(substr($puts,6), true);
+
+                $dest = $json["tel"];
+                if (substr($gets,0,20) == "0225  00".spacing($dest,12)) {
+                    $this->Result[] = $dest.":".substr($gets,20,11);
+
+                } else {
+                    $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
+                    if(substr($gets,6,2) >= "80") break;
+                }
+                $gets = "";
+            }
+            fclose($fsocket);
+
+        } else {
+
+            $fp=@fsockopen(trim($this->SMS_Server),trim($this->SMS_Port));
+            if (!$fp) return false;
+            set_time_limit(300);
+
+            ## php4.3.10일경우
+            ## zend 최신버전으로 업해주세요..
+            ## 또는 122번째 줄을 $this->Data as $tmp => $puts 로 변경해 주세요.
+
+            foreach($this->Data as $puts) {
+                $dest = substr($puts,26,11);
+                fputs($fp,$puts);
+                while(!$gets) { $gets=fgets($fp,30); }
+                if (substr($gets,0,19)=="0223  00".$dest) $this->Result[]=$dest.":".substr($gets,19,10);
+                else $this->Result[$dest]=$dest.":Error";
+                $gets="";
+            }
+            fclose($fp);
+        }
+		$this->Data=array();
 	}
 }
 ?>

lib/latest.lib.php

@@ -31,7 +31,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
         }
     }
 
-    $caches = null;
+    $caches = false;
 
     if(G5_USE_CACHE) {
         $cache_file_name = "latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}-".g5_cache_secret_key();

lib/pbkdf2.compat.php

@@ -46,7 +46,7 @@ function create_hash($password, $force_compat = false)
 {
     // Generate the salt.
     
-    if (function_exists('mcrypt_create_iv')) {
+    if (function_exists('mcrypt_create_iv') && version_compare( PHP_VERSION, '7.2' , '<' ) ) {
         $salt = base64_encode(mcrypt_create_iv(PBKDF2_COMPAT_SALT_BYTES, MCRYPT_DEV_URANDOM));
     } elseif (@file_exists('/dev/urandom') && $fp = @fopen('/dev/urandom', 'r')) {
         $salt = base64_encode(fread($fp, PBKDF2_COMPAT_SALT_BYTES));

lib/thumbnail.lib.php

@@ -306,8 +306,11 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
         if(!$thumb_height) {
             $thumb_height = round(($thumb_width * $size[1]) / $size[0]);
         } else {
-            if($size[0] < $thumb_width || $size[1] < $thumb_height)
+            if($crop_mode === 'center' && ($size[0] > $thumb_width || $size[1] > $thumb_height)){
+                $is_large = true;
+            } else if($size[0] < $thumb_width || $size[1] < $thumb_height) {
                 $is_large = false;
+            }
         }
     } else {
         if($thumb_height) {

lib/uri.lib.php

@@ -229,7 +229,8 @@ function exist_seo_url($type, $seo_title, $write_table, $sql_id=0){
     global $g5;
 
     $exists_title = '';
-    $sql_id = preg_replace('/[^a-z0-9_]/i', '', $sql_id);
+    $sql_id = preg_replace('/[^a-z0-9_\-]/i', '', $sql_id);
+	// 영카트 상품코드의 경우 - 하이픈이 들어가야 함
 
     if( $type === 'bbs' ){
         $sql = "select wr_seo_title FROM {$write_table} WHERE wr_seo_title = '".sql_real_escape_string($seo_title)."' AND wr_id <> '$sql_id' limit 1";

mobile/skin/board/basic/style.css

@@ -85,6 +85,7 @@
 .more_opt {display:none;position:absolute;top:50px;right:7px;background:#fff;border:1px solid #b8bfc4;z-index:999}
 .more_opt:before {content:"";position:absolute;top:-8px;right:6px;width:0;height:0;border-style:solid;border-width:0 6px 8px 6px;border-color:transparent transparent #b8bfc4 transparent}
 .more_opt:after {content:"";position:absolute;top:-6px;right:6px;width:0;height:0;border-style:solid;border-width:0 6px 8px 6px;border-color:transparent transparent #fff transparent}
+.more_opt.is_list_btn{width:90px}
 .more_opt li {display:block;border-bottom:1px solid #f1f1f1;padding:10px;margin:0;color:#6b757c;text-align:left}
 .more_opt li:last-child {border-bottom:0}
 .more_opt li button, .more_opt li a {width:100%;border:0;background:#fff;color:#6b757c}
@@ -299,7 +300,7 @@
 .bo_vc_w_wr:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_vc_w .bo_vc_secret {display:block}
 
-#bo_vc_send_sns {display:block;float:left}
+#bo_vc_send_sns {display:block;margin-bottom:10px}
 #bo_vc_sns {display:block;margin:0;padding:0;list-style:none;zoom:1}
 #bo_vc_sns:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_vc_sns li {float:left;margin:0 5px 0 0}

mobile/skin/board/basic/view.skin.php

@@ -143,7 +143,7 @@ jQuery(function($){
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) {
          ?>
             <li>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
                     <i class="fa fa-download" aria-hidden="true"></i>
                     <strong><?php echo $view['file'][$i]['source'] ?></strong>
                     <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)

mobile/skin/board/basic/view_comment.skin.php

@@ -22,6 +22,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 		$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $str);
 		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
 		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
+        $is_comment_reply_edit = ($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) ? 1 : 0;
     ?>
     <article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-bottom-color:#f8f8f8"<?php } ?>>
         <div class="comment_inner">
@@ -37,6 +38,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                 <?php
                 include(G5_SNS_PATH."/view_comment_list.sns.skin.php");
                 ?>
+                <?php if( $is_comment_reply_edit ){ ?>
                 <div class="bo_vl_opt">
                     <button type="button" class="btn_cm_opt btn_b03 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">댓글 옵션</span></button>
                     <ul class="bo_vc_act">
@@ -45,6 +47,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                         <?php if ($list[$i]['is_del']) { ?><li><a href="<?php echo $list[$i]['del_link']; ?>" onclick="return comment_delete();">삭제</a></li><?php } ?>
                     </ul>
                 </div>
+                <?php } ?>
                 <script>
                 $(function() {			    
                     // 댓글 옵션창 열기

mobile/skin/board/gallery/style.css

@@ -74,6 +74,7 @@
 .more_opt {display:none;position:absolute;top:50px;right:7px;background:#fff;border:1px solid #b8bfc4;z-index:999}
 .more_opt:before {content:"";position:absolute;top:-8px;right:6px;width:0;height:0;border-style:solid;border-width:0 6px 8px 6px;border-color:transparent transparent #b8bfc4 transparent}
 .more_opt:after {content:"";position:absolute;top:-6px;right:6px;width:0;height:0;border-style:solid;border-width:0 6px 8px 6px;border-color:transparent transparent #fff transparent}
+.more_opt.is_list_btn{width:90px}
 .more_opt li {display:block;border-bottom:1px solid #f1f1f1;padding:10px;margin:0;color:#6b757c;text-align:left}
 .more_opt li:last-child {border-bottom:0}
 .more_opt li button, .more_opt li a {width:100%;border:0;background:#fff;color:#6b757c}
@@ -331,7 +332,7 @@
 .bo_vc_w_wr:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_vc_w .bo_vc_secret {display:block}
 
-#bo_vc_send_sns {display:block;float:left}
+#bo_vc_send_sns {display:block;margin-bottom:10px}
 #bo_vc_sns {display:block;margin:0;padding:0;list-style:none;zoom:1}
 #bo_vc_sns:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_vc_sns li {float:left;margin:0 5px 0 0}

mobile/skin/board/gallery/view.skin.php

@@ -145,7 +145,7 @@ jQuery(function($){
             if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) {
          ?>
             <li>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
                     <i class="fa fa-download" aria-hidden="true"></i>
                     <strong><?php echo $view['file'][$i]['source'] ?></strong>
                     <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)

mobile/skin/board/gallery/view_comment.skin.php

@@ -22,6 +22,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 		$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $str);
 		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
 		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
+        $is_comment_reply_edit = ($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) ? 1 : 0;
     ?>
     <article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-bottom-color:#f8f8f8"<?php } ?>>
         <div class="comment_inner">
@@ -37,6 +38,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                 <?php
                 include(G5_SNS_PATH."/view_comment_list.sns.skin.php");
                 ?>
+                <?php if( $is_comment_reply_edit ){ ?>
                 <div class="bo_vl_opt">
                     <button type="button" class="btn_cm_opt btn_b03 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">댓글 옵션</span></button>
                     <ul class="bo_vc_act">
@@ -45,6 +47,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                         <?php if ($list[$i]['is_del']) { ?><li><a href="<?php echo $list[$i]['del_link']; ?>" onclick="return comment_delete();">삭제</a></li><?php } ?>
                     </ul>
                 </div>
+                <?php } ?>
                 <script>
                 $(function() {			    
                     // 댓글 옵션창 열기

mobile/skin/member/basic/memo_view.skin.php

@@ -39,7 +39,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 						<li class="memo_view_nick"><?php echo $nick ?></li>
 						<li class="memo_view_date"><span class="sound_only"><?php echo $kind_date ?>시간</span><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $memo['me_send_datetime'] ?></li> 
 						<li class="memo_op_btn list_btn"><a href="<?php echo $list_link ?>" class="btn_b01 btn"><i class="fa fa-list" aria-hidden="true"></i><span class="sound_only">목록</span></a></li>
-						<li class="memo_op_btn del_btn"><a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;" class="memo_del btn_b01 btn"><i class="fa fa-trash-o" aria-hidden="true"></i> <span class="sound_only">삭제</span></a></li>	
+						<li class="memo_op_btn del_btn"><a href="<?php echo $del_link; ?>" onclick="del(this.href); return false;" class="memo_del btn_b01 btn"><i class="fa fa-trash-o" aria-hidden="true"></i> <span class="sound_only">삭제</span></a></li>	
 					</ul>
                     <div class="memo_btn">
                     	<?php if($prev_link) {  ?>

mobile/skin/member/basic/register_result.skin.php

@@ -39,7 +39,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
     </div>
 
     <div class="btn_confirm">
-        <a href="<?php echo G5_URL ?>/"">메인으로</a>
+        <a href="<?php echo G5_URL ?>/">메인으로</a>
     </div>
 
 </div>

mobile/skin/qa/basic/view.skin.php

@@ -99,7 +99,7 @@ $(".btn_more_opt").on("click", function() {
             for ($i=0; $i<$view['download_count']; $i++) {
              ?>
                 <li>
-                    <a href="<?php echo $view['download_href'][$i];  ?>" class="view_file_download">
+                    <a href="<?php echo $view['download_href'][$i];  ?>" class="view_file_download" download>
                         <img src="<?php echo $qa_skin_url ?>/img/icon_file.gif" alt="첨부">
                         <strong><?php echo $view['download_source'][$i] ?></strong>
                     </a>

plugin/okname/hpcert2.php

@@ -21,15 +21,15 @@ require('./hpcert.config.php');
 **************************************************************************/
 
 /* 공통 리턴 항목 */
-//$idcfMbrComCd           =   $_POST['idcf_mbr_com_cd'];      // 고객사코드
+//$idcfMbrComCd           =   $_REQUEST['idcf_mbr_com_cd'];      // 고객사코드
 $idcfMbrComCd           =   $memId;
-$hsCertSvcTxSeqno       =   $_POST['hs_cert_svc_tx_seqno']; // 거래번호
-$rqstSiteNm             =   $_POST['rqst_site_nm'];         // 접속도메인
-$hsCertRqstCausCd       =   $_POST['hs_cert_rqst_caus_cd']; // 인증요청사유코드 2byte  (00:회원가입, 01:성인인증, 02:회원정보수정, 03:비밀번호찾기, 04:상품구매, 99:기타)
+$hsCertSvcTxSeqno       =   $_REQUEST['hs_cert_svc_tx_seqno']; // 거래번호
+$rqstSiteNm             =   $_REQUEST['rqst_site_nm'];         // 접속도메인
+$hsCertRqstCausCd       =   $_REQUEST['hs_cert_rqst_caus_cd']; // 인증요청사유코드 2byte  (00:회원가입, 01:성인인증, 02:회원정보수정, 03:비밀번호찾기, 04:상품구매, 99:기타)
 
-$resultCd               =   $_POST['result_cd'];            // 결과코드
-$resultMsg              =   $_POST['result_msg'];           // 결과메세지
-$certDtTm               =   $_POST['cert_dt_tm'];           // 인증일시
+$resultCd               =   $_REQUEST['result_cd'];            // 결과코드
+$resultMsg              =   $_REQUEST['result_msg'];           // 결과메세지
+$certDtTm               =   $_REQUEST['cert_dt_tm'];           // 인증일시
 
 if($resultCd != 'B000') {
     alert_close('휴대폰 본인확인 중 오류가 발생했습니다. 오류코드 : '.$resultCd.'\\n\\n문의는 코리아크레딧뷰로 고객센터 02-708-1000 로 해주십시오.');
@@ -38,15 +38,15 @@ if($resultCd != 'B000') {
 /**************************************************************************
  * 모듈 호출    ; 생년월일 본인 확인서비스 결과 데이터를 복호화한다.
  **************************************************************************/
-$encInfo = $_POST['encInfo'];
+$encInfo = $_REQUEST['encInfo'];
 if(preg_match('~[^0-9a-zA-Z+/=]~', $encInfo, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 공개키
-$WEBPUBKEY = trim($_POST['WEBPUBKEY']);
+$WEBPUBKEY = trim($_REQUEST['WEBPUBKEY']);
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBPUBKEY, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 서명값
-$WEBSIGNATURE = trim($_POST['WEBSIGNATURE']);
+$WEBSIGNATURE = trim($_REQUEST['WEBSIGNATURE']);
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBSIGNATURE, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 // ########################################################################

plugin/okname/ipin2.php

@@ -14,15 +14,15 @@ foreach($check_arrays as $key){
 require('./ipin.config.php');
 
 //아이핀팝업에서 조회한 PERSONALINFO이다.
-@$encPsnlInfo = $_POST["encPsnlInfo"];
+@$encPsnlInfo = $_REQUEST["encPsnlInfo"];
 if(preg_match('~[^0-9a-zA-Z+/=]~', $encPsnlInfo, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 공개키
-@$WEBPUBKEY = trim($_POST["WEBPUBKEY"]);
+@$WEBPUBKEY = trim($_REQUEST["WEBPUBKEY"]);
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBPUBKEY, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 서명값
-@$WEBSIGNATURE = trim($_POST["WEBSIGNATURE"]);
+@$WEBSIGNATURE = trim($_REQUEST["WEBSIGNATURE"]);
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBSIGNATURE, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //아이핀 서버와 통신을 위한 키파일 생성

plugin/sms5/sms5.lib.php

@@ -155,96 +155,15 @@ if($config['cf_sms_type'] == 'LMS') {
         var $Result = array();
         var $Log = array();
 
-        // SMS 서버 접속
-        function SMS_con($host, $id, $pw, $portcode) {
-            $this->socket_host      = $host;
-            $this->socket_portcode  = $portcode;
-            $this->icode_id         = FillSpace($id, 10);
-            $this->icode_pw         = FillSpace($pw, 10);
-        }
-
-        function Init() {
-            $this->Data     = array();   // 발송하기 위한 패킷내용이 배열로 들어간다.
-            $this->Result   = array();   // 발송결과값이 배열로 들어간다.
-        }
-
         function Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate="", $nCount) {
             // EUC-KR로 변환
             $strCaller  = iconv_euckr($strCaller);
             $strSubject = iconv_euckr($strSubject);
             $strData    = iconv_euckr($strData);
 
-            // 문자 타입별 Port 설정.
-            $sendType = strlen($strData) > 90 ? 1 : 0; // 0: SMS / 1: LMS
-
-            /* 개발 완료 후 아래 포트를 rand 함수를 이용하는 라인으로 변경 바랍니다.*/
-
-            // 충전식
-            if ($this->socket_portcode == 1) {
-                    if($sendType && $sendType == 1) {
-                        //$this->socket_port = 8200;        // LMS
-                        $this->socket_port=(int)rand(8200,8201);    // LMS
-                    } else {
-                        //$this->socket_port = 6295;        // SMS
-                        $this->socket_port=(int)rand(6295,6297);    // SMS
-                    }
-            }
-            // 정액제
-            else {
-                if($sendType && $sendType == 1) {
-                    //$this->socket_port = 8300; // LMS
-                    $this->socket_port=(int)rand(8300,8301); // LMS
-                } else {
-                    //$this->socket_port = 6291; // SMS
-                    $this->socket_port=(int)rand(6291,6293); // SMS
-                }
-            }
-
-            $strCallBack    = FillSpace($strCallBack, 11);       // 회신번호
-            $strDate        = FillSpace($strDate, 12);           // 즉시(12byte 공백), 예약전송(YmdHi)
-
-            if ($sendType && $sendType == 1) {
-
-                /** LMS 제목 **/
-                /*
-                제목필드의 값이 없을 경우 단말기 기종및 설정에 따라 표기 방법이 다름
-                1.설정에서 제목필드보기 설정 Disable -> 제목필드값을 넣어도 미표기
-                2.설정에서 제목필드보기 설정 Enable  -> 제목을 넣지 않을 경우 제목없음으로 자동표시
-
-                제목의 첫글자에 "<",">", 개행문자가 있을경우 단말기종류 및 통신사에 따라 메세지 전송실패 -> 글자를 체크하거나 취환처리요망
-                */
-                $strSubject = str_replace("\r\n", " ", $strSubject);
-                $strSubject = str_replace("<", "[", $strSubject);
-                $strSubject = str_replace(">", "]", $strSubject);
-
-                $strSubject = FillSpace($strSubject,30);
-                $strData    = FillSpace(CutChar($strData,1500),1500);
-            } else if (!$strURL) {
-                $strData    = FillSpace(CutChar($strData,90),90);
-                $strCaller  = FillSpace($strCaller,10);
-            } else {
-                $strURL     = FillSpace($strURL,50);
-            }
-
-            $Error = CheckCommonTypeDest($strDest, $nCount);
-            $Error = is_vaild_callback($strCallBack);
-            $Error = CheckCommonTypeDate($strDate);
-
-            for ($i=0; $i<$nCount; $i++) {
-                $strDest[$i] = FillSpace($strDest[$i],11);
-                if ($sendType && $sendType == 1) {
-                    $this->Data[$i]	= '01144 '.$this->icode_id.$this->icode_pw.$strDest[$i].$strCallBack.$strSubject.$strDate.$strData;
-                } else if (!$strURL) {
-                    $this->Data[$i]	= '01144 '.$this->icode_id.$this->icode_pw.$strDest[$i].$strCallBack.$strCaller.$strDate.$strData;
-                } else {
-                    $strData = FillSpace(CheckCallCenter($strURL, $strDest[$i], $strData),80);
-                    $this->Data[$i]	= '05173 '.$this->icode_id.$this->icode_pw.$strDest[$i].$strCallBack.$strURL.$strDate.$strData;
-                }
-            }
-            return true;
+            return parent::Add($strDest, $strCallBack, $strCaller, $strSubject, $strURL, $strData, $strDate, $nCount);
         }
 
-
         function Send() {
             global $g5;
 
@@ -265,27 +184,7 @@ if($config['cf_sms_type'] == 'LMS') {
                 exit;
             }
 
-            $fsocket = fsockopen($this->socket_host,$this->socket_port, $errno, $errstr, 2);
-            if (!$fsocket) return false;
-            set_time_limit(60);
-
-            foreach($this->Data as $puts) {
-                fputs($fsocket, $puts);
-                while(!$gets) { $gets = fgets($fsocket,30); }
-                $dest = substr($puts,26,11);
-                if (substr($gets,0,19) == "0223  00".$dest) {
-                    $this->Result[] = $dest.":".substr($gets,19,10);
-                    $this->Log[] = $puts;
-                } else {
-                    $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
-                    $this->Log[] = $puts;
-                }
-                $gets = "";
-            }
-
-            fclose($fsocket);
-            $this->Data = array();
-            return true;
+            return parent::Send();
         }
     }
 } else {
@@ -294,15 +193,6 @@ if($config['cf_sms_type'] == 'LMS') {
     class SMS5 extends SMS {
         var $Log = array();
 
-        function SMS_con($sms_server,$sms_id,$sms_pw,$port) {
-            $this->ID=$sms_id;      // 계약 후 지정
-            $this->PWD=$sms_pw;     // 계약 후 지정
-            $this->SMS_Server=$sms_server;
-            $this->SMS_Port=$port;
-            $this->ID = spacing($this->ID,10);
-            $this->PWD = spacing($this->PWD,10);
-        }
-
          /**
          * 발송번호의 값이 정확한 값인지 확인합니다.
          *
@@ -380,7 +270,7 @@ if($config['cf_sms_type'] == 'LMS') {
             }
         }
         function Add2($strDest, $strCallBack, $strCaller, $strURL, $strMessage, $strDate="", $nCount) {
-            global $g5;
+            global $g5, $config;
 
             $Error = $this->CheckCommonTypeDest($strDest, $nCount);
             $Error = $this->CheckCommonTypeCallBack($strCallBack);
@@ -390,32 +280,91 @@ if($config['cf_sms_type'] == 'LMS') {
             $strCaller      = spacing($strCaller,10);
             $strDate        = spacing($strDate,12);
 
+            // 토큰키를 사용한다면
+            if( isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'] === $this->icode_key ){
 
-            for ($i=0; $i<$nCount; $i++) {
-                $hp_number  = spacing($strDest[$i]['bk_hp'],11);
-                $strData = $strMessage;
-                if( !empty($strDest[$i]['bk_name']) ){
-                    $strData    = str_replace("{이름}", $strDest[$i]['bk_name'], $strData);
+                for ($i=0; $i<$nCount; $i++) {
+                    $hp_number  = spacing($strDest[$i]['bk_hp'],11);
+                    $strData = $strMessage;
+                    if( !empty($strDest[$i]['bk_name']) ){
+                        $strData    = str_replace("{이름}", $strDest[$i]['bk_name'], $strData);
+                    }
+                    
+                    $msg = $strData;
+
+                    // 개행치환
+                    $msg = preg_replace("/\r\n/", "\n", $msg);
+                    $msg = preg_replace("/\r/", "\n", $msg);
+                    // 90byte 이내는 SMS, 90 ~ 2000 byte 는 LMS 그 이상은 절삭 되어 LMS로 발송
+                    // SMS 이기 때문에 90byte 이내로 합니다.
+                    $msg=cut_char($msg, 90);
+                    $msg = spacing($msg, 90);
+
+                    // 한글 깨진것이 있는지 체크합니다.
+                    if( preg_match('/^([\x00-\x7e]|.{2})*/', $msg, $z) ){
+                        $msg = $z[0];
+                    }
+
+                    // 문자 내용이 euc-kr 인지 체크합니다.
+                    $enc = mb_detect_encoding($msg, array('EUC-KR', 'UTF-8'));
+
+                    // 문자 내용이 euc-kr 이면 json_encode 에서 깨지기 때문에  utf-8 로 변환합니다.
+                    if($enc === 'EUC-KR'){
+                        $msg = iconv_utf8($msg);
+                    }
+
+                    // 보낼 내용을 배열에 집어넣기
+                    $dest = $hp_number;
+                    $callBack = $strCallBack;
+                    $Caller = $strCaller;
+                    $rsvTime = $strDate ? $strDate : '';
+
+                    $list = array(
+                        "key" => $this->icode_key, 
+                        "tel" => $dest,
+                        "cb" => $callBack,
+                        "msg" => $msg,
+                        "title" => "",      //SMS 의 경우 타이틀을 지정할수 없습니다.
+                        "date" => $rsvTime
+                    );
+
+                    $packet = json_encode($list);
+
+                    if( !$packet ){ // json_encode가 잘못되었으면 보내지 않습니다.
+                        return "json_encode error";
+                    }
+                    $this->Data[$i]    = '06'.str_pad(strlen($packet), 4, "0", STR_PAD_LEFT).$packet;
                 }
-                // 아이코드에서는 문자에 utf-8 인코딩 형식을 아직 지원하지 않는다.
-                $strData = iconv('utf-8', "euc-kr", stripslashes($strData));
 
-                if (!$strURL) {
-                    $strData    = spacing(cut_char($strData,80),80);
+            } else {
 
-                    $this->Data[$i] = '01144 '.$this->ID.$this->PWD.$hp_number.$strCallBack.$strCaller.$strDate.$strData;
-                } else {
-                    $strURL     = spacing($strURL,50);
-                    $strData    = spacing($this->CheckCallCenter($strURL, $hp_number, $strData),80);
+                for ($i=0; $i<$nCount; $i++) {
+                    $hp_number  = spacing($strDest[$i]['bk_hp'],11);
+                    $strData = $strMessage;
+                    if( !empty($strDest[$i]['bk_name']) ){
+                        $strData    = str_replace("{이름}", $strDest[$i]['bk_name'], $strData);
+                    }
+                    // 아이코드에서는 문자에 utf-8 인코딩 형식을 아직 지원하지 않는다.
+                    $strData = iconv('utf-8', "euc-kr", stripslashes($strData));
 
-                    $this->Data[$i] = '05173 '.$this->ID.$this->PWD.$hp_number.$strCallBack.$strURL.$strDate.$strData;
+                    if (!$strURL) {
+                        $strData    = spacing(cut_char($strData,80),80);
+
+                        $this->Data[$i] = '01144 '.$this->ID.$this->PWD.$hp_number.$strCallBack.$strCaller.$strDate.$strData;
+                    } else {
+                        $strURL     = spacing($strURL,50);
+                        $strData    = spacing($this->CheckCallCenter($strURL, $hp_number, $strData),80);
+
+                        $this->Data[$i] = '05173 '.$this->ID.$this->PWD.$hp_number.$strCallBack.$strURL.$strDate.$strData;
+                    }
                 }
             }
+
             return true; // 수정대기
         }
 
         function Send() {
-            global $g5;
+            global $g5, $config;
 
             $count = 1;
 
@@ -436,33 +385,61 @@ if($config['cf_sms_type'] == 'LMS') {
                 exit;
             }
 
-            $fsocket=fsockopen($this->SMS_Server,$this->SMS_Port, $errno, $errstr, 2);
-            if (!$fsocket) return false;
-            set_time_limit(60);
+            // 토큰키를 사용한다면
+            if( isset($config['cf_icode_token_key']) && $config['cf_icode_token_key'] === $this->icode_key ){
+                $fsocket = fsockopen(trim($this->socket_host),trim($this->socket_port), $errno, $errstr, 2);
+                if (!$fsocket) return false;
+                set_time_limit(300);
 
-            ## php4.3.10일경우
-            ## zend 최신버전으로 업해주세요..
-            ## 또는 69번째 줄을 $this->Data as $tmp => $puts 로 변경해 주세요.
+                foreach($this->Data as $puts) {
+                    fputs($fsocket, $puts);
+                    while(!$gets) { $gets = fgets($fsocket,32); }
+                    $json = json_decode(substr($puts,6), true);
 
-            foreach($this->Data as $puts) {
-                $dest = substr($puts,26,11);
-                fputs($fsocket, $puts);
-                while(!$gets) {
-                    $gets = fgets($fsocket,30);
+                    $dest = $json["tel"];
+                    if (substr($gets,0,20) == "0225  00".spacing($dest,12)) {
+                        $this->Result[] = $dest.":".substr($gets,20,11);
+
+                    } else {
+                        $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
+                        if(substr($gets,6,2) >= "80") break;
+                    }
+                    $gets = "";
+
+                    // 1천건씩 전송 후 5초 쉼
+                    if ($count++%1000 == 0) sleep(5);
                 }
-                if (substr($gets,0,19) == "0223  00".$dest) {
-                    $this->Result[] = $dest.":".substr($gets,19,10);
-                    $this->Log[] = $puts;
-                } else {
-                    $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
-                    $this->Log[] = $puts;
-                }
-                $gets = "";
+                fclose($fsocket);
 
-                // 1천건씩 전송 후 5초 쉼
-                if ($count++%1000 == 0) sleep(5);
+            } else {
+                $fsocket = fsockopen($this->SMS_Server,$this->SMS_Port);
+                if (!$fsocket) return false;
+                set_time_limit(300);
+
+                ## php4.3.10일경우
+                ## zend 최신버전으로 업해주세요..
+                ## 또는 69번째 줄을 $this->Data as $tmp => $puts 로 변경해 주세요.
+
+                foreach($this->Data as $puts) {
+                    $dest = substr($puts,26,11);
+                    fputs($fsocket, $puts);
+                    while(!$gets) {
+                        $gets = fgets($fsocket,30);
+                    }
+                    if (substr($gets,0,19) == "0223  00".$dest) {
+                        $this->Result[] = $dest.":".substr($gets,19,10);
+                        $this->Log[] = $puts;
+                    } else {
+                        $this->Result[$dest] = $dest.":Error(".substr($gets,6,2).")";
+                        $this->Log[] = $puts;
+                    }
+                    $gets = "";
+
+                    // 1천건씩 전송 후 5초 쉼
+                    if ($count++%1000 == 0) sleep(5);
+                }
+                fclose($fsocket);
             }
-            fclose($fsocket);
             $this->Data = array();
             return true;
         }

plugin/social/Hybrid/Providers/Kakao.php

@@ -26,7 +26,7 @@ class Hybrid_Providers_Kakao extends Hybrid_Provider_Model_OAuth2
         parent::initialize();
 
         // Provider API end-points
-        $this->api->api_base_url  = "https://kapi.kakao.com/v1/";
+        $this->api->api_base_url  = "https://kapi.kakao.com/v2/";
         $this->api->authorize_url = "https://kauth.kakao.com/oauth/authorize";
         $this->api->token_url     = "https://kauth.kakao.com/oauth/token";
 
@@ -72,7 +72,8 @@ class Hybrid_Providers_Kakao extends Hybrid_Provider_Model_OAuth2
     */
     function getUserProfile()
     {
-        $params = array('property_keys'=>'kaccount_email');
+        //$params = array('property_keys'=>'kaccount_email');	// v1 parameter
+        $params = array('property_keys'=>array('kakao_account.email'));		// v2 parameter
 
         $this->api->decode_json = false;
         $this->api->curl_header = array( 'Authorization: Bearer ' . $this->api->access_token );
@@ -86,7 +87,9 @@ class Hybrid_Providers_Kakao extends Hybrid_Provider_Model_OAuth2
         $this->user->profile->identifier  = @ $data->id;
         $this->user->profile->displayName = @ $data->properties->nickname;
         $this->user->profile->photoURL    = @ $data->properties->thumbnail_image;
-        $email = @ $data->kaccount_email;
+        //$email = @ $data->properties->kaccount_email;	// v1 version
+        
+        $email = @ $data->kakao_account->email;   // v2 version
 
         if( $email ){
             $this->user->profile->email = $email;

plugin/social/register_member_update.php

@@ -53,6 +53,7 @@ if( ! isset($mb_password) || ! $mb_password ){
 
 }
 
+if ($msg = valid_mb_id($mb_id))         alert($msg, "", true, true);
 if ($msg = empty_mb_name($mb_name))       alert($msg, "", true, true);
 if ($msg = empty_mb_nick($mb_nick))     alert($msg, "", true, true);
 if ($msg = empty_mb_email($mb_email))   alert($msg, "", true, true);
@@ -68,6 +69,10 @@ if ($msg = exist_mb_id($mb_id))     alert($msg);
 if ($msg = exist_mb_nick($mb_nick, $mb_id))     alert($msg, "", true, true);
 if ($msg = exist_mb_email($mb_email, $mb_id))   alert($msg, "", true, true);
 
+if( $mb = get_member($mb_id) ){
+    alert("이미 등록된 회원이 존재합니다.", G5_URL);
+}
+
 $data = array(
 'mb_id' =>  $mb_id,
 'mb_password'   =>  get_encrypt_string($mb_password),

skin/board/basic/list.skin.php

@@ -45,7 +45,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             <?php echo $page ?> 페이지
         </div>
 
-        <?php if ($rss_href || $write_href) { ?>
         <ul class="btn_bo_user">
         	<?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
             <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01 btn" title="RSS"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
@@ -66,7 +65,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         	</li>
         	<?php }  ?>
         </ul>
-        <?php } ?>
     </div>
     <!-- } 게시판 페이지 정보 및 버튼 끝 -->
         	
@@ -137,9 +135,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                     <?php
                     if ($list[$i]['icon_new']) echo "<span class=\"new_icon\">N<span class=\"sound_only\">새글</span></span>";
                     // if ($list[$i]['file']['count']) { echo '<'.$list[$i]['file']['count'].'>'; }
+                    if (isset($list[$i]['icon_hot'])) echo rtrim($list[$i]['icon_hot']);
                     if (isset($list[$i]['icon_file'])) echo rtrim($list[$i]['icon_file']);
                     if (isset($list[$i]['icon_link'])) echo rtrim($list[$i]['icon_link']);
-                    if (isset($list[$i]['icon_hot'])) echo rtrim($list[$i]['icon_hot']);
                     ?>
                     <?php if ($list[$i]['comment_cnt']) { ?><span class="sound_only">댓글</span><span class="cnt_cmt"><?php echo $list[$i]['wr_comment']; ?></span><span class="sound_only">개</span><?php } ?>
                 </div>

skin/board/basic/style.css

@@ -101,6 +101,7 @@
 #bo_list .td_numbig {width:80px;text-align:center}
 #bo_list .txt_active {color:#5d910b}
 #bo_list .txt_expired {color:#ccc}
+#bo_list tbody tr {border-left:2px solid transparent}
 #bo_list tbody tr:hover {border-left:2px solid #253dbe}
 
 #bo_cate {margin:25px 0}

skin/board/basic/view.skin.php

@@ -130,7 +130,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         ?>
         <div id="bo_v_act">
             <?php if($board['bo_use_good']) { ?><span class="bo_v_good"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i><span class="sound_only">추천</span><strong><?php echo number_format($view['wr_good']) ?></strong></span><?php } ?>
-            <?php if($board['bo_use_nogood']) { ?><span class="bo_v_nogood"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></span><?php } ?>
+            <?php if($board['bo_use_nogood']) { ?><span class="bo_v_nogood"><i class="fa fa-thumbs-o-down" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></span><?php } ?>
         </div>
         <?php
             }
@@ -161,7 +161,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
             <li>
                	<i class="fa fa-folder-open" aria-hidden="true"></i>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
                     <strong><?php echo $view['file'][$i]['source'] ?></strong> <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
                 </a>
                 <br>

skin/board/basic/view_comment.skin.php

@@ -26,6 +26,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결
 		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
 		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
+        $is_comment_reply_edit = ($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) ? 1 : 0;
 	?>
 
 	<article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-top-color:#e0e0e0"<?php } ?>>
@@ -53,7 +54,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                <?php if (strstr($list[$i]['wr_option'], "secret")) { ?><img src="<?php echo $board_skin_url; ?>/img/icon_secret.gif" alt="비밀글"><?php } ?>
 	                <?php echo $comment ?>
 	            </p>
-	            <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
+	            <?php if($is_comment_reply_edit) {
 	                if($w == 'cu') {
 	                    $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
 	                    $cmt = sql_fetch($sql);
@@ -70,6 +71,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	        <input type="hidden" value="<?php echo strstr($list[$i]['wr_option'],"secret") ?>" id="secret_comment_<?php echo $comment_id ?>">
 	        <textarea id="save_comment_<?php echo $comment_id ?>" style="display:none"><?php echo get_text($list[$i]['content1'], 0) ?></textarea>
 		</div>
+        <?php if($is_comment_reply_edit) { ?>
 		<div class="bo_vl_opt">
             <button type="button" class="btn_cm_opt btn_b01 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">댓글 옵션</span></button>
         	<ul class="bo_vc_act">
@@ -78,6 +80,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                 <?php if ($list[$i]['is_del']) { ?><li><a href="<?php echo $list[$i]['del_link']; ?>" onclick="return comment_delete();">삭제</a></li><?php } ?>
             </ul>
         </div>
+        <?php } ?>
         <script>
 			$(function() {			    
 		    // 댓글 옵션창 열기
@@ -334,13 +337,16 @@ $(function() {
     );
 });
 <?php } ?>
-$(function() {            
+</script>
+<?php } ?>
+<!-- } 댓글 쓰기 끝 -->
+<script>
+jQuery(function($) {            
     //댓글열기
-    $(".cmt_btn").click(function(){
+    $(".cmt_btn").click(function(e){
+        e.preventDefault();
         $(this).toggleClass("cmt_btn_op");
         $("#bo_vc").toggle();
     });
 });
-</script>
-<?php } ?>
-<!-- } 댓글 쓰기 끝 -->
+</script>

skin/board/basic/write.skin.php

@@ -130,7 +130,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
     <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
-        <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
+        <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){ echo $write['wr_link'.$i]; } ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 

skin/board/gallery/list.skin.php

@@ -36,7 +36,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             <?php echo $page ?> 페이지
         </div>
 
-        <?php if ($rss_href || $write_href) { ?>
         <ul class="btn_bo_user">
         	<?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin btn" title="관리자"><i class="fa fa-cog fa-spin fa-fw"></i><span class="sound_only">관리자</span></a></li><?php } ?>
             <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01 btn" title="RSS"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
@@ -57,7 +56,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         	</li>
         	<?php }  ?>
         </ul>
-        <?php } ?>
     </div>
     <!-- } 게시판 페이지 정보 및 버튼 끝 -->
 

skin/board/gallery/style.css

@@ -124,7 +124,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .gall_now .gall_text_href a {color:#ff3061}
 
 #bo_gall .gall_href a:link, #bo_gall .gall_href a:focus, #bo_gall .gall_href a:hover {text-decoration:none}
-#bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;max-height:200px;overflow:hidden}
+#bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;height:200px;max-height:200px;overflow:hidden}
 #bo_gall .gall_img a,#bo_gall .gall_img .no_image,#bo_gall .gall_img .is_notice {display:block}
 #bo_gall .gall_img img {max-width:100%;height:auto !important}
 #bo_gall .gall_img span {display:inline-block;background:#eaeaea;text-align:center;line-height:200px;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777}

skin/board/gallery/view.skin.php

@@ -130,7 +130,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         ?>
         <div id="bo_v_act">
             <?php if($board['bo_use_good']) { ?><span class="bo_v_good"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i><span class="sound_only">추천</span><strong><?php echo number_format($view['wr_good']) ?></strong></span><?php } ?>
-            <?php if($board['bo_use_nogood']) { ?><span class="bo_v_nogood"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></span><?php } ?>
+            <?php if($board['bo_use_nogood']) { ?><span class="bo_v_nogood"><i class="fa fa-thumbs-o-down" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></span><?php } ?>
         </div>
         <?php
             }
@@ -161,7 +161,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
             <li>
                	<i class="fa fa-folder-open" aria-hidden="true"></i>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
                     <strong><?php echo $view['file'][$i]['source'] ?></strong> <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
                 </a>
                 <br>

skin/board/gallery/view_comment.skin.php

@@ -26,6 +26,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결
 		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
 		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
+        $is_comment_reply_edit = ($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) ? 1 : 0;
 	?>
 
 	<article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-top-color:#e0e0e0"<?php } ?>>
@@ -53,7 +54,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                <?php if (strstr($list[$i]['wr_option'], "secret")) { ?><img src="<?php echo $board_skin_url; ?>/img/icon_secret.gif" alt="비밀글"><?php } ?>
 	                <?php echo $comment ?>
 	            </p>
-	            <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
+	            <?php if($is_comment_reply_edit) {
 	                if($w == 'cu') {
 	                    $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
 	                    $cmt = sql_fetch($sql);
@@ -70,6 +71,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	        <input type="hidden" value="<?php echo strstr($list[$i]['wr_option'],"secret") ?>" id="secret_comment_<?php echo $comment_id ?>">
 	        <textarea id="save_comment_<?php echo $comment_id ?>" style="display:none"><?php echo get_text($list[$i]['content1'], 0) ?></textarea>
 		</div>
+        <?php if($is_comment_reply_edit) { ?>
 		<div class="bo_vl_opt">
             <button type="button" class="btn_cm_opt btn_b01 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">댓글 옵션</span></button>
         	<ul class="bo_vc_act">
@@ -78,6 +80,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                 <?php if ($list[$i]['is_del']) { ?><li><a href="<?php echo $list[$i]['del_link']; ?>" onclick="return comment_delete();">삭제</a></li><?php } ?>
             </ul>
         </div>
+        <?php } ?>
         <script>
 			$(function() {			    
 		    // 댓글 옵션창 열기
@@ -335,13 +338,16 @@ $(function() {
     );
 });
 <?php } ?>
-$(function() {            
+</script>
+<?php } ?>
+<!-- } 댓글 쓰기 끝 -->
+<script>
+jQuery(function($) {            
     //댓글열기
-    $(".cmt_btn").click(function(){
+    $(".cmt_btn").click(function(e){
+        e.preventDefault();
         $(this).toggleClass("cmt_btn_op");
         $("#bo_vc").toggle();
     });
 });
-</script>
-<?php } ?>
-<!-- } 댓글 쓰기 끝 -->
+</script>

skin/board/gallery/write.skin.php

@@ -128,7 +128,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <?php for ($i=1; $is_link && $i<=G5_LINK_COUNT; $i++) { ?>
     <div class="bo_w_link write_div">
         <label for="wr_link<?php echo $i ?>"><i class="fa fa-link" aria-hidden="true"></i><span class="sound_only"> 링크  #<?php echo $i ?></span></label>
-        <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){echo$write['wr_link'.$i];} ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
+        <input type="text" name="wr_link<?php echo $i ?>" value="<?php if($w=="u"){ echo $write['wr_link'.$i]; } ?>" id="wr_link<?php echo $i ?>" class="frm_input full_input" size="50">
     </div>
     <?php } ?>
 

skin/latest/pic_block/latest.skin.php

@@ -24,7 +24,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
     }
     $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
     ?>
-        <li class="galley_li">
+        <li class="gallery_li">
             <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo $img_content; ?></a>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";

skin/latest/pic_block/style.css

@@ -10,7 +10,7 @@
 .pic_lt ul:after {display:block;visibility:hidden;clear:both;content:""}
 .pic_lt ul {margin: 0 -10px}
 .pic_lt li {float:left;width:25%;padding:0 10px}
-.pic_lt li.galley_li:nth-child(4n+1) {clear: both!important}
+.pic_lt li.gallery_li:nth-child(4n+1) {clear: both!important}
 .pic_lt li .lt_img {margin:5px 0;display:block}
 .pic_lt li .lt_img img {width:100%;height:auto}
 .pic_lt li a:hover {color:#a22121}

skin/member/basic/memo_view.skin.php

@@ -39,7 +39,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 						<li class="memo_view_nick"><?php echo $nick ?></li>
 						<li class="memo_view_date"><span class="sound_only"><?php echo $kind_date ?>시간</span><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $memo['me_send_datetime'] ?></li> 
 						<li class="memo_op_btn list_btn"><a href="<?php echo $list_link ?>" class="btn_b01 btn"><i class="fa fa-list" aria-hidden="true"></i><span class="sound_only">목록</span></a></li>
-						<li class="memo_op_btn del_btn"><a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;" class="memo_del btn_b01 btn"><i class="fa fa-trash-o" aria-hidden="true"></i> <span class="sound_only">삭제</span></a></li>	
+						<li class="memo_op_btn del_btn"><a href="<?php echo $del_link; ?>" onclick="del(this.href); return false;" class="memo_del btn_b01 btn"><i class="fa fa-trash-o" aria-hidden="true"></i> <span class="sound_only">삭제</span></a></li>	
 					</ul>
                     <div class="memo_btn">
                     	<?php if($prev_link) {  ?>

skin/outlogin/basic/style.css

@@ -8,6 +8,7 @@
 .ol form {padding:20px}
 .ol a.btn_admin {display:inline-block;padding:0 10px;height:25px;text-decoration:none;line-height:25px;vertical-align:middle} /* 관리자 전용 버튼 */
 .ol a.btn_admin:focus, .ol a.btn_admin:hover {text-decoration:none}
+.ol .login-sns{padding-bottom:0px}
 
 #ol_before {}
 #ol_before:after {display:block;visibility:hidden;clear:both;content:""}

skin/qa/basic/view.skin.php

@@ -107,7 +107,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
              ?>
                 <li>
                     <i class="fa fa-download" aria-hidden="true"></i>
-                    <a href="<?php echo $view['download_href'][$i];  ?>" class="view_file_download">
+                    <a href="<?php echo $view['download_href'][$i];  ?>" class="view_file_download" download>
                         <strong><?php echo $view['download_source'][$i] ?></strong>
                     </a>
                 </li>