Merge branch '54' of github.com:gnuboard/g5 into 54

adm/board_copy.php

@@ -58,6 +58,19 @@ include_once(G5_PATH.'/head.sub.php');
 <script>
 function fboardcopy_check(f)
 {
+    <?php
+    if(!$w){
+    $js_array = get_bo_table_banned_word();
+    echo "var banned_array = ". json_encode($js_array) . ";\n";
+    }
+    ?>
+
+    // 게시판명이 금지된 단어로 되어 있으면
+    if( (typeof banned_array != 'undefined') && jQuery.inArray(f.target_table.value, banned_array) !== -1 ){
+        alert("입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.");
+        return false;
+    }
+
     if (f.bo_table.value == f.target_table.value) {
         alert("원본 테이블명과 복사할 테이블명이 달라야 합니다.");
         return false;

adm/board_copy_update.php

@@ -15,6 +15,11 @@ if (!preg_match('/[A-Za-z0-9_]{1,20}/', $target_table)) {
     alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)');
 }
 
+// 게시판명이 금지된 단어로 되어 있으면
+if ( $w == '' && in_array($target_table, get_bo_table_banned_word()) ){
+    alert('입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.');
+}
+
 $row = sql_fetch(" select count(*) as cnt from {$g5['board_table']} where bo_table = '$target_table' ");
 if ($row['cnt'])
     alert($target_table.'은(는) 이미 존재하는 게시판 테이블명 입니다.\\n복사할 테이블명으로 사용할 수 없습니다.');

adm/board_form.php

@@ -1372,6 +1372,19 @@ jQuery(function($){
 
 function fboardform_submit(f)
 {
+    <?php
+    if(!$w){
+    $js_array = get_bo_table_banned_word();
+    echo "var banned_array = ". json_encode($js_array) . ";\n";
+    }
+    ?>
+
+    // 게시판명이 금지된 단어로 되어 있으면
+    if( (typeof banned_array != 'undefined') && jQuery.inArray(f.bo_table.value, banned_array) !== -1 ){
+        alert("입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.");
+        return false;
+    }
+
     <?php echo get_editor_js("bo_content_head"); ?>
     <?php echo get_editor_js("bo_content_tail"); ?>
     <?php echo get_editor_js("bo_mobile_content_head"); ?>

adm/board_form_update.php

@@ -17,6 +17,11 @@ if (!$bo_table) { alert('게시판 TABLE명은 반드시 입력하세요.'); }
 if (!preg_match("/^([A-Za-z0-9_]{1,20})$/", $bo_table)) { alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)'); }
 if (!$_POST['bo_subject']) { alert('게시판 제목을 입력하세요.'); }
 
+// 게시판명이 금지된 단어로 되어 있으면
+if ( $w == '' && in_array($bo_table, get_bo_table_banned_word()) ){
+    alert('입력한 게시판 TABLE명을 사용할수 없습니다. 다른 이름으로 입력해 주세요.');
+}
+
 $bo_include_head = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($bo_include_head, 0, 255));
 $bo_include_tail = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($bo_include_tail, 0, 255));
 

adm/view.php

@@ -3,10 +3,18 @@ include_once('./_common.php');
 
 $call = isset($_REQUEST['call']) ?  strtolower(preg_replace('/[^a-z0-9_]/i', '', $_REQUEST['call'])) : '';
 
-if( ! $call || ! $is_admin ){
+if( ! $call ){
     return;
 }
 
+if( ! $is_admin ){
+	$sql = " select count(*) as cnt from {$g5['auth_table']} where mb_id = '{$member['mb_id']}' ";
+	$row = sql_fetch($sql);
+	if ( ! $row['cnt']) {
+		return;
+	}
+}
+
 run_event('admin_request_handler_'.$call, $arr_query, $token);
 
 $sub_menu = admin_menu_find_by($call, 'sub_menu');

adm/write_count.php

@@ -6,27 +6,27 @@ check_demo();
 
 auth_check($auth[$sub_menu], 'r');
 
+$g5['title'] = '글,댓글 현황';
+include_once ('./admin.head.php');
+
 // http://www.jqplot.com/
-add_stylesheet('<link rel="stylesheet" href="'.G5_PLUGIN_URL.'/jqplot/jquery.jqplot.css">', 0);
-add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/jquery.jqplot.js"></script>', 0);
-add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.canvasTextRenderer.min.js"></script>', 0);
-add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"></script>', 0);
-add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.pointLabels.min.js"></script>', 0);
-add_javascript('<!--[if lt IE 9]><script src="'.G5_PLUGIN_URL.'/jqplot/excanvas.js"></script><![endif]-->', 0);
+add_stylesheet('<link rel="stylesheet" href="'.G5_PLUGIN_URL.'/jqplot/jquery.jqplot.css">', 1);
+add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/jquery.jqplot.js"></script>', 1);
+add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.canvasTextRenderer.min.js"></script>', 1);
+add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"></script>', 1);
+add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/plugins/jqplot.pointLabels.min.js"></script>', 1);
+add_javascript('<!--[if lt IE 9]><script src="'.G5_PLUGIN_URL.'/jqplot/excanvas.js"></script><![endif]-->', 1);
 
 if (!($graph == 'line' || $graph == 'bar'))
     $graph = 'line';
 
 if ($graph == 'bar') {
     // 바 타입으로 사용하는 코드입니다.
-    add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/jqplot.barRenderer.min.js"></script>', 0);
-    add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/jqplot.categoryAxisRenderer.min.js"></script>', 0);
-    add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/jqplot.pointLabels.min.js"></script>', 0);
+    add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/jqplot.barRenderer.min.js"></script>', 1);
+    add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/jqplot.categoryAxisRenderer.min.js"></script>', 1);
+    add_javascript('<script src="'.G5_PLUGIN_URL.'/jqplot/jqplot.pointLabels.min.js"></script>', 1);
 }
 
-$g5['title'] = '글,댓글 현황';
-include_once ('./admin.head.php');
-
 $period_array = array(
     '오늘'=>array('시간', 0),
     '어제'=>array('시간', 0),

bbs/good.php

@@ -92,7 +92,7 @@ if(isset($_POST['js']) && $_POST['js'] === "on") {
 
     if (!$is_member)
     {
-        $href = './login.php?'.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id));
+        $href = G5_BBS_URL.'/login.php?'.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id));
 
         alert('회원만 가능합니다.', $href);
     }

bbs/view_comment.php

@@ -119,6 +119,7 @@ else
 }
 
 $comment_action_url = https_url(G5_BBS_DIR)."/write_comment_update.php";
