From ddd3ec388c19bee0e59b2b0328e1a10b1acfd12a Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 29 May 2013 10:09:01 +0900 Subject: [PATCH 01/15] =?UTF-8?q?callback=20url=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/sns/twitter/twitterconfig.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/sns/twitter/twitterconfig.php b/plugin/sns/twitter/twitterconfig.php index 7f8b2684c..70c525cb4 100644 --- a/plugin/sns/twitter/twitterconfig.php +++ b/plugin/sns/twitter/twitterconfig.php @@ -6,5 +6,5 @@ define('CONSUMER_KEY', $config['cf_twitter_key']); define('CONSUMER_SECRET', $config['cf_twitter_secret']); -//define('OAUTH_CALLBACK', G4_SNS_URL.'/twitter/callback.php'); -define('OAUTH_CALLBACK', ''); +define('OAUTH_CALLBACK', G4_SNS_URL.'/twitter/callback.php'); +//define('OAUTH_CALLBACK', ''); From 8b57547440fa9007587ad9604ee721f00e25c3b7 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 29 May 2013 10:51:02 +0900 Subject: [PATCH 02/15] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=EB=90=9C=20SNS=20=EB=A5=BC=20=EC=BD=94=EB=A9=98=ED=8A=B8?= =?UTF-8?q?=EC=97=90=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write_comment_update.php | 13 +++---- plugin/kcp/kcpcert.head.skin.php | 41 ---------------------- skin/board/basic/view_comment.skin.php | 21 +++++------ skin/board/basic/view_comment.sns.skin.php | 9 ----- 4 files changed, 15 insertions(+), 69 deletions(-) delete mode 100644 plugin/kcp/kcpcert.head.skin.php diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index 329c34c34..c79306afb 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -134,6 +134,11 @@ if ($w == 'c') // 댓글 입력 $tmp_comment_reply = ''; } + // SNS 등록 + $wr_sns = array(); + include_once("./write_comment_update.sns.php"); + $wr_sns = implode(",", $wr_sns); + $sql = " insert into $write_table set ca_name = '{$wr['ca_name']}', wr_option = '$wr_secret', @@ -153,6 +158,7 @@ if ($w == 'c') // 댓글 입력 wr_datetime = '".G4_TIME_YMDHIS."', wr_last = '', wr_ip = '{$_SERVER['REMOTE_ADDR']}', + wr_sns = '$wr_sns', wr_1 = '$wr_1', wr_2 = '$wr_2', wr_3 = '$wr_3', @@ -167,13 +173,8 @@ if ($w == 'c') // 댓글 입력 $comment_id = mysql_insert_id(); - // SNS 등록 - $wr_sns = array(); - include_once("./write_comment_update.sns.php"); - $wr_sns = implode(",", $wr_sns); - // 원글에 댓글수 증가 & 마지막 시간 반영 - sql_query(" update $write_table set wr_comment = wr_comment + 1, wr_sns = '$wr_sns', wr_last = '".G4_TIME_YMDHIS."' where wr_id = '$wr_id' "); + sql_query(" update $write_table set wr_comment = wr_comment + 1, wr_last = '".G4_TIME_YMDHIS."' where wr_id = '$wr_id' "); // 새글 INSERT sql_query(" insert into {$g4['board_new_table']} ( bo_table, wr_id, wr_parent, bn_datetime, mb_id ) values ( '$bo_table', '$comment_id', '$wr_id', '".G4_TIME_YMDHIS."', '{$member['mb_id']}' ) "); diff --git a/plugin/kcp/kcpcert.head.skin.php b/plugin/kcp/kcpcert.head.skin.php deleted file mode 100644 index d141b22b7..000000000 --- a/plugin/kcp/kcpcert.head.skin.php +++ /dev/null @@ -1,41 +0,0 @@ - \ No newline at end of file diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index 772c4baa6..f59b10bf2 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -16,11 +16,13 @@ var char_max = parseInt(); // 최대 $comment_id = $list[$i]['wr_id']; $cmt_depth = ""; // 댓글단계 $cmt_depth = strlen($list[$i]['wr_comment_reply']) * 20; - $str = $list[$i]['content']; + $comment = $list[$i]['content']; + /* if (strstr($list[$i]['wr_option'], "secret")) { $str = $str; } - $str = preg_replace("/\[\\]/i", "", $str); + */ + $comment = preg_replace("/\[\\]/i", "", $comment); ?>
style="margin-left:px;border-top-color:#e0e0e0">
@@ -38,7 +40,10 @@ var char_max = parseInt(); // 최대

"; ?> - + "; ?> + "; ?> + "; ?> +

