5.2.4 버전변경

LICENSE.txt

@@ -2,7 +2,7 @@
 
 프로그램 명칭 : 그누보드5 ( GNU Board 5 )
 
-저작자 : (주)에스아이알소프트 http://sir.co.kr
+저작자 : (주)에스아이알소프트 http://sir.kr
 
 라이센스 (License)
 

adm/admin.tail.php

@@ -21,7 +21,7 @@ if (!defined('_GNUBOARD_')) exit;
 
 <!-- <p>실행시간 : <?php echo get_microtime() - $begin_time; ?> -->
 
-<script src="<?php echo G5_ADMIN_URL ?>/admin.js"></script>
+<script src="<?php echo G5_ADMIN_URL ?>/admin.js?ver=<?php echo G5_JS_VER; ?>"></script>
 <script>
 $(function(){
     var hide_menu = false;

adm/board_copy.php

@@ -8,7 +8,7 @@ $g5['title'] = '게시판 복사';
 include_once(G5_PATH.'/head.sub.php');
 ?>
 
-<script src="<?php echo G5_ADMIN_URL ?>/admin.js"></script>
+<script src="<?php echo G5_ADMIN_URL ?>/admin.js?ver=<?php echo G5_JS_VER; ?>"></script>
 
 <div class="new_win">
     <h1><?php echo $g5['title']; ?></h1>

adm/board_form_update.php

@@ -184,7 +184,7 @@ if ($w == '') {
     // 글수 조정
     /*
         엔피씨님의 팁으로 교체합니다. 130308
-        http://sir.co.kr/bbs/board.php?bo_table=g5_tiptech&wr_id=27207
+        http://sir.kr/g5_tiptech/27207
     */
     if (isset($_POST['proc_count'])) {
         // 원글을 얻습니다.

adm/config_form.php

@@ -736,7 +736,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                 <select name="cf_cert_hp" id="cf_cert_hp">
                     <?php echo option_selected("",    $config['cf_cert_hp'], "사용안함"); ?>
                     <?php echo option_selected("kcb", $config['cf_cert_hp'], "코리아크레딧뷰로(KCB) 휴대폰 본인확인"); ?>
-                    <?php echo option_selected("kcp", $config['cf_cert_hp'], "한국사이버결제(KCP) 휴대폰 본인확인"); ?>
+                    <?php echo option_selected("kcp", $config['cf_cert_hp'], "NHN KCP 휴대폰 본인확인"); ?>
                     <?php echo option_selected("lg",  $config['cf_cert_hp'], "LG유플러스 휴대폰 본인확인"); ?>
                 </select>
             </td>
@@ -745,16 +745,16 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <th scope="row" class="cf_cert_service"><label for="cf_cert_kcb_cd">코리아크레딧뷰로<br>KCB 회원사ID</label></th>
             <td class="cf_cert_service">
                 <?php echo help('KCB 회원사ID를 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, KCB와 계약체결 후 회원사ID를 발급 받으실 수 있습니다.<br>이용하시려는 서비스에 대한 계약을 아이핀, 휴대폰 본인확인 각각 체결해주셔야 합니다.<br>아이핀 본인확인 테스트의 경우에는 KCB 회원사ID가 필요 없으나,<br>휴대폰 본인확인 테스트의 경우 KCB 에서 따로 발급 받으셔야 합니다.') ?>
-                <input type="text" name="cf_cert_kcb_cd" value="<?php echo $config['cf_cert_kcb_cd'] ?>" id="cf_cert_kcb_cd" class="frm_input" size="20"> <a href="http://sir.co.kr/main/service/b_ipin.php" target="_blank" class="btn_frmline">KCB 아이핀 서비스 신청페이지</a>
-                <a href="http://sir.co.kr/main/service/b_cert.php" target="_blank" class="btn_frmline">KCB 휴대폰 본인확인 서비스 신청페이지</a>
+                <input type="text" name="cf_cert_kcb_cd" value="<?php echo $config['cf_cert_kcb_cd'] ?>" id="cf_cert_kcb_cd" class="frm_input" size="20"> <a href="http://sir.kr/main/service/b_ipin.php" target="_blank" class="btn_frmline">KCB 아이핀 서비스 신청페이지</a>
+                <a href="http://sir.kr/main/service/b_cert.php" target="_blank" class="btn_frmline">KCB 휴대폰 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
         <tr>
-            <th scope="row" class="cf_cert_service"><label for="cf_cert_kcp_cd">한국사이버결제<br>KCP 사이트코드</label></th>
+            <th scope="row" class="cf_cert_service"><label for="cf_cert_kcp_cd">NHN KCP 사이트코드</label></th>
             <td class="cf_cert_service">
                 <?php echo help('SM으로 시작하는 5자리 사이트 코드중 뒤의 3자리만 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 사이트코드를 발급 받으실 수 있습니다.') ?>
                 <span class="sitecode">SM</span>
-                <input type="text" name="cf_cert_kcp_cd" value="<?php echo $config['cf_cert_kcp_cd'] ?>" id="cf_cert_kcp_cd" class="frm_input" size="3"> <a href="http://sir.co.kr/main/service/p_cert.php" target="_blank" class="btn_frmline">KCP 휴대폰 본인확인 서비스 신청페이지</a>
+                <input type="text" name="cf_cert_kcp_cd" value="<?php echo $config['cf_cert_kcp_cd'] ?>" id="cf_cert_kcp_cd" class="frm_input" size="3"> <a href="http://sir.kr/main/service/p_cert.php" target="_blank" class="btn_frmline">NHN KCP 휴대폰 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
         <tr>
@@ -762,7 +762,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
             <td class="cf_cert_service">
                 <?php echo help('LG유플러스 상점아이디 중 si_를 제외한 나머지 아이디만 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 상점아이디를 발급 받으실 수 있습니다.<br><strong>LG유플러스 휴대폰본인확인은 ActiveX 설치가 필요하므로 Internet Explorer 에서만 사용할 수 있습니다.</strong>') ?>
                 <span class="sitecode">si_</span>
-                <input type="text" name="cf_lg_mid" value="<?php echo $config['cf_lg_mid'] ?>" id="cf_lg_mid" class="frm_input" size="20"> <a href="http://sir.co.kr/main/service/lg_cert.php" target="_blank" class="btn_frmline">LG유플러스 본인확인 서비스 신청페이지</a>
+                <input type="text" name="cf_lg_mid" value="<?php echo $config['cf_lg_mid'] ?>" id="cf_lg_mid" class="frm_input" size="20"> <a href="http://sir.kr/main/service/lg_cert.php" target="_blank" class="btn_frmline">LG유플러스 본인확인 서비스 신청페이지</a>
             </td>
         </tr>
         <tr>

adm/member_delete.php

@@ -1,4 +1,4 @@
-<?
+<?php
 $sub_menu = "200100";
 include_once("./_common.php");
 

adm/member_form.php

@@ -126,6 +126,11 @@ if(!isset($mb['mb_dupinfo'])) {
     sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_dupinfo` varchar(255) NOT NULL DEFAULT '' AFTER `mb_adult` ", false);
 }
 
+// 이메일인증 체크 필드추가
+if(!isset($mb['mb_email_certify2'])) {
+    sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_email_certify2` varchar(255) NOT NULL DEFAULT '' AFTER `mb_email_certify` ", false);
+}
+
 if ($mb['mb_intercept_date']) $g5['title'] = "차단된 ";
 else $g5['title'] .= "";
 $g5['title'] .= '회원 '.$html_title;

adm/member_list_delete.php

@@ -1,4 +1,4 @@
-<?
+<?php
 $sub_menu = "200100";
 include_once("./_common.php");
 

adm/service.php

@@ -19,9 +19,9 @@ include_once('./admin.head.php');
         <p>정보통신망법 23조 2항(주민등록번호의 사용제한)에 따라 기존 주민등록번호 기반의 인증서비스 이용이 불가합니다. 주민등록번호 대체수단으로 최소한의 정보(생년월일, 휴대폰번호, 성별)를 입력받아 본인임을 확인하는 인증수단 입니다</p>
 
         <ul>
-            <li><a href="http://sir.co.kr/main/service/p_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_01.jpg" alt="KCP 휴대폰 본인확인 신청하기"></a></li>
-            <li><a href="http://sir.co.kr/main/service/lg_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_02.jpg" alt="LG유플러스 휴대폰대체인증 신청하기"></a></li>
-            <li class="last"><a href="http://sir.co.kr/main/service/b_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_03.jpg" alt="OKname 휴대폰 본인확인 신청하기"></a></li>
+            <li><a href="http://sir.kr/main/service/p_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_01.jpg" alt="KCP 휴대폰 본인확인 신청하기"></a></li>
+            <li><a href="http://sir.kr/main/service/lg_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_02.jpg" alt="LG유플러스 휴대폰대체인증 신청하기"></a></li>
+            <li class="last"><a href="http://sir.kr/main/service/b_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_03.jpg" alt="OKname 휴대폰 본인확인 신청하기"></a></li>
         </ul>
     </div>
     <div class="sevice_1">
@@ -30,7 +30,7 @@ include_once('./admin.head.php');
         <p>정부가 주관하는 주민등록번호 대체 수단으로 본인의 개인정보를 아이핀 사이트에 한번만 발급해 놓고, 이후부터는 아이디와 패스워드 만으로
         본인임을 확인하는 인증수단 입니다.</p>
 
-       <h4><a href="http://sir.co.kr/main/service/b_ipin.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_04.jpg" alt="OKname 아이핀 본인확인 신청하기"></a></h4>
+       <h4><a href="http://sir.kr/main/service/b_ipin.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_04.jpg" alt="OKname 아이핀 본인확인 신청하기"></a></h4>
     </div>
     <div class="sevice_2">
             <div class="svc_sms">
@@ -40,7 +40,7 @@ include_once('./admin.head.php');
                 </div>
                 <div class="svc_btn"><a href="http://icodekorea.com/res/join_company_fix_a.php?sellid=sir2" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_05.jpg" alt="아이코드 SMS 서비스 신청하기"></a></div>
             </div>
-            
+
     </div>
 </div>
 

adm/sms_admin/form_list.php

@@ -18,6 +18,9 @@ if (is_numeric($fg_no))
 else
     $sql_group = "";
 
+$st = clean_xss_tags($st);
+$sv = clean_xss_tags($sv);
+
 if ($st == 'all') {
     $sql_search = "and (fo_name like '%{$sv}%' or fo_content like '%{$sv}%')";
 } else if ($st == 'name') {
@@ -60,7 +63,7 @@ function book_all_checked(chk)
 function book_del(fo_no)
 {
     if (confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n그래도 삭제하시겠습니까?"))
-        location.href = "./form_update.php?w=d&fo_no=" + fo_no + "&page=<?php echo $page?>&fg_no=<?php echo $fg_no?>&st=<?php echo $st?>&sv=<?php echo $sv?>";
+        location.href = "./form_update.php?w=d&fo_no=" + fo_no + "&page=<?php echo $page?>&fg_no=<?php echo $fg_no?>&st=<?php echo get_text($st); ?>&sv=<?php echo get_text($sv); ?>";
 }
 
 function multi_update(sel)
@@ -127,7 +130,7 @@ function multi_update(sel)
         <option value="content"<?php echo get_selected('content', $st); ?>>이모티콘</option>
     </select>
     <label for="sv" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-    <input type="text" name="sv" value="<?php echo $sv;?>" id="sv" required class="frm_input required" >
+    <input type="text" name="sv" value="<?php echo get_text($sv) ;?>" id="sv" required class="frm_input required" >
     <input type="submit" value="검색" class="btn_submit">
     </form>
 </div>
@@ -181,7 +184,7 @@ function multi_update(sel)
             <span class="sound_only">등록 </span><?php echo date('Y-m-d', strtotime($res['fo_datetime']))?>
         </div>
         <div class="li_cmd">
-            <a href="./form_write.php?w=u&amp;fo_no=<?php echo $res['fo_no']?>&amp;page=<?php echo $page;?>&amp;fg_no=<?php echo $fg_no;?>&amp;st=<?php echo $st;?>&amp;sv=<?php echo $sv;?>">수정</a>
+            <a href="./form_write.php?w=u&amp;fo_no=<?php echo $res['fo_no']?>&amp;page=<?php echo $page;?>&amp;fg_no=<?php echo $fg_no;?>&amp;st=<?php echo get_text($st);?>&amp;sv=<?php echo get_text($sv);?>">수정</a>
             <a href="javascript:void(book_del('<?php echo $res['fo_no']?>'));">삭제</a>
             <a href="./sms_write.php?fo_no=<?php echo $res['fo_no']?>">보내기</a>
         </div>

adm/write_count.php

@@ -14,7 +14,7 @@ add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.categoryAxi
 add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.pointLabels.min.js"></script>', 0);
 add_javascript('<!--[if lt IE 9]><script src="'.G5_PLUGIN_URL.'/jqplot/excanvas.js"></script><![endif]-->', 0);
 
-if (!($graph == 'line' || $graph == 'bar')) 
+if (!($graph == 'line' || $graph == 'bar'))
     $graph = 'line';
 
 if ($graph == 'bar') {
@@ -49,7 +49,7 @@ foreach($period_array as $key=>$value) {
         break;
     }
 }
-if (!$is_period) 
+if (!$is_period)
     $period = '오늘';
 
 $day = $period_array[$period][0];
@@ -64,15 +64,15 @@ if ($period == '오늘') {
     $from = $yesterday;
     $to = $from;
 } else if ($period == '내일') {
-    $from = date('Y-m-d', G5_SERVER_TIME + (86400 * 2)); 
+    $from = date('Y-m-d', G5_SERVER_TIME + (86400 * 2));
     $to = $from;
 } else {
-    $from = date('Y-m-d', G5_SERVER_TIME - (86400 * $period_array[$period][1])); 
+    $from = date('Y-m-d', G5_SERVER_TIME - (86400 * $period_array[$period][1]));
     $to = $yesterday;
 }
 
 $sql_bo_table = '';
-if ($bo_table) 
+if ($bo_table)
     $sql_bo_table = "and bo_table = '$bo_table'";
 
 switch ($day) {
@@ -130,7 +130,7 @@ switch ($day) {
     <form>
     <select name="bo_table">
     <option value="">전체게시판</a>
-    <?php 
+    <?php
     $sql = " select bo_table, bo_subject from {$g5['board_table']} order by bo_count_write desc ";
     $result = sql_query($sql);
     for($i=0; $row=sql_fetch_array($result); $i++) {
@@ -179,7 +179,7 @@ $(document).ready(function(){
     var line1 = [<?php echo implode($line1, ','); ?>];
     var line2 = [<?php echo implode($line2, ','); ?>];
     var plot1 = $.jqplot ('chart1', [line1, line2], {
-            seriesDefaults: { 
+            seriesDefaults: {
                 <?php if ($graph == 'bar') { ?>
                 renderer:$.jqplot.BarRenderer,
                 <?php } ?>
@@ -205,6 +205,6 @@ $(document).ready(function(){
 }
 ?>
 
-<?
+<?php
 include_once ('./admin.tail.php');
 ?>

bbs/ajax.comment_token.php

@@ -0,0 +1,14 @@
+<?php
+include_once('./_common.php');
+include_once(G5_LIB_PATH.'/json.lib.php');
+
+$ss_name = 'ss_comment_token';
+
+set_session($ss_name, '');
+
+$token = _token();
+
+set_session($ss_name, $token);
+
+die(json_encode(array('token'=>$token)));
+?>

bbs/alert.php

@@ -33,6 +33,8 @@ $msg2 = str_replace("\\n", "<br>", $msg);
 $url = clean_xss_tags($url);
 if (!$url) $url = clean_xss_tags($_SERVER['HTTP_REFERER']);
 
+$url = preg_replace("/[\<\>\'\"\\\'\\\"\(\)]/", "", $url);
+
 // url 체크
 check_url_host($url);
 

bbs/delete.php

@@ -1,11 +1,11 @@
 <?php
 include_once('./_common.php');
 
-if ($is_admin)
-{
-    if (!($token && get_session('ss_delete_token') == $token))
-        alert('토큰 에러로 삭제 불가합니다.');
-}
+$delete_token = get_session('ss_delete_token');
+set_session('ss_delete_token', '');
+
+if (!($token && $delete_token == $token))
+    alert('토큰 에러로 삭제 불가합니다.');
 
 //$wr = sql_fetch(" select * from $write_table where wr_id = '$wr_id' ");
 

bbs/delete_comment.php

@@ -2,11 +2,11 @@
 // 코멘트 삭제
 include_once('./_common.php');
 
-if ($is_admin)
-{
-    if (!($token && get_session("ss_delete_token") == $token))
-        alert('토큰 에러로 삭제 불가합니다.');
-}
+$delete_comment_token = get_session('ss_delete_comment_'.$comment_id.'_token');
+set_session('ss_delete_comment_'.$comment_id.'_token', '');
+
+if (!($token && $delete_comment_token == $token))
+    alert('토큰 에러로 삭제 불가합니다.');
 
 // 4.1
 @include_once($board_skin_path.'/delete_comment.head.skin.php');

bbs/email_certify.php

@@ -1,20 +1,29 @@
 <?php
 include_once('./_common.php');
 
-$sql = " select mb_id, mb_email, mb_datetime from {$g5['member_table']} where mb_id = '{$mb_id}' ";
+$mb_id  = trim($_GET['mb_id']);
+$mb_md5 = trim($_GET['mb_md5']);
+
+$sql = " select mb_id, mb_email_certify2 from {$g5['member_table']} where mb_id = '{$mb_id}' ";
 $row = sql_fetch($sql);
 if (!$row['mb_id'])
     alert('존재하는 회원이 아닙니다.', G5_URL);
 
+// 인증 링크는 한번만 처리가 되게 한다.
+sql_query(" update {$g5['member_table']} set mb_email_certify2 = '' where mb_id = '$mb_id' ");
+
 if ($mb_md5)
 {
-    $tmp_md5 = md5($row['mb_id'].$row['mb_email'].$row['mb_datetime']);
-    if ($mb_md5 == $tmp_md5)
+    if ($mb_md5 == $row['mb_email_certify2'])
     {
         sql_query(" update {$g5['member_table']} set mb_email_certify = '".G5_TIME_YMDHIS."' where mb_id = '{$mb_id}' ");
 
         alert("메일인증 처리를 완료 하였습니다.\\n\\n지금부터 {$mb_id} 아이디로 로그인 가능합니다.", G5_URL);
     }
+    else
+    {
+        alert('메일인증 요청 정보가 올바르지 않습니다.', G5_URL);
+    }
 }
 
 alert('제대로 된 값이 넘어오지 않았습니다.', G5_URL);

bbs/formmail.php

@@ -28,8 +28,17 @@ if ($sendmail_count > 3)
 $g5['title'] = '메일 쓰기';
 include_once(G5_PATH.'/head.sub.php');
 
+$email_enc = new str_encrypt();
+$email_dec = $email_enc->decrypt($email);
+
+$email = get_email_address($email_dec);
+if(!$email)
+    alert_close('이메일이 올바르지 않습니다.');
+
+$email = $email_enc->encrypt($email);
+
 if (!$name)
-    $name = base64_decode($email);
+    $name = $email;
 else
     $name = get_text(stripslashes($name), true);
 

bbs/formmail_send.php

@@ -9,7 +9,8 @@ if (!$config['cf_email_use'])
 if (!$is_member && $config['cf_formmail_is_member'])
     alert_close('회원만 이용하실 수 있습니다.');
 
-$to = base64_decode($to);
+$email_enc = new str_encrypt();
+$to = $email_enc->decrypt($to);
 
 if (substr_count($to, "@") > 1)
     alert_close('한번에 한사람에게만 메일을 발송할 수 있습니다.');

bbs/list.php

@@ -46,7 +46,7 @@ if ($sca || $stx) {
     $sql_search .= " and (wr_num between {$spt} and ({$spt} + {$config['cf_search_part']})) ";
 
     // 원글만 얻는다. (코멘트의 내용도 검색하기 위함)
-    // 라엘님 제안 코드로 대체 http://sir.co.kr/bbs/board.php?bo_table=g5_bug&wr_id=2922
+    // 라엘님 제안 코드로 대체 http://sir.kr/g5_bug/2922
     $sql = " SELECT COUNT(DISTINCT `wr_parent`) AS `cnt` FROM {$write_table} WHERE {$sql_search} ";
     $row = sql_fetch($sql);
     $total_count = $row['cnt'];

bbs/login_check.php

@@ -31,7 +31,8 @@ if ($mb['mb_leave_date'] && $mb['mb_leave_date'] <= date("Ymd", G5_SERVER_TIME))
 }
 
 if ($config['cf_use_email_certify'] && !preg_match("/[1-9]/", $mb['mb_email_certify'])) {
-    confirm("{$mb['mb_email']} 메일로 메일인증을 받으셔야 로그인 가능합니다. 다른 메일주소로 변경하여 인증하시려면 취소를 클릭하시기 바랍니다.", G5_URL, G5_BBS_URL.'/register_email.php?mb_id='.$mb_id);
+    $ckey = md5($mb['mb_ip'].$mb['mb_datetime']);
+    confirm("{$mb['mb_email']} 메일로 메일인증을 받으셔야 로그인 가능합니다. 다른 메일주소로 변경하여 인증하시려면 취소를 클릭하시기 바랍니다.", G5_URL, G5_BBS_URL.'/register_email.php?mb_id='.$mb_id.'&ckey='.$ckey);
 }
 
 @include_once($member_skin_path.'/login_check.skin.php');

bbs/member_confirm.php

@@ -19,6 +19,8 @@ $url = clean_xss_tags($_GET['url']);
 // url 체크
 check_url_host($url);
 
+$url = get_text($url);
+
 include_once($member_skin_path.'/member_confirm.skin.php');
 
 include_once('./_tail.sub.php');

bbs/move_update.php

@@ -19,6 +19,8 @@ $save_count_write = 0;
 $save_count_comment = 0;
 $cnt = 0;
 
+$wr_id_list = preg_replace('/[^0-9\,]/', '', $_POST['wr_id_list']);
+
 $sql = " select distinct wr_num from $write_table where wr_id in ({$wr_id_list}) order by wr_id ";
 $result = sql_query($sql);
 while ($row = sql_fetch_array($result))

bbs/password.php

@@ -9,11 +9,13 @@ switch ($w) {
         $return_url = './board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
         break;
     case 'd' :
-        $action = './delete.php';
+        set_session('ss_delete_token', $token = uniqid(time()));
+        $action = './delete.php?token='.$token;
         $return_url = './board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
         break;
     case 'x' :
-        $action = './delete_comment.php';
+        set_session('ss_delete_comment_'.$comment_id.'_token', $token = uniqid(time()));
+        $action = './delete_comment.php?token='.$token;
         $row = sql_fetch(" select wr_parent from $write_table where wr_id = '$comment_id' ");
         $return_url = './board.php?bo_table='.$bo_table.'&wr_id='.$row['wr_parent'];
         break;

bbs/qadelete.php

@@ -29,6 +29,10 @@ for($i=0; $i<$count; $i++) {
     if($is_admin != 'super' && $row['mb_id'] != $member['mb_id'])
         continue;
 
+    // 답변이 달린 글은 삭제못함
+    if($is_admin != 'super' && !$row['qa_type'] && $row['qa_status'])
+        continue;
+
     // 첨부파일 삭제
     for($k=1; $k<=2; $k++) {
         @unlink(G5_DATA_PATH.'/qa/'.$row['qa_file'.$k]);

bbs/qawrite_update.php

@@ -15,16 +15,23 @@ $msg = array();
 // 1:1문의 설정값
 $qaconfig = get_qa_config();
 
+if(trim($qaconfig['qa_category'])) {
+    if($w != 'a') {
+        $category = explode('|', $qaconfig['qa_category']);
+        if(!in_array($qa_category, $category))
+            alert('분류를 올바르게 지정해 주십시오.');
+    }
+} else {
+    alert('1:1문의 설정에서 분류를 설정해 주십시오');
+}
+
 // e-mail 체크
-if(isset($_POST['qa_email']) && $qa_email) {
+$qa_email = '';
+if(isset($_POST['qa_email']) && $_POST['qa_email'])
     $qa_email = get_email_address(trim($_POST['qa_email']));
 
-    if($qaconfig['qa_req_email'] && !$qa_email)
-        $msg[] = '이메일을 입력하세요.';
-
-    if (!preg_match("/([0-9a-zA-Z_-]+)@([0-9a-zA-Z_-]+)\.([0-9a-zA-Z_-]+)/", $qa_email))
-        $msg[] = '이메일 주소가 형식에 맞지 않습니다.';
-}
+if($w != 'a' && $qaconfig['qa_req_email'] && !$qa_email)
+    $msg[] = '이메일을 입력하세요.';
 
 $qa_subject = '';
 if (isset($_POST['qa_subject'])) {
@@ -105,6 +112,18 @@ if($w == 'u' || $w == 'a' || $w == 'r') {
     }
 }
 
+// 파일개수 체크
+$file_count   = 0;
+$upload_count = count($_FILES['bf_file']['name']);
+
+for ($i=1; $i<=$upload_count; $i++) {
+    if($_FILES['bf_file']['name'][$i] && is_uploaded_file($_FILES['bf_file']['tmp_name'][$i]))
+        $file_count++;
+}
+
+if($file_count > 2)
+    alert('첨부파일을 2개 이하로 업로드 해주십시오.');
+
 // 디렉토리가 없다면 생성합니다. (퍼미션도 변경하구요.)
 @mkdir(G5_DATA_PATH.'/qa', G5_DIR_PERMISSION);
 @chmod(G5_DATA_PATH.'/qa', G5_DIR_PERMISSION);

bbs/register_email.php

@@ -6,11 +6,17 @@ $g5['title'] = '메일인증 메일주소 변경';
 include_once('./_head.php');
 
 $mb_id = substr(clean_xss_tags($_GET['mb_id']), 0, 20);
-$sql = " select mb_email, mb_datetime, mb_email_certify from {$g5['member_table']} where mb_id = '{$mb_id}' ";
+$sql = " select mb_email, mb_datetime, mb_ip, mb_email_certify from {$g5['member_table']} where mb_id = '{$mb_id}' ";
 $mb = sql_fetch($sql);
 if (substr($mb['mb_email_certify'],0,1)!=0) {
     alert("이미 메일인증 하신 회원입니다.", G5_URL);
 }
+
+$ckey = trim($_GET['ckey']);
+$key  = md5($mb['mb_ip'].$mb['mb_datetime']);
+
+if(!$ckey || $ckey != $key)
+    alert('올바른 방법으로 이용해 주십시오.', G5_URL);
 ?>
 
 <p class="rg_em_p">메일인증을 받지 못한 경우 회원정보의 메일주소를 변경 할 수 있습니다.</p>

bbs/register_email_update.php

@@ -3,12 +3,15 @@ include_once('./_common.php');
 include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
-$mb_id    = trim($_POST['mb_id']);
-$mb_email = trim($_POST['mb_email']);
+$mb_id = substr(clean_xss_tags($_POST['mb_id']), 0, 20);
+$mb_email = get_email_address(trim($_POST['mb_email']));
 
-$sql = " select mb_name, mb_datetime from {$g5['member_table']} where mb_id = '{$mb_id}' and mb_email_certify <> '' ";
+if(!$mb_id || !$mb_email)
+    alert('올바른 방법으로 이용해 주십시오.', G5_URL);
+
+$sql = " select mb_name from {$g5['member_table']} where mb_id = '{$mb_id}' and substring(mb_email_certify, 1, 1) = '0' ";
 $mb = sql_fetch($sql);
-if ($mb) {
+if (!$mb) {
     alert("이미 메일인증 하신 회원입니다.", G5_URL);
 }
 
@@ -26,8 +29,12 @@ if ($row['cnt']) {
 $subject = '['.$config['cf_title'].'] 인증확인 메일입니다.';
 
 $mb_name = $mb['mb_name'];
-$mb_datetime = $mb['mb_datetime'] ? $mb['mb_datetime'] : G5_TIME_YMDHIS;
-$mb_md5 = md5($mb_id.$mb_email.$mb_datetime);
+
+// 어떠한 회원정보도 포함되지 않은 일회용 난수를 생성하여 인증에 사용
+$mb_md5 = md5(pack('V*', rand(), rand(), rand(), rand()));
+
+sql_query(" update {$g5['member_table']} set mb_email_certify2 = '$mb_md5' where mb_id = '$mb_id' ");
+
 $certify_href = G5_BBS_URL.'/email_certify.php?mb_id='.$mb_id.'&amp;mb_md5='.$mb_md5;
 
 ob_start();

bbs/register_form_update.php

@@ -253,8 +253,12 @@ if ($w == '') {
     if ($config['cf_email_mb_member']) {
         $subject = '['.$config['cf_title'].'] 회원가입을 축하드립니다.';
 
-        $mb_md5 = md5($mb_id.$mb_email.G5_TIME_YMDHIS);
-        $certify_href = G5_BBS_URL.'/email_certify.php?mb_id='.$mb_id.'&mb_md5='.$mb_md5;
+        // 어떠한 회원정보도 포함되지 않은 일회용 난수를 생성하여 인증에 사용
+        if ($config['cf_use_email_certify']) {
+            $mb_md5 = md5(pack('V*', rand(), rand(), rand(), rand()));
+            sql_query(" update {$g5['member_table']} set mb_email_certify2 = '$mb_md5' where mb_id = '$mb_id' ");
+            $certify_href = G5_BBS_URL.'/email_certify.php?mb_id='.$mb_id.'&mb_md5='.$mb_md5;
+        }
 
         ob_start();
         include_once ('./register_form_update_mail1.php');
@@ -396,8 +400,11 @@ if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name']
 if ($config['cf_use_email_certify'] && $old_email != $mb_email) {
     $subject = '['.$config['cf_title'].'] 인증확인 메일입니다.';
 
-    $mb_datetime = $member['mb_datetime'] ? $member['mb_datetime'] : G5_TIME_YMDHIS;
-    $mb_md5 = md5($mb_id.$mb_email.$mb_datetime);
+    // 어떠한 회원정보도 포함되지 않은 일회용 난수를 생성하여 인증에 사용
+    $mb_md5 = md5(pack('V*', rand(), rand(), rand(), rand()));
+
+    sql_query(" update {$g5['member_table']} set mb_email_certify2 = '$mb_md5' where mb_id = '$mb_id' ");
+
     $certify_href = G5_BBS_URL.'/email_certify.php?mb_id='.$mb_id.'&mb_md5='.$mb_md5;
 
     ob_start();
@@ -405,7 +412,7 @@ if ($config['cf_use_email_certify'] && $old_email != $mb_email) {
     $content = ob_get_contents();
     ob_end_clean();
 
-    mailer($config['cf_title'], $config['cf_admin_email'], $mb_email, $subject, $content, 1);
+    mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $mb_email, $subject, $content, 1);
 }
 
 

bbs/scrap_popin_update.php

@@ -10,6 +10,10 @@ if (!$is_member)
     exit;
 }
 
+// 게시글 존재하는지
+if(!$write['wr_id'])
+    alert_close('스크랩하시려는 게시글이 존재하지 않습니다.');
+
 $sql = " select count(*) as cnt from {$g5['scrap_table']}
             where mb_id = '{$member['mb_id']}'
             and bo_table = '$bo_table'

bbs/view.php

@@ -72,12 +72,8 @@ $update_href = $delete_href = '';
 // 로그인중이고 자신의 글이라면 또는 관리자라면 비밀번호를 묻지 않고 바로 수정, 삭제 가능
 if (($member['mb_id'] && ($member['mb_id'] == $write['mb_id'])) || $is_admin) {
     $update_href = './write.php?w=u&bo_table='.$bo_table.'&wr_id='.$wr_id.'&page='.$page.$qstr;
-    $delete_href = './delete.php?bo_table='.$bo_table.'&wr_id='.$wr_id.'&page='.$page.urldecode($qstr);
-    if ($is_admin)
-    {
-        set_session("ss_delete_token", $token = uniqid(time()));
-        $delete_href ='./delete.php?bo_table='.$bo_table.'&wr_id='.$wr_id.'&token='.$token.'&page='.$page.urldecode($qstr);
-    }
+    set_session('ss_delete_token', $token = uniqid(time()));
+    $delete_href ='./delete.php?bo_table='.$bo_table.'&wr_id='.$wr_id.'&token='.$token.'&page='.$page.urldecode($qstr);
 }
 else if (!$write['mb_id']) { // 회원이 쓴 글이 아니라면
     $update_href = './password.php?w=u&bo_table='.$bo_table.'&wr_id='.$wr_id.'&page='.$page.$qstr;

bbs/view_comment.php

@@ -9,11 +9,6 @@ if ($is_guest && $board['bo_comment_level'] < 2) {
 
 @include_once($board_skin_path.'/view_comment.head.skin.php');
 
-// 코멘트를 새창으로 여는 경우 세션값이 없으므로 생성한다.
-if ($is_admin && !$token) {
-    set_session("ss_delete_token", $token = uniqid(time()));
-}
-
 $list = array();
 
 $is_comment_write = false;
@@ -72,10 +67,13 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $list[$i]['is_del']  = false;
     if ($is_comment_write || $is_admin)
     {
+        $token = '';
+
         if ($member['mb_id'])
         {
             if ($row['mb_id'] == $member['mb_id'] || $is_admin)
             {
+                set_session('ss_delete_comment_'.$row['wr_id'].'_token', $token = uniqid(time()));
                 $list[$i]['del_link']  = './delete_comment.php?bo_table='.$bo_table.'&amp;comment_id='.$row['wr_id'].'&amp;token='.$token.'&amp;page='.$page.$qstr;
                 $list[$i]['is_edit']   = true;
                 $list[$i]['is_del']    = true;

bbs/write.php

@@ -337,6 +337,8 @@ if ($w == '') {
     }
 
     $file = get_file($bo_table, $wr_id);
+    if($file_count < $file['count'])
+        $file_count = $file['count'];
 } else if ($w == 'r') {
     if (strstr($write['wr_option'], 'secret')) {
         $is_secret = true;

bbs/write_comment_update.php

@@ -3,6 +3,12 @@ define('G5_CAPTCHA', true);
 include_once('./_common.php');
 include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 
+// 토큰체크
+$comment_token = trim(get_session('ss_comment_token'));
+set_session('ss_comment_token', '');
+if(!trim($_POST['token']) || !$comment_token || $comment_token != $_POST['token'])
+    alert('올바른 방법으로 이용해 주십시오.');
+
 // 090710
 if (substr_count($wr_content, "&#") > 50) {
     alert('내용에 올바르지 않은 코드가 다수 포함되어 있습니다.');
@@ -77,12 +83,15 @@ if ($w == 'c') // 댓글 입력
     // 댓글 답변
     if ($comment_id)
     {
-        $sql = " select wr_id, wr_comment, wr_comment_reply from $write_table
+        $sql = " select wr_id, wr_parent, wr_comment, wr_comment_reply from $write_table
                     where wr_id = '$comment_id' ";
         $reply_array = sql_fetch($sql);
         if (!$reply_array['wr_id'])
             alert('답변할 댓글이 없습니다.\\n\\n답변하는 동안 댓글이 삭제되었을 수 있습니다.');
 
+        if($wr['wr_parent'] != $reply_array['wr_parent'])
+            alert('댓글을 등록할 수 없습니다.');
+
         $tmp_comment = $reply_array['wr_comment'];
 
         if (strlen($reply_array['wr_comment_reply']) == 5)

bbs/write_token.php

@@ -0,0 +1,13 @@
+<?php
+include_once('./_common.php');
+include_once(G5_LIB_PATH.'/json.lib.php');
+
+if(!$bo_table)
+   die(json_encode(array('error'=>'게시판 정보가 올바르지 않습니다.', 'url'=>G5_URL)));
+
+set_session('ss_write_'.$bo_table.'_token', '');
+
+$token = get_write_token($bo_table);
+
+die(json_encode(array('error'=>'', 'token'=>$token, 'url'=>'')));
+?>

bbs/write_update.php

@@ -3,6 +3,9 @@ include_once('./_common.php');
 include_once(G5_LIB_PATH.'/naver_syndi.lib.php');
 include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
 
+// 토큰체크
+check_write_token($bo_table);
+
 $g5['title'] = '게시글 저장';
 
 $msg = array();
@@ -15,7 +18,12 @@ if($board['bo_use_category']) {
         $categories = array_map('trim', explode("|", $board['bo_category_list'].($is_admin ? '|공지' : '')));
         if(!empty($categories) && !in_array($ca_name, $categories))
             $msg[] = '분류를 올바르게 입력하세요.';
+
+        if(empty($categories))
+            $ca_name = '';
     }
+} else {
+    $ca_name = '';
 }
 
 $wr_subject = '';
@@ -77,10 +85,16 @@ if ($w == 'u' || $w == 'r') {
 }
 
 // 외부에서 글을 등록할 수 있는 버그가 존재하므로 비밀글은 사용일 경우에만 가능해야 함
-if (!$is_admin && !$board['bo_use_secret'] && $secret) {
+if (!$is_admin && !$board['bo_use_secret'] && (stripos($_POST['html'], 'secret') !== false || stripos($_POST['secret'], 'secret') !== false || stripos($_POST['mail'], 'secret') !== false)) {
 	alert('비밀글 미사용 게시판 이므로 비밀글로 등록할 수 없습니다.');
 }
 
+$secret = '';
+if (isset($_POST['secret']) && $_POST['secret']) {
+    if(preg_match('#secret#', strtolower($_POST['secret']), $matches))
+        $secret = $matches[0];
+}
+
 // 외부에서 글을 등록할 수 있는 버그가 존재하므로 비밀글 무조건 사용일때는 관리자를 제외(공지)하고 무조건 비밀글로 등록
 if (!$is_admin && $board['bo_use_secret'] == 2) {
     $secret = 'secret';
@@ -88,12 +102,14 @@ if (!$is_admin && $board['bo_use_secret'] == 2) {
 
 $html = '';
 if (isset($_POST['html']) && $_POST['html']) {
-    $html = $_POST['html'];
+    if(preg_match('#html(1|2)#', strtolower($_POST['html']), $matches))
+        $html = $matches[0];
 }
 
 $mail = '';
 if (isset($_POST['mail']) && $_POST['mail']) {
-    $mail = $_POST['mail'];
+    if(preg_match('#mail#', strtolower($_POST['mail']), $matches))
+        $mail = $matches[0];
 }
 
 $notice = '';
@@ -402,6 +418,24 @@ if (!$group['gr_use_access'] && $board['bo_read_level'] < 2 && !$secret) {
     naver_syndi_ping($bo_table, $wr_id);
 }
 
+// 파일개수 체크
+$file_count   = 0;
+$upload_count = count($_FILES['bf_file']['name']);
+
+for ($i=0; $i<$upload_count; $i++) {
+    if($_FILES['bf_file']['name'][$i] && is_uploaded_file($_FILES['bf_file']['tmp_name'][$i]))
+        $file_count++;
+}
+
+if($w == 'u') {
+    $file = get_file($bo_table, $wr_id);
+    if($file_count && (int)$file['count'] > $board['bo_upload_count'])
+        alert('기존 파일을 삭제하신 후 첨부파일을 '.number_format($board['bo_upload_count']).'개 이하로 업로드 해주십시오.');
+} else {
+    if($file_count > $board['bo_upload_count'])
+        alert('첨부파일을 '.number_format($board['bo_upload_count']).'개 이하로 업로드 해주십시오.');
+}
+
 // 디렉토리가 없다면 생성합니다. (퍼미션도 변경하구요.)
 @mkdir(G5_DATA_PATH.'/file/'.$bo_table, G5_DIR_PERMISSION);
 @chmod(G5_DATA_PATH.'/file/'.$bo_table, G5_DIR_PERMISSION);

common.php

@@ -39,6 +39,7 @@ function g5_path()
     $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];
     if(isset($_SERVER['HTTP_HOST']) && preg_match('/:[0-9]+$/', $host))
         $host = preg_replace('/:[0-9]+$/', '', $host);
+    $host = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", '', $host);
     $result['url'] = $http.$host.$port.$user.$root;
     return $result;
 }
@@ -228,7 +229,7 @@ $qstr = '';
 if (isset($_REQUEST['sca']))  {
     $sca = clean_xss_tags(trim($_REQUEST['sca']));
     if ($sca) {
-        $sca = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\s]/", "", $sca);
+        $sca = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", "", $sca);
         $qstr .= '&amp;sca=' . urlencode($sca);
     }
 } else {
@@ -237,7 +238,7 @@ if (isset($_REQUEST['sca']))  {
 
 if (isset($_REQUEST['sfl']))  {
     $sfl = trim($_REQUEST['sfl']);
-    $sfl = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\s]/", "", $sfl);
+    $sfl = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*\s]/", "", $sfl);
     if ($sfl)
         $qstr .= '&amp;sfl=' . urlencode($sfl); // search field (검색 필드)
 } else {
@@ -255,7 +256,7 @@ if (isset($_REQUEST['stx']))  { // search text (검색어)
 
 if (isset($_REQUEST['sst']))  {
     $sst = trim($_REQUEST['sst']);
-    $sst = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\s]/", "", $sst);
+    $sst = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*\s]/", "", $sst);
     if ($sst)
         $qstr .= '&amp;sst=' . urlencode($sst); // search sort (검색 정렬 필드)
 } else {

config.php

@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.1.12');
+define('G5_GNUBOARD_VER', '5.2.4');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);
@@ -30,7 +30,7 @@ define('G5_DOMAIN', '');
 define('G5_HTTPS_DOMAIN', '');
 
 /*
-www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요.
+www.sir.kr 과 sir.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.kr 과 같이 입력하세요.
 이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다.
 */
 define('G5_COOKIE_DOMAIN',  '');

extend/version.extend.php

@@ -0,0 +1,6 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+define('G5_JS_VER',  '161020');
+define('G5_CSS_VER', '161020');
+?>

g4_import_run.php

@@ -28,6 +28,8 @@ $g4_config_file = trim($_POST['file_path']);
 if(!$g4_config_file)
     alert('config.php 파일의 경로를 입력해 주십시오.');
 
+$g4_config_file = preg_replace('#/config.php$#i', '', $g4_config_file).'/config.php';
+
 if(!is_file($g4_config_file))
     alert('입력하신 경로에 config.php 파일이 존재하지 않습니다.');
 

head.sub.php

@@ -55,9 +55,9 @@ if($config['cf_add_meta'])
 <?php
 if (defined('G5_IS_ADMIN')) {
     if(!defined('_THEME_PREVIEW_'))
-        echo '<link rel="stylesheet" href="'.G5_ADMIN_URL.'/css/admin.css">'.PHP_EOL;
+        echo '<link rel="stylesheet" href="'.G5_ADMIN_URL.'/css/admin.css?ver='.G5_CSS_VER.'">'.PHP_EOL;
 } else {
-    echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').'.css">'.PHP_EOL;
+    echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').'.css?ver='.G5_CSS_VER.'">'.PHP_EOL;
 }
 ?>
 <!--[if lte IE 8]>
@@ -74,16 +74,14 @@ var g5_bo_table  = "<?php echo isset($bo_table)?$bo_table:''; ?>";
 var g5_sca       = "<?php echo isset($sca)?$sca:''; ?>";
 var g5_editor    = "<?php echo ($config['cf_editor'] && $board['bo_use_dhtml_editor'])?$config['cf_editor']:''; ?>";
 var g5_cookie_domain = "<?php echo G5_COOKIE_DOMAIN ?>";
-<?php
-if ($is_admin) {
-    echo 'var g5_admin_url = "'.G5_ADMIN_URL.'";'.PHP_EOL;
-}
-?>
+<?php if(defined('G5_IS_ADMIN')) { ?>
+var g5_admin_url = "<?php echo G5_ADMIN_URL; ?>";
+<?php } ?>
 </script>
 <script src="<?php echo G5_JS_URL ?>/jquery-1.8.3.min.js"></script>
-<script src="<?php echo G5_JS_URL ?>/jquery.menu.js"></script>
-<script src="<?php echo G5_JS_URL ?>/common.js"></script>
-<script src="<?php echo G5_JS_URL ?>/wrest.js"></script>
+<script src="<?php echo G5_JS_URL ?>/jquery.menu.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL ?>/common.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL ?>/wrest.js?ver=<?php echo G5_JS_VER; ?>"></script>
 <?php
 if(G5_IS_MOBILE) {
     echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지

install/gnuboard5.sql

@@ -463,7 +463,8 @@ CREATE TABLE IF NOT EXISTS `g5_member` (
   `mb_ip` varchar(255) NOT NULL default '',
   `mb_leave_date` varchar(8) NOT NULL default '',
   `mb_intercept_date` varchar(8) NOT NULL default '',
-  `mb_email_certify` datetime NOT NULL default '0000-00-00 00:00:00',  
+  `mb_email_certify` datetime NOT NULL default '0000-00-00 00:00:00',
+  `mb_email_certify2` varchar(255) NOT NULL default '',
   `mb_memo` text NOT NULL,
   `mb_lost_certify` varchar(255) NOT NULL,
   `mb_mailling` tinyint(4) NOT NULL default '0',

js/common.js

@@ -546,6 +546,26 @@ function font_resize(id, rmv_class, add_class)
     set_cookie("ck_font_resize_add_class", add_class, 1, g5_cookie_domain);
 }
 
+/**
+ * 댓글 수정 토큰
+**/
+function set_comment_token(f)
+{
+    if(typeof f.token === "undefined")
+        $(f).prepend('<input type="hidden" name="token" value="">');
+
+    $.ajax({
+        url: g5_bbs_url+"/ajax.comment_token.php",
+        type: "GET",
+        dataType: "json",
+        async: false,
+        cache: false,
+        success: function(data, textStatus) {
+            f.token.value = data.token;
+        }
+    });
+}
+
 $(function(){
     $(".win_point").click(function() {
         win_point(this.href);
@@ -669,4 +689,53 @@ $(function(){
             return false;
         }
     });
+});
+
+function get_write_token(bo_table)
+{
+    var token = "";
+
+    $.ajax({
+        type: "POST",
+        url: g5_bbs_url+"/write_token.php",
+        data: { bo_table: bo_table },
+        cache: false,
+        async: false,
+        dataType: "json",
+        success: function(data) {
+            if(data.error) {
+                alert(data.error);
+                if(data.url)
+                    document.location.href = data.url;
+
+                return false;
+            }
+
+            token = data.token;
+        }
+    });
+
+    return token;
+}
+
+$(function() {
+    $(document).on("click", "form[name=fwrite] input:submit", function() {
+        var f = this.form;
+        var bo_table = f.bo_table.value;
+        var token = get_write_token(bo_table);
+
+        if(!token) {
+            alert("토큰 정보가 올바르지 않습니다.");
+            return false;
+        }
+
+        var $f = $(f);
+
+        if(typeof f.token === "undefined")
+            $f.prepend('<input type="hidden" name="token" value="">');
+
+        $f.find("input[name=token]").val(token);
+
+        return true;
+    });
 });

lib/common.lib.php

@@ -212,8 +212,8 @@ function url_auto_link($str)
     global $config;
 
     // 140326 유창화님 제안코드로 수정
-    // http://sir.co.kr/bbs/board.php?bo_table=pg_lecture&wr_id=461
-    // http://sir.co.kr/bbs/board.php?bo_table=pg_lecture&wr_id=463
+    // http://sir.kr/pg_lecture/461
+    // http://sir.kr/pg_lecture/463
     $str = str_replace(array("<", ">", "&", """, " ", "'"), array("\t_lt_\t", "\t_gt_\t", "&", "\"", "\t_nbsp_\t", "'"), $str);
     //$str = preg_replace("`(?:(?:(?:href|src)\s*=\s*(?:\"|'|)){0})((http|https|ftp|telnet|news|mms)://[^\"'\s()]+)`", "<A HREF=\"\\1\" TARGET='{$config['cf_link_target']}'>\\1</A>", $str);
     $str = preg_replace("/([^(href=\"?'?)|(src=\"?'?)]|\(|^)((http|https|ftp|telnet|news|mms):\/\/[a-zA-Z0-9\.-]+\.[가-힣\xA1-\xFEa-zA-Z0-9\.:&#=_\?\/~\+%@;\-\|\,\(\)]+)/i", "\\1<A HREF=\"\\2\" TARGET=\"{$config['cf_link_target']}\">\\2</A>", $str);
@@ -712,7 +712,7 @@ function get_member($mb_id, $fields='*')
 // 제목별로 컬럼 정렬하는 QUERY STRING
 function subject_sort_link($col, $query_string='', $flag='asc')
 {
-    global $sst, $sod, $sfl, $stx, $page;
+    global $sst, $sod, $sfl, $stx, $page, $sca;
 
     $q1 = "sst=$col";
     if ($flag == 'asc')
@@ -744,6 +744,7 @@ function subject_sort_link($col, $query_string='', $flag='asc')
     $arr_query[] = $q2;
     $arr_query[] = 'sfl='.$sfl;
     $arr_query[] = 'stx='.$stx;
+    $arr_query[] = 'sca='.$sca;
     $arr_query[] = 'page='.$page;
     $qstr = implode("&amp;", $arr_query);
 
@@ -1200,7 +1201,8 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
     global $g5;
     global $bo_table, $sca, $is_admin, $member;
 
-    $email = base64_encode($email);
+    $email_enc = new str_encrypt();
+    $email = $email_enc->encrypt($email);
     $homepage = set_http(clean_xss_tags($homepage));
 
     $name     = get_text($name, 0, true);
@@ -2422,6 +2424,8 @@ class html_process {
                 if(!trim($link[1]))
                     continue;
 
+                $link[1] = preg_replace('#\.css([\'\"]?>)$#i', '.css?ver='.G5_CSS_VER.'$1', $link[1]);
+
                 $stylesheet .= PHP_EOL.$link[1];
             }
         }
@@ -2446,6 +2450,8 @@ class html_process {
                 if(!trim($js[1]))
                     continue;
 
+                $js[1] = preg_replace('#\.js([\'\"]?>)$#i', '.js?ver='.G5_JS_VER.'$1', $js[1]);
+
                 $javascript .= $php_eol.$js[1];
                 $php_eol = PHP_EOL;
             }
@@ -2463,7 +2469,10 @@ class html_process {
         <body>
         전에 스킨의 자바스크립트가 위치하도록 하게 한다.
         */
-        $buffer = preg_replace('#(</head>[^<]*<body[^>]*>)#', "$javascript\n$1", $buffer);
+        $nl = '';
+        if($javascript)
+            $nl = "\n";
+        $buffer = preg_replace('#(</head>[^<]*<body[^>]*>)#', "$javascript{$nl}$1", $buffer);
 
         return $buffer;
     }
@@ -2980,6 +2989,11 @@ function check_url_host($url, $msg='', $return_url=G5_URL)
     $p = @parse_url($url);
     $host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
 
+    if(stripos($url, 'http:') !== false) {
+        if(!isset($p['scheme']) || !$p['scheme'] || !isset($p['host']) || !$p['host'])
+            alert('url 정보가 올바르지 않습니다.', $return_url);
+    }
+
     if ((isset($p['scheme']) && $p['scheme']) || (isset($p['host']) && $p['host'])) {
         //if ($p['host'].(isset($p['port']) ? ':'.$p['port'] : '') != $_SERVER['HTTP_HOST']) {
         if ($p['host'] != $host) {
@@ -3173,4 +3187,76 @@ function check_vaild_callback($callback){
              return true;
    }
 }
+
+// 문자열 암복호화
+class str_encrypt
+{
+    var $salt;
+    var $lenght;
+
+    function __construct($salt='')
+    {
+        if(!$salt)
+            $this->salt = md5(G5_MYSQL_PASSWORD);
+        else
+            $this->salt = $salt;
+
+        $this->length = strlen($this->salt);
+    }
+
+    function encrypt($str)
+    {
+        $length = strlen($str);
+        $result = '';
+
+        for($i=0; $i<$length; $i++) {
+            $char    = substr($str, $i, 1);
+            $keychar = substr($this->salt, ($i % $this->length) - 1, 1);
+            $char    = chr(ord($char) + ord($keychar));
+            $result .= $char;
+        }
+
+        return base64_encode($result);
+    }
+
+    function decrypt($str) {
+        $result = '';
+        $str    = base64_decode($str);
+        $length = strlen($str);
+
+        for($i=0; $i<$length; $i++) {
+            $char    = substr($str, $i, 1);
+            $keychar = substr($this->salt, ($i % $this->length) - 1, 1);
+            $char    = chr(ord($char) - ord($keychar));
+            $result .= $char;
+        }
+
+        return $result;
+    }
+}
+
+// 불법접근을 막도록 토큰을 생성하면서 토큰값을 리턴
+function get_write_token($bo_table)
+{
+    $token = md5(uniqid(rand(), true));
+    set_session('ss_write_'.$bo_table.'_token', $token);
+
+    return $token;
+}
+
+
+// POST로 넘어온 토큰과 세션에 저장된 토큰 비교
+function check_write_token($bo_table)
+{
+    if(!$bo_table)
+        alert('올바른 방법으로 이용해 주십시오.', G5_URL);
+
+    $token = get_session('ss_write_'.$bo_table.'_token');
+    set_session('ss_write_'.$bo_table.'_token', '');
+
+    if(!$token || !$_REQUEST['token'] || $token != $_REQUEST['token'])
+        alert('올바른 방법으로 이용해 주십시오.', G5_URL);
+
+    return true;
+}
 ?>

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

@@ -53,8 +53,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             $query_string = clean_query_string($_SERVER['QUERY_STRING']);
 
             if($w == 'cu') {
-                $sql = " select wr_id, wr_content from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
+                $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);
+                if (!($is_admin || ($member['mb_id'] == $cmt['mb_id'] && $cmt['mb_id'])))
+                    $cmt['wr_content'] = '';
                 $c_wr_content = $cmt['wr_content'];
             }
 
@@ -248,6 +250,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
         <?php if($is_guest) echo chk_captcha_js(); ?>
 
+        set_comment_token(f);
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;

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

@@ -53,8 +53,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             $query_string = clean_query_string($_SERVER['QUERY_STRING']);
 
             if($w == 'cu') {
-                $sql = " select wr_id, wr_content from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
+                $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);
+                if (!($is_admin || ($member['mb_id'] == $cmt['mb_id'] && $cmt['mb_id'])))
+                    $cmt['wr_content'] = '';
                 $c_wr_content = $cmt['wr_content'];
             }
 
@@ -248,6 +250,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
         <?php if($is_guest) echo chk_captcha_js(); ?>
 
+        set_comment_token(f);
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;

mobile/skin/faq/basic/list.skin.php

@@ -77,7 +77,7 @@ if( count($faq_master_list) ){
 
 <?php
 // 하단 HTML
-echo '<div id="faq_thtml">'.conv_content($fm['fm_tail_html'], 1).'</div>';
+echo '<div id="faq_thtml">'.conv_content($fm['fm_mobile_tail_html'], 1).'</div>';
 ?>
 
 <div id="faq_sch">

mobile/skin/member/basic/formmail.skin.php

@@ -11,7 +11,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
     <form name="fformmail" action="./formmail_send.php" onsubmit="return fformmail_submit(this);" method="post" enctype="multipart/form-data" style="margin:0px;">
     <input type="hidden" name="to" value="<?php echo $email ?>">
     <input type="hidden" name="attach" value="2">
-    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php if ($is_member) { // 회원이면 ?>
     <input type="hidden" name="fnick" value="<?php echo get_text($member['mb_nick']); ?>">
     <input type="hidden" name="fmail" value="<?php echo $member['mb_email'] ?>">

mobile/skin/member/basic/style.css

@@ -135,7 +135,8 @@
 #memo_list_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
 #memo_list_ul li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
 #memo_list_ul .memo_link {}
-#memo_list_ul .memo_send {position:absolute;top:10px;right:30px}
+#memo_list_ul .memo_send {display:block;margin-top:4px}
+#memo_list_ul .memo_send a{color:#777}
 #memo_list_ul .memo_read {font-size:0.95em;color:#666}
 #memo_list_ul .memo_del {position:absolute;top:10px;right:0}
 

mobile/tail.php

@@ -21,7 +21,7 @@ if(defined('G5_THEME_PATH')) {
     <div id="ft_copy">
         <div id="ft_company">
             <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=company">회사소개</a>
-            <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=privacy">개인정보취급방침</a>
+            <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=privacy">개인정보처리방침</a>
             <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=provision">서비스이용약관</a>
         </div>
         Copyright &copy; <b>소유하신 도메인.</b> All rights reserved.<br>

plugin/editor/smarteditor2/SmartEditor2.html

@@ -1,74 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>네이버 :: Smart Editor 2 &#8482;</title>
-<script type="text/javascript" src="./js/HuskyEZCreator.js" charset="utf-8"></script>
-</head>
-<body>
-<form action="sample.php" method="post">
-	<textarea name="ir1" id="ir1" rows="10" cols="100" style="width:766px; height:412px; display:none;"></textarea>
-	<!--textarea name="ir1" id="ir1" rows="10" cols="100" style="width:100%; height:412px; min-width:610px; display:none;"></textarea-->
-	<p>
-		<input type="button" onclick="pasteHTML();" value="본문에 내용 넣기" />
-		<input type="button" onclick="showHTML();" value="본문 내용 가져오기" />
-		<input type="button" onclick="submitContents(this);" value="서버로 내용 전송" />
-		<input type="button" onclick="setDefaultFont();" value="기본 폰트 지정하기 (궁서_24)" />
-	</p>
-</form>
-
-<script type="text/javascript">
-var oEditors = [];
-
-// 추가 글꼴 목록
-//var aAdditionalFontSet = [["MS UI Gothic", "MS UI Gothic"], ["Comic Sans MS", "Comic Sans MS"],["TEST","TEST"]];
-
-nhn.husky.EZCreator.createInIFrame({
-	oAppRef: oEditors,
-	elPlaceHolder: "ir1",
-	sSkinURI: "SmartEditor2Skin.html",	
-	htParams : {
-		bUseToolbar : true,				// 툴바 사용 여부 (true:사용/ false:사용하지 않음)
-		bUseVerticalResizer : true,		// 입력창 크기 조절바 사용 여부 (true:사용/ false:사용하지 않음)
-		bUseModeChanger : true,			// 모드 탭(Editor | HTML | TEXT) 사용 여부 (true:사용/ false:사용하지 않음)
-		//aAdditionalFontList : aAdditionalFontSet,		// 추가 글꼴 목록
-		fOnBeforeUnload : function(){
-			//alert("완료!");
-		}
-	}, //boolean
-	fOnAppLoad : function(){
-		//예제 코드
-		//oEditors.getById["ir1"].exec("PASTE_HTML", ["로딩이 완료된 후에 본문에 삽입되는 text입니다."]);
-	},
-	fCreator: "createSEditor2"
-});
-
-function pasteHTML() {
-	var sHTML = "<span style='color:#FF0000;'>이미지도 같은 방식으로 삽입합니다.<\/span>";
-	oEditors.getById["ir1"].exec("PASTE_HTML", [sHTML]);
-}
-
-function showHTML() {
-	var sHTML = oEditors.getById["ir1"].getIR();
-	alert(sHTML);
-}
-	
-function submitContents(elClickedObj) {
-	oEditors.getById["ir1"].exec("UPDATE_CONTENTS_FIELD", []);	// 에디터의 내용이 textarea에 적용됩니다.
-	
-	// 에디터의 내용에 대한 값 검증은 이곳에서 document.getElementById("ir1").value를 이용해서 처리하면 됩니다.
-	
-	try {
-		elClickedObj.form.submit();
-	} catch(e) {}
-}
-
-function setDefaultFont() {
-	var sDefaultFont = '궁서';
-	var nFontSize = 24;
-	oEditors.getById["ir1"].setDefaultFont(sDefaultFont, nFontSize);
-}
-</script>
-
-</body>
-</html>

plugin/editor/smarteditor2/SmartEditor2Skin.html

@@ -9,20 +9,20 @@
 <style type="text/css">
 	body { margin: 10px; }
 </style>
-<script type="text/javascript" src="./js/jindo.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="./js/jindo_component.js" charset="utf-8"></script>
-<script type="text/javascript" src="./js/SE2B_Configuration_Service.js" charset="utf-8"></script>	<!-- 설정 파일 -->
-<script type="text/javascript" src="./js/SE2B_Configuration_General.js" charset="utf-8"></script>	<!-- 설정 파일 -->
-<script type="text/javascript" src="./js/SE2BasicCreator.js?v3" charset="utf-8"></script>
+<script type="text/javascript" src="./js/lib/jindo2.all.js" charset="utf-8"></script>
+<script type="text/javascript" src="./js/lib/jindo_component.js" charset="utf-8"></script>
+<script type="text/javascript" src="./js/SE2M_Configuration.js?v3" charset="utf-8"></script>	<!-- 설정 파일 -->
+<script type="text/javascript" src="./js/SE2BasicCreator.js" charset="utf-8"></script>
+<script type="text/javascript" src="./js/smarteditor2.min.js" charset="utf-8"></script>
 
-<script src='js/smarteditor2.min.js?v2' charset='utf-8'></script>
-<script src='photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js' charset='utf-8'></script>
+<!-- 사진첨부샘플  --> 
+<script type="text/javascript" src="photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js?v3" charset="utf-8"></script>
 </head>
 <body>
 
 
 
-<span id="rev"></span>
+<span id="rev" style="display:none">Version: 2.8.2.12056 </span>
 
 <!-- SE2 Markup Start -->	
 <div id="smart_editor2">
@@ -37,24 +37,12 @@
 						<div class="se2_in_layer">
 							<ul class="se2_l_font_fam">
 							<li style="display:none"><button type="button"><span>@DisplayName@<span>(</span><em style="font-family:FontFamily;">@SampleText@</em><span>)</span></span></button></li>
-							<!--
-							<li><button type="button"><span>돋움<span>(</span><em style="font-family:'돋움',Dotum,Sans-serif;">가나다라</em><span>)</span></span></button></li>
-							<li><button type="button"><span>돋움체<span>(</span><em style="font-family:'돋움체',DotumChe,Sans-serif;">가나다라</em><span>)</span></span></button></li>
-							<li><button type="button"><span>굴림<span>(</span><em style="font-family:'굴림',Gulim,Sans-serif;">가나다라</em><span>)</span></span></button></li>
-							<li><button type="button"><span>굴림체<span>(</span><em style="font-family:'굴림체',GulimChe,Sans-serif;">가나다라</em><span>)</span></span></button></li>
-							<li><button type="button"><span>바탕<span>(</span><em style="font-family:'바탕',Batang,serif;">가나다라</em><span>)</span></span></button></li>
-							<li><button type="button"><span>바탕체<span>(</span><em style="font-family:'바탕체',BatangChe,serif;">가나다라</em><span>)</span></span></button></li>
-							<li><button type="button"><span>궁서<span>(</span><em style="font-family:'궁서',Gungsuh,serif;">가나다라</em><span>)</span></span></button></li>
-							<li><button type="button"><span>Arial<span>(</span><em style="font-family:arial,Sans-serif;">abcd</em><span>)</span></span></button></li>
-							<li><button type="button"><span>Tahoma<span>(</span><em style="font-family:tahoma,Sans-serif;">abcd</em><span>)</span></span></button></li>
-							<li><button type="button"><span>Times New Roman<span>(</span><em style="font-family:'Times New Roman',Times,serif;">abcd</em><span>)</span></span></button></li>
-							<li><button type="button"><span>Verdana<span>(</span><em style="font-family:verdana,Sans-serif;">abcd</em><span>)</span></span></button></li>
-							<li><button type="button"><span>Courier New<span>(</span><em style="font-family:Courier New,Sans-serif;">abcd</em><span>)</span></span></button></li>
-							-->
 							<li class="se2_division husky_seditor_font_separator"></li>
-							<li class="husky_seditor_font_nanumgothic"><button type="button"><span>나눔고딕<span>(</span><em style="font-family:'나눔고딕',NanumGothic,Sans-serif;">가나다라</em><span>)</span></span></button></li>
-							<li class="husky_seditor_font_nanummyeongjo"><button type="button"><span>나눔명조<span>(</span><em style="font-family:'나눔명조',NanumMyeongjo,serif;">가나다라</em><span>)</span></span></button></li>
-							<li class="husky_seditor_font_nanumgothiccoding"><button type="button"><span>나눔고딕코딩<span>(</span><em style="font-family:'나눔고딕코딩',NanumGothicCoding,Sans-serif;">가나다라</em><span>)</span></span></button></li>
+							<li><button type="button"><span>나눔고딕<span>(</span><em style="font-family:'나눔고딕',NanumGothic;">가나다라</em><span>)</span></span></button></li>
+							<li><button type="button"><span>나눔명조<span>(</span><em style="font-family:'나눔명조',NanumMyeongjo;">가나다라</em><span>)</span></span></button></li>
+							<li><button type="button"><span>나눔고딕코딩<span>(</span><em style="font-family:'나눔고딕코딩',NanumGothicCoding;">가나다라</em><span>)</span></span></button></li>
+							<li><button type="button"><span>나눔바른고딕<span>(</span><em style="font-family:'나눔바른고딕',NanumBarunGothic;">가나다라</em><span>)</span></span></button></li>
+							<li><button type="button"><span>나눔바른펜<span>(</span><em style="font-family:'나눔바른펜',NanumBarunPen;">가나다라</em><span>)</span></span></button></li>
 							</ul>
 						</div>
 					</div>
@@ -66,23 +54,23 @@
 					<div class="se2_layer husky_se_fontSize_layer">
 						<div class="se2_in_layer">
 							<ul class="se2_l_font_size">
-							<li><button type="button" style="height:19px;"><span style="margin-top:4px; margin-bottom:3px; margin-left:5px; font-size:7pt;">가나다라마바사<span style=" font-size:7pt;">(7pt)</span></span></button></li>
-							<li><button type="button" style="height:20px;"><span style="margin-bottom:2px; font-size:8pt;">가나다라마바사<span style="font-size:8pt;">(8pt)</span></span></button></li>
-							<li><button type="button" style="height:20px;"><span style="margin-bottom:1px; font-size:9pt;">가나다라마바사<span style="font-size:9pt;">(9pt)</span></span></button></li>
-							<li><button type="button" style="height:21px;"><span style="margin-bottom:1px; font-size:10pt;">가나다라마바사<span style="font-size:10pt;">(10pt)</span></span></button></li>
-							<li><button type="button" style="height:23px;"><span style="margin-bottom:2px; font-size:11pt;">가나다라마바사<span style="font-size:11pt;">(11pt)</span></span></button></li>
-							<li><button type="button" style="height:25px;"><span style="margin-bottom:1px; font-size:12pt;">가나다라마바사<span style="font-size:12pt;">(12pt)</span></span></button></li>
-							<li><button type="button" style="height:27px;"><span style="margin-bottom:2px; font-size:14pt;">가나다라마바사<span style="margin-left:6px;font-size:14pt;">(14pt)</span></span></button></li>
-							<li><button type="button" style="height:33px;"><span style="margin-bottom:1px; font-size:18pt;">가나다라마바사<span style="margin-left:8px;font-size:18pt;">(18pt)</span></span></button></li>
-							<li><button type="button" style="height:39px;"><span style="margin-left:3px; font-size:24pt;">가나다라마<span style="margin-left:11px;font-size:24pt;">(24pt)</span></span></button></li>
-							<li><button type="button" style="height:53px;"><span style="margin-top:-1px; margin-left:3px; font-size:36pt;">가나다<span style="font-size:36pt;">(36pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-top:4px; margin-bottom:3px; margin-left:5px; font-size:7pt;">가나다라마바사<span style=" font-size:7pt;">(7pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-bottom:2px; font-size:8pt;">가나다라마바사<span style="font-size:8pt;">(8pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-bottom:1px; font-size:9pt;">가나다라마바사<span style="font-size:9pt;">(9pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-bottom:1px; font-size:10pt;">가나다라마바사<span style="font-size:10pt;">(10pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-bottom:2px; font-size:11pt;">가나다라마바사<span style="font-size:11pt;">(11pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-bottom:1px; font-size:12pt;">가나다라마바사<span style="font-size:12pt;">(12pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-bottom:2px; font-size:14pt;">가나다라마바사<span style="margin-left:6px;font-size:14pt;">(14pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-bottom:1px; font-size:18pt;">가나다라마바사<span style="margin-left:8px;font-size:18pt;">(18pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-left:3px; font-size:24pt;">가나다라마<span style="margin-left:11px;font-size:24pt;">(24pt)</span></span></button></li>
+							<li><button type="button"><span style="margin-top:-1px; margin-left:3px; font-size:36pt;">가나다<span style="font-size:36pt;">(36pt)</span></span></button></li>
 							</ul>
 						</div>
 					</div>
 					<!-- //폰트 사이즈 레이어 -->
 				</li>
 </ul><ul>
-				<li class="husky_seditor_ui_bold"><button type="button" title="굵게[Ctrl+B]" class="se2_bold"><span class="_buttonRound">굵게[Ctrl+B]</span></button></li>
+				<li class="husky_seditor_ui_bold first_child"><button type="button" title="굵게[Ctrl+B]" class="se2_bold"><span class="_buttonRound tool_bg">굵게[Ctrl+B]</span></button></li>
 
 				<li class="husky_seditor_ui_underline"><button type="button" title="밑줄[Ctrl+U]" class="se2_underline"><span class="_buttonRound">밑줄[Ctrl+U]</span></button></li>
 
@@ -215,17 +203,17 @@
 
 				<li class="husky_seditor_ui_superscript"><button type="button" title="윗첨자" class="se2_sup"><span class="_buttonRound">윗첨자</span></button></li>
 
-				<li class="husky_seditor_ui_subscript"><button type="button" title="아래첨자" class="se2_sub"><span class="_buttonRound">아래첨자</span></button></li>
+				<li class="husky_seditor_ui_subscript last_child"><button type="button" title="아래첨자" class="se2_sub"><span class="_buttonRound tool_bg">아래첨자</span></button></li>
 </ul><ul>
-				<li class="husky_seditor_ui_justifyleft"><button type="button" title="왼쪽정렬" class="se2_left"><span class="_buttonRound">왼쪽정렬</span></button></li>
+				<li class="husky_seditor_ui_justifyleft first_child"><button type="button" title="왼쪽정렬" class="se2_left"><span class="_buttonRound tool_bg">왼쪽정렬</span></button></li>
 
 				<li class="husky_seditor_ui_justifycenter"><button type="button" title="가운데정렬" class="se2_center"><span class="_buttonRound">가운데정렬</span></button></li>
 
 				<li class="husky_seditor_ui_justifyright"><button type="button" title="오른쪽정렬" class="se2_right"><span class="_buttonRound">오른쪽정렬</span></button></li>
 
-				<li class="husky_seditor_ui_justifyfull"><button type="button" title="양쪽정렬" class="se2_justify"><span class="_buttonRound">양쪽정렬</span></button></li>
+				<li class="husky_seditor_ui_justifyfull"><button type="button" title="양쪽정렬" class="se2_justify"><span class="_buttonRound">양쪽정렬</span></button></li>	
 
-				<li class="husky_seditor_ui_lineHeight"><button type="button" title="줄간격" class="se2_lineheight" ><span class="_buttonRound">줄간격</span></button>
+				<li class="husky_seditor_ui_lineHeight last_child"><button type="button" title="줄간격" class="se2_lineheight" ><span class="_buttonRound tool_bg">줄간격</span></button>
 					<!-- 줄간격 레이어 -->
 					<div class="se2_layer husky_se2m_lineHeight_layer">
 						<div class="se2_in_layer">
@@ -265,7 +253,7 @@
 					</div>
 				</li>
 </ul><ul>
-				<li class="husky_seditor_ui_quote"><button type="button" title="인용구" class="se2_blockquote"><span class="_buttonRound">인용구</span></button>
+				<li class="husky_seditor_ui_quote single_child"><button type="button" title="인용구" class="se2_blockquote"><span class="_buttonRound tool_bg">인용구</span></button>
 					<!-- 인용구 -->
 					<div class="se2_layer husky_seditor_blockquote_layer" style="margin-left:-407px; display:none;">
 						<div class="se2_in_layer">
@@ -289,7 +277,7 @@
 					<!-- //인용구 -->
 				</li>
 </ul><ul>
-				<li class="husky_seditor_ui_hyperlink"><button type="button" title="링크" class="se2_url"><span class="_buttonRound">링크</span></button>
+				<li class="husky_seditor_ui_hyperlink first_child"><button type="button" title="링크" class="se2_url"><span class="_buttonRound tool_bg">링크</span></button>
 					<!-- 링크 -->
 					<div class="se2_layer" style="margin-left:-285px">
 						<div class="se2_in_layer">
@@ -512,7 +500,7 @@
 					<!--//@lazyload_html-->
 				</li>
 
-				<li class="husky_seditor_ui_findAndReplace"><button type="button" title="찾기/바꾸기" class="se2_find"><span class="_buttonRound">찾기/바꾸기</span></button>
+				<li class="husky_seditor_ui_findAndReplace last_child"><button type="button" title="찾기/바꾸기" class="se2_find"><span class="_buttonRound tool_bg">찾기/바꾸기</span></button>
 					<!--@lazyload_html find_and_replace-->
 					<!-- 찾기/바꾸기 -->
 					<div class="se2_layer husky_se2m_findAndReplace_layer" style="margin-left:-238px;">
@@ -526,7 +514,7 @@
 								</ul>
 								<div class="se2_in_bx_find husky_se2m_find_ui" style="display:block">
 									<dl>
-									<dt><label for="find_word">찾을단어</label></dt><dd><input type="text" id="find_word" value="스마트에디터" class="input_ty1"></dd>
+									<dt><label for="find_word">찾을 단어</label></dt><dd><input type="text" id="find_word" value="스마트에디터" class="input_ty1"></dd>
 									</dl>
 									<p class="se2_find_btns">
 										<button type="button" class="se2_find_next husky_se2m_find_next"><span>다음 찾기</span></button><button type="button" class="se2_cancel husky_se2m_cancel"><span>취소</span></button>
@@ -534,11 +522,11 @@
 								</div>
 								<div class="se2_in_bx_revise husky_se2m_replace_ui" style="display:none">
 									<dl>
-									<dt><label for="find_word2">찾을단어</label></dt><dd><input type="text" id="find_word2" value="스마트에디터" class="input_ty1"></dd>
-									<dt><label for="revise_word">바꿀단어</label></dt><dd><input type="text" id="revise_word" value="스마트에디터" class="input_ty1"></dd>
+									<dt><label for="find_word2">찾을 단어</label></dt><dd><input type="text" id="find_word2" value="스마트에디터" class="input_ty1"></dd>
+									<dt><label for="revise_word">바꿀 단어</label></dt><dd><input type="text" id="revise_word" value="스마트에디터" class="input_ty1"></dd>
 									</dl>
 									<p class="se2_find_btns">
-										<button type="button" class="se2_find_next2 husky_se2m_replace_find_next"><span>다음찾기</span></button><button type="button" class="se2_revise1 husky_se2m_replace"><span>바꾸기</span></button><button type="button" class="se2_revise2 husky_se2m_replace_all"><span>모두 바꾸기</span></button><button type="button" class="se2_cancel husky_se2m_cancel"><span>취소</span></button>
+										<button type="button" class="se2_find_next2 husky_se2m_replace_find_next"><span>다음 찾기</span></button><button type="button" class="se2_revise1 husky_se2m_replace"><span>바꾸기</span></button><button type="button" class="se2_revise2 husky_se2m_replace_all"><span>모두 바꾸기</span></button><button type="button" class="se2_cancel husky_se2m_cancel"><span>취소</span></button>
 									</p>
 								</div>
 								<button type="button" title="닫기" class="se2_close husky_se2m_cancel"><span>닫기</span></button>

plugin/editor/smarteditor2/css/smart_editor2.css

@@ -1,336 +1,175 @@
 @charset "UTF-8";
 /* NHN Web Standardization Team (http://html.nhndesign.com/) HHJ 090226 */
 /* COMMON */
-body, #smart_editor2, #smart_editor2 p, #smart_editor2 h1, #smart_editor2 h2, #smart_editor2 h3, #smart_editor2 h4, #smart_editor2 h5, #smart_editor2 h6, #smart_editor2 ul, #smart_editor2 ol, #smart_editor2 li, #smart_editor2 dl, #smart_editor2 dt, #smart_editor2 dd, #smart_editor2 table, #smart_editor2 th, #smart_editor2 td, #smart_editor2 form, #smart_editor2 fieldset, #smart_editor2 legend, #smart_editor2 input, #smart_editor2 textarea, #smart_editor2 button, #smart_editor2 select { margin: 0; padding: 0; }
-
-#smart_editor2, #smart_editor2 h1, #smart_editor2 h2, #smart_editor2 h3, #smart_editor2 h4, #smart_editor2 h5, #smart_editor2 h6, #smart_editor2 input, #smart_editor2 textarea, #smart_editor2 select, #smart_editor2 table, #smart_editor2 button { font-family: '돋움',Dotum,Helvetica,sans-serif; font-size: 12px; color: #666; }
-
-#smart_editor2 span, #smart_editor2 em { font-size: 12px; }
-
-#smart_editor2 em, #smart_editor2 address { font-style: normal; }
-
-#smart_editor2 img, #smart_editor2 fieldset { border: 0; }
-
-#smart_editor2 hr { display: none; }
-
-#smart_editor2 ol, #smart_editor2 ul { list-style: none; }
-
-#smart_editor2 button { border: 0; background: none; font-size: 11px; vertical-align: top; cursor: pointer; }
-
-#smart_editor2 button span, #smart_editor2 button em { visibility: hidden; overflow: hidden; position: absolute; top: 0; font-size: 0; line-height: 0; }
-
-#smart_editor2 legend, #smart_editor2 .blind { visibility: hidden; overflow: hidden; position: absolute; width: 0; height: 0; font-size: 0; line-height: 0; }
-
-#smart_editor2 .input_ty1 { height: 14px; margin: 0; padding: 4px 2px 0 4px; border: 1px solid #c7c7c7; font-size: 11px; color: #666; }
-
-#smart_editor2 a:link, #smart_editor2 a:visited, #smart_editor2 a:active, #smart_editor2 a:focus { color: #666; text-decoration: none; }
-
-#smart_editor2 a:hover { color: #666; text-decoration: underline; }
-
+body,#smart_editor2,#smart_editor2 p,#smart_editor2 h1,#smart_editor2 h2,#smart_editor2 h3,#smart_editor2 h4,#smart_editor2 h5,#smart_editor2 h6,#smart_editor2 ul,#smart_editor2 ol,#smart_editor2 li,#smart_editor2 dl,#smart_editor2 dt,#smart_editor2 dd,#smart_editor2 table,#smart_editor2 th,#smart_editor2 td,#smart_editor2 form,#smart_editor2 fieldset,#smart_editor2 legend,#smart_editor2 input,#smart_editor2 textarea,#smart_editor2 button,#smart_editor2 select{margin:0;padding:0}
+#smart_editor2,#smart_editor2 h1,#smart_editor2 h2,#smart_editor2 h3,#smart_editor2 h4,#smart_editor2 h5,#smart_editor2 h6,#smart_editor2 input,#smart_editor2 textarea,#smart_editor2 select,#smart_editor2 table,#smart_editor2 button{font-family:'돋움',Dotum,Helvetica,sans-serif;font-size:12px;color:#666}
+#smart_editor2 span,#smart_editor2 em{font-size:12px}
+#smart_editor2 em,#smart_editor2 address{font-style:normal}
+#smart_editor2 img,#smart_editor2 fieldset{border:0}
+#smart_editor2 hr{display:none}
+#smart_editor2 ol,#smart_editor2 ul{list-style:none}
+#smart_editor2 button{border:0;background:none;font-size:11px;vertical-align:top;cursor:pointer}
+#smart_editor2 button span,#smart_editor2 button em{visibility:hidden;overflow:hidden;position:absolute;top:0;font-size:0;line-height:0}
+#smart_editor2 legend,#smart_editor2 .blind{visibility:hidden;overflow:hidden;position:absolute;width:0;height:0;font-size:0;line-height:0}
+#smart_editor2 .input_ty1{height:14px;margin:0;padding:4px 2px 0 4px;border:1px solid #c7c7c7;font-size:11px;color:#666}
+#smart_editor2 a:link,#smart_editor2 a:visited,#smart_editor2 a:active,#smart_editor2 a:focus{color:#666;text-decoration:none}
+#smart_editor2 a:hover{color:#666;text-decoration:underline}
 /* LAYOUT */
-#smart_editor2 .se2_header { margin: 10px 0 29px 0; }
-
-#smart_editor2 .se2_bi { float: left; width: 93px; height: 20px; margin: 0; padding: 0; background: url("../img/ko_KR/btn_set.png?130306") -343px -358px no-repeat; font-size: 0; line-height: 0; text-indent: -10000px; vertical-align: middle; }
-
-#smart_editor2 .se2_allhelp { display: inline-block; width: 18px; height: 18px; padding: 0; background: url("../img/ko_KR/btn_set.png?130306") -437px -358px no-repeat; font-size: 0; line-height: 0; text-indent: -10000px; vertical-align: middle; }
-
-#smart_editor2 #smart_editor2_content { border: 1px solid #b5b5b5; }
-
-#smart_editor2 .se2_tool { overflow: visible; position: relative; z-index: 25; }
-
+#smart_editor2 .se2_header{margin:10px 0 29px 0}
+#smart_editor2 .se2_bi{float:left;width:93px;height:20px;margin:0;padding:0;background:url("../img/ko_KR/btn_set.png?130306") -343px -358px no-repeat;font-size:0;line-height:0;text-indent:-10000px;vertical-align:middle}
+#smart_editor2 .se2_allhelp{display:inline-block;width:18px;height:18px;padding:0;background:url("../img/ko_KR/btn_set.png?130306") -437px -358px no-repeat;font-size:0;line-height:0;text-indent:-10000px;vertical-align:middle}
+#smart_editor2 #smart_editor2_content{border:1px solid #b5b5b5}
+#smart_editor2 .se2_tool{overflow:visible;position:relative;z-index:25}
 /* EDITINGAREA */
-#smart_editor2 .se2_input_area { position: relative; z-index: 22; height: 400px; margin: 0; padding: 0; *zoom: 1; }
-
-#smart_editor2 .se2_input_wysiwyg, #smart_editor2 .se2_input_syntax { display: block; overflow: auto; width: 100%; height: 100%; margin: 0; *margin: -1px 0 0 0; border: 0; }
-
+#smart_editor2 .se2_input_area{position:relative;z-index:22;height:400px;margin:0;padding:0;*zoom:1}
+#smart_editor2 .se2_input_wysiwyg,#smart_editor2 .se2_input_syntax{display:block;overflow:auto;width:100%;height:100%;margin:0;*margin:-1px 0 0 0;border:0}
 /* EDITINGMODE */
-#smart_editor2 .se2_conversion_mode { position: relative; height: 15px; padding-top: 1px; border-top: 1px solid #b5b5b5; background: url("../img/icon_set.gif") 0 -896px repeat-x; }
-
-#smart_editor2 .se2_inputarea_controller { display: block; clear: both; position: relative; width: 100%; height: 15px; text-align: center; cursor: n-resize; }
-
-#smart_editor2 .se2_inputarea_controller span, #smart_editor2 .controller_on span { background: url("../img/ico_extend.png") no-repeat; }
-
-#smart_editor2 .se2_inputarea_controller span { position: static; display: inline-block; visibility: visible; overflow: hidden; height: 15px; padding-left: 11px; background-position: 0 2px; color: #888; font-size: 11px; letter-spacing: -1px; line-height: 16px; white-space: nowrap; }
-
-* + html #smart_editor2 .se2_inputarea_controller span { line-height: 14px; }
-
-#smart_editor2 .controller_on span { background-position: 0 -21px; color: #249c04; }
-
-#smart_editor2 .ly_controller { display: block; position: absolute; bottom: 2px; left: 50%; width: 287px; margin-left: -148px; padding: 8px 0 7px 9px; border: 1px solid #827f7c; background: #fffdef; }
-
-#smart_editor2 .ly_controller p { color: #666; font-size: 11px; letter-spacing: -1px; line-height: 11px; }
-
-#smart_editor2 .ly_controller .bt_clse, #smart_editor2 .ly_controller .ic_arr { position: absolute; background: url("../img/ico_extend.png") no-repeat; }
-
-#smart_editor2 .ly_controller .bt_clse { top: 5px; right: 4px; width: 14px; height: 15px; background-position: 1px -43px; }
-
-#smart_editor2 .ly_controller .ic_arr { top: 25px; left: 50%; width: 10px; height: 6px; margin-left: -5px; background-position: 0 -65px; }
-
-#smart_editor2 .se2_converter { float: left; position: absolute; top: -1px; right: 3px; z-index: 20; }
-
-#smart_editor2 .se2_converter li { float: left; }
-
-#smart_editor2 .se2_converter .se2_to_editor { width: 59px; height: 15px; background: url("../img/ko_KR/btn_set.png?130306") 0 -85px no-repeat; vertical-align: top; }
-
-#smart_editor2 .se2_converter .se2_to_html { width: 59px; height: 15px; background: url("../img/ko_KR/btn_set.png?130306") -59px -70px no-repeat; vertical-align: top; }
-
-#smart_editor2 .se2_converter .se2_to_text { width: 60px; height: 15px; background: url("../img/ko_KR/btn_set.png?130306") -417px -466px no-repeat; vertical-align: top; }
-
-#smart_editor2 .se2_converter .active .se2_to_editor { width: 59px; height: 15px; background: url("../img/ko_KR/btn_set.png?130306") 0 -70px no-repeat; vertical-align: top; }
-
-#smart_editor2 .se2_converter .active .se2_to_html { width: 59px; height: 15px; background: url("../img/ko_KR/btn_set.png?130306") -59px -85px no-repeat; vertical-align: top; }
-
-#smart_editor2 .se2_converter .active .se2_to_text { width: 60px; height: 15px; background: url("../img/ko_KR/btn_set.png?130306") -417px -481px no-repeat; vertical-align: top; }
-
+#smart_editor2 .se2_conversion_mode{position:relative;height:15px;padding-top:1px;border-top:1px solid #b5b5b5;background:url("../img/icon_set.gif") 0 -896px repeat-x}
+#smart_editor2 .se2_inputarea_controller{display:block;clear:both;position:relative;width:100%;height:15px;text-align:center;cursor:n-resize}
+#smart_editor2 .se2_inputarea_controller span,#smart_editor2 .controller_on span{background:url("../img/ico_extend.png") no-repeat}
+#smart_editor2 .se2_inputarea_controller span{position:static;display:inline-block;visibility:visible;overflow:hidden;height:15px;padding-left:11px;background-position:0 2px;color:#888;font-size:11px;letter-spacing:-1px;line-height:16px;white-space:nowrap}
+* + html #smart_editor2 .se2_inputarea_controller span{line-height:14px}
+#smart_editor2 .controller_on span{background-position:0 -21px;color:#249c04}
+#smart_editor2 .ly_controller{display:block;position:absolute;bottom:2px;left:50%;width:287px;margin-left:-148px;padding:8px 0 7px 9px;border:1px solid #827f7c;background:#fffdef}
+#smart_editor2 .ly_controller p{color:#666;font-size:11px;letter-spacing:-1px;line-height:11px}
+#smart_editor2 .ly_controller .bt_clse,#smart_editor2 .ly_controller .ic_arr{position:absolute;background:url("../img/ico_extend.png") no-repeat}
+#smart_editor2 .ly_controller .bt_clse{top:5px;right:4px;width:14px;height:15px;background-position:1px -43px}
+#smart_editor2 .ly_controller .ic_arr{top:25px;left:50%;width:10px;height:6px;margin-left:-5px;background-position:0 -65px}
+#smart_editor2 .se2_converter{float:left;position:absolute;top:-1px;right:3px;z-index:20}
+#smart_editor2 .se2_converter li{float:left}
+#smart_editor2 .se2_converter .se2_to_editor{width:59px;height:15px;background:url("../img/ko_KR/btn_set.png?130306") 0 -85px no-repeat;vertical-align:top}
+#smart_editor2 .se2_converter .se2_to_html{width:59px;height:15px;background:url("../img/ko_KR/btn_set.png?130306") -59px -70px no-repeat;vertical-align:top}
+#smart_editor2 .se2_converter .se2_to_text{width:60px;height:15px;background:url("../img/ko_KR/btn_set.png?130306") -417px -466px no-repeat;vertical-align:top}
+#smart_editor2 .se2_converter .active .se2_to_editor{width:59px;height:15px;background:url("../img/ko_KR/btn_set.png?130306") 0 -70px no-repeat;vertical-align:top}
+#smart_editor2 .se2_converter .active .se2_to_html{width:59px;height:15px;background:url("../img/ko_KR/btn_set.png?130306") -59px -85px no-repeat;vertical-align:top}
+#smart_editor2 .se2_converter .active .se2_to_text{width:60px;height:15px;background:url("../img/ko_KR/btn_set.png?130306") -417px -481px no-repeat;vertical-align:top}
 /* EDITINGAREA_HTMLSRC */
-#smart_editor2 .off .ico_btn, #smart_editor2 .off .se2_more, #smart_editor2 .off .se2_more2, #smart_editor2 .off .se2_font_family, #smart_editor2 .off .se2_font_size, #smart_editor2 .off .se2_bold, #smart_editor2 .off .se2_underline, #smart_editor2 .off .se2_italic, #smart_editor2 .off .se2_tdel, #smart_editor2 .off .se2_fcolor, #smart_editor2 .off .se2_fcolor_more, #smart_editor2 .off .se2_bgcolor, #smart_editor2 .off .se2_bgcolor_more, #smart_editor2 .off .se2_left, #smart_editor2 .off .se2_center, #smart_editor2 .off .se2_right, #smart_editor2 .off .se2_justify, #smart_editor2 .off .se2_ol, #smart_editor2 .off .se2_ul, #smart_editor2 .off .se2_indent, #smart_editor2 .off .se2_outdent, #smart_editor2 .off .se2_lineheight, #smart_editor2 .off .se2_del_style, #smart_editor2 .off .se2_blockquote, #smart_editor2 .off .se2_summary, #smart_editor2 .off .se2_footnote, #smart_editor2 .off .se2_url, #smart_editor2 .off .se2_emoticon, #smart_editor2 .off .se2_character, #smart_editor2 .off .se2_table, #smart_editor2 .off .se2_find, #smart_editor2 .off .se2_spelling, #smart_editor2 .off .se2_sup, #smart_editor2 .off .se2_sub, #smart_editor2 .off .se2_text_tool_more, #smart_editor2 .off .se2_new, #smart_editor2 .off .selected_color, #smart_editor2 .off .se2_lineSticker { -ms-filter: alpha(opacity=50); opacity: .5; cursor: default; filter: alpha(opacity=50); }
-
+#smart_editor2 .off .ico_btn,#smart_editor2 .off .se2_more,#smart_editor2 .off .se2_more2,#smart_editor2 .off .se2_font_family,#smart_editor2 .off .se2_font_size,#smart_editor2 .off .se2_bold,#smart_editor2 .off .se2_underline,#smart_editor2 .off .se2_italic,#smart_editor2 .off .se2_tdel,#smart_editor2 .off .se2_fcolor,#smart_editor2 .off .se2_fcolor_more,#smart_editor2 .off .se2_bgcolor,#smart_editor2 .off .se2_bgcolor_more,#smart_editor2 .off .se2_left,#smart_editor2 .off .se2_center,#smart_editor2 .off .se2_right,#smart_editor2 .off .se2_justify,#smart_editor2 .off .se2_ol,#smart_editor2 .off .se2_ul,#smart_editor2 .off .se2_indent,#smart_editor2 .off .se2_outdent,#smart_editor2 .off .se2_lineheight,#smart_editor2 .off .se2_del_style,#smart_editor2 .off .se2_blockquote,#smart_editor2 .off .se2_summary,#smart_editor2 .off .se2_footnote,#smart_editor2 .off .se2_url,#smart_editor2 .off .se2_emoticon,#smart_editor2 .off .se2_character,#smart_editor2 .off .se2_table,#smart_editor2 .off .se2_find,#smart_editor2 .off .se2_spelling,#smart_editor2 .off .se2_sup,#smart_editor2 .off .se2_sub,#smart_editor2 .off .se2_text_tool_more,#smart_editor2 .off .se2_new,#smart_editor2 .off .selected_color,#smart_editor2 .off .se2_lineSticker{-ms-filter:alpha(opacity=50);opacity:.5;cursor:default;filter:alpha(opacity=50)}
 /* LAYER */
-#smart_editor2 .se2_text_tool .se2_layer { display: none; float: left; position: absolute; top: 20px; left: 0; z-index: 50; margin: 0; padding: 0; border: 1px solid #bcbbbb; background: #fafafa; }
-
-#smart_editor2 .se2_text_tool li.active { z-index: 50; }
-
-#smart_editor2 .se2_text_tool .active .se2_layer { display: block; }
-
-#smart_editor2 .se2_text_tool .active li .se2_layer { display: none; }
-
-#smart_editor2 .se2_text_tool .active .active .se2_layer { display: block; }
-
-#smart_editor2 .se2_text_tool .se2_layer .se2_in_layer { float: left; margin: 0; padding: 0; border: 1px solid #fff; background: #fafafa; }
-
+#smart_editor2 .se2_text_tool .se2_layer{display:none;float:left;position:absolute;top:20px;left:0;z-index:50;margin:0;padding:0;border:1px solid #bcbbbb;background:#fafafa}
+#smart_editor2 .se2_text_tool li.active{z-index:50}
+#smart_editor2 .se2_text_tool .active .se2_layer{display:block}
+#smart_editor2 .se2_text_tool .active li .se2_layer{display:none}
+#smart_editor2 .se2_text_tool .active .active .se2_layer{display:block}
+#smart_editor2 .se2_text_tool .se2_layer .se2_in_layer{float:left;margin:0;padding:0;border:1px solid #fff;background:#fafafa}
 /* TEXT_TOOLBAR */
-#smart_editor2 .se2_text_tool { position: relative; clear: both; z-index: 30; padding: 4px 0 4px 3px; background: #f4f4f4 url("../img/bg_text_tool.gif") 0 0 repeat-x; border-bottom: 1px solid #b5b5b5; *zoom: 1; }
-
-#smart_editor2 .se2_text_tool:after { content: ""; display: block; clear: both; }
-
-#smart_editor2 .se2_text_tool ul { float: left; display: inline; margin-right: 3px; padding-left: 1px; white-space: nowrap; }
-
-#smart_editor2 .se2_text_tool li { _display: inline; float: left; position: relative; z-index: 30; }
-
-#smart_editor2 .se2_text_tool button, #smart_editor2 .se2_multy .se2_icon { width: 21px; height: 21px; background: url("../img/ko_KR/text_tool_set.png?140317") no-repeat; vertical-align: top; }
-
-#smart_editor2 .se2_text_tool .se2_font_type { position: relative; }
-
-#smart_editor2 .se2_text_tool .se2_font_type li { margin-left: 3px; }
-
-#smart_editor2 .se2_text_tool .se2_font_type button { text-align: left; }
-
-#smart_editor2 .se2_text_tool .se2_font_type button.se2_font_family span, #smart_editor2 .se2_text_tool .se2_font_type button.se2_font_size span { display: inline-block; visibility: visible; position: static; width: 52px; height: 20px; padding: 0 0 0 6px; font-size: 12px; line-height: 20px; *line-height: 22px; color: #333; *zoom: 1; }
-
-#smart_editor2 .se2_text_tool .se2_multy { position: absolute; top: 0; right: 0; padding-left: 0; margin-right: 0; white-space: nowrap; border-left: 1px solid #e0dedf; }
-
-#smart_editor2 .se2_text_tool .se2_multy .se2_mn { float: left; white-space: nowrap; }
-
-#smart_editor2 .se2_text_tool .se2_multy button { background-image: none; width: 47px; }
-
-#smart_editor2 .se2_text_tool .se2_multy .se2_icon { display: inline-block; visibility: visible; overflow: visible; position: static; width: 16px; height: 29px; margin: -1px 2px 0 -1px; background-position: 0 -132px; line-height: 30px; vertical-align: top; }
-
-#smart_editor2 .se2_text_tool .se2_multy button, #smart_editor2 .se2_text_tool .se2_multy button span { height: 29px; line-height: 29px; }
-
-#smart_editor2 .se2_text_tool .se2_map .se2_icon { background-position: -29px -132px; }
-
-#smart_editor2 .se2_text_tool button span.se2_mntxt { display: inline-block; visibility: visible; overflow: visible; _overflow-y: hidden; position: relative; *margin-right: -1px; width: auto; height: 29px; font-weight: normal; font-size: 11px; line-height: 30px; *line-height: 29px; _line-height: 30px; color: #444; letter-spacing: -1px; vertical-align: top; }
-
-#smart_editor2 .se2_text_tool .se2_multy .se2_photo { margin-right: 1px; }
-
-#smart_editor2 .se2_text_tool .se2_multy .hover .ico_btn { background: #e8e8e8; }
-
-#smart_editor2 .se2_text_tool .se2_multy .se2_mn.hover { background: #e0dedf; }
-
+#smart_editor2 .se2_text_tool{position:relative;clear:both;z-index:30;padding:4px 0 4px 3px;background:#f4f4f4 url("../img/bg_text_tool.gif") 0 0 repeat-x;border-bottom:1px solid #b5b5b5;*zoom:1}
+#smart_editor2 .se2_text_tool:after{content:"";display:block;clear:both}
+#smart_editor2 .se2_text_tool ul{float:left;display:inline;margin-right:3px;padding-left:1px;white-space:nowrap}
+#smart_editor2 .se2_text_tool li{_display:inline;float:left;position:relative;z-index:30}
+#smart_editor2 .se2_text_tool button,#smart_editor2 .se2_multy .se2_icon{width:21px;height:21px;background:url("../img/ko_KR/text_tool_set.png?140317") no-repeat;vertical-align:top}
+#smart_editor2 .se2_text_tool .se2_font_type{position:relative}
+#smart_editor2 .se2_text_tool .se2_font_type li{margin-left:3px}
+#smart_editor2 .se2_text_tool .se2_font_type button{text-align:left}
+#smart_editor2 .se2_text_tool .se2_font_type button.se2_font_family span,#smart_editor2 .se2_text_tool .se2_font_type button.se2_font_size span{display:inline-block;visibility:visible;position:static;width:52px;height:20px;padding:0 0 0 6px;font-size:12px;line-height:20px;*line-height:22px;color:#333;*zoom:1}
+#smart_editor2 .se2_text_tool .se2_multy{position:absolute;top:0;right:0;padding-left:0;margin-right:0;white-space:nowrap;border-left:1px solid #e0dedf}
+#smart_editor2 .se2_text_tool .se2_multy .se2_mn{float:left;white-space:nowrap}
+#smart_editor2 .se2_text_tool .se2_multy button{background-image:none;width:47px}
+#smart_editor2 .se2_text_tool .se2_multy .se2_icon{display:inline-block;visibility:visible;overflow:visible;position:static;width:16px;height:29px;margin:-1px 2px 0 -1px;background-position:0 -132px;line-height:30px;vertical-align:top}
+#smart_editor2 .se2_text_tool .se2_multy button,#smart_editor2 .se2_text_tool .se2_multy button span{height:29px;line-height:29px}
+#smart_editor2 .se2_text_tool .se2_map .se2_icon{background-position:-29px -132px}
+#smart_editor2 .se2_text_tool button span.se2_mntxt{display:inline-block;visibility:visible;overflow:visible;_overflow-y:hidden;position:relative;*margin-right:-1px;width:auto;height:29px;font-weight:normal;font-size:11px;line-height:30px;*line-height:29px;_line-height:30px;color:#444;letter-spacing:-1px;vertical-align:top}
+#smart_editor2 .se2_text_tool .se2_multy .se2_photo{margin-right:1px}
+#smart_editor2 .se2_text_tool .se2_multy .hover .ico_btn{background:#e8e8e8}
+#smart_editor2 .se2_text_tool .se2_multy .se2_mn.hover{background:#e0dedf}
 /* TEXT_TOOLBAR : ROUNDING */
-#smart_editor2 ul li.first_child button span.tool_bg, #smart_editor2 ul li.last_child button span.tool_bg, #smart_editor2 ul li.single_child button span.tool_bg { visibility: visible; height: 21px; }
-
-#smart_editor2 ul li.first_child button span.tool_bg { left: -1px; width: 3px; background: url("../img/bg_button_left.gif?20121228") no-repeat; }
-
-#smart_editor2 ul li.last_child button span.tool_bg { right: 0px; _right: -1px; width: 2px; background: url("../img/bg_button_right.gif") no-repeat; }
-
-#smart_editor2 ul li.single_child { padding-right: 1px; }
-
-#smart_editor2 ul li.single_child button span.tool_bg { left: 0; background: url("../img/bg_button.gif?20121228") no-repeat; width: 22px; }
-
-#smart_editor2 div.se2_text_tool ul li.hover button span.tool_bg { background-position: 0 -21px; }
-
-#smart_editor2 div.se2_text_tool ul li.active button span.tool_bg, #smart_editor2 div.se2_text_tool ul li.active li.active button span.tool_bg { background-position: 0 -42px; }
-
-#smart_editor2 div.se2_text_tool ul li.active li button span.tool_bg { background-position: 0 0; }
-
+#smart_editor2 ul li.first_child button span.tool_bg,#smart_editor2 ul li.last_child button span.tool_bg,#smart_editor2 ul li.single_child button span.tool_bg{visibility:visible;height:21px}
+#smart_editor2 ul li.first_child button span.tool_bg{left:-1px;width:3px;background:url("../img/bg_button_left.gif?20121228") no-repeat}
+#smart_editor2 ul li.last_child button span.tool_bg{right:0px;_right:-1px;width:2px;background:url("../img/bg_button_right.gif") no-repeat}
+#smart_editor2 ul li.single_child{padding-right:1px}
+#smart_editor2 ul li.single_child button span.tool_bg{left:0;background:url("../img/bg_button.gif?20121228") no-repeat;width:22px}
+#smart_editor2 div.se2_text_tool ul li.hover button span.tool_bg{background-position:0 -21px}
+#smart_editor2 div.se2_text_tool ul li.active button span.tool_bg,#smart_editor2 div.se2_text_tool ul li.active li.active button span.tool_bg{background-position:0 -42px}
+#smart_editor2 div.se2_text_tool ul li.active li button span.tool_bg{background-position:0 0}
 /* TEXT_TOOLBAR : SUB_MENU */
-#smart_editor2 .se2_sub_text_tool { display: none; position: absolute; top: 20px; left: 0; z-index: 40; width: auto; height: 29px; padding: 0 4px 0 0; border: 1px solid #b5b5b5; border-top: 1px solid #9a9a9a; background: #f4f4f4; }
-
-#smart_editor2 .active .se2_sub_text_tool { display: block; }
-
-#smart_editor2 .se2_sub_text_tool ul { float: left; height: 25px; margin: 0; padding: 4px 0 0 4px; }
-
+#smart_editor2 .se2_sub_text_tool{display:none;position:absolute;top:20px;left:0;z-index:40;width:auto;height:29px;padding:0 4px 0 0;border:1px solid #b5b5b5;border-top:1px solid #9a9a9a;background:#f4f4f4}
+#smart_editor2 .active .se2_sub_text_tool{display:block}
+#smart_editor2 .se2_sub_text_tool ul{float:left;height:25px;margin:0;padding:4px 0 0 4px}
 /* TEXT_TOOLBAR : SUB_MENU_SIZE */
-#smart_editor2 .se2_sub_step1 { width: 88px; }
-
-#smart_editor2 .se2_sub_step2 { width: 199px; }
-
-#smart_editor2 .se2_sub_step2_1 { width: 178px; }
-
+#smart_editor2 .se2_sub_step1{width:88px}
+#smart_editor2 .se2_sub_step2{width:199px}
+#smart_editor2 .se2_sub_step2_1{width:178px}
 /* TEXT_TOOLBAR : BUTTON */
-#smart_editor2 .se2_text_tool .se2_font_family { width: 70px; height: 21px; background-position: 0 -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_font_family { background-position: 0 -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_font_family { background-position: 0 -103px; }
-
-#smart_editor2 .se2_text_tool .se2_font_size { width: 45px; height: 21px; background-position: -70px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_font_size { background-position: -70px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_font_size { background-position: -70px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_bold { background-position: -115px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_bold { background-position: -115px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_bold { background-position: -115px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_underline { background-position: -136px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_underline { background-position: -136px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_underline { background-position: -136px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_italic { background-position: -157px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_italic { background-position: -157px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_italic { background-position: -157px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_tdel { background-position: -178px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_tdel { background-position: -178px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_tdel { background-position: -178px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_fcolor { position: relative; background-position: -199px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_fcolor { background-position: -199px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_fcolor { background-position: -199px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_fcolor_more { background-position: -220px -10px; width: 10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_fcolor_more { background-position: -220px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_fcolor_more { background-position: -220px -103px; }
-
-#smart_editor2 .se2_text_tool .selected_color { position: absolute; top: 14px; left: 5px; width: 11px; height: 3px; font-size: 0; }
-
-#smart_editor2 .se2_text_tool .se2_ol, #smart_editor2 .se2_text_tool .active .se2_sub_text_tool .se2_ol { background-position: -345px -10px; }
-
-#smart_editor2 .se2_text_tool .se2_ul, #smart_editor2 .se2_text_tool .active .se2_sub_text_tool .se2_ul { background-position: -366px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_ol, #smart_editor2 .se2_text_tool .active .se2_sub_text_tool .hover .se2_ol { background-position: -345px -72px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_ul, #smart_editor2 .se2_text_tool .active .se2_sub_text_tool .hover .se2_ul { background-position: -366px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_ol, #smart_editor2 .se2_text_tool .active .active .se2_ol { background-position: -345px -103px; }
-
-#smart_editor2 .se2_text_tool .active .se2_ul, #smart_editor2 .se2_text_tool .active .active .se2_ul { background-position: -366px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_indent, #smart_editor2 .se2_text_tool .active .se2_sub_text_tool .se2_indent { background-position: -408px -10px; }
-
-#smart_editor2 .se2_text_tool .se2_outdent, #smart_editor2 .se2_text_tool .active .se2_sub_text_tool .se2_outdent { background-position: -387px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_indent, #smart_editor2 .se2_text_tool .active .se2_sub_text_tool .hover .se2_indent { background-position: -408px -72px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_outdent, #smart_editor2 .se2_text_tool .active .se2_sub_text_tool .hover .se2_outdent { background-position: -387px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_indent, #smart_editor2 .se2_text_tool .active .active .se2_indent { background-position: -408px -103px; }
-
-#smart_editor2 .se2_text_tool .active .se2_outdent, #smart_editor2 .se2_text_tool .active .active .se2_outdent { background-position: -387px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_lineheight { background-position: -429px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_lineheight { background-position: -429px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_lineheight { background-position: -429px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_url { background-position: -513px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_url { background-position: -513px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_url { background-position: -513px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_bgcolor { position: relative; background-position: -230px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_bgcolor { background-position: -230px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_bgcolor { background-position: -230px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_bgcolor_more { background-position: -251px -10px; width: 10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_bgcolor_more { background-position: -251px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_bgcolor_more { background-position: -251px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_left { background-position: -261px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_left { background-position: -261px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_left { background-position: -261px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_center { background-position: -282px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_center { background-position: -282px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_center { background-position: -282px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_right { background-position: -303px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_right { background-position: -303px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_right { background-position: -303px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_justify { background-position: -324px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_justify { background-position: -324px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_justify { background-position: -324px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_blockquote { background-position: -471px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_blockquote { background-position: -471px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_blockquote { background-position: -471px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_character { background-position: -555px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_character { background-position: -555px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_character { background-position: -555px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_table { background-position: -576px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_table { background-position: -576px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_table { background-position: -576px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_find { background-position: -597px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_find { background-position: -597px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_find { background-position: -597px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_sup { background-position: -660px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_sup { background-position: -660px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_sup { background-position: -660px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_sub { background-position: -681px -10px; }
-
-#smart_editor2 .se2_text_tool .hover .se2_sub { background-position: -681px -72px; }
-
-#smart_editor2 .se2_text_tool .active .se2_sub { background-position: -681px -103px; }
-
-#smart_editor2 .se2_text_tool .se2_text_tool_more { background-position: 0 -41px; width: 13px; }
-
-#smart_editor2 .se2_text_tool .se2_text_tool_more span.tool_bg { background: none; }
-
-#smart_editor2 .se2_text_tool .hover .se2_text_tool_more { background-position: -13px -41px; }
-
-#smart_editor2 .se2_text_tool .active .se2_text_tool_more { background-position: -26px -41px; }
+#smart_editor2 .se2_text_tool .se2_font_family{width:70px;height:21px;background-position:0 -10px}
+#smart_editor2 .se2_text_tool .hover .se2_font_family{background-position:0 -72px}
+#smart_editor2 .se2_text_tool .active .se2_font_family{background-position:0 -103px}
+#smart_editor2 .se2_text_tool .se2_font_size{width:45px;height:21px;background-position:-70px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_font_size{background-position:-70px -72px}
+#smart_editor2 .se2_text_tool .active .se2_font_size{background-position:-70px -103px}
+#smart_editor2 .se2_text_tool .se2_bold{background-position:-115px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_bold{background-position:-115px -72px}
+#smart_editor2 .se2_text_tool .active .se2_bold{background-position:-115px -103px}
+#smart_editor2 .se2_text_tool .se2_underline{background-position:-136px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_underline{background-position:-136px -72px}
+#smart_editor2 .se2_text_tool .active .se2_underline{background-position:-136px -103px}
+#smart_editor2 .se2_text_tool .se2_italic{background-position:-157px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_italic{background-position:-157px -72px}
+#smart_editor2 .se2_text_tool .active .se2_italic{background-position:-157px -103px}
+#smart_editor2 .se2_text_tool .se2_tdel{background-position:-178px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_tdel{background-position:-178px -72px}
+#smart_editor2 .se2_text_tool .active .se2_tdel{background-position:-178px -103px}
+#smart_editor2 .se2_text_tool .se2_fcolor{position:relative;background-position:-199px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_fcolor{background-position:-199px -72px}
+#smart_editor2 .se2_text_tool .active .se2_fcolor{background-position:-199px -103px}
+#smart_editor2 .se2_text_tool .se2_fcolor_more{background-position:-220px -10px;width:10px}
+#smart_editor2 .se2_text_tool .hover .se2_fcolor_more{background-position:-220px -72px}
+#smart_editor2 .se2_text_tool .active .se2_fcolor_more{background-position:-220px -103px}
+#smart_editor2 .se2_text_tool .selected_color{position:absolute;top:14px;left:5px;width:11px;height:3px;font-size:0}
+#smart_editor2 .se2_text_tool .se2_ol,#smart_editor2 .se2_text_tool .active .se2_sub_text_tool .se2_ol{background-position:-345px -10px}
+#smart_editor2 .se2_text_tool .se2_ul,#smart_editor2 .se2_text_tool .active .se2_sub_text_tool .se2_ul{background-position:-366px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_ol,#smart_editor2 .se2_text_tool .active .se2_sub_text_tool .hover .se2_ol{background-position:-345px -72px}
+#smart_editor2 .se2_text_tool .hover .se2_ul,#smart_editor2 .se2_text_tool .active .se2_sub_text_tool .hover .se2_ul{background-position:-366px -72px}
+#smart_editor2 .se2_text_tool .active .se2_ol,#smart_editor2 .se2_text_tool .active .active .se2_ol{background-position:-345px -103px}
+#smart_editor2 .se2_text_tool .active .se2_ul,#smart_editor2 .se2_text_tool .active .active .se2_ul{background-position:-366px -103px}
+#smart_editor2 .se2_text_tool .se2_indent,#smart_editor2 .se2_text_tool .active .se2_sub_text_tool .se2_indent{background-position:-408px -10px}
+#smart_editor2 .se2_text_tool .se2_outdent,#smart_editor2 .se2_text_tool .active .se2_sub_text_tool .se2_outdent{background-position:-387px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_indent,#smart_editor2 .se2_text_tool .active .se2_sub_text_tool .hover .se2_indent{background-position:-408px -72px}
+#smart_editor2 .se2_text_tool .hover .se2_outdent,#smart_editor2 .se2_text_tool .active .se2_sub_text_tool .hover .se2_outdent{background-position:-387px -72px}
+#smart_editor2 .se2_text_tool .active .se2_indent,#smart_editor2 .se2_text_tool .active .active .se2_indent{background-position:-408px -103px}
+#smart_editor2 .se2_text_tool .active .se2_outdent,#smart_editor2 .se2_text_tool .active .active .se2_outdent{background-position:-387px -103px}
+#smart_editor2 .se2_text_tool .se2_lineheight{background-position:-429px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_lineheight{background-position:-429px -72px}
+#smart_editor2 .se2_text_tool .active .se2_lineheight{background-position:-429px -103px}
+#smart_editor2 .se2_text_tool .se2_url{background-position:-513px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_url{background-position:-513px -72px}
+#smart_editor2 .se2_text_tool .active .se2_url{background-position:-513px -103px}
+#smart_editor2 .se2_text_tool .se2_bgcolor{position:relative;background-position:-230px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_bgcolor{background-position:-230px -72px}
+#smart_editor2 .se2_text_tool .active .se2_bgcolor{background-position:-230px -103px}
+#smart_editor2 .se2_text_tool .se2_bgcolor_more{background-position:-251px -10px;width:10px}
+#smart_editor2 .se2_text_tool .hover .se2_bgcolor_more{background-position:-251px -72px}
+#smart_editor2 .se2_text_tool .active .se2_bgcolor_more{background-position:-251px -103px}
+#smart_editor2 .se2_text_tool .se2_left{background-position:-261px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_left{background-position:-261px -72px}
+#smart_editor2 .se2_text_tool .active .se2_left{background-position:-261px -103px}
+#smart_editor2 .se2_text_tool .se2_center{background-position:-282px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_center{background-position:-282px -72px}
+#smart_editor2 .se2_text_tool .active .se2_center{background-position:-282px -103px}
+#smart_editor2 .se2_text_tool .se2_right{background-position:-303px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_right{background-position:-303px -72px}
+#smart_editor2 .se2_text_tool .active .se2_right{background-position:-303px -103px}
+#smart_editor2 .se2_text_tool .se2_justify{background-position:-324px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_justify{background-position:-324px -72px}
+#smart_editor2 .se2_text_tool .active .se2_justify{background-position:-324px -103px}
+#smart_editor2 .se2_text_tool .se2_blockquote{background-position:-471px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_blockquote{background-position:-471px -72px}
+#smart_editor2 .se2_text_tool .active .se2_blockquote{background-position:-471px -103px}
+#smart_editor2 .se2_text_tool .se2_character{background-position:-555px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_character{background-position:-555px -72px}
+#smart_editor2 .se2_text_tool .active .se2_character{background-position:-555px -103px}
+#smart_editor2 .se2_text_tool .se2_table{background-position:-576px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_table{background-position:-576px -72px}
+#smart_editor2 .se2_text_tool .active .se2_table{background-position:-576px -103px}
+#smart_editor2 .se2_text_tool .se2_find{background-position:-597px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_find{background-position:-597px -72px}
+#smart_editor2 .se2_text_tool .active .se2_find{background-position:-597px -103px}
+#smart_editor2 .se2_text_tool .se2_sup{background-position:-660px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_sup{background-position:-660px -72px}
+#smart_editor2 .se2_text_tool .active .se2_sup{background-position:-660px -103px}
+#smart_editor2 .se2_text_tool .se2_sub{background-position:-681px -10px}
+#smart_editor2 .se2_text_tool .hover .se2_sub{background-position:-681px -72px}
+#smart_editor2 .se2_text_tool .active .se2_sub{background-position:-681px -103px}
+#smart_editor2 .se2_text_tool .se2_text_tool_more{background-position:0 -41px;width:13px}
+#smart_editor2 .se2_text_tool .se2_text_tool_more span.tool_bg{background:none}
+#smart_editor2 .se2_text_tool .hover .se2_text_tool_more{background-position:-13px -41px}
+#smart_editor2 .se2_text_tool .active .se2_text_tool_more{background-position:-26px -41px}

plugin/editor/smarteditor2/css/smart_editor2_in.css

@@ -1,34 +1,21 @@
-@charset "UTF-8";
-/* NHN Web Standardization Team (http://html.nhndesign.com/) HHJ 090226 */
-/* COMMON */
-body, .se2_inputarea { margin: 0; padding: 0; font-family: '돋움',Dotum,Helvetica,Sans-serif; font-size: 12px; line-height: 1.5; }
-
-/* body,.se2_inputarea,.se2_inputarea th,.se2_inputarea td{margin:0;padding:0;font-family:'돋움',Dotum,Helvetica,Sans-serif;font-size:12px;line-height:1.5;color:#666} */
-.se2_inputarea p, .se2_inputarea br { margin: 0; padding: 0; }
-
-.se2_inputarea { margin: 15px; word-wrap: break-word; *word-wrap: normal; *word-break: break-all; }
-
-.se2_inputarea_890 { width: 741px; margin: 20px 0 10px 64px; }
-
-.se2_inputarea_698 { width: 548px; margin: 20px 0 10px 64px; }
-
-/* TEXT_TOOLBAR : QUOTE */
-.se2_quote1 { margin: 0 0 30px 20px; padding: 0 8px; border-left: 2px solid #ccc; color: #888; }
-
-.se2_quote2 { margin: 0 0 30px 13px; padding: 0 8px 0 16px; background: url("../img/bg_quote2.gif") 0 3px no-repeat; color: #888; }
-
-.se2_quote3 { margin: 0 0 30px; padding: 12px 10px 11px; border: 1px dashed #ccc; color: #888; }
-
-.se2_quote4 { margin: 0 0 30px; padding: 12px 10px 11px; border: 1px dashed #66b246; color: #888; }
-
-.se2_quote5 { margin: 0 0 30px; padding: 12px 10px 11px; border: 1px dashed #ccc; background: #fafafa; color: #888; }
-
-.se2_quote6 { margin: 0 0 30px; padding: 12px 10px 11px; border: 1px solid #e5e5e5; color: #888; }
-
-.se2_quote7 { margin: 0 0 30px; padding: 12px 10px 11px; border: 1px solid #66b246; color: #888; }
-
-.se2_quote8 { margin: 0 0 30px; padding: 12px 10px 11px; border: 1px solid #e5e5e5; background: #fafafa; color: #888; }
-
-.se2_quote9 { margin: 0 0 30px; padding: 12px 10px 11px; border: 2px solid #e5e5e5; color: #888; }
-
-.se2_quote10 { margin: 0 0 30px; padding: 12px 10px 11px; border: 2px solid #e5e5e5; background: #fafafa; color: #888; }
+@charset "UTF-8";
+/* NHN Web Standardization Team (http://html.nhndesign.com/) HHJ 090226 */
+/* COMMON */
+body,.se2_inputarea{margin:0;padding:0;font-family:'돋움',Dotum,Helvetica,Sans-serif;font-size:12px;line-height:1.5}
+/* body,.se2_inputarea,.se2_inputarea th,.se2_inputarea td{margin:0;padding:0;font-family:'돋움',Dotum,Helvetica,Sans-serif;font-size:12px;line-height:1.5;color:#666} */
+.se2_inputarea p,.se2_inputarea br{margin:0;padding:0}
+.se2_inputarea{margin:15px;word-wrap:break-word;*word-wrap:normal;*word-break:break-all}
+.se2_inputarea td{word-break:break-all}
+.se2_inputarea_890{width:741px;margin:20px 0 10px 64px}
+.se2_inputarea_698{width:548px;margin:20px 0 10px 64px}
+/* TEXT_TOOLBAR : QUOTE */
+.se2_quote1{margin:0 0 30px 20px;padding:0 8px;border-left:2px solid #ccc;color:#888}
+.se2_quote2{margin:0 0 30px 13px;padding:0 8px 0 16px;background:url("../img/bg_quote2.gif") 0 3px no-repeat;color:#888}
+.se2_quote3{margin:0 0 30px;padding:12px 10px 11px;border:1px dashed #ccc;color:#888}
+.se2_quote4{margin:0 0 30px;padding:12px 10px 11px;border:1px dashed #66b246;color:#888}
+.se2_quote5{margin:0 0 30px;padding:12px 10px 11px;border:1px dashed #ccc;background:#fafafa;color:#888}
+.se2_quote6{margin:0 0 30px;padding:12px 10px 11px;border:1px solid #e5e5e5;color:#888}
+.se2_quote7{margin:0 0 30px;padding:12px 10px 11px;border:1px solid #66b246;color:#888}
+.se2_quote8{margin:0 0 30px;padding:12px 10px 11px;border:1px solid #e5e5e5;background:#fafafa;color:#888}
+.se2_quote9{margin:0 0 30px;padding:12px 10px 11px;border:2px solid #e5e5e5;color:#888}
+.se2_quote10{margin:0 0 30px;padding:12px 10px 11px;border:2px solid #e5e5e5;background:#fafafa;color:#888}

plugin/editor/smarteditor2/css/smart_editor2_out.css

@@ -1,20 +1,12 @@
 @charset "UTF-8";
 /* NHN Web Standardization Team (http://html.nhndesign.com/) HHJ 090226 */
 /* COMMON */
-.se2_outputarea, .se2_outputarea th, .se2_outputarea td { margin: 0; padding: 0; color: #666; font-size: 12px; font-family: '돋움',Dotum,'굴림',Gulim,Helvetica,Sans-serif; line-height: 1.5; }
-
-.se2_outputarea p { margin: 0; padding: 0; }
-
-.se2_outputarea a:hover { text-decoration: underline; }
-
-.se2_outputarea a:link { color: #0000ff; }
-
-.se2_outputarea ul { margin: 0 0 0 40px; padding: 0; }
-
-.se2_outputarea ul li { margin: 0; list-style-type: disc; padding: 0; }
-
-.se2_outputarea ul ul li { list-style-type: circle; }
-
-.se2_outputarea ul ul ul li { list-style-type: square; }
-
-.se2_outputarea img, .se2_outputarea fieldset { border: 0; }
+.se2_outputarea,.se2_outputarea th,.se2_outputarea td{margin:0;padding:0;color:#666;font-size:12px;font-family:'돋움',Dotum,'굴림',Gulim,Helvetica,Sans-serif;line-height:1.5}
+.se2_outputarea p{margin:0;padding:0}
+.se2_outputarea a:hover{text-decoration:underline}
+.se2_outputarea a:link{color:#0000ff}
+.se2_outputarea ul{margin:0 0 0 40px;padding:0}
+.se2_outputarea ul li{margin:0;list-style-type:disc;padding:0}
+.se2_outputarea ul ul li{list-style-type:circle}
+.se2_outputarea ul ul ul li{list-style-type:square}
+.se2_outputarea img,.se2_outputarea fieldset{border:0}

plugin/editor/smarteditor2/editor.lib.php

@@ -15,7 +15,7 @@ function editor_html($id, $content, $is_dhtml_editor=true)
 
     if ($is_dhtml_editor && $js) {
         $html .= "\n".'<script src="'.$editor_url.'/js/HuskyEZCreator.js"></script>';
-        $html .= "\n".'<script>var g5_editor_url = "'.$editor_url.'", oEditors = [];</script>';
+        $html .= "\n".'<script>var g5_editor_url = "'.$editor_url.'", oEditors = [], ed_nonce = "'.ft_nonce_create('smarteditor').'";</script>';
         $html .= "\n".'<script src="'.$editor_url.'/config.js"></script>';
         $html .= "\n<script>";
         $html .= '
@@ -38,7 +38,7 @@ function editor_html($id, $content, $is_dhtml_editor=true)
     }
 
     $smarteditor_class = $is_dhtml_editor ? "smarteditor2" : "";
-    $html .= "\n<textarea id=\"$id\" name=\"$id\" class=\"$smarteditor_class\" maxlength=\"65536\" style=\"width:100%\">$content</textarea>";
+    $html .= "\n<textarea id=\"$id\" name=\"$id\" class=\"$smarteditor_class\" maxlength=\"65536\" style=\"width:100%;height:300px\">$content</textarea>";
     $html .= "\n<span class=\"sound_only\">웹 에디터 끝</span>";
     return $html;
 }
@@ -64,4 +64,72 @@ function chk_editor_js($id, $is_dhtml_editor=true)
         return "if (!{$id}_editor.value) { alert(\"내용을 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n";
     }
 }
+
+/*
+ * Name: FT-NONCE-LIB
+ * Created By: Full Throttle Development, LLC (http://fullthrottledevelopment.com)
+ * Created On: July 2009
+ * Last Modified On: August 12, 2009
+ * Last Modified By: Glenn Ansley (glenn@fullthrottledevelopment.com)
+ * Version: 0.2
+ */
+
+/* 
+Copyright 2009 Full Throttle Development, LLC
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+if (!defined('FT_NONCE_UNIQUE_KEY'))
+    define( 'FT_NONCE_UNIQUE_KEY' , sha1(G5_MYSQL_USER) );
+
+if (!defined('FT_NONCE_DURATION'))
+    define( 'FT_NONCE_DURATION' , 2160000 ); // 300 makes link or form good for 5 minutes from time of generation,  300은 5분간 유효, 2160000은 10시간동안 유효
+
+if (!defined('FT_NONCE_KEY'))
+    define( 'FT_NONCE_KEY' , '_nonce' );
+
+// This method creates a key / value pair for a url string
+if(!function_exists('ft_nonce_create_query_string')){
+    function ft_nonce_create_query_string( $action = '' , $user = '' ){
+        return FT_NONCE_KEY."=".ft_nonce_create( $action , $user );
+    }
+}
+
+// This method creates an nonce. It should be called by one of the previous two functions.
+if(!function_exists('ft_nonce_create')){
+    function ft_nonce_create( $action = '' , $user='' ){
+        return substr( ft_nonce_generate_hash( $action . $user ), -12, 10);
+    }
+}
+
+// This method validates an nonce
+if(!function_exists('ft_nonce_is_valid')){
+    function ft_nonce_is_valid( $nonce , $action = '' , $user='' ){
+        // Nonce generated 0-12 hours ago
+        if ( substr(ft_nonce_generate_hash( $action . $user ), -12, 10) == $nonce ){
+            return true;
+        }
+        return false;
+    }
+}
+
+// This method generates the nonce timestamp
+if(!function_exists('ft_nonce_generate_hash')){
+    function ft_nonce_generate_hash( $action='' , $user='' ){
+        $i = ceil( time() / ( FT_NONCE_DURATION / 2 ) );
+        return md5( $i . $action . $user . $action );
+    }
+}
 ?>

plugin/editor/smarteditor2/js/SE2BasicCreator.js

@@ -10,7 +10,6 @@ function createSEditor2(elIRField, htParams, elSeAppContainer){
 	var oIRTextarea = elIRField?elIRField:jindo.$$.getSingle("TEXTAREA.blind", elEditingArea);
 	var oHTMLSrc = jindo.$$.getSingle("TEXTAREA.se2_input_htmlsrc", elEditingArea);
 	var oTextArea = jindo.$$.getSingle("TEXTAREA.se2_input_text", elEditingArea);
-	var sEditorMode = "open";
 	
 	if(!htParams){ 
 		htParams = {}; 
@@ -24,7 +23,7 @@ function createSEditor2(elIRField, htParams, elSeAppContainer){
 	oEditor.registerPlugin(new nhn.husky.StringConverterManager());
 
 	var htDimension = {
-		nMinHeight:320,
+		nMinHeight:205,
 		nMinWidth:parseInt(elIRField.style.minWidth, 10)||570,
 		nHeight:elIRField.style.height||elIRField.offsetHeight,
 		nWidth:elIRField.style.width||elIRField.offsetWidth
@@ -56,7 +55,6 @@ function createSEditor2(elIRField, htParams, elSeAppContainer){
 	oEditor.registerPlugin(new nhn.husky.ActiveLayerManager());
 	oEditor.registerPlugin(new nhn.husky.SE_WYSIWYGStyleGetter());							// 커서 위치 스타일 정보 가져오기
 
-	oEditor.registerPlugin(new nhn.husky.SE2B_Customize_ToolBar(elAppContainer));			// 상단 툴바 (Basic)
 	oEditor.registerPlugin(new nhn.husky.SE_WYSIWYGEnterKey("P"));							// 엔터 시 처리, 현재는 P로 처리
 	
 	oEditor.registerPlugin(new nhn.husky.SE2M_ColorPalette(elAppContainer));				// 색상 팔레트
@@ -76,16 +74,22 @@ function createSEditor2(elIRField, htParams, elSeAppContainer){
 	oEditor.registerPlugin(new nhn.husky.SE2M_TableCreator(elAppContainer));				// 테이블 생성
 	oEditor.registerPlugin(new nhn.husky.SE2M_TableEditor(elAppContainer));					// 테이블 편집
 	oEditor.registerPlugin(new nhn.husky.SE2M_TableBlockStyler(elAppContainer));			// 테이블 스타일
-	oEditor.registerPlugin(new nhn.husky.SE2M_AttachQuickPhoto(elAppContainer));			// 사진			
+	if(nhn.husky.SE2M_AttachQuickPhoto){
+		oEditor.registerPlugin(new nhn.husky.SE2M_AttachQuickPhoto(elAppContainer));			// 사진			
+	}
 
 	oEditor.registerPlugin(new nhn.husky.MessageManager(oMessageMap));
 	oEditor.registerPlugin(new nhn.husky.SE2M_QuickEditor_Common(elAppContainer));			// 퀵에디터 공통(표, 이미지)
 	
 	oEditor.registerPlugin(new nhn.husky.SE2B_CSSLoader());									// CSS lazy load
-	oEditor.registerPlugin(new nhn.husky.SE_OuterIFrameControl(elAppContainer, 100));
+	if(window.frameElement){
+		oEditor.registerPlugin(new nhn.husky.SE_OuterIFrameControl(elAppContainer, 100));
+	}
 	
 	oEditor.registerPlugin(new nhn.husky.SE_ToolbarToggler(elAppContainer, htParams.bUseToolbar));
 	oEditor.registerPlugin(new nhn.husky.SE2M_Accessibility(elAppContainer));				// 에디터내의 웹접근성 관련 기능모음 플러그인 
-	
+
+    oEditor.registerPlugin(new nhn.husky.SE2B_Customize_ToolBar(elAppContainer));       // 2.3 버젼에 있는 툴바 이용
+
 	return oEditor;
 }

plugin/editor/smarteditor2/js/SE2M_Configuration.js

@@ -0,0 +1,149 @@
+/*
+ * Smart Editor 2 Configuration : This setting must be changed by service
+ */
+window.nhn = window.nhn || {};
+nhn.husky = nhn.husky || {};
+nhn.husky.SE2M_Configuration = nhn.husky.SE2M_Configuration || {};
+
+/**
+ * CSS LazyLoad를 위한 경로
+ */
+nhn.husky.SE2M_Configuration.SE2B_CSSLoader = {
+	sCSSBaseURI : "css"
+};
+
+/**
+ * 편집영역 설정
+ */
+nhn.husky.SE2M_Configuration.SE_EditingAreaManager = {
+	sCSSBaseURI : "css",					// smart_editor2_inputarea.html 파일의 상대경로
+	sBlankPageURL : "smart_editor2_inputarea.html",
+	sBlankPageURL_EmulateIE7 : "smart_editor2_inputarea_ie8.html",
+	aAddtionalEmulateIE7 : [] // IE8 default 사용, IE9 ~ 선택적 사용
+};
+
+/**
+ * [웹접근성]
+ * 단축키 ALT+,  ALT+. 을 이용하여 스마트에디터 영역의 이전/이후 요소로 이동할 수 있다.
+ * 		sBeforeElementId : 스마트에디터 영역 이전 요소의 id
+ * 		sNextElementId : 스마트에디터 영역 이후 요소의 id 
+ * 
+ * 스마트에디터 영역 이외의 제목 영역 (예:스마트에디터가 적용된 블로그 쓰기 페이지에서의 제목 영역) 에 해당하는 엘리먼트에서 Tab키를 누르면 에디팅 영역으로 포커스를 이동시킬 수 있다.
+ * 		sTitleElementId : 제목에 해당하는 input 요소의 id. 
+ */
+nhn.husky.SE2M_Configuration.SE2M_Accessibility = {
+    ed_nonce : (typeof parent.ed_nonce !='undefined') ? parent.ed_nonce : '',
+    sBeforeElementId : '',
+    sNextElementId : '',
+    sTitleElementId : ''
+};
+
+/**
+ * 링크 기능 옵션
+ */
+nhn.husky.SE2M_Configuration.SE2M_Hyperlink = {
+	bAutolink : true	// 자동링크기능 사용여부(기본값:true)
+};
+
+nhn.husky.SE2M_Configuration.Quote = {
+	sImageBaseURL : 'http://static.se2.naver.com/static/img'
+};
+nhn.husky.SE2M_Configuration.SE2M_ColorPalette = {
+	bAddRecentColorFromDefault : false
+};
+
+nhn.husky.SE2B_Customize_ToolBar = jindo.$Class(/** @lends nhn.husky.SE2B_Customize_ToolBar */{
+	name : "SE2B_Customize_ToolBar",
+	/**
+	 * @constructs
+	 * @param {Object} oAppContainer 에디터를 구성하는 컨테이너
+	 */
+	$init : function(oAppContainer) {
+		this._assignHTMLElements(oAppContainer);
+	},
+	$BEFORE_MSG_APP_READY : function(){
+		this._addEventMoreButton();
+	},
+	
+	/**
+	 * @private
+	 * @description DOM엘리먼트를 수집하는 메소드
+	 * @param {Object} oAppContainer 툴바 포함 에디터를 감싸고 있는 div 엘리먼트
+	 */
+	_assignHTMLElements : function(oAppContainer) {
+		this.oAppContainer = oAppContainer;
+		this.elTextToolBarArea =  jindo.$$.getSingle("div.se2_tool");
+		this.elTextMoreButton =  jindo.$$.getSingle("button.se2_text_tool_more", this.elTextToolBarArea);
+		this.elTextMoreButtonParent = this.elTextMoreButton.parentNode;
+		this.welTextMoreButtonParent = jindo.$Element(this.elTextMoreButtonParent);
+		this.elMoreLayer =  jindo.$$.getSingle("div.se2_sub_text_tool");
+	},
+
+	_addEventMoreButton : function (){
+		this.oApp.registerBrowserEvent(this.elTextMoreButton, "click", "EVENT_CLICK_EXPAND_VIEW");
+		this.oApp.registerBrowserEvent(this.elMoreLayer, "click", "EVENT_CLICK_EXPAND_VIEW");			
+	},
+	
+	$ON_EVENT_CLICK_EXPAND_VIEW : function(weEvent){
+		this.oApp.exec("TOGGLE_EXPAND_VIEW", [this.elTextMoreButton]);
+		weEvent.stop();
+	},
+	
+	$ON_TOGGLE_EXPAND_VIEW : function(){
+		if(!this.welTextMoreButtonParent.hasClass("active")){
+			this.oApp.exec("SHOW_EXPAND_VIEW");
+		} else {
+			this.oApp.exec("HIDE_EXPAND_VIEW");
+		}
+	},
+	
+	$ON_CHANGE_EDITING_MODE : function(sMode){
+		if(sMode != "WYSIWYG"){
+			this.elTextMoreButton.disabled =true;
+			this.welTextMoreButtonParent.removeClass("active");
+			this.oApp.exec("HIDE_EXPAND_VIEW");
+		}else{
+			this.elTextMoreButton.disabled =false;
+		}
+	},
+	
+	$AFTER_SHOW_ACTIVE_LAYER : function(){
+		this.oApp.exec("HIDE_EXPAND_VIEW");
+	},
+	
+	$AFTER_SHOW_DIALOG_LAYER : function(){
+		this.oApp.exec("HIDE_EXPAND_VIEW");
+	},
+	
+	$ON_SHOW_EXPAND_VIEW : function(){
+		this.welTextMoreButtonParent.addClass("active");
+		this.elMoreLayer.style.display = "block";
+	},
+	
+	$ON_HIDE_EXPAND_VIEW : function(){
+		this.welTextMoreButtonParent.removeClass("active");
+		this.elMoreLayer.style.display = "none";
+	},
+	
+	/**
+	 * CHANGE_EDITING_MODE모드 이후에 호출되어야 함. 
+	 * WYSIWYG 모드가 활성화되기 전에 호출이 되면 APPLY_FONTCOLOR에서 에러 발생.
+	 */
+	$ON_RESET_TOOLBAR : function(){
+		if(this.oApp.getEditingMode() !== "WYSIWYG"){			
+			return;
+		}
+		//스펠체크 닫기 
+		this.oApp.exec("END_SPELLCHECK");		
+		//열린 팝업을 닫기 위해서
+		this.oApp.exec("DISABLE_ALL_UI");
+		this.oApp.exec("ENABLE_ALL_UI");
+		//글자색과 글자 배경색을 제외한 세팅
+		this.oApp.exec("RESET_STYLE_STATUS");
+		this.oApp.exec("CHECK_STYLE_CHANGE");
+		//최근 사용한 글자색 셋팅.
+		this.oApp.exec("APPLY_FONTCOLOR", ["#000000"]);
+		//더보기 영역 닫기.
+		this.oApp.exec("HIDE_EXPAND_VIEW");
+	}
+});

plugin/editor/smarteditor2/photo_uploader/popup/_common.php

@@ -0,0 +1,3 @@
+<?php
+include_once("../../../../../common.php");
+?>

plugin/editor/smarteditor2/photo_uploader/popup/attach_photo.js

@@ -1,681 +0,0 @@
-	//변수 선언 및 초기화
-	var nImageInfoCnt = 0;
-	var htImageInfo = [];		//image file정보 저장
-	var aResult = [];
-	
-	var rFilter = /^(image\/bmp|image\/gif|image\/jpg|image\/jpeg|image\/png)$/i;  
-	var rFilter2 = /^(bmp|gif|jpg|jpeg|png)$/i; 
-	var nTotalSize = 0;
-	var nMaxImageSize = 10*1024*1024;
-	var nMaxTotalImageSize = 50*1024*1024;
-	var nMaxImageCount = 10;
-	var nImageFileCount = 0;
-	var bSupportDragAndDropAPI = false;
-	var oFileUploader;
-	var bAttachEvent = false;
-
-	//마크업에 따른 할당
-	var elContent= $("pop_content");  
-	var elDropArea = jindo.$$.getSingle(".drag_area",elContent);
-	var elDropAreaUL = jindo.$$.getSingle(".lst_type",elContent);
-	var elCountTxtTxt = jindo.$$.getSingle("#imageCountTxt",elContent);
-	var elTotalSizeTxt = jindo.$$.getSingle("#totalSizeTxt",elContent);
-	var elTextGuide = $("guide_text");
-	var welUploadInputBox = $Element("uploadInputBox");
-	var oNavigator = jindo.$Agent().navigator();
-	
-	//마크업-공통 
-	var welBtnConfirm = $Element("btn_confirm");				//확인 버튼
-	var welBtnCancel= $Element("btn_cancel");				//취소 버튼
-	
-	//진도로 랩핑된 element
-	var welTextGuide = $Element(elTextGuide);
-	var welDropArea = $Element(elDropArea);
-	var welDropAreaUL = $Element(elDropAreaUL); 
-	var fnUploadImage = null;
-	
-	//File API 지원 여부로 결정
-	function checkDragAndDropAPI(){
-		try{
-			if( !oNavigator.ie ){
-				if(!!oNavigator.safari && oNavigator.version <= 5){
-					bSupportDragAndDropAPI = false;
-				}else{
-					bSupportDragAndDropAPI = true;
-				}
-			} else {
-				bSupportDragAndDropAPI = false;
-			}
-		}catch(e){
-			bSupportDragAndDropAPI = false;
-		}
-	}
-	
-	//--------------- html5 미지원 브라우저에서 (IE9 이하) ---------------
-	/** 
-	 * 이미지를 첨부 후 활성화된 버튼 상태
-	 */
-     function goStartMode(){
-    	 var sSrc = welBtnConfirm.attr("src")|| "";
-    	 if(sSrc.indexOf("btn_confirm2.png") < 0 ){
-    		 welBtnConfirm.attr("src","../../img/photoQuickPopup/btn_confirm2.png");
-    		 fnUploadImage.attach(welBtnConfirm.$value(), "click");
-    	 }
-     } 
-     /**
-      * 이미지를 첨부 전 비활성화된 버튼 상태
-      * @return
-      */
-     function goReadyMode(){
-    	 var sSrc = welBtnConfirm.attr("src")|| "";
-    	 if(sSrc.indexOf("btn_confirm2.png") >= 0 ){
-    		 fnUploadImage.detach(welBtnConfirm.$value(), "click");
-	    	 welBtnConfirm.attr("src","../../img/photoQuickPopup/btn_confirm.png");
-    	 }
-     }   
-	
-	/**
-	 * 일반 업로드 
-	 * @desc oFileUploader의 upload함수를 호출함. 
-	 */
-	function generalUpload(){
-		oFileUploader.upload();
-	}
-	
-    /** 
-     * 이미지 첨부 전 안내 텍스트가 나오는 배경으로 '설정'하는 함수.
-     * @return
-     */
- 	function readyModeBG (){
- 		var sClass = welTextGuide.className();
- 		if(sClass.indexOf('nobg') >= 0){
- 			welTextGuide.removeClass('nobg');
- 			welTextGuide.className('bg');
- 		}
- 	}
- 	
- 	/**
- 	 * 이미지 첨부 전 안내 텍스트가 나오는 배경을 '제거'하는 함수. 
- 	 * @return
- 	 */
- 	function startModeBG (){
- 		var sClass = welTextGuide.className();
- 		if(sClass.indexOf('nobg') < 0){
-	 		welTextGuide.removeClass('bg');
-	 		welTextGuide.className('nobg');
- 		}
- 	}
-
-	//--------------------- html5  지원되는 브라우저에서 사용하는 함수  --------------------------
- 	/**
- 	 * 팝업에 노출될 업로드 예정 사진의 수.
- 	 * @param {Object} nCount 현재 업로드 예정인 사진 장수
- 	 * @param {Object} nVariable 삭제되는 수
- 	 */
- 	function updateViewCount (nCount, nVariable){
- 		var nCnt = nCount + nVariable;
- 		elCountTxtTxt.innerHTML = nCnt +"장";
- 		nImageFileCount = nCnt;
- 		return nCnt;
- 	}
- 	
- 	/**
- 	 * 팝업에 노출될 업로드될 사진 총 용량
- 	 */
- 	function updateViewTotalSize(){
- 		var nViewTotalSize = Number(parseInt((nTotalSize || 0), 10) / (1024*1024));
- 		elTotalSizeTxt.innerHTML = nViewTotalSize.toFixed(2) +"MB";
- 	}
- 	
- 	/**
- 	 * 이미지 전체 용량 재계산.
- 	 * @param {Object} sParentId
- 	 */
- 	function refreshTotalImageSize(sParentId){
- 		var nDelImgSize = htImageInfo[sParentId].size;
- 		if(nTotalSize - nDelImgSize > -1 ){
- 			nTotalSize = nTotalSize - nDelImgSize;
- 		} 
- 	}
-	
- 	/**
- 	 * hash table에서 이미지 정보 초기화.
- 	 * @param {Object} sParentId
- 	 */
- 	function removeImageInfo (sParentId){
- 		//삭제된 이미지의 공간을 초기화 한다.
- 		htImageInfo[sParentId] = null;
- 	}
- 	
- 	
- 	/**
- 	 * byte로 받은 이미지 용량을 화면에 표시를 위해 포맷팅
- 	 * @param {Object} nByte
- 	 */
- 	function setUnitString (nByte) {
- 		var nImageSize;
- 		var sUnit;
- 		
- 		if(nByte < 0 ){
- 			nByte = 0;
- 		}
- 		
- 		if( nByte < 1024) {
- 			nImageSize = Number(nByte);
- 			sUnit = 'B';
- 			return nImageSize + sUnit;
- 		} else if( nByte > (1024*1024)) {
- 			nImageSize = Number(parseInt((nByte || 0), 10) / (1024*1024));
- 			sUnit = 'MB';
- 			return nImageSize.toFixed(2) + sUnit;
- 		} else {
- 			nImageSize = Number(parseInt((nByte || 0), 10) / 1024);
- 			sUnit = 'KB';
- 			return nImageSize.toFixed(0) + sUnit;
- 		}
-     }
- 	
- 	/**
- 	 * 화면 목록에 적당하게 이름을 잘라서 표시.
- 	 * @param {Object} sName 파일명
- 	 * @param {Object} nMaxLng 최대 길이
- 	 */
- 	function cuttingNameByLength (sName, nMaxLng) {
- 		var sTemp, nIndex;
- 		if(sName.length > nMaxLng){
- 			nIndex = sName.indexOf(".");
- 			sTemp = sName.substring(0,nMaxLng) + "..." + sName.substring(nIndex,sName.length) ;
- 		} else {
- 			sTemp = sName;
- 		}
- 		return sTemp;
- 	}
- 	
- 	/**
- 	 * Total Image Size를 체크해서 추가로 이미지를 넣을지 말지를 결정함.
- 	 * @param {Object} nByte
- 	 */
- 	function checkTotalImageSize(nByte){
- 		if( nTotalSize + nByte < nMaxTotalImageSize){
- 			nTotalSize = nTotalSize + nByte;
- 			return false;
- 		} else {
- 			return true;
- 		}
- 	}
-	
- 	// 이벤트 핸들러 할당
- 	function dragEnter(ev) {
- 		ev.stopPropagation();
- 		ev.preventDefault();
-     }
- 	
-     function dragExit(ev) {
-     	ev.stopPropagation();
-     	ev.preventDefault();
-     }
-     
- 	function dragOver(ev) {
- 		ev.stopPropagation();
- 		ev.preventDefault();
-     }
- 	
-	/**
-	 * 드랍 영역에 사진을 떨구는 순간 발생하는 이벤트
-	 * @param {Object} ev
-	 */
-    function drop(ev) {
-		ev.stopPropagation();
-		ev.preventDefault();
-		
-		if (nImageFileCount >= 10){
-			alert("최대 10장까지만 등록할 수 있습니다.");
-			return;
-		}
-		
-		if(typeof ev.dataTransfer.files == 'undefined'){
-			alert("HTML5를 지원하지 않는 브라우저입니다.");
-		}else{
-			//변수 선언
-			var wel,
-				files,
-				nCount,
-				sListTag = '';
-			
-			//초기화	
-			files = ev.dataTransfer.files;
-			nCount = files.length;
-						
-			if (!!files && nCount === 0){
-				//파일이 아닌, 웹페이지에서 이미지를 드래서 놓는 경우.
-				alert("정상적인 첨부방식이 아닙니다.");
-				return ;
-			}
-			
-			for (var i = 0, j = nImageFileCount ; i < nCount ; i++){
-				if (!rFilter.test(files[i].type)) {
-					alert("이미지파일 (jpg,gif,png,bmp)만 업로드 가능합니다.");
-				} else if(files[i].size > nMaxImageSize){
-					alert("이미지 용량이 10MB를 초과하여 등록할 수 없습니다.");
-				} else {
-					//제한된 수만 업로드 가능.
-					if ( j < nMaxImageCount ){
-						sListTag += addImage(files[i]);
-						
-						//다음 사진을위한 셋팅
-						j = j+1;
-						nImageInfoCnt = nImageInfoCnt+1;
-					} else {
-						alert("최대 10장까지만 등록할 수 있습니다.");
-						break;			
-					}
-				}
-			}
-			if(j > 0){
-				//배경 이미지 변경
-				startModeBG();
-				if ( sListTag.length > 1){
-					welDropAreaUL.prependHTML(sListTag);
-				}
-				//이미지 총사이즈 view update 
-				updateViewTotalSize();
-				//이미치 총 수 view update
-				nImageFileCount = j;
-				updateViewCount(nImageFileCount, 0);
-				// 저장 버튼 활성화
-				goStartMode();
-			}else{
-				readyModeBG();
-			}
-		}
-    }
-	
-    /**
-     * 이미지를 추가하기 위해서 file을 저장하고, 목록에 보여주기 위해서 string을 만드는 함수.
-     * @param ofile 한개의 이미지 파일
-     * @return
-     */
-    function addImage(ofile){
-    	//파일 사이즈
-		var ofile = ofile,
-			sFileSize = 0,
-			sFileName = "",
-			sLiTag = "",
-			bExceedLimitTotalSize = false,
-			aFileList = [];
-		
-		sFileSize = setUnitString(ofile.size);
-		sFileName = cuttingNameByLength(ofile.name, 15);
-		bExceedLimitTotalSize = checkTotalImageSize(ofile.size);
-
-		if( !!bExceedLimitTotalSize ){
-			alert("전체 이미지 용량이 50MB를 초과하여 등록할 수 없습니다. \n\n (파일명 : "+sFileName+", 사이즈 : "+sFileSize+")");
-		} else {
-			//이미지 정보 저장							
-			htImageInfo['img'+nImageInfoCnt] = ofile;
-			
-    		//List 마크업 생성하기
-			aFileList.push('	<li id="img'+nImageInfoCnt+'" class="imgLi"><span>'+ sFileName +'</span>');
-			aFileList.push('	<em>'+ sFileSize +'</em>');
-	        aFileList.push('	<a onclick="delImage(\'img'+nImageInfoCnt+'\')"><img class="del_button" src="../../img/photoQuickPopup/btn_del.png"  width="14" height="13" alt="첨부 사진 삭제"></a>');
-			aFileList.push('	</li> ');   
-			
-			sLiTag = aFileList.join(" ");
-			aFileList = [];
-		}
-		return sLiTag;
-    }
-    
-    /**
-     * HTML5 DragAndDrop으로 사진을 추가하고, 확인버튼을 누른 경우에 동작한다.
-     * @return
-     */
-    function html5Upload() {	
-    	var tempFile,
-    		sUploadURL;
-    	
-    	sUploadURL= 'file_uploader_html5.php'; 	//upload URL
-    	
-    	//파일을 하나씩 보내고, 결과를 받음.
-    	for(var j=0, k=0; j < nImageInfoCnt; j++) {
-    		tempFile = htImageInfo['img'+j];
-    		try{
-	    		if(!!tempFile){
-	    			//Ajax통신하는 부분. 파일과 업로더할 url을 전달한다.
-	    			callAjaxForHTML5(tempFile,sUploadURL);
-	    			k += 1;
-	    		}
-	    	}catch(e){}
-    		tempFile = null;
-    	}
-	}
-    
-    function callAjaxForHTML5 (tempFile, sUploadURL){
-    	var oAjax = jindo.$Ajax(sUploadURL, {
-			type: 'xhr',
-			method : "post",
-			onload : function(res){ // 요청이 완료되면 실행될 콜백 함수
-				var sResString = res._response.responseText;
-				if (res.readyState() == 4) {
-					if(sResString.indexOf("NOTALLOW_") > -1){
-						var sFileName = sResString.replace("NOTALLOW_", "");
-						alert("이미지 파일(jpg,gif,png,bmp)만 업로드 하실 수 있습니다. ("+sFileName+")");
-					}else{
-						//성공 시에  responseText를 가지고 array로 만드는 부분.
-						makeArrayFromString(res._response.responseText);
-					}
-				}
-			},
-			timeout : 3,
-			onerror :  jindo.$Fn(onAjaxError, this).bind()
-		});
-		oAjax.header("contentType","multipart/form-data");
-		oAjax.header("file-name",encodeURIComponent(tempFile.name));
-		oAjax.header("file-size",tempFile.size);
-		oAjax.header("file-Type",tempFile.type);
-		oAjax.request(tempFile);
-    }
-    
-    function makeArrayFromString(sResString){
-    	var	aTemp = [],
-    		aSubTemp = [],
-    		htTemp = {}
-    		aResultleng = 0;
-    	
- 		try{
- 			if(!sResString || sResString.indexOf("sFileURL") < 0){
- 	    		return ;
- 	    	}
- 			aTemp = sResString.split("&");
-	    	for (var i = 0; i < aTemp.length ; i++){
-	    		if( !!aTemp[i] && aTemp[i] != "" && aTemp[i].indexOf("=") > 0){
-	    			aSubTemp = aTemp[i].split("=");
-	    			htTemp[aSubTemp[0]] = aSubTemp[1];
-	    		}
-	 		}
- 		}catch(e){}
- 		
- 		aResultleng = aResult.length;
-    	aResult[aResultleng] = htTemp;
-    	
-    	if(aResult.length == nImageFileCount){
-    		setPhotoToEditor(aResult); 
-    		aResult = null;
-    		window.close();
-    	}
-    }
-    
-    /**
- 	 * 사진 삭제 시에 호출되는 함수
- 	 * @param {Object} sParentId 
- 	 */
- 	function delImage (sParentId){
- 		var elLi = jindo.$$.getSingle("#"+sParentId);
- 		
- 		refreshTotalImageSize(sParentId);
- 		
- 		updateViewTotalSize();
- 		updateViewCount(nImageFileCount,-1);
- 		//사진 file array에서 정보 삭제.
- 		removeImageInfo(sParentId);
- 		//해당 li삭제
- 		$Element(elLi).leave();
- 		
- 		//마지막 이미지인경우.
- 		if(nImageFileCount === 0){
- 			readyModeBG();
- 			//사진 추가 버튼 비활성화
- 			goReadyMode();
- 		}
- 		
- 		// drop 영역 이벤트 다시 활성화.
- 		if(!bAttachEvent){
- 			addEvent();
- 		}
- 	}
-
- 	/**
-     * 이벤트 할당
-     */
-	function addEvent() {
-		bAttachEvent = true;
-		elDropArea.addEventListener("dragenter", dragEnter, false);
-		elDropArea.addEventListener("dragexit", dragExit, false);
-		elDropArea.addEventListener("dragover", dragOver, false);
-		elDropArea.addEventListener("drop", drop, false);
-	}
-	
-	function removeEvent(){
-		bAttachEvent = false;
-		elDropArea.removeEventListener("dragenter", dragEnter, false);
-	    elDropArea.removeEventListener("dragexit", dragExit, false);
-	    elDropArea.removeEventListener("dragover", dragOver, false);
-	    elDropArea.removeEventListener("drop", drop, false);	
-	}
- 	
-	/**
-	 * Ajax 통신 시 error가 발생할 때 처리하는 함수입니다.
-	 * @return
-	 */
-	function onAjaxError (){
-		alert("[가이드]사진 업로더할 서버URL셋팅이 필요합니다.-onAjaxError");
-	}
-
- 	/**
-      * 이미지 업로드 시작
-      * 확인 버튼 클릭하면 호출되는 msg
-      */
-     function uploadImage (e){
-    	 if(!bSupportDragAndDropAPI){
-    		 generalUpload();
-    	 }else{
-    		 html5Upload();
-    	 }
-     }
-     
- 	/**
- 	 * jindo에 파일 업로드 사용.(iframe에 Form을 Submit하여 리프레시없이 파일을 업로드하는 컴포넌트)
- 	 */
- 	function callFileUploader (){
- 		oFileUploader = new jindo.FileUploader(jindo.$("uploadInputBox"),{
- 			sUrl  : location.href.replace(/\/[^\/]*$/, '') + '/file_uploader.php',	//샘플 URL입니다.
- 	        sCallback : location.href.replace(/\/[^\/]*$/, '') + '/callback.html',	//업로드 이후에 iframe이 redirect될 콜백페이지의 주소
- 	    	sFiletype : "*.jpg;*.png;*.bmp;*.gif",						//허용할 파일의 형식. ex) "*", "*.*", "*.jpg", 구분자(;)	
- 	    	sMsgNotAllowedExt : 'JPG, GIF, PNG, BMP 확장자만 가능합니다',	//허용할 파일의 형식이 아닌경우에 띄워주는 경고창의 문구
- 	    	bAutoUpload : false,									 	//파일이 선택됨과 동시에 자동으로 업로드를 수행할지 여부 (upload 메소드 수행)
- 	    	bAutoReset : true 											// 업로드한 직후에 파일폼을 리셋 시킬지 여부 (reset 메소드 수행)
- 	    }).attach({
- 	    	select : function(oCustomEvent) {
- 	    		//파일 선택이 완료되었을 때 발생
-// 		    	 oCustomEvent (이벤트 객체) = {
-// 	    			sValue (String) 선택된 File Input의 값
-// 	    			bAllowed (Boolean) 선택된 파일의 형식이 허용되는 형식인지 여부
-// 	    			sMsgNotAllowedExt (String) 허용되지 않는 파일 형식인 경우 띄워줄 경고메세지
-// 	    		}
-//  				선택된 파일의 형식이 허용되는 경우만 처리 
- 	    		if(oCustomEvent.bAllowed === true){
- 		    		goStartMode();
- 		    	}else{
- 		    		goReadyMode();
- 		    		oFileUploader.reset();
- 		    	}
-// 	    		bAllowed 값이 false인 경우 경고문구와 함께 alert 수행 
-// 	    		oCustomEvent.stop(); 수행시 bAllowed 가 false이더라도 alert이 수행되지 않음
- 	    	},
- 	    	success : function(oCustomEvent) {
- 	    		// alert("success");
- 	    		// 업로드가 성공적으로 완료되었을 때 발생
- 	    		// oCustomEvent(이벤트 객체) = {
- 	    		//	htResult (Object) 서버에서 전달해주는 결과 객체 (서버 설정에 따라 유동적으로 선택가능)
- 	    		// }
- 	    		var aResult = []; 
- 	    		aResult[0] = oCustomEvent.htResult;
- 	    		setPhotoToEditor(aResult); 
- 	    		//버튼 비활성화
- 	    		goReadyMode();
- 	    		oFileUploader.reset();
- 	    		window.close();
- 	    	},
- 	    	error : function(oCustomEvent) {
- 	    		//업로드가 실패했을 때 발생
- 	    		//oCustomEvent(이벤트 객체) = {
- 	    		//	htResult : { (Object) 서버에서 전달해주는 결과 객체. 에러발생시 errstr 프로퍼티를 반드시 포함하도록 서버 응답을 설정하여야한다.
- 	    		//		errstr : (String) 에러메시지
- 	    		// 	}
- 	    		//}
- 	    		//var wel = jindo.$Element("info");
- 	    		//wel.html(oCustomEvent.htResult.errstr);
- 	    		alert(oCustomEvent.htResult.errstr);
- 	    	}
- 	    });
- 	}
-	
-    /**
-     * 페이지 닫기 버튼 클릭
-     */
-    function closeWindow(){
-	   	if(bSupportDragAndDropAPI){
-	   		removeEvent();
-	   	}
-	   	window.close();
-    }
-    
-	window.onload = function(){
-  		checkDragAndDropAPI();
-  		
-  		if(bSupportDragAndDropAPI){
-  			$Element("pop_container2").hide();
-  			$Element("pop_container").show();
-  			
-  			welTextGuide.removeClass("nobg");
-  			welTextGuide.className("bg");
-  			
-  			addEvent();
-  		} else {
-  			$Element("pop_container").hide();
-  			$Element("pop_container2").show();
-  			callFileUploader();
-  		}
-  		fnUploadImage = $Fn(uploadImage,this);
-  		$Fn(closeWindow,this).attach(welBtnCancel.$value(), "click");
-	};
-
-	/**
-	 *  서버로부터 받은 데이타를 에디터에 전달하고 창을 닫음.
-	 * @parameter aFileInfo [{},{},...] 
-	 * @ex aFileInfo = [
-	 * 	{
-			sFileName : "nmms_215646753.gif",
-			sFileURL :"http://static.naver.net/www/u/2010/0611/nmms_215646753.gif",
-			bNewLine : true
-		},
-		{
-			sFileName : "btn_sch_over.gif",
-			sFileURL :"http://static1.naver.net/w9/btn_sch_over.gif",
-			bNewLine : true
-		}
-	 * ]
-	 */
- 	function setPhotoToEditor(oFileInfo){
-		if (!!opener && !!opener.nhn && !!opener.nhn.husky && !!opener.nhn.husky.PopUpManager) {
-			//스마트 에디터 플러그인을 통해서 넣는 방법 (oFileInfo는 Array)
-			opener.nhn.husky.PopUpManager.setCallback(window, 'SET_PHOTO', [oFileInfo]);
-			//본문에 바로 tag를 넣는 방법 (oFileInfo는 String으로 <img src=....> )
-			//opener.nhn.husky.PopUpManager.setCallback(window, 'PASTE_HTML', [oFileInfo]);
-		}
-	}
- 	
- 	// 2012.05 현재] jindo.$Ajax.prototype.request에서 file과 form을 지원하지 안함. 
- 	jindo.$Ajax.prototype.request = function(oData) {
- 		this._status++;
- 		var t   = this;
- 		var req = this._request;
- 		var opt = this._options;
- 		var data, v,a = [], data = "";
- 		var _timer = null;
- 		var url = this._url;
- 		this._is_abort = false;
-
- 		if( opt.postBody && opt.type.toUpperCase()=="XHR" && opt.method.toUpperCase()!="GET"){
- 			if(typeof oData == 'string'){
- 				data = oData;
- 			}else{
- 				data = jindo.$Json(oData).toString();	
- 			}	
- 		}else if (typeof oData == "undefined" || !oData) {
- 			data = null;
- 		} else {
- 			data = oData;
- 		}
- 		
- 		req.open(opt.method.toUpperCase(), url, opt.async);
- 		if (opt.sendheader) {
- 			if(!this._headers["Content-Type"]){
- 				req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
- 			}
- 			req.setRequestHeader("charset", "utf-8");
- 			for (var x in this._headers) {
- 				if(this._headers.hasOwnProperty(x)){
- 					if (typeof this._headers[x] == "function") 
- 						continue;
- 					req.setRequestHeader(x, String(this._headers[x]));
- 				}
- 			}
- 		}
- 		var navi = navigator.userAgent;
- 		if(req.addEventListener&&!(navi.indexOf("Opera") > -1)&&!(navi.indexOf("MSIE") > -1)){
- 			/*
- 			 * opera 10.60에서 XMLHttpRequest에 addEventListener기 추가되었지만 정상적으로 동작하지 않아 opera는 무조건 dom1방식으로 지원함.
- 			 * IE9에서도 opera와 같은 문제가 있음.
- 			 */
- 			if(this._loadFunc){ req.removeEventListener("load", this._loadFunc, false); }
- 			this._loadFunc = function(rq){ 
- 				clearTimeout(_timer);
- 				_timer = undefined; 
- 				t._onload(rq); 
- 			}
- 			req.addEventListener("load", this._loadFunc, false);
- 		}else{
- 			if (typeof req.onload != "undefined") {
- 				req.onload = function(rq){
- 					if(req.readyState == 4 && !t._is_abort){
- 						clearTimeout(_timer); 
- 						_timer = undefined;
- 						t._onload(rq);
- 					}
- 				};
- 			} else {
- 	            /*
- 				 * IE6에서는 onreadystatechange가 동기적으로 실행되어 timeout이벤트가 발생안됨.
- 				 * 그래서 interval로 체크하여 timeout이벤트가 정상적으로 발생되도록 수정. 비동기 방식일때만
- 		
- 	             */
- 				if(window.navigator.userAgent.match(/(?:MSIE) ([0-9.]+)/)[1]==6&&opt.async){
- 					var onreadystatechange = function(rq){
- 						if(req.readyState == 4 && !t._is_abort){
- 							if(_timer){
- 								clearTimeout(_timer);
- 								_timer = undefined;
- 							}
- 							t._onload(rq);
- 							clearInterval(t._interval);
- 							t._interval = undefined;
- 						}
- 					};
- 					this._interval = setInterval(onreadystatechange,300);
-
- 				}else{
- 					req.onreadystatechange = function(rq){
- 						if(req.readyState == 4){
- 							clearTimeout(_timer); 
- 							_timer = undefined;
- 							t._onload(rq);
- 						}
- 					};
- 				}
- 			}
- 		}
-
- 		req.send(data);
- 		return this;
- 	};

plugin/editor/smarteditor2/photo_uploader/popup/callback.html

@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> 
-<html lang="ko">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>FileUploader Callback</title>
-</head>
-<body>
-    <script type="text/javascript">
-    	// alert("callback");
-		// document.domain 설정
-		try { document.domain = "http://*.naver.com"; } catch(e) {}
-		
-        // execute callback script
-        var sUrl = document.location.search.substr(1);
-		if (sUrl != "blank") {
-	        var oParameter = {}; // query array
-
-	        sUrl.replace(/([^=]+)=([^&]*)(&|$)/g, function(){
-	            oParameter[arguments[1]] = arguments[2];
-	            return "";
-	        });
-	        
-	        if ((oParameter.errstr || '').length) { // on error
-	            (parent.jindo.FileUploader._oCallback[oParameter.callback_func+'_error'])(oParameter);
-	        } else {
-		        (parent.jindo.FileUploader._oCallback[oParameter.callback_func+'_success'])(oParameter);
-		   }
-		}
-    </script>
-</body>
-</html>

plugin/editor/smarteditor2/photo_uploader/popup/file_uploader.php

@@ -1,43 +0,0 @@
-<?php
-include_once("../../../../../common.php");
-// default redirection
-$url = $_REQUEST["callback"].'?callback_func='.$_REQUEST["callback_func"];
-$bSuccessUpload = is_uploaded_file($_FILES['Filedata']['tmp_name']);
-
-$ym = date('ym', G5_SERVER_TIME);
-
-$data_dir = G5_DATA_PATH.'/editor/'.$ym;
-$data_url = G5_DATA_URL.'/editor/'.$ym;
-
-@mkdir($data_dir, G5_DIR_PERMISSION);
-@chmod($data_dir, G5_DIR_PERMISSION);
-
-// SUCCESSFUL
-if(bSuccessUpload) {
-	$tmp_name = $_FILES['Filedata']['tmp_name'];
-	$name = $_FILES['Filedata']['name'];
-	
-	$filename_ext = strtolower(array_pop(explode('.',$name)));
-	
-	if (!preg_match("/(jpe?g|gif|bmp|png)$/i", $filename_ext)) {
-		$url .= '&errstr='.$name;
-	} else {
-		
-        $file_name = sprintf('%u', ip2long($_SERVER['REMOTE_ADDR'])).'_'.get_microtime().".".$filename_ext;
-		$save_dir = sprintf('%s/%s', $data_dir, $file_name);
-        $save_url = sprintf('%s/%s', $data_url, $file_name);
-		
-		@move_uploaded_file($tmp_name, $save_dir);
-		
-		$url .= "&bNewLine=true";
-		$url .= "&sFileName=".$name;
-		$url .= "&sFileURL=".$save_url;
-	}
-}
-// FAILED
-else {
-	$url .= '&errstr=error';
-}
-	
-header('Location: '. $url);
-?>

plugin/editor/smarteditor2/photo_uploader/popup/file_uploader_html5.php

@@ -1,47 +0,0 @@
-<?php
-include_once("../../../../../common.php");
-
-$ym = date('ym', G5_SERVER_TIME);
-
-$data_dir = G5_DATA_PATH.'/editor/'.$ym;
-$data_url = G5_DATA_URL.'/editor/'.$ym;
-
-@mkdir($data_dir, G5_DIR_PERMISSION);
-@chmod($data_dir, G5_DIR_PERMISSION);
-
- 	$sFileInfo = '';
-	$headers = array();
-	 
-	foreach($_SERVER as $k => $v) {
-		if(substr($k, 0, 9) == "HTTP_FILE") {
-			$k = substr(strtolower($k), 5);
-			$headers[$k] = $v;
-		} 
-	}
-	
-	$file = new stdClass;
-	//$file->name = str_replace("\0", "", rawurldecode($headers['file_name']));
-    $file->name = str_replace("\0", "", rawurldecode($headers['file_name']));
-	$file->size = $headers['file_size'];
-	$file->content = file_get_contents("php://input");
-	
-	$filename_ext = strtolower(array_pop(explode('.',$file->name)));
-
-    if (!preg_match("/(jpe?g|gif|bmp|png)$/i", $filename_ext)) {
-        echo "NOTALLOW_".$file->name;
-        exit;
-    }
-    
-	//$file_name = iconv("utf-8", "cp949", $file->name);
-    $file_name = sprintf('%u', ip2long($_SERVER['REMOTE_ADDR'])).'_'.get_microtime().".".$filename_ext;
-    $newPath = $data_dir."/".$file_name;
-    $save_url = sprintf('%s/%s', $data_url, $file_name);
-
-    if(file_put_contents($newPath, $file->content)) {
-        $sFileInfo .= "&bNewLine=true";
-        $sFileInfo .= "&sFileName=".$file->name;
-        $sFileInfo .= "&sFileURL=".$save_url;
-    }
-    
-    echo $sFileInfo;
-?>

plugin/editor/smarteditor2/photo_uploader/popup/index.html

@@ -59,6 +59,6 @@
 <!-- The basic File Upload plugin -->
 <script src="./js/jquery.fileupload.js?v=140715"></script>
 
-<script src="./js/basic.js"></script>
+<script src="./js/basic.js?v3"></script>
 </body> 
 </html>

plugin/editor/smarteditor2/photo_uploader/popup/jindo.fileuploader.js

@@ -1,390 +0,0 @@
-/**
- * Jindo Component
- * @version 1.0.3
- * NHN_Library:Jindo_Component-1.0.3;JavaScript Components for Jindo;
- * @include Component, UIComponent, FileUploader
- */
-jindo.Component = jindo.$Class({
-    _htEventHandler: null,
-    _htOption: null,
-    $init: function () {
-        var aInstance = this.constructor.getInstance();
-        aInstance.push(this);
-        this._htEventHandler = {};
-        this._htOption = {};
-        this._htOption._htSetter = {};
-    },
-    option: function (sName, vValue) {
-        switch (typeof sName) {
-        case "undefined":
-            return this._htOption;
-        case "string":
-            if (typeof vValue != "undefined") {
-                if (sName == "htCustomEventHandler") {
-                    if (typeof this._htOption[sName] == "undefined") {
-                        this.attach(vValue);
-                    } else {
-                        return this;
-                    }
-                }
-                this._htOption[sName] = vValue;
-                if (typeof this._htOption._htSetter[sName] == "function") {
-                    this._htOption._htSetter[sName](vValue);
-                }
-            } else {
-                return this._htOption[sName];
-            }
-            break;
-        case "object":
-            for (var sKey in sName) {
-                if (sKey == "htCustomEventHandler") {
-                    if (typeof this._htOption[sKey] == "undefined") {
-                        this.attach(sName[sKey]);
-                    } else {
-                        continue;
-                    }
-                }
-                this._htOption[sKey] = sName[sKey];
-                if (typeof this._htOption._htSetter[sKey] == "function") {
-                    this._htOption._htSetter[sKey](sName[sKey]);
-                }
-            }
-            break;
-        }
-        return this;
-    },
-    optionSetter: function (sName, fSetter) {
-        switch (typeof sName) {
-        case "undefined":
-            return this._htOption._htSetter;
-        case "string":
-            if (typeof fSetter != "undefined") {
-                this._htOption._htSetter[sName] = jindo.$Fn(fSetter, this).bind();
-            } else {
-                return this._htOption._htSetter[sName];
-            }
-            break;
-        case "object":
-            for (var sKey in sName) {
-                this._htOption._htSetter[sKey] = jindo.$Fn(sName[sKey], this).bind();
-            }
-            break;
-        }
-        return this;
-    },
-    fireEvent: function (sEvent, oEvent) {
-        oEvent = oEvent || {};
-        var fInlineHandler = this['on' + sEvent],
-            aHandlerList = this._htEventHandler[sEvent] || [],
-            bHasInlineHandler = typeof fInlineHandler == "function",
-            bHasHandlerList = aHandlerList.length > 0;
-        if (!bHasInlineHandler && !bHasHandlerList) {
-            return true;
-        }
-        aHandlerList = aHandlerList.concat();
-        oEvent.sType = sEvent;
-        if (typeof oEvent._aExtend == 'undefined') {
-            oEvent._aExtend = [];
-            oEvent.stop = function () {
-                if (oEvent._aExtend.length > 0) {
-                    oEvent._aExtend[oEvent._aExtend.length - 1].bCanceled = true;
-                }
-            };
-        }
-        oEvent._aExtend.push({
-            sType: sEvent,
-            bCanceled: false
-        });
-        var aArg = [oEvent],
-            i, nLen;
-        for (i = 2, nLen = arguments.length; i < nLen; i++) {
-            aArg.push(arguments[i]);
-        }
-        if (bHasInlineHandler) {
-            fInlineHandler.apply(this, aArg);
-        }
-        if (bHasHandlerList) {
-            var fHandler;
-            for (i = 0, fHandler;
-            (fHandler = aHandlerList[i]); i++) {
-                fHandler.apply(this, aArg);
-            }
-        }
-        return !oEvent._aExtend.pop().bCanceled;
-    },
-    attach: function (sEvent, fHandlerToAttach) {
-        if (arguments.length == 1) {
-            jindo.$H(arguments[0]).forEach(jindo.$Fn(function (fHandler, sEvent) {
-                this.attach(sEvent, fHandler);
-            }, this).bind());
-            return this;
-        }
-        var aHandler = this._htEventHandler[sEvent];
-        if (typeof aHandler == 'undefined') {
-            aHandler = this._htEventHandler[sEvent] = [];
-        }
-        aHandler.push(fHandlerToAttach);
-        return this;
-    },
-    detach: function (sEvent, fHandlerToDetach) {
-        if (arguments.length == 1) {
-            jindo.$H(arguments[0]).forEach(jindo.$Fn(function (fHandler, sEvent) {
-                this.detach(sEvent, fHandler);
-            }, this).bind());
-            return this;
-        }
-        var aHandler = this._htEventHandler[sEvent];
-        if (aHandler) {
-            for (var i = 0, fHandler;
-            (fHandler = aHandler[i]); i++) {
-                if (fHandler === fHandlerToDetach) {
-                    aHandler = aHandler.splice(i, 1);
-                    break;
-                }
-            }
-        }
-        return this;
-    },
-    detachAll: function (sEvent) {
-        var aHandler = this._htEventHandler;
-        if (arguments.length) {
-            if (typeof aHandler[sEvent] == 'undefined') {
-                return this;
-            }
-            delete aHandler[sEvent];
-            return this;
-        }
-        for (var o in aHandler) {
-            delete aHandler[o];
-        }
-        return this;
-    }
-});
-jindo.Component.factory = function (aObject, htOption) {
-    var aReturn = [],
-        oInstance;
-    if (typeof htOption == "undefined") {
-        htOption = {};
-    }
-    for (var i = 0, el;
-    (el = aObject[i]); i++) {
-        oInstance = new this(el, htOption);
-        aReturn[aReturn.length] = oInstance;
-    }
-    return aReturn;
-};
-jindo.Component.getInstance = function () {
-    if (typeof this._aInstance == "undefined") {
-        this._aInstance = [];
-    }
-    return this._aInstance;
-};
-jindo.UIComponent = jindo.$Class({
-    $init: function () {
-        this._bIsActivating = false;
-    },
-    isActivating: function () {
-        return this._bIsActivating;
-    },
-    activate: function () {
-        if (this.isActivating()) {
-            return this;
-        }
-        this._bIsActivating = true;
-        if (arguments.length > 0) {
-            this._onActivate.apply(this, arguments);
-        } else {
-            this._onActivate();
-        }
-        return this;
-    },
-    deactivate: function () {
-        if (!this.isActivating()) {
-            return this;
-        }
-        this._bIsActivating = false;
-        if (arguments.length > 0) {
-            this._onDeactivate.apply(this, arguments);
-        } else {
-            this._onDeactivate();
-        }
-        return this;
-    }
-}).extend(jindo.Component);
-jindo.FileUploader = jindo.$Class({
-    _bIsActivating: false,
-    _aHiddenInput: [],
-    $init: function (elFileSelect, htOption) {
-        var htDefaultOption = {
-            sUrl: '',
-            sCallback: '',
-            htData: {},
-            sFiletype: '*',
-            sMsgNotAllowedExt: "업로드가 허용되지 않는 파일형식입니다",
-            bAutoUpload: false,
-            bAutoReset: true,
-            bActivateOnload: true
-        };
-        this.option(htDefaultOption);
-        this.option(htOption || {});
-        this._el = jindo.$(elFileSelect);
-        this._wel = jindo.$Element(this._el);
-        this._elForm = this._el.form;
-        this._aHiddenInput = [];
-        this.constructor._oCallback = {};
-        this._wfChange = jindo.$Fn(this._onFileSelectChange, this);
-        if (this.option("bActivateOnload")) {
-            this.activate();
-        }
-    },
-    _appendIframe: function () {
-        var sIframeName = 'tmpFrame_' + this._makeUniqueId();
-        this._welIframe = jindo.$Element(jindo.$('<iframe name="' + sIframeName + '" src="' + this.option("sCallback") + '?blank">')).css({
-            width: '10px',
-            border: '2px',
-            height: '10px',
-            left: '10px',
-            top: '10px'
-        });
-        document.body.appendChild(this._welIframe.$value());
-    },
-    _removeIframe: function () {
-        this._welIframe.leave();
-    },
-    getBaseElement: function () {
-        return this.getFileSelect();
-    },
-    getFileSelect: function () {
-        return this._el;
-    },
-    getFormElement: function () {
-        return this._elForm;
-    },
-    upload: function () {
-        this._appendIframe();
-        var elForm = this.getFormElement(),
-            welForm = jindo.$Element(elForm),
-            sIframeName = this._welIframe.attr("name"),
-            sFunctionName = sIframeName + '_func',
-            sAction = this.option("sUrl");
-        welForm.attr({
-            target: sIframeName,
-            action: sAction
-        });
-        this._aHiddenInput.push(this._createElement('input', {
-            'type': 'hidden',
-            'name': 'callback',
-            'value': this.option("sCallback")
-        }));
-        this._aHiddenInput.push(this._createElement('input', {
-            'type': 'hidden',
-            'name': 'callback_func',
-            'value': sFunctionName
-        }));
-        for (var k in this.option("htData")) {
-            this._aHiddenInput.push(this._createElement('input', {
-                'type': 'hidden',
-                'name': k,
-                'value': this.option("htData")[k]
-            }));
-        }
-        for (var i = 0; i < this._aHiddenInput.length; i++) {
-            elForm.appendChild(this._aHiddenInput[i]);
-        }
-        this.constructor._oCallback[sFunctionName + '_success'] = jindo.$Fn(function (oParameter) {
-            this.fireEvent("success", {
-                htResult: oParameter
-            });
-            delete this.constructor._oCallback[oParameter.callback_func + '_success'];
-            delete this.constructor._oCallback[oParameter.callback_func + '_error'];
-            for (var i = 0; i < this._aHiddenInput.length; i++) {
-                jindo.$Element(this._aHiddenInput[i]).leave();
-            }
-            this._aHiddenInput.length = 0;
-            this._removeIframe();
-        }, this).bind();
-        this.constructor._oCallback[sFunctionName + '_error'] = jindo.$Fn(function (oParameter) {
-            this.fireEvent("error", {
-                htResult: oParameter
-            });
-            delete this.constructor._oCallback[oParameter.callback_func + '_success'];
-            delete this.constructor._oCallback[oParameter.callback_func + '_error'];
-            for (var i = 0; i < this._aHiddenInput.length; i++) {
-                jindo.$Element(this._aHiddenInput[i]).leave();
-            }
-            this._aHiddenInput.length = 0;
-            this._removeIframe();
-        }, this).bind();
-        
-        elForm.submit();
-        if (this.option("bAutoReset")) {
-            this.reset();
-        }
-    },
-    reset: function () {
-        var elWrapForm = jindo.$("<form>");
-        this._wel.wrap(elWrapForm);
-        elWrapForm.reset();
-        jindo.$Element(elWrapForm).replace(this._el);
-        var elForm = this.getFormElement(),
-            welForm = jindo.$Element(elForm);
-        welForm.attr({
-            target: this._sPrevTarget,
-            action: this._sAction
-        });
-        return this;
-    },
-    _onActivate: function () {
-        var elForm = this.getFormElement(),
-            welForm = jindo.$Element(elForm);
-        this._sPrevTarget = welForm.attr("target");
-        this._sAction = welForm.attr("action");
-        this._el.value = "";
-        this._wfChange.attach(this._el, "change");
-    },
-    _onDeactivate: function () {
-        this._wfChange.detach(this._el, "change");
-    },
-    _makeUniqueId: function () {
-        return new Date().getMilliseconds() + Math.floor(Math.random() * 100000);
-    },
-    _createElement: function (name, attributes) {
-        var el = jindo.$("<" + name + ">");
-        var wel = jindo.$Element(el);
-        for (var k in attributes) {
-            wel.attr(k, attributes[k]);
-        }
-        return el;
-    },
-    _checkExtension: function (sFile) {
-        var aType = this.option("sFiletype").split(';');
-        for (var i = 0, sType; i < aType.length; i++) {
-            sType = (aType[i] == "*.*") ? "*" : aType[i];
-            sType = sType.replace(/^\s+|\s+$/, '');
-            sType = sType.replace(/\./g, '\\.');
-            sType = sType.replace(/\*/g, '[^\\\/]+');
-            if ((new RegExp(sType + '$', 'gi')).test(sFile)) {
-                return true;
-            }
-        }
-        return false;
-    },
-    _onFileSelectChange: function (we) {
-        var sValue = we.element.value,
-            bAllowed = this._checkExtension(sValue),
-            htParam = {
-                sValue: sValue,
-                bAllowed: bAllowed,
-                sMsgNotAllowedExt: this.option("sMsgNotAllowedExt")
-            };
-        if (sValue.length && this.fireEvent("select", htParam)) {
-            if (bAllowed) {
-                if (this.option("bAutoUpload")) {
-                    this.upload();
-                }
-            } else {
-                alert(htParam.sMsgNotAllowedExt);
-            }
-        }
-    }
-}).extend(jindo.UIComponent);

plugin/editor/smarteditor2/photo_uploader/popup/js/basic.js

@@ -8,9 +8,16 @@ jQuery.fn.bindAll = function(options) {
 
 jQuery(function ($) {
     'use strict';
+
+    var ed_nonce = '';
+
+    if( !!opener && !!opener.window && !!opener.window.nhn ){
+        ed_nonce = opener.window.nhn.husky.SE2M_Configuration.SE2M_Accessibility.ed_nonce;
+    }
+
     // Change this to the location of your server-side upload handler:
     var gnu = {
-        url : './php/',
+        url : './php/?_nonce='+ed_nonce,
         container_el : 'body',
         dreg_area : '#drag_area',
         dreg_area_list : '#drag_area > ul',
@@ -61,7 +68,7 @@ jQuery(function ($) {
                 delete_url = $button.attr("data-delete");
             if( delete_url ){
                 $.ajax({
-                    url: othis.url+"?del=1&file="+ delete_url
+                    url: othis.url+"&del=1&file="+ delete_url
                 }).done(function (result) {
                 });
             }
@@ -115,7 +122,7 @@ jQuery(function ($) {
                 // Uncomment the following to send cross-domain cookies:
                 //xhrFields: {withCredentials: true},
                 //url: $('#fileupload').fileupload('option', 'url'),
-                url: this.url+"?t="+ oDate.getTime(),
+                url: this.url+"&t="+ oDate.getTime(),
                 dataType: 'json',
                 context: $('#fileupload')[0]
             }).always(function () {

plugin/editor/smarteditor2/photo_uploader/popup/photo_uploader.html

@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="ko">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<title>사진 첨부하기 :: SmartEditor2</title>
-<style type="text/css">
-/* NHN Web Standard 1Team JJS 120106 */ 
-/* Common */
-body,p,h1,h2,h3,h4,h5,h6,ul,ol,li,dl,dt,dd,table,th,td,form,fieldset,legend,input,textarea,button,select{margin:0;padding:0}
-body,input,textarea,select,button,table{font-family:'돋움',Dotum,Helvetica,sans-serif;font-size:12px}
-img,fieldset{border:0}
-ul,ol{list-style:none}
-em,address{font-style:normal}
-a{text-decoration:none}
-a:hover,a:active,a:focus{text-decoration:underline}
-
-/* Contents */
-.blind{visibility:hidden;position:absolute;line-height:0}
-#pop_wrap{width:383px}
-#pop_header{height:26px;padding:14px 0 0 20px;border-bottom:1px solid #ededeb;background:#f4f4f3}
-.pop_container{padding:11px 20px 0}
-#pop_footer{margin:21px 20px 0;padding:10px 0 16px;border-top:1px solid #e5e5e5;text-align:center}
-h1{color:#333;font-size:14px;letter-spacing:-1px}
-.btn_area{word-spacing:2px}
-.pop_container .drag_area{overflow:hidden;overflow-y:auto;position:relative;width:341px;height:129px;margin-top:4px;border:1px solid #eceff2}
-.pop_container .drag_area .bg{display:block;position:absolute;top:0;left:0;width:341px;height:129px;background:#fdfdfd url(../../img/photoQuickPopup/bg_drag_image.png) 0 0 no-repeat}
-.pop_container .nobg{background:none}
-.pop_container .bar{color:#e0e0e0}
-.pop_container .lst_type li{overflow:hidden;position:relative;padding:7px 0 6px 8px;border-bottom:1px solid #f4f4f4;vertical-align:top}
-.pop_container :root .lst_type li{padding:6px 0 5px 8px}
-.pop_container .lst_type li span{float:left;color:#222}
-.pop_container .lst_type li em{float:right;margin-top:1px;padding-right:22px;color:#a1a1a1;font-size:11px}
-.pop_container .lst_type li a{position:absolute;top:6px;right:5px}
-.pop_container .dsc{margin-top:6px;color:#666;line-height:18px}
-.pop_container .dsc_v1{margin-top:12px}
-.pop_container .dsc em{color:#13b72a}
-.pop_container2{padding:46px 60px 20px}
-.pop_container2 .dsc{margin-top:6px;color:#666;line-height:18px}
-.pop_container2 .dsc strong{color:#13b72a}
-.upload{margin:0 4px 0 0;_margin:0;padding:6px 0 4px 6px;border:solid 1px #d5d5d5;color:#a1a1a1;font-size:12px;border-right-color:#efefef;border-bottom-color:#efefef;length:300px;}
-:root  .upload{padding:6px 0 2px 6px;}
-</style>
-</head>
-<body>
-<div id="pop_wrap">
-	<!-- header -->
-    <div id="pop_header">
-        <h1>사진 첨부하기</h1>
-    </div>
-    <!-- //header -->
-    <!-- container -->
-	
-    <!-- [D] HTML5인 경우 pop_container 클래스와 하위 HTML 적용
-	    	 그밖의 경우 pop_container2 클래스와 하위 HTML 적용      -->
-	<div id="pop_container2" class="pop_container2">
-    	<!-- content -->
-		<form id="editor_upimage" name="editor_upimage" action="FileUploader.php" method="post" enctype="multipart/form-data" onSubmit="return false;">
-        <div id="pop_content2">
-			<input type="file" class="upload" id="uploadInputBox" name="Filedata">
-            <p class="dsc" id="info"><strong>10MB</strong>이하의 이미지 파일만 등록할 수 있습니다.<br>(JPG, GIF, PNG, BMP)</p>
-        </div>
-		</form>
-        <!-- //content -->
-    </div>
-    <div id="pop_container" class="pop_container" style="display:none;">
-    	<!-- content -->
-        <div id="pop_content">
-	        <p class="dsc"><em id="imageCountTxt">0장</em>/10장 <span class="bar">|</span> <em id="totalSizeTxt">0MB</em>/50MB</p>
-        	<!-- [D] 첨부 이미지 여부에 따른 Class 변화 
-            	 첨부 이미지가 있는 경우 : em에 "bg" 클래스 적용 //첨부 이미지가 없는 경우 : em에 "nobg" 클래스 적용   -->
-				 
-            <div class="drag_area" id="drag_area">
-				<ul class="lst_type" >
-				</ul>
-            	<em class="blind">마우스로 드래그해서 이미지를 추가해주세요.</em><span id="guide_text" class="bg"></span>
-            </div>
-			<div style="display:none;" id="divImageList"></div>
-            <p class="dsc dsc_v1"><em>한 장당 10MB, 1회에 50MB까지, 10개</em>의 이미지 파일을<br>등록할 수 있습니다. (JPG, GIF, PNG, BMP)</p>
-        </div>
-        <!-- //content -->
-    </div>
-
-    <!-- //container -->
-    <!-- footer -->
-    <div id="pop_footer">
-	    <div class="btn_area">
-            <a href="#"><img src="../../img/photoQuickPopup/btn_confirm.png" width="49" height="28" alt="확인" id="btn_confirm"></a>
-            <a href="#"><img src="../../img/photoQuickPopup/btn_cancel.png" width="48" height="28" alt="취소" id="btn_cancel"></a>
-        </div>
-    </div>
-    <!-- //footer -->
-</div>
-<script type="text/javascript" src="jindo.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="jindo.fileuploader.js" charset="utf-8"></script>
-<script type="text/javascript" src="attach_photo.js" charset="utf-8"></script>
-
-</body>
-</html>

plugin/editor/smarteditor2/photo_uploader/popup/php/index.php

@@ -29,13 +29,30 @@ $data_url = G5_DATA_URL.'/editor/'.$ym.'/';
 @mkdir($data_dir, G5_DIR_PERMISSION);
 @chmod($data_dir, G5_DIR_PERMISSION);
 
-require('UploadHandler.php');
-$options = array(
-    'upload_dir' => $data_dir,
-    'upload_url' => $data_url,
-    // This option will disable creating thumbnail images and will not create that extra folder.
-    // However, due to this, the images preview will not be displayed after upload
-    'image_versions' => array()
-);
+if(!function_exists('ft_nonce_is_valid')){
+    include_once('../../../editor.lib.php');
+}
 
-$upload_handler = new UploadHandler($options);
+$is_editor_upload = false;
+
+if( isset($_GET['_nonce']) && ft_nonce_is_valid( $_GET['_nonce'] , 'smarteditor' ) ){
+    $is_editor_upload = true;
+}
+
+if( $is_editor_upload ) {
+
+    require('UploadHandler.php');
+    $options = array(
+        'upload_dir' => $data_dir,
+        'upload_url' => $data_url,
+        // This option will disable creating thumbnail images and will not create that extra folder.
+        // However, due to this, the images preview will not be displayed after upload
+        'image_versions' => array()
+    );
+
+    $upload_handler = new UploadHandler($options);
+
+} else {
+    echo json_encode(array('files'=>array('0'=>array('error'=>'정상적인 업로드가 아닙니다.'))));
+    exit;
+}

plugin/editor/smarteditor2/sample.php

@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Smart Editor&#8482; WYSIWYG Mode</title>
-<link href="../../css/compiled/open/ko_KR/smart_editor2_in.css" rel="stylesheet" type="text/css">
-</head>
-<body class="smartOutput se2_inputarea">
-	<p>
-		<b><u>에디터 내용:</u></b>
-	</p>
-
-	<div style="width:736px;">
-	<?php
-		$postMessage = $_POST["ir1"]; 
-		echo $postMessage;
-	?>
-	</div>
-	
-	<hr>
-	<p>
-		<b><span style="color:#FF0000">주의: </span>sample.php는 샘플 파일로 정상 동작하지 않을 수 있습니다. 이 점 주의바랍니다.</b>
-	</p>
-	
-	<?php echo(htmlspecialchars_decode('&lt;img id="test" width="0" height="0"&gt;'))?>
-	
-<script>
-	if(!document.getElementById("test")) {
-		alert("PHP가 실행되지 않았습니다. 내용을 로컬 파일로 전송한 것이 아니라 서버로 전송했는지 확인 해 주십시오.");
-	}
-</script>
-</body>
-</html>

plugin/editor/smarteditor2/smart_editor2_inputarea.html

@@ -1,8 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 <html lang="ko">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta charset="utf-8">
 <title>Smart Editor&#8482; WYSIWYG Mode</title>
 </head>
-<body class="se2_inputarea" style="height:0"></body>
+<body class="se2_inputarea" style="height:0;-webkit-nbsp-mode:normal"></body>
 </html>

plugin/htmlpurifier/HTMLPurifier.standalone.php

@@ -7,7 +7,7 @@
  * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
  * FILE, changes will be overwritten the next time the script is run.
  *
- * @version 4.7.0
+ * @version 4.8.0
  *
  * @warning
  *      You must *not* include any other HTML Purifier files before this file,
@@ -39,7 +39,7 @@
  */
 
 /*
-    HTML Purifier 4.7.0 - Standards Compliant HTML Filtering
+    HTML Purifier 4.8.0 - Standards Compliant HTML Filtering
     Copyright (C) 2006-2008 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -78,12 +78,12 @@ class HTMLPurifier
      * Version of HTML Purifier.
      * @type string
      */
-    public $version = '4.7.0';
+    public $version = '4.8.0';
 
     /**
      * Constant with version of HTML Purifier.
      */
-    const VERSION = '4.7.0';
+    const VERSION = '4.8.0';
 
     /**
      * Global configuration object.
@@ -124,7 +124,7 @@ class HTMLPurifier
     /**
      * Initializes the purifier.
      *
-     * @param HTMLPurifier_Config $config Optional HTMLPurifier_Config object
+     * @param HTMLPurifier_Config|mixed $config Optional HTMLPurifier_Config object
      *                for all instances of the purifier, if omitted, a default
      *                configuration is supplied (which can be overridden on a
      *                per-use basis).
@@ -406,6 +406,11 @@ class HTMLPurifier_AttrCollections
      * @param HTMLPurifier_HTMLModule[] $modules Hash array of HTMLPurifier_HTMLModule members
      */
     public function __construct($attr_types, $modules)
+    {
+        $this->doConstruct($attr_types, $modules);
+    }
+
+    public function doConstruct($attr_types, $modules)
     {
         // load extensions from the modules
         foreach ($modules as $module) {
@@ -1557,6 +1562,19 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
         );
         $this->info['page-break-inside'] = new HTMLPurifier_AttrDef_Enum(array('auto', 'avoid'));
 
+        $border_radius = new HTMLPurifier_AttrDef_CSS_Composite(
+            array(
+                new HTMLPurifier_AttrDef_CSS_Percentage(true), // disallow negative
+                new HTMLPurifier_AttrDef_CSS_Length('0') // disallow negative
+            ));
+
+        $this->info['border-top-left-radius'] =
+        $this->info['border-top-right-radius'] =
+        $this->info['border-bottom-right-radius'] =
+        $this->info['border-bottom-left-radius'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_radius, 2);
+        // TODO: support SLASH syntax
+        $this->info['border-radius'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_radius, 4);
+
     }
 
     /**
@@ -1736,7 +1754,7 @@ class HTMLPurifier_Config
      * HTML Purifier's version
      * @type string
      */
-    public $version = '4.7.0';
+    public $version = '4.8.0';
 
     /**
      * Whether or not to automatically finalize
@@ -3198,7 +3216,7 @@ abstract class HTMLPurifier_DefinitionCache
 
     /**
      * Clears all expired (older version or revision) objects from cache
-     * @note Be carefuly implementing this method as flush. Flush must
+     * @note Be careful implementing this method as flush. Flush must
      *       not interfere with other Definition types, and cleanup()
      *       should not be repeatedly called by userland code.
      * @param HTMLPurifier_Config $config
@@ -6293,6 +6311,11 @@ class HTMLPurifier_HTMLModuleManager
         if ($config->get('HTML.TargetBlank')) {
             $modules[] = 'TargetBlank';
         }
+        // NB: HTML.TargetNoreferrer must be AFTER HTML.TargetBlank
+        // so that its post-attr-transform gets run afterwards.
+        if ($config->get('HTML.TargetNoreferrer')) {
+            $modules[] = 'TargetNoreferrer';
+        }
 
         // merge in custom modules
         $modules = array_merge($modules, $this->userModules);
@@ -7743,12 +7766,17 @@ class HTMLPurifier_Lexer
     public function extractBody($html)
     {
         $matches = array();
-        $result = preg_match('!<body[^>]*>(.*)</body>!is', $html, $matches);
+        $result = preg_match('|(.*?)<body[^>]*>(.*)</body>|is', $html, $matches);
         if ($result) {
-            return $matches[1];
-        } else {
-            return $html;
+            // Make sure it's not in a comment
+            $comment_start = strrpos($matches[1], '<!--');
+            $comment_end   = strrpos($matches[1], '-->');
+            if ($comment_start === false ||
+                ($comment_end !== false && $comment_end > $comment_start)) {
+                return $matches[2];
+            }
         }
+        return $html;
     }
 }
 
@@ -10073,6 +10101,7 @@ class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
         $css = $this->parseCDATA($css);
 
         $definition = $config->getCSSDefinition();
+        $allow_duplicates = $config->get("CSS.AllowDuplicates");
 
         // we're going to break the spec and explode by semicolons.
         // This is because semicolon rarely appears in escaped form
@@ -10082,6 +10111,7 @@ class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
 
         $declarations = explode(';', $css);
         $propvalues = array();
+        $new_declarations = '';
 
         /**
          * Name of the current CSS property being validated.
@@ -10131,7 +10161,11 @@ class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
             if ($result === false) {
                 continue;
             }
-            $propvalues[$property] = $result;
+            if ($allow_duplicates) {
+                $new_declarations .= "$property:$result;";
+            } else {
+                $propvalues[$property] = $result;
+            }
         }
 
         $context->destroy('CurrentCSSProperty');
@@ -10140,7 +10174,6 @@ class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
         // slightly inefficient, but it's the only way of getting rid of
         // duplicates. Perhaps config to optimize it, but not now.
 
-        $new_declarations = '';
         foreach ($propvalues as $prop => $value) {
             $new_declarations .= "$prop:$value;";
         }
@@ -12251,6 +12284,9 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
             return false;
         }
         $uri_string = substr($uri_string, 4);
+        if (strlen($uri_string) == 0) {
+            return false;
+        }
         $new_length = strlen($uri_string) - 1;
         if ($uri_string[$new_length] != ')') {
             return false;
@@ -12625,18 +12661,26 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
 
         // we purposely avoid using regex, hopefully this is faster
 
-        if (ctype_alpha($id)) {
-            $result = true;
-        } else {
-            if (!ctype_alpha(@$id[0])) {
+        if ($config->get('Attr.ID.HTML5') === true) {
+            if (preg_match('/[\t\n\x0b\x0c ]/', $id)) {
                 return false;
             }
-            // primitive style of regexps, I suppose
-            $trim = trim(
-                $id,
-                'A..Za..z0..9:-._'
-            );
-            $result = ($trim === '');
+        } else {
+            if (ctype_alpha($id)) {
+                // OK
+            } else {
+                if (!ctype_alpha(@$id[0])) {
+                    return false;
+                }
+                // primitive style of regexps, I suppose
+                $trim = trim(
+                    $id,
+                    'A..Za..z0..9:-._'
+                );
+                if ($trim !== '') {
+                    return false;
+                }
+            }
         }
 
         $regexp = $config->get('Attr.IDBlacklistRegexp');
@@ -12644,14 +12688,14 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
             return false;
         }
 
-        if (!$this->selector && $result) {
+        if (!$this->selector) {
             $id_accumulator->add($id);
         }
 
         // if no change was made to the ID, return the result
         // else, return the new id if stripping whitespace made it
         //     valid, or return false.
-        return $result ? $id : false;
+        return $id;
     }
 }
 
@@ -13024,24 +13068,33 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
         // fairly well supported.
         $underscore = $config->get('Core.AllowHostnameUnderscore') ? '_' : '';
 
+        // Based off of RFC 1738, but amended so that
+        // as per RFC 3696, the top label need only not be all numeric.
         // The productions describing this are:
         $a   = '[a-z]';     // alpha
         $an  = '[a-z0-9]';  // alphanum
         $and = "[a-z0-9-$underscore]"; // alphanum | "-"
         // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
-        $domainlabel = "$an($and*$an)?";
-        // toplabel    = alpha | alpha *( alphanum | "-" ) alphanum
-        $toplabel = "$a($and*$an)?";
+        $domainlabel = "$an(?:$and*$an)?";
+        // AMENDED as per RFC 3696
+        // toplabel    = alphanum | alphanum *( alphanum | "-" ) alphanum
+        //      side condition: not all numeric
+        $toplabel = "$an(?:$and*$an)?";
         // hostname    = *( domainlabel "." ) toplabel [ "." ]
-        if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
-            return $string;
+        if (preg_match("/^(?:$domainlabel\.)*($toplabel)\.?$/i", $string, $matches)) {
+            if (!ctype_digit($matches[1])) {
+                return $string;
+            }
         }
 
+        // PHP 5.3 and later support this functionality natively
+        if (function_exists('idn_to_ascii')) {
+            return idn_to_ascii($string);
+
         // If we have Net_IDNA2 support, we can support IRIs by
         // punycoding them. (This is the most portable thing to do,
         // since otherwise we have to assume browsers support
-
-        if ($config->get('Core.EnableIDNA')) {
+        } elseif ($config->get('Core.EnableIDNA')) {
             $idna = new Net_IDNA2(array('encoding' => 'utf8', 'overlong' => false, 'strict' => true));
             // we need to encode each period separately
             $parts = explode('.', $string);
@@ -13505,8 +13558,7 @@ class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
             if ($src) {
                 $alt = $config->get('Attr.DefaultImageAlt');
                 if ($alt === null) {
-                    // truncate if the alt is too long
-                    $attr['alt'] = substr(basename($attr['src']), 0, 40);
+                    $attr['alt'] = basename($attr['src']);
                 } else {
                     $attr['alt'] = $alt;
                 }
@@ -14053,6 +14105,44 @@ class HTMLPurifier_AttrTransform_TargetBlank extends HTMLPurifier_AttrTransform
 
 
 
+// must be called POST validation
+
+/**
+ * Adds rel="noreferrer" to any links which target a different window
+ * than the current one.  This is used to prevent malicious websites
+ * from silently replacing the original window, which could be used
+ * to do phishing.
+ * This transform is controlled by %HTML.TargetNoreferrer.
+ */
+class HTMLPurifier_AttrTransform_TargetNoreferrer extends HTMLPurifier_AttrTransform
+{
+    /**
+     * @param array $attr
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return array
+     */
+    public function transform($attr, $config, $context)
+    {
+        if (isset($attr['rel'])) {
+            $rels = explode(' ', $attr['rel']);
+        } else {
+            $rels = array();
+        }
+        if (isset($attr['target']) && !in_array('noreferrer', $rels)) {
+            $rels[] = 'noreferrer';
+        }
+        if (!empty($rels) || isset($attr['rel'])) {
+            $attr['rel'] = implode(' ', $rels);
+        }
+
+        return $attr;
+    }
+}
+
+
+
+
 /**
  * Sets height/width defaults for <textarea>
  */
@@ -14329,6 +14419,12 @@ class HTMLPurifier_ChildDef_List extends HTMLPurifier_ChildDef
             return false;
         }
 
+        // if li is not allowed, delete parent node
+        if (!isset($config->getHTMLDefinition()->info['li'])) {
+            trigger_error("Cannot allow ul/ol without allowing li", E_USER_WARNING);
+            return false;
+        }
+
         // the new set of children
         $result = array();
 
@@ -15166,6 +15262,12 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
         }
         $dir = $this->generateDirectoryPath($config);
         $dh = opendir($dir);
+        // Apparently, on some versions of PHP, readdir will return
+        // an empty string if you pass an invalid argument to readdir.
+        // So you need this test.  See #49.
+        if (false === $dh) {
+            return false;
+        }
         while (false !== ($filename = readdir($dh))) {
             if (empty($filename)) {
                 continue;
@@ -15175,6 +15277,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
             }
             unlink($dir . '/' . $filename);
         }
+        return true;
     }
 
     /**
@@ -15188,6 +15291,10 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
         }
         $dir = $this->generateDirectoryPath($config);
         $dh = opendir($dir);
+        // See #49 (and above).
+        if (false === $dh) {
+            return false;
+        }
         while (false !== ($filename = readdir($dh))) {
             if (empty($filename)) {
                 continue;
@@ -15200,6 +15307,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
                 unlink($dir . '/' . $filename);
             }
         }
+        return true;
     }
 
     /**
@@ -15255,11 +15363,12 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
         if ($result !== false) {
             // set permissions of the new file (no execute)
             $chmod = $config->get('Cache.SerializerPermissions');
-            if (!$chmod) {
-                $chmod = 0644; // invalid config or simpletest
+            if ($chmod === null) {
+                // don't do anything
+            } else {
+                $chmod = $chmod & 0666;
+                chmod($file, $chmod);
             }
-            $chmod = $chmod & 0666;
-            chmod($file, $chmod);
         }
         return $result;
     }
@@ -15273,9 +15382,6 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
     {
         $directory = $this->generateDirectoryPath($config);
         $chmod = $config->get('Cache.SerializerPermissions');
-        if (!$chmod) {
-            $chmod = 0755; // invalid config or simpletest
-        }
         if (!is_dir($directory)) {
             $base = $this->generateBaseDirectoryPath($config);
             if (!is_dir($base)) {
@@ -15288,7 +15394,19 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
             } elseif (!$this->_testPermissions($base, $chmod)) {
                 return false;
             }
-            mkdir($directory, $chmod);
+            if ($chmod === null) {
+                trigger_error(
+                    'Base directory ' . $base . ' does not exist,
+                    please create or change using %Cache.SerializerPath',
+                    E_USER_WARNING
+                );
+                return false;
+            }
+            if ($chmod !== null) {
+                mkdir($directory, $chmod);
+            } else {
+                mkdir($directory);
+            }
             if (!$this->_testPermissions($directory, $chmod)) {
                 trigger_error(
                     'Base directory ' . $base . ' does not exist,
@@ -15325,7 +15443,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac
             );
             return false;
         }
-        if (function_exists('posix_getuid')) {
+        if (function_exists('posix_getuid') && $chmod !== null) {
             // POSIX system, we can give more specific advice
             if (fileowner($dir) === posix_getuid()) {
                 // we can chmod it ourselves
@@ -16873,6 +16991,28 @@ class HTMLPurifier_HTMLModule_TargetBlank extends HTMLPurifier_HTMLModule
 
 
 
+/**
+ * Module adds the target-based noreferrer attribute transformation to a tags.  It
+ * is enabled by HTML.TargetNoreferrer
+ */
+class HTMLPurifier_HTMLModule_TargetNoreferrer extends HTMLPurifier_HTMLModule
+{
+    /**
+     * @type string
+     */
+    public $name = 'TargetNoreferrer';
+
+    /**
+     * @param HTMLPurifier_Config $config
+     */
+    public function setup($config) {
+        $a = $this->addBlankElement('a');
+        $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetNoreferrer();
+    }
+}
+
+
+
 /**
  * XHTML 1.1 Text Module, defines basic text containers. Core Module.
  * @note In the normative XML Schema specification, this module
@@ -17979,9 +18119,14 @@ class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
             return;
         }
 
-        // there is/are URL(s). Let's split the string:
-        // Note: this regex is extremely permissive
-        $bits = preg_split('#((?:https?|ftp)://[^\s\'",<>()]+)#Su', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+        // there is/are URL(s). Let's split the string.
+        // We use this regex:
+        // https://gist.github.com/gruber/249502
+        // but with @cscott's backtracking fix and also
+        // the Unicode characters un-Unicodified.
+        $bits = preg_split(
+            '/\\b((?:[a-z][\\w\\-]+:(?:\\/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}\\/)(?:[^\\s()<>]|\\((?:[^\\s()<>]|(?:\\([^\\s()<>]+\\)))*\\))+(?:\\((?:[^\\s()<>]|(?:\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:\'".,<>?\x{00ab}\x{00bb}\x{201c}\x{201d}\x{2018}\x{2019}]))/iu',
+            $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
 
 
         $token = array();
@@ -18126,6 +18271,12 @@ class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
         $this->removeNbsp = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp');
         $this->removeNbspExceptions = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions');
         $this->exclude = $config->get('AutoFormat.RemoveEmpty.Predicate');
+        foreach ($this->exclude as $key => $attrs) {
+            if (!is_array($attrs)) {
+                // HACK, see HTMLPurifier/Printer/ConfigForm.php
+                $this->exclude[$key] = explode(';', $attrs);
+            }
+        }
         $this->attrValidator = new HTMLPurifier_AttrValidator();
     }
 
@@ -18308,6 +18459,7 @@ class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
     );
 
     /**
+     * These are all lower-case keys.
      * @type array
      */
     protected $allowedParam = array(
@@ -18315,7 +18467,7 @@ class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
         'movie' => true,
         'flashvars' => true,
         'src' => true,
-        'allowFullScreen' => true, // if omitted, assume to be 'false'
+        'allowfullscreen' => true, // if omitted, assume to be 'false'
     );
 
     /**
@@ -18365,9 +18517,11 @@ class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
                     $token->attr['name'] === $this->addParam[$n]) {
                     // keep token, and add to param stack
                     $this->paramStack[$i][$n] = true;
-                } elseif (isset($this->allowedParam[$n])) {
+                } elseif (isset($this->allowedParam[strtolower($n)])) {
                     // keep token, don't do anything to it
                     // (could possibly check for duplicates here)
+                    // Note: In principle, parameters should be case sensitive.
+                    // But it seems they are not really; so accept any case.
                 } else {
                     $token = false;
                 }
@@ -21400,9 +21554,18 @@ class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme
         } else {
             $raw_data = $data;
         }
+        if ( strlen($raw_data) < 12 ) {
+            // error; exif_imagetype throws exception with small files,
+            // and this likely indicates a corrupt URI/failed parse anyway
+            return false;
+        }
         // XXX probably want to refactor this into a general mechanism
         // for filtering arbitrary content types
-        $file = tempnam("/tmp", "");
+        if (function_exists('sys_get_temp_dir')) {
+            $file = tempnam(sys_get_temp_dir(), "");
+        } else {
+            $file = tempnam("/tmp", "");
+        }
         file_put_contents($file, $raw_data);
         if (function_exists('exif_imagetype')) {
             $image_code = exif_imagetype($file);
@@ -21719,6 +21882,53 @@ class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme
 
 
 
+/**
+ * Validates tel (for phone numbers).
+ *
+ * The relevant specifications for this protocol are RFC 3966 and RFC 5341,
+ * but this class takes a much simpler approach: we normalize phone
+ * numbers so that they only include (possibly) a leading plus,
+ * and then any number of digits and x'es.
+ */
+
+class HTMLPurifier_URIScheme_tel extends HTMLPurifier_URIScheme
+{
+    /**
+     * @type bool
+     */
+    public $browsable = false;
+
+    /**
+     * @type bool
+     */
+    public $may_omit_host = true;
+
+    /**
+     * @param HTMLPurifier_URI $uri
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return bool
+     */
+    public function doValidate(&$uri, $config, $context)
+    {
+        $uri->userinfo = null;
+        $uri->host     = null;
+        $uri->port     = null;
+
+        // Delete all non-numeric characters, non-x characters
+        // from phone number, EXCEPT for a leading plus sign.
+        $uri->path = preg_replace('/(?!^\+)[^\dx]/', '',
+                     // Normalize e(x)tension to lower-case
+                     str_replace('X', 'x', $uri->path));
+
+        return true;
+    }
+}
+
+
+
+
+
 /**
  * Performs safe variable parsing based on types which can be used by
  * users. This may not be able to represent all possible data inputs,

plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Attr.ID.HTML5.txt

@@ -0,0 +1,10 @@
+Attr.ID.HTML5
+TYPE: bool/null
+DEFAULT: null
+VERSION: 4.8.0
+--DESCRIPTION--
+In HTML5, restrictions on the format of the id attribute have been significantly
+relaxed, such that any string is valid so long as it contains no spaces and
+is at least one character.  In lieu of a general HTML5 compatibility flag,
+set this configuration directive to true to use the relaxed rules.
+--# vim: et sw=4 sts=4

plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/CSS.AllowDuplicates.txt

@@ -0,0 +1,11 @@
+CSS.AllowDuplicates
+TYPE: bool
+DEFAULT: false
+VERSION: 4.8.0
+--DESCRIPTION--
+<p>
+  By default, HTML Purifier removes duplicate CSS properties,
+  like <code>color:red; color:blue</code>.  If this is set to
+  true, duplicate properties are allowed.
+</p>
+--# vim: et sw=4 sts=4

plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt

@@ -1,5 +1,5 @@
 Cache.SerializerPermissions
-TYPE: int
+TYPE: int/null
 VERSION: 4.3.0
 DEFAULT: 0755
 --DESCRIPTION--
@@ -8,4 +8,9 @@ DEFAULT: 0755
     Directory permissions of the files and directories created inside
     the DefinitionCache/Serializer or other custom serializer path.
 </p>
+<p>
+    In HTML Purifier 4.8.0, this also supports <code>NULL</code>,
+    which means that no chmod'ing or directory creation shall
+    occur.
+</p>
 --# vim: et sw=4 sts=4

plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/HTML.TargetNoreferrer.txt

@@ -0,0 +1,9 @@
+HTML.TargetNoreferrer
+TYPE: bool
+VERSION: 4.8.0
+DEFAULT: TRUE
+--DESCRIPTION--
+If enabled, noreferrer rel attributes are added to links which have
+a target attribute associated with them.  This prevents malicious
+destinations from overwriting the original window.
+--# vim: et sw=4 sts=4

plugin/htmlpurifier/standalone/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt

@@ -8,6 +8,7 @@ array (
   'ftp' => true,
   'nntp' => true,
   'news' => true,
+  'tel' => true,
 )
 --DESCRIPTION--
 Whitelist that defines the schemes that a URI is allowed to have.  This

plugin/htmlpurifier/standalone/HTMLPurifier/Printer/ConfigForm.php

@@ -327,6 +327,10 @@ class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer
                 case HTMLPurifier_VarParser::HASH:
                     $nvalue = '';
                     foreach ($value as $i => $v) {
+                        if (is_array($v)) {
+                            // HACK
+                            $v = implode(";", $v);
+                        }
                         $nvalue .= "$i:$v" . PHP_EOL;
                     }
                     $value = $nvalue;

plugin/okname/hpcert.config.php

@@ -25,7 +25,16 @@ $mbphnNo = 'x';                                     // 휴대폰번호 (고정
 $svcTxSeqno = get_uniqid();                         // 거래번호. 동일문자열을 두번 사용할 수 없음. ( 20자리의 문자열. 0-9,A-Z,a-z 사용.)
 
 $clientIp = $_SERVER['SERVER_ADDR'];                // 회원사 IP,   $_SERVER["SERVER_ADDR"] 사용가능.
-$clientDomain = $_SERVER['HTTP_HOST'];              // 회원사 도메인, $_SERVER["HTTP_HOST"] 사용가능.
+//$clientDomain = $_SERVER['HTTP_HOST'];              // 회원사 도메인, $_SERVER["HTTP_HOST"] 사용가능.
+$p = @parse_url($_SERVER['HTTP_HOST']);
+if(isset($p['host']) && $p['host'])
+    $clientDomain = $p['host'];
+else
+    $clientDomain = $_SERVER['SERVER_NAME'];
+unset($p);
+
+$clientDomain = escapeshellarg($clientDomain);
+
 
 $rsv1 = '0';                                        // 예약 항목
 $rsv2 = '0';                                        // 예약 항목
@@ -71,5 +80,5 @@ if($config['cf_cert_use'] == 2) {
 // ########################################################################
 // # 리턴 URL 설정
 // ########################################################################
-$returnUrl = G5_OKNAME_URL.'/hpcert2.php';          // 본인인증 완료후 리턴될 URL (도메인 포함 full path)
+$returnUrl = escapeshellarg(G5_OKNAME_URL.'/hpcert2.php');          // 본인인증 완료후 리턴될 URL (도메인 포함 full path)
 ?>

plugin/okname/hpcert2.php

@@ -9,7 +9,8 @@ include_once('./hpcert.config.php');
 **************************************************************************/
 
 /* 공통 리턴 항목 */
-$idcfMbrComCd           =   $_POST['idcf_mbr_com_cd'];      // 고객사코드
+//$idcfMbrComCd           =   $_POST['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:기타)

skin/board/basic/view_comment.skin.php

@@ -59,8 +59,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             $query_string = clean_query_string($_SERVER['QUERY_STRING']);
 
             if($w == 'cu') {
-                $sql = " select wr_id, wr_content from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
+                $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);
+                if (!($is_admin || ($member['mb_id'] == $cmt['mb_id'] && $cmt['mb_id'])))
+                    $cmt['wr_content'] = '';
                 $c_wr_content = $cmt['wr_content'];
             }
 
@@ -256,6 +258,8 @@ function fviewcomment_submit(f)
 
     <?php if($is_guest) echo chk_captcha_js();  ?>
 
+    set_comment_token(f);
+
     document.getElementById("btn_submit").disabled = "disabled";
 
     return true;

skin/board/gallery/view_comment.skin.php

@@ -59,8 +59,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             $query_string = clean_query_string($_SERVER['QUERY_STRING']);
 
             if($w == 'cu') {
-                $sql = " select wr_id, wr_content from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
+                $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);
+                if (!($is_admin || ($member['mb_id'] == $cmt['mb_id'] && $cmt['mb_id'])))
+                    $cmt['wr_content'] = '';
                 $c_wr_content = $cmt['wr_content'];
             }
 
@@ -256,6 +258,8 @@ function fviewcomment_submit(f)
 
     <?php if($is_guest) echo chk_captcha_js();  ?>
 
+    set_comment_token(f);
+
     document.getElementById("btn_submit").disabled = "disabled";
 
     return true;

skin/member/basic/formmail.skin.php

@@ -12,7 +12,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
     <form name="fformmail" action="./formmail_send.php" onsubmit="return fformmail_submit(this);" method="post" enctype="multipart/form-data" style="margin:0px;">
     <input type="hidden" name="to" value="<?php echo $email ?>">
     <input type="hidden" name="attach" value="2">
-    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php if ($is_member) { // 회원이면  ?>
     <input type="hidden" name="fnick" value="<?php echo get_text($member['mb_nick']); ?>">
     <input type="hidden" name="fmail" value="<?php echo $member['mb_email'] ?>">

tail.php

@@ -29,7 +29,7 @@ if (G5_IS_MOBILE) {
     <div id="ft_copy">
         <div>
             <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=company">회사소개</a>
-            <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=privacy">개인정보취급방침</a>
+            <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=privacy">개인정보처리방침</a>
             <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=provision">서비스이용약관</a>
             Copyright &copy; <b>소유하신 도메인.</b> All rights reserved.<br>
             <a href="#hd" id="ft_totop">상단으로</a>

theme/basic/head.sub.php

@@ -46,7 +46,7 @@ if($config['cf_add_meta'])
     echo $config['cf_add_meta'].PHP_EOL;
 ?>
 <title><?php echo $g5_head_title; ?></title>
-<link rel="stylesheet" href="<?php echo G5_THEME_CSS_URL; ?>/<?php echo G5_IS_MOBILE ? 'mobile' : 'default'; ?>.css">
+<link rel="stylesheet" href="<?php echo G5_THEME_CSS_URL; ?>/<?php echo G5_IS_MOBILE ? 'mobile' : 'default'; ?>.css?ver=<?php echo G5_CSS_VER; ?>">
 <!--[if lte IE 8]>
 <script src="<?php echo G5_JS_URL ?>/html5.js"></script>
 <![endif]-->
@@ -61,20 +61,17 @@ var g5_bo_table  = "<?php echo isset($bo_table)?$bo_table:''; ?>";
 var g5_sca       = "<?php echo isset($sca)?$sca:''; ?>";
 var g5_editor    = "<?php echo ($config['cf_editor'] && $board['bo_use_dhtml_editor'])?$config['cf_editor']:''; ?>";
 var g5_cookie_domain = "<?php echo G5_COOKIE_DOMAIN ?>";
-<?php
-if ($is_admin) {
-    echo 'var g5_admin_url = "'.G5_ADMIN_URL.'";'.PHP_EOL;
-}
-?>
 </script>
 <script src="<?php echo G5_JS_URL ?>/jquery-1.8.3.min.js"></script>
-<script src="<?php echo G5_JS_URL ?>/jquery.menu.js"></script>
-<script src="<?php echo G5_JS_URL ?>/common.js"></script>
-<script src="<?php echo G5_JS_URL ?>/wrest.js"></script>
+<script src="<?php echo G5_JS_URL ?>/jquery.menu.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL ?>/common.js?ver=<?php echo G5_JS_VER; ?>"></script>
+<script src="<?php echo G5_JS_URL ?>/wrest.js?ver=<?php echo G5_JS_VER; ?>"></script>
 <?php
 if(G5_IS_MOBILE) {
     echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지
 }
+if(!defined('G5_IS_ADMIN'))
+    echo $config['cf_add_script'];
 ?>
 </head>
 <body>

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

@@ -53,8 +53,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             $query_string = clean_query_string($_SERVER['QUERY_STRING']);
 
             if($w == 'cu') {
-                $sql = " select wr_id, wr_content from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
+                $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);
+                if (!($is_admin || ($member['mb_id'] == $cmt['mb_id'] && $cmt['mb_id'])))
+                    $cmt['wr_content'] = '';
                 $c_wr_content = $cmt['wr_content'];
             }
 
@@ -248,6 +250,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
         <?php if($is_guest) echo chk_captcha_js(); ?>
 
+        set_comment_token(f);
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;

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

@@ -53,8 +53,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             $query_string = clean_query_string($_SERVER['QUERY_STRING']);
 
             if($w == 'cu') {
-                $sql = " select wr_id, wr_content from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
+                $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);
+                if (!($is_admin || ($member['mb_id'] == $cmt['mb_id'] && $cmt['mb_id'])))
+                    $cmt['wr_content'] = '';
                 $c_wr_content = $cmt['wr_content'];
             }
 
@@ -248,6 +250,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 
         <?php if($is_guest) echo chk_captcha_js(); ?>
 
+        set_comment_token(f);
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;

theme/basic/mobile/skin/faq/basic/list.skin.php

@@ -77,7 +77,7 @@ if( count($faq_master_list) ){
 
 <?php
 // 하단 HTML
-echo '<div id="faq_thtml">'.conv_content($fm['fm_tail_html'], 1).'</div>';
+echo '<div id="faq_thtml">'.conv_content($fm['fm_mobile_tail_html'], 1).'</div>';
 ?>
 
 <div id="faq_sch">

theme/basic/mobile/skin/member/basic/formmail.skin.php

@@ -11,7 +11,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
     <form name="fformmail" action="./formmail_send.php" onsubmit="return fformmail_submit(this);" method="post" enctype="multipart/form-data" style="margin:0px;">
     <input type="hidden" name="to" value="<?php echo $email ?>">
     <input type="hidden" name="attach" value="2">
-    <input type="hidden" name="token" value="<?php echo $token ?>">
     <?php if ($is_member) { // 회원이면 ?>
     <input type="hidden" name="fnick" value="<?php echo get_text($member['mb_nick']); ?>">
     <input type="hidden" name="fmail" value="<?php echo $member['mb_email'] ?>">

theme/basic/mobile/skin/member/basic/style.css

@@ -135,7 +135,8 @@
 #memo_list_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
 #memo_list_ul li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
 #memo_list_ul .memo_link {}
-#memo_list_ul .memo_send {position:absolute;top:10px;right:30px}
+#memo_list_ul .memo_send {display:block;margin-top:4px}
+#memo_list_ul .memo_send a{color:#777}
 #memo_list_ul .memo_read {font-size:0.95em;color:#666}
 #memo_list_ul .memo_del {position:absolute;top:10px;right:0}
 

theme/basic/mobile/tail.php

@@ -16,7 +16,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     <div id="ft_copy">
         <div id="ft_company">
             <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=company">회사소개</a>
-            <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=privacy">개인정보취급방침</a>
+            <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=privacy">개인정보처리방침</a>
             <a href="<?php echo G5_BBS_URL; ?>/content.php?co_id=provision">서비스이용약관</a>
         </div>
         Copyright &copy; <b>소유하신 도메인.</b> All rights reserved.<br>

theme/basic/readme.txt

@@ -1,7 +1,7 @@
 Theme Name: 베이직
-Theme URI: http://theme.sir.co.kr/gnuboard5/demo/basic
+Theme URI: http://theme.sir.kr/gnuboard5/demo/basic
 Maker: SIR
-Maker URI: http://sir.co.kr
+Maker URI: http://sir.kr
 Version: 1.0.0
 Detail: 베이직 테마는  SIR에서 제공하는 그누보드5 테마입니다. 베이직 테마는 웹표준 및 접근성을 준수합니다.
 License: GNU LESSER GENERAL PUBLIC LICENSE Version 2.1

theme/basic/skin/board/basic/view_comment.skin.php

@@ -59,8 +59,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             $query_string = clean_query_string($_SERVER['QUERY_STRING']);
 
             if($w == 'cu') {
-                $sql = " select wr_id, wr_content from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
+                $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);
+                if (!($is_admin || ($member['mb_id'] == $cmt['mb_id'] && $cmt['mb_id'])))
+                    $cmt['wr_content'] = '';
                 $c_wr_content = $cmt['wr_content'];
             }
 
@@ -256,6 +258,8 @@ function fviewcomment_submit(f)
 
     <?php if($is_guest) echo chk_captcha_js();  ?>
 
+    set_comment_token(f);
+
     document.getElementById("btn_submit").disabled = "disabled";
 
     return true;