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

adm/admin.lib.php

@@ -355,6 +355,29 @@ function get_admin_token()
     return $token;
 }
 
+// 관리자가 자동등록방지를 사용해야 할 경우
+function get_admin_captcha_by($type='get'){
+    
+    $captcha_name = 'ss_admin_use_captcha';
+
+    if($type === 'remove'){
+        set_session($captcha_name, '');
+    }
+
+    return get_session($captcha_name);
+}
+
+//input value 에서 xss 공격 filter 역할을 함 ( 반드시 input value='' 타입에만 사용할것 )
+function get_sanitize_input($s, $is_html=false){
+
+    if(!$is_html){
+        $s = strip_tags($s);
+    }
+
+    $s = htmlspecialchars($s, ENT_QUOTES, 'utf-8');
+
+    return $s;
+}
 
 // POST로 넘어온 토큰과 세션에 저장된 토큰 비교
 function check_admin_token()
@@ -425,7 +448,7 @@ else if ($is_admin != 'super')
 }
 
 // 관리자의 아이피, 브라우저와 다르다면 세션을 끊고 관리자에게 메일을 보낸다.
-$admin_key = md5($member['mb_datetime'] . $_SERVER['REMOTE_ADDR'] . $_SERVER['HTTP_USER_AGENT']);
+$admin_key = md5($member['mb_datetime'] . get_real_client_ip() . $_SERVER['HTTP_USER_AGENT']);
 if (get_session('ss_mb_key') !== $admin_key) {
 
     session_destroy();

adm/admin.menu100.php

@@ -19,5 +19,6 @@ if(version_compare(phpversion(), '5.3.0', '>=') && defined('G5_BROWSCAP_USE') &&
     $menu['menu100'][] = array('100520', '접속로그 변환', G5_ADMIN_URL.'/browscap_convert.php', 'cf_visit_cnvrt');
 }
 
+$menu['menu100'][] = array('100410', 'DB업그레이드', G5_ADMIN_URL.'/dbupgrade.php', 'db_upgrade');
 $menu['menu100'][] = array('100400', '부가서비스', G5_ADMIN_URL.'/service.php', 'cf_service');
 ?>

adm/ajax.use_captcha.php

@@ -0,0 +1,7 @@
+<?php
+include_once('./_common.php');
+
+if( isset($_POST['admin_use_captcha']) ){
+    set_session('ss_admin_use_captcha', true);
+}
+?>

adm/auth_list_delete.php

@@ -9,17 +9,24 @@ if ($is_admin != 'super')
 
 check_admin_token();
 
-$count = count($_POST['chk']);
+$count = (isset($_POST['chk']) && is_array($_POST['chk'])) ? count($_POST['chk']) : 0;
 
 if (!$count)
     alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
 
+if ( (isset($_POST['mb_id']) && ! is_array($_POST['mb_id'])) || (isset($_POST['au_menu']) && ! is_array($_POST['au_menu'])) ){
+    alert("잘못된 요청입니다.");
+}
+
 for ($i=0; $i<$count; $i++)
 {
     // 실제 번호를 넘김
     $k = $chk[$i];
+    
+    $mb_id = preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['mb_id'][$k]);
+    $au_menu = preg_replace('/[^a-zA-Z0-9_]/', '', $_POST['au_menu'][$k]);
 
-    $sql = " delete from {$g5['auth_table']} where mb_id = '{$_POST['mb_id'][$k]}' and au_menu = '{$_POST['au_menu'][$k]}' ";
+    $sql = " delete from {$g5['auth_table']} where mb_id = '".$mb_id."' and au_menu = '".$au_menu."' ";
     sql_query($sql);
 }
 

adm/board_form.php

@@ -230,7 +230,7 @@ $pg_anchor = '<ul class="anchor">
         <tr>
             <th scope="row"><label for="bo_category_list">분류</label></th>
             <td>
-                <?php echo help('분류와 분류 사이는 | 로 구분하세요. (예: 질문|답변) 첫자로 #은 입력하지 마세요. (예: #질문|#답변 [X])') ?>
+                <?php echo help('분류와 분류 사이는 | 로 구분하세요. (예: 질문|답변) 첫자로 #은 입력하지 마세요. (예: #질문|#답변 [X])'."\n".'분류명에 일부 특수문자 ()/ 는 사용할수 없습니다.'); ?>
                 <input type="text" name="bo_category_list" value="<?php echo get_text($board['bo_category_list']) ?>" id="bo_category_list" class="frm_input" size="70">
                 <input type="checkbox" name="bo_use_category" value="1" id="bo_use_category" <?php echo $board['bo_use_category']?'checked':''; ?>>
                 <label for="bo_use_category">사용</label>
@@ -825,6 +825,7 @@ $pg_anchor = '<ul class="anchor">
                 <label for="chk_all_mobile_skin">전체적용</label>
             </td>
         </tr>
+        <?php if ($is_admin === 'super'){   // 슈퍼관리자인 경우에만 수정 가능 ?>
         <tr>
             <th scope="row"><label for="bo_include_head">상단 파일 경로</label></th>
             <td>
@@ -849,6 +850,22 @@ $pg_anchor = '<ul class="anchor">
                 <label for="chk_all_include_tail">전체적용</label>
             </td>
         </tr>
+        <tr id="admin_captcha_box" style="display:none;">
+            <th scope="row">자동등록방지</th>
+            <td>
+                <?php
+                echo help("파일 경로를 입력 또는 수정시 캡챠를 반드시 입력해야 합니다.");
+
+                include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+                $captcha_html = captcha_html();
+                $captcha_js   = chk_captcha_js();
+                echo $captcha_html;
+                ?>
+                <script>
+                jQuery("#captcha_key").removeAttr("required").removeClass("required");
+                </script>
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="bo_content_head">상단 내용</label></th>
             <td>
@@ -897,6 +914,7 @@ $pg_anchor = '<ul class="anchor">
                 <label for="chk_all_mobile_content_tail">전체적용</label>
             </td>
         </tr>
+        <?php }     //end if $is_admin === 'super' ?>
          <tr>
             <th scope="row"><label for="bo_insert_content">글쓰기 기본 내용</label></th>
             <td>
@@ -1243,7 +1261,7 @@ $pg_anchor = '<ul class="anchor">
 <div class="btn_fixed_top">
     <?php if( $bo_table && $w ){ ?>
         <a href="./board_copy.php?bo_table=<?php echo $board['bo_table']; ?>" id="board_copy" target="win_board_copy" class=" btn_02 btn">게시판복사</a>
-        <a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $board['bo_table']; ?>'" class=" btn_02 btn">게시판 바로가기</a>
+        <a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $board['bo_table']; ?>" class=" btn_02 btn">게시판 바로가기</a>
         <a href="./board_thumbnail_delete.php?bo_table=<?php echo $board['bo_table'].'&amp;'.$qstr;?>" onclick="return delete_confirm2('게시판 썸네일 파일을 삭제하시겠습니까?');" class="btn_02 btn">게시판 썸네일 삭제</a>
     <?php } ?>
     <input type="submit" value="확인" class="btn_submi btn btn_01" accesskey="s">
@@ -1308,6 +1326,52 @@ function set_point(f) {
     }
 }
 
+var captcha_chk = false;
+
+function use_captcha_check(){
+    $.ajax({
+        type: "POST",
+        url: g5_admin_url+"/ajax.use_captcha.php",
+        data: { admin_use_captcha: "1" },
+        cache: false,
+        async: false,
+        dataType: "json",
+        success: function(data) {
+        }
+    });
+}
+
+function frm_check_file(){
+    var bo_include_head = "<?php echo $board['bo_include_head']; ?>";
+    var bo_include_tail = "<?php echo $board['bo_include_tail']; ?>";
+    var head = jQuery.trim(jQuery("#bo_include_head").val());
+    var tail = jQuery.trim(jQuery("#bo_include_tail").val());
+
+    if(bo_include_head !== head || bo_include_tail !== tail){
+        // 캡챠를 사용합니다.
+        jQuery("#admin_captcha_box").show();
+        captcha_chk = true;
+
+        use_captcha_check();
+
+        return false;
+    } else {
+        jQuery("#admin_captcha_box").hide();
+    }
+
+    return true;
+}
+
+jQuery(function($){
+    if( window.self !== window.top ){   // frame 또는 iframe을 사용할 경우 체크
+        $("#bo_include_head, #bo_include_tail").on("change paste keyup", function(e) {
+            frm_check_file();
+        });
+
+        use_captcha_check();
+    }
+});
+
 function fboardform_submit(f)
 {
     <?php echo get_editor_js("bo_content_head"); ?>
@@ -1327,6 +1391,10 @@ function fboardform_submit(f)
         return false;
     }
 
+    if( captcha_chk ) {
+        <?php echo isset($captcha_js) ? $captcha_js : ''; // 캡챠 사용시 자바스크립트에서 입력된 캡챠를 검사함  ?>
+    }
+
     return true;
 }
 </script>

adm/board_form_update.php

@@ -17,30 +17,39 @@ if (!$_POST['bo_subject']) { alert('게시판 제목을 입력하세요.'); }
 $_POST['bo_include_head'] = preg_replace("#[\\\]+$#", "", substr($_POST['bo_include_head'], 0, 255));
 $_POST['bo_include_tail'] = preg_replace("#[\\\]+$#", "", substr($_POST['bo_include_tail'], 0, 255));
 
+// 관리자가 자동등록방지를 사용해야 할 경우
+if ($board && ($board['bo_include_head'] !== $_POST['bo_include_head'] || $board['bo_include_tail'] !== $_POST['bo_include_tail']) && function_exists('get_admin_captcha_by') && get_admin_captcha_by()){
+    include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+
+    if (!chk_captcha()) {
+        alert('자동등록방지 숫자가 틀렸습니다.');
+    }
+}
+
 if ($file = $_POST['bo_include_head']) {
-    $purl = parse_url($file);
-    $file = $purl['path'];
-    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
+    $file_ext = pathinfo($file, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) ) {
         alert('상단 파일 경로의 확장자는 php, html 만 허용합니다.');
     }
     $_POST['bo_include_head'] = $file;
 }
 
 if ($file = $_POST['bo_include_tail']) {
-    $purl = parse_url($file);
-    $file = $purl['path'];
-    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
+    $file_ext = pathinfo($file, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) ) {
         alert('하단 파일 경로의 확장자는 php, html 만 허용합니다.');
     }
     $_POST['bo_include_tail'] = $file;
 }
 
 if(!is_include_path_check($_POST['bo_include_head'], 1)) {
-    alert('/data/file/ 또는 /data/editor/ 포함된 문자를 상단 파일 경로에 포함시킬수 없습니다.');
+    alert('상단 파일 경로에 포함시킬수 없는 문자열이 있습니다.');
 }
 
 if(!is_include_path_check($_POST['bo_include_tail'], 1)) {
-    alert('/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.');
+    alert('하단 파일 경로에 포함시킬수 없는 문자열이 있습니다.');
 }
 
 $board_path = G5_DATA_PATH.'/file/'.$bo_table;
@@ -60,6 +69,8 @@ $f = @fopen($file, 'w');
 $src_char = array('&', '=');
 $dst_char = array('＆', '〓');
 $bo_category_list = str_replace($src_char, $dst_char, $bo_category_list);
+//https://github.com/gnuboard/gnuboard5/commit/f5f4925d4eb28ba1af728e1065fc2bdd9ce1da58 에 따른 조치
+$str_bo_category_list = isset($_POST['bo_category_list']) ? preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", "", $_POST['bo_category_list']) : '';
 
 $sql_common = " gr_id               = '{$_POST['gr_id']}',
                 bo_subject          = '{$_POST['bo_subject']}',
@@ -82,7 +93,7 @@ $sql_common = " gr_id               = '{$_POST['gr_id']}',
                 bo_comment_point    = '{$_POST['bo_comment_point']}',
                 bo_download_point   = '{$_POST['bo_download_point']}',
                 bo_use_category     = '{$_POST['bo_use_category']}',
-                bo_category_list    = '{$_POST['bo_category_list']}',
+                bo_category_list    = '{$str_bo_category_list}',
                 bo_use_sideview     = '{$_POST['bo_use_sideview']}',
                 bo_use_file_content = '{$_POST['bo_use_file_content']}',
                 bo_use_secret       = '{$_POST['bo_use_secret']}',
@@ -110,13 +121,20 @@ $sql_common = " gr_id               = '{$_POST['gr_id']}',
                 bo_image_width      = '{$_POST['bo_image_width']}',
                 bo_skin             = '{$_POST['bo_skin']}',
                 bo_mobile_skin      = '{$_POST['bo_mobile_skin']}',
-                bo_include_head     = '{$_POST['bo_include_head']}',
+                ";
+
+// 최고 관리자인 경우에만 수정가능
+if ($is_admin === 'super'){
+$sql_common .= " bo_include_head     = '{$_POST['bo_include_head']}',
                 bo_include_tail     = '{$_POST['bo_include_tail']}',
                 bo_content_head     = '{$_POST['bo_content_head']}',
                 bo_content_tail     = '{$_POST['bo_content_tail']}',
                 bo_mobile_content_head     = '{$_POST['bo_mobile_content_head']}',
                 bo_mobile_content_tail     = '{$_POST['bo_mobile_content_tail']}',
-                bo_insert_content   = '{$_POST['bo_insert_content']}',
+                ";
+}
+
+$sql_common .= " bo_insert_content   = '{$_POST['bo_insert_content']}',
                 bo_gallery_cols     = '{$_POST['bo_gallery_cols']}',
                 bo_gallery_width    = '{$_POST['bo_gallery_width']}',
                 bo_gallery_height   = '{$_POST['bo_gallery_height']}',
@@ -301,12 +319,17 @@ if (is_checked('chk_grp_comment_min'))          $grp_fields .= " , bo_comment_mi
 if (is_checked('chk_grp_comment_max'))          $grp_fields .= " , bo_comment_max = '{$bo_comment_max}' ";
 if (is_checked('chk_grp_upload_count'))         $grp_fields .= " , bo_upload_count = '{$bo_upload_count}' ";
 if (is_checked('chk_grp_upload_size'))          $grp_fields .= " , bo_upload_size = '{$bo_upload_size}' ";
-if (is_checked('chk_grp_include_head'))         $grp_fields .= " , bo_include_head = '{$bo_include_head}' ";
-if (is_checked('chk_grp_include_tail'))         $grp_fields .= " , bo_include_tail = '{$bo_include_tail}' ";
-if (is_checked('chk_grp_content_head'))         $grp_fields .= " , bo_content_head = '{$bo_content_head}' ";
-if (is_checked('chk_grp_content_tail'))         $grp_fields .= " , bo_content_tail = '{$bo_content_tail}' ";
-if (is_checked('chk_grp_mobile_content_head'))         $grp_fields .= " , bo_mobile_content_head = '{$bo_mobile_content_head}' ";
-if (is_checked('chk_grp_mobile_content_tail'))         $grp_fields .= " , bo_mobile_content_tail = '{$bo_mobile_content_tail}' ";
+
+//최고관리자만 수정가능
+if ($is_admin === 'super'){
+    if (is_checked('chk_grp_include_head'))         $grp_fields .= " , bo_include_head = '{$bo_include_head}' ";
+    if (is_checked('chk_grp_include_tail'))         $grp_fields .= " , bo_include_tail = '{$bo_include_tail}' ";
+    if (is_checked('chk_grp_content_head'))         $grp_fields .= " , bo_content_head = '{$bo_content_head}' ";
+    if (is_checked('chk_grp_content_tail'))         $grp_fields .= " , bo_content_tail = '{$bo_content_tail}' ";
+    if (is_checked('chk_grp_mobile_content_head'))         $grp_fields .= " , bo_mobile_content_head = '{$bo_mobile_content_head}' ";
+    if (is_checked('chk_grp_mobile_content_tail'))         $grp_fields .= " , bo_mobile_content_tail = '{$bo_mobile_content_tail}' ";
+}
+
 if (is_checked('chk_grp_insert_content'))       $grp_fields .= " , bo_insert_content = '{$bo_insert_content}' ";
 if (is_checked('chk_grp_use_search'))           $grp_fields .= " , bo_use_search = '{$bo_use_search}' ";
 if (is_checked('chk_grp_order'))                $grp_fields .= " , bo_order = '{$bo_order}' ";
@@ -385,12 +408,17 @@ if (is_checked('chk_all_comment_min'))          $all_fields .= " , bo_comment_mi
 if (is_checked('chk_all_comment_max'))          $all_fields .= " , bo_comment_max = '{$bo_comment_max}' ";
 if (is_checked('chk_all_upload_count'))         $all_fields .= " , bo_upload_count = '{$bo_upload_count}' ";
 if (is_checked('chk_all_upload_size'))          $all_fields .= " , bo_upload_size = '{$bo_upload_size}' ";
-if (is_checked('chk_all_include_head'))         $all_fields .= " , bo_include_head = '{$bo_include_head}' ";
-if (is_checked('chk_all_include_tail'))         $all_fields .= " , bo_include_tail = '{$bo_include_tail}' ";
-if (is_checked('chk_all_content_head'))         $all_fields .= " , bo_content_head = '{$bo_content_head}' ";
-if (is_checked('chk_all_content_tail'))         $all_fields .= " , bo_content_tail = '{$bo_content_tail}' ";
-if (is_checked('chk_all_mobile_content_head'))         $all_fields .= " , bo_mobile_content_head = '{$bo_mobile_content_head}' ";
-if (is_checked('chk_all_mobile_content_tail'))         $all_fields .= " , bo_mobile_content_tail = '{$bo_mobile_content_tail}' ";
+
+//최고관리자만 수정가능
+if ($is_admin === 'super'){
+    if (is_checked('chk_all_include_head'))         $all_fields .= " , bo_include_head = '{$bo_include_head}' ";
+    if (is_checked('chk_all_include_tail'))         $all_fields .= " , bo_include_tail = '{$bo_include_tail}' ";
+    if (is_checked('chk_all_content_head'))         $all_fields .= " , bo_content_head = '{$bo_content_head}' ";
+    if (is_checked('chk_all_content_tail'))         $all_fields .= " , bo_content_tail = '{$bo_content_tail}' ";
+    if (is_checked('chk_all_mobile_content_head'))         $all_fields .= " , bo_mobile_content_head = '{$bo_mobile_content_head}' ";
+    if (is_checked('chk_all_mobile_content_tail'))         $all_fields .= " , bo_mobile_content_tail = '{$bo_mobile_content_tail}' ";
+}
+
 if (is_checked('chk_all_insert_content'))       $all_fields .= " , bo_insert_content = '{$bo_insert_content}' ";
 if (is_checked('chk_all_use_search'))           $all_fields .= " , bo_use_search = '{$bo_use_search}' ";
 if (is_checked('chk_all_order'))                $all_fields .= " , bo_order = '{$bo_order}' ";
