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

bbs/good.php

@@ -83,6 +83,8 @@ if(isset($_POST['js']) && $_POST['js'] === "on") {
             $row = sql_fetch($sql);
 
             $count = $row['count'];
+			
+			run_event('bbs_increase_good_json', $bo_table, $wr_id, $good);
 
             print_result($error, $count);
         }
@@ -147,6 +149,8 @@ if(isset($_POST['js']) && $_POST['js'] === "on") {
                 $status = '비추천';
 
             $href = get_pretty_url($bo_table, $wr_id);
+			
+			run_event('bbs_increase_good_html', $bo_table, $wr_id, $good, $href);
 
             alert("이 글을 $status 하셨습니다.", '', false);
         }

bbs/memo_form_update.php

@@ -76,7 +76,8 @@ for ($i=0; $i<count($member_list['id']); $i++) {
         // 보내는 회원 쪽지 INSERT
         $sql = " insert into {$g5['memo_table']} ( me_recv_mb_id, me_send_mb_id, me_send_datetime, me_memo, me_read_datetime, me_send_id, me_type , me_send_ip ) values ( '$recv_mb_id', '{$member['mb_id']}', '".G5_TIME_YMDHIS."', '{$_POST['me_memo']}', '0000-00-00 00:00:00', '$me_id', 'send', '{$_SERVER['REMOTE_ADDR']}' ) ";
         sql_query($sql);
-
+		
+		$member_list['me_id'][$i] = $me_id;
     }
 
     // 실시간 쪽지 알림 기능
@@ -93,16 +94,14 @@ if ($member_list) {
     $redirect_url = G5_HTTP_BBS_URL."/memo.php?kind=send";
     $str_nick_list = implode(',', $member_list['nick']);
 
-    run_event('memo_form_update_after', $member_list, $str_nick_list, $redirect_url);
+    run_event('memo_form_update_after', $member_list, $str_nick_list, $redirect_url, $_POST['me_memo']);
 
     alert($str_nick_list." 님께 쪽지를 전달하였습니다.", $redirect_url, false);
 } else {
 
     $redirect_url = G5_HTTP_BBS_URL."/memo_form.php";
     
-    run_event('memo_form_update_failed', $member_list, $redirect_url);
-    
-    exit;
+    run_event('memo_form_update_failed', $member_list, $redirect_url, $_POST['me_memo']);
 
     alert("회원아이디 오류 같습니다.", $redirect_url, false);
 }

bbs/qawrite_update.php

@@ -14,6 +14,7 @@ $msg = array();
 
 // 1:1문의 설정값
 $qaconfig = get_qa_config();