@@ -168,16 +173,6 @@ var char_max = parseInt(); // 최대 f.is_good.value = 0; - /* - var s; - if (s = word_filter_check(document.getElementById('wr_content').value)) - { - alert("내용에 금지단어('"+s+"')가 포함되어있습니다"); - document.getElementById('wr_content').focus(); - return false; - } - */ - var subject = ""; var content = ""; $.ajax({ diff --git a/skin/board/basic/view_comment.sns.skin.php b/skin/board/basic/view_comment.sns.skin.php index 06d6d1ff8..6382c8362 100644 --- a/skin/board/basic/view_comment.sns.skin.php +++ b/skin/board/basic/view_comment.sns.skin.php @@ -70,15 +70,6 @@ if (!$board['bo_use_sns']) return; break; default : $twitter_url = G4_SNS_URL."/twitter/redirect.php"; - // 안먹히는 코드 ㅠㅠ - if ($member['mb_twitter_token'] && $member['mb_twitter_token_secret']) { - $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $member['mb_twitter_token'], $member['mb_twitter_token_secret']); - $content = $connection->get('account/verify_credentials'); - if (200 == $connection->http_code) { - $twitter_user = true; - $twitter_url = $connection->getAuthorizeURL($token); - } - } } } From eb46ea069b8e038f7763a4e4214f6845733bafcf Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 29 May 2013 10:57:43 +0900 Subject: [PATCH 03/15] =?UTF-8?q?submit=20=ED=9B=84=20btn=5Fsubmit=20?= =?UTF-8?q?=EC=97=90=20disabled=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/view_comment.skin.php | 2 ++ skin/board/basic/write.skin.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index f59b10bf2..9aa94e9da 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -244,6 +244,8 @@ var char_max = parseInt(); // 최대 + document.getElementById("btn_submit").disabled = "disabled"; + return true; } diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 52cca5147..5847287ef 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -218,6 +218,8 @@ function fwrite_submit(f) + document.getElementById("btn_submit").disabled = "disabled"; + return true; } From 6315c806824930bdbfb36fc82ce4c92d1b06fcf5 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 29 May 2013 11:19:10 +0900 Subject: [PATCH 04/15] =?UTF-8?q?submit=20=ED=9B=84=20=EB=8B=A4=EC=8B=9C?= =?UTF-8?q?=20submit=20=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?btn=5Fsubmit=20=EC=9D=84=20disabled=20=EB=A1=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/gallery/view_comment.skin.php | 12 ++---------- skin/board/gallery/view_comment.sns.skin.php | 9 --------- skin/board/gallery/write.skin.php | 2 ++ skin/member/basic/register_form.skin.php | 2 ++ 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php index 067f350c1..215c55ead 100644 --- a/skin/board/gallery/view_comment.skin.php +++ b/skin/board/gallery/view_comment.skin.php @@ -168,16 +168,6 @@ var char_max = parseInt(); // 최대 f.is_good.value = 0; - /* - var s; - if (s = word_filter_check(document.getElementById('wr_content').value)) - { - alert("내용에 금지단어('"+s+"')가 포함되어있습니다"); - document.getElementById('wr_content').focus(); - return false; - } - */ - var subject = ""; var content = ""; $.ajax({ @@ -249,6 +239,8 @@ var char_max = parseInt(); // 최대 + document.getElementById("btn_submit").disabled = "disabled"; + return true; } diff --git a/skin/board/gallery/view_comment.sns.skin.php b/skin/board/gallery/view_comment.sns.skin.php index 06d6d1ff8..6382c8362 100644 --- a/skin/board/gallery/view_comment.sns.skin.php +++ b/skin/board/gallery/view_comment.sns.skin.php @@ -70,15 +70,6 @@ if (!$board['bo_use_sns']) return; break; default : $twitter_url = G4_SNS_URL."/twitter/redirect.php"; - // 안먹히는 코드 ㅠㅠ - if ($member['mb_twitter_token'] && $member['mb_twitter_token_secret']) { - $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $member['mb_twitter_token'], $member['mb_twitter_token_secret']); - $content = $connection->get('account/verify_credentials'); - if (200 == $connection->http_code) { - $twitter_user = true; - $twitter_url = $connection->getAuthorizeURL($token); - } - } } } diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php index a5c6ec465..3875e2b3c 100644 --- a/skin/board/gallery/write.skin.php +++ b/skin/board/gallery/write.skin.php @@ -234,6 +234,8 @@ function fwrite_submit(f) + document.getElementById("btn_submit").disabled = "disabled"; + return true; } diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index d38367053..1d8f45d44 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -379,6 +379,8 @@ function fregisterform_submit(f) + document.getElementById("btn_submit").disabled = "disabled"; + return true; } From d9ab6c62207829cbde220c047e49b48076d7043e Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 29 May 2013 11:42:13 +0900 Subject: [PATCH 05/15] =?UTF-8?q?=EC=84=A4=EC=B9=98=EC=8B=9C=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EB=9E=A8=20=EC=88=98=EC=A0=95=EC=A4=91=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=90=9C=20=ED=95=84=EB=93=9C=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/sql_write.sql | 71 ++++---- install/gnuboard4s.sql | 389 +++++++++++++++++++++-------------------- 2 files changed, 234 insertions(+), 226 deletions(-) diff --git a/adm/sql_write.sql b/adm/sql_write.sql index 63e86974e..d84badc4f 100644 --- a/adm/sql_write.sql +++ b/adm/sql_write.sql @@ -1,42 +1,43 @@ CREATE TABLE `__TABLE_NAME__` ( - `wr_id` int(11) NOT NULL auto_increment, - `wr_num` int(11) NOT NULL default '0', - `wr_reply` varchar(10) NOT NULL default '', - `wr_parent` int(11) NOT NULL default '0', - `wr_is_comment` tinyint(4) NOT NULL default '0', - `wr_comment` int(11) NOT NULL default '0', - `wr_comment_reply` varchar(5) NOT NULL default '', - `ca_name` varchar(255) NOT NULL default '', - `wr_option` set('html1','html2','secret','mail') NOT NULL default '', - `wr_subject` varchar(255) NOT NULL default '', + `wr_id` int(11) NOT NULL AUTO_INCREMENT, + `wr_num` int(11) NOT NULL DEFAULT '0', + `wr_reply` varchar(10) NOT NULL, + `wr_parent` int(11) NOT NULL DEFAULT '0', + `wr_is_comment` tinyint(4) NOT NULL DEFAULT '0', + `wr_comment` int(11) NOT NULL DEFAULT '0', + `wr_comment_reply` varchar(5) NOT NULL, + `ca_name` varchar(255) NOT NULL, + `wr_option` set('html1','html2','secret','mail') NOT NULL, + `wr_subject` varchar(255) NOT NULL, `wr_content` text NOT NULL, `wr_link1` text NOT NULL, `wr_link2` text NOT NULL, - `wr_link1_hit` int(11) NOT NULL default '0', - `wr_link2_hit` int(11) NOT NULL default '0', - `wr_trackback` varchar(255) NOT NULL default '', - `wr_hit` int(11) NOT NULL default '0', - `wr_good` int(11) NOT NULL default '0', - `wr_nogood` int(11) NOT NULL default '0', - `mb_id` varchar(255) NOT NULL default '', - `wr_password` varchar(255) NOT NULL default '', - `wr_name` varchar(255) NOT NULL default '', - `wr_email` varchar(255) NOT NULL default '', - `wr_homepage` varchar(255) NOT NULL default '', - `wr_datetime` datetime NOT NULL default '0000-00-00 00:00:00', - `wr_last` varchar(19) NOT NULL default '', - `wr_ip` varchar(255) NOT NULL default '', - `wr_1` varchar(255) NOT NULL default '', - `wr_2` varchar(255) NOT NULL default '', - `wr_3` varchar(255) NOT NULL default '', - `wr_4` varchar(255) NOT NULL default '', - `wr_5` varchar(255) NOT NULL default '', - `wr_6` varchar(255) NOT NULL default '', - `wr_7` varchar(255) NOT NULL default '', - `wr_8` varchar(255) NOT NULL default '', - `wr_9` varchar(255) NOT NULL default '', - `wr_10` varchar(255) NOT NULL default '', - PRIMARY KEY (`wr_id`), + `wr_link1_hit` int(11) NOT NULL DEFAULT '0', + `wr_link2_hit` int(11) NOT NULL DEFAULT '0', + `wr_trackback` varchar(255) NOT NULL, + `wr_hit` int(11) NOT NULL DEFAULT '0', + `wr_good` int(11) NOT NULL DEFAULT '0', + `wr_nogood` int(11) NOT NULL DEFAULT '0', + `mb_id` varchar(255) NOT NULL, + `wr_password` varchar(255) NOT NULL, + `wr_name` varchar(255) NOT NULL, + `wr_email` varchar(255) NOT NULL, + `wr_homepage` varchar(255) NOT NULL, + `wr_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `wr_last` varchar(19) NOT NULL, + `wr_ip` varchar(255) NOT NULL, + `wr_sns` set('fb','tw','me','gp') NOT NULL, + `wr_1` varchar(255) NOT NULL, + `wr_2` varchar(255) NOT NULL, + `wr_3` varchar(255) NOT NULL, + `wr_4` varchar(255) NOT NULL, + `wr_5` varchar(255) NOT NULL, + `wr_6` varchar(255) NOT NULL, + `wr_7` varchar(255) NOT NULL, + `wr_8` varchar(255) NOT NULL, + `wr_9` varchar(255) NOT NULL, + `wr_10` varchar(255) NOT NULL, + PRIMARY KEY (`wr_id`), KEY `wr_num_reply_parent` (`wr_num`,`wr_reply`,`wr_parent`), KEY `wr_is_comment` (`wr_is_comment`,`wr_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql index b80e3bd63..916930bf9 100644 --- a/install/gnuboard4s.sql +++ b/install/gnuboard4s.sql @@ -20,105 +20,106 @@ CREATE TABLE IF NOT EXISTS `g4s_auth` ( DROP TABLE IF EXISTS `g4s_board`; CREATE TABLE IF NOT EXISTS `g4s_board` ( - `bo_table` varchar(20) NOT NULL default '', - `gr_id` varchar(255) NOT NULL default '', - `bo_subject` varchar(255) NOT NULL default '', + `bo_table` varchar(20) NOT NULL DEFAULT '', + `gr_id` varchar(255) NOT NULL DEFAULT '', + `bo_subject` varchar(255) NOT NULL DEFAULT '', `bo_device` enum('both','pc','mobile') NOT NULL DEFAULT 'both', - `bo_admin` varchar(255) NOT NULL default '', - `bo_list_level` tinyint(4) NOT NULL default '0', - `bo_read_level` tinyint(4) NOT NULL default '0', - `bo_write_level` tinyint(4) NOT NULL default '0', - `bo_reply_level` tinyint(4) NOT NULL default '0', - `bo_comment_level` tinyint(4) NOT NULL default '0', - `bo_upload_level` tinyint(4) NOT NULL default '0', - `bo_download_level` tinyint(4) NOT NULL default '0', - `bo_html_level` tinyint(4) NOT NULL default '0', - `bo_link_level` tinyint(4) NOT NULL default '0', - `bo_trackback_level` tinyint(4) NOT NULL default '0', - `bo_count_delete` tinyint(4) NOT NULL default '0', - `bo_count_modify` tinyint(4) NOT NULL default '0', - `bo_read_point` int(11) NOT NULL default '0', - `bo_write_point` int(11) NOT NULL default '0', - `bo_comment_point` int(11) NOT NULL default '0', - `bo_download_point` int(11) NOT NULL default '0', - `bo_use_category` tinyint(4) NOT NULL default '0', + `bo_admin` varchar(255) NOT NULL DEFAULT '', + `bo_list_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_read_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_write_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_reply_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_comment_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_upload_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_download_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_html_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_link_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_trackback_level` tinyint(4) NOT NULL DEFAULT '0', + `bo_count_delete` tinyint(4) NOT NULL DEFAULT '0', + `bo_count_modify` tinyint(4) NOT NULL DEFAULT '0', + `bo_read_point` int(11) NOT NULL DEFAULT '0', + `bo_write_point` int(11) NOT NULL DEFAULT '0', + `bo_comment_point` int(11) NOT NULL DEFAULT '0', + `bo_download_point` int(11) NOT NULL DEFAULT '0', + `bo_use_category` tinyint(4) NOT NULL DEFAULT '0', `bo_category_list` text NOT NULL, `bo_disable_tags` text NOT NULL, - `bo_use_sideview` tinyint(4) NOT NULL default '0', - `bo_use_file_content` tinyint(4) NOT NULL default '0', - `bo_use_secret` tinyint(4) NOT NULL default '0', - `bo_use_dhtml_editor` tinyint(4) NOT NULL default '0', - `bo_use_rss_view` tinyint(4) NOT NULL default '0', - `bo_use_good` tinyint(4) NOT NULL default '0', - `bo_use_nogood` tinyint(4) NOT NULL default '0', - `bo_use_name` tinyint(4) NOT NULL default '0', - `bo_use_signature` tinyint(4) NOT NULL default '0', - `bo_use_ip_view` tinyint(4) NOT NULL default '0', - `bo_use_trackback` tinyint(4) NOT NULL default '0', - `bo_use_list_view` tinyint(4) NOT NULL default '0', - `bo_use_list_content` tinyint(4) NOT NULL default '0', - `bo_table_width` int(11) NOT NULL default '0', - `bo_subject_len` int(11) NOT NULL default '0', - `bo_mobile_subject_len` int(11) NOT NULL default '0', - `bo_page_rows` int(11) NOT NULL default '0', - `bo_mobile_page_rows` int(11) NOT NULL default '0', - `bo_new` int(11) NOT NULL default '0', - `bo_hot` int(11) NOT NULL default '0', - `bo_image_width` int(11) NOT NULL default '0', - `bo_skin` varchar(255) NOT NULL default '', - `bo_mobile_skin` varchar(255) NOT NULL default '', - `bo_image_head` varchar(255) NOT NULL default '', - `bo_image_tail` varchar(255) NOT NULL default '', - `bo_include_head` varchar(255) NOT NULL default '', - `bo_include_tail` varchar(255) NOT NULL default '', + `bo_use_sideview` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_file_content` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_secret` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_dhtml_editor` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_rss_view` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_good` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_nogood` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_name` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_signature` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_ip_view` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_trackback` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_list_view` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_list_content` tinyint(4) NOT NULL DEFAULT '0', + `bo_table_width` int(11) NOT NULL DEFAULT '0', + `bo_subject_len` int(11) NOT NULL DEFAULT '0', + `bo_mobile_subject_len` int(11) NOT NULL DEFAULT '0', + `bo_page_rows` int(11) NOT NULL DEFAULT '0', + `bo_mobile_page_rows` int(11) NOT NULL DEFAULT '0', + `bo_new` int(11) NOT NULL DEFAULT '0', + `bo_hot` int(11) NOT NULL DEFAULT '0', + `bo_image_width` int(11) NOT NULL DEFAULT '0', + `bo_skin` varchar(255) NOT NULL DEFAULT '', + `bo_mobile_skin` varchar(255) NOT NULL DEFAULT '', + `bo_image_head` varchar(255) NOT NULL DEFAULT '', + `bo_image_tail` varchar(255) NOT NULL DEFAULT '', + `bo_include_head` varchar(255) NOT NULL DEFAULT '', + `bo_include_tail` varchar(255) NOT NULL DEFAULT '', `bo_content_head` text NOT NULL, `bo_mobile_content_head` text NOT NULL, `bo_content_tail` text NOT NULL, `bo_mobile_content_tail` text NOT NULL, `bo_insert_content` text NOT NULL, - `bo_gallery_cols` int(11) NOT NULL default '0', - `bo_gallery_width` int(11) NOT NULL default '0', - `bo_gallery_height` int(11) NOT NULL default '0', - `bo_mobile_gallery_cols` int(11) NOT NULL default '0', - `bo_mobile_gallery_width` int(11) NOT NULL default '0', - `bo_mobile_gallery_height` int(11) NOT NULL default '0', - `bo_upload_size` int(11) NOT NULL default '0', - `bo_reply_order` tinyint(4) NOT NULL default '0', - `bo_use_search` tinyint(4) NOT NULL default '0', - `bo_show_menu` tinyint(4) NOT NULL default '0', - `bo_order` int(11) NOT NULL default '0', - `bo_count_write` int(11) NOT NULL default '0', - `bo_count_comment` int(11) NOT NULL default '0', - `bo_write_min` int(11) NOT NULL default '0', - `bo_write_max` int(11) NOT NULL default '0', - `bo_comment_min` int(11) NOT NULL default '0', - `bo_comment_max` int(11) NOT NULL default '0', + `bo_gallery_cols` int(11) NOT NULL DEFAULT '0', + `bo_gallery_width` int(11) NOT NULL DEFAULT '0', + `bo_gallery_height` int(11) NOT NULL DEFAULT '0', + `bo_mobile_gallery_cols` int(11) NOT NULL DEFAULT '0', + `bo_mobile_gallery_width` int(11) NOT NULL DEFAULT '0', + `bo_mobile_gallery_height` int(11) NOT NULL DEFAULT '0', + `bo_upload_size` int(11) NOT NULL DEFAULT '0', + `bo_reply_order` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_search` tinyint(4) NOT NULL DEFAULT '0', + `bo_show_menu` tinyint(4) NOT NULL DEFAULT '0', + `bo_order` int(11) NOT NULL DEFAULT '0', + `bo_count_write` int(11) NOT NULL DEFAULT '0', + `bo_count_comment` int(11) NOT NULL DEFAULT '0', + `bo_write_min` int(11) NOT NULL DEFAULT '0', + `bo_write_max` int(11) NOT NULL DEFAULT '0', + `bo_comment_min` int(11) NOT NULL DEFAULT '0', + `bo_comment_max` int(11) NOT NULL DEFAULT '0', `bo_notice` text NOT NULL, - `bo_upload_count` tinyint(4) NOT NULL default '0', - `bo_use_email` tinyint(4) NOT NULL default '0', + `bo_upload_count` tinyint(4) NOT NULL DEFAULT '0', + `bo_use_email` tinyint(4) NOT NULL DEFAULT '0', `bo_use_cert` enum('','cert','adult') NOT NULL DEFAULT '', - `bo_sort_field` varchar(255) NOT NULL default '', - `bo_1_subj` varchar(255) NOT NULL default '', - `bo_2_subj` varchar(255) NOT NULL default '', - `bo_3_subj` varchar(255) NOT NULL default '', - `bo_4_subj` varchar(255) NOT NULL default '', - `bo_5_subj` varchar(255) NOT NULL default '', - `bo_6_subj` varchar(255) NOT NULL default '', - `bo_7_subj` varchar(255) NOT NULL default '', - `bo_8_subj` varchar(255) NOT NULL default '', - `bo_9_subj` varchar(255) NOT NULL default '', - `bo_10_subj` varchar(255) NOT NULL default '', - `bo_1` varchar(255) NOT NULL default '', - `bo_2` varchar(255) NOT NULL default '', - `bo_3` varchar(255) NOT NULL default '', - `bo_4` varchar(255) NOT NULL default '', - `bo_5` varchar(255) NOT NULL default '', - `bo_6` varchar(255) NOT NULL default '', - `bo_7` varchar(255) NOT NULL default '', - `bo_8` varchar(255) NOT NULL default '', - `bo_9` varchar(255) NOT NULL default '', - `bo_10` varchar(255) NOT NULL default '', - PRIMARY KEY (`bo_table`) + `bo_use_sns` tinyint(4) NOT NULL DEFAULT '0', + `bo_sort_field` varchar(255) NOT NULL DEFAULT '', + `bo_1_subj` varchar(255) NOT NULL DEFAULT '', + `bo_2_subj` varchar(255) NOT NULL DEFAULT '', + `bo_3_subj` varchar(255) NOT NULL DEFAULT '', + `bo_4_subj` varchar(255) NOT NULL DEFAULT '', + `bo_5_subj` varchar(255) NOT NULL DEFAULT '', + `bo_6_subj` varchar(255) NOT NULL DEFAULT '', + `bo_7_subj` varchar(255) NOT NULL DEFAULT '', + `bo_8_subj` varchar(255) NOT NULL DEFAULT '', + `bo_9_subj` varchar(255) NOT NULL DEFAULT '', + `bo_10_subj` varchar(255) NOT NULL DEFAULT '', + `bo_1` varchar(255) NOT NULL DEFAULT '', + `bo_2` varchar(255) NOT NULL DEFAULT '', + `bo_3` varchar(255) NOT NULL DEFAULT '', + `bo_4` varchar(255) NOT NULL DEFAULT '', + `bo_5` varchar(255) NOT NULL DEFAULT '', + `bo_6` varchar(255) NOT NULL DEFAULT '', + `bo_7` varchar(255) NOT NULL DEFAULT '', + `bo_8` varchar(255) NOT NULL DEFAULT '', + `bo_9` varchar(255) NOT NULL DEFAULT '', + `bo_10` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`bo_table`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -188,117 +189,123 @@ CREATE TABLE IF NOT EXISTS `g4s_board_new` ( DROP TABLE IF EXISTS `g4s_config`; CREATE TABLE IF NOT EXISTS `g4s_config` ( - `cf_title` varchar(255) NOT NULL default '', - `cf_admin` varchar(255) NOT NULL default '', - `cf_include_index` varchar(255) NOT NULL default '', - `cf_include_head` varchar(255) NOT NULL default '', - `cf_include_tail` varchar(255) NOT NULL default '', + `cf_title` varchar(255) NOT NULL DEFAULT '', + `cf_admin` varchar(255) NOT NULL DEFAULT '', + `cf_include_index` varchar(255) NOT NULL DEFAULT '', + `cf_include_head` varchar(255) NOT NULL DEFAULT '', + `cf_include_tail` varchar(255) NOT NULL DEFAULT '', `cf_add_script` text NOT NULL, - `cf_use_point` tinyint(4) NOT NULL default '0', - `cf_use_norobot` tinyint(4) NOT NULL default '0', - `cf_use_copy_log` tinyint(4) NOT NULL default '0', - `cf_use_email_certify` tinyint(4) NOT NULL default '0', - `cf_login_point` int(11) NOT NULL default '0', - `cf_cut_name` tinyint(4) NOT NULL default '0', - `cf_nick_modify` int(11) NOT NULL default '0', - `cf_new_skin` varchar(255) NOT NULL default '', - `cf_login_skin` varchar(255) NOT NULL default '', - `cf_new_rows` int(11) NOT NULL default '0', - `cf_search_skin` varchar(255) NOT NULL default '', - `cf_connect_skin` varchar(255) NOT NULL default '', - `cf_read_point` int(11) NOT NULL default '0', - `cf_write_point` int(11) NOT NULL default '0', - `cf_comment_point` int(11) NOT NULL default '0', - `cf_download_point` int(11) NOT NULL default '0', - `cf_search_bgcolor` varchar(255) NOT NULL default '', - `cf_search_color` varchar(255) NOT NULL default '', - `cf_write_pages` int(11) NOT NULL default '0', - `cf_mobile_pages` int(11) NOT NULL default '0', - `cf_link_target` varchar(255) NOT NULL default '', - `cf_delay_sec` int(11) NOT NULL default '0', + `cf_use_point` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_norobot` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_copy_log` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_email_certify` tinyint(4) NOT NULL DEFAULT '0', + `cf_login_point` int(11) NOT NULL DEFAULT '0', + `cf_cut_name` tinyint(4) NOT NULL DEFAULT '0', + `cf_nick_modify` int(11) NOT NULL DEFAULT '0', + `cf_new_skin` varchar(255) NOT NULL DEFAULT '', + `cf_login_skin` varchar(255) NOT NULL DEFAULT '', + `cf_new_rows` int(11) NOT NULL DEFAULT '0', + `cf_search_skin` varchar(255) NOT NULL DEFAULT '', + `cf_connect_skin` varchar(255) NOT NULL DEFAULT '', + `cf_read_point` int(11) NOT NULL DEFAULT '0', + `cf_write_point` int(11) NOT NULL DEFAULT '0', + `cf_comment_point` int(11) NOT NULL DEFAULT '0', + `cf_download_point` int(11) NOT NULL DEFAULT '0', + `cf_search_bgcolor` varchar(255) NOT NULL DEFAULT '', + `cf_search_color` varchar(255) NOT NULL DEFAULT '', + `cf_write_pages` int(11) NOT NULL DEFAULT '0', + `cf_mobile_pages` int(11) NOT NULL DEFAULT '0', + `cf_link_target` varchar(255) NOT NULL DEFAULT '', + `cf_delay_sec` int(11) NOT NULL DEFAULT '0', `cf_filter` text NOT NULL, `cf_possible_ip` text NOT NULL, `cf_intercept_ip` text NOT NULL, - `cf_register_skin` varchar(255) NOT NULL default 'basic', - `cf_member_skin` varchar(255) NOT NULL default '', - `cf_use_homepage` tinyint(4) NOT NULL default '0', - `cf_req_homepage` tinyint(4) NOT NULL default '0', - `cf_use_tel` tinyint(4) NOT NULL default '0', - `cf_req_tel` tinyint(4) NOT NULL default '0', - `cf_use_hp` tinyint(4) NOT NULL default '0', - `cf_req_hp` tinyint(4) NOT NULL default '0', - `cf_use_addr` tinyint(4) NOT NULL default '0', - `cf_req_addr` tinyint(4) NOT NULL default '0', - `cf_use_signature` tinyint(4) NOT NULL default '0', - `cf_req_signature` tinyint(4) NOT NULL default '0', - `cf_use_profile` tinyint(4) NOT NULL default '0', - `cf_req_profile` tinyint(4) NOT NULL default '0', - `cf_register_level` tinyint(4) NOT NULL default '0', - `cf_register_point` int(11) NOT NULL default '0', - `cf_icon_level` tinyint(4) NOT NULL default '0', - `cf_use_recommend` tinyint(4) NOT NULL default '0', - `cf_recommend_point` int(11) NOT NULL default '0', - `cf_leave_day` int(11) NOT NULL default '0', - `cf_search_part` int(11) NOT NULL default '0', - `cf_email_use` tinyint(4) NOT NULL default '0', - `cf_email_wr_super_admin` tinyint(4) NOT NULL default '0', - `cf_email_wr_group_admin` tinyint(4) NOT NULL default '0', - `cf_email_wr_board_admin` tinyint(4) NOT NULL default '0', - `cf_email_wr_write` tinyint(4) NOT NULL default '0', - `cf_email_wr_comment_all` tinyint(4) NOT NULL default '0', - `cf_email_mb_super_admin` tinyint(4) NOT NULL default '0', - `cf_email_mb_member` tinyint(4) NOT NULL default '0', - `cf_email_po_super_admin` tinyint(4) NOT NULL default '0', + `cf_register_skin` varchar(255) NOT NULL DEFAULT 'basic', + `cf_member_skin` varchar(255) NOT NULL DEFAULT '', + `cf_use_homepage` tinyint(4) NOT NULL DEFAULT '0', + `cf_req_homepage` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_tel` tinyint(4) NOT NULL DEFAULT '0', + `cf_req_tel` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_hp` tinyint(4) NOT NULL DEFAULT '0', + `cf_req_hp` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_addr` tinyint(4) NOT NULL DEFAULT '0', + `cf_req_addr` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_signature` tinyint(4) NOT NULL DEFAULT '0', + `cf_req_signature` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_profile` tinyint(4) NOT NULL DEFAULT '0', + `cf_req_profile` tinyint(4) NOT NULL DEFAULT '0', + `cf_register_level` tinyint(4) NOT NULL DEFAULT '0', + `cf_register_point` int(11) NOT NULL DEFAULT '0', + `cf_icon_level` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_recommend` tinyint(4) NOT NULL DEFAULT '0', + `cf_recommend_point` int(11) NOT NULL DEFAULT '0', + `cf_leave_day` int(11) NOT NULL DEFAULT '0', + `cf_search_part` int(11) NOT NULL DEFAULT '0', + `cf_email_use` tinyint(4) NOT NULL DEFAULT '0', + `cf_email_wr_super_admin` tinyint(4) NOT NULL DEFAULT '0', + `cf_email_wr_group_admin` tinyint(4) NOT NULL DEFAULT '0', + `cf_email_wr_board_admin` tinyint(4) NOT NULL DEFAULT '0', + `cf_email_wr_write` tinyint(4) NOT NULL DEFAULT '0', + `cf_email_wr_comment_all` tinyint(4) NOT NULL DEFAULT '0', + `cf_email_mb_super_admin` tinyint(4) NOT NULL DEFAULT '0', + `cf_email_mb_member` tinyint(4) NOT NULL DEFAULT '0', + `cf_email_po_super_admin` tinyint(4) NOT NULL DEFAULT '0', `cf_prohibit_id` text NOT NULL, `cf_prohibit_email` text NOT NULL, - `cf_new_del` int(11) NOT NULL default '0', - `cf_memo_del` int(11) NOT NULL default '0', - `cf_visit_del` int(11) NOT NULL default '0', - `cf_popular_del` int(11) NOT NULL default '0', - `cf_use_jumin` tinyint(4) NOT NULL default '0', - `cf_use_member_icon` tinyint(4) NOT NULL default '0', - `cf_member_icon_size` int(11) NOT NULL default '0', - `cf_member_icon_width` int(11) NOT NULL default '0', - `cf_member_icon_height` int(11) NOT NULL default '0', - `cf_login_minutes` int(11) NOT NULL default '0', - `cf_image_extension` varchar(255) NOT NULL default '', - `cf_flash_extension` varchar(255) NOT NULL default '', - `cf_movie_extension` varchar(255) NOT NULL default '', - `cf_formmail_is_member` tinyint(4) NOT NULL default '0', - `cf_page_rows` int(11) NOT NULL default '0', - `cf_visit` varchar(255) NOT NULL default '', - `cf_max_po_id` int(11) NOT NULL default '0', + `cf_new_del` int(11) NOT NULL DEFAULT '0', + `cf_memo_del` int(11) NOT NULL DEFAULT '0', + `cf_visit_del` int(11) NOT NULL DEFAULT '0', + `cf_popular_del` int(11) NOT NULL DEFAULT '0', + `cf_use_jumin` tinyint(4) NOT NULL DEFAULT '0', + `cf_use_member_icon` tinyint(4) NOT NULL DEFAULT '0', + `cf_member_icon_size` int(11) NOT NULL DEFAULT '0', + `cf_member_icon_width` int(11) NOT NULL DEFAULT '0', + `cf_member_icon_height` int(11) NOT NULL DEFAULT '0', + `cf_login_minutes` int(11) NOT NULL DEFAULT '0', + `cf_image_extension` varchar(255) NOT NULL DEFAULT '', + `cf_flash_extension` varchar(255) NOT NULL DEFAULT '', + `cf_movie_extension` varchar(255) NOT NULL DEFAULT '', + `cf_formmail_is_member` tinyint(4) NOT NULL DEFAULT '0', + `cf_page_rows` int(11) NOT NULL DEFAULT '0', + `cf_visit` varchar(255) NOT NULL DEFAULT '', + `cf_max_po_id` int(11) NOT NULL DEFAULT '0', `cf_stipulation` text NOT NULL, `cf_privacy` text NOT NULL, - `cf_open_modify` int(11) NOT NULL default '0', - `cf_memo_send_point` int(11) NOT NULL default '0', - `cf_mobile_new_skin` varchar(255) NOT NULL default'', - `cf_mobile_search_skin` varchar(255) NOT NULL default'', - `cf_mobile_connect_skin` varchar(255) NOT NULL default'', - `cf_mobile_member_skin` varchar(255) NOT NULL default'', - `cf_gcaptcha_mp3` varchar(255) NOT NULL default'', - `cf_kcpcert_site_cd` varchar(255) NOT NULL default '', + `cf_open_modify` int(11) NOT NULL DEFAULT '0', + `cf_memo_send_point` int(11) NOT NULL DEFAULT '0', + `cf_mobile_new_skin` varchar(255) NOT NULL DEFAULT '', + `cf_mobile_search_skin` varchar(255) NOT NULL DEFAULT '', + `cf_mobile_connect_skin` varchar(255) NOT NULL DEFAULT '', + `cf_mobile_member_skin` varchar(255) NOT NULL DEFAULT '', + `cf_gcaptcha_mp3` varchar(255) NOT NULL DEFAULT '', + `cf_googl_shorturl_apikey` varchar(255) NOT NULL DEFAULT '', + `cf_kcpcert_site_cd` varchar(255) NOT NULL DEFAULT '', `cf_kcpcert_use` enum('','test','service') NOT NULL DEFAULT '', - `cf_1_subj` varchar(255) NOT NULL default '', - `cf_2_subj` varchar(255) NOT NULL default '', - `cf_3_subj` varchar(255) NOT NULL default '', - `cf_4_subj` varchar(255) NOT NULL default '', - `cf_5_subj` varchar(255) NOT NULL default '', - `cf_6_subj` varchar(255) NOT NULL default '', - `cf_7_subj` varchar(255) NOT NULL default '', - `cf_8_subj` varchar(255) NOT NULL default '', - `cf_9_subj` varchar(255) NOT NULL default '', - `cf_10_subj` varchar(255) NOT NULL default '', - `cf_1` varchar(255) NOT NULL default '', - `cf_2` varchar(255) NOT NULL default '', - `cf_3` varchar(255) NOT NULL default '', - `cf_4` varchar(255) NOT NULL default '', - `cf_5` varchar(255) NOT NULL default '', - `cf_6` varchar(255) NOT NULL default '', - `cf_7` varchar(255) NOT NULL default '', - `cf_8` varchar(255) NOT NULL default '', - `cf_9` varchar(255) NOT NULL default '', - `cf_10` varchar(255) NOT NULL default '' + `cf_facebook_appid` varchar(255) NOT NULL, + `cf_facebook_secret` varchar(255) NOT NULL, + `cf_twitter_key` varchar(255) NOT NULL, + `cf_twitter_secret` varchar(255) NOT NULL, + `cf_me2day_key` varchar(255) NOT NULL, + `cf_1_subj` varchar(255) NOT NULL DEFAULT '', + `cf_2_subj` varchar(255) NOT NULL DEFAULT '', + `cf_3_subj` varchar(255) NOT NULL DEFAULT '', + `cf_4_subj` varchar(255) NOT NULL DEFAULT '', + `cf_5_subj` varchar(255) NOT NULL DEFAULT '', + `cf_6_subj` varchar(255) NOT NULL DEFAULT '', + `cf_7_subj` varchar(255) NOT NULL DEFAULT '', + `cf_8_subj` varchar(255) NOT NULL DEFAULT '', + `cf_9_subj` varchar(255) NOT NULL DEFAULT '', + `cf_10_subj` varchar(255) NOT NULL DEFAULT '', + `cf_1` varchar(255) NOT NULL DEFAULT '', + `cf_2` varchar(255) NOT NULL DEFAULT '', + `cf_3` varchar(255) NOT NULL DEFAULT '', + `cf_4` varchar(255) NOT NULL DEFAULT '', + `cf_5` varchar(255) NOT NULL DEFAULT '', + `cf_6` varchar(255) NOT NULL DEFAULT '', + `cf_7` varchar(255) NOT NULL DEFAULT '', + `cf_8` varchar(255) NOT NULL DEFAULT '', + `cf_9` varchar(255) NOT NULL DEFAULT '', + `cf_10` varchar(255) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- From 8ad73139badf845afe7f0c96c1fce0ad9dd7c910 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 29 May 2013 11:54:00 +0900 Subject: [PATCH 06/15] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#464=20?= =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EB=A7=88=ED=81=AC=EC=97=85=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/view_comment.skin.php | 8 ++++---- skin/member/basic/register_form.skin.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index 9aa94e9da..8acc0716c 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -35,14 +35,14 @@ var char_max = parseInt(); // 최대 작성일 + 페이스북에도 등록됨 + 트위터에도 등록됨 + 미투데이에도 등록됨

