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

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/write_comment_update.php

@@ -20,6 +20,8 @@ if (substr_count($wr_content, "&#") > 50) {
 $w = $_POST["w"];
 $wr_name  = trim($_POST['wr_name']);
 $wr_email = '';
+$reply_array = array();
+
 if (!empty($_POST['wr_email']))
     $wr_email = get_email_address(trim($_POST['wr_email']));
 
@@ -85,9 +87,7 @@ if ($w == 'c') // 댓글 입력
     // 댓글 답변
     if ($comment_id)
     {
-        $sql = " select wr_id, wr_parent, wr_comment, wr_comment_reply from $write_table
-                    where wr_id = '$comment_id' ";
-        $reply_array = sql_fetch($sql);
+        $reply_array = get_write($write_table, $comment_id, true);
         if (!$reply_array['wr_id'])
             alert('답변할 댓글이 없습니다.\\n\\n답변하는 동안 댓글이 삭제되었을 수 있습니다.');
 
@@ -341,7 +341,7 @@ delete_cache_latest($bo_table);
 
 $redirect_url = short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr['wr_parent'].'&'.$qstr.'&#c_'.$comment_id);
 
-run_event('comment_update_after', $board, $wr_id, $w, $qstr, $redirect_url);
+run_event('comment_update_after', $board, $wr_id, $w, $qstr, $redirect_url, $comment_id, $reply_array);
 
 goto_url($redirect_url);
 ?>

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.4');
+define('G5_GNUBOARD_VER', '5.4.0.8');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);

css/default.css

@@ -104,7 +104,8 @@ 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:3}
+#gnb .gnb_wrap {margin:0 auto;position:relative}
+#gnb .gnb_wrap:hover, #gnb .gnb_wrap:focus, #gnb .gnb_wrap:active{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 +158,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:2;margin:0 auto;height:100%;zoom:1}
+#container_wr {margin:0 auto;height:100%;zoom:1}
 #aside {float:right;width:235px;padding:0;height:100%;margin:20px 0 20px 20px}
 
-#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 {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}

css/mobile.css