+$qa_id = isset($qa_id) ? (int) $qa_id : 0;
 
 if(trim($qaconfig['qa_category'])) {
     if($w != 'a') {

config.php

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

extend/g5_54version_update.extend.php

@@ -7,7 +7,7 @@ add_replace('invalid_password', 'g54_return_invalid_password', 10, 3);
 
 function g54_return_invalid_password($bool, $type, $wr){
     if($type === 'write' && $bool === false && $wr['wr_password'] && isset($_POST['wr_password'])) {
-        if(G5_STRING_ENCRYPT_FUNCTION === 'create_hash' && strlen($wr['wr_password']) === G5_MYSQL_PASSWORD_LENGTH) {
+        if(G5_STRING_ENCRYPT_FUNCTION === 'create_hash' && (strlen($wr['wr_password']) === G5_MYSQL_PASSWORD_LENGTH || strlen($wr['wr_password']) === 16)) {
             if( sql_password($_POST['wr_password']) === $wr['wr_password'] ){
                 $bool = true;
             }
@@ -22,7 +22,7 @@ function g54_check_bbs_password($type, $wr, $qstr=''){
 
         global $bo_table, $w;
 
-        if(G5_STRING_ENCRYPT_FUNCTION === 'create_hash' && strlen($wr['wr_password']) === G5_MYSQL_PASSWORD_LENGTH) {
+        if(G5_STRING_ENCRYPT_FUNCTION === 'create_hash' && (strlen($wr['wr_password']) === G5_MYSQL_PASSWORD_LENGTH || strlen($wr['wr_password']) === 16)) {
             if( sql_password($_POST['wr_password']) === $wr['wr_password'] ){
                 if ($w == 's') {
                     $ss_name = 'ss_secret_'.$bo_table.'_'.$wr['wr_num'];

index.php

@@ -24,7 +24,9 @@ include_once(G5_PATH.'/head.php');
     // 이 함수가 바로 최신글을 추출하는 역할을 합니다.
     // 사용방법 : latest(스킨, 게시판아이디, 출력라인, 글자수);
     // 테마의 스킨을 사용하려면 theme/basic 과 같이 지정
-    echo latest('pic_list', 'free', 4, 23);
+    echo latest('pic_list', 'free', 4, 23);			// 최소설치시 자동생성되는 자유게시판
+	echo latest('pic_list', 'qa', 4, 23);			// 최소설치시 자동생성되는 질문답변게시판
+	echo latest('pic_list', 'notice', 4, 23);		// 최소설치시 자동생성되는 공지사항게시판
     ?>
 </div>
 <div class="latest_wr">
@@ -33,7 +35,7 @@ include_once(G5_PATH.'/head.php');
     // 이 함수가 바로 최신글을 추출하는 역할을 합니다.
     // 사용방법 : latest(스킨, 게시판아이디, 출력라인, 글자수);
     // 테마의 스킨을 사용하려면 theme/basic 과 같이 지정
-    echo latest('pic_block', 'gallery', 4, 23);
+    echo latest('pic_block', 'gallery', 4, 23);		// 최소설치시 자동생성되는 갤러리게시판
     ?>
     <!-- } 사진 최신글2 끝 -->
 </div>

lib/common.lib.php

@@ -3184,7 +3184,7 @@ function login_password_check($mb, $pass, $hash)
     if(!$mb_id)
         return false;
 
-    if(G5_STRING_ENCRYPT_FUNCTION === 'create_hash' && strlen($hash) === G5_MYSQL_PASSWORD_LENGTH) {
+    if(G5_STRING_ENCRYPT_FUNCTION === 'create_hash' && (strlen($hash) === G5_MYSQL_PASSWORD_LENGTH || strlen($hash) === 16)) {
         if( sql_password($pass) === $hash ){
 
             if( ! isset($mb['mb_password2']) ){

lib/uri.lib.php

@@ -111,7 +111,7 @@ function short_url_clean($string_url, $add_qry=''){
         $url=parse_url($string_url);
         $page_name = basename($url['path'],".php");
         
-        $array_page_names = run_replace('url_clean_page_names', array('board', 'write'));
+        $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;
@@ -126,7 +126,10 @@ function short_url_clean($string_url, $add_qry=''){
         if( $page_name === 'write' ){
             $vars['action'] = 'write';
             $allow_param_keys = array('bo_table'=>'', 'action'=>'');
-        } else {
+        } else if( $page_name === 'content' ){
+			$vars['action'] = 'content';
+			$allow_param_keys = array('action'=>'', 'co_id'=>'');
+		} else {
             $allow_param_keys = array('bo_table'=>'', 'wr_id'=>'');
         }
 
@@ -153,7 +156,7 @@ function short_url_clean($string_url, $add_qry=''){
 
         if( isset($url['host']) ){
 
-            $array_file_paths = run_replace('url_clean_page_paths', array('/'.G5_BBS_DIR.'/board.php', '/'.G5_BBS_DIR.'/write.php'));
+            $array_file_paths = run_replace('url_clean_page_paths', array('/'.G5_BBS_DIR.'/board.php', '/'.G5_BBS_DIR.'/write.php', '/'.G5_BBS_DIR.'/content.php'));
 
             $str_path = isset($url['path']) ? $url['path'] : '';
             $http = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 'https://' : 'http://';

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

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

mobile/skin/faq/basic/list.skin.php

@@ -98,21 +98,27 @@ echo '<div id="faq_thtml">'.conv_content($fm['fm_mobile_tail_html'], 1).'</div>'
 
 <script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
 <script>
-$(function() {
+jQuery(function() {
     $(".closer_btn").on("click", function() {
-        $(this).closest(".con_inner").slideToggle();
+        $(this).closest(".con_inner").slideToggle('slow', function() {
+			var $h3 = $(this).closest("li").find("h3");
+
+			$("#faq_con li h3").removeClass("faq_li_open");
+			if($(this).is(":visible")) {
+				$h3.addClass("faq_li_open");
+			}
+		});
     });
 });
 
 function faq_open(el)
 {	
-	$("h3").on("click", function() {
-        $(this).addClass("faq_li_open");
-    });
-    var $con = $(el).closest("li").find(".con_inner");
+    var $con = $(el).closest("li").find(".con_inner"),
+		$h3 = $(el).closest("li").find("h3");
 
     if($con.is(":visible")) {
         $con.slideUp();
+		$h3.removeClass("faq_li_open");
     } else {
         $("#faq_con .con_inner:visible").css("display", "none");
 
@@ -120,6 +126,9 @@ function faq_open(el)
             function() {
                 // 이미지 리사이즈
                 $con.viewimageresize2();
+				$("#faq_con li h3").removeClass("faq_li_open");
+
+				$h3.addClass("faq_li_open");
             }
         );
     }

skin/faq/basic/list.skin.php

@@ -110,21 +110,27 @@ if ($admin_href)
 
 <script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
 <script>
-$(function() {
+jQuery(function() {
     $(".closer_btn").on("click", function() {
-        $(this).closest(".con_inner").slideToggle();
+        $(this).closest(".con_inner").slideToggle('slow', function() {
+			var $h3 = $(this).closest("li").find("h3");
+
+			$("#faq_con li h3").removeClass("faq_li_open");
+			if($(this).is(":visible")) {
+				$h3.addClass("faq_li_open");
+			}
+		});
     });
 });
 
 function faq_open(el)
 {	
-	$("h3").on("click", function() {
-        $(this).addClass("faq_li_open");
-    });
-    var $con = $(el).closest("li").find(".con_inner");
+    var $con = $(el).closest("li").find(".con_inner"),
+		$h3 = $(el).closest("li").find("h3");
 
     if($con.is(":visible")) {
         $con.slideUp();
+		$h3.removeClass("faq_li_open");
     } else {
         $("#faq_con .con_inner:visible").css("display", "none");
 
@@ -132,6 +138,9 @@ function faq_open(el)
             function() {
                 // 이미지 리사이즈
                 $con.viewimageresize2();
+				$("#faq_con li h3").removeClass("faq_li_open");
+
+				$h3.addClass("faq_li_open");
             }
         );
     }

skin/member/basic/register_form.skin.php

@@ -53,7 +53,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 	    <div class="tbl_frm01 tbl_wrap register_form_inner">
 	        <h2>개인정보 입력</h2>
 	        <ul>
-	            <li class="half_input left_input margin_input">
+	            <li>
 	                <label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label>
 	                <input type="text" id="reg_mb_name" name="mb_name" value="<?php echo get_text($member['mb_name']) ?>" <?php echo $required ?> <?php echo $readonly; ?> class="frm_input full_input <?php echo $required ?> <?php echo $readonly ?>" size="10" placeholder="이름">
 	                <?php
@@ -84,7 +84,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 	                <?php } ?>
 	            </li>
 	            <?php if ($req_nick) {  ?>
-	            <li class="half_input left_input">
+	            <li>
 	                <label for="reg_mb_nick">
 	                	닉네임<strong class="sound_only">필수</strong>
 	                	<button type="button" class="tooltip_icon"><i class="fa fa-question-circle-o" aria-hidden="true"></i><span class="sound_only">설명보기</span></button>
@@ -119,14 +119,14 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 	            </li>
 	            <?php }  ?>
 	
-	            <li class="half_input left_input margin_input">
+	            <li>
 	            <?php if ($config['cf_use_tel']) {  ?>
 	            
 	                <label for="reg_mb_tel">전화번호<?php if ($config['cf_req_tel']) { ?><strong class="sound_only">필수</strong><?php } ?></label>
 	                <input type="text" name="mb_tel" value="<?php echo get_text($member['mb_tel']) ?>" id="reg_mb_tel" <?php echo $config['cf_req_tel']?"required":""; ?> class="frm_input full_input <?php echo $config['cf_req_tel']?"required":""; ?>" maxlength="20" placeholder="전화번호">
 	            <?php }  ?>
 				</li>
-				<li class="half_input left_input">
+				<li>
 	            <?php if ($config['cf_use_hp'] || $config['cf_cert_hp']) {  ?>
 	                <label for="reg_mb_hp">휴대폰번호<?php if ($config['cf_req_hp']) { ?><strong class="sound_only">필수</strong><?php } ?></label>
 	                
@@ -470,9 +470,9 @@ function fregisterform_submit(f)
 
 jQuery(function($){
 	//tooltip
-    $(".tooltip_icon").click(function(){
+    $(document).on("click", ".tooltip_icon", function(e){
         $(this).next(".tooltip").fadeIn(400).css("display","inline-block");
-    }).mouseout(function(){
+    }).on("mouseout", ".tooltip_icon", function(e){
         $(this).next(".tooltip").fadeOut();
     });
 });

theme/basic/head.php

@@ -106,6 +106,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
                 <li class="gnb_1dli gnb_mnal"><button type="button" class="gnb_menu_btn" title="전체메뉴"><i class="fa fa-bars" aria-hidden="true"></i><span class="sound_only">전체메뉴열기</span></button></li>
                 <?php
 				$menu_datas = get_menu_db(0, true);
+				$gnb_zindex = 999; // gnb_1dli z-index 값 설정용
                 $i = 0;
                 foreach( $menu_datas as $row ){
                     if( empty($row) ) continue;

theme/basic/index.php

@@ -17,7 +17,9 @@ include_once(G5_THEME_PATH.'/head.php');
     // 이 함수가 바로 최신글을 추출하는 역할을 합니다.
     // 사용방법 : latest(스킨, 게시판아이디, 출력라인, 글자수);
     // 테마의 스킨을 사용하려면 theme/basic 과 같이 지정
-    echo latest('theme/pic_list', 'free', 4, 23);
+    echo latest('theme/pic_list', 'free', 4, 23);		// 최소설치시 자동생성되는 자유게시판
+	echo latest('theme/pic_list', 'qa', 4, 23);			// 최소설치시 자동생성되는 질문답변게시판
+	echo latest('theme/pic_list', 'notice', 4, 23);		// 최소설치시 자동생성되는 공지사항게시판
     ?>
 </div>
 <div class="latest_wr">
@@ -26,7 +28,7 @@ include_once(G5_THEME_PATH.'/head.php');
     // 이 함수가 바로 최신글을 추출하는 역할을 합니다.
     // 사용방법 : latest(스킨, 게시판아이디, 출력라인, 글자수);
     // 테마의 스킨을 사용하려면 theme/basic 과 같이 지정
-    echo latest('theme/pic_block', 'gallery', 4, 23);
+    echo latest('theme/pic_block', 'gallery', 4, 23);		// 최소설치시 자동생성되는 갤러리게시판
     ?>
     <!-- } 사진 최신글2 끝 -->
 </div>

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

@@ -98,21 +98,27 @@ echo '<div id="faq_thtml">'.conv_content($fm['fm_mobile_tail_html'], 1).'</div>'
 
 <script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
 <script>
-$(function() {
+jQuery(function() {
     $(".closer_btn").on("click", function() {
-        $(this).closest(".con_inner").slideToggle();
+        $(this).closest(".con_inner").slideToggle('slow', function() {
+			var $h3 = $(this).closest("li").find("h3");
+
+			$("#faq_con li h3").removeClass("faq_li_open");
+			if($(this).is(":visible")) {
+				$h3.addClass("faq_li_open");
+			}
+		});
     });
 });
 
 function faq_open(el)
 {	
-	$("h3").on("click", function() {
-        $(this).addClass("faq_li_open");
-    });
-    var $con = $(el).closest("li").find(".con_inner");
+    var $con = $(el).closest("li").find(".con_inner"),
+		$h3 = $(el).closest("li").find("h3");
 
     if($con.is(":visible")) {
         $con.slideUp();
+		$h3.removeClass("faq_li_open");
     } else {
         $("#faq_con .con_inner:visible").css("display", "none");
 
@@ -120,6 +126,9 @@ function faq_open(el)
             function() {
                 // 이미지 리사이즈
                 $con.viewimageresize2();
+				$("#faq_con li h3").removeClass("faq_li_open");
+
+				$h3.addClass("faq_li_open");
             }
         );
     }

theme/basic/skin/faq/basic/list.skin.php

@@ -110,21 +110,27 @@ if ($admin_href)
 
 <script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
 <script>
-$(function() {
+jQuery(function() {
     $(".closer_btn").on("click", function() {
-        $(this).closest(".con_inner").slideToggle();
+        $(this).closest(".con_inner").slideToggle('slow', function() {
+			var $h3 = $(this).closest("li").find("h3");
+
+			$("#faq_con li h3").removeClass("faq_li_open");
+			if($(this).is(":visible")) {
+				$h3.addClass("faq_li_open");
+			}
+		});
     });
 });
 
 function faq_open(el)
 {	
-	$("h3").on("click", function() {
-        $(this).addClass("faq_li_open");
-    });
-    var $con = $(el).closest("li").find(".con_inner");
+    var $con = $(el).closest("li").find(".con_inner"),
+		$h3 = $(el).closest("li").find("h3");
 
     if($con.is(":visible")) {
         $con.slideUp();
+		$h3.removeClass("faq_li_open");
     } else {
         $("#faq_con .con_inner:visible").css("display", "none");
 
@@ -132,6 +138,9 @@ function faq_open(el)
             function() {
                 // 이미지 리사이즈
                 $con.viewimageresize2();
+				$("#faq_con li h3").removeClass("faq_li_open");
+
+				$h3.addClass("faq_li_open");
             }
         );
     }

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

@@ -53,7 +53,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 	    <div class="tbl_frm01 tbl_wrap register_form_inner">
 	        <h2>개인정보 입력</h2>
 	        <ul>
-	            <li class="half_input left_input margin_input">
+	            <li>
 	                <label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label>
 	                <input type="text" id="reg_mb_name" name="mb_name" value="<?php echo get_text($member['mb_name']) ?>" <?php echo $required ?> <?php echo $readonly; ?> class="frm_input full_input <?php echo $required ?> <?php echo $readonly ?>" size="10" placeholder="이름">
 	                <?php
@@ -84,7 +84,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 	                <?php } ?>
 	            </li>
 	            <?php if ($req_nick) {  ?>
-	            <li class="half_input left_input">
+	            <li>
 	                <label for="reg_mb_nick">
 	                	닉네임<strong class="sound_only">필수</strong>
 	                	<button type="button" class="tooltip_icon"><i class="fa fa-question-circle-o" aria-hidden="true"></i><span class="sound_only">설명보기</span></button>
@@ -119,14 +119,14 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 	            </li>
 	            <?php }  ?>
 	
-	            <li class="half_input left_input margin_input">
+	            <li>
 	            <?php if ($config['cf_use_tel']) {  ?>
 	            
 	                <label for="reg_mb_tel">전화번호<?php if ($config['cf_req_tel']) { ?><strong class="sound_only">필수</strong><?php } ?></label>
 	                <input type="text" name="mb_tel" value="<?php echo get_text($member['mb_tel']) ?>" id="reg_mb_tel" <?php echo $config['cf_req_tel']?"required":""; ?> class="frm_input full_input <?php echo $config['cf_req_tel']?"required":""; ?>" maxlength="20" placeholder="전화번호">
 	            <?php }  ?>
 				</li>
-				<li class="half_input left_input">
+				<li>
 	            <?php if ($config['cf_use_hp'] || $config['cf_cert_hp']) {  ?>
 	                <label for="reg_mb_hp">휴대폰번호<?php if ($config['cf_req_hp']) { ?><strong class="sound_only">필수</strong><?php } ?></label>
 	                
@@ -470,9 +470,9 @@ function fregisterform_submit(f)
 
 jQuery(function($){
 	//tooltip
-    $(".tooltip_icon").click(function(){
+    $(document).on("click", ".tooltip_icon", function(e){
         $(this).next(".tooltip").fadeIn(400).css("display","inline-block");
-    }).mouseout(function(){
+    }).on("mouseout", ".tooltip_icon", function(e){
         $(this).next(".tooltip").fadeOut();
     });
 });