@@ -407,5 +435,8 @@ if ($all_fields) {
 
 delete_cache_latest($bo_table);
 
+if(function_exists('get_admin_captcha_by'))
+    get_admin_captcha_by('remove');
+
 goto_url("./board_form.php?w=u&bo_table={$bo_table}&amp;{$qstr}");
 ?>

adm/board_list_update.php

@@ -8,6 +8,8 @@ if (!count($_POST['chk'])) {
     alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
 }
 
+check_admin_token();
+
 if ($_POST['act_button'] == "선택수정") {
 
     auth_check($auth[$sub_menu], 'w');
@@ -19,7 +21,7 @@ if ($_POST['act_button'] == "선택수정") {
 
         if ($is_admin != 'super') {
             $sql = " select count(*) as cnt from {$g5['board_table']} a, {$g5['group_table']} b
-                      where a.gr_id = '{$_POST['gr_id'][$k]}'
+                      where a.gr_id = '".sql_real_escape_string($_POST['gr_id'][$k])."'
                         and a.gr_id = b.gr_id
                         and b.gr_admin = '{$member['mb_id']}' ";
             $row = sql_fetch($sql);
@@ -28,19 +30,20 @@ if ($_POST['act_button'] == "선택수정") {
         }
 
         $sql = " update {$g5['board_table']}
-                    set gr_id               = '{$_POST['gr_id'][$k]}',
-                        bo_subject          = '{$_POST['bo_subject'][$k]}',
-                        bo_device           = '{$_POST['bo_device'][$k]}',
-                        bo_skin             = '{$_POST['bo_skin'][$k]}',
-                        bo_mobile_skin      = '{$_POST['bo_mobile_skin'][$k]}',
-                        bo_read_point       = '{$_POST['bo_read_point'][$k]}',
-                        bo_write_point      = '{$_POST['bo_write_point'][$k]}',
-                        bo_comment_point    = '{$_POST['bo_comment_point'][$k]}',
-                        bo_download_point   = '{$_POST['bo_download_point'][$k]}',
-                        bo_use_search       = '{$_POST['bo_use_search'][$k]}',
-                        bo_use_sns          = '{$_POST['bo_use_sns'][$k]}',
-                        bo_order            = '{$_POST['bo_order'][$k]}'
-                  where bo_table            = '{$_POST['board_table'][$k]}' ";
+                    set gr_id               = '".sql_real_escape_string($_POST['gr_id'][$k])."',
+                        bo_subject          = '".sql_real_escape_string($_POST['bo_subject'][$k])."',
+                        bo_device           = '".sql_real_escape_string($_POST['bo_device'][$k])."',
+                        bo_skin             = '".sql_real_escape_string($_POST['bo_skin'][$k])."',
+                        bo_mobile_skin      = '".sql_real_escape_string($_POST['bo_mobile_skin'][$k])."',
+                        bo_read_point       = '".sql_real_escape_string($_POST['bo_read_point'][$k])."',
+                        bo_write_point      = '".sql_real_escape_string($_POST['bo_write_point'][$k])."',
+                        bo_comment_point    = '".sql_real_escape_string($_POST['bo_comment_point'][$k])."',
+                        bo_download_point   = '".sql_real_escape_string($_POST['bo_download_point'][$k])."',
+                        bo_use_search       = '".sql_real_escape_string($_POST['bo_use_search'][$k])."',
+                        bo_use_sns          = '".sql_real_escape_string($_POST['bo_use_sns'][$k])."',
+                        bo_order            = '".sql_real_escape_string($_POST['bo_order'][$k])."'
+                  where bo_table            = '".sql_real_escape_string($_POST['board_table'][$k])."' ";
+
         sql_query($sql);
     }
 
@@ -51,8 +54,6 @@ if ($_POST['act_button'] == "선택수정") {
 
     auth_check($auth[$sub_menu], 'd');
 
-    check_admin_token();
-
     // _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
     define('_BOARD_DELETE_', true);
 

adm/cache_file_delete.php

@@ -5,6 +5,11 @@ include_once('./_common.php');
 if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.', G5_URL);
 
+@include_once('./safe_check.php');
+if(function_exists('social_log_file_delete')){
+    social_log_file_delete();
+}
+
 $g5['title'] = '캐시파일 일괄삭제';
 include_once('./admin.head.php');
 ?>

adm/contentform.php

@@ -126,6 +126,22 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <input type="text" name="co_include_tail" value="<?php echo $co['co_include_tail']; ?>" id="co_include_tail" class="frm_input" size="60">
         </td>
     </tr>
+    <tr id="admin_captcha_box" style="display:none;">
+        <th scope="row">자동등록방지</th>
+        <td>
+            <?php
+            echo help("파일 경로를 입력 또는 수정시 캡챠를 반드시 입력해야 합니다.");
+
+            include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+            $captcha_html = captcha_html();
+            $captcha_js   = chk_captcha_js();
+            echo $captcha_html;
+            ?>
+            <script>
+            jQuery("#captcha_key").removeAttr("required").removeClass("required");
+            </script>
+        </td>
+    </tr>
     <tr>
         <th scope="row"><label for="co_himg">상단이미지</label></th>
         <td>
@@ -185,7 +201,56 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
 
 </form>
 
+<?php
+// [KVE-2018-2089] 취약점 으로 인해 파일 경로 수정시에만 자동등록방지 코드 사용
+?>
 <script>
+var captcha_chk = false;
+
+function use_captcha_check(){
+    $.ajax({
+        type: "POST",
+        url: g5_admin_url+"/ajax.use_captcha.php",
+        data: { admin_use_captcha: "1" },
+        cache: false,
+        async: false,
+        dataType: "json",
+        success: function(data) {
+        }
+    });
+}
+
+function frm_check_file(){
+    var co_include_head = "<?php echo $co['co_include_head']; ?>";
+    var co_include_tail = "<?php echo $co['co_include_tail']; ?>";
+    var head = jQuery.trim(jQuery("#co_include_head").val());
+    var tail = jQuery.trim(jQuery("#co_include_tail").val());
+
+    if(co_include_head !== head || co_include_tail !== tail){
+        // 캡챠를 사용합니다.
+        jQuery("#admin_captcha_box").show();
+        captcha_chk = true;
+
+        use_captcha_check();
+
+        return false;
+    } else {
+        jQuery("#admin_captcha_box").hide();
+    }
+
+    return true;
+}
+
+jQuery(function($){
+    if( window.self !== window.top ){   // frame 또는 iframe을 사용할 경우 체크
+        $("#co_include_head, #co_include_tail").on("change paste keyup", function(e) {
+            frm_check_file();
+        });
+
+        use_captcha_check();
+    }
+});
+
 function frmcontentform_check(f)
 {
     errmsg = "";
@@ -204,6 +269,11 @@ function frmcontentform_check(f)
         errfld.focus();
         return false;
     }
+    
+    if( captcha_chk ) {
+        <?php echo $captcha_js; // 캡챠 사용시 자바스크립트에서 입력된 캡챠를 검사함  ?>
+    }
+
     return true;
 }
 </script>

adm/contentformupdate.php

@@ -12,6 +12,23 @@ else
 
 check_admin_token();
 
+if ($w == "" || $w == "u")
+{
+    if(preg_match("/[^a-z0-9_]/i", $co_id)) alert("ID 는 영문자, 숫자, _ 만 가능합니다.");
+
+    $sql = " select * from {$g5['content_table']} where co_id = '$co_id' ";
+    $co_row = sql_fetch($sql);
+}
+
+// 관리자가 자동등록방지를 사용해야 할 경우
+if (($co_row['co_include_head'] !== $_POST['co_include_head'] || $co_row['co_include_tail'] !== $_POST['co_include_tail']) && function_exists('get_admin_captcha_by') && get_admin_captcha_by()){
+    include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+
+    if (!chk_captcha()) {
+        alert('자동등록방지 숫자가 틀렸습니다.');
+    }
+}
+
 @mkdir(G5_DATA_PATH."/content", G5_DIR_PERMISSION);
 @chmod(G5_DATA_PATH."/content", G5_DIR_PERMISSION);
 
@@ -21,17 +38,19 @@ if ($co_timg_del)  @unlink(G5_DATA_PATH."/content/{$co_id}_t");
 $error_msg = '';
 
 if( $co_include_head ){
-    $purl = parse_url($co_include_head);
-    $file = $purl['path'];
-    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
+
+    $file_ext = pathinfo($co_include_head, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) ) {
         alert('상단 파일 경로의 확장자는 php, html 만 허용합니다.');
     }
 }
 
 if( $co_include_tail ){
-    $purl = parse_url($co_include_tail);
-    $file = $purl['path'];
-    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
+
+    $file_ext = pathinfo($co_include_tail, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) ) {
         alert('하단 파일 경로의 확장자는 php, html 만 허용합니다.');
     }
 }
@@ -58,11 +77,7 @@ $sql_common = " co_include_head     = '$co_include_head',
 
 if ($w == "")
 {
-    //if(eregi("[^a-z0-9_]", $co_id)) alert("ID 는 영문자, 숫자, _ 만 가능합니다.");
-    if(preg_match("/[^a-z0-9_]/i", $co_id)) alert("ID 는 영문자, 숫자, _ 만 가능합니다.");
-
-    $sql = " select co_id from {$g5['content_table']} where co_id = '$co_id' ";
-    $row = sql_fetch($sql);
+    $row = $co_row;
     if ($row['co_id'])
         alert("이미 같은 ID로 등록된 내용이 있습니다.");
 
@@ -87,6 +102,9 @@ else if ($w == "d")
     sql_query($sql);
 }
 
+if(function_exists('get_admin_captcha_by'))
+    get_admin_captcha_by('remove');
+
 if ($w == "" || $w == "u")
 {
     if ($_FILES['co_himg']['name'])

adm/css/admin.css

@@ -685,6 +685,15 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 .sevice_2 .svc_design{overflow:hidden;height:210px;position:relative}
 .sevice_2 .svc_design .svc_btn a{margin:0 0 20px}
 
+/* 캡챠 */
+#captcha {display:inline-block;position:relative}
+#captcha legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden;}
+#captcha #captcha_img {;height:40px;border:1px solid #898989;vertical-align:top;padding:0;margin:0}
+#captcha #captcha_mp3 {;margin:0;padding:0;width:40px;height:40px;border:0;background:transparent;vertical-align:middle;overflow:hidden;cursor:pointer;background:url('../../img/captcha2.png') no-repeat;text-indent:-999px;border-radius:3px}
+#captcha #captcha_reload {margin:0;padding:0;width:40px;height:40px;border:0;background:transparent;vertical-align:middle;overflow:hidden;cursor:pointer;background:url('../../img/captcha2.png') no-repeat  0 -40px;text-indent:-999px;border-radius:3px}
+#captcha #captcha_key {margin:0 0 0 3px;padding:0 5px;width:90px;height:40px;border:1px solid #ccc;background:#fff;font-size:1.333em;font-weight:bold;text-align:center;border-radius:3px;vertical-align:top}
+#captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em}
+
 /*테마*/
 .theme_p{margin:0 0 10px }
 #theme_list{padding:0;margin:0;list-style:none;  width: 1000px;position:relative}

adm/dbupgrade.php

@@ -0,0 +1,88 @@
+<?php
+$sub_menu = '100410';
+include_once('./_common.php');
+
+auth_check($auth[$sub_menu], 'r');
+
+$g5['title'] = 'DB 업그레이드';
+include_once('./admin.head.php');
+
+$is_check = false;
+
+//소셜 로그인 관련 필드 및 구글 리챕챠 필드 추가
+if(!isset($config['cf_social_login_use'])) {
+    sql_query("ALTER TABLE `{$g5['config_table']}`
+                ADD `cf_social_login_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `cf_googl_shorturl_apikey`,
+                ADD `cf_google_clientid` varchar(100) NOT NULL DEFAULT '' AFTER `cf_twitter_secret`,
+                ADD `cf_google_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_google_clientid`,
+                ADD `cf_naver_clientid` varchar(100) NOT NULL DEFAULT '' AFTER `cf_google_secret`,
+                ADD `cf_naver_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_naver_clientid`,
+                ADD `cf_kakao_rest_key` varchar(100) NOT NULL DEFAULT '' AFTER `cf_naver_secret`,
+                ADD `cf_social_servicelist` varchar(255) NOT NULL DEFAULT '' AFTER `cf_social_login_use`,
+                ADD `cf_payco_clientid` varchar(100) NOT NULL DEFAULT '' AFTER `cf_social_servicelist`,
+                ADD `cf_payco_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_payco_clientid`,
+                ADD `cf_captcha` varchar(100) NOT NULL DEFAULT '' AFTER `cf_kakao_js_apikey`,
+                ADD `cf_recaptcha_site_key` varchar(100) NOT NULL DEFAULT '' AFTER `cf_captcha`,
+                ADD `cf_recaptcha_secret_key` varchar(100) NOT NULL DEFAULT '' AFTER `cf_recaptcha_site_key`
+    ", true);
+
+    $is_check = true;
+}
+
+//소셜 로그인 관련 필드 카카오 클라이언트 시크릿 추가
+if(!isset($config['cf_kakao_client_secret'])) {
+    sql_query("ALTER TABLE `{$g5['config_table']}`
+                ADD `cf_kakao_client_secret` varchar(100) NOT NULL DEFAULT '' AFTER `cf_kakao_rest_key`
+    ", true);
+
+    $is_check = true;
+}
+
+// 회원 이미지 관련 필드 추가
+if(!isset($config['cf_member_img_size'])) {
+    sql_query("ALTER TABLE `{$g5['config_table']}`
+                ADD `cf_member_img_size` int(11) NOT NULL DEFAULT '0' AFTER `cf_member_icon_height`,
+                ADD `cf_member_img_width` int(11) NOT NULL DEFAULT '0' AFTER `cf_member_img_size`,
+                ADD `cf_member_img_height` int(11) NOT NULL DEFAULT '0' AFTER `cf_member_img_width`
+    ", true);
+
+    $sql = " update {$g5['config_table']} set cf_member_img_size = 50000, cf_member_img_width = 60, cf_member_img_height = 60 ";
+    sql_query($sql, false);
+
+    $is_check = true;
+}
+
+// 소셜 로그인 관리 테이블 없을 경우 생성
+if( isset($g5['social_profile_table']) && !sql_query(" DESC {$g5['social_profile_table']} ", false)) {
+    sql_query(" CREATE TABLE IF NOT EXISTS `{$g5['social_profile_table']}` (
+                  `mp_no` int(11) NOT NULL AUTO_INCREMENT,
+                  `mb_id` varchar(255) NOT NULL DEFAULT '',
+                  `provider` varchar(50) NOT NULL DEFAULT '',
+                  `object_sha` varchar(45) NOT NULL DEFAULT '',
+                  `identifier` varchar(255) NOT NULL DEFAULT '',
+                  `profileurl` varchar(255) NOT NULL DEFAULT '',
+                  `photourl` varchar(255) NOT NULL DEFAULT '',
+                  `displayname` varchar(150) NOT NULL DEFAULT '',
+                  `description` varchar(255) NOT NULL DEFAULT '',
+                  `mp_register_day` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+                  `mp_latest_day` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+                  UNIQUE KEY `mp_no` (`mp_no`),
+                  KEY `mb_id` (`mb_id`),
+                  KEY `provider` (`provider`)
+                ) ", true);
+
+    $is_check = true;
+}
+
+$db_upgrade_msg = $is_check ? 'DB 업그레이드가 완료되었습니다.' : '더 이상 업그레이드 할 내용이 없습니다.<br>현재 DB 업그레이드가 완료된 상태입니다.';
+?>
+
+<div class="local_desc01 local_desc">
+    <p>
+        <?php echo $db_upgrade_msg; ?>
+    </p>
+</div>
+
+<?php
+include_once ('./admin.tail.php');
+?>

adm/faqform.php

@@ -5,6 +5,9 @@ include_once(G5_EDITOR_LIB);
 
 auth_check($auth[$sub_menu], "w");
 
+$fm_id = (int) $fm_id;
+$fa_id = isset($fa_id) ? (int) $fa_id : 0;
+
 $sql = " select * from {$g5['faq_master_table']} where fm_id = '$fm_id' ";
 $fm = sql_fetch($sql);
 

adm/faqformupdate.php

@@ -5,7 +5,7 @@ include_once('./_common.php');
 if ($w == "u" || $w == "d")
     check_demo();
 
-if ($W == 'd')
+if ($w == 'd')
     auth_check($auth[$sub_menu], "d");
 else
     auth_check($auth[$sub_menu], "w");

adm/index.php

@@ -2,6 +2,11 @@
 $sub_menu = '100000';
 include_once('./_common.php');
 
+@include_once('./safe_check.php');
+if(function_exists('social_log_file_delete')){
+    social_log_file_delete(86400);      //소셜로그인 디버그 파일 24시간 지난것은 삭제
+}
+
 $g5['title'] = '관리자메인';
 include_once ('./admin.head.php');
 

adm/qa_config.php

@@ -263,6 +263,22 @@ if(!isset($qaconfig['qa_include_head'])) {
                 <input type="text" name="qa_include_tail" value="<?php echo $qaconfig['qa_include_tail'] ?>" id="qa_include_tail" class="frm_input" size="50">
             </td>
         </tr>
+        <tr id="admin_captcha_box" style="display:none;">
+            <th scope="row">자동등록방지</th>
+            <td>
+                <?php
+                echo help("파일 경로를 입력 또는 수정시 캡챠를 반드시 입력해야 합니다.");
+
+                include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+                $captcha_html = captcha_html();
+                $captcha_js   = chk_captcha_js();
+                echo $captcha_html;
+                ?>
+                <script>
+                jQuery("#captcha_key").removeAttr("required").removeClass("required");
+                </script>
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="qa_content_head">상단 내용</label></th>
             <td>
@@ -316,6 +332,53 @@ if(!isset($qaconfig['qa_include_head'])) {
 </form>
 
 <script>
+
+var captcha_chk = false;
+
+function use_captcha_check(){
+    $.ajax({
+        type: "POST",
+        url: g5_admin_url+"/ajax.use_captcha.php",
+        data: { admin_use_captcha: "1" },
+        cache: false,
+        async: false,
+        dataType: "json",
+        success: function(data) {
+        }
+    });
+}
+
+function frm_check_file(){
+    var qa_include_head = "<?php echo $qaconfig['qa_include_head']; ?>";
+    var qa_include_tail = "<?php echo $qaconfig['qa_include_tail']; ?>";
+    var head = jQuery.trim(jQuery("#qa_include_head").val());
+    var tail = jQuery.trim(jQuery("#qa_include_tail").val());
+
+    if(qa_include_head !== head || qa_include_tail !== tail){
+        // 캡챠를 사용합니다.
+        jQuery("#admin_captcha_box").show();
+        captcha_chk = true;
+
+        use_captcha_check();
+
+        return false;
+    } else {
+        jQuery("#admin_captcha_box").hide();
+    }
+
+    return true;
+}
+
+jQuery(function($){
+    if( window.self !== window.top ){   // frame 또는 iframe을 사용할 경우 체크
+        $("#qa_include_head, #qa_include_tail").on("change paste keyup", function(e) {
+            frm_check_file();
+        });
+
+        use_captcha_check();
+    }
+});
+
 function fqaconfigform_submit(f)
 {
     <?php echo get_editor_js("qa_content_head"); ?>
@@ -323,6 +386,10 @@ function fqaconfigform_submit(f)
     <?php echo get_editor_js("qa_mobile_content_head"); ?>
     <?php echo get_editor_js("qa_mobile_content_tail"); ?>
 
+    if( captcha_chk ) {
+        <?php echo isset($captcha_js) ? $captcha_js : ''; // 캡챠 사용시 자바스크립트에서 입력된 캡챠를 검사함  ?>
+    }
+
     f.action = "./qa_config_update.php";
     return true;
 }

adm/qa_config_update.php

@@ -10,18 +10,29 @@ check_admin_token();
 
 $error_msg = '';
 
+$qaconfig = get_qa_config();
+
+// 관리자가 자동등록방지를 사용해야 할 경우
+if ($board && ($qaconfig['qa_include_head'] !== $_POST['qa_include_head'] || $qaconfig['qa_include_tail'] !== $_POST['qa_include_tail']) && function_exists('get_admin_captcha_by') && get_admin_captcha_by()){
+    include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
+
+    if (!chk_captcha()) {
+        alert('자동등록방지 숫자가 틀렸습니다.');
+    }
+}
+
 if( $qa_include_head ){
-    $purl = parse_url($qa_include_head);
-    $file = $purl['path'];
-    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
+    $file_ext = pathinfo($qa_include_head, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) ) {
         alert('상단 파일 경로의 확장자는 php, html 만 허용합니다.');
     }
 }
 
 if( $qa_include_tail ){
-    $purl = parse_url($qa_include_tail);
-    $file = $purl['path'];
-    if (!preg_match("/\.(php|htm['l']?)$/i", $file)) {
+    $file_ext = pathinfo($qa_include_tail, PATHINFO_EXTENSION);
+
+    if( ! $file_ext || ! in_array($file_ext, array('php', 'htm', 'html')) ) {
         alert('하단 파일 경로의 확장자는 php, html 만 허용합니다.');
     }
 }
@@ -75,6 +86,9 @@ $sql = " update {$g5['qa_config_table']}
                 qa_5                    = '{$_POST['qa_5']}' ";
 sql_query($sql);
 
+if(function_exists('get_admin_captcha_by'))
+    get_admin_captcha_by('remove');
+
 if($error_msg){
     alert($error_msg, './qa_config.php');
 } else {

adm/safe_check.php

@@ -0,0 +1,17 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+function social_log_file_delete($second=0){
+    $files = glob(G5_DATA_PATH.'/tmp/social_*');
+    if (is_array($files)) {
+        $before_time  = $second ? G5_SERVER_TIME - $second : 0;
+        foreach ($files as $social_log_file) {
+            $modification_time = filemtime($log_file); // 파일접근시간
+
+            if ($before_time && $modification_time > $before_time) continue;
+
+            unlink($social_log_file);
+        }
+    }
+}
+?>

adm/sms_admin/emoticon_move.php

@@ -11,7 +11,8 @@ auth_check($auth[$sub_menu], "r");
 $g5['title'] = '이모티콘그룹 이동';
 include_once(G5_PATH.'/head.sub.php');
 
-$fo_no_list = implode(',', $_POST['fo_no']);
+$list = array();    //배열 변수 초기화
+$fo_no_list = isset($_POST['fo_no']) ? implode(',', $_POST['fo_no']) : '';
 
 $sql = " select * from {$g5['sms5_form_group_table']} order by fg_no ";
 $result = sql_query($sql);
@@ -27,7 +28,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     <form name="fboardmoveall" method="post" action="./emoticon_move_update.php" onsubmit="return fboardmoveall_submit(this);">
     <input type="hidden" name="sw" value="<?php echo $sw ?>">
     <input type="hidden" name="fo_no_list" value="<?php echo $fo_no_list ?>">
-    <input type="hidden" name="url" value="<?php echo $_SERVER['HTTP_REFERER'] ?>">
+    <input type="hidden" name="url" value="<?php echo clean_xss_tags(strip_tags($_SERVER['HTTP_REFERER'])); ?>">
 
     <div class="tbl_head01 tbl_wrap">
         <table>

adm/sms_admin/form_multi_update.php

@@ -4,7 +4,7 @@ include_once("./_common.php");
 
 auth_check($auth[$sub_menu], "w");
 
-check_token();
+check_admin_token();
 
 if($atype == "del"){
     $count = count($_POST['fo_no']);
@@ -14,7 +14,7 @@ if($atype == "del"){
     for ($i=0; $i<$count; $i++)
     {
         // 실제 번호를 넘김
-        $fo_no = $_POST['fo_no'][$i];
+        $fo_no = (int) $_POST['fo_no'][$i];
         if (!trim($fo_no)) continue;
 
         $res = sql_fetch("select * from {$g5['sms5_form_table']} where fo_no='$fo_no'");

adm/sms_admin/history_view.php

@@ -5,6 +5,9 @@ include_once("./_common.php");
 $spage_size = 20;
 $colspan = 10;
 
+$st = isset($st) ? strip_tags($st) : '';
+$ssv = isset($ssv) ? strip_tags($ssv) : '';
+
 auth_check($auth[$sub_menu], "r");
 
 $g5['title'] = "문자전송 상세내역";
@@ -64,18 +67,18 @@ function all_send()
 </script>
 
 <form name="search_form" method="get" action="<?php echo $_SERVER['SCRIPT_NAME']?>" class="local_sch01 local_sch">
-<input type="hidden" name="wr_no" value="<?php echo $wr_no?>">
-<input type="hidden" name="wr_renum" value="<?php echo $wr_renum?>">
-<input type="hidden" name="page" value="<?php echo $page?>">
-<input type="hidden" name="st" value="<?php echo $st?>">
-<input type="hidden" name="sv" value="<?php echo $sv?>">
+<input type="hidden" name="wr_no" value="<?php echo get_sanitize_input($wr_no); ?>">
+<input type="hidden" name="wr_renum" value="<?php echo get_sanitize_input($wr_renum); ?>">
+<input type="hidden" name="page" value="<?php echo get_sanitize_input($page); ?>">
+<input type="hidden" name="st" value="<?php echo get_sanitize_input($st); ?>">
+<input type="hidden" name="sv" value="<?php echo get_sanitize_input($sv); ?>">
 <label for="sst" class="sound_only">검색대상</label>
 <select name="sst" id="sst">
     <option value="hs_name" <?php echo get_selected('hs_name', $sst); ?>>이름</option>
     <option value="hs_hp" <?php echo get_selected('hs_hp', $sst); ?>>휴대폰번호</option>
 </select>
 <label for="ssv" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-<input type="text" name="ssv" value="<?php echo $ssv?>" id="ssv" class="frm_input">
+<input type="text" name="ssv" value="<?php echo get_sanitize_input($ssv); ?>" id="ssv" class="frm_input">
 <input type="submit" value="검색" class="btn_submit">
 </form>
 

adm/sms_admin/num_book.php

@@ -13,6 +13,8 @@ $g5['title'] = "휴대폰번호 관리";
 
 if ($page < 1) $page = 1;
 
+$bg_no = isset($bg_no) ? (int) $bg_no : 0;
+
 if (is_numeric($bg_no))
     $sql_group = " and bg_no='$bg_no' ";
 else

adm/sms_admin/num_book_move.php

@@ -33,7 +33,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     <input type="hidden" name="sw" value="<?php echo $sw ?>">
     <input type="hidden" name="bk_no_list" value="<?php echo $bk_no_list ?>">
     <input type="hidden" name="act" value="<?php echo $act ?>">
-    <input type="hidden" name="url" value="<?php echo $_SERVER['HTTP_REFERER'] ?>">
+    <input type="hidden" name="url" value="<?php echo clean_xss_tags(strip_tags($_SERVER['HTTP_REFERER'])); ?>">
     <div class=" new_win_con"> 
         <div class="tbl_head01 tbl_wrap">
             <table>

bbs/alert.php

@@ -28,6 +28,7 @@ include_once(G5_PATH.'/head.sub.php');
 // 파일만 가능합니다.
 // 공백이 없어야 합니다.
 
+$msg = isset($msg) ? strip_tags($msg) : '';
 $msg2 = str_replace("\\n", "<br>", $msg);
 
 $url = clean_xss_tags($url);
@@ -36,7 +37,7 @@ if (!$url) $url = clean_xss_tags($_SERVER['HTTP_REFERER']);
 $url = preg_replace("/[\<\>\'\"\\\'\\\"\(\)]/", "", $url);
 
 // url 체크
-check_url_host($url);
+check_url_host($url, $msg);
 
 if($error) {
     $header2 = "다음 항목에 오류가 있습니다.";
@@ -46,7 +47,7 @@ if($error) {
 ?>
 
 <script>
-alert("<?php echo strip_tags($msg); ?>");
+alert("<?php echo $msg; ?>");
 //document.location.href = "<?php echo $url; ?>";
 <?php if ($url) { ?>
 document.location.replace("<?php echo str_replace('&amp;', '&', $url); ?>");

bbs/alert_close.php

@@ -2,6 +2,8 @@
 include_once('./_common.php');
 include_once(G5_PATH.'/head.sub.php');
 
+$msg = isset($msg) ? strip_tags($msg) : '';
+
 $msg2 = str_replace("\\n", "<br>", $msg);
 
 if($error) {

bbs/board.php

@@ -16,6 +16,8 @@ if (!$bo_table) {
     alert($msg);
 }
 
+$g5['board_title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']);
+
 // wr_id 값이 있으면 글읽기
 if (isset($wr_id) && $wr_id) {
     // 글이 없을 경우 해당 게시판 목록으로 이동
@@ -77,7 +79,7 @@ if (isset($wr_id) && $wr_id) {
     }
 
     // 자신의 글이거나 관리자라면 통과
-    if (($write['mb_id'] && $write['mb_id'] == $member['mb_id']) || $is_admin) {
+    if (($write['mb_id'] && $write['mb_id'] === $member['mb_id']) || $is_admin) {
         ;
     } else {
         // 비밀글이라면
@@ -93,7 +95,7 @@ if (isset($wr_id) && $wr_id) {
                             and wr_reply = ''
                             and wr_is_comment = 0 ";
                 $row = sql_fetch($sql);
-                if ($row['mb_id'] == $member['mb_id'])
+                if ($row['mb_id'] === $member['mb_id'])
                     $is_owner = true;
             }
 
@@ -120,7 +122,7 @@ if (isset($wr_id) && $wr_id) {
         sql_query(" update {$write_table} set wr_hit = wr_hit + 1 where wr_id = '{$wr_id}' ");
 
         // 자신의 글이면 통과
-        if ($write['mb_id'] && $write['mb_id'] == $member['mb_id']) {
+        if ($write['mb_id'] && $write['mb_id'] === $member['mb_id']) {
             ;
         } else if ($is_guest && $board['bo_read_level'] == 1 && $write['wr_ip'] == $_SERVER['REMOTE_ADDR']) {
             // 비회원이면서 읽기레벨이 1이고 등록된 아이피가 같다면 자신의 글이므로 통과
@@ -136,7 +138,7 @@ if (isset($wr_id) && $wr_id) {
         set_session($ss_name, TRUE);
     }
 
-    $g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']);
+    $g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".$g5['board_title'];
 } else {
     if ($member['mb_level'] < $board['bo_list_level']) {
         if ($member['mb_id'])
@@ -171,7 +173,7 @@ if (isset($wr_id) && $wr_id) {
 
     if (!isset($page) || (isset($page) && $page == 0)) $page = 1;
 
-    $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']).' '.$page.' 페이지';
+    $g5['title'] = $g5['board_title'].' '.$page.' 페이지';
 }
 
 include_once(G5_PATH.'/head.sub.php');
@@ -219,7 +221,7 @@ if ($board['bo_use_nogood'])
 
 $admin_href = "";
 // 최고관리자 또는 그룹관리자라면
-if ($member['mb_id'] && ($is_admin == 'super' || $group['gr_admin'] == $member['mb_id']))
+if ($member['mb_id'] && ($is_admin === 'super' || $group['gr_admin'] === $member['mb_id']))
     $admin_href = G5_ADMIN_URL.'/board_form.php?w=u&amp;bo_table='.$bo_table;
 
 include_once(G5_BBS_PATH.'/board_head.php');

bbs/delete.php

@@ -26,7 +26,7 @@ else if ($is_admin == 'group') { // 그룹관리자
     else if ($member['mb_level'] < $mb['mb_level']) // 자신의 레벨이 크거나 같다면 통과
         alert('자신의 권한보다 높은 권한의 회원이 작성한 글은 삭제할 수 없습니다.');
 } else if ($member['mb_id']) {
-    if ($member['mb_id'] != $write['mb_id'])
+    if ($member['mb_id'] !== $write['mb_id'])
         alert('자신의 글이 아니므로 삭제할 수 없습니다.');
 } else {
     if ($write['mb_id'])
@@ -80,7 +80,7 @@ while ($row = sql_fetch_array($result))
         $sql2 = " select * from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' ";
         $result2 = sql_query($sql2);
         while ($row2 = sql_fetch_array($result2)) {
-            @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.$row2['bf_file']);
+            @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '', $row2['bf_file']));
             // 썸네일삭제
             if(preg_match("/\.({$config['cf_image_extension']})$/i", $row2['bf_file'])) {
                 delete_board_thumbnail($bo_table, $row2['bf_file']);

bbs/delete_all.php

@@ -98,7 +98,7 @@ for ($i=$chk_count-1; $i>=0; $i--)
             $result2 = sql_query($sql2);
             while ($row2 = sql_fetch_array($result2)) {
                 // 파일삭제
-                @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.$row2['bf_file']);
+                @unlink(G5_DATA_PATH.'/file/'.$bo_table.'/'.str_replace('../', '',$row2['bf_file']));
 
                 // 썸네일삭제
                 if(preg_match("/\.({$config['cf_image_extension']})$/i", $row2['bf_file'])) {

bbs/delete_comment.php

@@ -2,6 +2,8 @@
 // 코멘트 삭제
 include_once('./_common.php');
 
+$comment_id = (int) $comment_id;
+
 $delete_comment_token = get_session('ss_delete_comment_'.$comment_id.'_token');
 set_session('ss_delete_comment_'.$comment_id.'_token', '');
 
@@ -20,16 +22,16 @@ if ($is_admin == 'super') // 최고관리자 통과
     ;
 else if ($is_admin == 'group') { // 그룹관리자
     $mb = get_member($write['mb_id']);
-    if ($member['mb_id'] == $group['gr_admin']) { // 자신이 관리하는 그룹인가?
+    if ($member['mb_id'] === $group['gr_admin']) { // 자신이 관리하는 그룹인가?
         if ($member['mb_level'] >= $mb['mb_level']) // 자신의 레벨이 크거나 같다면 통과
             ;
         else
             alert('그룹관리자의 권한보다 높은 회원의 코멘트이므로 삭제할 수 없습니다.');
     } else
         alert('자신이 관리하는 그룹의 게시판이 아니므로 코멘트를 삭제할 수 없습니다.');
-} else if ($is_admin == 'board') { // 게시판관리자이면
+} else if ($is_admin === 'board') { // 게시판관리자이면
     $mb = get_member($write['mb_id']);
-    if ($member['mb_id'] == $board['bo_admin']) { // 자신이 관리하는 게시판인가?
+    if ($member['mb_id'] === $board['bo_admin']) { // 자신이 관리하는 게시판인가?
         if ($member['mb_level'] >= $mb['mb_level']) // 자신의 레벨이 크거나 같다면 통과
             ;
         else
@@ -37,7 +39,7 @@ else if ($is_admin == 'group') { // 그룹관리자
     } else
         alert('자신이 관리하는 게시판이 아니므로 코멘트를 삭제할 수 없습니다.');
 } else if ($member['mb_id']) {
-    if ($member['mb_id'] != $write['mb_id'])
+    if ($member['mb_id'] !== $write['mb_id'])
         alert('자신의 글이 아니므로 삭제할 수 없습니다.');
 } else {
     if (!check_password($wr_password, $write['wr_password']))

bbs/download.php

@@ -67,17 +67,28 @@ if (!get_session($ss_name))
         insert_point($member['mb_id'], $board['bo_download_point'], "{$board['bo_subject']} $wr_id 파일 다운로드", $bo_table, $wr_id, "다운로드");
     }
 
+    set_session($ss_name, TRUE);
+}
+
+// 이미 다운로드 받은 파일인지를 검사한 후 다운로드 카운트 증가 ( SIR 그누위즈 님 코드 제안 )
+$ss_name = 'ss_down_'.$bo_table.'_'.$wr_id.'_'.$no;
+if (!get_session($ss_name))
+{
     // 다운로드 카운트 증가
     $sql = " update {$g5['board_file_table']} set bf_download = bf_download + 1 where bo_table = '$bo_table' and wr_id = '$wr_id' and bf_no = '$no' ";
     sql_query($sql);
-
-    set_session($ss_name, TRUE);
+    // 다운로드 카운트를 증가시키고 세션을 생성
+    $_SESSION[$ss_name] = true;
 }
 
 $g5['title'] = '다운로드 > '.conv_subject($write['wr_subject'], 255);
 
-//$original = urlencode($file['bf_source']);
-$original = iconv('utf-8', 'euc-kr', $file['bf_source']); // SIR 잉끼님 제안코드
+//파일명에 한글이 있는 경우
+if(preg_match("/[\xA1-\xFE][\xA1-\xFE]/", $file['bf_source'])){
+    $original = iconv('utf-8', 'euc-kr', $file['bf_source']); // SIR 잉끼님 제안코드
+} else {
+    $original = urlencode($file['bf_source']);
+}
 
 @include_once($board_skin_path.'/download.tail.skin.php');
 
@@ -86,6 +97,11 @@ if(preg_match("/msie/i", $_SERVER['HTTP_USER_AGENT']) && preg_match("/5\.5/", $_
     header("content-length: ".filesize("$filepath"));
     header("content-disposition: attachment; filename=\"$original\"");
     header("content-transfer-encoding: binary");
+} else if (preg_match("/Firefox/i", $_SERVER['HTTP_USER_AGENT'])){
+    header("content-type: file/unknown");
+    header("content-length: ".filesize("$filepath"));
+    header("content-disposition: attachment; filename=\"".basename($file['bf_source'])."\"");
+    header("content-description: php generated data");
 } else {
     header("content-type: file/unknown");
     header("content-length: ".filesize("$filepath"));

bbs/list.php

@@ -33,7 +33,11 @@ if ($sop != 'and' && $sop != 'or')
 
 // 분류 선택 또는 검색어가 있다면
 $stx = trim($stx);
-if ($sca || $stx) {
+//검색인지 아닌지 구분하는 변수 초기화
+$is_search_bbs = false;
+
+if ($sca || $stx || $stx === '0') {     //검색이면
+    $is_search_bbs = true;      //검색구분변수 true 지정
     $sql_search = get_sql_search($sca, $sfl, $stx, $sop);
 
     // 가장 작은 번호를 얻어서 변수에 저장 (하단의 페이징에서 사용)
@@ -80,7 +84,7 @@ $notice_count = 0;
 $notice_array = array();
 
 // 공지 처리
-if (!$sca && !$stx) {
+if (!$is_search_bbs) {
     $arr_notice = explode(',', trim($board['bo_notice']));
     $from_notice_idx = ($page - 1) * $page_rows;
     if($from_notice_idx < 0)
@@ -162,7 +166,7 @@ if ($sst) {
     $sql_order = " order by {$sst} {$sod} ";
 }
 
-if ($sca || $stx) {
+if ($is_search_bbs) {
     $sql = " select distinct wr_parent from {$write_table} where {$sql_search} {$sql_order} limit {$from_record}, $page_rows ";
 } else {
     $sql = " select * from {$write_table} where wr_is_comment = 0 ";
@@ -180,7 +184,7 @@ if($page_rows > 0) {
     while ($row = sql_fetch_array($result))
     {
         // 검색일 경우 wr_id만 얻었으므로 다시 한행을 얻는다
-        if ($sca || $stx)
+        if ($is_search_bbs)
             $row = sql_fetch(" select * from {$write_table} where wr_id = '{$row['wr_parent']}' ");
 
         $list[$i] = get_list($row, $board, $board_skin_url, G5_IS_MOBILE ? $board['bo_mobile_subject_len'] : $board['bo_subject_len']);
@@ -201,7 +205,7 @@ $write_pages = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['c
 $list_href = '';
 $prev_part_href = '';
 $next_part_href = '';
-if ($sca || $stx) {
+if ($is_search_bbs) {
     $list_href = './board.php?bo_table='.$bo_table;
 
     $patterns = array('#&amp;page=[0-9]*#', '#&amp;spt=[0-9\-]*#');

bbs/login_check.php

@@ -56,7 +56,7 @@ if ( is_use_email_certify() && !preg_match("/[1-9]/", $mb['mb_email_certify']))
 // 회원아이디 세션 생성
 set_session('ss_mb_id', $mb['mb_id']);
 // FLASH XSS 공격에 대응하기 위하여 회원의 고유키를 생성해 놓는다. 관리자에서 검사함 - 110106
-set_session('ss_mb_key', md5($mb['mb_datetime'] . $_SERVER['REMOTE_ADDR'] . $_SERVER['HTTP_USER_AGENT']));
+set_session('ss_mb_key', md5($mb['mb_datetime'] . get_real_client_ip() . $_SERVER['HTTP_USER_AGENT']));
 
 // 포인트 체크
 if($config['cf_use_point']) {
@@ -83,7 +83,7 @@ if ($auto_login) {
 
 if ($url) {
     // url 체크
-    check_url_host($url);
+    check_url_host($url, '', G5_URL, true);
 
     $link = urldecode($url);
     // 2003-06-14 추가 (다른 변수들을 넘겨주기 위함)

bbs/member_confirm.php

@@ -22,7 +22,7 @@ include_once('./_head.sub.php');
 $url = clean_xss_tags($_GET['url']);
 
 // url 체크
-check_url_host($url);
+check_url_host($url, '', G5_URL, true);
 
 $url = get_text($url);
 

bbs/memo.php

@@ -20,7 +20,7 @@ else
 
 $sql = " select count(*) as cnt from {$g5['memo_table']} where me_{$kind}_mb_id = '{$member['mb_id']}' ";
 $row = sql_fetch($sql);
-$total_count = number_format($row['cnt']);
+$total_count = $row['cnt'];
 
 $total_page  = ceil($total_count / $config['cf_page_rows']);  // 전체 페이지 계산
 if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)

bbs/memo_view.php

@@ -68,8 +68,8 @@ $mb = get_member($memo['me_'.$unkind.'_mb_id']);
 $list_link = './memo.php?kind='.$kind;
 
 if(isset($page) && $page){
-    $prev_link .= '&page='.(int) $page;
-    $next_link .= '&page='.(int) $page;
+    $prev_link .= $prev_link ? '&page='.(int) $page : '';
+    $next_link .= $next_link ? '&page='.(int) $page : '';
     $list_link .= '&page='.(int) $page;
 }
 

bbs/move_update.php

@@ -28,7 +28,14 @@ while ($row = sql_fetch_array($result))
     $wr_num = $row['wr_num'];
     for ($i=0; $i<count($_POST['chk_bo_table']); $i++)
     {
-        $move_bo_table = $_POST['chk_bo_table'][$i];
+        $move_bo_table = preg_replace('/[^a-z0-9_]/i', '', $_POST['chk_bo_table'][$i]);
+
+        // 취약점 18-0075 참고
+        $sql = "select * from {$g5['board_table']} where bo_table = '".sql_real_escape_string($move_bo_table)."' ";
+        $move_board = sql_fetch($sql);
+        // 존재하지 않다면
+        if( !$move_board['bo_table'] ) continue;
+
         $move_write_table = $g5['write_prefix'] . $move_bo_table;
 
         $src_dir = G5_DATA_PATH.'/file/'.$bo_table; // 원본 디렉토리

bbs/qadelete.php

@@ -7,7 +7,8 @@ if($is_guest)
 $delete_token = get_session('ss_qa_delete_token');
 set_session('ss_qa_delete_token', '');
 
-if (!($token && $delete_token == $token))
+//관리자가 아닌경우에는 토큰을 검사합니다.
+if (!$is_admin && !($token && $delete_token == $token))
     alert('토큰 에러로 삭제 불가합니다.');
 
 $tmp_array = array();
@@ -21,7 +22,7 @@ if(!$count)
     alert('삭제할 게시글을 하나이상 선택해 주십시오.');
 
 for($i=0; $i<$count; $i++) {
-    $qa_id = $tmp_array[$i];
+    $qa_id = (int) $tmp_array[$i];
 
     $sql = " select qa_id, mb_id, qa_type, qa_status, qa_parent, qa_content, qa_file1, qa_file2
                 from {$g5['qa_content_table']}
@@ -32,7 +33,7 @@ for($i=0; $i<$count; $i++) {
         continue;
 
     // 자신의 글이 아니면 건너뜀
-    if($is_admin != 'super' && $row['mb_id'] != $member['mb_id'])
+    if($is_admin != 'super' && $row['mb_id'] !== $member['mb_id'])
         continue;
 
     // 답변이 달린 글은 삭제못함

bbs/scrap_popin_update.php

@@ -45,6 +45,14 @@ if ($wr_content && ($member['mb_level'] >= $board['bo_comment_level']))
     // 원글이 존재한다면
     if ($wr['wr_id'])
     {
+
+        // 세션의 시간 검사
+        // 4.00.15 - 댓글 수정시 연속 게시물 등록 메시지로 인한 오류 수정
+        if ($w == 'c' && $_SESSION['ss_datetime'] >= (G5_SERVER_TIME - $config['cf_delay_sec']) && !$is_admin)
+            alert('너무 빠른 시간내에 게시물을 연속해서 올릴 수 없습니다.');
+        
+        set_session('ss_datetime', G5_SERVER_TIME);
+
         $mb_id = $member['mb_id'];
         $wr_name = addslashes(clean_xss_tags($board['bo_use_name'] ? $member['mb_name'] : $member['mb_nick']));
         $wr_password = $member['mb_password'];
@@ -86,7 +94,7 @@ if ($wr_content && ($member['mb_level'] >= $board['bo_comment_level']))
         sql_query(" update {$g5['board_table']}  set bo_count_comment = bo_count_comment + 1 where bo_table = '$bo_table' ");
 
         // 포인트 부여
-        insert_point($member['mb_id'], $board['bo_comment_point'], "{$board['bo_subject']} {$wr_id}-{$comment_id} 코멘트쓰기", $bo_table, $comment_id, '코멘트');
+        insert_point($member['mb_id'], $board['bo_comment_point'], "{$board['bo_subject']} {$wr_id}-{$comment_id} 댓글쓰기(스크랩)", $bo_table, $comment_id, '댓글');
     }
 }
 

bbs/view.php

@@ -10,7 +10,7 @@ if ($sop != 'and' && $sop != 'or')
 
 $sql_search = "";
 // 검색이면
-if ($sca || $stx) {
+if ($sca || $stx || $stx === '0') {
     // where 문을 얻음
     $sql_search = get_sql_search($sca, $sfl, $stx, $sop);
     $search_href = './board.php?bo_table='.$bo_table.'&page='.$page.$qstr;
@@ -72,7 +72,7 @@ if ($member['mb_level'] >= $board['bo_reply_level'])
 // 수정, 삭제 링크
 $update_href = $delete_href = '';
 // 로그인중이고 자신의 글이라면 또는 관리자라면 비밀번호를 묻지 않고 바로 수정, 삭제 가능
-if (($member['mb_id'] && ($member['mb_id'] == $write['mb_id'])) || $is_admin) {
+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;
     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);

bbs/view_comment.php

@@ -39,8 +39,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $list[$i]['content'] = $list[$i]['content1']= '비밀글 입니다.';
     if (!strstr($row['wr_option'], 'secret') ||
         $is_admin ||
-        ($write['mb_id']==$member['mb_id'] && $member['mb_id']) ||
-        ($row['mb_id']==$member['mb_id'] && $member['mb_id'])) {
+        ($write['mb_id']===$member['mb_id'] && $member['mb_id']) ||
+        ($row['mb_id']===$member['mb_id'] && $member['mb_id'])) {
         $list[$i]['content1'] = $row['wr_content'];
         $list[$i]['content'] = conv_content($row['wr_content'], 0, 'wr_content');
         $list[$i]['content'] = search_font($stx, $list[$i]['content']);
@@ -71,7 +71,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
 
         if ($member['mb_id'])
         {
-            if ($row['mb_id'] == $member['mb_id'] || $is_admin)
+            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.'&comment_id='.$row['wr_id'].'&token='.$token.'&page='.$page.$qstr;

bbs/write.php

@@ -56,7 +56,7 @@ if ($w == '') {
 } else if ($w == 'u') {
     // 김선용 1.00 : 글쓰기 권한과 수정은 별도로 처리되어야 함
     //if ($member['mb_level'] < $board['bo_write_level']) {
-    if($member['mb_id'] && $write['mb_id'] == $member['mb_id']) {
+    if($member['mb_id'] && $write['mb_id'] === $member['mb_id']) {
         ;
     } else if ($member['mb_level'] < $board['bo_write_level']) {
         if ($member['mb_id']) {
@@ -116,7 +116,7 @@ if ($w == '') {
     if (strstr($write['wr_option'], 'secret')) {
         if ($write['mb_id']) {
             // 회원의 경우는 해당 글쓴 회원 및 관리자
-            if (!($write['mb_id'] == $member['mb_id'] || $is_admin))
+            if (!($write['mb_id'] === $member['mb_id'] || $is_admin))
                 alert('비밀글에는 자신 또는 관리자만 답변이 가능합니다.');
         } else {
             // 비회원의 경우는 비밀글에 답변이 불가함
@@ -168,7 +168,7 @@ if (!empty($group['gr_use_access'])) {
         alert("접근 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.", 'login.php?'.$qstr.'&amp;url='.urlencode($_SERVER['SCRIPT_NAME'].'?bo_table='.$bo_table));
     }
 
-    if ($is_admin == 'super' || $group['gr_admin'] == $member['mb_id'] || $board['bo_admin'] == $member['mb_id']) {
+    if ($is_admin == 'super' || $group['gr_admin'] === $member['mb_id'] || $board['bo_admin'] === $member['mb_id']) {
         ; // 통과
     } else {
         // 그룹접근
@@ -251,7 +251,7 @@ $is_name     = false;
 $is_password = false;
 $is_email    = false;
 $is_homepage = false;
-if ($is_guest || ($is_admin && $w == 'u' && $member['mb_id'] != $write['mb_id'])) {
+if ($is_guest || ($is_admin && $w == 'u' && $member['mb_id'] !== $write['mb_id'])) {
     $is_name = true;
     $is_password = true;
     $is_email = true;
@@ -308,7 +308,7 @@ if ($w == '') {
     $password_required = '';
 
     if (!$is_admin) {
-        if (!($is_member && $member['mb_id'] == $write['mb_id'])) {
+        if (!($is_member && $member['mb_id'] === $write['mb_id'])) {
             if (!check_password($wr_password, $write['wr_password'])) {
                 alert('비밀번호가 틀립니다.');
             }
@@ -386,7 +386,7 @@ else
 
 $captcha_html = '';
 $captcha_js   = '';
-$is_use_captcha = ((($board['bo_use_captcha'] && $w!=='u') || $is_guest) && !$is_admin) ? 1 : 0;
+$is_use_captcha = ((($board['bo_use_captcha'] && $w !== 'u') || $is_guest) && !$is_admin) ? 1 : 0;
 
 if ($is_use_captcha) {
     $captcha_html = captcha_html();

bbs/write_comment_update.php

@@ -269,7 +269,7 @@ else if ($w == 'cu') // 댓글 수정
         ;
     else if ($is_admin == 'group') { // 그룹관리자
         $mb = get_member($comment['mb_id']);
-        if ($member['mb_id'] == $group['gr_admin']) { // 자신이 관리하는 그룹인가?
+        if ($member['mb_id'] === $group['gr_admin']) { // 자신이 관리하는 그룹인가?
             if ($member['mb_level'] >= $mb['mb_level']) // 자신의 레벨이 크거나 같다면 통과
                 ;
             else
@@ -278,7 +278,7 @@ else if ($w == 'cu') // 댓글 수정
             alert('자신이 관리하는 그룹의 게시판이 아니므로 댓글을 수정할 수 없습니다.');
     } else if ($is_admin == 'board') { // 게시판관리자이면
         $mb = get_member($comment['mb_id']);
-        if ($member['mb_id'] == $board['bo_admin']) { // 자신이 관리하는 게시판인가?
+        if ($member['mb_id'] === $board['bo_admin']) { // 자신이 관리하는 게시판인가?
             if ($member['mb_level'] >= $mb['mb_level']) // 자신의 레벨이 크거나 같다면 통과
                 ;
             else
@@ -286,7 +286,7 @@ else if ($w == 'cu') // 댓글 수정
         } else
             alert('자신이 관리하는 게시판이 아니므로 댓글을 수정할 수 없습니다.');
     } else if ($member['mb_id']) {
-        if ($member['mb_id'] != $comment['mb_id'])
+        if ($member['mb_id'] !== $comment['mb_id'])
             alert('자신의 글이 아니므로 수정할 수 없습니다.');
     } else {
         if($comment['wr_password'] != $wr_password)

bbs/write_update.php

@@ -129,18 +129,23 @@ for ($i=1; $i<=10; $i++) {
 
 if ($w == '' || $w == 'u') {
 
+    // 외부에서 글을 등록할 수 있는 버그가 존재하므로 공지는 관리자만 등록이 가능해야 함
+    if (!$is_admin && $notice) {
+        alert('관리자만 공지할 수 있습니다.');
+    }
+
+    //회원 자신이 쓴글을 수정할 경우 공지가 풀리는 경우가 있음 
+    if($w =='u' && !$is_admin && $board['bo_notice'] && in_array($wr['wr_id'], $notice_array)){
+        $notice = 1;
+    }
+
     // 김선용 1.00 : 글쓰기 권한과 수정은 별도로 처리되어야 함
-    if($w =='u' && $member['mb_id'] && $wr['mb_id'] == $member['mb_id']) {
+    if($w =='u' && $member['mb_id'] && $wr['mb_id'] === $member['mb_id']) {
         ;
     } else if ($member['mb_level'] < $board['bo_write_level']) {
         alert('글을 쓸 권한이 없습니다.');
     }
 
-	// 외부에서 글을 등록할 수 있는 버그가 존재하므로 공지는 관리자만 등록이 가능해야 함
-	if (!$is_admin && $notice) {
-		alert('관리자만 공지할 수 있습니다.');
-    }
-
 } else if ($w == 'r') {
 
     if (in_array((int)$wr_id, $notice_array)) {
@@ -188,7 +193,7 @@ if ($w == '' || $w == 'u') {
     alert('w 값이 제대로 넘어오지 않았습니다.');
 }
 
-$is_use_captcha = ((($board['bo_use_captcha'] && $w!=='u') || $is_guest) && !$is_admin) ? 1 : 0;
+$is_use_captcha = ((($board['bo_use_captcha'] && $w !== 'u') || $is_guest) && !$is_admin) ? 1 : 0;
 
 if ($is_use_captcha && !chk_captcha()) {
     alert('자동등록방지 숫자가 틀렸습니다.');
@@ -328,7 +333,7 @@ if ($w == '' || $w == 'r') {
 
     if ($member['mb_id']) {
         // 자신의 글이라면
-        if ($member['mb_id'] == $wr['mb_id']) {
+        if ($member['mb_id'] === $wr['mb_id']) {
             $mb_id = $member['mb_id'];
             $wr_name = addslashes(clean_xss_tags($board['bo_use_name'] ? $member['mb_name'] : $member['mb_nick']));
             $wr_email = addslashes($member['mb_email']);

common.php

@@ -254,7 +254,7 @@ if (isset($_REQUEST['sfl']))  {
 
 if (isset($_REQUEST['stx']))  { // search text (검색어)
     $stx = get_search_string(trim($_REQUEST['stx']));
-    if ($stx)
+    if ($stx || $stx === '0')
         $qstr .= '&stx=' . urlencode(cut_str($stx, 20, ''));
 } else {
     $stx = '';
@@ -373,20 +373,22 @@ if ($_SESSION['ss_mb_id']) { // 로그인중이라면
         if (strtolower($tmp_mb_id) != strtolower($config['cf_admin'])) {
             $sql = " select mb_password, mb_intercept_date, mb_leave_date, mb_email_certify from {$g5['member_table']} where mb_id = '{$tmp_mb_id}' ";
             $row = sql_fetch($sql);
-            $key = md5($_SERVER['SERVER_ADDR'] . $_SERVER['REMOTE_ADDR'] . $_SERVER['HTTP_USER_AGENT'] . $row['mb_password']);
-            // 쿠키에 저장된 키와 같다면
-            $tmp_key = get_cookie('ck_auto');
-            if ($tmp_key === $key && $tmp_key) {
-                // 차단, 탈퇴가 아니고 메일인증이 사용이면서 인증을 받았다면
-                if ($row['mb_intercept_date'] == '' &&
-                    $row['mb_leave_date'] == '' &&
-                    (!$config['cf_use_email_certify'] || preg_match('/[1-9]/', $row['mb_email_certify'])) ) {
-                    // 세션에 회원아이디를 저장하여 로그인으로 간주
-                    set_session('ss_mb_id', $tmp_mb_id);
+            if($row['mb_password']){
+                $key = md5($_SERVER['SERVER_ADDR'] . $_SERVER['REMOTE_ADDR'] . $_SERVER['HTTP_USER_AGENT'] . $row['mb_password']);
+                // 쿠키에 저장된 키와 같다면
+                $tmp_key = get_cookie('ck_auto');
+                if ($tmp_key === $key && $tmp_key) {
+                    // 차단, 탈퇴가 아니고 메일인증이 사용이면서 인증을 받았다면
+                    if ($row['mb_intercept_date'] == '' &&
+                        $row['mb_leave_date'] == '' &&
+                        (!$config['cf_use_email_certify'] || preg_match('/[1-9]/', $row['mb_email_certify'])) ) {
+                        // 세션에 회원아이디를 저장하여 로그인으로 간주
+                        set_session('ss_mb_id', $tmp_mb_id);
 
-                    // 페이지를 재실행
-                    echo "<script type='text/javascript'> window.location.reload(); </script>";
-                    exit;
+                        // 페이지를 재실행
+                        echo "<script type='text/javascript'> window.location.reload(); </script>";
+                        exit;
+                    }
                 }
             }
             // $row 배열변수 해제

config.php

@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.3.0.2');
+define('G5_GNUBOARD_VER', '5.3.1.3');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);
@@ -152,7 +152,7 @@ define('G5_DIR_PERMISSION',  0755); // 디렉토리 생성시 퍼미션
 define('G5_FILE_PERMISSION', 0644); // 파일 생성시 퍼미션
 
 // 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT']
-define('G5_MOBILE_AGENT',   'phone|samsung|lgtel|mobile|[^A]skt|nokia|blackberry|android|sony');
+define('G5_MOBILE_AGENT',   'phone|samsung|lgtel|mobile|[^A]skt|nokia|blackberry|BB10|android|sony');
 
 // SMTP
 // lib/mailer.lib.php 에서 사용

css/default.css

@@ -43,8 +43,18 @@ border: 1px solid #558ab7 !important;
 }
 .placeholdersjs { color: #aaa !important; }
 
+/* 레이아웃 크기 지정 */
+#hd, #wrapper, #ft{min-width:1200px}
+
+#hd_pop,
+#hd_wrapper,
+#tnb ul,
+#gnb .gnb_wrap,
+#container_wr,
+#ft_wr{width:1200px}
+
 /* 팝업레이어 */
-#hd_pop {z-index:1000;position:relative;margin:0 auto;width:1200px;height:0}
+#hd_pop {z-index:1000;position:relative;margin:0 auto;height:0}
 #hd_pop h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 .hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff;}
 .hd_pops img{max-width:100%}
@@ -56,10 +66,10 @@ border: 1px solid #558ab7 !important;
 .hd_pops_footer .hd_pops_close{background:#393939;position:absolute;top:0;right:0}
 
 /* 상단 레이아웃 */
-#hd {min-width:1000px;border-top:2px solid #253dbe}
+#hd {border-top:2px solid #253dbe}
 #hd_h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 
-#hd_wrapper {position:relative;margin:0 auto;padding:10px 0;height:115px;width:1200px;zoom:1}
+#hd_wrapper {position:relative;margin:0 auto;padding:10px 0;height:115px;zoom:1}
 #hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""}
 
 #logo {float:left;padding:30px 0 0}
@@ -67,14 +77,14 @@ border: 1px solid #558ab7 !important;
 .hd_sch_wr{position:absolute;top:25px;left:50%;width:430px;margin-left:-215px;}
 #hd_sch h3 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #hd_sch{;border:2px solid #556ada;background:#fff;border-radius:5px;overflow:hidden}
-#hd_sch #sch_stx {padding-left:10px;height:40px;width:376px;border:0;;border-right:0;float:left;font-size:1.25em}
+#hd_sch #sch_stx {padding-left:10px;height:40px;width:376px;border:0;border-right:0;float:left;font-size:1.25em}
 #hd_sch #sch_submit {height:40px;border:0;background:#fff;color:#253dbe;width:50px;float:left;cursor:pointer;font-size:18px}
 
 #sbn_side{position:absolute;top:20px;right:0}
 
 #tnb {border-bottom:1px solid #ddd;background:#fff}
 #tnb h3 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#tnb ul {margin:0 auto;width:1200px;zoom:1}
+#tnb ul {margin:0 auto;zoom:1}
 #tnb ul:after {display:block;visibility:hidden;clear:both;content:""}
 #tnb li {float:right;border-left:1px solid #ddd;margin-bottom:-1px;font-size:0.92em}
 #tnb a {display:inline-block;padding:0 10px;color:#646464;line-height:35px}
@@ -108,7 +118,7 @@ border: 1px solid #558ab7 !important;
 /* 메인메뉴 */
 #gnb{position:relative}
 #gnb h2{position:absolute;font-size:0;line-height:0;overflow:hidden}
-#gnb .gnb_wrap{margin:0 auto;width:1200px;position:relative}
+#gnb .gnb_wrap{margin:0 auto;position:relative}
 #gnb #gnb_1dul {font-size:1.083em;padding: 0;background:#253dbe;zoom:1;
 -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.3);
 -moz-box-shadow:  0 1px 3px rgba(0,0,0,0.3);
@@ -139,7 +149,7 @@ transition: all 0.3s ease-out;}
 .gnb_1dli_on .gnb_2da {}
 .gnb_2da:focus, .gnb_2da:hover {color:#fff}
 .gnb_1dli_over .gnb_2dul {display:block;left:0}
-.gnb_1dli_over2 .gnb_2dul {display:block;right:0;background:#fff}
+.gnb_1dli_over2 .gnb_2dul {display:block;right:0}
 .gnb_wrap .gnb_empty {padding:10px 0;width:100%;text-align:center;line-height:2em;color:#fff}
 .gnb_wrap .gnb_empty a{color:#fff;text-decoration:underline}
 .gnb_wrap .gnb_al_ul .gnb_empty, .gnb_wrap .gnb_al_ul .gnb_empty a{color:#555}
@@ -163,12 +173,12 @@ box-shadow: 0 2px 5px rgba(0,0,0,0.2);}
 /* 중간 레이아웃 */
 #wrapper{}
 #container_wr:after {display:block;visibility:hidden;clear:both;content:""}
-#container_wr {z-index:5;margin:0 auto;width:1200px;height:100%;;zoom:1}
-#aside {float:right;width:305px;padding:0;background: #e7ebf3;height: 100%;border: 1px solid #adbfd2;;margin:20px 0 20px 20px}
+#container_wr {z-index:5;margin:0 auto;height:100%;zoom:1}
+#aside {float:right;width:305px;padding:0;background: #e7ebf3;height: 100%;border: 1px solid #adbfd2;margin:20px 0 20px 20px}
 
 #container {z-index:4;position:relative;float:left;min-height:500px;height:auto !important;margin:20px  0;height:500px;font-size:1em;width:875px;zoom:1}
 #container:after {display:block;visibility:hidden;clear:both;content:""}
-#container_title {font-size:1.333em;max-width:1200px;margin:0 auto;font-weight:bold;}
+#container_title {font-size:1.333em;margin:0 auto;font-weight:bold;}
 #container_title span{margin:0 auto 10px;display:block;line-height:30px;}
 /*.latest_wr:after {display:block;visibility:hidden;clear:both;content:""}*/
 .lt_wr{width:49%}
@@ -177,7 +187,7 @@ box-shadow: 0 2px 5px rgba(0,0,0,0.2);}
 /* 하단 레이아웃 */
 #ft {border-top:1px solid #d5d5d5;background:#fff;padding-bottom:30px;margin:0 auto;text-align:center}
 #ft h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#ft_wr {width:1200px;margin:0 auto;position:relative;}
+#ft_wr {margin:0 auto;position:relative;}
 #ft_link{padding:15px 0;border-bottom:1px solid #eee}
 #ft_link a{;display:inline-block;padding:0 8px;line-height:1.083em;font-weight:bold}
 #ft_catch{margin:20px 0 10px}
@@ -206,8 +216,8 @@ box-shadow: 0 2px 5px rgba(0,0,0,0.2);}
 /* 캡챠 자동등록(입력)방지 기본 -pc */
 #captcha {display:inline-block;position:relative}
 #captcha legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden;}
-#captcha #captcha_img {;height:40px;border:1px solid #898989;;vertical-align:top;padding:0;margin:0}
-#captcha #captcha_mp3 {;margin:0;padding:0;width:40px;height:40px;border:0;background:transparent;vertical-align:middle;overflow:hidden;cursor:pointer;background:url('../img/captcha2.png') no-repeat;text-indent:-999px;;border-radius:3px}
+#captcha #captcha_img {;height:40px;border:1px solid #898989;vertical-align:top;padding:0;margin:0}
+#captcha #captcha_mp3 {;margin:0;padding:0;width:40px;height:40px;border:0;background:transparent;vertical-align:middle;overflow:hidden;cursor:pointer;background:url('../img/captcha2.png') no-repeat;text-indent:-999px;border-radius:3px}
 #captcha #captcha_reload {margin:0;padding:0;width:40px;height:40px;border:0;background:transparent;vertical-align:middle;overflow:hidden;cursor:pointer;background:url('../img/captcha2.png') no-repeat  0 -40px;text-indent:-999px;border-radius:3px}
 #captcha #captcha_key {margin:0 0 0 3px;padding:0 5px;width:90px;height:40px;border:1px solid #ccc;background:#fff;font-size:1.333em;font-weight:bold;text-align:center;border-radius:3px;vertical-align:top}
 #captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em}
@@ -247,7 +257,7 @@ button.btn02 {display:inline-block;margin:0;padding:7px;border:1px solid #3b3c3f
 
 .btn_confirm {text-align:right} /* 서식단계 진행 */
 
-.btn_submit {border:0;background:#253dbe;color:#fff;;cursor:pointer;border:0}
+.btn_submit {border:0;background:#253dbe;color:#fff;cursor:pointer;border:0}
 .btn_submit:hover {background:#0025eb}
 
 a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle;}
@@ -286,7 +296,7 @@ a.btn_admin,.btn_admin {display:inline-block;background:#d13f4a;color:#fff;text-
 .tbl_head01 thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
 .tbl_head01 tfoot th, .tbl_head01 tfoot td {padding:10px 0;border-top:1px solid #c1d1d5;border-bottom:1px solid #c1d1d5;background:#d7e0e2;text-align:center}
 .tbl_head01 tbody th {padding:8px 0;border-bottom:1px solid #e8e8e8}
-.tbl_head01 td {color:#666;background:#fff;;padding:10px 5px;border-top:1px solid #ecf0f1;line-height:1.4em;height:60px;word-break:break-all}
+.tbl_head01 td {color:#666;background:#fff;padding:10px 5px;border-top:1px solid #ecf0f1;line-height:1.4em;height:60px;word-break:break-all}
 .tbl_head01 tbody tr:hover td{background:#fafafa;}
 .tbl_head01 a:hover {text-decoration:underline}
 
@@ -315,7 +325,7 @@ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
 
 .full_input{width:100%}
 .half_input{width:49.5%}
-.tbl_frm01 textarea {width:100%;height:100px}
+.tbl_frm01 textarea, .write_div textarea {width:100%;height:100px}
 .tbl_frm01 a {text-decoration:none}
 .tbl_frm01 .frm_file {display:block;margin-bottom:5px}
 .tbl_frm01 .frm_info {display:block;padding:0 0 5px;line-height:1.4em}
@@ -410,7 +420,7 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 .pg_page, .pg_current {display:inline-block;vertical-align:middle;background:#f3f3f3;border:1px solid #bbbcc3}
 .pg a:focus, .pg a:hover {text-decoration:none}
 .pg_page {color:#555;font-size:1.083em;height:30px;line-height:28px;padding:0 5px;min-width:30px;text-decoration:none;border-radius:3px;}
-.pg_page:hover{background:#ddd}
+.pg_page:hover{background-color:#ddd}
 .pg_start {text-indent:-999px;overflow:hidden;background:url('../img/btn_first.gif') no-repeat 50% 50% #fff;padding:0;border:1px solid #bbb;}
 .pg_prev {text-indent:-999px;overflow:hidden;background:url('../img/btn_prev.gif') no-repeat 50% 50% #fff;padding:0;border:1px solid #bbb}
 .pg_end {text-indent:-999px;overflow:hidden;background:url('../img/btn_end.gif') no-repeat 50% 50% #fff;padding:0;border:1px solid #bbb}

extend/social_login.extend.php

@@ -39,7 +39,10 @@ define('G5_SOCIAL_USE_POPUP', ! is_mobile() );  // 모바일에서는 팝업사
 define('G5_SOCIAL_DELETE_DAY', 0);
 
 // 메일 인증관련, false 이면 메일인증을 받지 않고 로그인됩니다. true 이고 기본환경설정에서 메일인증설정이 활성화 되어 있는 경우 메일인증을 받아야만 로그인 됩니다.
-define('G5_SOCIAL_CERTIFY_MAIL', false );
+define('G5_SOCIAL_CERTIFY_MAIL', false);
+
+// 소셜 DEBUG 관련 설정, 기본값은 false, true 로 설정시 data/tmp/social_anystring.log 파일이 생성됩니다.
+define('G5_SOCIAL_IS_DEBUG', false);
 
 include_once(G5_SOCIAL_LOGIN_PATH.'/includes/functions.php');
 ?>

extend/user.config.php

@@ -1,11 +1,3 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
-// 유저 사이드뷰에서 아이콘 지정 안했을시 기본 no 프로필 이미지
-define('G5_NO_PROFILE_IMG', '<span class="profile_img"><img src="'.G5_IMG_URL.'/no_profile.gif" alt="no_profile" width="20" height="20"></span>');
-
-/**
-* 이 아래에 사용자 코드를 적용해 주세요.
-*/
-
 ?>

g4_import.php

@@ -11,6 +11,8 @@ if(get_session('tables_copied') == 'done')
 
 if($is_admin != 'super')
     alert('최고관리자로 로그인 후 실행해 주십시오.', G5_URL);
+
+include_once(G5_PATH.'/head.php');
 ?>
 
 <style>
@@ -20,162 +22,41 @@ if($is_admin != 'super')
 #g4_import_frm .btn_submit {padding:0 10px;height:24px}
 </style>
 
-<!-- 상단 시작 { -->
-<div id="hd">
-    <h1 id="hd_h1"><?php echo $g5['title'] ?></h1>
+<div id="g4_import">
+    <p>
+        이 프로그램은 그누보드5 설치 후 바로 실행하셔야만 합니다.<br>
+        만약 그누보드5 사이트를 운영 중에 이 프로그램을 실행하시면 DB 데이터가 망실되거나 데이터의 오류가 발생할 수 있습니다.<br>
+        또한 중복해서 실행하실 경우에도 DB 데이터의 오류가 발생할 수 있으니 반드시 한번만 실행해 주십시오.
+    </p>
+    <p>프로그램을 실행하시려면 그누보드4의 config.php 파일 경로를 입력하신 후 확인을 클릭해 주십시오.</p>
 
-    <div id="skip_to_container"><a href="#container">본문 바로가기</a></div>
-
-    <div id="hd_wrapper">
-
-        <div id="logo">
-            <a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="<?php echo $config['cf_title']; ?>"></a>
-        </div>
-
-        <fieldset id="hd_sch">
-            <legend>사이트 내 전체검색</legend>
-            <form name="fsearchbox" method="get" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);">
-            <input type="hidden" name="sfl" value="wr_subject||wr_content">
-            <input type="hidden" name="sop" value="and">
-            <label for="sch_stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-            <input type="text" name="stx" id="sch_stx" maxlength="20">
-            <input type="submit" id="sch_submit" value="검색">
-            </form>
-
-            <script>
-            function fsearchbox_submit(f)
-            {
-                if (f.stx.value.length < 2) {
-                    alert("검색어는 두글자 이상 입력하십시오.");
-                    f.stx.select();
-                    f.stx.focus();
-                    return false;
-                }
-
-                // 검색에 많은 부하가 걸리는 경우 이 주석을 제거하세요.
-                var cnt = 0;
-                for (var i=0; i<f.stx.value.length; i++) {
-                    if (f.stx.value.charAt(i) == ' ')
-                        cnt++;
-                }
-
-                if (cnt > 1) {
-                    alert("빠른 검색을 위하여 검색어에 공백은 한개만 입력할 수 있습니다.");
-                    f.stx.select();
-                    f.stx.focus();
-                    return false;
-                }
-
-                return true;
-            }
-            </script>
-        </fieldset>
-
-        <ul id="tnb">
-            <?php if ($is_member) {  ?>
-            <?php if ($is_admin) {  ?>
-            <li><a href="<?php echo G5_ADMIN_URL ?>"><b>관리자</b></a></li>
-            <?php }  ?>
-            <li><a href="<?php echo G5_BBS_URL ?>/member_confirm.php?url=<?php echo G5_BBS_URL ?>/register_form.php">정보수정</a></li>
-            <li><a href="<?php echo G5_BBS_URL ?>/logout.php">로그아웃</a></li>
-            <?php } else {  ?>
-            <li><a href="<?php echo G5_BBS_URL ?>/register.php">회원가입</a></li>
-            <li><a href="<?php echo G5_BBS_URL ?>/login.php"><b>로그인</b></a></li>
-            <?php }  ?>
-            <li><a href="<?php echo G5_BBS_URL ?>/qalist.php">1:1문의</a></li>
-            <li><a href="<?php echo G5_BBS_URL ?>/current_connect.php">접속자 <?php echo connect(); // 현재 접속자수  ?></a></li>
-            <li><a href="<?php echo G5_BBS_URL ?>/new.php">새글</a></li>
-        </ul>
-
-        <div id="text_size">
-            <!-- font_resize('엘리먼트id', '제거할 class', '추가할 class'); -->
-            <button id="size_down" onclick="font_resize('container', 'ts_up ts_up2', '');"><img src="<?php echo G5_URL; ?>/img/ts01.gif" alt="기본"></button>
-            <button id="size_def" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up');"><img src="<?php echo G5_URL; ?>/img/ts02.gif" alt="크게"></button>
-            <button id="size_up" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up2');"><img src="<?php echo G5_URL; ?>/img/ts03.gif" alt="더크게"></button>
-        </div>
+    <form name="fimport" method="post" action="./g4_import_run.php" onsubmit="return fimport_submit(this);">
+    <input type="hidden" name="token" value="" >
+    <div id="g4_import_frm">
+        <label for="file_path">config.php 파일 경로</label>
+        <input type="text" name="file_path" id="file_path" required class="frm_input required">
+        <input type="submit" value="확인" class="btn_submit">
     </div>
+    </form>
 
-    <hr>
+    <p>
+        경로는 그누보드5 설치 루트를 기준으로 그누보드4의 config.php 파일의 상대경로입니다.<br>
+        예를 들어 그누보드4를 웹루트에 설치하셨고 그누보드5를 g5라는 하위 폴더에 설치하셨다면 입력하실 경로는 ../config.php 입니다.
+    </p>
 
-    <nav id="gnb">
-        <h2>메인메뉴</h2>
-        <ul id="gnb_1dul">
-            <li class="gnb_empty">메뉴는 표시하지 않습니다.</li>
-        </ul>
-    </nav>
-</div>
-<!-- } 상단 끝 -->
-
-<hr>
-
-<!-- 콘텐츠 시작 { -->
-<div id="wrapper">
-    <div id="aside">
-        <?php echo outlogin('basic'); // 외부 로그인  ?>
-    </div>
-    <div id="container">
-        <?php if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) { ?><div id="container_title"><?php echo $g5['title'] ?></div><?php } ?>
-
-        <div id="g4_import">
-            <p>
-                이 프로그램은 그누보드5 설치 후 바로 실행하셔야만 합니다.<br>
-                만약 그누보드5 사이트를 운영 중에 이 프로그램을 실행하시면 DB 데이터가 망실되거나 데이터의 오류가 발생할 수 있습니다.<br>
-                또한 중복해서 실행하실 경우에도 DB 데이터의 오류가 발생할 수 있으니 반드시 한번만 실행해 주십시오.
-            </p>
-            <p>프로그램을 실행하시려면 그누보드4의 config.php 파일 경로를 입력하신 후 확인을 클릭해 주십시오.</p>
-
-            <form name="fimport" method="post" action="./g4_import_run.php" onsubmit="return fimport_submit(this);">
-            <input type="hidden" name="token" value="" >
-            <div id="g4_import_frm">
-                <label for="file_path">config.php 파일 경로</label>
-                <input type="text" name="file_path" id="file_path" required class="frm_input required">
-                <input type="submit" value="확인" class="btn_submit">
-            </div>
-            </form>
-
-            <p>
-                경로는 그누보드5 설치 루트를 기준으로 그누보드4의 config.php 파일의 상대경로입니다.<br>
-                예를 들어 그누보드4를 웹루트에 설치하셨고 그누보드5를 g5라는 하위 폴더에 설치하셨다면 입력하실 경로는 ../config.php 입니다.
-            </p>
-
-        </div>
-
-        <script>
-        function fimport_submit(f)
-        {
-            var token = get_write_token('g4_import');
-            
-            f.token.value = token;
-
-            return confirm('그누보드4의 DB 데이터를 이전하시겠습니까?');
-        }
-        </script>
-
-    </div>
-</div>
-
-<!-- } 콘텐츠 끝 -->
-
-<hr>
-
-<!-- 하단 시작 { -->
-<div id="ft">
-    <div id="ft_catch"><img src="<?php echo G5_IMG_URL; ?>/ft.png" alt="<?php echo G5_VERSION ?>"></div>
-    <div id="ft_copy">
-        <p>
-            Copyright &copy; <b>소유하신 도메인.</b> All rights reserved.<br>
-            <a href="#">상단으로</a>
-        </p>
-    </div>
 </div>
 
 <script>
-$(function() {
-    // 폰트 리사이즈 쿠키있으면 실행
-    font_resize("container", get_cookie("ck_font_resize_rmv_class"), get_cookie("ck_font_resize_add_class"));
-});
+function fimport_submit(f)
+{
+    var token = get_write_token('g4_import');
+    
+    f.token.value = token;
+
+    return confirm('그누보드4의 DB 데이터를 이전하시겠습니까?');
+}
 </script>
 
 <?php
-include_once(G5_PATH.'/'.G5_THEME_DIR.'/basic/tail.sub.php');
+include_once(G5_PATH.'/tail.php');
 ?>

g4_import_run.php

@@ -3,17 +3,9 @@ include_once('./_common.php');
 
 ob_end_clean();
 
-include_once(G5_LIB_PATH.'/connect.lib.php');
-include_once(G5_LIB_PATH.'/outlogin.lib.php');
-
 set_time_limit ( 0 );
 ini_set('memory_limit', '50M');
 
-$g5['title'] = '그누보드4 DB 데이터 이전';
-include_once(G5_PATH.'/'.G5_THEME_DIR.'/basic/head.sub.php');
-
-echo '<link rel="stylesheet" href="'.G5_URL.'/g4_import.css">';
-
 if(empty($_POST))
     alert('올바른 방법으로 이용해 주십시오.', G5_URL);
 
@@ -41,6 +33,9 @@ if(!is_file($g4_config_file))
     alert('입력하신 경로에 config.php 파일이 존재하지 않습니다.');
 
 $is_euckr = false;
+
+$g5['title'] = '그누보드4 DB 데이터 이전';
+include_once(G5_PATH.'/head.php');
 ?>
 <script>
 // 새로고침 방지
@@ -68,495 +63,375 @@ document.onkeydown = noRefresh ;
 #g4_import_run ol {margin: 0;padding: 0 0 0 25px;border: 1px solid #E9E9E9;border-bottom: 0;background: #f5f8f9;list-style:none;zoom:1}
 #g4_import_run li {padding:7px 10px;border-bottom:1px solid #e9e9e9}
 #g4_import_run #run_msg {padding:30px 0;text-align:center}
+#container_wr #aside{display:none}
 </style>
 
-<!-- 상단 시작 { -->
-<div id="hd">
-    <h1 id="hd_h1"><?php echo $g5['title'] ?></h1>
+<div id="g4_import_run">
+    <ol>
+<?php
+flush();
 
-    <div id="skip_to_container"><a href="#container">본문 바로가기</a></div>
+// g4의 confing.php
+require('./'.$g4_config_file);
 
-    <div id="hd_wrapper">
+if(preg_replace('/[^a-z]/', '', strtolower($g4['charset'])) == 'euckr')
+    $is_euckr = true;
 
-        <div id="logo">
-            <a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="<?php echo $config['cf_title']; ?>"></a>
-        </div>
+// member table 복사
+$columns = sql_field_names($g5['member_table']);
 
-        <fieldset id="hd_sch">
-            <legend>사이트 내 전체검색</legend>
-            <form name="fsearchbox" method="get" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);">
-            <input type="hidden" name="sfl" value="wr_subject||wr_content">
-            <input type="hidden" name="sop" value="and">
-            <label for="sch_stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-            <input type="text" name="stx" id="sch_stx" maxlength="20">
-            <input type="submit" id="sch_submit" value="검색">
-            </form>
+$sql = " select * from {$g4['member_table']} ";
+$result = sql_query($sql);
+for($i=0; $row=sql_fetch_array($result); $i++) {
+    if($is_euckr)
+        $row = array_map('iconv_utf8', $row);
 
-            <script>
-            function fsearchbox_submit(f)
-            {
-                if (f.stx.value.length < 2) {
-                    alert("검색어는 두글자 이상 입력하십시오.");
-                    f.stx.select();
-                    f.stx.focus();
-                    return false;
-                }
+    // 중복체크
+    $sql2 = " select count(*) as cnt from {$g5['member_table']} where mb_id = '{$row['mb_id']}' ";
+    $row2 = sql_fetch($sql2);
+    if($row2['cnt'])
+        continue;
 
-                // 검색에 많은 부하가 걸리는 경우 이 주석을 제거하세요.
-                var cnt = 0;
-                for (var i=0; i<f.stx.value.length; i++) {
-                    if (f.stx.value.charAt(i) == ' ')
-                        cnt++;
-                }
+    $comma = '';
+    $sql_common = '';
 
-                if (cnt > 1) {
-                    alert("빠른 검색을 위하여 검색어에 공백은 한개만 입력할 수 있습니다.");
-                    f.stx.select();
-                    f.stx.focus();
-                    return false;
-                }
+    foreach($row as $key=>$val) {
+        if($key == 'mb_no')
+            continue;
 
-                return true;
+        if(!in_array($key, $columns))
+            continue;
+
+        $sql_common .= $comma . " $key = '".addslashes($val)."' ";
+
+        $comma = ',';
+    }
+
+    sql_query(" INSERT INTO {$g5['member_table']} SET $sql_common ");
+}
+
+echo '<li>member table 복사</li>'.PHP_EOL;
+unset($columns);
+unset($fiels);
+
+// point table 복사
+$sql = " select * from {$g4['point_table']} ";
+$result = sql_query($sql);
+for($i=0; $row=sql_fetch_array($result); $i++) {
+    if($is_euckr)
+        $row = array_map('iconv_utf8', $row);
+
+    $comma = '';
+    $sql_common = '';
+
+    foreach($row as $key=>$val) {
+        if($key == 'po_id')
+            continue;
+
+        $sql_common .= $comma . " $key = '".addslashes($val)."' ";
+
+        $comma = ',';
+    }
+
+    sql_query(" INSERT INTO {$g5['point_table']} SET $sql_common ");
+}
+echo '<li>point table 복사</li>'.PHP_EOL;
+
+// login table 복사
+$sql = " select * from {$g4['login_table']} ";
+$result = sql_query($sql);
+for($i=0; $row=sql_fetch_array($result); $i++) {
+    if($is_euckr)
+        $row = array_map('iconv_utf8', $row);
+
+    // 중복체크
+    $sql2 = " select count(*) as cnt from {$g5['login_table']} where lo_ip = '{$row['lo_ip']}' ";
+    $row2 = sql_fetch($sql2);
+    if($row2['cnt'])
+        continue;
+
+    $comma = '';
+    $sql_common = '';
+
+    foreach($row as $key=>$val) {
+        $sql_common .= $comma . " $key = '".addslashes($val)."' ";
+
+        $comma = ',';
+    }
+
+    sql_query(" INSERT INTO {$g5['login_table']} SET $sql_common ");
+}
+echo '<li>login table 복사</li>'.PHP_EOL;
+
+// visit table 복사
+$sql = " select * from {$g4['visit_table']} ";
+$result = sql_query($sql);
+
+// g5_visit 테이블 초기화
+sql_query(" delete from {$g5['visit_table']} ");
+
+for($i=0; $row=sql_fetch_array($result); $i++) {
+    if($is_euckr)
+        $row = array_map('iconv_utf8', $row);
+
+    // 중복체크
+    /*
+    $sql2 = " select count(*) as cnt from {$g5['visit_table']} where vi_ip = '{$row['vi_ip']}' and vi_date = '{$row['vi_date']}' ";
+    $row2 = sql_fetch($sql2);
+    if($row2['cnt'])
+        continue;
+    */
+
+    $comma = '';
+    $sql_common = '';
+
+    foreach($row as $key=>$val) {
+        $sql_common .= $comma . " $key = '".addslashes($val)."' ";
+
+        $comma = ',';
+    }
+
+    sql_query(" INSERT INTO {$g5['visit_table']} SET $sql_common ");
+}
+echo '<li>visit table 복사</li>'.PHP_EOL;
+
+// visit sum table 복사
+$sql = " select * from {$g4['visit_sum_table']} ";
+$result = sql_query($sql);
+
+// g5_visit_sub 테이블 초기화
+sql_query(" delete from {$g5['visit_sum_table']} ");
+
+for($i=0; $row=sql_fetch_array($result); $i++) {
+    if($is_euckr)
+        $row = array_map('iconv_utf8', $row);
+
+    // 중복체크
+    /*
+    $sql2 = " select count(*) as cnt from {$g5['visit_sum_table']} where vs_date = '{$row['vs_date']}' ";
+    $row2 = sql_fetch($sql2);
+    if($row2['cnt'])
+        continue;
+    */
+
+    $comma = '';
+    $sql_common = '';
+
+    foreach($row as $key=>$val) {
+        $sql_common .= $comma . " $key = '".addslashes($val)."' ";
+
+        $comma = ',';
+    }
+
+    sql_query(" INSERT INTO {$g5['visit_sum_table']} SET $sql_common ");
+}
+echo '<li>visit sum table 복사</li>'.PHP_EOL;
+
+// group table 복사
+$columns = sql_field_names($g5['group_table']);
+
+$sql = " select * from {$g4['group_table']} ";
+$result = sql_query($sql);
+for($i=0; $row=sql_fetch_array($result); $i++) {
+    if($is_euckr)
+        $row = array_map('iconv_utf8', $row);
+
+    // 중복체크
+    $sql2 = " select count(*) as cnt from {$g5['group_table']} where gr_id = '{$row['gr_id']}' ";
+    $row2 = sql_fetch($sql2);
+    if($row2['cnt'])
+        continue;
+
+    $comma = '';
+    $sql_common = '';
+
+    foreach($row as $key=>$val) {
+        if(!in_array($key, $columns))
+            continue;
+
+        $sql_common .= $comma . " $key = '".addslashes($val)."' ";
+
+        $comma = ',';
+    }
+
+    sql_query(" INSERT INTO {$g5['group_table']} SET $sql_common ");
+}
+
+echo '<li>group table 복사</li>'.PHP_EOL;
+unset($columns);
+unset($fiels);
+
+// board 복사
+$columns = sql_field_names($g5['board_table']);
+
+$sql = " select * from {$g4['board_table']} ";
+$result = sql_query($sql);
+for($i=0; $row=sql_fetch_array($result); $i++) {
+    if($is_euckr)
+        $row = array_map('iconv_utf8', $row);
+
+    // 중복체크
+    $sql2 = " select count(*) as cnt from {$g5['board_table']} where bo_table = '{$row['bo_table']}' ";
+    $row2 = sql_fetch($sql2);
+    if($row2['cnt'])
+        continue;
+
+    $comma = '';
+    $sql_common = '';
+
+    // 모바일 스킨 디렉토리
+    if( ! isset($row['bo_mobile_skin']) ){
+        $row['bo_mobile_skin'] = 'basic';
+    }
+
+    // 모바일 제목 길이
+    if( ! isset($row['bo_mobile_subject_len']) ){
+        $row['bo_mobile_subject_len'] = '30';
+    }
+    
+    // 모바일 페이지당 목록 수
+    if( ! isset($row['bo_mobile_page_rows']) ){
+        $row['bo_mobile_page_rows'] = '15';
+    }
+
+    // 갤러리 이미지 폭 ( 리스트 )
+    if( ! isset($row['bo_gallery_width']) ){
+        $row['bo_gallery_width'] = '174';
+    }
+
+    // 갤러리 이미지 높이 ( 리스트 )
+    if( ! isset($row['bo_gallery_height']) ){
+        $row['bo_gallery_height'] = '124';
+    }
+
+    // 모바일 갤러리 이미지 폭 ( 리스트 )
+    if( ! isset($row['bo_mobile_gallery_width']) ){
+        $row['bo_mobile_gallery_width'] = '125';
+    }
+
+    // 모바일 갤러리 이미지 높이 ( 리스트 )
+    if( ! isset($row['bo_mobile_gallery_height']) ){
+        $row['bo_mobile_gallery_height'] = '100';
+    }
+
+    foreach($row as $key=>$val) {
+        if(!in_array($key, $columns))
+            continue;
+        
+        if($key === 'bo_notice'){
+            $val = str_replace("\n", ",", $val);
+
+            if( substr($val, -1)  === ',' ){
+                $val = substr($val, 0, -1);
             }
-            </script>
-        </fieldset>
+        }
 
-        <ul id="tnb">
-            <?php if ($is_member) {  ?>
-            <?php if ($is_admin) {  ?>
-            <li><a href="<?php echo G5_ADMIN_URL ?>"><b>관리자</b></a></li>
-            <?php }  ?>
-            <li><a href="<?php echo G5_BBS_URL ?>/member_confirm.php?url=<?php echo G5_BBS_URL ?>/register_form.php">정보수정</a></li>
-            <li><a href="<?php echo G5_BBS_URL ?>/logout.php">로그아웃</a></li>
-            <?php } else {  ?>
-            <li><a href="<?php echo G5_BBS_URL ?>/register.php">회원가입</a></li>
-            <li><a href="<?php echo G5_BBS_URL ?>/login.php"><b>로그인</b></a></li>
-            <?php }  ?>
-            <li><a href="<?php echo G5_BBS_URL ?>/qalist.php">1:1문의</a></li>
-            <li><a href="<?php echo G5_BBS_URL ?>/current_connect.php">접속자 <?php echo connect(); // 현재 접속자수  ?></a></li>
-            <li><a href="<?php echo G5_BBS_URL ?>/new.php">새글</a></li>
-        </ul>
+        $sql_common .= $comma . " $key = '".addslashes($val)."' ";
 
-        <div id="text_size">
-            <!-- font_resize('엘리먼트id', '제거할 class', '추가할 class'); -->
-            <button id="size_down" onclick="font_resize('container', 'ts_up ts_up2', '');"><img src="<?php echo G5_URL; ?>/img/ts01.gif" alt="기본"></button>
-            <button id="size_def" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up');"><img src="<?php echo G5_URL; ?>/img/ts02.gif" alt="크게"></button>
-            <button id="size_up" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up2');"><img src="<?php echo G5_URL; ?>/img/ts03.gif" alt="더크게"></button>
-        </div>
-    </div>
+        $comma = ',';
+    }
 
-    <hr>
+    sql_query(" INSERT INTO {$g5['board_table']} SET $sql_common ");
 
-    <nav id="gnb">
-        <h2>메인메뉴</h2>
-        <ul id="gnb_1dul">
-            <li class="gnb_empty">메뉴는 표시하지 않습니다.</li>
-        </ul>
-    </nav>
+    // 게시판 테이블 생성
+    $bo_table = $row['bo_table'];
+    $file = file(G5_ADMIN_PATH.'/sql_write.sql');
+    $sql = implode($file, "\n");
+
+    $create_table = $g5['write_prefix'] . $bo_table;
+
+    $source = array('/__TABLE_NAME__/', '/;/');
+    $target = array($create_table, '');
+    $sql = preg_replace($source, $target, $sql);
+
+    // 게시글 복사
+    if(sql_query($sql, FALSE)) {
+        $write_table = $g4['write_prefix'].$bo_table;
+        $columns2 = sql_field_names($create_table);
+
+        $sql3 = " select * from $write_table ";
+        $result3 = sql_query($sql3);
+
+        for($k=0; $row3=sql_fetch_array($result3); $k++) {
+            if($is_euckr)
+                $row3 = array_map('iconv_utf8', $row3);
+
+            $comma3 = '';
+            $sql_common3 = '';
+
+            foreach($row3 as $key=>$val) {
+                if(!in_array($key, $columns2))
+                    continue;
+
+                $sql_common3 .= $comma3 . " $key = '".addslashes($val)."' ";
+
+                $comma3 = ',';
+            }
+
+            // 첨부파일개수
+            $wr_id = $row3['wr_id'];
+            $sql4 = " select count(*) as cnt from {$g4['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' ";
+            $row4 = sql_fetch($sql4);
+
+            $sql_common3 .= " , wr_file = '{$row4['cnt']}' ";
+
+            sql_query(" INSERT INTO $create_table SET $sql_common3 ");
+        }
+
+        echo '<li>'.str_replace(G5_TABLE_PREFIX.'write_', '', $create_table).' 게시글 복사</li>';
+    }
+}
+
+unset($columns);
+unset($fiels);
+
+// 그외 테이블 복사
+$tables = array('board_file', 'board_new', 'board_good', 'mail', 'memo', 'group_member', 'auth', 'popular', 'poll', 'poll_etc', 'scrap');
+
+foreach($tables as $table) {
+    $columns = sql_field_names($g5[$table.'_table']);
+
+    $src_table = $g4[$table.'_table'];
+    $dst_table = $g5[$table.'_table'];
+    $sql = " select * from $src_table ";
+    $result = sql_query($sql);
+    for($i=0; $row=sql_fetch_array($result); $i++) {
+        if($is_euckr)
+            $row = array_map('iconv_utf8', $row);
+
+        $comma = '';
+        $sql_common = '';
+
+        foreach($row as $key=>$val) {
+            if(!in_array($key, $columns))
+                continue;
+
+            $sql_common .= $comma . " $key = '".addslashes($val)."' ";
+
+            $comma = ',';
+        }
+
+        $result2 = sql_query(" INSERT INTO $dst_table SET $sql_common ", false);
+
+        if(!$result2)
+            continue;
+    }
+
+    echo '<li>'.$table.' table 복사</li>'.PHP_EOL;
+}
+
+unset($columns);
+unset($fiels);
+
+echo '</ol>'.PHP_EOL;
+
+echo '<div id="run_msg">그누보드4 DB 데이터 이전 완료</div>'.PHP_EOL;
+
+// 실행완료 세션에 기록
+set_session('tables_copied', 'done');
+?>
 </div>
-<!-- } 상단 끝 -->
-
-<hr>
-
-<!-- 콘텐츠 시작 { -->
-<div id="wrapper">
-    <div id="aside">
-        <?php echo outlogin('basic'); // 외부 로그인  ?>
-    </div>
-    <div id="container">
-        <?php if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) { ?><div id="container_title"><?php echo $g5['title'] ?></div><?php } ?>
-
-        <div id="g4_import_run">
-            <ol>
-        <?php
-        flush();
-
-        // g4의 confing.php
-        require('./'.$g4_config_file);
-
-        if(preg_replace('/[^a-z]/', '', strtolower($g4['charset'])) == 'euckr')
-            $is_euckr = true;
-
-        // member table 복사
-        $columns = sql_field_names($g5['member_table']);
-
-        $sql = " select * from {$g4['member_table']} ";
-        $result = sql_query($sql);
-        for($i=0; $row=sql_fetch_array($result); $i++) {
-            if($is_euckr)
-                $row = array_map('iconv_utf8', $row);
-
-            // 중복체크
-            $sql2 = " select count(*) as cnt from {$g5['member_table']} where mb_id = '{$row['mb_id']}' ";
-            $row2 = sql_fetch($sql2);
-            if($row2['cnt'])
-                continue;
-
-            $comma = '';
-            $sql_common = '';
-
-            foreach($row as $key=>$val) {
-                if($key == 'mb_no')
-                    continue;
-
-                if(!in_array($key, $columns))
-                    continue;
-
-                $sql_common .= $comma . " $key = '".addslashes($val)."' ";
-
-                $comma = ',';
-            }
-
-            sql_query(" INSERT INTO {$g5['member_table']} SET $sql_common ");
-        }
-
-        echo '<li>member table 복사</li>'.PHP_EOL;
-        unset($columns);
-        unset($fiels);
-
-        // point table 복사
-        $sql = " select * from {$g4['point_table']} ";
-        $result = sql_query($sql);
-        for($i=0; $row=sql_fetch_array($result); $i++) {
-            if($is_euckr)
-                $row = array_map('iconv_utf8', $row);
-
-            $comma = '';
-            $sql_common = '';
-
-            foreach($row as $key=>$val) {
-                if($key == 'po_id')
-                    continue;
-
-                $sql_common .= $comma . " $key = '".addslashes($val)."' ";
-
-                $comma = ',';
-            }
-
-            sql_query(" INSERT INTO {$g5['point_table']} SET $sql_common ");
-        }
-        echo '<li>point table 복사</li>'.PHP_EOL;
-
-        // login table 복사
-        $sql = " select * from {$g4['login_table']} ";
-        $result = sql_query($sql);
-        for($i=0; $row=sql_fetch_array($result); $i++) {
-            if($is_euckr)
-                $row = array_map('iconv_utf8', $row);
-
-            // 중복체크
-            $sql2 = " select count(*) as cnt from {$g5['login_table']} where lo_ip = '{$row['lo_ip']}' ";
-            $row2 = sql_fetch($sql2);
-            if($row2['cnt'])
-                continue;
-
-            $comma = '';
-            $sql_common = '';
-
-            foreach($row as $key=>$val) {
-                $sql_common .= $comma . " $key = '".addslashes($val)."' ";
-
-                $comma = ',';
-            }
-
-            sql_query(" INSERT INTO {$g5['login_table']} SET $sql_common ");
-        }
-        echo '<li>login table 복사</li>'.PHP_EOL;
-
-        // visit table 복사
-        $sql = " select * from {$g4['visit_table']} ";
-        $result = sql_query($sql);
-
-        // g5_visit 테이블 초기화
-        sql_query(" delete from {$g5['visit_table']} ");
-
-        for($i=0; $row=sql_fetch_array($result); $i++) {
-            if($is_euckr)
-                $row = array_map('iconv_utf8', $row);
-
-            // 중복체크
-            /*
-            $sql2 = " select count(*) as cnt from {$g5['visit_table']} where vi_ip = '{$row['vi_ip']}' and vi_date = '{$row['vi_date']}' ";
-            $row2 = sql_fetch($sql2);
-            if($row2['cnt'])
-                continue;
-            */
-
-            $comma = '';
-            $sql_common = '';
-
-            foreach($row as $key=>$val) {
-                $sql_common .= $comma . " $key = '".addslashes($val)."' ";
-
-                $comma = ',';
-            }
-
-            sql_query(" INSERT INTO {$g5['visit_table']} SET $sql_common ");
-        }
-        echo '<li>visit table 복사</li>'.PHP_EOL;
-
-        // visit sum table 복사
-        $sql = " select * from {$g4['visit_sum_table']} ";
-        $result = sql_query($sql);
-
-        // g5_visit_sub 테이블 초기화
-        sql_query(" delete from {$g5['visit_sum_table']} ");
-
-        for($i=0; $row=sql_fetch_array($result); $i++) {
-            if($is_euckr)
-                $row = array_map('iconv_utf8', $row);
-
-            // 중복체크
-            /*
-            $sql2 = " select count(*) as cnt from {$g5['visit_sum_table']} where vs_date = '{$row['vs_date']}' ";
-            $row2 = sql_fetch($sql2);
-            if($row2['cnt'])
-                continue;
-            */
-
-            $comma = '';
-            $sql_common = '';
-
-            foreach($row as $key=>$val) {
-                $sql_common .= $comma . " $key = '".addslashes($val)."' ";
-
-                $comma = ',';
-            }
-
-            sql_query(" INSERT INTO {$g5['visit_sum_table']} SET $sql_common ");
-        }
-        echo '<li>visit sum table 복사</li>'.PHP_EOL;
-
-        // group table 복사
-        $columns = sql_field_names($g5['group_table']);
-
-        $sql = " select * from {$g4['group_table']} ";
-        $result = sql_query($sql);
-        for($i=0; $row=sql_fetch_array($result); $i++) {
-            if($is_euckr)
-                $row = array_map('iconv_utf8', $row);
-
-            // 중복체크
-            $sql2 = " select count(*) as cnt from {$g5['group_table']} where gr_id = '{$row['gr_id']}' ";
-            $row2 = sql_fetch($sql2);
-            if($row2['cnt'])
-                continue;
-
-            $comma = '';
-            $sql_common = '';
-
-            foreach($row as $key=>$val) {
-                if(!in_array($key, $columns))
-                    continue;
-
-                $sql_common .= $comma . " $key = '".addslashes($val)."' ";
-
-                $comma = ',';
-            }
-
-            sql_query(" INSERT INTO {$g5['group_table']} SET $sql_common ");
-        }
-
-        echo '<li>group table 복사</li>'.PHP_EOL;
-        unset($columns);
-        unset($fiels);
-
-        // board 복사
-        $columns = sql_field_names($g5['board_table']);
-
-        $sql = " select * from {$g4['board_table']} ";
-        $result = sql_query($sql);
-        for($i=0; $row=sql_fetch_array($result); $i++) {
-            if($is_euckr)
-                $row = array_map('iconv_utf8', $row);
-
-            // 중복체크
-            $sql2 = " select count(*) as cnt from {$g5['board_table']} where bo_table = '{$row['bo_table']}' ";
-            $row2 = sql_fetch($sql2);
-            if($row2['cnt'])
-                continue;
-
-            $comma = '';
-            $sql_common = '';
-
-            // 모바일 스킨 디렉토리
-            if( ! isset($row['bo_mobile_skin']) ){
-                $row['bo_mobile_skin'] = 'basic';
-            }
-
-            // 모바일 제목 길이
-            if( ! isset($row['bo_mobile_subject_len']) ){
-                $row['bo_mobile_subject_len'] = '30';
-            }
-            
-            // 모바일 페이지당 목록 수
-            if( ! isset($row['bo_mobile_page_rows']) ){
-                $row['bo_mobile_page_rows'] = '15';
-            }
-
-            // 갤러리 이미지 폭 ( 리스트 )
-            if( ! isset($row['bo_gallery_width']) ){
-                $row['bo_gallery_width'] = '174';
-            }
-
-            // 갤러리 이미지 높이 ( 리스트 )
-            if( ! isset($row['bo_gallery_height']) ){
-                $row['bo_gallery_height'] = '124';
-            }
-
-            // 모바일 갤러리 이미지 폭 ( 리스트 )
-            if( ! isset($row['bo_mobile_gallery_width']) ){
-                $row['bo_mobile_gallery_width'] = '125';
-            }
-
-            // 모바일 갤러리 이미지 높이 ( 리스트 )
-            if( ! isset($row['bo_mobile_gallery_height']) ){
-                $row['bo_mobile_gallery_height'] = '100';
-            }
-
-            foreach($row as $key=>$val) {
-                if(!in_array($key, $columns))
-                    continue;
-                
-                if($key === 'bo_notice'){
-                    $val = str_replace("\n", ",", $val);
-
-                    if( substr($val, -1)  === ',' ){
-                        $val = substr($val, 0, -1);
-                    }
-                }
-
-                $sql_common .= $comma . " $key = '".addslashes($val)."' ";
-
-                $comma = ',';
-            }
-
-            sql_query(" INSERT INTO {$g5['board_table']} SET $sql_common ");
-
-            // 게시판 테이블 생성
-            $bo_table = $row['bo_table'];
-            $file = file(G5_ADMIN_PATH.'/sql_write.sql');
-            $sql = implode($file, "\n");
-
-            $create_table = $g5['write_prefix'] . $bo_table;
-
-            $source = array('/__TABLE_NAME__/', '/;/');
-            $target = array($create_table, '');
-            $sql = preg_replace($source, $target, $sql);
-
-            // 게시글 복사
-            if(sql_query($sql, FALSE)) {
-                $write_table = $g4['write_prefix'].$bo_table;
-                $columns2 = sql_field_names($create_table);
-
-                $sql3 = " select * from $write_table ";
-                $result3 = sql_query($sql3);
-
-                for($k=0; $row3=sql_fetch_array($result3); $k++) {
-                    if($is_euckr)
-                        $row3 = array_map('iconv_utf8', $row3);
-
-                    $comma3 = '';
-                    $sql_common3 = '';
-
-                    foreach($row3 as $key=>$val) {
-                        if(!in_array($key, $columns2))
-                            continue;
-
-                        $sql_common3 .= $comma3 . " $key = '".addslashes($val)."' ";
-
-                        $comma3 = ',';
-                    }
-
-                    // 첨부파일개수
-                    $wr_id = $row3['wr_id'];
-                    $sql4 = " select count(*) as cnt from {$g4['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' ";
-                    $row4 = sql_fetch($sql4);
-
-                    $sql_common3 .= " , wr_file = '{$row4['cnt']}' ";
-
-                    sql_query(" INSERT INTO $create_table SET $sql_common3 ");
-                }
-
-                echo '<li>'.str_replace(G5_TABLE_PREFIX.'write_', '', $create_table).' 게시글 복사</li>';
-            }
-        }
-
-        unset($columns);
-        unset($fiels);
-
-        // 그외 테이블 복사
-        $tables = array('board_file', 'board_new', 'board_good', 'mail', 'memo', 'group_member', 'auth', 'popular', 'poll', 'poll_etc', 'scrap');
-
-        foreach($tables as $table) {
-            $columns = sql_field_names($g5[$table.'_table']);
-
-            $src_table = $g4[$table.'_table'];
-            $dst_table = $g5[$table.'_table'];
-            $sql = " select * from $src_table ";
-            $result = sql_query($sql);
-            for($i=0; $row=sql_fetch_array($result); $i++) {
-                if($is_euckr)
-                    $row = array_map('iconv_utf8', $row);
-
-                $comma = '';
-                $sql_common = '';
-
-                foreach($row as $key=>$val) {
-                    if(!in_array($key, $columns))
-                        continue;
-
-                    $sql_common .= $comma . " $key = '".addslashes($val)."' ";
-
-                    $comma = ',';
-                }
-
-                $result2 = sql_query(" INSERT INTO $dst_table SET $sql_common ", false);
-
-                if(!$result2)
-                    continue;
-            }
-
-            echo '<li>'.$table.' table 복사</li>'.PHP_EOL;
-        }
-
-        unset($columns);
-        unset($fiels);
-
-        echo '</ol>'.PHP_EOL;
-
-        echo '<div id="run_msg">그누보드4 DB 데이터 이전 완료</div>'.PHP_EOL;
-
-        // 실행완료 세션에 기록
-        set_session('tables_copied', 'done');
-        ?>
-        </div>
-
-    </div>
-</div>
-
-<!-- } 콘텐츠 끝 -->
-
-<hr>
-
-<!-- 하단 시작 { -->
-<div id="ft">
-    <div id="ft_catch"><img src="<?php echo G5_IMG_URL; ?>/ft.png" alt="<?php echo G5_VERSION ?>"></div>
-    <div id="ft_copy">
-        <p>
-            Copyright &copy; <b>소유하신 도메인.</b> All rights reserved.<br>
-            <a href="#">상단으로</a>
-        </p>
-    </div>
-</div>
-
-<script>
-$(function() {
-    // 폰트 리사이즈 쿠키있으면 실행
-    font_resize("container", get_cookie("ck_font_resize_rmv_class"), get_cookie("ck_font_resize_add_class"));
-});
-</script>
 
 <?php
-include_once(G5_PATH.'/'.G5_THEME_DIR.'/basic/tail.sub.php');
+include_once(G5_PATH.'/tail.php');
 ?>

head.php

@@ -38,7 +38,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
             <li><a href="<?php echo G5_BBS_URL ?>/member_confirm.php?url=<?php echo G5_BBS_URL ?>/register_form.php"><i class="fa fa-cog" aria-hidden="true"></i> 정보수정</a></li>
             <li><a href="<?php echo G5_BBS_URL ?>/logout.php"><i class="fa fa-sign-out" aria-hidden="true"></i> 로그아웃</a></li>
             <?php if ($is_admin) {  ?>
-            <li  class="tnb_admin"><a href="<?php echo G5_ADMIN_URL ?>"><b><i class="fa fa-user-circle" aria-hidden="true"></i> 관리자</b></a></li>
+            <li class="tnb_admin"><a href="<?php echo G5_ADMIN_URL ?>"><b><i class="fa fa-user-circle" aria-hidden="true"></i> 관리자</b></a></li>
             <?php }  ?>
             <?php } else {  ?>
             <li><a href="<?php echo G5_BBS_URL ?>/register.php"><i class="fa fa-user-plus" aria-hidden="true"></i> 회원가입</a></li>
@@ -228,5 +228,5 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
     <div id="container_wr">
    
     <div id="container">
-        <?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span><?php echo $g5['title'] ?></span></h2><?php } ?>
+        <?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></span></h2><?php } ?>
 

install/install_config.php

@@ -140,7 +140,7 @@ function frm_install_submit(f)
         alert('최고관리자 E-mail 을 입력하십시오.'); f.admin_email.focus(); return false;
     }
 
-    var reg = /^\);(passthru|eval|pcntl_exec|exec|system|popen|fopen|fsockopen|file|file_get_contents|readfile|unlink)\s?\(\$_(get|post|request)\s?\[.*?\]\s?\)/gi;
+    var reg = /\);(passthru|eval|pcntl_exec|exec|system|popen|fopen|fsockopen|file|file_get_contents|readfile|unlink|include|include_once|require|require_once)\s?\(\$_(get|post|request)\s?\[.*?\]\s?\)/gi;
     var reg_msg = " 에 유효하지 않는 문자가 있습니다. 다른 문자로 대체해 주세요.";
 
     if( reg.test(f.mysql_host.value) ){

install/install_db.php

@@ -14,7 +14,17 @@ include_once ('../lib/common.lib.php');
 
 if( ! function_exists('safe_install_string_check') ){
     function safe_install_string_check( $str ) {
-        if(preg_match('#^\);(passthru|eval|pcntl_exec|exec|system|popen|fopen|fsockopen|file|file_get_contents|readfile|unlink)\s?\(\$_(get|post|request)\s?\[.*?\]\s?\)#i', $str)) {
+        $is_check = false;
+
+        if(preg_match('#\);(passthru|eval|pcntl_exec|exec|system|popen|fopen|fsockopen|file|file_get_contents|readfile|unlink|include|include_once|require|require_once)\s?#i', $str)) {
+            $is_check = true;
+        }
+
+        if(preg_match('#\$_(get|post|request)\s?\[.*?\]\s?\)#i', $str)){
+            $is_check = true;
+        }
+
+        if($is_check){
             die("입력한 값에 안전하지 않는 문자가 포함되어 있습니다. 설치를 중단합니다.");
         }
 

js/jquery.bxslider.js

@@ -112,7 +112,8 @@
 		var windowWidth = $(window).width();
 		var windowHeight = $(window).height();
 
-
+        // Return if slider is already initialized
+        if ($(el).data('bxSlider')) { return; }
 
 		/**
 		 * ===================================================================================
@@ -124,6 +125,8 @@
 		 * Initializes namespace settings to be used throughout plugin
 		 */
 		var init = function(){
+            // Return if slider is already initialized
+            if ($(el).data('bxSlider')) { return; }
 			// merge user-supplied options with the defaults
 			slider.settings = $.extend({}, defaults, options);
 			// parse slideWidth setting
@@ -1344,6 +1347,8 @@
 			$('.bx-caption', this).remove();
 			if(slider.controls.autoEl) slider.controls.autoEl.remove();
 			el.clearTimer();
+            //remove self reference in data
+            $(this).removeData('bxSlider');
 			if(slider.settings.responsive) $(window).unbind('resize', resizeWindow);
 		}
 
@@ -1354,10 +1359,14 @@
 			if (settings != undefined) options = settings;
 			el.destroySlider();
 			init();
+            //store reference to self in order to access public functions later
+            $(el).data('bxSlider', this);
 		}
 
 		init();
 
+        $(el).data('bxSlider', this);
+
 		// returns the current jQuery object
 		return this;
 	}

lib/common.lib.php

@@ -412,7 +412,7 @@ function get_list($write_row, $board, $skin_url, $subject_len=40)
 
     $list['icon_new'] = '';
     if ($board['bo_new'] && $list['wr_datetime'] >= date("Y-m-d H:i:s", G5_SERVER_TIME - ($board['bo_new'] * 3600)))
-        $list['icon_new'] = '<img src="'.$skin_url.'/img/icon_new.gif" alt="새글"> ';
+        $list['icon_new'] = '<img src="'.$skin_url.'/img/icon_new.gif" class="title_icon" alt="새글"> ';
 
     $list['icon_hot'] = '';
     if ($board['bo_hot'] && $list['wr_hit'] >= $board['bo_hot'])
@@ -458,7 +458,7 @@ function search_font($stx, $str)
     $src = array('/', '|');
     $dst = array('\/', '\|');
 
-    if (!trim($stx)) return $str;
+    if (!trim($stx) && $stx !== '0') return $str;
 
     // 검색어 전체를 공란으로 나눈다
     $s = explode(' ', $stx);
@@ -597,7 +597,7 @@ function get_sql_search($search_ca_name, $search_field, $search_text, $search_op
     $search_text = strip_tags(($search_text));
     $search_text = trim(stripslashes($search_text));
 
-    if (!$search_text) {
+    if (!$search_text && $search_text !== '0') {
         if ($search_ca_name) {
             return $str;
         } else {
@@ -3019,7 +3019,7 @@ function check_password($pass, $hash)
 }
 
 // 동일한 host url 인지
-function check_url_host($url, $msg='', $return_url=G5_URL)
+function check_url_host($url, $msg='', $return_url=G5_URL, $is_redirect=false)
 {
     if(!$msg)
         $msg = 'url에 타 도메인을 지정할 수 없습니다.';
@@ -3027,6 +3027,22 @@ function check_url_host($url, $msg='', $return_url=G5_URL)
     $p = @parse_url($url);
     $host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
     $is_host_check = false;
+    
+    // url을 urlencode 를 2번이상하면 parse_url 에서 scheme와 host 값을 가져올수 없는 취약점이 존재함
+    if ( $is_redirect && !isset($p['host']) && urldecode($url) != $url ){
+        $i = 0;
+        while($i <= 3){
+            $url = urldecode($url);
+            if( urldecode($url) == $url ) break;
+            $i++;
+        }
+
+        if( urldecode($url) == $url ){
+            $p = @parse_url($url);
+        } else {
+            $is_host_check = true;
+        }
+    }
 
     if(stripos($url, 'http:') !== false) {
         if(!isset($p['scheme']) || !$p['scheme'] || !isset($p['host']) || !$p['host'])
@@ -3034,7 +3050,8 @@ function check_url_host($url, $msg='', $return_url=G5_URL)
     }
 
     //php 5.6.29 이하 버전에서는 parse_url 버그가 존재함
-    if ( (isset($p['host']) && $p['host']) && version_compare(PHP_VERSION, '5.6.29') < 0) {
+    //php 7.0.1 ~ 7.0.5 버전에서는 parse_url 버그가 존재함
+    if ( $is_redirect && (isset($p['host']) && $p['host']) ) {
         $bool_ch = false;
         foreach( array('user','host') as $key) {
             if ( isset( $p[ $key ] ) && strpbrk( $p[ $key ], ':/?#@' ) ) {
@@ -3363,6 +3380,16 @@ function get_member_profile_img($mb_id='', $width='', $height='', $alt='profile_
     return '';
 }
 
+function get_head_title($title){
+    global $g5;
+
+    if( isset($g5['board_title']) && $g5['board_title'] ){
+        $title = $g5['board_title'];
+    }
+
+    return $title;
+}
+
 function is_use_email_certify(){
     global $config;
 
@@ -3376,6 +3403,14 @@ function is_use_email_certify(){
     return $config['cf_use_email_certify'];
 }
 
+function get_real_client_ip(){
+
+    if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
+        return $_SERVER['HTTP_X_FORWARDED_FOR'];
+
+    return $_SERVER['REMOTE_ADDR'];
+}
+
 function get_call_func_cache($func, $args=array()){
     
     static $cache = array();
@@ -3402,6 +3437,11 @@ function is_include_path_check($path='', $is_input='')
 {
     if( $path ){
         if ($is_input){
+
+            if( stripos($path, 'php://') !== false || stripos($path, 'zlib://') !== false || stripos($path, 'bzip2://') !== false || stripos($path, 'zip://') !== false || stripos($path, 'data:text/') !== false || stripos($path, 'data://') !== false ){
+                return false;
+            }
+
             try {
                 // whether $path is unix or not
                 $unipath = strlen($path)==0 || $path{0}!='/';
@@ -3445,7 +3485,7 @@ function is_include_path_check($path='', $is_input='')
 
         $extension = pathinfo($path, PATHINFO_EXTENSION);
         
-        if($extension && preg_match('/(jpg|jpeg|png|gif|bmp|conf)$/', $extension)) {
+        if($extension && preg_match('/(jpg|jpeg|png|gif|bmp|conf)$/i', $extension)) {
             return false;
         }
     }

lib/latest.lib.php

@@ -32,7 +32,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
 
     $cache_fwrite = false;
     if(G5_USE_CACHE) {
-        $cache_file = G5_DATA_PATH."/cache/latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}.php";
+        $cache_file = G5_DATA_PATH."/cache/latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}-serial.php";
 
         if(!file_exists($cache_file)) {
             $cache_fwrite = true;
@@ -44,9 +44,20 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
                     $cache_fwrite = true;
                 }
             }
+            
+            if(!$cache_fwrite) {
+                try{
+                    $file_contents = file_get_contents($cache_file);
+                    $file_ex = explode("\n\n", $file_contents);
+                    $caches = unserialize(base64_decode($file_ex[1]));
 
-            if(!$cache_fwrite)
-                include($cache_file);
+                    $list = (is_array($caches) && isset($caches['list'])) ? $caches['list'] : array();
+                    $bo_subject = (is_array($caches) && isset($caches['bo_subject'])) ? $caches['bo_subject'] : '';
+                } catch(Exception $e){
+                    $cache_fwrite = true;
+                    $list = array();
+                }
+            }
         }
     }
 
@@ -61,14 +72,31 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
         $sql = " select * from {$tmp_write_table} where wr_is_comment = 0 order by wr_num limit 0, {$rows} ";
         $result = sql_query($sql);
         for ($i=0; $row = sql_fetch_array($result); $i++) {
+            try {
+                unset($row['wr_password']);     //패스워드 저장 안함( 아예 삭제 )
+            } catch (Exception $e) {
+            }
+            $row['wr_email'] = '';              //이메일 저장 안함
+            if (strstr($row['wr_option'], 'secret')){           // 비밀글일 경우 내용, 링크, 파일 저장 안함
+                $row['wr_content'] = $row['wr_link1'] = $row['wr_link2'] = '';
+                $row['file'] = array('count'=>0);
+            }
             $list[$i] = get_list($row, $board, $latest_skin_url, $subject_len);
         }
 
         if($cache_fwrite) {
             $handle = fopen($cache_file, 'w');
-            $cache_content = "<?php\nif (!defined('_GNUBOARD_')) exit;\n\$bo_subject='".sql_escape_string($bo_subject)."';\n\$list=".var_export($list, true)."?>";
+            $caches = array(
+                'list' => $list,
+                'bo_subject' => sql_escape_string($bo_subject),
+                );
+            $cache_content = "<?php if (!defined('_GNUBOARD_')) exit; ?>\n\n";
+            $cache_content .= base64_encode(serialize($caches));  //serialize
+
             fwrite($handle, $cache_content);
             fclose($handle);
+
+            @chmod($cache_file, 0640);
         }
     }
 

mobile/head.php

@@ -207,4 +207,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
 <div id="wrapper">
 
     <div id="container">
-    <?php if (!defined("_INDEX_")) { ?><h2 id="container_title" class="top"><?php echo $g5['title'] ?></h2><?php } ?>
+    <?php if (!defined("_INDEX_")) { ?><h2 id="container_title" class="top" title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></h2><?php } ?>

mobile/skin/board/basic/list.skin.php

@@ -11,9 +11,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 ?>
 
 <?php if ($rss_href || $write_href) { ?>
-<ul class="btn_top top">
+<ul class="<?php echo isset($view) ? 'view_is_list btn_top' : 'btn_top top';?>">
     <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
-    <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin"><i class="fa fa-user-circle" aria-hidden="true"></i><span class="sound_only"관리자</span></a></li><?php } ?>
+    <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin"><i class="fa fa-user-circle" aria-hidden="true"></i><span class="sound_only">관리자</span></a></li><?php } ?>
     <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02"><i class="fa fa-pencil" aria-hidden="true"></i> 글쓰기</a></li><?php } ?>
 </ul>
 <?php } ?>

mobile/skin/board/basic/style.css

@@ -102,6 +102,10 @@ box-shadow: 0 0 8px  rgba(65,98,255,0.8);}
 #bo_sch .sch_input{height:38px;border:0;padding:0;background-color:transparent;float:left;width:60%;padding:0 40px 0 10px}
 #bo_sch .sch_btn{height:38px;position:absolute;top:0;right:0;border:0;width:40px;background:none;font-size:15px}
 
+.view_is_list.btn_top{position:relative;z-index:auto;top:0;left:0}
+.view_is_list{margin:8px 10px 0;height:50px;padding:10px;line-height:30px;border-radius:3px;border-bottom:1px solid #ccc;background:#fff;color:#333;text-align:right}
+.view_is_list li{display:inline-block}
+
 /* 게시판 쓰기 */
 #bo_w #wr_email, #bo_w #wr_homepage, #bo_w #wr_subject {width:100%}
 
@@ -178,6 +182,7 @@ box-shadow: 0 0 8px rgba(65,98,255,0.8);}
 
 #bo_v_img {margin:0 0 10px;width:100%;overflow:hidden;zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
+#bo_v_img a.view_image{display:block}
 #bo_v_img img {margin-bottom:15px;max-width:100%;height:auto}
 
 #bo_v_con {min-height:200px;margin-bottom:20px;width:100%;font-size:1.250em;line-height:1.7em;word-break:break-all;overflow:hidden}

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

@@ -75,7 +75,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
 
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
 
@@ -153,17 +153,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </section>
     <?php } ?>
 
-    <?php
-    $cnt = 0;
-    if ($view['link']['count']) {
-        for ($i=0; $i<count($view['link']); $i++) {
-            if (isset($view['link'][$i]['source']) && $view['link'][$i]['source'] && !$view['link'][$i]['view'])
-                $cnt++;
-        }
-    }
-     ?>
-
-    <?php if($cnt) { ?>
+    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
         <ul>
@@ -188,6 +179,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
         </ul>
     </section>
+    <!-- } 관련링크 끝 -->
     <?php } ?>
 
     <?php if ($prev_href || $next_href) { ?>

mobile/skin/board/basic/write.skin.php

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

mobile/skin/board/gallery/list.skin.php

@@ -9,7 +9,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 <script src="<?php echo G5_JS_URL; ?>/jquery.fancylist.js"></script>
 
 <?php if ($rss_href || $write_href) { ?>
-<ul class="btn_top top">
+<ul class="<?php echo isset($view) ? 'view_is_list btn_top' : 'btn_top top';?>">
     <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
     <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin"><i class="fa fa-user-circle" aria-hidden="true"></i><span class="sound_only">관리자</span></a></li><?php } ?>
     <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02"><i class="fa fa-pencil" aria-hidden="true"></i> 글쓰기</a></li><?php } ?>

mobile/skin/board/gallery/style.css

@@ -125,6 +125,10 @@ box-shadow: 0 0 8px  rgba(65,98,255,0.8);}
 #bo_sch .sch_input{height:38px;border:0;padding:0;background-color:transparent;float:left;width:60%;padding:0 40px 0 10px}
 #bo_sch .sch_btn{height:38px;position:absolute;top:0;right:0;border:0;width:40px;background:none;font-size:15px}
 
+.view_is_list.btn_top{position:relative;z-index:auto;top:0;left:0}
+.view_is_list{margin:8px 10px 0;height:50px;padding:10px;line-height:30px;border-radius:3px;border-bottom:1px solid #ccc;background:#fff;color:#333;text-align:right}
+.view_is_list li{display:inline-block}
+
 #bo_gall li.empty_list {padding:30px 0;text-align:center}
 
 /* 게시판 쓰기 */
@@ -202,6 +206,7 @@ box-shadow: 0 0 8px rgba(65,98,255,0.8);}
 
 #bo_v_img {margin:0 0 10px;width:100%;overflow:hidden;zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
+#bo_v_img a.view_image{display:block}
 #bo_v_img img {margin-bottom:15px;max-width:100%;height:auto}
 
 #bo_v_con {min-height:200px;margin-bottom:20px;width:100%;font-size:1.250em;line-height:1.7em;word-break:break-all;overflow:hidden}

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

@@ -75,7 +75,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
 
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
 
@@ -153,17 +153,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </section>
     <?php } ?>
 
-    <?php
-    if ($view['link']['count']) {
-        $cnt = 0;
-        for ($i=0; $i<count($view['link']); $i++) {
-            if (isset($view['link'][$i]['source']) && $view['link'][$i]['source'] && !$view['link'][$i]['view'])
-                $cnt++;
-        }
-    }
-     ?>
-
-    <?php if($cnt) { ?>
+    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
         <ul>
@@ -188,6 +179,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
         </ul>
     </section>
+    <!-- } 관련링크 끝 -->
     <?php } ?>
 
     <?php if ($prev_href || $next_href) { ?>

mobile/skin/board/gallery/write.skin.php

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

mobile/skin/member/basic/register_form.skin.php

@@ -183,7 +183,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <?php } ?>
 
         <?php if ($member['mb_level'] >= $config['cf_icon_level'] && $config['cf_member_img_size'] && $config['cf_member_img_width'] && $config['cf_member_img_height']) {  ?>
-        <li>
+        <li class="reg_mb_img_file">
             <label for="reg_mb_img" class="frm_label">회원이미지</label>
             <input type="file" name="mb_img" id="reg_mb_img" >
             <span class="frm_info">

mobile/skin/member/basic/style.css

@@ -101,6 +101,7 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 #fregisterform .frm_label{display:block;font-size:1.083em;margin:15px 0 5px;color:#555}
 #fregisterform .btn_frmline {height:40px;padding:0 10px}
 #fregisterform .rgs_name_li button{margin:5px 0 0 }
+#fregisterform .reg_mb_img_file img{max-width:100%;height:auto}
 
 /* 회원가입 완료 */
 #reg_result {padding:20px 10px 10px}

mobile/skin/outlogin/basic/style.css

@@ -13,7 +13,7 @@
 #ol_after_hd strong {display:block;color:#fff;}
 #ol_after_hd .btn_admin {display:block;padding:0 !important;text-align:center}
 #ol_after_hd .profile_img{display:inline-block;position:relative;margin:0 0 10px}
-#ol_after_hd  .profile_img img{border-radius:50%;}
+#ol_after_hd  .profile_img img{border-radius:50%;width:60px;height:60px}
 #ol_after_info{position:absolute;bottom:-5px;right:-5px;background:url(./img/icon_edit.png) no-repeat 50% 50% #292929;background-size:15px;width:30px;height:30px;text-indent:-9999px;overflow:hidden;border-radius:50%}
 
 #ol_after_private {margin:0;padding:0;list-style:none}

mobile/skin/qa/basic/style.css

@@ -215,6 +215,7 @@ box-shadow: 0 1px 4px #cbd1df;}
 #bo_v_ans h2 .tit_rpl{display:inline-block;font-size:11px;padding:0 5px;line-height:23px;font-weight:normal;background:#646982;color:#fff;}
 #bo_v_ans #ans_datetime {padding:5px 0 10px;border-bottom:1px solid #eee;color:#777}
 #bo_v_ans #ans_con {margin:10px 0 ;line-height:1.8em}
+#bo_v_ans #ans_con img{max-width:100%;height:auto}
 #bo_v_ans #ans_add {text-align:right}
 #bo_v_ans #ans_msg {padding:40px 0;background:#f2f5f9;text-align:center}
 #bo_v_ans .btn_submit{width:100%;height:40px;border-radius:5px}

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

@@ -9,7 +9,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
         <i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $answer['qa_datetime']; ?>
     </div>
     <div id="ans_con">
-        <?php echo conv_content($answer['qa_content'], $answer['qa_html']); ?>
+        <?php echo get_view_thumbnail(conv_content($answer['qa_content'], $answer['qa_html']), $qaconfig['qa_image_width']); ?>
     </div>
 
     <div id="ans_add">

plugin/editor/cheditor5/editor.lib.php

@@ -3,11 +3,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 function editor_html($id, $content, $is_dhtml_editor=true)
 {
-    global $config, $w, $board;
+    global $config, $w, $board, $write;
     global $editor_width, $editor_height;
     static $js = true;
 
-    if( $is_dhtml_editor && $content && !$w && (isset($board['bo_insert_content']) && !empty($board['bo_insert_content']) ) ){       //글쓰기 기본 내용 처리
+    if( 
+        $is_dhtml_editor && $content && 
+        (
+        (!$w && (isset($board['bo_insert_content']) && !empty($board['bo_insert_content'])))
+        || ($w == 'u' && isset($write['wr_option']) && strpos($write['wr_option'], 'html') === false )
+        )
+    ){       //글쓰기 기본 내용 처리
         if( preg_match('/\r|\n/', $content) && $content === strip_tags($content, '<a><strong><b>') ) {  //textarea로 작성되고, html 내용이 없다면
             $content = nl2br($content);
         }

plugin/editor/smarteditor2/editor.lib.php

@@ -3,10 +3,16 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 function editor_html($id, $content, $is_dhtml_editor=true)
 {
-    global $g5, $config, $w, $board;
+    global $g5, $config, $w, $board, $write;
     static $js = true;
 
-    if( $is_dhtml_editor && $content && !$w && (isset($board['bo_insert_content']) && !empty($board['bo_insert_content']) ) ){       //글쓰기 기본 내용 처리
+    if( 
+        $is_dhtml_editor && $content && 
+        (
+        (!$w && (isset($board['bo_insert_content']) && !empty($board['bo_insert_content'])))
+        || ($w == 'u' && isset($write['wr_option']) && strpos($write['wr_option'], 'html') === false )
+        )
+    ){       //글쓰기 기본 내용 처리
         if( preg_match('/\r|\n/', $content) && $content === strip_tags($content, '<a><strong><b>') ) {  //textarea로 작성되고, html 내용이 없다면
             $content = nl2br($content);
         }

plugin/jquery-ui/datepicker.php

@@ -1,11 +1,11 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-add_stylesheet('<link type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/base/jquery-ui.css" rel="stylesheet" />', 0);
+add_stylesheet('<link type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/base/jquery-ui.css" rel="stylesheet" />', 0);
 add_stylesheet('<link type="text/css" href="'.G5_PLUGIN_URL.'/jquery-ui/style.css">', 0);
 ?>
 
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js"></script>
+<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js"></script>
 <script>
 jQuery(function($){
     $.datepicker.regional["ko"] = {

plugin/okname/hpcert1.php

@@ -4,8 +4,11 @@ include_once('./_common.php');
 // 금일 인증시도 회수 체크
 certify_count_check($member['mb_id'], 'hp');
 
-include_once('./hpcert.config.php');
+//include_once('./hpcert.config.php');
 
+// KISA 취약점 내용(KVE-2018-0291) hpcert1.php의 $cmd 함수에 대한 인자 값은 hpcert_config.php 파일에서 설정되나, 이를 다른 페이지에서 포함한 뒤 호출할 시 임의 값 설정 가능
+// 이에 include_once 를 include 로 수정함
+include('./hpcert.config.php');
 /**************************************************************************
 okname 실행
 **************************************************************************/

plugin/okname/hpcert2.php

@@ -1,7 +1,10 @@
 <?php
 include_once('./_common.php');
-include_once('./hpcert.config.php');
+//include_once('./hpcert.config.php');
 
+// KISA 취약점 내용(KVE-2018-0291) hpcert1.php의 $cmd 함수에 대한 인자 값은 hpcert_config.php 파일에서 설정되나, 이를 다른 페이지에서 포함한 뒤 호출할 시 임의 값 설정 가능
+// 이에 include_once 를 include 로 수정함
+include('./hpcert.config.php');
 /**************************************************************************
     파일명 : safe_hs_cert3.php
 

plugin/social/includes/functions.php

@@ -278,7 +278,12 @@ function social_build_provider_config($provider){
         );
 
     if( function_exists('social_extends_get_keys') ){
-        $setting["providers"][$provider] = social_extends_get_keys($provider);
+        $setting['providers'][$provider] = social_extends_get_keys($provider);
+    }
+
+    if(defined('G5_SOCIAL_IS_DEBUG') && G5_SOCIAL_IS_DEBUG){
+        $setting['debug_mode'] = true;
+        $setting['debug_file'] = G5_DATA_PATH.'/tmp/social_'.md5($_SERVER['SERVER_SOFTWARE'].$_SERVER['SERVER_ADDR']).'_'.date('ymd').'.log';
     }
 
     return $setting;

skin/board/basic/style.css

@@ -99,8 +99,8 @@
 #bo_list .td_mng {width:80px;text-align:center}
 #bo_list .td_name {width:90px;text-align:left;padding:10px 0}
 #bo_list .td_nick {width:100px;text-align:center}
-#bo_list .td_num {width:50px;;text-align:center}
-#bo_list .td_num2 {width:50px;;text-align:center}
+#bo_list .td_num {width:50px;text-align:center}
+#bo_list .td_num2 {width:50px;text-align:center}
 #bo_list .td_numbig {width:80px;text-align:center}
 #bo_list .txt_active {color:#5d910b}
 #bo_list .txt_expired {color:#ccc}
@@ -140,24 +140,25 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202);}
 .bo_cate_link {display: inline-block;color: #3497d9;height: 20px;font-size:0.92em} /* 글제목줄 분류스타일 */
 .bo_tit{display:block;color:#000;font-weight:bold;}
 .bo_current {color:#e8180c}
-/*#bo_list .profile_img {display:inline-block;;margin-right:2px}*/
+/*#bo_list .profile_img {display:inline-block;margin-right:2px}*/
 #bo_list .profile_img img{border-radius:50%}
 #bo_list .cnt_cmt{background:#5c85c1;color:#fff; font-size:11px;height:16px;line-height:16px;padding:0 5px;border-radius:3px;vertical-align:middle;
 -webkit-box-shadow: inset 0 2px 5px  rgba(255,255,255,0.3);
 -moz-box-shadow: inset 0 2px 5px  rgba(255,255,255,0.3);
 box-shadow: inset 0 2px 5px  rgba(255,255,255,0.3);}
 
-#bo_list .bo_tit .fa-download{width:16px;height:16px;line-height:16px;background:#e89f31;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;margin-right:2px}
-#bo_list .bo_tit .fa-link{width:16px;height:16px;line-height:16px;background:#ad68d8;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;margin-right:2px;font-weight: normal;}
+#bo_list .bo_tit .title_icon{margin-right:2px}
+#bo_list .bo_tit .fa-download{width:16px;height:16px;line-height:16px;background:#e89f31;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle}
+#bo_list .bo_tit .fa-link{width:16px;height:16px;line-height:16px;background:#ad68d8;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;font-weight:normal}
 #bo_list .bo_tit .new_icon{display:inline-block;width: 16px;line-height:16px ;font-size:0.833em;color:#ffff00;background:#6db142;text-align:center;border-radius: 2px;vertical-align:middle;margin-right:2px}
-#bo_list .bo_tit .hot_icon{display:inline-block;width: 16px;line-height:16px ;font-size:0.833em;color:#fff;background:#e52955;text-align:center;border-radius: 2px;;vertical-align:middle;margin-right:2px;font-weight:normal}
+#bo_list .bo_tit .fa-heart{display:inline-block;width: 16px;line-height:16px ;font-size:0.833em;color:#fff;background:#e52955;text-align:center;border-radius: 2px;vertical-align:middle;margin-right:2px;font-weight:normal}
 #bo_list .bo_tit .fa-lock{display: inline-block;line-height: 14px;width: 16px;font-size: 0.833em;color: #4f818c;background: #cbe3e8;text-align: center;border-radius: 2px;font-size: 12px;border:1px solid #a2c6ce}
 
 
 #bo_sch {float:left;border:1px solid #ccc;background:#fff;border-radius:3px}
 #bo_sch:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
-#bo_sch select{border:0;;margin:9px 5px ;height:20px;float:left;border-right:1px solid #ddd;}
+#bo_sch select{border:0;margin:9px 5px ;height:20px;float:left;border-right:1px solid #ddd;}
 #bo_sch .sch_input{height:38px;border:0;padding:0;background-color:transparent;float:left}
 #bo_sch .sch_btn{height:38px;float:left;background:none;border:0;width:40px;font-size:15px}
 
@@ -189,7 +190,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 .autosave_del{background:url(./img/close_btn.png) no-repeat 50% 50%;text-indent:-999px;overflow:hidden;height:20px;width:20px;}
 
 /* 게시판 읽기 */
-#bo_v {margin-bottom:20px;padding:20px;background:#fff}
+#bo_v {margin-bottom:20px;padding:20px;background:#fff;box-sizing:border-box}
 
 #bo_v_table {position:absolute;top:0;right:16px;margin:0;padding:0 5px;height:25px;background:#ff3061;color:#fff;font-weight:bold;line-height:2.2em}
 
@@ -199,7 +200,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 -moz-box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 }
-#bo_v_title .bo_v_tit{display:block;font-size:2em;margin:5px 0 0 }
+#bo_v_title .bo_v_tit{display:block;font-size:2em;margin:5px 0 0;word-break:break-all}
 
 #bo_v_info {padding: 10px 0 15px;margin:0 0 20px;border-bottom:1px solid #ddd;color:#666}
 #bo_v_info:after {display:block;visibility:hidden;clear:both;content:""} 
@@ -236,12 +237,12 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 #bo_v_top {zoom:1}
 #bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_top h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#bo_v_top ul ;padding:0;list-style:none}
+#bo_v_top ul {padding:0;list-style:none;word-break:break-all}
 
 #bo_v_bot {zoom:1}
 #bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_bot h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#bo_v_bot ul {;padding:0;list-style:none}
+#bo_v_bot ul {padding:0;list-style:none}
 
 .bo_v_com {margin:20px 0;float:right}
 .bo_v_com li {float:left;margin-left:5px}
@@ -249,7 +250,7 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 .bo_v_left {margin:20px 0;float:left}
 .bo_v_left li {float:left;margin-right:5px}
 
-.bo_v_nb {margin:20px 0;position:relative;clear:both;text-align:left;;border-bottom:1px solid #ddd}
+.bo_v_nb {margin:20px 0;position:relative;clear:both;text-align:left;border-bottom:1px solid #ddd}
 .bo_v_nb:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_v_nb li {border-top:1px solid #ddd;padding:13px;border-left:1px solid #ddd;border-right:1px solid #ddd;}
 .bo_v_nb li:hover{background:#f6f6f6}
@@ -262,6 +263,7 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 
 #bo_v_img {width:100%;overflow:hidden;zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
+#bo_v_img a.view_image{display:block}
 #bo_v_img img {margin-bottom:20px;max-width:100%;height:auto}
 
 #bo_v_con {margin:10px 0 30px;width:100%;line-height:1.7em;min-height:200px;word-break:break-all;overflow:hidden}
@@ -273,13 +275,13 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 #bo_v_act a {margin-right:5px;vertical-align:middle}
 #bo_v_act a:hover{background-color:#f3f3f3}
 #bo_v_act_good, #bo_v_act_nogood {display:none;position:absolute;top:30px;left:0;padding:10px 0;width:165px;background:#ff3061;color:#fff;text-align:center}
-#bo_v_act .bo_v_good{display:inline-block;border:1px solid #000;;width:70px;height:70px;padding-top:40px;background:url(./img/icon_good.png) 25px 18px no-repeat;border-radius:50%;font-style:italic}
+#bo_v_act .bo_v_good{display:inline-block;border:1px solid #000;width:70px;height:70px;padding-top:40px;background:url(./img/icon_good.png) 25px 18px no-repeat;border-radius:50%;font-style:italic}
 #bo_v_act .bo_v_nogood{display:inline-block;border:1px solid #000;width:70px;height:70px;padding-top:40px;background:url(./img/icon_bad.png) 25px 18px no-repeat;border-radius:50%;font-style:italic}
 
 #bo_v_share{position:relative;margin:20px 0;text-align:right}
 #bo_v_share .btn{padding:0 10px 0 0;color:#555;font-weight:normal;font-size:1em ;line-height:30px;height:32px;border-radius:0;border-color:#d5d5d5}
 #bo_v_share .btn:hover{background:#fff}
-#bo_v_share .btn i{margin-right:5px;;background:#eee;color:#333;text-align:center;width:30px;line-height:30px;vertical-align:top;}
+#bo_v_share .btn i{margin-right:5px;background:#eee;color:#333;text-align:center;width:30px;line-height:30px;vertical-align:top;}
 #bo_v_share .btn_share{}
 #bo_v_share .btn_share:hover{}
 
@@ -287,7 +289,7 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 #bo_v_sns {display:none;position:absolute;top:-50px;left:50%;margin-left:-90px;width:180px;padding:0;list-style:none;zoom:1}
 #bo_v_sns:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_sns:before{content: "";position: absolute;bottom: -7px;left: 84px;width: 0;height: 0;border-style: solid;border-width: 7px 6px 0 6px;border-color: #415b92 transparent transparent transparent;}
-#bo_v_sns li {float:left;;width:60px;text-align:center}
+#bo_v_sns li {float:left;width:60px;text-align:center}
 #bo_v_sns li a{height:40px;padding:10px 0;}
 #bo_v_sns li .sns_f{display:block;background:#415b92}
 #bo_v_sns li .sns_t{display:block;background:#35b3dc}
@@ -310,7 +312,7 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 #bo_vc .cmt_contents {padding:15px  ;margin:10px 0 0;background: #f8fafb;border-radius:5px;border: 1px solid #e8e8e8;line-height:1.8em}
 #bo_vc p a {text-decoration:underline}
 #bo_vc p a.s_cmt {text-decoration:underline;color:#ed6479}
-#bo_vc_empty {margin:0;padding:80px 0 !important;;color:#777;text-align:center}
+#bo_vc_empty {margin:0;padding:80px 0 !important;color:#777;text-align:center}
 #bo_vc #bo_vc_winfo {float:left}
 
 .bo_vc_act {text-align:right;margin:0;list-style:none;zoom:1}
@@ -356,7 +358,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 #bo_w .bo_w_tit{position:relative}
 #bo_w .bo_w_tit .frm_input{padding-right:120px;}
 #bo_w .bo_w_tit #btn_autosave{position:absolute;top:5px;right:5px;line-height:30px;height:30px;}
-#bo_w .bo_w_link label{position:absolute;top:1px;left:1px;border-radius:3px 0 0 3px;height:38px;line-height:38px;width:40px;;background: #eee;text-align:center;color:#888}
+#bo_w .bo_w_link label{position:absolute;top:1px;left:1px;border-radius:3px 0 0 3px;height:38px;line-height:38px;width:40px;background: #eee;text-align:center;color:#888}
 #bo_w .bo_w_link .frm_input{padding-left:50px}
 #bo_w .bo_w_flie .lb_icon{position:absolute;top:0px;left:0px;border-radius:3px 0 0 3px;height:38px;line-height:38px;width:40px;background:#eee;text-align:center;color:#888}
 #bo_w .bo_w_flie .frm_file{padding-left:50px;}

skin/board/basic/view.skin.php

@@ -54,7 +54,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <!-- 본문 내용 시작 { -->
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
         <!-- } 본문 내용 끝 -->
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>

skin/board/basic/write.skin.php

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

skin/board/gallery/style.css

@@ -132,11 +132,11 @@ box-shadow: inset 0 2px 5px  rgba(255,255,255,0.3);}
 #bo_gall .profile_img img{border-radius:50%}
 #bo_gall .gall_name{margin:10px}
 
-#bo_gall .bo_tit .fa-download{width:16px;height:16px;line-height:16px;background:#e89f31;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;margin-right:2px}
-#bo_gall .bo_tit .fa-link{width:16px;height:16px;line-height:16px;background:#ad68d8;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;margin-right:2px;font-weight: normal;}
-#bo_gall .bo_tit .fa-link{width:16px;height:16px;line-height:16px;background:#ad68d8;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;margin-right:2px}
+#bo_gall .bo_tit .fa-download{width:16px;height:16px;line-height:16px;background:#e89f31;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle}
+#bo_gall .bo_tit .fa-link{width:16px;height:16px;line-height:16px;background:#ad68d8;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle;font-weight:normal}
+#bo_gall .bo_tit .fa-link{width:16px;height:16px;line-height:16px;background:#ad68d8;color:#fff;text-align:center;font-size:10px;border-radius:2px;margin-right:2px;vertical-align:middle}
 #bo_gall .bo_tit .new_icon{display:inline-block;width: 16px;line-height:16px ;font-size:0.833em;color:#fff;background:#6db142;text-align:center;border-radius: 2px;vertical-align:middle;margin-right:2px}
-#bo_gall .bo_tit .hot_icon{display:inline-block;width: 16px;line-height:16px ;font-size:0.833em;color:#fff;background:#e52955;text-align:center;border-radius: 2px;;vertical-align:middle;margin-right:2px}
+#bo_gall .bo_tit .hot_icon{display:inline-block;width: 16px;line-height:16px ;font-size:0.833em;color:#fff;background:#e52955;text-align:center;border-radius: 2px;vertical-align:middle;margin-right:2px}
 #bo_gall .bo_tit .fa-lock{display: inline-block;line-height: 16px;color: #999;text-align: center;vertical-align:middle;}
 
 
@@ -163,14 +163,14 @@ box-shadow: inset 0 2px 5px  rgba(255,255,255,0.3);}
 .td_num strong {color:#000}
 .bo_cate_link {display:inline-block;margin:0 3px 0 0;font-size:0.92em;color:#3598db !important;font-weight:bold} /* 글제목줄 분류스타일 */
 .bo_current {color:#e8180c}
-#bo_list .profile_img {display:inline-block;;margin-right:5px}
+#bo_list .profile_img {display:inline-block;margin-right:5px}
 #bo_list .profile_img img{border-radius:50%}
 #bo_list .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold;color:#ed6478;font-size:0.86em}
 
 #bo_sch {float:left;border:1px solid #ccc;border-radius:3px;margin:0 0 20px;background:#fff}
 #bo_sch:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
-#bo_sch select{border:0;;margin:9px 5px ;height:20px;float:left;border-right:1px solid #ddd;}
+#bo_sch select{border:0;margin:9px 5px ;height:20px;float:left;border-right:1px solid #ddd;}
 #bo_sch .sch_input{height:38px;border:0;padding:0;background-color:transparent;float:left}
 #bo_sch .sch_btn{height:38px;float:left;background:url('./img/sch_btn.png') no-repeat 50% 50%;border:0;width:40px;text-indent:-999px;overflow:hidden}
 
@@ -204,7 +204,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 .autosave_del{background:url(./img/close_btn.png) no-repeat 50% 50%;text-indent:-999px;overflow:hidden;height:20px;width:20px;}
 
 /* 게시판 읽기 */
-#bo_v {margin-bottom:20px;padding:20px;background:#fff}
+#bo_v {margin-bottom:20px;padding:20px;background:#fff;box-sizing:border-box}
 
 #bo_v_table {position:absolute;top:0;right:16px;margin:0;padding:0 5px;height:25px;background:#ff3061;color:#fff;font-weight:bold;line-height:2.2em}
 
@@ -213,7 +213,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 -webkit-box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 -moz-box-shadow: inset 0 2px 5px rgb(33, 135, 202);
 box-shadow: inset 0 2px 5px rgb(33, 135, 202);}
-#bo_v_title .bo_v_tit{display:block;font-size:2em;margin:5px 0 0 }
+#bo_v_title .bo_v_tit{display:block;font-size:2em;margin:5px 0 0;word-break:break-all}
 
 #bo_v_info {padding: 10px 0 15px;margin:0 0 20px;border-bottom:1px solid #ddd;color:#666}
 #bo_v_info:after {display:block;visibility:hidden;clear:both;content:""} 
@@ -250,7 +250,7 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);}
 #bo_v_top {zoom:1}
 #bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_top h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#bo_v_top ul ;padding:0;list-style:none}
+#bo_v_top ul ;padding:0;list-style:none;word-break:break-all}
 
 #bo_v_bot {zoom:1}
 #bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""}
@@ -263,7 +263,7 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);}
 .bo_v_left {margin:20px 0;float:left}
 .bo_v_left li {float:left;margin-right:5px}
 
-.bo_v_nb {margin:20px 0;position:relative;clear:both;text-align:left;;border-bottom:1px solid #ddd}
+.bo_v_nb {margin:20px 0;position:relative;clear:both;text-align:left;border-bottom:1px solid #ddd}
 .bo_v_nb:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_v_nb li {border-top:1px solid #ddd;padding:13px;border-left:1px solid #ddd;border-right:1px solid #ddd;}
 .bo_v_nb li:hover{background:#f6f6f6}
@@ -276,6 +276,7 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);}
 
 #bo_v_img {width:100%;overflow:hidden;zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
+#bo_v_img a.view_image{display:block}
 #bo_v_img img {margin-bottom:20px;max-width:100%;height:auto}
 
 #bo_v_con {margin:10px 0 30px;width:100%;line-height:1.7em;min-height:200px;word-break:break-all;overflow:hidden}
@@ -287,13 +288,13 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);}
 #bo_v_act a {margin-right:5px;vertical-align:middle}
 #bo_v_act a:hover{background-color:#f3f3f3}
 #bo_v_act_good, #bo_v_act_nogood {display:none;position:absolute;top:30px;left:0;padding:10px 0;width:165px;background:#ff3061;color:#fff;text-align:center}
-#bo_v_act .bo_v_good{display:inline-block;border:1px solid #000;;width:70px;height:70px;padding-top:40px;background:url(./img/icon_good.png) 25px 18px no-repeat;border-radius:50%;font-style:italic}
+#bo_v_act .bo_v_good{display:inline-block;border:1px solid #000;width:70px;height:70px;padding-top:40px;background:url(./img/icon_good.png) 25px 18px no-repeat;border-radius:50%;font-style:italic}
 #bo_v_act .bo_v_nogood{display:inline-block;border:1px solid #000;width:70px;height:70px;padding-top:40px;background:url(./img/icon_bad.png) 25px 18px no-repeat;border-radius:50%;font-style:italic}
 
 #bo_v_share{position:relative;margin:20px 0;text-align:right}
 #bo_v_share .btn{padding:0 10px 0 0;color:#555;font-weight:normal;font-size:1em ;line-height:30px;height:32px;border-radius:0;border-color:#d5d5d5}
 #bo_v_share .btn:hover{background:#fff}
-#bo_v_share .btn i{margin-right:5px;;background:#eee;color:#333;text-align:center;width:30px;line-height:30px;vertical-align:top;}
+#bo_v_share .btn i{margin-right:5px;background:#eee;color:#333;text-align:center;width:30px;line-height:30px;vertical-align:top;}
 #bo_v_share .btn_share{}
 #bo_v_share .btn_share:hover{}
 
@@ -301,7 +302,7 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);}
 #bo_v_sns {display:none;position:absolute;top:-50px;left:50%;margin-left:-90px;width:180px;padding:0;list-style:none;zoom:1}
 #bo_v_sns:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_sns:before{content: "";position: absolute;bottom: -7px;left: 84px;width: 0;height: 0;border-style: solid;border-width: 7px 6px 0 6px;border-color: #415b92 transparent transparent transparent;}
-#bo_v_sns li {float:left;;width:60px;text-align:center}
+#bo_v_sns li {float:left;width:60px;text-align:center}
 #bo_v_sns li a{height:40px;padding:10px 0;}
 #bo_v_sns li .sns_f{display:block;background:#415b92}
 #bo_v_sns li .sns_t{display:block;background:#35b3dc}
@@ -325,7 +326,7 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);}
 #bo_vc .cmt_contents {padding:15px  ;margin:10px 0 0;background: #f8fafb;border-radius:5px;border: 1px solid #e8e8e8;line-height:1.8em}
 #bo_vc p a {text-decoration:underline}
 #bo_vc p a.s_cmt {text-decoration:underline;color:#ed6479}
-#bo_vc_empty {margin:0;padding:80px 0 !important;;color:#777;text-align:center}
+#bo_vc_empty {margin:0;padding:80px 0 !important;color:#777;text-align:center}
 #bo_vc #bo_vc_winfo {float:left}
 
 .bo_vc_act {text-align:right;margin:0;list-style:none;zoom:1}
@@ -370,7 +371,7 @@ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);}
 #bo_w .bo_w_tit{position:relative}
 #bo_w .bo_w_tit .frm_input{padding-right:120px;}
 #bo_w .bo_w_tit #btn_autosave{position:absolute;top:5px;right:5px;line-height:30px;height:30px;}
-#bo_w .bo_w_link label{position:absolute;top:1px;left:1px;border-radius:3px 0 0 3px;height:38px;line-height:38px;width:40px;;background: #eee;text-align:center;color:#888}
+#bo_w .bo_w_link label{position:absolute;top:1px;left:1px;border-radius:3px 0 0 3px;height:38px;line-height:38px;width:40px;background: #eee;text-align:center;color:#888}
 #bo_w .bo_w_link .frm_input{padding-left:50px}
 #bo_w .bo_w_flie .lb_icon{position:absolute;top:0px;left:0px;border-radius:3px 0 0 3px;height:38px;line-height:38px;width:40px;background:#eee;text-align:center;color:#888}
 #bo_w .bo_w_flie .frm_file{padding-left:50px;}

skin/board/gallery/view.skin.php

@@ -54,7 +54,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <!-- 본문 내용 시작 { -->
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
         <!-- } 본문 내용 끝 -->
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>

skin/board/gallery/write.skin.php

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

skin/member/basic/login.skin.php

@@ -30,6 +30,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
     <aside id="login_info">
         <h2>회원로그인 안내</h2>
+        <div>
             <a href="<?php echo G5_BBS_URL ?>/password_lost.php" target="_blank" id="login_password_lost">아이디 비밀번호 찾기</a>
             <a href="./register.php">회원 가입</a>
         </div>

skin/member/basic/memo_view.skin.php

@@ -56,7 +56,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 
             <a href="<?php echo $list_link ?>" class="btn btn_b01"><i class="fa fa-list" aria-hidden="true"></i> 목록</a>
             <button type="button" onclick="window.close();" class="btn_close">창닫기</button>
-            <?php if ($kind == 'recv') {  ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>" class="btn btn_b02">답장</a><?php }  ?>
+            <?php if ($kind == 'recv') {  ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>" class="btn btn_b02 reply_btn">답장</a><?php }  ?>
         </div>
     </div>
 </div>

skin/member/basic/register_form.skin.php

@@ -190,7 +190,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             <?php }  ?>
 
             <?php if ($member['mb_level'] >= $config['cf_icon_level'] && $config['cf_member_img_size'] && $config['cf_member_img_width'] && $config['cf_member_img_height']) {  ?>
-            <li>
+            <li class="reg_mb_img_file">
                 <label for="reg_mb_img" class="frm_label">회원이미지</label>
                 <input type="file" name="mb_img" id="reg_mb_img" >
                                 

skin/member/basic/style.css

@@ -135,7 +135,7 @@ box-shadow: 0 1px 3px #eee;
 #fregisterform .frm_info{display:block;color:#3497d9;font-size:0.92em}
 #fregisterform .form_01 div{margin: 0 0 50px}
 #fregisterform .captcha{display:block;margin:5px 0 0}
-
+#fregisterform .reg_mb_img_file img{max-width:100%;height:auto}
 
 
 /* 회원가입 완료 */
@@ -193,6 +193,7 @@ box-shadow: 0 1px 3px #eee;
 .memo_view_date{text-align:right;color:#555;font-style:italic}
 .memo_view_date strong{font-weight:normal}
 #memo_view .btn_b02{float:right}
+#memo_view .btn_b02.reply_btn{margin-left:4px}
 #memo_view p {padding:10px;border-top:1px solid #ddd;min-height:150px;height:auto !important;height:150px;background:#fff;line-height:1.8em}
 
 #memo_write textarea {height:100px}

skin/popular/basic/popular.skin.php

@@ -9,6 +9,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
 <section id="popular">
     <div>
         <h2>인기검색어</h2>
+        <div class="popular_inner">
         <ul>
         <?php
         if( isset($list) && is_array($list) ){
@@ -20,6 +21,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">',
         }   //end if
         ?>
         </ul>
+        </div>
     </div>
 </section>
 <!-- } 인기검색어 끝 -->

skin/popular/basic/style.css

@@ -1,9 +1,10 @@
 @charset "utf-8";
 /* 인기검색어 */
-#popular {padding:8px 0 0;}
+#popular {margin:8px 0 0;position:relative}
 #popular h2{display:inline-block;font-size:0.92em;color:#4b8bff;background:#fff;line-height:20px;padding:0 5px;border:1px solid #dcdcde;vertical-align:top}
-#popular ul{display:inline-block;padding-top:5px;}
+#popular .popular_inner{position:absolute;left:70px;top:2px;height:18px;overflow:hidden}
+#popular ul{display:inline-block}
 #popular ul:after {display:block;visibility:hidden;clear:both;content:""}
-#popular li{height:13px;line-height:13px;border-left:1px solid #c3c3c3;padding:0 10px;float:left}
+#popular li{height:18px;line-height:18px;border-left:1px solid #c3c3c3;padding:0 10px;float:left}
 #popular li:first-child{border-left:0}
 #popular li a:hover{color:#a22121;text-decoration:underline}

skin/qa/basic/style.css

@@ -270,6 +270,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 #bo_v_ans h2 span{display:inline-block;font-size:11px;background:#555;border-radius:5px;height:22px;line-height:22px;;padding:0 5px;color:#fff;font-weight:normal}
 #bo_v_ans #ans_datetime {padding:0 10px 10px;font-size:0.92em;;background:#eee;;color:#666;font-style:italic}
 #bo_v_ans #ans_con {margin:0 0 10px;padding:15px;line-height:1.8em}
+#bo_v_ans #ans_con img{max-width:100%;height:auto}
 #bo_v_ans #ans_add {text-align:right;padding:15px;}
 #ans_msg {padding:40px 0;background:#f2f5f9;text-align:center}
 #bo_v_ans .add_qa{position:absolute;top:10px;right:10px;background:#f57b8a;color:#fff}
@@ -320,7 +321,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 #bo_w .bo_w_info:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_w .bo_w_info .frm_input{float:left;width:33%}
 #bo_w #wr_password{margin:0 0.5%}
-#bo_w .qa_content_wrap.smarteditor2 iframe{background:#fff}
+.qa_content_wrap.smarteditor2 iframe{background:#fff}
 #bo_w .bo_w_tit{position:relative}
 #bo_w .bo_w_tit .frm_input{padding-right:120px;}
 #bo_w .bo_w_tit #btn_autosave{position:absolute;top:5px;right:5px;line-height:30px;height:30px;}

skin/qa/basic/view.answer.skin.php

@@ -11,7 +11,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     </div>
 
     <div id="ans_con">
-        <?php echo conv_content($answer['qa_content'], $answer['qa_html']); ?>
+        <?php echo get_view_thumbnail(conv_content($answer['qa_content'], $answer['qa_html']), $qaconfig['qa_image_width']); ?>
     </div>
 
     <div id="ans_add">

skin/qa/basic/view.answerform.skin.php

@@ -41,7 +41,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
                 <label for="qa_subject" class="sound_only">제목</label>
                 <input type="text" name="qa_subject" value="" id="qa_subject" required class="frm_input required full_input" size="50" maxlength="255" placeholder="제목">
             </li>
-            <li>
+            <li class="qa_content_wrap <?php echo $is_dhtml_editor ? $config['cf_editor'] : ''; ?>">
                 <label for="qa_content" class="sound_only">내용<strong>필수</strong></label>
                 <span class="wr_content">
                     <?php echo $editor_html; // 에디터 사용시는 에디터로, 아니면 textarea 로 노출 ?>

skin/social/social_login.skin.php

@@ -47,7 +47,7 @@ add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css
         <?php if( social_service_check('twitter') ) {     //트위터 로그인을 사용한다면 ?>
         <a href="<?php echo $self_url;?>?provider=twitter&amp;url=<?php echo $urlencode;?>" class="sns-icon social_link sns-twitter" title="트위터">
             <span class="ico"></span>
-            <span class="txt">트위터+<i> 트위터</i></span>
+            <span class="txt">트위터<i> 로그인</i></span>
         </a>
         <?php }     //end if ?>
         <?php if( social_service_check('payco') ) {     //페이코 로그인을 사용한다면 ?>

theme/basic/css/default.css

@@ -34,7 +34,7 @@ input[type=text],input[type=password], textarea {
 -o-transition: all 0.30s ease-in-out;
 outline: none;
 }
- 
+
 input[type=text]:focus,input[type=password]:focus,  textarea:focus,select:focus {
 -webkit-box-shadow:  0 0 5px #9ed4ff;
 -moz-box-shadow:  0 0 5px #9ed4ff;
@@ -43,8 +43,18 @@ border: 1px solid #558ab7 !important;
 }
 .placeholdersjs { color: #aaa !important; }
 
+/* 레이아웃 크기 지정 */
+#hd, #wrapper, #ft{min-width:1200px}
+
+#hd_pop,
+#hd_wrapper,
+#tnb ul,
+#gnb .gnb_wrap,
+#container_wr,
+#ft_wr{width:1200px}
+
 /* 팝업레이어 */
-#hd_pop {z-index:1000;position:relative;margin:0 auto;width:1200px;height:0}
+#hd_pop {z-index:1000;position:relative;margin:0 auto;height:0}
 #hd_pop h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 .hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff;}
 .hd_pops img{max-width:100%}
@@ -56,10 +66,10 @@ border: 1px solid #558ab7 !important;
 .hd_pops_footer .hd_pops_close{background:#393939;position:absolute;top:0;right:0}
 
 /* 상단 레이아웃 */
-#hd {min-width:1000px;border-top:2px solid #253dbe}
+#hd {border-top:2px solid #253dbe}
 #hd_h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 
-#hd_wrapper {position:relative;margin:0 auto;padding:10px 0;height:115px;width:1200px;zoom:1}
+#hd_wrapper {position:relative;margin:0 auto;padding:10px 0;height:115px;zoom:1}
 #hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""}
 
 #logo {float:left;padding:30px 0 0}
@@ -67,14 +77,14 @@ border: 1px solid #558ab7 !important;
 .hd_sch_wr{position:absolute;top:25px;left:50%;width:430px;margin-left:-215px;}
 #hd_sch h3 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #hd_sch{;border:2px solid #556ada;background:#fff;border-radius:5px;overflow:hidden}
-#hd_sch #sch_stx {padding-left:10px;height:40px;width:376px;border:0;;border-right:0;float:left;font-size:1.25em}
+#hd_sch #sch_stx {padding-left:10px;height:40px;width:376px;border:0;border-right:0;float:left;font-size:1.25em}
 #hd_sch #sch_submit {height:40px;border:0;background:#fff;color:#253dbe;width:50px;float:left;cursor:pointer;font-size:18px}
 
 #sbn_side{position:absolute;top:20px;right:0}
 
 #tnb {border-bottom:1px solid #ddd;background:#fff}
 #tnb h3 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#tnb ul {margin:0 auto;width:1200px;zoom:1}
+#tnb ul {margin:0 auto;zoom:1}
 #tnb ul:after {display:block;visibility:hidden;clear:both;content:""}
 #tnb li {float:right;border-left:1px solid #ddd;margin-bottom:-1px;font-size:0.92em}
 #tnb a {display:inline-block;padding:0 10px;color:#646464;line-height:35px}
@@ -108,7 +118,7 @@ border: 1px solid #558ab7 !important;
 /* 메인메뉴 */
 #gnb{position:relative}
 #gnb h2{position:absolute;font-size:0;line-height:0;overflow:hidden}
-#gnb .gnb_wrap{margin:0 auto;width:1200px;position:relative}
+#gnb .gnb_wrap{margin:0 auto;position:relative}
 #gnb #gnb_1dul {font-size:1.083em;padding: 0;background:#253dbe;zoom:1;
 -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.3);
 -moz-box-shadow:  0 1px 3px rgba(0,0,0,0.3);
@@ -139,7 +149,7 @@ transition: all 0.3s ease-out;}
 .gnb_1dli_on .gnb_2da {}
 .gnb_2da:focus, .gnb_2da:hover {color:#fff}
 .gnb_1dli_over .gnb_2dul {display:block;left:0}
-.gnb_1dli_over2 .gnb_2dul {display:block;right:0;background:#fff}
+.gnb_1dli_over2 .gnb_2dul {display:block;right:0}
 .gnb_wrap .gnb_empty {padding:10px 0;width:100%;text-align:center;line-height:2em;color:#fff}
 .gnb_wrap .gnb_empty a{color:#fff;text-decoration:underline}
 .gnb_wrap .gnb_al_ul .gnb_empty, .gnb_wrap .gnb_al_ul .gnb_empty a{color:#555}
@@ -163,12 +173,12 @@ box-shadow: 0 2px 5px rgba(0,0,0,0.2);}
 /* 중간 레이아웃 */
 #wrapper{}
 #container_wr:after {display:block;visibility:hidden;clear:both;content:""}
-#container_wr {z-index:5;margin:0 auto;width:1200px;height:100%;;zoom:1}
-#aside {float:right;width:305px;padding:0;background: #e7ebf3;height: 100%;border: 1px solid #adbfd2;;margin:20px 0 20px 20px}
+#container_wr {z-index:5;margin:0 auto;height:100%;zoom:1}
+#aside {float:right;width:305px;padding:0;background: #e7ebf3;height: 100%;border: 1px solid #adbfd2;margin:20px 0 20px 20px}
 
 #container {z-index:4;position:relative;float:left;min-height:500px;height:auto !important;margin:20px  0;height:500px;font-size:1em;width:875px;zoom:1}
 #container:after {display:block;visibility:hidden;clear:both;content:""}
-#container_title {font-size:1.333em;max-width:1200px;margin:0 auto;font-weight:bold;}
+#container_title {font-size:1.333em;margin:0 auto;font-weight:bold;}
 #container_title span{margin:0 auto 10px;display:block;line-height:30px;}
 /*.latest_wr:after {display:block;visibility:hidden;clear:both;content:""}*/
 .lt_wr{width:49%}
@@ -177,7 +187,7 @@ box-shadow: 0 2px 5px rgba(0,0,0,0.2);}
 /* 하단 레이아웃 */
 #ft {border-top:1px solid #d5d5d5;background:#fff;padding-bottom:30px;margin:0 auto;text-align:center}
 #ft h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#ft_wr {width:1200px;margin:0 auto;position:relative;}
+#ft_wr {margin:0 auto;position:relative;}
 #ft_link{padding:15px 0;border-bottom:1px solid #eee}
 #ft_link a{;display:inline-block;padding:0 8px;line-height:1.083em;font-weight:bold}
 #ft_catch{margin:20px 0 10px}
@@ -206,8 +216,8 @@ box-shadow: 0 2px 5px rgba(0,0,0,0.2);}
 /* 캡챠 자동등록(입력)방지 기본 -pc */
 #captcha {display:inline-block;position:relative}
 #captcha legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden;}
-#captcha #captcha_img {;height:40px;border:1px solid #898989;;vertical-align:top;padding:0;margin:0}
-#captcha #captcha_mp3 {;margin:0;padding:0;width:40px;height:40px;border:0;background:transparent;vertical-align:middle;overflow:hidden;cursor:pointer;background:url('../../../img/captcha2.png') no-repeat;text-indent:-999px;;border-radius:3px}
+#captcha #captcha_img {;height:40px;border:1px solid #898989;vertical-align:top;padding:0;margin:0}
+#captcha #captcha_mp3 {;margin:0;padding:0;width:40px;height:40px;border:0;background:transparent;vertical-align:middle;overflow:hidden;cursor:pointer;background:url('../../../img/captcha2.png') no-repeat;text-indent:-999px;border-radius:3px}
 #captcha #captcha_reload {margin:0;padding:0;width:40px;height:40px;border:0;background:transparent;vertical-align:middle;overflow:hidden;cursor:pointer;background:url('../../../img/captcha2.png') no-repeat  0 -40px;text-indent:-999px;border-radius:3px}
 #captcha #captcha_key {margin:0 0 0 3px;padding:0 5px;width:90px;height:40px;border:1px solid #ccc;background:#fff;font-size:1.333em;font-weight:bold;text-align:center;border-radius:3px;vertical-align:top}
 #captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em}
@@ -252,7 +262,7 @@ button.btn02 {display:inline-block;margin:0;padding:7px;border:1px solid #3b3c3f
 
 .btn_confirm {text-align:right} /* 서식단계 진행 */
 
-.btn_submit {border:0;background:#253dbe;color:#fff;;cursor:pointer;border:0}
+.btn_submit {border:0;background:#253dbe;color:#fff;cursor:pointer;border:0}
 .btn_submit:hover {background:#0025eb}
 
 a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle;}
@@ -291,7 +301,7 @@ a.btn_admin,.btn_admin {display:inline-block;background:#d13f4a;color:#fff;text-
 .tbl_head01 thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
 .tbl_head01 tfoot th, .tbl_head01 tfoot td {padding:10px 0;border-top:1px solid #c1d1d5;border-bottom:1px solid #c1d1d5;background:#d7e0e2;text-align:center}
 .tbl_head01 tbody th {padding:8px 0;border-bottom:1px solid #e8e8e8}
-.tbl_head01 td {color:#666;background:#fff;;padding:10px 5px;border-top:1px solid #ecf0f1;line-height:1.4em;height:60px;word-break:break-all}
+.tbl_head01 td {color:#666;background:#fff;padding:10px 5px;border-top:1px solid #ecf0f1;line-height:1.4em;height:60px;word-break:break-all}
 .tbl_head01 tbody tr:hover td{background:#fafafa;}
 .tbl_head01 a:hover {text-decoration:underline}
 
@@ -320,7 +330,7 @@ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
 
 .full_input{width:100%}
 .half_input{width:49.5%}
-.tbl_frm01 textarea {width:100%;height:100px}
+.tbl_frm01 textarea, .write_div textarea {width:100%;height:100px}
 .tbl_frm01 a {text-decoration:none}
 .tbl_frm01 .frm_file {display:block;margin-bottom:5px}
 .tbl_frm01 .frm_info {display:block;padding:0 0 5px;line-height:1.4em}
@@ -415,7 +425,7 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 .pg_page, .pg_current {display:inline-block;vertical-align:middle;background:#f3f3f3;border:1px solid #bbbcc3}
 .pg a:focus, .pg a:hover {text-decoration:none}
 .pg_page {color:#555;font-size:1.083em;height:30px;line-height:28px;padding:0 5px;min-width:30px;text-decoration:none;border-radius:3px;}
-.pg_page:hover{background:#ddd}
+.pg_page:hover{background-color:#ddd}
 .pg_start {text-indent:-999px;overflow:hidden;background:url('../img/btn_first.gif') no-repeat 50% 50% #fff;padding:0;border:1px solid #bbb;}
 .pg_prev {text-indent:-999px;overflow:hidden;background:url('../img/btn_prev.gif') no-repeat 50% 50% #fff;padding:0;border:1px solid #bbb}
 .pg_end {text-indent:-999px;overflow:hidden;background:url('../img/btn_end.gif') no-repeat 50% 50% #fff;padding:0;border:1px solid #bbb}

theme/basic/head.php

@@ -33,7 +33,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
             <li><a href="<?php echo G5_BBS_URL ?>/member_confirm.php?url=<?php echo G5_BBS_URL ?>/register_form.php"><i class="fa fa-cog" aria-hidden="true"></i> 정보수정</a></li>
             <li><a href="<?php echo G5_BBS_URL ?>/logout.php"><i class="fa fa-sign-out" aria-hidden="true"></i> 로그아웃</a></li>
             <?php if ($is_admin) {  ?>
-            <li  class="tnb_admin"><a href="<?php echo G5_ADMIN_URL ?>"><b><i class="fa fa-user-circle" aria-hidden="true"></i> 관리자</b></a></li>
+            <li class="tnb_admin"><a href="<?php echo G5_ADMIN_URL ?>"><b><i class="fa fa-user-circle" aria-hidden="true"></i> 관리자</b></a></li>
             <?php }  ?>
             <?php } else {  ?>
             <li><a href="<?php echo G5_BBS_URL ?>/register.php"><i class="fa fa-user-plus" aria-hidden="true"></i> 회원가입</a></li>
@@ -223,5 +223,5 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
     <div id="container_wr">
    
     <div id="container">
-        <?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span><?php echo $g5['title'] ?></span></h2><?php } ?>
+        <?php if (!defined("_INDEX_")) { ?><h2 id="container_title"><span title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></span></h2><?php } ?>
 

theme/basic/mobile/head.php

@@ -189,4 +189,4 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
 <div id="wrapper">
 
     <div id="container">
-    <?php if (!defined("_INDEX_")) { ?><h2 id="container_title" class="top"><?php echo $g5['title'] ?></h2><?php } ?>
+    <?php if (!defined("_INDEX_")) { ?><h2 id="container_title" class="top" title="<?php echo get_text($g5['title']); ?>"><?php echo get_head_title($g5['title']); ?></h2><?php } ?>

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

@@ -11,9 +11,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 ?>
 
 <?php if ($rss_href || $write_href) { ?>
-<ul class="btn_top top">
+<ul class="<?php echo isset($view) ? 'view_is_list btn_top' : 'btn_top top';?>">
     <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
-    <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin"><i class="fa fa-user-circle" aria-hidden="true"></i><span class="sound_only"관리자</span></a></li><?php } ?>
+    <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin"><i class="fa fa-user-circle" aria-hidden="true"></i><span class="sound_only">관리자</span></a></li><?php } ?>
     <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02"><i class="fa fa-pencil" aria-hidden="true"></i> 글쓰기</a></li><?php } ?>
 </ul>
 <?php } ?>

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

@@ -101,6 +101,10 @@ box-shadow: 0 0 8px  rgba(65,98,255,0.8);}
 #bo_sch .sch_input{height:38px;border:0;padding:0;background-color:transparent;float:left;width:60%;padding:0 40px 0 10px}
 #bo_sch .sch_btn{height:38px;position:absolute;top:0;right:0;border:0;width:40px;background:none;font-size:15px}
 
+.view_is_list.btn_top{position:relative;z-index:auto;top:0;left:0}
+.view_is_list{margin:8px 10px 0;height:50px;padding:10px;line-height:30px;border-radius:3px;border-bottom:1px solid #ccc;background:#fff;color:#333;text-align:right}
+.view_is_list li{display:inline-block}
+
 #bo_list{margin:10px 0}
 
 /* 게시판 쓰기 */
@@ -179,6 +183,7 @@ box-shadow: 0 0 8px rgba(65,98,255,0.8);}
 
 #bo_v_img {margin:0 0 10px;width:100%;overflow:hidden;zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
+#bo_v_img a.view_image{display:block}
 #bo_v_img img {margin-bottom:15px;max-width:100%;height:auto}
 
 #bo_v_con {min-height:200px;margin-bottom:20px;width:100%;font-size:1.250em;line-height:1.7em;word-break:break-all;overflow:hidden}

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

@@ -75,7 +75,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
 
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
 
@@ -153,17 +153,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </section>
     <?php } ?>
 
-    <?php
-    if ($view['link']['count']) {
-        $cnt = 0;
-        for ($i=0; $i<count($view['link']); $i++) {
-            if (isset($view['link'][$i]['source']) && $view['link'][$i]['source'] && !$view['link'][$i]['view'])
-                $cnt++;
-        }
-    }
-     ?>
-
-    <?php if($cnt) { ?>
+    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>
         <ul>
@@ -188,6 +179,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
         </ul>
     </section>
+    <!-- } 관련링크 끝 -->
     <?php } ?>
 
     <?php if ($prev_href || $next_href) { ?>

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

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

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

@@ -9,7 +9,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 <script src="<?php echo G5_JS_URL; ?>/jquery.fancylist.js"></script>
 
 <?php if ($rss_href || $write_href) { ?>
-<ul class="btn_top top">
+<ul class="<?php echo isset($view) ? 'view_is_list btn_top' : 'btn_top top';?>">
     <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01"><i class="fa fa-rss" aria-hidden="true"></i><span class="sound_only">RSS</span></a></li><?php } ?>
     <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin"><i class="fa fa-user-circle" aria-hidden="true"></i><span class="sound_only">관리자</span></a></li><?php } ?>
     <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02"><i class="fa fa-pencil" aria-hidden="true"></i> 글쓰기</a></li><?php } ?>