+$comment_common_url = short_url_clean(G5_BBS_URL.'/board.php?'.clean_query_string($_SERVER['QUERY_STRING']));
 
 include_once($board_skin_path.'/view_comment.skin.php');
 

bbs/view_image.php

@@ -23,57 +23,87 @@ if(strpos($filename, G5_DATA_DIR.'/editor')) {
     $filepath = G5_DATA_PATH.'/file/'.$bo_table.'/'.$filename;
 }
 
-if(is_file($filepath)) {
-    $size = @getimagesize($filepath);
+$file_exists = (is_file($filepath) && file_exists($filepath)) ? 1 : 0;
+
+if($file_exists = run_replace('exists_view_image', $file_exists, $filepath, $editor_file)) {
+    $size = $file_exists ? run_replace('get_view_imagesize', @getimagesize($filepath), $filepath, $editor_file) : array();
     if(empty($size))
         alert_close('이미지 파일이 아닙니다.');
 
-    $width = $size[0];
-    $height = $size[1];
+    $width = (isset($size[0]) && $size[0]) ? (int) $size[0] : 0;
+    $height = (isset($size[1]) && $size[1]) ? (int) $size[1] : 0;
 
     if($editor_file)
-        $fileurl = G5_DATA_URL.'/'.$editor_file;
+        $fileurl = run_replace('get_editor_content_url', G5_DATA_URL.'/'.$editor_file);
     else
-        $fileurl = G5_DATA_URL.'/file/'.$bo_table.'/'.$filename;
+        $fileurl = run_replace('get_file_board_url', G5_DATA_URL.'/file/'.$bo_table.'/'.$filename, $bo_table);
 
-    $img = '<img src="'.$fileurl.'" alt="" width="'.$width.'" height="'.$height.'" class="draggable" style="position:relative;top:0;left:0;cursor:move;">';
+    $img_attr = ($width && $height) ? 'width="'.$width.'" height="'.$height.'"' : '';
+
+    $img = '<img src="'.$fileurl.'" alt="" '.$img_attr.' class="draggable" style="position:relative;top:0;left:0;cursor:move;">';
 } else {
     alert_close('파일이 존재하지 않습니다.');
 }
 ?>
 
-<div><?php echo $img ?></div>
+<div class="bbs-view-image"><?php echo $img ?></div>
 
 <script>
-var win_w = <?php echo $width ?>;
-var win_h = <?php echo $height ?> + 70;
-var win_l = (screen.width - win_w) / 2;
-var win_t = (screen.height - win_h) / 2;
 
-if(win_w > screen.width) {
-    win_l = 0;
-    win_w = screen.width - 20;
+jQuery(function($){
 
-    if(win_h > screen.height) {
-        win_t = 0;
-        win_h = screen.height - 40;
-    }
-}
+$.fn.imgLoad = function(callback) {
+    return this.each(function() {
+        if (callback) {
+            if (this.complete || /*for IE 10-*/ $(this).height() > 0) {
+                callback.apply(this);
+            }
+            else {
+                $(this).on('load', function(){
+                    callback.apply(this);
+                });
+            }
+        }
+    });
+};
 
-if(win_h > screen.height) {
-    win_t = 0;
-    win_h = screen.height - 40;
+    $(".bbs-view-image img").imgLoad(function(){
 
-    if(win_w > screen.width) {
-        win_w = screen.width - 20;
-        win_l = 0;
-    }
-}
+        var win_w = <?php echo $width ?>;
+        var win_h = <?php echo $height ?> + 70;
 
-window.moveTo(win_l, win_t);
-window.resizeTo(win_w, win_h);
+        if( !win_w || !win_h ){
+            win_w = $(this).width();
+            win_h = $(this).height();
+        }
+
+        var win_l = (screen.width - win_w) / 2;
+        var win_t = (screen.height - win_h) / 2;
+
+        if(win_w > screen.width) {
+            win_l = 0;
+            win_w = screen.width - 20;
+
+            if(win_h > screen.height) {
+                win_t = 0;
+                win_h = screen.height - 40;
+            }
+        }
+
+        if(win_h > screen.height) {
+            win_t = 0;
+            win_h = screen.height - 40;
+
+            if(win_w > screen.width) {
+                win_w = screen.width - 20;
+                win_l = 0;
+            }
+        }
+
+        window.moveTo(win_l, win_t);
+        window.resizeTo(win_w, win_h);
+    });
 
-$(function() {
     var is_draggable = false;
     var x = y = 0;
     var pos_x = pos_y = 0;

bbs/write.php

@@ -42,7 +42,7 @@ if ($w == '') {
         if ($member['mb_id']) {
             alert('글을 쓸 권한이 없습니다.');
         } else {
-            alert("글을 쓸 권한이 없습니다.\\n회원이시라면 로그인 후 이용해 보십시오.", './login.php?'.$qstr.'&url='.urlencode($_SERVER['SCRIPT_NAME'].'?bo_table='.$bo_table));
+            alert("글을 쓸 권한이 없습니다.\\n회원이시라면 로그인 후 이용해 보십시오.", G5_BBS_URL.'/login.php?'.$qstr.'&url='.urlencode($_SERVER['SCRIPT_NAME'].'?bo_table='.$bo_table));
         }
     }
 
@@ -64,7 +64,7 @@ if ($w == '') {
         if ($member['mb_id']) {
             alert('글을 수정할 권한이 없습니다.');
         } else {
-            alert('글을 수정할 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&url='.urlencode($_SERVER['SCRIPT_NAME'].'?bo_table='.$bo_table));
+            alert('글을 수정할 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', G5_BBS_URL.'/login.php?'.$qstr.'&url='.urlencode($_SERVER['SCRIPT_NAME'].'?bo_table='.$bo_table));
         }
     }
 
@@ -97,7 +97,7 @@ if ($w == '') {
         if ($member['mb_id'])
             alert('글을 답변할 권한이 없습니다.');
         else
-            alert('답변글을 작성할 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&url='.urlencode($_SERVER['SCRIPT_NAME'].'?bo_table='.$bo_table));
+            alert('답변글을 작성할 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', G5_BBS_URL.'/login.php?'.$qstr.'&url='.urlencode($_SERVER['SCRIPT_NAME'].'?bo_table='.$bo_table));
     }
 
     $tmp_point = isset($member['mb_point']) ? $member['mb_point'] : 0;

bbs/write_update.php

@@ -333,7 +333,7 @@ if ($w == '' || $w == 'r') {
             alert('자신의 글이 아니므로 수정할 수 없습니다.', $return_url);
     } else {
         if ($write['mb_id'])
-            alert('로그인 후 수정하세요.', './login.php?url='.urlencode($return_url));
+            alert('로그인 후 수정하세요.', G5_BBS_URL.'/login.php?url='.urlencode($return_url));
     }
 
     if ($member['mb_id']) {

common.php

@@ -38,7 +38,7 @@ function g5_path()
     $server_script_filename = preg_replace('/\/+/', '/', str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME'])); 
     $tilde_remove = preg_replace('/^\/\~[^\/]+(.*)$/', '$1', $server_script_name); 
     $document_root = str_replace($tilde_remove, '', $server_script_filename); 
-    $pattern = '/' . preg_quote($document_root, '/') . '/i'; 
+    $pattern = '/.*?' . preg_quote($document_root, '/') . '/i';
     $root = preg_replace($pattern, '', $result['path']); 
     $port = ($_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443) ? '' : ':'.$_SERVER['SERVER_PORT']; 
     $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://'; 

config.php

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

css/default.css

@@ -104,7 +104,7 @@ border:1px solid #558ab7 !important;
 /* 메인메뉴 */
 #gnb {position:relative;background:#fff}
 #gnb > h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#gnb .gnb_wrap {margin:0 auto;position:relative;z-index:10}
+#gnb .gnb_wrap {margin:0 auto;position:relative;z-index:3}
 #gnb #gnb_1dul {font-size:1.083em;padding:0;border-bottom:1px solid #e0e2e5;zoom:1}
 #gnb ul:after {display:block;visibility:hidden;clear:both;content:""}
 #gnb .gnb_1dli {float:left;line-height:55px;padding:0px;position:relative}
@@ -157,10 +157,10 @@ 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;height:100%;zoom:1}
+#container_wr {z-index:2;margin:0 auto;height:100%;zoom:1}
 #aside {float:right;width:235px;padding:0;height:100%;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:930px;zoom:1}
+#container {z-index:1;position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;height:500px;font-size:1em;width:930px;zoom:1}
 #container:after {display:block;visibility:hidden;clear:both;content:""}
 #container_title {font-size:1.333em;margin:0 auto;font-weight:bold}
 #container_title span {margin:0 auto 10px;display:block;line-height:30px}

head.php

@@ -110,31 +110,8 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
             <ul id="gnb_1dul">
                 <li class="gnb_1dli gnb_mnal"><button type="button" class="gnb_menu_btn" title="전체메뉴"><i class="fa fa-bars" aria-hidden="true"></i><span class="sound_only">전체메뉴열기</span></button></li>
                 <?php
-                $sql = " select *
-                            from {$g5['menu_table']}
-                            where me_use = '1'
-                              and length(me_code) = '2'
-                            order by me_order, me_id ";
-                $result = sql_query($sql, false);
-                $gnb_zindex = 999; // gnb_1dli z-index 값 설정용
-                $menu_datas = array();
-
-                for ($i=0; $row=sql_fetch_array($result); $i++) {
-                    $menu_datas[$i] = $row;
-
-                    $sql2 = " select *
-                                from {$g5['menu_table']}
-                                where me_use = '1'
-                                  and length(me_code) = '4'
-                                  and substring(me_code, 1, 2) = '{$row['me_code']}'
-                                order by me_order, me_id ";
-                    $result2 = sql_query($sql2);
-                    for ($k=0; $row2=sql_fetch_array($result2); $k++) {
-                        $menu_datas[$i]['sub'][$k] = $row2;
-                    }
-
-                }
-
+				$menu_datas = get_menu_db(0, true);
+				$gnb_zindex = 999; // gnb_1dli z-index 값 설정용
                 $i = 0;
                 foreach( $menu_datas as $row ){
                     if( empty($row) ) continue;

head.sub.php

@@ -84,16 +84,16 @@ var g5_admin_url = "<?php echo G5_ADMIN_URL; ?>";
 <?php } ?>
 </script>
 <?php
-add_javascript('<script src="'.G5_JS_URL.'/jquery-1.12.4.min.js"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/jquery-migrate-1.4.1.min.js"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/jquery.menu.js?ver='.G5_JS_VER.'"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/common.js?ver='.G5_JS_VER.'"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/wrest.js?ver='.G5_JS_VER.'"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/placeholders.min.js"></script>', 1);
-add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/font-awesome/css/font-awesome.min.css">', 1);
+add_javascript('<script src="'.G5_JS_URL.'/jquery-1.12.4.min.js"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/jquery-migrate-1.4.1.min.js"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/jquery.menu.js?ver='.G5_JS_VER.'"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/common.js?ver='.G5_JS_VER.'"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/wrest.js?ver='.G5_JS_VER.'"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/placeholders.min.js"></script>', 0);
+add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/font-awesome/css/font-awesome.min.css">', 0);
 
 if(G5_IS_MOBILE) {
-    add_javascript('<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>', 2); // overflow scroll 감지
+    add_javascript('<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>', 1); // overflow scroll 감지
 }
 if(!defined('G5_IS_ADMIN'))
     echo $config['cf_add_script'];

lib/common.lib.php

@@ -21,7 +21,8 @@ function get_microtime()
 function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
 {
     //$url = preg_replace('#&page=[0-9]*(&page=)$#', '$1', $url);
-    $url = preg_replace('#&page=[0-9]*#', '', $url) . '&page=';
+    $url = preg_replace('#(&)?page=[0-9]*#', '', $url);
+	$url .= substr($url, -1) === '?' ? 'page=' : '&page=';
 
     $str = '';
     if ($cur_page > 1) {

lib/get_data.lib.php

@@ -88,6 +88,53 @@ function get_board_db($bo_table, $is_cache=false){
     return $cache[$key];
 }
 
+function get_menu_db($use_mobile=0, $is_cache=false){
+    global $g5;
+
+    static $cache = array();
+    
+	$cache = run_replace('get_menu_db_cache', $cache, $use_mobile, $is_cache);
+	
+	$key = md5($use_mobile);
+
+    if( $is_cache && isset($cache[$key]) ){
+        return $cache[$key];
+    }
+	
+	$where = $use_mobile ? "me_mobile_use = '1'" : "me_use = '1'";
+
+	if( !($cache[$key] = run_replace('get_menu_db', array(), $use_mobile)) ){
+		$sql = " select *
+					from {$g5['menu_table']}
+					where $where
+					  and length(me_code) = '2'
+					order by me_order, me_id ";
+		$result = sql_query($sql, false);
+
+		for ($i=0; $row=sql_fetch_array($result); $i++) {
+			
+			$row['ori_me_link'] = $row['me_link'];
+			$row['me_link'] = short_url_clean($row['me_link']);
+			$cache[$key][$i] = $row;
+
+			$sql2 = " select *
+						from {$g5['menu_table']}
+						where $where
+						  and length(me_code) = '4'
+						  and substring(me_code, 1, 2) = '{$row['me_code']}'
+						order by me_order, me_id ";
+			$result2 = sql_query($sql2);
+			for ($k=0; $row2=sql_fetch_array($result2); $k++) {
+				$row2['ori_me_link'] = $row2['me_link'];
+				$row2['me_link'] = short_url_clean($row2['me_link']);
+				$cache[$key][$i]['sub'][$k] = $row2;
+			}
+		}
+	}
+
+	return $cache[$key];
+}
+
 // 게시판 테이블에서 하나의 행을 읽음
 function get_content_by_field($write_table, $type='bbs', $where_field='', $where_value='', $is_cache=false)
 {

lib/thumbnail.lib.php

@@ -53,7 +53,7 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
 
     if(!$filename)
         return false;
-
+    
     if( $thumbnail_info = run_replace('get_list_thumbnail_info', array(), array('bo_table'=>$bo_table, 'wr_id'=>$wr_id, 'data_path'=>$data_path, 'edt'=>$edt, 'filename'=>$filename, 'filepath'=>$filepath, 'thumb_width'=>$thumb_width, 'thumb_height'=>$thumb_height, 'is_create'=>$is_create, 'is_crop'=>$is_crop, 'crop_mode'=>$crop_mode, 'is_sharpen'=>$is_sharpen, 'um_value'=>$um_value)) ){
         return $thumbnail_info;
     }
@@ -202,7 +202,7 @@ function get_view_thumbnail($contents, $thumb_width=0)
         }
     }
 
-    return $contents;
+    return run_replace('get_view_thumbnail', $contents);
 }
 
 function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_height, $is_create, $is_crop=false, $crop_mode='center', $is_sharpen=false, $um_value='80/0.5/3')

mobile/head.php

@@ -38,40 +38,32 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
 			<?php echo outlogin('basic'); // 외부 로그인 ?>
             <ul id="gnb_1dul">
             <?php
-            $sql = " select *
-                        from {$g5['menu_table']}
-                        where me_mobile_use = '1'
-                          and length(me_code) = '2'
-                        order by me_order, me_id ";
-            $result = sql_query($sql, false);
-
-            for($i=0; $row=sql_fetch_array($result); $i++) {
+            $menu_datas = get_menu_db(1, true);
+			$i = 0;
+			foreach( $menu_datas as $row ){
+				if( empty($row) ) continue;
             ?>
                 <li class="gnb_1dli">
                     <a href="<?php echo $row['me_link']; ?>" target="_<?php echo $row['me_target']; ?>" class="gnb_1da"><?php echo $row['me_name'] ?></a>
                     <?php
-                    $sql2 = " select *
-                                from {$g5['menu_table']}
-                                where me_mobile_use = '1'
-                                  and length(me_code) = '4'
-                                  and substring(me_code, 1, 2) = '{$row['me_code']}'
-                                order by me_order, me_id ";
-                    $result2 = sql_query($sql2);
-
-                    for ($k=0; $row2=sql_fetch_array($result2); $k++) {
+                    $k = 0;
+                    foreach( (array) $row['sub'] as $row2 ){
+						if( empty($row2) ) continue;
                         if($k == 0)
                             echo '<button type="button" class="btn_gnb_op"><span class="sound_only">하위분류</span></button><ul class="gnb_2dul">'.PHP_EOL;
                     ?>
                         <li class="gnb_2dli"><a href="<?php echo $row2['me_link']; ?>" target="_<?php echo $row2['me_target']; ?>" class="gnb_2da"><span></span><?php echo $row2['me_name'] ?></a></li>
                     <?php
-                    }
+					$k++;
+                    }	//end foreach $row2
 
                     if($k > 0)
                         echo '</ul>'.PHP_EOL;
                     ?>
                 </li>
             <?php
-            }
+			$i++;
+            }	//end foreach $row
 
             if ($i == 0) {  ?>
                 <li id="gnb_empty">메뉴 준비 중입니다.<?php if ($is_admin) { ?> <br><a href="<?php echo G5_ADMIN_URL; ?>/menu_list.php">관리자모드 &gt; 환경설정 &gt; 메뉴설정</a>에서 설정하세요.<?php } ?></li>

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

@@ -108,7 +108,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 				<div class="bo_info">
                     <span class="sound_only">작성자</span><?php echo $list[$i]['name'] ?>
                     <span class="bo_date"><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $list[$i]['datetime2'] ?></span>
-                	<span class="bo_view"><i class="fa fa-eye" aria-hidden="true"></i> <?php echo number_format($view['wr_hit']) ?><span class="sound_only">회</span></span>
+                	<span class="bo_view"><i class="fa fa-eye" aria-hidden="true"></i> <?php echo number_format($list[$i]['wr_hit']) ?><span class="sound_only">회</span></span>
                 	<?php if ($is_good) { ?><span class="sound_only">추천</span><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?><?php } ?>
                     <?php if ($is_nogood) { ?><span class="sound_only">비추천</span><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> <?php echo $list[$i]['wr_nogood'] ?><?php } ?>
                 </div>        

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

@@ -20,6 +20,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         // if (strstr($list[$i]['wr_option'], "secret"))
             // $str = $str;
 		$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $str);
+		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
+		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
     ?>
     <article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-bottom-color:#f8f8f8"<?php } ?>>
         <div class="comment_inner">
@@ -67,8 +69,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                 </p>
 
                 <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
-                    $query_string = clean_query_string($_SERVER['QUERY_STRING']);
-
                     if($w == 'cu') {
                         $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
                         $cmt = sql_fetch($sql);
@@ -76,9 +76,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                             $cmt['wr_content'] = '';
                         $c_wr_content = $cmt['wr_content'];
                     }
-
-                    $c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
-                    $c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
                 ?>
                 <?php } ?>
             </div>

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

@@ -20,6 +20,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         // if (strstr($list[$i]['wr_option'], "secret"))
             // $str = $str;
 		$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $str);
+		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
+		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
     ?>
     <article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-bottom-color:#f8f8f8"<?php } ?>>
         <div class="comment_inner">
@@ -67,8 +69,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                 </p>
 
                 <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
-                    $query_string = clean_query_string($_SERVER['QUERY_STRING']);
-
                     if($w == 'cu') {
                         $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
                         $cmt = sql_fetch($sql);
@@ -76,9 +76,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                             $cmt['wr_content'] = '';
                         $c_wr_content = $cmt['wr_content'];
                     }
-
-                    $c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
-                    $c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
                 ?>
                 <?php } ?>
             </div>

mobile/skin/latest/basic/style.css

@@ -15,7 +15,7 @@
 .lt .lt_date {color:#828282}
 .lt .latest-sel{margin-top:1px}
 
-.lt .lt_more {position:absolute;top:15px;right:15px;color:#3a8afd;background:#fff;border:1px solid #d1d7e5;font-size:0.925em;border-radius:3px;padding:4px 5px}
+.lt .lt_more {position:absolute;top:15px;right:15px;color:#3a8afd;background:#fff;border:1px solid #d1d7e5;font-size:0.925em;border-radius:3px;padding:4px 5px;z-index:1}
 .lt .lt_cmt {background:#e9eff5;color:#3a8afd;font-size:11px;height:16px;line-height:16px;padding:0 5px;border-radius:3px;vertical-align:middle}
 
 .lt .profile_img img {border-radius:50%;vertical-align:top}

mobile/skin/new/basic/new.skin.php

@@ -46,7 +46,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$new_skin_url.'/style.css">', 0);
         $wr_subject = get_text(cut_str($list[$i]['wr_subject'], 80));
     ?>
     <li>
-    	<a href="./board.php?bo_table=<?php echo $list[$i]['bo_table'] ?>" class="new_board"><?php echo $bo_subject ?></a>
+    	<a href="<?php echo get_pretty_url($list[$i]['bo_table']); ?>" class="new_board"><?php echo $bo_subject ?></a>
         <a href="<?php echo $list[$i]['href'] ?>" class="new_tit"><?php echo $list[$i]['comment'] ?><?php echo $wr_subject ?></a>
         <div class="new_info">
         	<span class="sound_only">작성자</span><?php echo $list[$i]['name'] ?>

skin/board/basic/view_comment.skin.php

@@ -24,6 +24,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         */
         $comment = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $comment);
         $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결
+		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
+		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
 	?>
 
 	<article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-top-color:#e0e0e0"<?php } ?>>
@@ -52,8 +54,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                <?php echo $comment ?>
 	            </p>
 	            <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
-	                $query_string = clean_query_string($_SERVER['QUERY_STRING']);
-	
 	                if($w == 'cu') {
 	                    $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
 	                    $cmt = sql_fetch($sql);
@@ -61,9 +61,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                        $cmt['wr_content'] = '';
 	                    $c_wr_content = $cmt['wr_content'];
 	                }
-	
-	                $c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
-	                $c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
 				?>
 	            <?php } ?>
 	        </div>

skin/board/gallery/style.css

@@ -103,7 +103,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall #gall_ul {margin:10px -10px 0;padding:0;list-style:none;zoom:1}
 #bo_gall #gall_ul:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_gall .gall_li {}
-#bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px}
+#bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px;z-index:1}
 #bo_gall .gall_box {position:relative;margin:0 0 50px 0;border-radius:0 0 2px 2px}
 #bo_gall .gall_con {position:relative}
 

skin/board/gallery/view_comment.skin.php

@@ -24,6 +24,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         */
         $comment = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $comment);
         $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결
+		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
+		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
 	?>
 
 	<article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-top-color:#e0e0e0"<?php } ?>>
@@ -52,8 +54,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                <?php echo $comment ?>
 	            </p>
 	            <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
-	                $query_string = clean_query_string($_SERVER['QUERY_STRING']);
-	
 	                if($w == 'cu') {
 	                    $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
 	                    $cmt = sql_fetch($sql);
@@ -61,9 +61,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                        $cmt['wr_content'] = '';
 	                    $c_wr_content = $cmt['wr_content'];
 	                }
-	
-	                $c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
-	                $c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
 				?>            
 	            <?php } ?>
 	        </div>

skin/new/basic/new.skin.php

@@ -96,7 +96,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$new_skin_url.'/style.css">', 0);
         </td>
         <?php } ?>
         <td class="td_group"><a href="./new.php?gr_id=<?php echo $list[$i]['gr_id'] ?>"><?php echo $gr_subject ?></a></td>
