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

adm/admin.js

@@ -108,7 +108,7 @@ function get_ajax_token()
 }
 
 $(function() {
-    $(document).on("click", "form input:submit", function() {
+    $(document).on("click", "form input:submit, form button:submit", function() {
         var f = this.form;
         var token = get_ajax_token();
 

adm/board_form_update.php

@@ -76,9 +76,9 @@ $f = @fopen($file, 'w');
 // 분류에 & 나 = 는 사용이 불가하므로 2바이트로 바꾼다.
 $src_char = array('&', '=');
 $dst_char = array('＆', '〓');
-$bo_category_list = str_replace($src_char, $dst_char, $bo_category_list);
+$bo_category_list = isset($_POST['bo_category_list']) ? str_replace($src_char, $dst_char, $_POST['bo_category_list']) : '';
 //https://github.com/gnuboard/gnuboard5/commit/f5f4925d4eb28ba1af728e1065fc2bdd9ce1da58 에 따른 조치
-$str_bo_category_list = isset($_POST['bo_category_list']) ? preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", "", $_POST['bo_category_list']) : '';
+$str_bo_category_list = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\/\^\*]/", "", $bo_category_list);
 
 $_POST['bo_subject'] = strip_tags($_POST['bo_subject']);
 $_POST['bo_mobile_subject'] = strip_tags($_POST['bo_mobile_subject']);
@@ -289,7 +289,7 @@ if (is_checked('chk_grp_write_point'))          $grp_fields .= " , bo_write_poin
 if (is_checked('chk_grp_comment_point'))        $grp_fields .= " , bo_comment_point = '{$bo_comment_point}' ";
 if (is_checked('chk_grp_download_point'))       $grp_fields .= " , bo_download_point = '{$bo_download_point}' ";
 if (is_checked('chk_grp_category_list')) {
-    $grp_fields .= " , bo_category_list = '{$bo_category_list}' ";
+    $grp_fields .= " , bo_category_list = '{$str_bo_category_list}' ";
     $grp_fields .= " , bo_use_category = '{$bo_use_category}' ";
 }
 if (is_checked('chk_grp_use_sideview'))         $grp_fields .= " , bo_use_sideview = '{$bo_use_sideview}' ";
@@ -378,7 +378,7 @@ if (is_checked('chk_all_write_point'))          $all_fields .= " , bo_write_poin
 if (is_checked('chk_all_comment_point'))        $all_fields .= " , bo_comment_point = '{$bo_comment_point}' ";
 if (is_checked('chk_all_download_point'))       $all_fields .= " , bo_download_point = '{$bo_download_point}' ";
 if (is_checked('chk_all_category_list')) {
-    $all_fields .= " , bo_category_list = '{$bo_category_list}' ";
+    $all_fields .= " , bo_category_list = '{$str_bo_category_list}' ";
     $all_fields .= " , bo_use_category = '{$bo_use_category}' ";
 }
 if (is_checked('chk_all_use_sideview'))         $all_fields .= " , bo_use_sideview = '{$bo_use_sideview}' ";

adm/boardgroup_list.php

@@ -127,7 +127,7 @@ $colspan = 10;
             <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['gr_subject'] ?> 그룹</label>
             <input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
         </td>
-        <td class="td_left"><a href="<?php echo get_pretty_url(G5_GROUP_DIR, $row['gr_id']); ?>"><?php echo $row['gr_id'] ?></a></td>
+        <td class="td_left"><a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_id'] ?></a></td>
         <td class="td_input">
             <label for="gr_subject_<?php echo $i; ?>" class="sound_only">그룹제목</label>
             <input type="text" name="gr_subject[<?php echo $i ?>]" value="<?php echo get_text($row['gr_subject']) ?>" id="gr_subject_<?php echo $i ?>" class="tbl_input">

adm/boardgroupmember_form.php

@@ -85,7 +85,7 @@ $colspan = 4;
             <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['gr_subject'] ?> 그룹</label>
             <input type="checkbox" name="chk[]" value="<?php echo $row['gm_id'] ?>" id="chk_<?php echo $i ?>">
         </td>
-        <td class="td_grid"><a href="<?php echo get_pretty_url(G5_GROUP_DIR, $row['gr_id']); ?>"><?php echo $row['gr_id'] ?></a></td>
+        <td class="td_grid"><a href="<?php echo G5_BBS_URL; ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_id'] ?></a></td>
         <td class="td_category"><?php echo $row['gr_subject'] ?></td>
         <td class="td_datetime"><?php echo $row['gm_datetime'] ?></td>
     </tr>

adm/dbupgrade.php

@@ -147,6 +147,22 @@ if(!isset($member['mb_memo_cnt'])) {
     $is_check = true;
 }
 
+// 스크랩 읽은 수 추가
+if(!isset($member['mb_scrap_cnt'])) {
+    sql_query(" ALTER TABLE `{$g5['member_table']}`
+                ADD `mb_scrap_cnt` int(11) NOT NULL DEFAULT '0' AFTER `mb_memo_cnt`", true);
+
+	$is_check = true;
+}
+
+// 짧은 URL 주소를 사용 여부 필드 추가
+if (!isset($config['cf_bbs_rewrite'])) {
+    sql_query(" ALTER TABLE `{$g5['config_table']}`
+                    ADD `cf_bbs_rewrite` tinyint(4) NOT NULL DEFAULT '0' AFTER `cf_link_target` ", true);
+
+	$is_check = true;
+}
+
 // 파일테이블에 추가 칼럼
 
 $sql = " SHOW COLUMNS FROM `{$g5['board_file_table']}` LIKE 'bf_fileurl' ";

adm/menu_form_search.php

@@ -52,7 +52,7 @@ if($sql) {
 <?php }
         switch($type) {
             case 'group':
-                $link = get_pretty_url(G5_GROUP_DIR, $row['id']);
+                $link = G5_BBS_URL.'/group.php?gr_id='.$row['id'];
                 break;
             case 'board':
                 $link = get_pretty_url($row['id']);

adm/qa_config_update.php

@@ -12,6 +12,12 @@ $error_msg = '';
 
 $qaconfig = get_qa_config();
 
+$check_keys = array('qa_title', 'qa_category', 'qa_skin', 'qa_mobile_skin', 'qa_use_email', 'qa_req_email', 'qa_use_hp', 'qa_req_hp', 'qa_use_sms', 'qa_send_number', 'qa_admin_hp', 'qa_admin_email', 'qa_subject_len', 'qa_mobile_subject_len', 'qa_page_rows', 'qa_mobile_page_rows', 'qa_image_width', 'qa_upload_size');
+
+foreach($check_keys as $key){
+	$$key = $_POST[$key] = isset($_POST[$key]) ? strip_tags($_POST[$key]) : '';
+}
+
 $qa_include_head = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($qa_include_head, 0, 255));
 $qa_include_tail = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($qa_include_tail, 0, 255));
 
@@ -50,8 +56,6 @@ if( $qa_include_tail && ! is_include_path_check($qa_include_tail, 1) ){
     $error_msg = '/data/file/ 또는 /data/editor/ 포함된 문자를 하단 파일 경로에 포함시킬수 없습니다.';
 }
 
-$_POST['qa_title'] = strip_tags($_POST['qa_title']);
-
 $sql = " update {$g5['qa_config_table']}
             set qa_title                = '{$_POST['qa_title']}',
                 qa_category             = '{$_POST['qa_category']}',

adm/theme_config_load.php

@@ -29,7 +29,7 @@ if(!in_array($type, $arr_type)) {
 }
 
 if($type == 'board') {
-    $keys = array('bo_gallery_cols', 'bo_gallery_width', 'bo_gallery_height', 'bo_mobile_gallery_width', 'bo_mobile_gallery_height', 'bo_image_width');
+    $keys = run_replace('theme_config_load_keys', array('bo_gallery_cols', 'bo_gallery_width', 'bo_gallery_height', 'bo_mobile_gallery_width', 'bo_mobile_gallery_height', 'bo_image_width'), $type);
     $tconfig = get_theme_config_value($config['cf_theme'], implode(',', $keys));
 
     $i = 0;
@@ -43,7 +43,7 @@ if($type == 'board') {
     if($i == 0)
         $data['error'] = '적용할 게시판 이미지 설정이 없습니다.';
 } else if($type == 'conf_skin') {
-    $keys = array('cf_new_skin', 'cf_mobile_new_skin', 'cf_search_skin', 'cf_mobile_search_skin', 'cf_connect_skin', 'cf_mobile_connect_skin', 'cf_faq_skin', 'cf_mobile_faq_skin');
+    $keys = run_replace('theme_config_load_keys', array('cf_new_skin', 'cf_mobile_new_skin', 'cf_search_skin', 'cf_mobile_search_skin', 'cf_connect_skin', 'cf_mobile_connect_skin', 'cf_faq_skin', 'cf_mobile_faq_skin'), $type);
 
     $tconfig = get_theme_config_value($config['cf_theme'], implode(',', $keys));
 
@@ -58,7 +58,7 @@ if($type == 'board') {
     if($i == 0)
         $data['error'] = '적용할 기본환경 스킨 설정이 없습니다.';
 } else if($type == 'conf_member') {
-    $keys = array('cf_member_skin', 'cf_mobile_member_skin');
+    $keys = run_replace('theme_config_load_keys', array('cf_member_skin', 'cf_mobile_member_skin'), $type);
 
     $tconfig = get_theme_config_value($config['cf_theme'], implode(',', $keys));
 

adm/theme_update.php

@@ -68,5 +68,7 @@ if($_POST['set_default_skin'] == 1) {
     }
 }
 
+run_event('adm_theme_update', $theme, $_POST['set_default_skin']);
+
 die('');
 ?>

bbs/delete_comment.php

@@ -88,5 +88,5 @@ delete_cache_latest($bo_table);
 
 run_event('bbs_delete_comment', $comment_id, $board);
 
-goto_url(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$write['wr_parent'].'&page='.$page. $qstr);
+goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$write['wr_parent'].'&page='.$page. $qstr));
 ?>

bbs/new_delete.php

@@ -8,24 +8,25 @@ if ($is_admin != 'super')
 
 $board = array();
 $save_bo_table = array();
+$save_wr_id = array();
 
 for($i=0;$i<count($_POST['chk_bn_id']);$i++)
 {
     // 실제 번호를 넘김
     $k = $_POST['chk_bn_id'][$i];
 
-    $bo_table = $_POST['bo_table'][$k];
-    $wr_id    = $_POST['wr_id'][$k];
+    $bo_table = isset($_POST['bo_table'][$k]) ? preg_replace('/[^a-z0-9_]/i', '', $_POST['bo_table'][$k]) : '';
+    $wr_id    = isset($_POST['wr_id'][$k]) ? preg_replace('/[^0-9]/i', '', $_POST['wr_id'][$k]) : 0;
 
-    $save_bo_table[] = $bo_table;
+    $save_bo_table[$i] = $bo_table;
+	$save_wr_id[$i] = $wr_id;
 
     $write_table = $g5['write_prefix'].$bo_table;
 
     if ($board['bo_table'] != $bo_table)
         $board = sql_fetch(" select bo_subject, bo_write_point, bo_comment_point, bo_notice from {$g5['board_table']} where bo_table = '$bo_table' ");
 
-    $sql = " select * from $write_table where wr_id = '$wr_id' ";
-    $write = sql_fetch($sql);
+    $write = get_write($write_table, $wr_id);
     if (!$write) continue;
 
     // 원글 삭제
@@ -138,12 +139,11 @@ for($i=0;$i<count($_POST['chk_bn_id']);$i++)
     }
 }
 
-$save_bo_table = array_unique($save_bo_table);
 foreach ($save_bo_table as $key=>$value) {
     delete_cache_latest($value);
 }
 
-run_event('bbs_new_delete', $chk_bn_id, $save_bo_table);
+run_event('bbs_new_delete', $chk_bn_id, $save_bo_table, $save_wr_id);
 
 goto_url("new.php?sfl=$sfl&stx=$stx&page=$page");
 ?>

common.php

@@ -216,10 +216,6 @@ ini_set("session.gc_divisor", 100); // session.gc_divisor는 session.gc_probabil
 session_set_cookie_params(0, '/');
 ini_set("session.cookie_domain", G5_COOKIE_DOMAIN);
 
-@session_start();
-//==============================================================================
-
-
 //==============================================================================
 // 공용 변수
 //------------------------------------------------------------------------------
@@ -227,6 +223,38 @@ ini_set("session.cookie_domain", G5_COOKIE_DOMAIN);
 // 기본적으로 사용하는 필드만 얻은 후 상황에 따라 필드를 추가로 얻음
 $config = get_config();
 
+// 본인인증 또는 쇼핑몰 사용시에만 secure; SameSite=None 로 설정합니다.
+if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER) ) {
+	// Chrome 80 버전부터 아래 이슈 대응
+	// https://developers-kr.googleblog.com/2020/01/developers-get-ready-for-new.html?fbclid=IwAR0wnJFGd6Fg9_WIbQPK3_FxSSpFLqDCr9bjicXdzy--CCLJhJgC9pJe5ss
+	if(!function_exists('session_start_samesite')) {
+		function session_start_samesite($options = array())
+		{
+			$res = @session_start($options);
+			
+			// IE 브라우저 또는 엣지브라우저 일때는 secure; SameSite=None 을 설정하지 않습니다.
+			if( preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) || preg_match('~Trident/7.0(; Touch)?; rv:11.0~',$_SERVER['HTTP_USER_AGENT']) ){
+				return $res;
+			}
+
+			$headers = headers_list();
+			krsort($headers);
+			foreach ($headers as $header) {
+				if (!preg_match('~^Set-Cookie: PHPSESSID=~', $header)) continue;
+				$header = preg_replace('~; secure(; HttpOnly)?$~', '', $header) . '; secure; SameSite=None';
+				header($header, false);
+				break;
+			}
+			return $res;
+		}
+	}
+
+	session_start_samesite();
+} else {
+	@session_start();
+}
+//==============================================================================
+
 define('G5_HTTP_BBS_URL',  https_url(G5_BBS_DIR, false));
 define('G5_HTTPS_BBS_URL', https_url(G5_BBS_DIR, true));
 if ($config['cf_editor'])

config.php

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

extend/version.extend.php

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

head.php

@@ -1,6 +1,8 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
+run_event('pre_head');
+
 if(defined('G5_THEME_PATH')) {
     require_once(G5_THEME_PATH.'/head.php');
     return;

head.sub.php

@@ -2,8 +2,6 @@
 // 이 파일은 새로운 파일 생성시 반드시 포함되어야 함
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-run_event('head_sub');
-
 // 테마 head.sub.php 파일
 if(!defined('G5_IS_ADMIN') && defined('G5_THEME_PATH') && is_file(G5_THEME_PATH.'/head.sub.php')) {
     require_once(G5_THEME_PATH.'/head.sub.php');

js/tooltipster/tooltipster.bundle.css

@@ -0,0 +1,388 @@
+/* This is the core CSS of Tooltipster */
+
+/* GENERAL STRUCTURE RULES (do not edit this section) */
+
+.tooltipster-base {
+	/* this ensures that a constrained height set by functionPosition,
+	if greater that the natural height of the tooltip, will be enforced
+	in browsers that support display:flex */
+	display: flex;
+	pointer-events: none;
+	/* this may be overriden in JS for fixed position origins */
+	position: absolute;
+}
+
+.tooltipster-box {
+	/* see .tooltipster-base. flex-shrink 1 is only necessary for IE10-
+	and flex-basis auto for IE11- (at least) */
+	flex: 1 1 auto;
+}
+
+.tooltipster-content {
+	/* prevents an overflow if the user adds padding to the div */
+	box-sizing: border-box;
+	/* these make sure we'll be able to detect any overflow */
+	max-height: 100%;
+	max-width: 100%;
+	overflow: auto;
+}
+
+.tooltipster-ruler {
+	/* these let us test the size of the tooltip without overflowing the window */
+	bottom: 0;
+	left: 0;
+	overflow: hidden;
+	position: fixed;
+	right: 0;
+	top: 0;
+	visibility: hidden;
+}
+
+/* ANIMATIONS */
+
+/* Open/close animations */
+
+/* fade */
+
+.tooltipster-fade {
+	opacity: 0;
+	-webkit-transition-property: opacity;
+	-moz-transition-property: opacity;
+	-o-transition-property: opacity;
+	-ms-transition-property: opacity;
+	transition-property: opacity;
+}
+.tooltipster-fade.tooltipster-show {
+	opacity: 1;
+}
+
+/* grow */
+
+.tooltipster-grow {
+	-webkit-transform: scale(0,0);
+	-moz-transform: scale(0,0);
+	-o-transform: scale(0,0);
+	-ms-transform: scale(0,0);
+	transform: scale(0,0);
+	-webkit-transition-property: -webkit-transform;
+	-moz-transition-property: -moz-transform;
+	-o-transition-property: -o-transform;
+	-ms-transition-property: -ms-transform;
+	transition-property: transform;
+	-webkit-backface-visibility: hidden;
+}
+.tooltipster-grow.tooltipster-show {
+	-webkit-transform: scale(1,1);
+	-moz-transform: scale(1,1);
+	-o-transform: scale(1,1);
+	-ms-transform: scale(1,1);
+	transform: scale(1,1);
+	-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+	-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	-moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	-ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	-o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+}
+
+/* swing */
+
+.tooltipster-swing {
+	opacity: 0;
+	-webkit-transform: rotateZ(4deg);
+	-moz-transform: rotateZ(4deg);
+	-o-transform: rotateZ(4deg);
+	-ms-transform: rotateZ(4deg);
+	transform: rotateZ(4deg);
+	-webkit-transition-property: -webkit-transform, opacity;
+	-moz-transition-property: -moz-transform;
+	-o-transition-property: -o-transform;
+	-ms-transition-property: -ms-transform;
+	transition-property: transform;
+}
+.tooltipster-swing.tooltipster-show {
+	opacity: 1;
+	-webkit-transform: rotateZ(0deg);
+	-moz-transform: rotateZ(0deg);
+	-o-transform: rotateZ(0deg);
+	-ms-transform: rotateZ(0deg);
+	transform: rotateZ(0deg);
+	-webkit-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 1);
+	-webkit-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+	-moz-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+	-ms-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+	-o-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+	transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+}
+
+/* fall */
+
+.tooltipster-fall {
+	-webkit-transition-property: top;
+	-moz-transition-property: top;
+	-o-transition-property: top;
+	-ms-transition-property: top;
+	transition-property: top;
+	-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+	-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	-moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	-ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	-o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+}
+.tooltipster-fall.tooltipster-initial {
+	top: 0 !important;
+}
+.tooltipster-fall.tooltipster-show {
+}
+.tooltipster-fall.tooltipster-dying {
+	-webkit-transition-property: all;
+	-moz-transition-property: all;
+	-o-transition-property: all;
+	-ms-transition-property: all;
+	transition-property: all;
+	top: 0 !important;
+	opacity: 0;
+}
+
+/* slide */
+
+.tooltipster-slide {
+	-webkit-transition-property: left;
+	-moz-transition-property: left;
+	-o-transition-property: left;
+	-ms-transition-property: left;
+	transition-property: left;
+	-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+	-webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	-moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	-ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	-o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+	transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+}
+.tooltipster-slide.tooltipster-initial {
+	left: -40px !important;
+}
+.tooltipster-slide.tooltipster-show {
+}
+.tooltipster-slide.tooltipster-dying {
+	-webkit-transition-property: all;
+	-moz-transition-property: all;
+	-o-transition-property: all;
+	-ms-transition-property: all;
+	transition-property: all;
+	left: 0 !important;
+	opacity: 0;
+}
+
+/* Update animations */
+
+/* We use animations rather than transitions here because
+ transition durations may be specified in the style tag due to
+ animationDuration, and we try to avoid collisions and the use
+ of !important */
+
+/* fade */
+
+@keyframes tooltipster-fading {
+	0% {
+		opacity: 0;
+	}
+	100% {
+		opacity: 1;
+	}
+}
+
+.tooltipster-update-fade {
+	animation: tooltipster-fading 400ms;
+}
+
+/* rotate */
+
+@keyframes tooltipster-rotating {
+	25% {
+		transform: rotate(-2deg);
+	}
+	75% {
+		transform: rotate(2deg);
+	}
+	100% {
+		transform: rotate(0);
+	}
+}
+
+.tooltipster-update-rotate {
+	animation: tooltipster-rotating 600ms;
+}
+
+/* scale */
+
+@keyframes tooltipster-scaling {
+	50% {
+		transform: scale(1.1);
+	}
+	100% {
+		transform: scale(1);
+	}
+}
+
+.tooltipster-update-scale {
+	animation: tooltipster-scaling 600ms;
+}
+
+/**
+ * DEFAULT STYLE OF THE SIDETIP PLUGIN
+ * 
+ * All styles are "namespaced" with .tooltipster-sidetip to prevent
+ * conflicts between plugins.
+ */
+
+/* .tooltipster-box */
+
+.tooltipster-sidetip .tooltipster-box {
+	background: #565656;
+	border: 2px solid black;
+	border-radius: 4px;
+}
+
+.tooltipster-sidetip.tooltipster-bottom .tooltipster-box {
+	margin-top: 8px;
+}
+
+.tooltipster-sidetip.tooltipster-left .tooltipster-box {
+	margin-right: 8px;
+}
+
+.tooltipster-sidetip.tooltipster-right .tooltipster-box {
+	margin-left: 8px;
+}
+
+.tooltipster-sidetip.tooltipster-top .tooltipster-box {
+	margin-bottom: 8px;
+}
+
+/* .tooltipster-content */
+
+.tooltipster-sidetip .tooltipster-content {
+	color: white;
+	line-height: 18px;
+	padding: 6px 14px;
+}
+
+/* .tooltipster-arrow : will keep only the zone of .tooltipster-arrow-uncropped that
+corresponds to the arrow we want to display */
+
+.tooltipster-sidetip .tooltipster-arrow {
+	overflow: hidden;
+	position: absolute;
+}
+
+.tooltipster-sidetip.tooltipster-bottom .tooltipster-arrow {
+	height: 10px;
+	/* half the width, for centering */
+	margin-left: -10px;
+	top: 0;
+	width: 20px;
+}
+
+.tooltipster-sidetip.tooltipster-left .tooltipster-arrow {
+	height: 20px;
+	margin-top: -10px;
+	right: 0;
+	/* top 0 to keep the arrow from overflowing .tooltipster-base when it has not
+	been positioned yet */
+	top: 0;
+	width: 10px;
+}
+
+.tooltipster-sidetip.tooltipster-right .tooltipster-arrow {
+	height: 20px;
+	margin-top: -10px;
+	left: 0;
+	/* same as .tooltipster-left .tooltipster-arrow */
+	top: 0;
+	width: 10px;
+}
+
+.tooltipster-sidetip.tooltipster-top .tooltipster-arrow {
+	bottom: 0;
+	height: 10px;
+	margin-left: -10px;
+	width: 20px;
+}
+
+/* common rules between .tooltipster-arrow-background and .tooltipster-arrow-border */
+
+.tooltipster-sidetip .tooltipster-arrow-background, .tooltipster-sidetip .tooltipster-arrow-border {
+	height: 0;
+	position: absolute;
+	width: 0;
+}
+
+/* .tooltipster-arrow-background */
+
+.tooltipster-sidetip .tooltipster-arrow-background {
+	border: 10px solid transparent;
+}
+
+.tooltipster-sidetip.tooltipster-bottom .tooltipster-arrow-background {
+	border-bottom-color: #565656;
+	left: 0;
+	top: 3px;
+}
+
+.tooltipster-sidetip.tooltipster-left .tooltipster-arrow-background {
+	border-left-color: #565656;
+	left: -3px;
+	top: 0;
+}
+
+.tooltipster-sidetip.tooltipster-right .tooltipster-arrow-background {
+	border-right-color: #565656;
+	left: 3px;
+	top: 0;
+}
+
+.tooltipster-sidetip.tooltipster-top .tooltipster-arrow-background {
+	border-top-color: #565656;
+	left: 0;
+	top: -3px;
+}
+
+/* .tooltipster-arrow-border */
+
+.tooltipster-sidetip .tooltipster-arrow-border {
+	border: 10px solid transparent;
+	left: 0;
+	top: 0;
+}
+
+.tooltipster-sidetip.tooltipster-bottom .tooltipster-arrow-border {
+	border-bottom-color: black;
+}
+
+.tooltipster-sidetip.tooltipster-left .tooltipster-arrow-border {
+	border-left-color: black;
+}
+
+.tooltipster-sidetip.tooltipster-right .tooltipster-arrow-border {
+	border-right-color: black;
+}
+
+.tooltipster-sidetip.tooltipster-top .tooltipster-arrow-border {
+	border-top-color: black;
+}
+
+/* tooltipster-arrow-uncropped */
+
+.tooltipster-sidetip .tooltipster-arrow-uncropped {
+	position: relative;
+}
+
+.tooltipster-sidetip.tooltipster-bottom .tooltipster-arrow-uncropped {
+	top: -10px;
+}
+
+.tooltipster-sidetip.tooltipster-right .tooltipster-arrow-uncropped {
+	left: -10px;
+}

lib/common.lib.php

@@ -116,6 +116,17 @@ function goto_url($url)
 // 세션변수 생성
 function set_session($session_name, $value)
 {
+	static $check_cookie = null;
+	
+	if( $check_cookie === null ){
+		$cookie_session_name = session_name();
+		if( ! ($cookie_session_name && isset($_COOKIE[$cookie_session_name]) && $_COOKIE[$cookie_session_name]) && ! headers_sent() ){
+			@session_regenerate_id(false);
+		}
+
+		$check_cookie = 1;
+	}
+
     if (PHP_VERSION < '5.3.0')
         session_register($session_name);
     // PHP 버전별 차이를 없애기 위한 방법
@@ -2461,7 +2472,7 @@ function add_stylesheet($stylesheet, $order=0)
 {
     global $html_process;
 
-    if(trim($stylesheet))
+    if(trim($stylesheet) && method_exists($html_process, 'merge_stylesheet') )
         $html_process->merge_stylesheet($stylesheet, $order);
 }
 
@@ -2469,7 +2480,7 @@ function add_javascript($javascript, $order=0)
 {
     global $html_process;
 
-    if(trim($javascript))
+    if(trim($javascript) && method_exists($html_process, 'merge_javascript') )
         $html_process->merge_javascript($javascript, $order);
 }
 

lib/uri.lib.php

@@ -113,15 +113,17 @@ function short_url_clean($string_url, $add_qry=''){
         
         $array_page_names = run_replace('url_clean_page_names', array('board', 'write', 'content'));
 
-        if( strpos($string_url, G5_BBS_URL) === false || ! in_array($page_name, $array_page_names) ){   //게시판이 아니면 리턴
-            return $string_url;
+        if( stripos(preg_replace('/^https?:/i', '', $string_url), preg_replace('/^https?:/i', '', G5_BBS_URL)) === false || ! in_array($page_name, $array_page_names) ){   //게시판이 아니면 리턴
+            return run_replace('false_short_url_clean', $string_url, $url, $page_name, $array_page_names);
         }
 
         $return_url = '';
         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;
+		foreach($vars as $k => $v) { $page_name .= "/".$v; }
+		*/
         
         if( $page_name === 'write' ){
             $vars['action'] = 'write';
@@ -173,8 +175,8 @@ function short_url_clean($string_url, $add_qry=''){
         if( $add_qry ){
             $add_param .= $add_param ? '&'.$add_qry : '?'.$add_qry;
         }
-
-        while(list($k,$v) = each($s)) $return_url .= '/'.$v;
+		
+		foreach($s as $k => $v) { $return_url .= '/'.$v; }
 
         return $host.$return_url.$add_param.$fragment;
     }

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

@@ -76,7 +76,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php if ($is_email) { ?>
         <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
-            <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input" email" maxlength="100" placeholder="이메일">
+            <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 

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

@@ -76,7 +76,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php if ($is_email) { ?>
         <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
-            <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input"  email" maxlength="100" placeholder="이메일">
+            <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 

mobile/skin/content/basic/style.css

@@ -5,4 +5,5 @@
 .ctt_admin {margin:0 5px;text-align:right}
 #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #ctt_con {padding:10px 0}
+#ctt_con img{max-width:100%;height:auto}
 .ctt_img {text-align:center}

mobile/skin/latest/basic/latest.carousel.js

@@ -1,6 +1,43 @@
 jQuery(function($){
     $(document).ready(function(){
         
+		$(".owl-carousel-wrap .sv_member").off('click').off('focusin');
+		
+		if ($.fn.tooltipster) {
+			var $member_menu_tip = $('.owl-carousel-wrap .sv_member').tooltipster({
+					theme: 'tooltipster-sir',
+					trigger: 'custom',
+					contentAsHTML: true,
+					interactive: true,
+					distance: 5,
+					position:'bottom',
+					coord: {
+						left: 20,
+						bottom: 0
+					},
+					triggerOpen: {
+						click: true,
+						tap: true    // For touch device
+					},
+					triggerClose: {
+						click: true,
+						scroll: true,
+						tap: true
+					},
+					functionBefore: function(instance, helper) {
+						var content = $(helper.origin).parent().find('.sv')[0].outerHTML;
+						instance.content(content);
+					},
+					functionReady : function(instance, helper) {
+						$(helper.tooltip).find(".tooltipster-arrow").css({left:16});
+					},
+					functionPosition: function(instance, helper, position){
+						position.coord.left += 7;
+						return position;
+					}
+			});
+		}
+
         var carousels = [],
             is_loop = true;
 
@@ -38,6 +75,16 @@ jQuery(function($){
                     owl_show_page(event);
                 },
             });
+			
+			carousels['sel' + index].on('changed.owl.carousel', function(event) {
+				
+				if ($.fn.tooltipster) {
+					var instances = $.tooltipster.instances();
+					$.each(instances, function(i, instance){
+						instance.close();
+					});
+				}
+			});
 
             $this.on("click", ".lt_page_next", function(e) {
                 e.preventDefault();

mobile/skin/latest/basic/latest.skin.php

@@ -3,14 +3,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 
 add_javascript('<script src="'.G5_JS_URL.'/owlcarousel/owl.carousel.min.js"></script>', 10);
-add_javascript('<script src="'.$latest_skin_url.'/latest.carousel.js"></script>', 11);
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/owlcarousel/owl.carousel.min.css">', 10);
 
+add_javascript('<script src="'.G5_JS_URL.'/tooltipster/tooltipster.bundle.min.js"></script>', 11);
+add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/tooltipster/tooltipster.bundle.min.css">', 11);
+add_javascript('<script src="'.$latest_skin_url.'/latest.carousel.js?v2"></script>', 12);
+
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
-add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
+add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css?v2">', 1);
 $thumb_width = 138;
 $thumb_height = 80;
-$list_count = count($list);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 $divisor_count = 4;
 $start_page_num = $list_count ? '1' : '0';
 $is_show_next_prev = ($list_count > 4) ? 1 : 0;

mobile/skin/latest/basic/style.css

@@ -30,7 +30,13 @@
 .lt .comment_icon {background:url('./img/icon_comment.png') no-repeat 50% 50%;display:inline-block;width:20px;height:28px;text-indent:-999px;overflow:hidden;vertical-align:top;background-size:70%;margin:0 0px 0 5px}
 .lt .empty_li {text-align:center;padding:40px 0;color:#777}
 
-.lt .owl-carousel .owl-item .profile_img img{width:auto}
+.lt .owl-carousel .owl-item .profile_img img{width:auto;display:inline}
+
+.tooltipster-content .sv a{display:block;padding:0 10px;line-height:30px;font-weight:normal;color:#bbb}
+.tooltipster-content .sv a:hover{background:#000;color:#fff}
+.tooltipster-sidetip.tooltipster-sir .tooltipster-content{padding:0}
+.tooltipster-sidetip.tooltipster-sir .tooltipster-box{border:0 none;background:#333;border-radius:0}
+.tooltipster-sidetip.tooltipster-sir.tooltipster-bottom .tooltipster-arrow-border, .tooltipster-sidetip.tooltipster-sir.tooltipster-bottom .tooltipster-arrow-background{border-bottom-color:#333}
 
 .lt_page {background:#fff;text-align:center;padding:10px 15px;line-height:25px;border-bottom:1px solid #e5ecee}
 .lt_page button {display:inline-block;background:#fff;width:25px;height:25px;border:1px solid #dbdee6;text-align:center;color:#cdcdce}

mobile/skin/latest/comment/latest.skin.php

@@ -3,14 +3,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="cm_lt">
     <h2 class="cm_lt_title"><a href="<?php echo get_pretty_url($bo_table); ?>">최신댓글</a></h2>
     <ul>
     <?php
-    $count = count($list);
-    for ($i=0; $i<$count; $i++) {
+    for ($i=0; $i<$list_count; $i++) {
     ?>
         <li>
             <span class="cm_lt_nick"><?php echo get_member_profile_img($member['mb_id']); ?></span>
@@ -24,7 +24,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
     <?php
     }
 
-    if($i ==0)
+    if($list_count ==0)
         echo '<li class="empty_li">게시물이 없습니다.</li>'.PHP_EOL;
     ?>
     </ul>

mobile/skin/latest/notice/latest.skin.php

@@ -4,12 +4,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
 add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="notice ft_cnt">
     <h2><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
-    <?php for ($i=0; $i<count($list); $i++) {  ?>
+    <?php for ($i=0; $i<$list_count; $i++) {  ?>
         <li>
             <?php
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
@@ -35,7 +36,7 @@ add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
             ?>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

mobile/skin/member/basic/memo.skin.php

@@ -35,7 +35,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 						    <a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $memo_preview; ?></a>
                         </div>
 					</div>	
-	                <?php// 쪽지 읽은 시간 echo $list[$i]['read_datetime'] ?>	
+	                <?php /* 쪽지 읽은 시간 echo $list[$i]['read_datetime']; */ ?>	
 					<a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;" class="memo_del"><i class="fa fa-trash-o" aria-hidden="true"></i> <span class="sound_only">삭제</span></a>
 	            </li>
 	            <?php }  ?>

mobile/skin/member/basic/memo_form.skin.php

@@ -22,7 +22,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 <li>
                     <label for="me_recv_mb_id" class="sound_only">받는 회원아이디<strong>필수</strong></label>
                     
-                    <input type="text" name="me_recv_mb_id" value="<?php echo $me_recv_mb_id; ?>" id="me_recv_mb_id" required class="frm_input full_input required" size="47" placeholder="받는 회원닉네임">
+                    <input type="text" name="me_recv_mb_id" value="<?php echo $me_recv_mb_id; ?>" id="me_recv_mb_id" required class="frm_input full_input required" size="47" placeholder="받는 회원아이디">
                     <span class="frm_info">여러 회원에게 보낼때는 컴마(,)로 구분하세요.
                     	<?php if ($config['cf_memo_send_point']) { ?><br>쪽지 보낼때 회원당 <?php echo number_format($config['cf_memo_send_point']); ?>점의 포인트를 차감합니다.<?php } ?>
                     </span>

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

@@ -151,7 +151,7 @@ if(!$view['qa_type']) {
                     </a>
                 </div>
                 <div class="li_info">
-                    <span class="li_stat <?php echo ($list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($rel_list[$i]['qa_status'] ? '답변완료' : '답변대기'); ?></span>
+                    <span class="li_stat <?php echo ($rel_list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($rel_list[$i]['qa_status'] ? '답변완료' : '답변대기'); ?></span>
                     <span class="li_date"><?php echo $rel_list[$i]['date']; ?></span>
                 </div>
             </li>

plugin/htmlpurifier/safeiframe.txt

@@ -4,6 +4,7 @@ www.youtube(?:-nocookie)?.com/
 serviceapi.rmcnmv.naver.com/
 videofarm.daum.net/
 player.vimeo.com/
+www.google.com/
 maps.google.com/
 play.afreeca.com/
 v.nate.com/

plugin/kcaptcha/kcaptcha_result.php

@@ -1,7 +1,6 @@
-<?
+<?php
 // 캡챠 세션값과 비교하여 맞는지? 틀린지? 결과값을 출력합니다.
 include_once("_common.php");
-//header("Content-Type: text/html; charset=$g4[charset]");
 
 $count = (int)get_session("ss_captcha_count");
 if ($count >= 5) { // 설정값 이상이면 자동등록방지 입력 문자가 맞아도 오류 처리

plugin/okname/hpcert2.php

@@ -21,15 +21,15 @@ require('./hpcert.config.php');
 **************************************************************************/
 
 /* 공통 리턴 항목 */
-//$idcfMbrComCd           =   $_POST['idcf_mbr_com_cd'];      // 고객사코드
+//$idcfMbrComCd           =   $_REQUEST['idcf_mbr_com_cd'];      // 고객사코드
 $idcfMbrComCd           =   $memId;
-$hsCertSvcTxSeqno       =   $_POST['hs_cert_svc_tx_seqno']; // 거래번호
-$rqstSiteNm             =   $_POST['rqst_site_nm'];         // 접속도메인
-$hsCertRqstCausCd       =   $_POST['hs_cert_rqst_caus_cd']; // 인증요청사유코드 2byte  (00:회원가입, 01:성인인증, 02:회원정보수정, 03:비밀번호찾기, 04:상품구매, 99:기타)
+$hsCertSvcTxSeqno       =   $_REQUEST['hs_cert_svc_tx_seqno']; // 거래번호
+$rqstSiteNm             =   $_REQUEST['rqst_site_nm'];         // 접속도메인
+$hsCertRqstCausCd       =   $_REQUEST['hs_cert_rqst_caus_cd']; // 인증요청사유코드 2byte  (00:회원가입, 01:성인인증, 02:회원정보수정, 03:비밀번호찾기, 04:상품구매, 99:기타)
 
-$resultCd               =   $_POST['result_cd'];            // 결과코드
-$resultMsg              =   $_POST['result_msg'];           // 결과메세지
-$certDtTm               =   $_POST['cert_dt_tm'];           // 인증일시
+$resultCd               =   $_REQUEST['result_cd'];            // 결과코드
+$resultMsg              =   $_REQUEST['result_msg'];           // 결과메세지
+$certDtTm               =   $_REQUEST['cert_dt_tm'];           // 인증일시
 
 if($resultCd != 'B000') {
     alert_close('휴대폰 본인확인 중 오류가 발생했습니다. 오류코드 : '.$resultCd.'\\n\\n문의는 코리아크레딧뷰로 고객센터 02-708-1000 로 해주십시오.');
@@ -38,15 +38,15 @@ if($resultCd != 'B000') {
 /**************************************************************************
  * 모듈 호출    ; 생년월일 본인 확인서비스 결과 데이터를 복호화한다.
  **************************************************************************/
-$encInfo = $_POST['encInfo'];
+$encInfo = $_REQUEST['encInfo'];
 if(preg_match('~[^0-9a-zA-Z+/=]~', $encInfo, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 공개키
-$WEBPUBKEY = trim($_POST['WEBPUBKEY']);
+$WEBPUBKEY = trim($_REQUEST['WEBPUBKEY']);
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBPUBKEY, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 서명값
-$WEBSIGNATURE = trim($_POST['WEBSIGNATURE']);
+$WEBSIGNATURE = trim($_REQUEST['WEBSIGNATURE']);
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBSIGNATURE, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 // ########################################################################

plugin/okname/ipin2.php

@@ -14,15 +14,15 @@ foreach($check_arrays as $key){
 require('./ipin.config.php');
 
 //아이핀팝업에서 조회한 PERSONALINFO이다.
-@$encPsnlInfo = $_POST["encPsnlInfo"];
+@$encPsnlInfo = $_REQUEST["encPsnlInfo"];
 if(preg_match('~[^0-9a-zA-Z+/=]~', $encPsnlInfo, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 공개키
-@$WEBPUBKEY = trim($_POST["WEBPUBKEY"]);
+@$WEBPUBKEY = trim($_REQUEST["WEBPUBKEY"]);
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBPUBKEY, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //KCB서버 서명값
-@$WEBSIGNATURE = trim($_POST["WEBSIGNATURE"]);
+@$WEBSIGNATURE = trim($_REQUEST["WEBSIGNATURE"]);
 if(preg_match('~[^0-9a-zA-Z+/=]~', $WEBSIGNATURE, $match)) {echo "입력 값 확인이 필요합니다"; exit;}
 
 //아이핀 서버와 통신을 위한 키파일 생성

skin/board/basic/view.skin.php

@@ -120,7 +120,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             <?php } ?>
             <?php if ($nogood_href) { ?>
             <span class="bo_v_act_gng">
-                <a href="<?php echo $nogood_href.'&amp;'.$qstr ?>" id="nogood_button" class="bo_v_nogood"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></a>
+                <a href="<?php echo $nogood_href.'&amp;'.$qstr ?>" id="nogood_button" class="bo_v_nogood"><i class="fa fa-thumbs-o-down" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></a>
                 <b id="bo_v_act_nogood"></b>
             </span>
             <?php } ?>

skin/board/gallery/view.skin.php

@@ -120,7 +120,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             <?php } ?>
             <?php if ($nogood_href) { ?>
             <span class="bo_v_act_gng">
-                <a href="<?php echo $nogood_href.'&amp;'.$qstr ?>" id="nogood_button" class="bo_v_nogood"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></a>
+                <a href="<?php echo $nogood_href.'&amp;'.$qstr ?>" id="nogood_button" class="bo_v_nogood"><i class="fa fa-thumbs-o-down" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></a>
                 <b id="bo_v_act_nogood"></b>
             </span>
             <?php } ?>

skin/latest/basic/latest.skin.php

@@ -3,12 +3,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="lat">
     <h2 class="lat_title"><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
-    <?php for ($i=0; $i<count($list); $i++) {  ?>
+    <?php for ($i=0; $i<$list_count; $i++) {  ?>
         <li class="basic_li">
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
@@ -40,7 +41,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
             </div>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

skin/latest/basic/style.css

@@ -17,6 +17,8 @@
 .lat li .fa-download {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#daae37;background:#ffefb9;text-align:center;border-radius:2px;vertical-align:middle}
 .lat li .fa-link {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#b451fd;background:#edd3fd;text-align:center;border-radius:2px;vertical-align:middle}
 
+.lat .profile_img img{border-radius:50%}
+
 .lt_info {padding:10px 0}
 .lt_info .lt_nick {}
 .lt_info .lt_date {color:#888}

skin/latest/notice/latest.skin.php

@@ -4,12 +4,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
 add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="notice ft_cnt">
     <h2><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
-    <?php for ($i=0; $i<count($list); $i++) {  ?>
+    <?php for ($i=0; $i<$list_count; $i++) {  ?>
         <li>
             <?php
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
@@ -35,7 +36,7 @@ add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
             ?>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

skin/latest/pic_block/latest.skin.php

@@ -6,13 +6,14 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
 $thumb_width = 210;
 $thumb_height = 150;
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="pic_lt">
     <h2 class="lat_title"><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
     <?php
-    for ($i=0; $i<count($list); $i++) {
+    for ($i=0; $i<$list_count; $i++) {
     $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
 
     if($thumb['src']) {
@@ -56,7 +57,7 @@ $thumb_height = 150;
             </div>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

skin/latest/pic_block/style.css

@@ -22,6 +22,7 @@
 .pic_lt li .fa-download {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#daae37;background:#ffefb9;text-align:center;border-radius:2px;vertical-align:middle}
 .pic_lt li .fa-link {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#b451fd;background:#edd3fd;text-align:center;border-radius:2px;vertical-align:middle}
 
+.pic_lt .profile_img img{border-radius:50%}
 
 .lt_info {padding:10px 0}
 .lt_info .lt_nick {}

skin/latest/pic_list/latest.skin.php

@@ -6,13 +6,14 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
 $thumb_width = 297;
 $thumb_height = 212;
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="pic_li_lt">
     <h2 class="lat_title"><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
     <?php
-    for ($i=0; $i<count($list); $i++) {
+    for ($i=0; $i<$list_count; $i++) {
         
         $img_link_html = '';
         
@@ -63,7 +64,7 @@ $thumb_height = 212;
             </div>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

skin/latest/pic_list/style.css

@@ -23,6 +23,8 @@
 .pic_li_lt li .fa-download {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#daae37;background:#ffefb9;text-align:center;border-radius:2px;vertical-align:middle}
 .pic_li_lt li .fa-link {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#b451fd;background:#edd3fd;text-align:center;border-radius:2px;vertical-align:middle}
 
+.pic_li_lt .profile_img img{border-radius:50%}
+
 .lt_info {padding:10px 0}
 .lt_info .lt_nick {}
 .lt_info .lt_date {color:#888}

skin/member/basic/register_form.skin.php

@@ -98,15 +98,17 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 	            <?php }  ?>
 	
 	            <li>
-	                <label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label>
+	                <label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong>
 	                
 	                <?php if ($config['cf_use_email_certify']) {  ?>
 	                <button type="button" class="tooltip_icon"><i class="fa fa-question-circle-o" aria-hidden="true"></i><span class="sound_only">설명보기</span></button>
-					<span class="tooltip">이미지 크기는 가
+					<span class="tooltip">
 	                    <?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; }  ?>
 	                    <?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; }  ?>
 	                </span>
 	                <?php }  ?>
+					</label>
+
 	                <input type="hidden" name="old_email" value="<?php echo $member['mb_email'] ?>">
 	                <input type="text" name="mb_email" value="<?php echo isset($member['mb_email'])?$member['mb_email']:''; ?>" id="reg_mb_email" required class="frm_input email full_input required" size="70" maxlength="100" placeholder="E-mail">
 	            

skin/member/basic/style.css

@@ -231,6 +231,7 @@
 #memo_list .memo_datetime {font-size:0.92em;color:#888d92}
 #memo_list .memo_del {position:absolute;right:15px;top:15px;padding:10px;color:#c7c9cb;font-size:1.4em}
 #memo_list .memo_cnt {margin-top:5px;font-weight:normal;display:inline-block;font-size:1.2em}
+#memo_list .pg_wrap {margin-top:10px;width:100%;float:inherit;text-align:center}
 
 #memo_view_contents {margin-bottom:20px;border-top:1px solid #ececec;border-bottom:1px solid #ececec}
 #memo_view_contents h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}

skin/qa/basic/view.skin.php

@@ -163,7 +163,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
                     </a>
                 </td>
                 <td class="td_date"><?php echo $rel_list[$i]['date']; ?></td>
-                <td class="td_stat"><span class="<?php echo ($list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($rel_list[$i]['qa_status'] ? '<i class="fa fa-check-circle" aria-hidden="true"></i> 답변완료' : '<i class="fa fa-times-circle" aria-hidden="true"></i> 답변대기'); ?></span></td>
+                <td class="td_stat"><span class="<?php echo ($rel_list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($rel_list[$i]['qa_status'] ? '<i class="fa fa-check-circle" aria-hidden="true"></i> 답변완료' : '<i class="fa fa-times-circle" aria-hidden="true"></i> 답변대기'); ?></span></td>
             </tr>
             <?php
             }

skin/search/basic/search.skin.php

@@ -105,7 +105,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
     $k=0;
     for ($idx=$table_index, $k=0; $idx<count($search_table) && $k<$rows; $idx++) {
      ?>
+		<div class="search_board_result">
         <h2><a href="<?php echo get_pretty_url($search_table[$idx], '', $search_query); ?>"><?php echo $bo_subject[$idx] ?> 게시판 내 결과</a></h2>
+		<a href="<?php echo get_pretty_url($search_table[$idx], '', $search_query); ?>" class="sch_more">더보기</a>
         <ul>
         <?php
         for ($i=0; $i<count($list[$idx]) && $k<$rows; $i++, $k++) {
@@ -134,8 +136,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
             </li>
         <?php }  ?>
         </ul>
-        <a href="<?php echo get_pretty_url($search_table[$idx], '', $search_query); ?>" class="sch_more">더보기</a>
-    <?php }  ?>
+		</div>
+    <?php }		//end for?>
     <?php if ($stx && $board_count) {  ?></section><?php }  ?>
 
     <?php echo $write_pages ?>

skin/search/basic/style.css

@@ -49,8 +49,9 @@ transition:all 0.1s ease-in-out}
 box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 
 .sch_res_list {position:relative;margin-bottom:10px}
+.sch_res_list .search_board_result{position:relative}
 .sch_res_list h2 {margin:0 0 15px;font-size:1.2em}
-.sch_res_list ul {margin:0;padding:0;list-style:none;border-top:1px solid #ececec}
+.sch_res_list ul {margin:0 0 20px 0;padding:0;list-style:none;border-top:1px solid #ececec}
 .sch_res_list li {border-bottom:1px solid #ececec;background:#fff;position:relative}
 .sch_res_list .sch_tit {display:block;padding:20px 0 10px}
 .sch_res_list .pop_a {display:inline-block;background:#e8eeef;color:#6f777f;border-radius:50%;text-align:center;width:26px;height:26px;line-height:26px}
@@ -60,4 +61,4 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 .sch_res_list .sch_info:after {display:block;visibility:hidden;clear:both;content:""}
 .sch_res_list .profile_img img {border-radius:50%}
 .sch_res_list .sch_datetime {margin-left:5px}
-.sch_more {position:absolute;right:0;top:0;text-align:right;margin:10px 0 30px;color:#3a8afd}
+.sch_more {position:absolute;right:0;top:5px;text-align:right;font-weight:normal;color:#3a8afd}

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

@@ -76,7 +76,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php if ($is_email) { ?>
         <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
-            <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input" email" maxlength="100" placeholder="이메일">
+            <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 

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

@@ -76,7 +76,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <?php if ($is_email) { ?>
         <div class="write_div">
             <label for="wr_email" class="sound_only">이메일</label>
-            <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input"  email" maxlength="100" placeholder="이메일">
+            <input type="email" name="wr_email" value="<?php echo $email ?>" id="wr_email" class="frm_input full_input" maxlength="100" placeholder="이메일">
         </div>
         <?php } ?>
 

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

@@ -5,4 +5,5 @@
 .ctt_admin {margin:0 5px;text-align:right}
 #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #ctt_con {padding:10px 0}
+#ctt_con img{max-width:100%;height:auto}
 .ctt_img {text-align:center}

theme/basic/mobile/skin/latest/basic/latest.carousel.js

@@ -1,6 +1,43 @@
 jQuery(function($){
     $(document).ready(function(){
         
+		$(".owl-carousel-wrap .sv_member").off('click').off('focusin');
+		
+		if ($.fn.tooltipster) {
+			var $member_menu_tip = $('.owl-carousel-wrap .sv_member').tooltipster({
+					theme: 'tooltipster-sir',
+					trigger: 'custom',
+					contentAsHTML: true,
+					interactive: true,
+					distance: 5,
+					position:'bottom',
+					coord: {
+						left: 20,
+						bottom: 0
+					},
+					triggerOpen: {
+						click: true,
+						tap: true    // For touch device
+					},
+					triggerClose: {
+						click: true,
+						scroll: true,
+						tap: true
+					},
+					functionBefore: function(instance, helper) {
+						var content = $(helper.origin).parent().find('.sv')[0].outerHTML;
+						instance.content(content);
+					},
+					functionReady : function(instance, helper) {
+						$(helper.tooltip).find(".tooltipster-arrow").css({left:16});
+					},
+					functionPosition: function(instance, helper, position){
+						position.coord.left += 7;
+						return position;
+					}
+			});
+		}
+
         var carousels = [],
             is_loop = true;
 
@@ -38,6 +75,16 @@ jQuery(function($){
                     owl_show_page(event);
                 },
             });
+			
+			carousels['sel' + index].on('changed.owl.carousel', function(event) {
+				
+				if ($.fn.tooltipster) {
+					var instances = $.tooltipster.instances();
+					$.each(instances, function(i, instance){
+						instance.close();
+					});
+				}
+			});
 
             $this.on("click", ".lt_page_next", function(e) {
                 e.preventDefault();

theme/basic/mobile/skin/latest/basic/latest.skin.php

@@ -3,14 +3,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 
 add_javascript('<script src="'.G5_JS_URL.'/owlcarousel/owl.carousel.min.js"></script>', 10);
-add_javascript('<script src="'.$latest_skin_url.'/latest.carousel.js"></script>', 11);
 add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/owlcarousel/owl.carousel.min.css">', 10);
 
+add_javascript('<script src="'.G5_JS_URL.'/tooltipster/tooltipster.bundle.min.js"></script>', 11);
+add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/tooltipster/tooltipster.bundle.min.css">', 11);
+add_javascript('<script src="'.$latest_skin_url.'/latest.carousel.js?v2"></script>', 12);
+
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
-add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
+add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css?v2">', 1);
 $thumb_width = 138;
 $thumb_height = 80;
-$list_count = count($list);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 $divisor_count = 4;
 $start_page_num = $list_count ? '1' : '0';
 $is_show_next_prev = ($list_count > 4) ? 1 : 0;

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

@@ -30,7 +30,13 @@
 .lt .comment_icon {background:url('./img/icon_comment.png') no-repeat 50% 50%;display:inline-block;width:20px;height:28px;text-indent:-999px;overflow:hidden;vertical-align:top;background-size:70%;margin:0 0px 0 5px}
 .lt .empty_li {text-align:center;padding:40px 0;color:#777}
 
-.lt .owl-carousel .owl-item .profile_img img{width:auto}
+.lt .owl-carousel .owl-item .profile_img img{width:auto;display:inline}
+
+.tooltipster-content .sv a{display:block;padding:0 10px;line-height:30px;font-weight:normal;color:#bbb}
+.tooltipster-content .sv a:hover{background:#000;color:#fff}
+.tooltipster-sidetip.tooltipster-sir .tooltipster-content{padding:0}
+.tooltipster-sidetip.tooltipster-sir .tooltipster-box{border:0 none;background:#333;border-radius:0}
+.tooltipster-sidetip.tooltipster-sir.tooltipster-bottom .tooltipster-arrow-border, .tooltipster-sidetip.tooltipster-sir.tooltipster-bottom .tooltipster-arrow-background{border-bottom-color:#333}
 
 .lt_page {background:#fff;text-align:center;padding:10px 15px;line-height:25px;border-bottom:1px solid #e5ecee}
 .lt_page button {display:inline-block;background:#fff;width:25px;height:25px;border:1px solid #dbdee6;text-align:center;color:#cdcdce}

theme/basic/mobile/skin/latest/comment/latest.skin.php

@@ -3,14 +3,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="cm_lt">
     <h2 class="cm_lt_title"><a href="<?php echo get_pretty_url($bo_table); ?>">최신댓글</a></h2>
     <ul>
     <?php
-    $count = count($list);
-    for ($i=0; $i<$count; $i++) {
+    for ($i=0; $i<$list_count; $i++) {
     ?>
         <li>
             <span class="cm_lt_nick"><?php echo get_member_profile_img($member['mb_id']); ?></span>
@@ -24,7 +24,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
     <?php
     }
 
-    if($i ==0)
+    if($list_count ==0)
         echo '<li class="empty_li">게시물이 없습니다.</li>'.PHP_EOL;
     ?>
     </ul>

theme/basic/mobile/skin/latest/notice/latest.skin.php

@@ -4,12 +4,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
 add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="notice ft_cnt">
     <h2><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
-    <?php for ($i=0; $i<count($list); $i++) {  ?>
+    <?php for ($i=0; $i<$list_count; $i++) {  ?>
         <li>
             <?php
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
@@ -35,7 +36,7 @@ add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
             ?>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

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

@@ -35,7 +35,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 						    <a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $memo_preview; ?></a>
                         </div>
 					</div>	
-	                <?php// 쪽지 읽은 시간 echo $list[$i]['read_datetime'] ?>	
+	                <?php /* 쪽지 읽은 시간 echo $list[$i]['read_datetime']; */ ?>	
 					<a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;" class="memo_del"><i class="fa fa-trash-o" aria-hidden="true"></i> <span class="sound_only">삭제</span></a>
 	            </li>
 	            <?php }  ?>

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

@@ -22,7 +22,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
                 <li>
                     <label for="me_recv_mb_id" class="sound_only">받는 회원아이디<strong>필수</strong></label>
                     
-                    <input type="text" name="me_recv_mb_id" value="<?php echo $me_recv_mb_id; ?>" id="me_recv_mb_id" required class="frm_input full_input required" size="47" placeholder="받는 회원닉네임">
+                    <input type="text" name="me_recv_mb_id" value="<?php echo $me_recv_mb_id; ?>" id="me_recv_mb_id" required class="frm_input full_input required" size="47" placeholder="받는 회원아이디">
                     <span class="frm_info">여러 회원에게 보낼때는 컴마(,)로 구분하세요.
                     	<?php if ($config['cf_memo_send_point']) { ?><br>쪽지 보낼때 회원당 <?php echo number_format($config['cf_memo_send_point']); ?>점의 포인트를 차감합니다.<?php } ?>
                     </span>

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

@@ -151,7 +151,7 @@ if(!$view['qa_type']) {
                     </a>
                 </div>
                 <div class="li_info">
-                    <span class="li_stat <?php echo ($list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($rel_list[$i]['qa_status'] ? '답변완료' : '답변대기'); ?></span>
+                    <span class="li_stat <?php echo ($rel_list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($rel_list[$i]['qa_status'] ? '답변완료' : '답변대기'); ?></span>
                     <span class="li_date"><?php echo $rel_list[$i]['date']; ?></span>
                 </div>
             </li>

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

@@ -120,7 +120,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             <?php } ?>
             <?php if ($nogood_href) { ?>
             <span class="bo_v_act_gng">
-                <a href="<?php echo $nogood_href.'&amp;'.$qstr ?>" id="nogood_button" class="bo_v_nogood"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></a>
+                <a href="<?php echo $nogood_href.'&amp;'.$qstr ?>" id="nogood_button" class="bo_v_nogood"><i class="fa fa-thumbs-o-down" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></a>
                 <b id="bo_v_act_nogood"></b>
             </span>
             <?php } ?>

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

@@ -120,7 +120,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
             <?php } ?>
             <?php if ($nogood_href) { ?>
             <span class="bo_v_act_gng">
-                <a href="<?php echo $nogood_href.'&amp;'.$qstr ?>" id="nogood_button" class="bo_v_nogood"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></a>
+                <a href="<?php echo $nogood_href.'&amp;'.$qstr ?>" id="nogood_button" class="bo_v_nogood"><i class="fa fa-thumbs-o-down" aria-hidden="true"></i><span class="sound_only">비추천</span><strong><?php echo number_format($view['wr_nogood']) ?></strong></a>
                 <b id="bo_v_act_nogood"></b>
             </span>
             <?php } ?>

theme/basic/skin/latest/basic/latest.skin.php

@@ -3,12 +3,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="lat">
     <h2 class="lat_title"><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
-    <?php for ($i=0; $i<count($list); $i++) {  ?>
+    <?php for ($i=0; $i<$list_count; $i++) {  ?>
         <li class="basic_li">
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
@@ -40,7 +41,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">',
             </div>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

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

@@ -17,6 +17,8 @@
 .lat li .fa-download {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#daae37;background:#ffefb9;text-align:center;border-radius:2px;vertical-align:middle}
 .lat li .fa-link {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#b451fd;background:#edd3fd;text-align:center;border-radius:2px;vertical-align:middle}
 
+.lat .profile_img img{border-radius:50%}
+
 .lt_info {padding:10px 0}
 .lt_info .lt_nick {}
 .lt_info .lt_date {color:#888}

theme/basic/skin/latest/notice/latest.skin.php

@@ -4,12 +4,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
 add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="notice ft_cnt">
     <h2><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
-    <?php for ($i=0; $i<count($list); $i++) {  ?>
+    <?php for ($i=0; $i<$list_count; $i++) {  ?>
         <li>
             <?php
             if ($list[$i]['icon_secret']) echo "<span class=\"lock_icon\"><i class=\"fa fa-lock\" aria-hidden=\"true\"></i></span> ";
@@ -35,7 +36,7 @@ add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
             ?>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

theme/basic/skin/latest/pic_block/latest.skin.php

@@ -6,13 +6,14 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
 $thumb_width = 210;
 $thumb_height = 150;
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="pic_lt">
     <h2 class="lat_title"><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
     <?php
-    for ($i=0; $i<count($list); $i++) {
+    for ($i=0; $i<$list_count; $i++) {
     $thumb = get_list_thumbnail($bo_table, $list[$i]['wr_id'], $thumb_width, $thumb_height, false, true);
 
     if($thumb['src']) {
@@ -56,7 +57,7 @@ $thumb_height = 150;
             </div>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

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

@@ -22,6 +22,7 @@
 .pic_lt li .fa-download {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#daae37;background:#ffefb9;text-align:center;border-radius:2px;vertical-align:middle}
 .pic_lt li .fa-link {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#b451fd;background:#edd3fd;text-align:center;border-radius:2px;vertical-align:middle}
 
+.pic_lt .profile_img img{border-radius:50%}
 
 .lt_info {padding:10px 0}
 .lt_info .lt_nick {}

theme/basic/skin/latest/pic_list/latest.skin.php

@@ -6,13 +6,14 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
 add_stylesheet('<link rel="stylesheet" href="'.$latest_skin_url.'/style.css">', 0);
 $thumb_width = 297;
 $thumb_height = 212;
+$list_count = (is_array($list) && $list) ? count($list) : 0;
 ?>
 
 <div class="pic_li_lt">
     <h2 class="lat_title"><a href="<?php echo get_pretty_url($bo_table); ?>"><?php echo $bo_subject ?></a></h2>
     <ul>
     <?php
-    for ($i=0; $i<count($list); $i++) {
+    for ($i=0; $i<$list_count; $i++) {
         
         $img_link_html = '';
         
@@ -63,7 +64,7 @@ $thumb_height = 212;
             </div>
         </li>
     <?php }  ?>
-    <?php if (count($list) == 0) { //게시물이 없을 때  ?>
+    <?php if ($list_count == 0) { //게시물이 없을 때  ?>
     <li class="empty_li">게시물이 없습니다.</li>
     <?php }  ?>
     </ul>

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

@@ -23,6 +23,8 @@
 .pic_li_lt li .fa-download {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#daae37;background:#ffefb9;text-align:center;border-radius:2px;vertical-align:middle}
 .pic_li_lt li .fa-link {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#b451fd;background:#edd3fd;text-align:center;border-radius:2px;vertical-align:middle}
 
+.pic_li_lt .profile_img img{border-radius:50%}
+
 .lt_info {padding:10px 0}
 .lt_info .lt_nick {}
 .lt_info .lt_date {color:#888}

theme/basic/skin/member/basic/register_form.skin.php

@@ -98,15 +98,16 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 	            <?php }  ?>
 	
 	            <li>
-	                <label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label>
+	                <label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong>
 	                
 	                <?php if ($config['cf_use_email_certify']) {  ?>
 	                <button type="button" class="tooltip_icon"><i class="fa fa-question-circle-o" aria-hidden="true"></i><span class="sound_only">설명보기</span></button>
-					<span class="tooltip">이미지 크기는 가
+					<span class="tooltip">
 	                    <?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; }  ?>
 	                    <?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; }  ?>
 	                </span>
-	                <?php }  ?>
+	                <?php } ?>
+					</label>
 	                <input type="hidden" name="old_email" value="<?php echo $member['mb_email'] ?>">
 	                <input type="text" name="mb_email" value="<?php echo isset($member['mb_email'])?$member['mb_email']:''; ?>" id="reg_mb_email" required class="frm_input email full_input required" size="70" maxlength="100" placeholder="E-mail">
 	            

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

@@ -231,6 +231,7 @@
 #memo_list .memo_datetime {font-size:0.92em;color:#888d92}
 #memo_list .memo_del {position:absolute;right:15px;top:15px;padding:10px;color:#c7c9cb;font-size:1.4em}
 #memo_list .memo_cnt {margin-top:5px;font-weight:normal;display:inline-block;font-size:1.2em}
+#memo_list .pg_wrap {margin-top:10px;width:100%;float:inherit;text-align:center}
 
 #memo_view_contents {margin-bottom:20px;border-top:1px solid #ececec;border-bottom:1px solid #ececec}
 #memo_view_contents h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}

theme/basic/skin/qa/basic/view.skin.php

@@ -163,7 +163,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
                     </a>
                 </td>
                 <td class="td_date"><?php echo $rel_list[$i]['date']; ?></td>
-                <td class="td_stat"><span class="<?php echo ($list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($rel_list[$i]['qa_status'] ? '<i class="fa fa-check-circle" aria-hidden="true"></i> 답변완료' : '<i class="fa fa-times-circle" aria-hidden="true"></i> 답변대기'); ?></span></td>
+                <td class="td_stat"><span class="<?php echo ($rel_list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($rel_list[$i]['qa_status'] ? '<i class="fa fa-check-circle" aria-hidden="true"></i> 답변완료' : '<i class="fa fa-times-circle" aria-hidden="true"></i> 답변대기'); ?></span></td>
             </tr>
             <?php
             }

theme/basic/skin/search/basic/search.skin.php

@@ -105,7 +105,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
     $k=0;
     for ($idx=$table_index, $k=0; $idx<count($search_table) && $k<$rows; $idx++) {
      ?>
+		<div class="search_board_result">
         <h2><a href="<?php echo get_pretty_url($search_table[$idx], '', $search_query); ?>"><?php echo $bo_subject[$idx] ?> 게시판 내 결과</a></h2>
+		<a href="<?php echo get_pretty_url($search_table[$idx], '', $search_query); ?>" class="sch_more">더보기</a>
         <ul>
         <?php
         for ($i=0; $i<count($list[$idx]) && $k<$rows; $i++, $k++) {
@@ -134,8 +136,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
             </li>
         <?php }  ?>
         </ul>
-        <a href="<?php echo get_pretty_url($search_table[$idx], '', $search_query); ?>" class="sch_more">더보기</a>
-    <?php }  ?>
+		</div>
+    <?php }		//end for?>
     <?php if ($stx && $board_count) {  ?></section><?php }  ?>
 
     <?php echo $write_pages ?>

theme/basic/skin/search/basic/style.css

@@ -49,8 +49,9 @@ transition:all 0.1s ease-in-out}
 box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 
 .sch_res_list {position:relative;margin-bottom:10px}
+.sch_res_list .search_board_result{position:relative}
 .sch_res_list h2 {margin:0 0 15px;font-size:1.2em}
-.sch_res_list ul {margin:0;padding:0;list-style:none;border-top:1px solid #ececec}
+.sch_res_list ul {margin:0 0 20px 0;padding:0;list-style:none;border-top:1px solid #ececec}
 .sch_res_list li {border-bottom:1px solid #ececec;background:#fff;position:relative}
 .sch_res_list .sch_tit {display:block;padding:20px 0 10px}
 .sch_res_list .pop_a {display:inline-block;background:#e8eeef;color:#6f777f;border-radius:50%;text-align:center;width:26px;height:26px;line-height:26px}
@@ -60,4 +61,4 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 .sch_res_list .sch_info:after {display:block;visibility:hidden;clear:both;content:""}
 .sch_res_list .profile_img img {border-radius:50%}
 .sch_res_list .sch_datetime {margin-left:5px}
-.sch_more {position:absolute;right:0;top:0;text-align:right;margin:10px 0 30px;color:#3a8afd}
+.sch_more {position:absolute;right:0;top:5px;text-align:right;font-weight:normal;color:#3a8afd}