diff --git a/.gitignore b/.gitignore
index 6a7de4a7b..e56ab3687 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@ cheditor*/
ckeditor43/
log/
g5_tree/
+<<<<<<< HEAD
+=======
+naver*.html
+>>>>>>> g5
diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php
index b241d2d3a..76d54c306 100644
--- a/adm/admin.menu100.php
+++ b/adm/admin.menu100.php
@@ -10,7 +10,6 @@ $menu['menu100'] = array (
array('100900', '캐시파일 일괄삭제',G5_ADMIN_URL.'/cache_file_delete.php', 'cf_cache', 1),
array('100910', '캡챠파일 일괄삭제',G5_ADMIN_URL.'/captcha_file_delete.php', 'cf_captcha', 1),
array('100920', '썸네일파일 일괄삭제',G5_ADMIN_URL.'/thumbnail_file_delete.php', 'cf_thumbnail', 1),
- array('100930', '네이버 신디케이션 핑',G5_SYNDI_URL.'/ping.php', 'cf_syndi_ping', 1),
array('100500', 'phpinfo()', G5_ADMIN_URL.'/phpinfo.php', 'cf_phpinfo')
);
?>
\ No newline at end of file
diff --git a/adm/board_delete.inc.php b/adm/board_delete.inc.php
index b3e4e3965..71a3b3578 100644
--- a/adm/board_delete.inc.php
+++ b/adm/board_delete.inc.php
@@ -30,8 +30,4 @@ delete_cache_latest($tmp_bo_table);
// 게시판 폴더 전체 삭제
rm_rf(G5_DATA_PATH.'/file/'.$tmp_bo_table);
-
-// syndication ping
-if(G5_SYNDI_USE)
- include G5_SYNDI_PATH.'/include/include.adm.board_delete.inc.php';
?>
\ No newline at end of file
diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index b56234342..db451aac4 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -385,9 +385,5 @@ if ($all_fields) {
delete_cache_latest($bo_table);
-// syndication ping
-if(G5_SYNDI_USE)
- include G5_SYNDI_PATH.'/include/include.adm.board_form_update.php';
-
goto_url("./board_form.php?w=u&bo_table={$bo_table}&{$qstr}");
?>
diff --git a/adm/boardgroup_form_update.php b/adm/boardgroup_form_update.php
index 3cad4e1c9..1ff30cbe9 100644
--- a/adm/boardgroup_form_update.php
+++ b/adm/boardgroup_form_update.php
@@ -65,9 +65,5 @@ if ($w == '') {
alert('제대로 된 값이 넘어오지 않았습니다.');
}
-// syndication ping
-if(G5_SYNDI_USE)
- include G5_SYNDI_PATH.'/include/include.adm.boardgroup_form_update.php';
-
goto_url('./boardgroup_form.php?w=u&gr_id='.$gr_id.'&'.$qstr);
?>
diff --git a/adm/config_form.php b/adm/config_form.php
index 2c7d4cb83..a6e4f067c 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -130,6 +130,16 @@ if(!isset($config['cf_add_meta'])) {
ADD `cf_add_meta` TEXT NOT NULL AFTER `cf_analytics` ", true);
}
+if (!isset($config['cf_syndi_token'])) {
+ sql_query(" ALTER TABLE `{$g5['config_table']}`
+ ADD `cf_syndi_token` VARCHAR(255) NOT NULL AFTER `cf_add_meta` ", true);
+}
+
+if (!isset($config['cf_syndi_except'])) {
+ sql_query(" ALTER TABLE `{$g5['config_table']}`
+ ADD `cf_syndi_except` TEXT NOT NULL AFTER `cf_syndi_token` ", true);
+}
+
if(!isset($config['cf_sms_use'])) {
sql_query(" ALTER TABLE `{$g5['config_table']}`
ADD `cf_sms_use` varchar(255) NOT NULL DEFAULT '' AFTER `cf_cert_limit`,
@@ -503,6 +513,21 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+ |
+
+ 경고) curl이 지원되지 않아 네이버 신디케이션을 사용할수 없습니다.'); ?>
+ 연동키는 네이버 웹마스터도구 -> 네이버 신디케이션에서 발급할 수 있습니다.') ?>
+
+ |
+
+
+ |
+
+ 참고로 그룹접근사용 게시판, 글읽기 권한 2 이상 게시판, 비밀글은 신디케이션 수집에서 제외됩니다.') ?>
+
+ |
+
diff --git a/adm/config_form_update.php b/adm/config_form_update.php
index 99a5b1f15..db852d38b 100644
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@@ -53,6 +53,8 @@ $sql = " update {$g5['config_table']}
cf_intercept_ip = '".trim($_POST['cf_intercept_ip'])."',
cf_analytics = '{$_POST['cf_analytics']}',
cf_add_meta = '{$_POST['cf_add_meta']}',
+ cf_syndi_token = '{$_POST['cf_syndi_token']}',
+ cf_syndi_except = '{$_POST['cf_syndi_except']}',
cf_member_skin = '{$_POST['cf_member_skin']}',
cf_use_homepage = '{$_POST['cf_use_homepage']}',
cf_req_homepage = '{$_POST['cf_req_homepage']}',
diff --git a/bbs/alert.php b/bbs/alert.php
index f0669a491..c56f8d735 100644
--- a/bbs/alert.php
+++ b/bbs/alert.php
@@ -43,7 +43,7 @@ if($error) {
alert("");
//document.location.href = "";
-document.location.replace("");
+document.location.replace("");
//alert('history.back();');
history.back();
diff --git a/bbs/delete.php b/bbs/delete.php
index fcb617436..570c12b19 100644
--- a/bbs/delete.php
+++ b/bbs/delete.php
@@ -93,10 +93,6 @@ while ($row = sql_fetch_array($result))
// 파일테이블 행 삭제
sql_query(" delete from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' ");
- // syndication ping
- if(G5_SYNDI_USE)
- include G5_SYNDI_PATH.'/include/include.bbs.delete.php';
-
$count_write++;
}
else
diff --git a/bbs/delete_all.php b/bbs/delete_all.php
index 3bfd376cd..023d034fa 100644
--- a/bbs/delete_all.php
+++ b/bbs/delete_all.php
@@ -106,10 +106,6 @@ for ($i=count($tmp_array)-1; $i>=0; $i--)
// 파일테이블 행 삭제
sql_query(" delete from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' ");
- // syndication ping
- if(G5_SYNDI_USE)
- include G5_SYNDI_PATH.'/include/include.bbs.delete_all.php';
-
$count_write++;
}
else
diff --git a/bbs/member_leave.php b/bbs/member_leave.php
index 53348d78c..c880d0284 100644
--- a/bbs/member_leave.php
+++ b/bbs/member_leave.php
@@ -16,7 +16,7 @@ $sql = " update {$g5['member_table']} set mb_leave_date = '{$date}' where mb_id
sql_query($sql);
// 3.09 수정 (로그아웃)
-session_unregister("ss_mb_id");
+unset($_SESSION['ss_mb_id']);
if (!$url)
$url = G5_URL;
diff --git a/bbs/move_update.php b/bbs/move_update.php
index d3f93445f..11fff763d 100644
--- a/bbs/move_update.php
+++ b/bbs/move_update.php
@@ -195,10 +195,6 @@ if ($sw == 'move')
sql_query(" update {$g5['board_table']} set bo_count_write = bo_count_write - '$save_count_write', bo_count_comment = bo_count_comment - '$save_count_comment' where bo_table = '$bo_table' ");
}
-// syndication ping
-if(G5_SYNDI_USE)
- include G5_SYNDI_PATH.'/include/include.bbs.move_update.php';
-
$msg = '해당 게시물을 선택한 게시판으로 '.$act.' 하였습니다.';
$opener_href = './board.php?bo_table='.$bo_table.'&page='.$page.'&'.$qstr;
diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index a1be54f76..a7b1e5196 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -83,7 +83,7 @@ if ($w == '' || $w == 'u') {
// 본인확인 체크
if($config['cf_cert_use'] && $config['cf_cert_req']) {
- if(trim($_POST['cert_no']) != $_SESSION['ss_cert_no'])
+ if(trim($_POST['cert_no']) != $_SESSION['ss_cert_no'] || !$_SESSION['ss_cert_no'])
alert("회원가입을 위해서는 본인확인을 해주셔야 합니다.");
}
diff --git a/bbs/write_update.php b/bbs/write_update.php
index 7855dfc88..d2b8a9fd3 100644
--- a/bbs/write_update.php
+++ b/bbs/write_update.php
@@ -1,5 +1,6 @@
"https://apis.naver.com/crawl/nsyndi/v2",
+ CURLOPT_POST => true,
+ CURLOPT_POSTFIELDS => "ping_url=" . $ping_url,
+ CURLOPT_RETURNTRANSFER => true,
+ CURLOPT_CONNECTTIMEOUT => 10,
+ CURLOPT_TIMEOUT => 10,
+ CURLOPT_HTTPHEADER => array("Host: apis.naver.com", "Pragma: no-cache", "Accept: */*", $ping_auth_header)
+ );
+
+ //print_r2($ping_client_opt); exit;
+ $ping = curl_init();
+ curl_setopt_array($ping, $ping_client_opt);
+ $response = curl_exec($ping);
+ curl_close($ping);
+
+ return $response;
+}
+?>
\ No newline at end of file
diff --git a/plugin/lgxpay/AuthOnlyReq.php b/plugin/lgxpay/AuthOnlyReq.php
index 64a3263be..476b78ac7 100644
--- a/plugin/lgxpay/AuthOnlyReq.php
+++ b/plugin/lgxpay/AuthOnlyReq.php
@@ -61,7 +61,7 @@ $LGD_HASHDATA = md5($LGD_MID.$LGD_BUYERSSN.$LGD_TIMESTAMP.$LGD_MERTKEY);
LG유플러스 전자결제 본인확인서비스
-
+