-        <td class="td_board"><a href="./board.php?bo_table=<?php echo $list[$i]['bo_table'] ?>"><?php echo $bo_subject ?></a></td>
+        <td class="td_board"><a href="<?php echo get_pretty_url($list[$i]['bo_table']); ?>"><?php echo $bo_subject ?></a></td>
         <td><a href="<?php echo $list[$i]['href'] ?>" class="new_tit"><?php echo $list[$i]['comment'] ?><?php echo $wr_subject ?></a></td>
         <td class="td_name"><?php echo $list[$i]['name'] ?></td>
         <td class="td_date"><?php echo $list[$i]['datetime2'] ?></td>

theme/basic/css/default.css

@@ -104,7 +104,7 @@ border:1px solid #558ab7 !important;
 /* 메인메뉴 */
 #gnb {position:relative;background:#fff}
 #gnb > h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#gnb .gnb_wrap {margin:0 auto;position:relative;z-index:10}
+#gnb .gnb_wrap {margin:0 auto;position:relative;z-index:3}
 #gnb #gnb_1dul {font-size:1.083em;padding:0;border-bottom:1px solid #e0e2e5;zoom:1}
 #gnb ul:after {display:block;visibility:hidden;clear:both;content:""}
 #gnb .gnb_1dli {float:left;line-height:55px;padding:0px;position:relative}