@@ -215,7 +215,7 @@ a.btn_b03, .btn_b03 {display:inline-block;line-height:28px;border:0;background:t
 a.btn_b03:hover, .btn_b03:hover {}
 a.btn_admin {display:inline-block;color:#d13f4a;font-size:1.4em;text-decoration:none;vertical-align:middle} /* 관리자 전용 버튼 */
 a.btn_admin:focus, a.btn_admin:hover {}
-.fix_btn {position:fixed;bottom:65px;right:15px;background:#3a8afd;width:50px;height:50px;color:#fff;text-align:center;border-radius:50% !important;font-size:1.8em;line-height:50px !important;-webkit-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
+.fix_btn {position:fixed;z-index:99;bottom:65px;right:15px;background:#3a8afd;width:50px;height:50px;color:#fff;text-align:center;border-radius:50% !important;font-size:1.8em;line-height:50px !important;-webkit-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
 -moz-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
 box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4)}
 a.btn,.btn {line-height:35px;width:30px;height:35px;padding:0 5px;text-align:center;font-weight:bold;border:0;font-size:1.4em;

extend/version.extend.php

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

lib/get_data.lib.php

@@ -50,6 +50,8 @@ function get_board_names(){
     global $g5;
 
     static $boards = array();
+	
+	$boards = run_replace('get_board_names_cache', $boards);
 
     if( ! $boards ){
         $sql = " select bo_table from {$g5['board_table']} ";
@@ -112,6 +114,9 @@ function get_menu_db($use_mobile=0, $is_cache=false){
 		$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 *
@@ -122,6 +127,8 @@ function get_menu_db($use_mobile=0, $is_cache=false){
 						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;
 			}
 		}

lib/uri.lib.php

@@ -118,7 +118,7 @@ function short_url_clean($string_url, $add_qry=''){
         }
 
         $return_url = '';
-        $qstring = parse_str($url['query'], $vars);
+        parse_str($url['query'], $vars);
 
         // 예) Array ( [scheme] => http [host] => sir.kr [path] => /bbs/board.php [query] => wr_id=1110870&bo_table=cm_free&cpage=1 [fragment] => c_1110946 )
         //while(list($k,$v) = each($vars)) $page_name .= "/".$v;
@@ -134,7 +134,7 @@ function short_url_clean($string_url, $add_qry=''){
 
         foreach( $allow_param_keys as $key=>$v ){
             if( !isset($vars[$key]) || empty($vars[$key]) ) continue;
-            $add = '';
+
             $s[$key] = $vars[$key];
         }
 
@@ -143,7 +143,7 @@ function short_url_clean($string_url, $add_qry=''){
             
             if( $get_write['wr_seo_title'] ){
                 unset($s['wr_id']);
-                $s['wr_seo_title'] = $get_write['wr_seo_title'].'/';
+                $s['wr_seo_title'] = urlencode($get_write['wr_seo_title']).'/';
             }
         }
 
@@ -180,7 +180,12 @@ function short_url_clean($string_url, $add_qry=''){
 }
 
 function correct_goto_url($url){
-    return $url.'/';
+
+    if( substr($url, -1) !== '/' ){
+		return $url.'/';
+	}
+
+	return $url;
 }
 
 function generate_seo_title($string, $wordLimit=G5_SEO_TITEL_WORD_CUT){

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

@@ -76,10 +76,10 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
                 <div class="bo_cnt">
                 	<?php if ($list[$i]['is_notice']) { ?>
-                	<div>
-                		<strong class="notice_icon">공지</strong>
+                	<div class="bo_cate_ico">
+                		<?php if ($list[$i]['is_notice']) { ?><strong class="notice_icon">공지</strong><?php } ?>
 	                    <?php if ($is_category && $list[$i]['ca_name']) { ?>       
-	                    <a href="<?php echo $list[$i]['ca_name_href'] ?>" class="bo_cate_link"><?php echo $list[$i]['ca_name'] ?></a>
+	                    <a href="<?php echo $list[$i]['ca_name_href'] ?>" class="bo_cate_link"><?php echo $list[$i]['ca_name']; ?></a>
 	                    <?php } ?>
                     </div>
                     <?php } ?> 

mobile/skin/board/basic/style.css

@@ -110,6 +110,7 @@
 #bo_v_sns li span {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
 
 .bo_cate_link {display:inline-block;background:#e2eaf6;padding:0 5px;line-height:20px;border-radius:5px;font-weight:bold;font-size:11px;color:#3ca1ff !important;text-decoration:none;/*font-size:0.92em*/} /* 글제목줄 분류스타일 */
+.bo_cate_ico {margin-bottom:5px}
 .bo_cnt {display:block;width:100%;font-size:1.083em;font-weight:bold;line-height:1.4em}
 .bo_cnt i {color:#8d96c2;font-size:12px}
 .bo_cnt .fa-heart {color:#ff0000}

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/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/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/member/basic/register_form.skin.php

@@ -468,10 +468,10 @@ function fregisterform_submit(f)
     return true;
 }
 
-$(function(){
+jQuery(function($){
 	//tooltip
     $(".tooltip_icon").click(function(){
-        $(this).next(".tooltip").fadeIn(400);
+        $(this).next(".tooltip").fadeIn(400).css("display","inline-block");
     }).mouseout(function(){
         $(this).next(".tooltip").fadeOut();
     });

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,8 @@ 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:3}
+#gnb .gnb_wrap {margin:0 auto;position:relative}
+#gnb .gnb_wrap:hover, #gnb .gnb_wrap:focus, #gnb .gnb_wrap:active{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 +158,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:2;margin:0 auto;height:100%;zoom:1}
+#container_wr {margin:0 auto;height:100%;zoom:1}
 #aside {float:right;width:235px;padding:0;height:100%;margin:20px 0 20px 20px}
 
-#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 {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/css/mobile.css

@@ -215,7 +215,7 @@ a.btn_b03, .btn_b03 {display:inline-block;line-height:28px;border:0;background:t
 a.btn_b03:hover, .btn_b03:hover {}
 a.btn_admin {display:inline-block;color:#d13f4a;font-size:1.4em;text-decoration:none;vertical-align:middle} /* 관리자 전용 버튼 */
 a.btn_admin:focus, a.btn_admin:hover {}
-.fix_btn {position:fixed;bottom:65px;right:15px;background:#3a8afd;width:50px;height:50px;color:#fff;text-align:center;border-radius:50% !important;font-size:1.8em;line-height:50px !important;-webkit-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
+.fix_btn {position:fixed;z-index:99;bottom:65px;right:15px;background:#3a8afd;width:50px;height:50px;color:#fff;text-align:center;border-radius:50% !important;font-size:1.8em;line-height:50px !important;-webkit-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
 -moz-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
 box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4)}
 a.btn,.btn {line-height:35px;width:30px;height:35px;padding:0 5px;text-align:center;font-weight:bold;border:0;font-size:1.4em;

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

@@ -75,11 +75,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                 <?php } ?>
 
                 <div class="bo_cnt">
-                	<?php if ($list[$i]['is_notice']) { ?>
-                	<div>
-                		<strong class="notice_icon">공지</strong>
+                	<?php if ($list[$i]['is_notice'] || ($is_category && $list[$i]['ca_name'])) { ?>
+                	<div class="bo_cate_ico">
+                		<?php if ($list[$i]['is_notice']) { ?><strong class="notice_icon">공지</strong><?php } ?>
 	                    <?php if ($is_category && $list[$i]['ca_name']) { ?>       
-	                    <a href="<?php echo $list[$i]['ca_name_href'] ?>" class="bo_cate_link"><?php echo $list[$i]['ca_name'] ?></a>
+	                    <a href="<?php echo $list[$i]['ca_name_href'] ?>" class="bo_cate_link"><?php echo $list[$i]['ca_name']; ?></a>
 	                    <?php } ?>
                     </div>
                     <?php } ?> 

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

@@ -110,6 +110,7 @@
 #bo_v_sns li span {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
 
 .bo_cate_link {display:inline-block;background:#e2eaf6;padding:0 5px;line-height:20px;border-radius:5px;font-weight:bold;font-size:11px;color:#3ca1ff !important;text-decoration:none;/*font-size:0.92em*/} /* 글제목줄 분류스타일 */
+.bo_cate_ico {margin-bottom:5px}
 .bo_cnt {display:block;width:100%;font-size:1.083em;font-weight:bold;line-height:1.4em}
 .bo_cnt i {color:#8d96c2;font-size:12px}
 .bo_cnt .fa-heart {color:#ff0000}

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/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/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/member/basic/register_form.skin.php

@@ -468,10 +468,10 @@ function fregisterform_submit(f)
     return true;
 }
 
-$(function(){
+jQuery(function($){
 	//tooltip
     $(".tooltip_icon").click(function(){
-        $(this).next(".tooltip").fadeIn(400);
+        $(this).next(".tooltip").fadeIn(400).css("display","inline-block");
     }).mouseout(function(){
         $(this).next(".tooltip").fadeOut();
     });

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

@@ -164,7 +164,7 @@
 
 .tooltip_icon {display:inline-block;vertical-align:baseline;color:#b3b5b8;border:0;font-size:1.4em;background:transparent;cursor:pointer}
 .tooltip_icon:hover {color:#448bf5}
-.tooltip {position:relative;width:auto;color:#fff;background:#000;padding:10px;font-size:small;line-height:18px;display:none;position:absolute;z-index:9;font-weight:normal;margin-left:15px;margin-top:10px}
+.tooltip {position:absolute;width:auto;color:#fff;background:#000;padding:10px;font-size:small;line-height:18px;display:none;z-index:9;font-weight:normal;margin-left:15px;margin-top:10px}
 .tooltip:before {content:"";position:absolute;top:0;left:-10px;width:0;height:0;border-style:solid;border-top:0px solid transparent;border-bottom:10px solid transparent;border-left:0;border-right:10px solid #000}
 
 

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>';