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

adm/boardgroup_form_update.php

@@ -69,5 +69,7 @@ if ($w == '') {
     alert('제대로 된 값이 넘어오지 않았습니다.');
 }
 
+run_event('admin_boardgroup_form_update', $gr_id, $w);
+
 goto_url('./boardgroup_form.php?w=u&gr_id='.$gr_id.'&'.$qstr);
 ?>

adm/boardgroup_list_update.php

@@ -10,19 +10,23 @@ auth_check($auth[$sub_menu], 'w');
 
 check_admin_token();
 
-$count = count($_POST['chk']);
+$post_chk = isset($_POST['chk']) ? (array) $_POST['chk'] : array();
+$post_group_id = isset($_POST['group_id']) ? (array) $_POST['group_id'] : array();
+$act_button = isset($_POST['act_button']) ? $_POST['act_button'] : '';
+
+$count = count($post_chk);
 
 if(!$count)
-    alert($_POST['act_button'].'할 게시판그룹을 1개이상 선택해 주세요.');
+    alert($act_button.'할 게시판그룹을 1개이상 선택해 주세요.');
 
 for ($i=0; $i<$count; $i++)
 {
-    $k     = $_POST['chk'][$i];
+    $k     = $post_chk[$i];
-    $gr_id = preg_replace('/[^a-z0-9_]/i', '', $_POST['group_id'][$k]);
+    $gr_id = preg_replace('/[^a-z0-9_]/i', '', $post_group_id[$k]);
     $gr_subject = is_array($_POST['gr_subject']) ? strip_tags(clean_xss_attributes($_POST['gr_subject'][$k])) : '';
     $gr_admin = is_array($_POST['gr_admin']) ? strip_tags(clean_xss_attributes($_POST['gr_admin'][$k])) : '';
 
-    if($_POST['act_button'] == '선택수정') {
+    if($act_button == '선택수정') {
         $sql = " update {$g5['group_table']}
                     set gr_subject    = '{$gr_subject}',
                         gr_device     = '".sql_real_escape_string($_POST['gr_device'][$k])."',
@@ -33,7 +37,7 @@ for ($i=0; $i<$count; $i++)
         if ($is_admin != 'super')
             $sql .= " and gr_admin    = '{$gr_admin}' ";
         sql_query($sql);
-    } else if($_POST['act_button'] == '선택삭제') {
+    } else if($act_button == '선택삭제') {
         $row = sql_fetch(" select count(*) as cnt from {$g5['board_table']} where gr_id = '$gr_id' ");
         if ($row['cnt'])
             alert("이 그룹에 속한 게시판이 존재하여 게시판 그룹을 삭제할 수 없습니다.\\n\\n이 그룹에 속한 게시판을 먼저 삭제하여 주십시오.", './board_list.php?sfl=gr_id&amp;stx='.$gr_id);
@@ -46,5 +50,7 @@ for ($i=0; $i<$count; $i++)
     }
 }
 
+run_event('admin_boardgroup_list_update', $act_button, $chk, $post_group_id, $qstr);
+
 goto_url('./boardgroup_list.php?'.$qstr);
 ?>

adm/config_form.php

@@ -1183,7 +1183,7 @@ include_once('_rewrite_config_form.php');
         <tr>
             <th scope="row"><label for="cf_kakao_rest_key">카카오 REST API 키</label></th>
             <td>
-                <input type="text" name="cf_kakao_rest_key" value="<?php echo $config['cf_kakao_rest_key'] ?>" id="cf_kakao_rest_key" class="frm_input" size="40"> <a href="https://developers.kakao.com/apps/new" target="_blank" class="btn_frmline">앱 등록하기</a>
+                <input type="text" name="cf_kakao_rest_key" value="<?php echo $config['cf_kakao_rest_key'] ?>" id="cf_kakao_rest_key" class="frm_input" size="40"> <a href="https://developers.kakao.com/product/kakaoLogin" target="_blank" class="btn_frmline">앱 등록하기</a>
             </td>
             <th scope="row"><label for="cf_kakao_client_secret">카카오 Client Secret</label></th>
             <td>

adm/css/admin.css

@@ -13,7 +13,7 @@ legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-inde
 label, input, button, select, img {vertical-align:middle}
 input, button {margin:0;padding:0;font-family:'Malgun Gothic',"맑은 고딕",AppleGothic,Dotum,"돋움", sans-serif;font-size:1em}
 button,input[type="submit"] {cursor:pointer}
-textarea, select {font-family:'Malgun Gothic',"맑은 고딕",AppleGothic,Dotum,"돋움", sans-serif;;font-size:1em}
+textarea, select {font-family:'Malgun Gothic',"맑은 고딕",AppleGothic,Dotum,"돋움", sans-serif;font-size:1em}
 select {margin:0}
 p {margin:0;padding:0;word-break:break-all}
 pre {overflow-x:scroll;font-size:1.1em}
@@ -39,10 +39,10 @@ h2{font-size: 1.083em;font-weight: bold;margin:10px 0}
 #tnb{float:right;padding:10px}
 #tnb ul:after{display:block;visibility:hidden;clear:both;content:""}
 #tnb li{float:left;position:relative;margin-left:3px}
-#tnb a{color:#fff;;padding:0 10px;display:block;line-height:30px;}
+#tnb a{color:#fff;padding:0 10px;display:block;line-height:30px;}
 #tnb .tnb_service{border-radius:3px;background:#4e5eb7;color:#fff;padding:0 10px;text-align:left;height:30px;line-height:30px;}
 #tnb .tnb_service:hover{background:#5969c3}
-#tnb  button{width:100px;;border:0;border-radius:3px;background:#4e5eb7;color:#fff;padding:0 30px 0 10px;text-align:left;height:30px;position:relative;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}
+#tnb button{width:100px;border:0;border-radius:3px;background:#4e5eb7;color:#fff;padding:0 30px 0 10px;text-align:left;height:30px;position:relative;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}
 #tnb button span{display:block;text-indent:-999px;overflow:hidden;width:30px;border-radius:3px;height:30px;position:absolute;top:0;right:0;background:url(../img/op_btn.png) 50% 50% no-repeat #5969c3}
 #tnb button:hover {background:#5969c3}
 #tnb .tnb_mb_area{display:none;background:#5e6dc2;width:100px;position:absolute;padding:5px;margin-top:1px;}
@@ -181,10 +181,10 @@ a.btn_submit{background:#ff4081;color:#fff}
 .btn_add01 button {margin:0}
 
 
-.td_mng a.btn,.td_mng a{display:inline-block;height:26px;line-height:26px;border:0;;border-radius:3px;padding:0 8px;margin:1px;font-weight:normal}
+.td_mng a.btn, .td_mng a{display:inline-block;height:26px;line-height:26px;border:0;border-radius:3px;padding:0 8px;margin:1px;font-weight:normal}
-.td_mng button,.td_mng button.btn{height:26px;border:0;border-radius:3px;padding:0 8px;margin:1px;border:0;;font-weight:normal}
+.td_mng button, .td_mng button.btn{height:26px;border:0;border-radius:3px;padding:0 8px;margin:1px;font-weight:normal}
-.btn{height:30px;border:0;;border-radius:5px;padding:0 10px;font-weight:bold;font-size:1.09em;vertical-align:middle}
+.btn{height:30px;border:0;border-radius:5px;padding:0 10px;font-weight:bold;font-size:1.09em;vertical-align:middle}
-a.btn{display:inline-block;height:30px;line-height:30px;border:0;;border-radius:5px;padding:0 10px;font-weight:bold;font-size:1.09em;;vertical-align:middle}
+a.btn{display:inline-block;height:30px;line-height:30px;border:0;border-radius:5px;padding:0 10px;font-weight:bold;font-size:1.09em;vertical-align:middle}
 .btn_submit{background:#ff4081;color:#fff}
 a.btn_submit{background:#ff4081;color:#fff}
 .btn_submit:hover{background:#ff1464}
@@ -234,7 +234,7 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent
 .color_st03{background:#b668d0;color:#fff;display:inline-block;padding:0 3px;font-size:0.92em;line-height:18px}
 .color_st04{background:#ffa700;color:#fff;display:inline-block;padding:0 3px;font-size:0.92em;line-height:18px}
 .color_st05{background:#688fef;color:#fff;display:inline-block;padding:0 3px;font-size:0.92em;line-height:18px}
-.color_st06{;color:#ff0000;border:1px solid #ff0000;display:inline-block;padding:0 3px;font-size:0.92em;line-height:18px}
+.color_st06{color:#ff0000;border:1px solid #ff0000;display:inline-block;padding:0 3px;font-size:0.92em;line-height:18px}
 
 /* 폼 안내글 */
 .frm_info {display:block;padding:0 0 5px;color:#5b747e}
@@ -264,21 +264,21 @@ border-bottom: 5px solid black;}
 /* 페이지 내 검색 */
 .local_sch{}
 .local_sch:after, .local_sch div:after{display:block;visibility:hidden;clear:both;content:""}
-.local_sch .btn_sch{width:30px;height:30px;border:0;padding:0;float:left;background:url(../img/sch_btn.png) no-repeat 50% 50%;border:1px solid #dcdcdc;border-left:0;text-indent:-999px;overflow:hidden}
+.local_sch .btn_sch{width:30px;height:30px;border:1px solid #dcdcdc;border-left:0;padding:0;float:left;background:url(../img/sch_btn.png) no-repeat 50% 50%;text-indent:-999px;overflow:hidden}
-.local_sch .btn_sch2{width:35px;height:35px;border:0;padding:0;background:url(../img/sch_btn.png) no-repeat 50% 50% #eee;border:1px solid #dcdcdc;text-indent:-999px;overflow:hidden}
+.local_sch .btn_sch2{width:35px;height:35px;border:1px solid #dcdcdc;padding:0;background:url(../img/sch_btn.png) no-repeat 50% 50% #eee;text-indent:-999px;overflow:hidden}
 
-.local_sch .sch_input{height:30px;border:1px solid #dcdcdc;border-right:0;;padding:0 5px;float:left;}
+.local_sch .sch_input{height:30px;border:1px solid #dcdcdc;border-right:0;padding:0 5px;float:left;}
 .local_sch select{height:30px;margin-right:3px;border:1px solid #dcdcdc}
 .local_sch01{margin: 10px 0;}
 .local_sch02{}
 .local_sch01 .frm_input{height:30px;border:1px solid #dcdcdc;padding:0 5px;}
-.local_sch01 .btn_submit{width:30px;height:30px;border:0;padding:0;background:url(../img/sch_btn.png) no-repeat 50% 50% #eee;border:1px solid #dcdcdc;text-indent:-999px;overflow:hidden}
+.local_sch01 .btn_submit{width:30px;height:30px;padding:0;background:url(../img/sch_btn.png) no-repeat 50% 50% #eee;border:1px solid #dcdcdc;text-indent:-999px;overflow:hidden}
-.local_sch03{;padding:5px 15px;background:#e9ebf9;margin:10px 0}
+.local_sch03{padding:5px 15px;background:#e9ebf9;margin:10px 0}
 .local_sch div{margin:5px 0;}
 .local_sch03 strong{display:inline-block;width:70px;}
 .local_sch03 label{margin-right:5px;display:inline-block}
 .local_sch03 button{height:30px;padding:0 5px;border:0;background:#9eacc6;color:#fff;}
-.local_sch03 .btn_submit{height:30px;padding:0 5px;border:0;;color:#fff;}
+.local_sch03 .btn_submit{height:30px;padding:0 5px;border:0;color:#fff;}
 .local_sch03 .frm_input{height:30px;border:1px solid #dcdcdc;padding:0 5px;}
 /* 페이지 내 실행 */
 .local_cmd {min-width:960px}
@@ -305,7 +305,7 @@ border-bottom: 5px solid black;}
 /* 페이지 내 카운트 */
 .local_ov {min-width:960px}
 
-.local_ov01 {position:relative;;margin: 10px 0;}
+.local_ov01 {position:relative;margin: 10px 0;}
 .local_ov01 .ov_a {display:inline-block;margin:0 0 0 5px;padding:0 0 0 10px;border-left:1px solid #ccc;color:#ff3061}
 
 
@@ -710,8 +710,8 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 /* 캡챠 */
 #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_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_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}
@@ -746,14 +746,14 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 .theme_dt_img{float:left;padding:20px}
 .theme_dt_img img{border:1px solid #aaa;}
 .theme_dt_if{float:left;width:235px;padding:20px 0}
-.theme_dt_if table{width:100%;border-collapse:collapse;;margin:15px 0 0 ;font-size:0.92em}
+.theme_dt_if table{width:100%;border-collapse:collapse;margin:15px 0 0 ;font-size:0.92em}
 .theme_dt_if table th{padding:5px;background:#fff;border-bottom:1px solid #f3f3f3;vertical-align:top;color:#3f51b5}
 .theme_dt_if table td{padding:5px;background:#fff;border-bottom:1px solid #f3f3f3;line-height:1.56em}
 .theme_dt_if table td a{text-decoration:underline}
 .theme_dt_if p{line-height:1.5em}
 .if_p_bg{display:inline-block;width:20px;height:1px ;background:#000;margin:30px 0 10px}
 #theme_detail .theme_dt_btn{position:absolute;top:0px;right:0px;background:#fff;}
-#theme_detail .theme_dt_btn .close_btn{background:url('../img/close.png') 50% 50% no-repeat;width:40px;height:40px;overflow:hidden;border:0;text-indent:-99999px;border-left:1px solid #d8d8d8}
+#theme_detail .theme_dt_btn .close_btn{border:0;border-left:1px solid #d8d8d8;background:url('../img/close.png') 50% 50% no-repeat;width:40px;height:40px;overflow:hidden;text-indent:-99999px}
 
 #theme_detail .theme_dt_btn .close_btn:hover{background-color:#eceffc}
 #theme_detail .theme_dt_btn .btn_03{line-height:28px;display:inline-block;vertical-align:top;margin-top:6px;padding:0 6px;border-radius:5px}

adm/menu_list_update.php

@@ -68,5 +68,7 @@ for ($i=0; $i<$count; $i++)
     sql_query($sql);
 }
 
+run_event('admin_menu_list_update');
+
 goto_url('./menu_list.php');
 ?>

common.php

@@ -221,7 +221,7 @@ ini_set("session.cookie_domain", G5_COOKIE_DOMAIN);
 //------------------------------------------------------------------------------
 // 기본환경설정
 // 기본적으로 사용하는 필드만 얻은 후 상황에 따라 필드를 추가로 얻음
-$config = get_config();
+$config = get_config(true);
 
 // 본인인증 또는 쇼핑몰 사용시에만 secure; SameSite=None 로 설정합니다.
 if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER) ) {
@@ -442,7 +442,7 @@ if ($_SESSION['ss_mb_id']) { // 로그인중이라면
 $write = array();
 $write_table = "";
 if ($bo_table) {
-    $board = get_board_db($bo_table);
+    $board = get_board_db($bo_table, true);
     if ($board['bo_table']) {
         set_cookie("ck_bo_table", $board['bo_table'], 86400 * 1);
         $gr_id = $board['gr_id'];
@@ -465,7 +465,7 @@ if ($bo_table) {
 }
 
 if ($gr_id && !is_array($gr_id)) {
-    $group = get_group($gr_id);
+    $group = get_group($gr_id, true);
 }
 
 if ($config['cf_editor']) {

config.php

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

js/common.js

@@ -165,32 +165,8 @@ function set_cookie(name, value, expirehours, domain)
 // 쿠키 얻음
 function get_cookie(name)
 {
-    var find_sw = false;
+	var match = document.cookie.match(new RegExp('(^| )' + name + '=([^;]+)'));
-    var start, end;
+	if (match) return unescape(match[2]);
-    var i = 0;
-
-    for (i=0; i<= document.cookie.length; i++)
-    {
-        start = i;
-        end = start + name.length;
-
-        if(document.cookie.substring(start, end) == name)
-        {
-            find_sw = true
-            break
-        }
-    }
-
-    if (find_sw == true)
-    {
-        start = end + 1;
-        end = document.cookie.indexOf(";", start);
-
-        if(end < start)
-            end = document.cookie.length;
-
-        return unescape(document.cookie.substring(start, end));
-    }
 	return "";
 }
 
@@ -559,10 +535,12 @@ function font_resize(id, rmv_class, add_class, othis)
 {
     var $el = $("#"+id);
 
+	if((typeof rmv_class !== "undefined" && rmv_class) || (typeof add_class !== "undefined" && add_class)){
 		$el.removeClass(rmv_class).addClass(add_class);
 
 		set_cookie("ck_font_resize_rmv_class", rmv_class, 1, g5_cookie_domain);
 		set_cookie("ck_font_resize_add_class", add_class, 1, g5_cookie_domain);
+	}
 
     if(typeof othis !== "undefined"){
         $(othis).addClass('select').siblings().removeClass('select');

lib/Cache/FileCache.class.php

@@ -33,9 +33,9 @@ class FileCache
      *
      * @param string $id
      */
-	public function get($id)
+	public function get($id, $expired_time=0)
 	{
-		$data = $this->_get($id);
+		$data = $this->_get($id, $expired_time);
 		return is_array($data) ? $data['data'] : FALSE;
 	}
 
@@ -59,7 +59,7 @@ class FileCache
 
     }
 
-	protected function _get($id)
+	protected function _get($id, $expired_time=0)
 	{
         $cache_file_path = $this->get_cache_file_path($id);
 
@@ -68,20 +68,27 @@ class FileCache
 			return FALSE;
 		}
         
+        $server_time = defined('G5_SERVER_TIME') ? G5_SERVER_TIME : time();
+
         try{
             $file_contents = file_get_contents($cache_file_path);
             $file_ex = explode("\n\n", $file_contents);
             $data = unserialize(base64_decode($file_ex[1]));
         } catch(Exception $e){
-            $data = array('ttl'=>1, 'time'=>time() - 1000);
+            $data = array('ttl'=>1, 'time'=> $server_time - 1000);
         }
         
-		if ($data['ttl'] > 0 && time() > $data['time'] + $data['ttl'])
+		if ($data['ttl'] > 0 && $server_time > $data['time'] + $data['ttl'])
 		{
 			unlink( $cache_file_path );
 			return FALSE;
 		}
 
+        if ($data['time'] && $expired_time && $data['time'] < ($server_time - $expired_time)){
+            unlink( $cache_file_path );
+            return FALSE;
+        }
+
 		return $data;
 	}
 

lib/cache.lib.php

@@ -52,10 +52,10 @@ function g5_set_cache($key, $save_data, $ttl = null){
     }
 }
 
-function g5_get_cache($key){
+function g5_get_cache($key, $expired_time=0){
 
     if( $cache = get_cachemanage_instance() ){
-        return $cache->get($key);
+        return $cache->get($key, $expired_time);
     }
     
     return false;

lib/common.lib.php

@@ -754,6 +754,7 @@ function get_group($gr_id, $is_cache=false)
     static $cache = array();
 
     $gr_id = preg_replace('/[^a-z0-9_]/i', '', $gr_id);
+    $cache = run_replace('get_group_db_cache', $cache, $gr_id, $is_cache);
     $key = md5($gr_id);
 
     if( $is_cache && isset($cache[$key]) ){
@@ -1605,15 +1606,19 @@ function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
         }
     }
 
+    $end_time = $is_debug ? get_microtime() : 0;
+
     if($result && $is_debug) {
         // 여기에 실행한 sql문을 화면에 표시하는 로직 넣기
         $g5_debug['sql'][] = array(
             'sql' => $sql,
             'start_time' => $start_time,
-            'end_time' => get_microtime(),
+            'end_time' => $end_time,
             );
     }
 
+    run_event('sql_query_after', $result, $sql, $start_time, $end_time);
+
     return $result;
 }
 

lib/get_data.lib.php

@@ -70,11 +70,10 @@ function get_board_db($bo_table, $is_cache=false){
 
     static $cache = array();
 
+    $bo_table = preg_replace('/[^a-z0-9_]/i', '', $bo_table);
     $cache = run_replace('get_board_db_cache', $cache, $bo_table, $is_cache);
-
     $key = md5($bo_table);
 
-    $bo_table = preg_replace('/[^a-z0-9_]/i', '', $bo_table);
     if( $is_cache && isset($cache[$key]) ){
         return $cache[$key];
     }

lib/latest.lib.php

@@ -10,6 +10,8 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
 
     if (!$skin_dir) $skin_dir = 'basic';
     
+    $time_unit = 3600;  // 1시간으로 고정
+
     if(preg_match('#^theme/(.+)$#', $skin_dir, $match)) {
         if (G5_IS_MOBILE) {
             $latest_skin_path = G5_THEME_MOBILE_PATH.'/'.G5_SKIN_DIR.'/latest/'.$match[1];
@@ -35,7 +37,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
 
     if(G5_USE_CACHE) {
         $cache_file_name = "latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}-".g5_cache_secret_key();
-        $caches = g5_get_cache($cache_file_name);
+        $caches = g5_get_cache($cache_file_name, $time_unit * $cache_time);
         $cache_list = isset($caches['list']) ? $caches['list'] : array();
         g5_latest_cache_data($bo_table, $cache_list);
     }
@@ -90,7 +92,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=
                 'bo_subject' => sql_escape_string($bo_subject),
             );
 
-            g5_set_cache($cache_file_name, $caches, 3600 * $cache_time);
+            g5_set_cache($cache_file_name, $caches, $time_unit * $cache_time);
         }
     } else {
         $list = $cache_list;

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

@@ -159,7 +159,7 @@ jQuery(function($){
     </section>
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>

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

@@ -161,7 +161,7 @@ jQuery(function($){
     </section>
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>

mobile/skin/social/social_login.skin.php

@@ -14,7 +14,7 @@ if( G5_SOCIAL_USE_POPUP ) {
     $self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
 }
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <div class="login-sns sns-wrap-32 sns-wrap-over" id="sns_login">

mobile/skin/social/social_outlogin.skin.1.php

@@ -14,7 +14,7 @@ if( G5_SOCIAL_USE_POPUP ) {
     $self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
 }
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <div class="login-sns sns-wrap-32 sns-wrap-over" id="sns_outlogin">

mobile/skin/social/social_register.skin.php

@@ -15,7 +15,7 @@ if( G5_SOCIAL_USE_POPUP ) {
 }
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 <div>
     <div class="login-sns sns-wrap-32 sns-wrap-over" id="sns_register">

mobile/skin/social/social_register_member.skin.php

@@ -8,7 +8,7 @@ if( ! $config['cf_social_login_use']) {     //소셜 로그인을 사용하지
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal.css">', 11);
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal-default-theme.css">', 12);
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 13);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 13);
 add_javascript('<script src="'.G5_JS_URL.'/remodal/remodal.js"></script>', 10);
 
 $email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.다른 이메일을 입력해 주세요.' : '';

mobile/skin/social/social_u_register_form.skin.php

@@ -9,7 +9,7 @@ $socials = social_get_provider_service_name('', 'all');
 
 $session_id = session_id();
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <li>

plugin/debugbar/debugbar.php

@@ -118,13 +118,30 @@ add_stylesheet('<link rel="stylesheet" href="'.G5_PLUGIN_URL.'/debugbar/style.cs
                             $is_print = $rowspan;
                             
                             foreach($datas as $data){
+                                
+                                $print_function = '';
+
+                                if( $data['function'] && is_array($data['function']) ){
+                                    foreach( (array) $data['function'] as $key=>$fn_name ){
+                                        $str_delimiter = '';
+                                        if($key) $str_delimiter = ' :: ';
+                                        
+                                        if( is_object($fn_name) ){
+                                            $fn_name = get_class($fn_name);
+                                        }
+
+                                        $print_function .= $str_delimiter.(string) $fn_name;
+                                    }
+                                } else {
+                                    $print_function = $data['function'];
+                                }
                         ?>
                         <tr>
                             <?php if ($is_print){ ?>
                             <td scope="row" data-label="event_tag" <?php echo $rowspan; ?>><?php echo $tag.' <span class="hook_count">('.$count.')</span>'; ?></td>
                             <?php } ?>
                             <td data-label="event_function">
-                                <?php echo $data['function']; ?>
+                                <?php echo $print_function; ?>
                             </td>
                             <td data-label="인수의 수"><?php echo $data['arguments']; ?></td>
                             <td data-label="우선 순위"><?php echo $data['priority']; ?></td>
@@ -194,13 +211,30 @@ add_stylesheet('<link rel="stylesheet" href="'.G5_PLUGIN_URL.'/debugbar/style.cs
                             $is_print = $rowspan;
                             
                             foreach($datas as $data){
+                                
+                                $print_function = '';
+
+                                if( $data['function'] && is_array($data['function']) ){
+                                    foreach( (array) $data['function'] as $key=>$fn_name ){
+                                        $str_delimiter = '';
+                                        if($key) $str_delimiter = ' :: ';
+                                        
+                                        if( is_object($fn_name) ){
+                                            $fn_name = get_class($fn_name);
+                                        }
+
+                                        $print_function .= $str_delimiter.(string) $fn_name;
+                                    }
+                                } else {
+                                    $print_function = $data['function'];
+                                }
                         ?>
                         <tr>
                             <?php if ($is_print){ ?>
                             <td scope="row" data-label="replace_tag" <?php echo $rowspan; ?>><?php echo $tag.' <span class="hook_count">('.$count.')</span>'; ?></td>
                             <?php } ?>
                             <td data-label="replace_function">
-                                <?php echo $data['function']; ?>
+                                <?php echo $print_function; ?>
                             </td>
                             <td data-label="인수의 수"><?php echo $data['arguments']; ?></td>
                             <td data-label="우선 순위"><?php echo $data['priority']; ?></td>

skin/board/basic/view.skin.php

@@ -176,7 +176,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <!-- } 첨부파일 끝 -->
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>

skin/board/gallery/view.skin.php

@@ -176,7 +176,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <!-- } 첨부파일 끝 -->
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>

skin/social/social_login.skin.php

@@ -14,7 +14,7 @@ if( G5_SOCIAL_USE_POPUP ) {
     $self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
 }
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <div id="sns_login" class="login-sns sns-wrap-32 sns-wrap-over">

skin/social/social_outlogin.skin.1.php

@@ -14,7 +14,7 @@ if( G5_SOCIAL_USE_POPUP ) {
     $self_url = G5_SOCIAL_LOGIN_URL.'/popup.php';
 }
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <div class="login-sns sns-wrap-32 sns-wrap-over" id="sns_outlogin">

skin/social/social_register.skin.php

@@ -15,7 +15,7 @@ if( G5_SOCIAL_USE_POPUP ) {
 }
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 <div>
 

skin/social/social_register_member.skin.php

@@ -8,7 +8,7 @@ if( ! $config['cf_social_login_use']) {     //소셜 로그인을 사용하지
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal.css">', 11);
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/remodal/remodal-default-theme.css">', 12);
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 13);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 13);
 add_javascript('<script src="'.G5_JS_URL.'/remodal/remodal.js"></script>', 10);
 
 $email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.다른 이메일을 입력해 주세요.' : '';

skin/social/social_u_register_form.skin.php

@@ -9,7 +9,7 @@ $socials = social_get_provider_service_name('', 'all');
 
 $session_id = session_id();
 
-add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css">', 10);
+add_stylesheet('<link rel="stylesheet" href="'.get_social_skin_url().'/style.css?ver='.G5_CSS_VER.'">', 10);
 ?>
 
 <li>

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

@@ -159,7 +159,7 @@ jQuery(function($){
     </section>
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>

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

@@ -161,7 +161,7 @@ jQuery(function($){
     </section>
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>

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

@@ -176,7 +176,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <!-- } 첨부파일 끝 -->
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>

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

@@ -176,7 +176,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <!-- } 첨부파일 끝 -->
     <?php } ?>
 
-    <?php if(isset($view['link'][1]) && $view['link'][1]) { ?>
+    <?php if(isset($view['link']) && array_filter($view['link'])) { ?>
     <!-- 관련링크 시작 { -->
     <section id="bo_v_link">
         <h2>관련링크</h2>