@@ -157,10 +157,10 @@ 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;height:100%;zoom:1}
+#container_wr {z-index:2;margin:0 auto;height:100%;zoom:1}
 #aside {float:right;width:235px;padding:0;height:100%;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:930px;zoom:1}
+#container {z-index:1;position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;height:500px;font-size:1em;width:930px;zoom:1}
 #container:after {display:block;visibility:hidden;clear:both;content:""}
 #container_title {font-size:1.333em;margin:0 auto;font-weight:bold}
 #container_title span {margin:0 auto 10px;display:block;line-height:30px}

theme/basic/head.php

@@ -105,31 +105,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
             <ul id="gnb_1dul">
                 <li class="gnb_1dli gnb_mnal"><button type="button" class="gnb_menu_btn" title="전체메뉴"><i class="fa fa-bars" aria-hidden="true"></i><span class="sound_only">전체메뉴열기</span></button></li>
                 <?php
-                $sql = " select *
-                            from {$g5['menu_table']}
-                            where me_use = '1'
-                              and length(me_code) = '2'
-                            order by me_order, me_id ";
-                $result = sql_query($sql, false);
-                $gnb_zindex = 999; // gnb_1dli z-index 값 설정용
-                $menu_datas = array();
-
-                for ($i=0; $row=sql_fetch_array($result); $i++) {
-                    $menu_datas[$i] = $row;
-
-                    $sql2 = " select *
-                                from {$g5['menu_table']}
-                                where me_use = '1'
-                                  and length(me_code) = '4'
-                                  and substring(me_code, 1, 2) = '{$row['me_code']}'
-                                order by me_order, me_id ";
-                    $result2 = sql_query($sql2);
-                    for ($k=0; $row2=sql_fetch_array($result2); $k++) {
-                        $menu_datas[$i]['sub'][$k] = $row2;
-                    }
-
-                }
-
+				$menu_datas = get_menu_db(0, true);
                 $i = 0;
                 foreach( $menu_datas as $row ){
                     if( empty($row) ) continue;

theme/basic/head.sub.php

@@ -66,16 +66,16 @@ var g5_editor    = "<?php echo ($config['cf_editor'] && $board['bo_use_dhtml_edi
 var g5_cookie_domain = "<?php echo G5_COOKIE_DOMAIN ?>";
 </script>
 <?php
-add_javascript('<script src="'.G5_JS_URL.'/jquery-1.12.4.min.js"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/jquery-migrate-1.4.1.min.js"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/jquery.menu.js?ver='.G5_JS_VER.'"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/common.js?ver='.G5_JS_VER.'"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/wrest.js?ver='.G5_JS_VER.'"></script>', 1);
-add_javascript('<script src="'.G5_JS_URL.'/placeholders.min.js"></script>', 1);
-add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/font-awesome/css/font-awesome.min.css">', 1);
+add_javascript('<script src="'.G5_JS_URL.'/jquery-1.12.4.min.js"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/jquery-migrate-1.4.1.min.js"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/jquery.menu.js?ver='.G5_JS_VER.'"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/common.js?ver='.G5_JS_VER.'"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/wrest.js?ver='.G5_JS_VER.'"></script>', 0);
+add_javascript('<script src="'.G5_JS_URL.'/placeholders.min.js"></script>', 0);
+add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/font-awesome/css/font-awesome.min.css">', 0);
 
 if(G5_IS_MOBILE) {
-    add_javascript('<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>', 2); // overflow scroll 감지
+    add_javascript('<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>', 1); // overflow scroll 감지
 }
 if(!defined('G5_IS_ADMIN'))
     echo $config['cf_add_script'];

theme/basic/mobile/head.php

@@ -33,40 +33,32 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
 			<?php echo outlogin('theme/basic'); // 외부 로그인 ?>
             <ul id="gnb_1dul">
             <?php
-            $sql = " select *
-                        from {$g5['menu_table']}
-                        where me_mobile_use = '1'
-                          and length(me_code) = '2'
-                        order by me_order, me_id ";
-            $result = sql_query($sql, false);
-
-            for($i=0; $row=sql_fetch_array($result); $i++) {
+            $menu_datas = get_menu_db(1, true);
+			$i = 0;
+			foreach( $menu_datas as $row ){
+				if( empty($row) ) continue;
             ?>
                 <li class="gnb_1dli">
                     <a href="<?php echo $row['me_link']; ?>" target="_<?php echo $row['me_target']; ?>" class="gnb_1da"><?php echo $row['me_name'] ?></a>
                     <?php
-                    $sql2 = " select *
-                                from {$g5['menu_table']}
-                                where me_mobile_use = '1'
-                                  and length(me_code) = '4'
-                                  and substring(me_code, 1, 2) = '{$row['me_code']}'
-                                order by me_order, me_id ";
-                    $result2 = sql_query($sql2);
-
-                    for ($k=0; $row2=sql_fetch_array($result2); $k++) {
+                    $k = 0;
+                    foreach( (array) $row['sub'] as $row2 ){
+						if( empty($row2) ) continue;
                         if($k == 0)
                             echo '<button type="button" class="btn_gnb_op"><span class="sound_only">하위분류</span></button><ul class="gnb_2dul">'.PHP_EOL;
                     ?>
                         <li class="gnb_2dli"><a href="<?php echo $row2['me_link']; ?>" target="_<?php echo $row2['me_target']; ?>" class="gnb_2da"><span></span><?php echo $row2['me_name'] ?></a></li>
                     <?php
-                    }
+					$k++;
+                    }	//end foreach $row2
 
                     if($k > 0)
                         echo '</ul>'.PHP_EOL;
                     ?>
                 </li>
             <?php
-            }
+			$i++;
+            }	//end foreach $row
 
             if ($i == 0) {  ?>
                 <li id="gnb_empty">메뉴 준비 중입니다.<?php if ($is_admin) { ?> <br><a href="<?php echo G5_ADMIN_URL; ?>/menu_list.php">관리자모드 &gt; 환경설정 &gt; 메뉴설정</a>에서 설정하세요.<?php } ?></li>

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

@@ -108,7 +108,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 				<div class="bo_info">
                     <span class="sound_only">작성자</span><?php echo $list[$i]['name'] ?>
                     <span class="bo_date"><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $list[$i]['datetime2'] ?></span>
-                	<span class="bo_view"><i class="fa fa-eye" aria-hidden="true"></i> <?php echo number_format($view['wr_hit']) ?><span class="sound_only">회</span></span>
+                	<span class="bo_view"><i class="fa fa-eye" aria-hidden="true"></i> <?php echo number_format($list[$i]['wr_hit']) ?><span class="sound_only">회</span></span>
                 	<?php if ($is_good) { ?><span class="sound_only">추천</span><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?><?php } ?>
                     <?php if ($is_nogood) { ?><span class="sound_only">비추천</span><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> <?php echo $list[$i]['wr_nogood'] ?><?php } ?>
                 </div>        

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

@@ -20,6 +20,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         // if (strstr($list[$i]['wr_option'], "secret"))
             // $str = $str;
 		$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $str);
+		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
+		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
     ?>
     <article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-bottom-color:#f8f8f8"<?php } ?>>
         <div class="comment_inner">
@@ -67,8 +69,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                 </p>
 
                 <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
-                    $query_string = clean_query_string($_SERVER['QUERY_STRING']);
-
                     if($w == 'cu') {
                         $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
                         $cmt = sql_fetch($sql);
@@ -76,9 +76,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                             $cmt['wr_content'] = '';
                         $c_wr_content = $cmt['wr_content'];
                     }
-
-                    $c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
-                    $c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
                 ?>
                 <?php } ?>
             </div>

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