- "; ?> - "; ?> - "; ?> - "; ?> + 비밀글

diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index 1d8f45d44..622db7a40 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -236,7 +236,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 '; diff --git a/plugin/kcpcert/kcpcert_result.php b/plugin/kcpcert/kcpcert_result.php index e6306d68c..569b60bef 100644 --- a/plugin/kcpcert/kcpcert_result.php +++ b/plugin/kcpcert/kcpcert_result.php @@ -1,9 +1,6 @@ - 공백없이 한글만 입력하세요."; } */ ?> - 이름과 휴대폰번호는 아래의 휴대폰 본인확인 기능을 사용하여 입력해 주십시오.' : ''; ?> - 테스트의 경우 이동통신사는 반드시 KT를 선택해 주십시오. 나머지 항목은 임의로 입력하시면 됩니다.' : ''; ?> - class="frm_input nospace " size="10"> + + 휴대폰 본인확인 후에는 이름과 휴대폰번호가 자동 입력되며 수동으로 입력할수 없게 됩니다. + + class="frm_input nospace " size="10"> + +
+ 휴대폰 본인확인 및 성인인증 완료 +
+ @@ -228,7 +233,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

작성하신 내용를 발송하시려면 버튼을, 작성을 취소하고 창을 닫으시려면 취소 링크를 누르세요.