@@ -20,6 +20,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         // if (strstr($list[$i]['wr_option'], "secret"))
             // $str = $str;
 		$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $str);
+		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
+		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
     ?>
     <article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-bottom-color:#f8f8f8"<?php } ?>>
         <div class="comment_inner">
@@ -67,8 +69,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                 </p>
 
                 <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
-                    $query_string = clean_query_string($_SERVER['QUERY_STRING']);
-
                     if($w == 'cu') {
                         $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
                         $cmt = sql_fetch($sql);
@@ -76,9 +76,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                             $cmt['wr_content'] = '';
                         $c_wr_content = $cmt['wr_content'];
                     }
-
-                    $c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
-                    $c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
                 ?>
                 <?php } ?>
             </div>

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

@@ -15,7 +15,7 @@
 .lt .lt_date {color:#828282}
 .lt .latest-sel{margin-top:1px}
 
-.lt .lt_more {position:absolute;top:15px;right:15px;color:#3a8afd;background:#fff;border:1px solid #d1d7e5;font-size:0.925em;border-radius:3px;padding:4px 5px}
+.lt .lt_more {position:absolute;top:15px;right:15px;color:#3a8afd;background:#fff;border:1px solid #d1d7e5;font-size:0.925em;border-radius:3px;padding:4px 5px;z-index:1}
 .lt .lt_cmt {background:#e9eff5;color:#3a8afd;font-size:11px;height:16px;line-height:16px;padding:0 5px;border-radius:3px;vertical-align:middle}
 
 .lt .profile_img img {border-radius:50%;vertical-align:top}

theme/basic/mobile/skin/new/basic/new.skin.php

@@ -46,7 +46,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$new_skin_url.'/style.css">', 0);
         $wr_subject = get_text(cut_str($list[$i]['wr_subject'], 80));
     ?>
     <li>
-    	<a href="./board.php?bo_table=<?php echo $list[$i]['bo_table'] ?>" class="new_board"><?php echo $bo_subject ?></a>
+    	<a href="<?php echo get_pretty_url($list[$i]['bo_table']); ?>" class="new_board"><?php echo $bo_subject ?></a>
         <a href="<?php echo $list[$i]['href'] ?>" class="new_tit"><?php echo $list[$i]['comment'] ?><?php echo $wr_subject ?></a>
         <div class="new_info">
         	<span class="sound_only">작성자</span><?php echo $list[$i]['name'] ?>

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

@@ -24,6 +24,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         */
         $comment = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $comment);
         $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결
+		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
+		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
 	?>
 
 	<article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-top-color:#e0e0e0"<?php } ?>>
@@ -52,8 +54,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                <?php echo $comment ?>
 	            </p>
 	            <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
-	                $query_string = clean_query_string($_SERVER['QUERY_STRING']);
-	
 	                if($w == 'cu') {
 	                    $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
 	                    $cmt = sql_fetch($sql);
@@ -61,9 +61,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                        $cmt['wr_content'] = '';
 	                    $c_wr_content = $cmt['wr_content'];
 	                }
-	
-	                $c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
-	                $c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
 				?>
 	            <?php } ?>
 	        </div>

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

@@ -103,7 +103,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall #gall_ul {margin:10px -10px 0;padding:0;list-style:none;zoom:1}
 #bo_gall #gall_ul:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_gall .gall_li {}
-#bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px}
+#bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px;z-index:1}
 #bo_gall .gall_box {position:relative;margin:0 0 50px 0;border-radius:0 0 2px 2px}
 #bo_gall .gall_con {position:relative}
 

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

@@ -24,6 +24,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         */
         $comment = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $comment);
         $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결
+		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
+		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
 	?>
 
 	<article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-top-color:#e0e0e0"<?php } ?>>
@@ -52,8 +54,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                <?php echo $comment ?>
 	            </p>
 	            <?php if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
-	                $query_string = clean_query_string($_SERVER['QUERY_STRING']);
-	
 	                if($w == 'cu') {
 	                    $sql = " select wr_id, wr_content, mb_id from $write_table where wr_id = '$c_id' and wr_is_comment = '1' ";
 	                    $cmt = sql_fetch($sql);
@@ -61,9 +61,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 	                        $cmt['wr_content'] = '';
 	                    $c_wr_content = $cmt['wr_content'];
 	                }
-	
-	                $c_reply_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
-	                $c_edit_href = './board.php?'.$query_string.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
 				?>            
 	            <?php } ?>
 	        </div>

theme/basic/skin/new/basic/new.skin.php

@@ -96,12 +96,12 @@ add_stylesheet('<link rel="stylesheet" href="'.$new_skin_url.'/style.css">', 0);
         </td>
         <?php } ?>
         <td class="td_group"><a href="./new.php?gr_id=<?php echo $list[$i]['gr_id'] ?>"><?php echo $gr_subject ?></a></td>
-        <td class="td_board"><a href="./board.php?bo_table=<?php echo $list[$i]['bo_table'] ?>"><?php echo $bo_subject ?></a></td>
+        <td class="td_board"><a href="<?php echo get_pretty_url($list[$i]['bo_table']); ?>"><?php echo $bo_subject ?></a></td>
         <td><a href="<?php echo $list[$i]['href'] ?>" class="new_tit"><?php echo $list[$i]['comment'] ?><?php echo $wr_subject ?></a></td>
         <td class="td_name"><?php echo $list[$i]['name'] ?></td>
         <td class="td_date"><?php echo $list[$i]['datetime2'] ?></td>
     </tr>
-    <?php }  ?>
+    <?php } ?>
 
     <?php if ($i == 0)
         echo '<tr><td colspan="'.$colspan.'" class="empty_table">게시물이 없습니다.</td></tr>';