- + 취소 @@ -379,7 +384,7 @@ function fregisterform_submit(f) - document.getElementById("btn_submit").disabled = "disabled"; + document.getElementById("btn_submit").disabled = true; return true; } diff --git a/skin/member/basic/register_form_update.head.skin.php b/skin/member/basic/register_form_update.head.skin.php deleted file mode 100644 index f1653afb9..000000000 --- a/skin/member/basic/register_form_update.head.skin.php +++ /dev/null @@ -1,7 +0,0 @@ - \ No newline at end of file diff --git a/skin/member/basic/register_form_update.tail.skin.php b/skin/member/basic/register_form_update.tail.skin.php deleted file mode 100644 index bbff72bb9..000000000 --- a/skin/member/basic/register_form_update.tail.skin.php +++ /dev/null @@ -1,7 +0,0 @@ - From fe087865a75cd72e77669515bf205d40413af5f6 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 29 May 2013 19:11:03 +0900 Subject: [PATCH 09/15] =?UTF-8?q?SNS=20=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/register_form_update.php | 6 ++ bbs/write.php | 2 +- bbs/write_comment_update.php | 6 +- bbs/write_comment_update.sns.php | 9 ++- plugin/kcpcert/kcpcert_result.php | 8 ++- plugin/sns/facebook/callback.php | 7 ++- plugin/sns/me2day/callback.php | 9 ++- plugin/sns/twitter/callback.php | 14 +++-- skin/board/basic/view_comment.skin.php | 10 ++-- skin/board/basic/view_comment.sns.skin.php | 65 ++++++++++++++------ skin/member/basic/register_form.skin.php | 70 +++++++++++----------- 11 files changed, 126 insertions(+), 80 deletions(-) diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 3b4bda071..4684ddeff 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -156,16 +156,22 @@ if ($config['cf_kcpcert_use'] && $md5_cert_no) { $sql_hp_certify .= " , mb_hp = '{$mb_hp}' "; $sql_hp_certify .= " , mb_hp_certify = '{$_SESSION['ss_kcpcert_hp_certify']}' "; $sql_hp_certify .= " , mb_adult = '{$_SESSION['ss_kcpcert_adult']}' "; + $sql_hp_certify .= " , mb_birth = '{$_SESSION['ss_kcpcert_birth']}' "; + $sql_hp_certify .= " , mb_sex = '{$_SESSION['ss_kcpcert_sex']}' "; } else { $sql_hp_certify .= " , mb_hp = '' "; $sql_hp_certify .= " , mb_hp_certify = 0 "; $sql_hp_certify .= " , mb_adult = 0 "; + $sql_hp_certify .= " , mb_birth = '' "; + $sql_hp_certify .= " , mb_sex = '' "; } } else { if (get_session("ss_reg_mb_name") != $mb_name || get_session("ss_reg_mb_hp") != $mb_hp) { $sql_hp_certify .= " , mb_hp = '{$mb_hp}' "; $sql_hp_certify .= " , mb_hp_certify = 0 "; $sql_hp_certify .= " , mb_adult = 0 "; + $sql_hp_certify .= " , mb_birth = '' "; + $sql_hp_certify .= " , mb_sex = '' "; } } //=============================================================== diff --git a/bbs/write.php b/bbs/write.php index 7a9e329b7..c5b782425 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -188,7 +188,7 @@ if ($config['cf_kcpcert_use'] != '' && !$is_admin) { } if ($board['bo_use_cert'] == 'adult' && !$member['mb_adult']) { - alert('이 게시판은 휴대폰 본인확인으로 성인인증 된 회원님만 글쓰기가 가능합니다.\\n\\n성인인데 글읽기가 안된다면 회원정보 수정에서 휴대폰 본인확인을\\n다시 해주시기 바랍니다.', G4_URL); + alert('이 게시판은 휴대폰 본인확인으로 성인인증 된 회원님만 글쓰기가 가능합니다.\\n\\n성인인데 글읽기가 안된다면 회원정보 수정에서 휴대폰 본인확인을 다시 해주시기 바랍니다.', G4_URL); } } diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index c79306afb..3309ad7ed 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -135,9 +135,7 @@ if ($w == 'c') // 댓글 입력 } // SNS 등록 - $wr_sns = array(); include_once("./write_comment_update.sns.php"); - $wr_sns = implode(",", $wr_sns); $sql = " insert into $write_table set ca_name = '{$wr['ca_name']}', @@ -158,7 +156,9 @@ if ($w == 'c') // 댓글 입력 wr_datetime = '".G4_TIME_YMDHIS."', wr_last = '', wr_ip = '{$_SERVER['REMOTE_ADDR']}', - wr_sns = '$wr_sns', + wr_facebook_user = '$wr_facebook_user', + wr_twitter_user = '$wr_twitter_user', + wr_me2day_user = '$wr_me2day_user', wr_1 = '$wr_1', wr_2 = '$wr_2', wr_3 = '$wr_3', diff --git a/bbs/write_comment_update.sns.php b/bbs/write_comment_update.sns.php index ca527ec62..567667078 100644 --- a/bbs/write_comment_update.sns.php +++ b/bbs/write_comment_update.sns.php @@ -10,6 +10,7 @@ set_cookie('ck_me2day_checked' , false, 86400*31); //============================================================================ // 페이스북 //---------------------------------------------------------------------------- +$wr_facebook_user = ""; if ($_POST['facebook_checked']) { include_once(G4_SNS_PATH."/facebook/src/facebook.php"); @@ -39,7 +40,7 @@ if ($_POST['facebook_checked']) { } } - $wr_sns[] = "fb"; + $wr_facebook_user = get_session("ss_facebook_user"); } //============================================================================ @@ -47,6 +48,7 @@ if ($_POST['facebook_checked']) { //============================================================================ // 트위터 //---------------------------------------------------------------------------- +$wr_twitter_user = ""; if ($_POST['twitter_checked']) { include_once(G4_SNS_PATH."/twitter/twitteroauth/twitteroauth.php"); include_once(G4_SNS_PATH."/twitter/twitterconfig.php"); @@ -63,7 +65,7 @@ if ($_POST['twitter_checked']) { set_cookie('ck_twitter_checked', true, 86400*31); } - $wr_sns[] = "tw"; + $wr_twitter_user = get_session("ss_twitter_user"); } //============================================================================ @@ -71,6 +73,7 @@ if ($_POST['twitter_checked']) { //============================================================================ // 미투데이 //---------------------------------------------------------------------------- +$wr_me2day_user = ""; if ($_POST['me2day_checked']) { if (!empty($_SESSION['me2day']['user_id']) && !empty($_SESSION['me2day']['user_key'])) { $user_id = $_SESSION['me2day']['user_id']; @@ -81,7 +84,7 @@ if ($_POST['me2day_checked']) { set_cookie('ck_me2day_checked', true, 86400*31); } - $wr_sns[] = "me"; + $wr_me2day_user = get_session("ss_me2day_user"); } //============================================================================ ?> \ No newline at end of file diff --git a/plugin/kcpcert/kcpcert_result.php b/plugin/kcpcert/kcpcert_result.php index 569b60bef..e25848901 100644 --- a/plugin/kcpcert/kcpcert_result.php +++ b/plugin/kcpcert/kcpcert_result.php @@ -131,10 +131,10 @@ if( $cert_enc_use == "Y" ) $phone_no = hyphen_hp_number($phone_no); - $sql = " select count(*) as cnt from {$g4['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$phone_no}' "; + $sql = " select mb_id from {$g4['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$phone_no}' "; $row = sql_fetch($sql); - if ($row['cnt']) { - alert_close("이미 가입되어 있는 휴대폰번호 입니다."); + if ($row['mb_id']) { + alert_close("이미 가입되어 있는 휴대폰번호 입니다.\\n회원아이디 : ".$row['mb_id']); } // hash 데이터 @@ -149,6 +149,8 @@ if( $cert_enc_use == "Y" ) set_session("ss_kcpcert_hash", $hash_data); set_session("ss_kcpcert_hp_certify", 1); set_session("ss_kcpcert_adult", $adult); + set_session("ss_kcpcert_birth", $birth_day); + set_session("ss_kcpcert_sex", ($sex_code=="01"?"M":"F")); /* $sql = " update {$g4['member_table']} set mb_name = '$user_name', mb_hp = '$phone_no', mb_hp_certify = 1, mb_adult = $adult, mb_birth = '$birth_day', mb_sex = '$sex_code' where mb_id = '{$member['mb_id']}' "; diff --git a/plugin/sns/facebook/callback.php b/plugin/sns/facebook/callback.php index f301207a5..9f1d7ec22 100644 --- a/plugin/sns/facebook/callback.php +++ b/plugin/sns/facebook/callback.php @@ -22,10 +22,13 @@ $g4['title'] = '페이스북 콜백'; include_once(G4_PATH.'/head.sub.php'); if ($user) { - $sns_name = $user_profile['name']; - $g4_sns_url = G4_SNS_URL; + $sns_name = $user_profile['name']; + $sns_user = $user; set_cookie('ck_sns_name', $sns_name, 86400); + set_session('ss_facebook_user', $user); + + $g4_sns_url = G4_SNS_URL; echo << diff --git a/plugin/sns/me2day/callback.php b/plugin/sns/me2day/callback.php index 78a03a07d..7226c98cc 100644 --- a/plugin/sns/me2day/callback.php +++ b/plugin/sns/me2day/callback.php @@ -14,11 +14,14 @@ include_once(G4_PATH.'/head.sub.php'); $result = json_decode(file_get_contents("http://me2day.net/api/noop.json?uid={$user_id}&ukey={$auth_key}&akey=".$config['cf_me2day_key'])); if ($result->code == 0) { - $user = json_decode(file_get_contents("http://me2day.net/api/get_person/{$user_id}.json")); - $sns_name = $user->nickname; - $g4_sns_url = G4_SNS_URL; + $user = json_decode(file_get_contents("http://me2day.net/api/get_person/{$user_id}.json")); + $sns_name = $user->nickname; + $sns_user = $user->id; set_cookie('ck_sns_name', $sns_name, 86400); + set_session('ss_me2day_user', $sns_user); + + $g4_sns_url = G4_SNS_URL; echo << diff --git a/plugin/sns/twitter/callback.php b/plugin/sns/twitter/callback.php index 27b58b765..456769424 100644 --- a/plugin/sns/twitter/callback.php +++ b/plugin/sns/twitter/callback.php @@ -16,8 +16,8 @@ require_once(G4_SNS_PATH.'/twitter/twitterconfig.php'); /* If the oauth_token is old redirect to the connect page. */ if (isset($_REQUEST['oauth_token']) && $_SESSION['oauth_token'] !== $_REQUEST['oauth_token']) { - $_SESSION['oauth_status'] = 'oldtoken'; - header('Location: ./clearsessions.php'); + $_SESSION['oauth_status'] = 'oldtoken'; + header('Location: ./clearsessions.php'); } /* Create TwitteroAuth object with app key/secret and token key/secret from default phase */ @@ -47,12 +47,14 @@ $g4['title'] = '트위터 콜백'; include_once(G4_PATH.'/head.sub.php'); if (200 == $connection->http_code) { - - $content = $connection->get('account/verify_credentials'); - $sns_name = $content->name; - $g4_sns_url = G4_SNS_URL; + $content = $connection->get('account/verify_credentials'); + $sns_name = $content->name; + $sns_user = $content->screen_name; set_cookie('ck_sns_name', $sns_name, 86400); + set_session('ss_twitter_user', $sns_user); + + $g4_sns_url = G4_SNS_URL; echo << diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index 8acc0716c..1bf735274 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -35,9 +35,9 @@ var char_max = parseInt(); // 최대 작성일 - 페이스북에도 등록됨 - 트위터에도 등록됨 - 미투데이에도 등록됨 + 페이스북에도 등록됨 + 트위터에도 등록됨 + 미투데이에도 등록됨 @@ -127,7 +127,7 @@ var char_max = parseInt(); // 최대 내용 글자 - '; - } - echo ''; - } - //============================================================================ - - - //============================================================================ - // 트위터 - //---------------------------------------------------------------------------- - if ($config['cf_twitter_key']) { - include_once(G4_SNS_PATH."/twitter/twitteroauth/twitteroauth.php"); - include_once(G4_SNS_PATH."/twitter/twitterconfig.php"); - - $twitter_user = false; - if (empty($_SESSION['access_token']) || empty($_SESSION['access_token']['oauth_token']) || empty($_SESSION['access_token']['oauth_token_secret'])) { - $twitter_url = G4_SNS_URL."/twitter/redirect.php"; - } else { - $access_token = $_SESSION['access_token']; - $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']); - $content = $connection->get('account/verify_credentials'); - //print_r2($content); - - switch ($connection->http_code) { - case 200: - $twitter_user = true; - $twitter_url = $connection->getAuthorizeURL($token); - break; - default : - $twitter_url = G4_SNS_URL."/twitter/redirect.php"; - } - } - - echo '
  • '; - if ($twitter_user) { - echo ''; - echo ''; - echo ''; - } else { - echo ''; - echo ''; - echo ''; - echo ''; - } - echo '
    • '; - } - //============================================================================ - - - //============================================================================ - // 미투데이 - //---------------------------------------------------------------------------- - if ($config['cf_me2day_key']) { - $me2day_user = false; - if (empty($_SESSION['me2day']['user_id']) || empty($_SESSION['me2day']['user_key'])) { - $result = json_decode(file_get_contents("http://me2day.net/api/get_auth_url.json?akey=".$config['cf_me2day_key'])); - $me2day_url = $result->url; - } else { - $me2day_user = true; - } - - echo '
  • '; - if ($me2day_user) { - echo ''; - echo ''; - echo ''; - } else { - echo ''; - echo ''; - echo ''; - echo ''; - } - echo '
    • '; - } - //============================================================================ - ?> - - - From 591de48cfc3064b7a44ebddd1cbe81fe22798683 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 30 May 2013 17:53:58 +0900 Subject: [PATCH 14/15] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20SNS=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=8A=A4=ED=83=80=EC=9D=BC=201?= =?UTF-8?q?=EC=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/board/basic/style.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css index 1b47d611c..7420dc797 100644 --- a/mobile/skin/board/basic/style.css +++ b/mobile/skin/board/basic/style.css @@ -105,6 +105,10 @@ #bo_v_act strong {color:#ff3061} #bo_v_act_good, #bo_v_act_nogood {display:inline-block;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} +#bo_v_sns {margin:0 0 2em;padding:0;list-style:none;zoom:1} +#bo_v_sns:after {display:block;visibility:hidden;clear:both;content:""} +#bo_v_sns li {float:left;margin:0 0.5em 0 0} + #bo_v form {padding-top:1.5em} /* 게시판 댓글 */ @@ -134,4 +138,9 @@ #bo_vc_w #char_cnt {display:block;margin-bottom:0.3em} #bo_vc_w textarea {width:99%} +#bo_vc_sns {margin:0;padding:0;list-style:none;zoom:1} +#bo_vc_sns:after {display:block;visibility:hidden;clear:both;content:""} +#bo_vc_sns li {float:left;margin:0 1em 0 0} +#bo_vc_sns input {margin:0 0 0 0.5em} + #bo_vc form {padding:0} \ No newline at end of file From 37734d3abc00c7bac54106ea4ad00f60419e3e18 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 30 May 2013 17:55:43 +0900 Subject: [PATCH 15/15] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20=EC=9D=BD=EA=B8=B0=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EC=A0=9C=EB=AA=A9=20=EC=B9=B4?= =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=B6=80=EB=B6=84=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/board/basic/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css index 7420dc797..70fb76b67 100644 --- a/mobile/skin/board/basic/style.css +++ b/mobile/skin/board/basic/style.css @@ -48,7 +48,7 @@ /* 게시판 읽기 */ #bo_v {margin-bottom:1.5em;padding-bottom:1.5em} -#bo_v_cate {padding:0 1em;color:#999;font-size:0.9em;font-weight:bold} +#bo_v_table {padding:0 1em;color:#999;font-size:0.9em;font-weight:bold} #bo_v_title {padding:0 0.7em 0.5em;font-size:1.2em}