diff --git a/adm/board_form.php b/adm/board_form.php index aff0b8dc1..f55f13dbc 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -54,7 +54,10 @@ if (!isset($board['bo_use_sns'])) { $result = sql_query(" select bo_table from `{$g4['board_table']}` "); for ($i=0; $row=sql_fetch_array($result); $i++) { - sql_query(" ALTER TABLE `{$g4['write_prefix']}{$row['bo_table']}` ADD `wr_sns` SET( 'fb', 'tw', 'me', 'gp' ) NOT NULL AFTER `wr_ip` ", false); + sql_query(" ALTER TABLE `{$g4['write_prefix']}{$row['bo_table']}` + ADD `wr_facebook_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_ip`, + ADD `wr_twitter_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_facebook_user`, + ADD `wr_me2day_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_twitter_user` ", false); } } diff --git a/adm/sql_write.sql b/adm/sql_write.sql index 63e86974e..f6e2bdd2a 100644 --- a/adm/sql_write.sql +++ b/adm/sql_write.sql @@ -1,42 +1,45 @@ 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_facebook_user` varchar(255) NOT NULL, + `wr_twitter_user` varchar(255) NOT NULL, + `wr_me2day_user` varchar(255) 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/bbs/register_form_update.php b/bbs/register_form_update.php index 48218b4a3..4684ddeff 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -145,6 +145,36 @@ if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name'] // 관리자님 회원정보 $admin = get_admin('super'); +//=============================================================== +// 휴대폰 본인확인 +//--------------------------------------------------------------- +$sql_hp_certify = ""; +$md5_cert_no = get_session("ss_kcpcert_no"); +if ($config['cf_kcpcert_use'] && $md5_cert_no) { + // 해시값이 같은 경우에만 휴대폰 본인확인 값을 저장한다. + if (get_session("ss_kcpcert_hash") == md5($mb_hp.$mb_name.$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 = '' "; + } +} +//=============================================================== if ($w == '') { @@ -159,7 +189,6 @@ if ($w == '') { mb_email = '{$mb_email}', mb_homepage = '{$mb_homepage}', mb_tel = '{$mb_tel}', - mb_hp = '{$mb_hp}', mb_zip1 = '{$mb_zip1}', mb_zip2 = '{$mb_zip2}', mb_addr1 = '{$mb_addr1}', @@ -185,7 +214,9 @@ if ($w == '') { mb_7 = '{$mb_7}', mb_8 = '{$mb_8}', mb_9 = '{$mb_9}', - mb_10 = '{$mb_10}' "; + mb_10 = '{$mb_10}' + {$sql_hp_certify} "; + // 이메일 인증을 사용하지 않는다면 이메일 인증시간을 바로 넣는다 if (!$config['cf_use_email_certify']) $sql .= " , mb_email_certify = '".G4_TIME_YMDHIS."' "; @@ -264,29 +295,6 @@ if ($w == '') { if ($old_email != $mb_email && $config['cf_use_email_certify']) $sql_email_certify = " , mb_email_certify = '' "; - ///////////////////////////////////////////////////////////////// - // 휴대폰 본인확인 - ///////////////////////////////////////////////////////////////// - $sql_hp_certify = ""; - $md5_cert_no = get_session("ss_kcpcert_no"); - if ($config['cf_kcpcert_use'] && $md5_cert_no) { - $hash_data = md5($mb_hp.$mb_name.$md5_cert_no); - // 해시값이 틀린 경우에는 휴대폰 인증 값을 무효화 한다. - if (get_session("ss_kcpcert_hash") != $hash_data) { - $sql_hp_certify .= " , mb_hp = '' "; - $sql_hp_certify .= " , mb_hp_certify = 0 "; - $sql_hp_certify .= " , mb_adult = 0 "; - } - } 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 = " update {$g4['member_table']} set mb_nick = '{$mb_nick}', mb_mailling = '{$mb_mailling}', @@ -341,6 +349,10 @@ if ($w == '') { // 사용자 코드 실행 @include_once ($member_skin_path.'/register_form_update.tail.skin.php'); +unset($_SESSION['ss_kcpcert_no']); +unset($_SESSION['ss_kcpcert_hash']); +unset($_SESSION['ss_kcpcert_hp_certify']); +unset($_SESSION['ss_kcpcert_adult']); if ($msg) echo ''; diff --git a/bbs/write.php b/bbs/write.php index 7a9e329b7..009d7e79c 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -16,8 +16,6 @@ if (!$bo_table) { check_device($board['bo_device']); -@include_once ($board_skin_path.'/write.head.skin.php'); - $notice_array = explode(',', trim($board['bo_notice'])); if (!($w == '' || $w == 'u' || $w == 'r')) { @@ -188,7 +186,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); } } @@ -375,6 +373,7 @@ if (!G4_IS_MOBILE && $board['bo_use_dhtml_editor'] && $member['mb_level'] >= $bo $editor_html = editor_html('wr_content', $content, $is_dhtml_editor); include_once(G4_PATH.'/head.sub.php'); +@include_once ($board_skin_path.'/write.head.skin.php'); include_once('./board_head.php'); $action_url = https_url(G4_BBS_DIR)."/write_update.php"; @@ -383,7 +382,6 @@ echo ''; include_once ($board_skin_path.'/write.skin.php'); include_once('./board_tail.php'); -include_once(G4_PATH.'/tail.sub.php'); - @include_once ($board_skin_path.'/write.tail.skin.php'); +include_once(G4_PATH.'/tail.sub.php'); ?> \ No newline at end of file diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index 329c34c34..3309ad7ed 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -134,6 +134,9 @@ if ($w == 'c') // 댓글 입력 $tmp_comment_reply = ''; } + // SNS 등록 + include_once("./write_comment_update.sns.php"); + $sql = " insert into $write_table set ca_name = '{$wr['ca_name']}', wr_option = '$wr_secret', @@ -153,6 +156,9 @@ if ($w == 'c') // 댓글 입력 wr_datetime = '".G4_TIME_YMDHIS."', wr_last = '', wr_ip = '{$_SERVER['REMOTE_ADDR']}', + 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', @@ -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/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/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; -- -------------------------------------------------------- diff --git a/lib/common.lib.php b/lib/common.lib.php index aca42c444..8c74c041d 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -816,9 +816,9 @@ function is_admin($mb_id) // 4.00 에서는 카테고리 테이블을 없애고 보드테이블에 있는 내용으로 대체 function get_category_option($bo_table='', $ca_name='') { - global $g4, $board; + global $g4, $board, $is_admin; - $categories = explode("|", $board['bo_category_list']); // 구분자가 , 로 되어 있음 + $categories = explode("|", $board['bo_category_list'].($is_admin?"|공지":"")); // 구분자가 , 로 되어 있음 $str = ""; for ($i=0; $i + ); // 최대 + 내용 diff --git a/mobile/skin/board/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php index 99bd40c2e..be5bbe6aa 100644 --- a/mobile/skin/board/gallery/view.skin.php +++ b/mobile/skin/board/gallery/view.skin.php @@ -165,6 +165,10 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } } ?> + ); // 최대 + 내용 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/plugin/kcpcert/kcpcert_result.php b/plugin/kcpcert/kcpcert_result.php index e6306d68c..e25848901 100644 --- a/plugin/kcpcert/kcpcert_result.php +++ b/plugin/kcpcert/kcpcert_result.php @@ -1,9 +1,6 @@ '{$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 데이터 $md5_cert_no = md5($cert_no); - $hash_data = md5($phone_no.$user_name.$md5_cert_no); - set_session("ss_kcpcert_no", $md5_cert_no); - set_session("ss_kcpcert_hash", $hash_data); + $hash_data = md5($phone_no.$user_name.$md5_cert_no); // 성인인증결과 $adult_day = date("Ymd", strtotime("-19 years", G4_SERVER_TIME)); $adult = ((int)$birth_day <= (int)$adult_day) ? 1 : 0; + set_session("ss_kcpcert_no", $md5_cert_no); + 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']}' "; sql_query($sql); + */ } else if( $res_cd != "0000" ) { 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/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', ''); diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index 772c4baa6..391c366e2 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">
@@ -33,12 +35,15 @@ var char_max = parseInt(); // 최대 작성일 + 페이스북에도 등록됨 + 트위터에도 등록됨 + 미투데이에도 등록됨

- "; ?> - + 비밀글 +

@@ -113,16 +118,14 @@ var char_max = parseInt(); // 최대 - - 내용 글자 - diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index 678665bf1..5fa039d5a 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -58,6 +58,10 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } ?> + diff --git a/skin/board/gallery/view.sns.skin.php b/skin/board/gallery/view.sns.skin.php deleted file mode 100644 index 80f8cd945..000000000 --- a/skin/board/gallery/view.sns.skin.php +++ /dev/null @@ -1,39 +0,0 @@ - -
    -
  • 페이스북으로 보내기
    • -
  • 트위터로 보내기
    • -
  • 미투데이로 보내기
    • -
  • 구글플러스로 보내기
    • - -
  • 카카오톡으로 보내기
    • - -
diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php index 067f350c1..73ec802b2 100644 --- a/skin/board/gallery/view_comment.skin.php +++ b/skin/board/gallery/view_comment.skin.php @@ -114,8 +114,8 @@ var char_max = parseInt(); // 최대 - @@ -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 deleted file mode 100644 index 06d6d1ff8..000000000 --- a/skin/board/gallery/view_comment.sns.skin.php +++ /dev/null @@ -1,130 +0,0 @@ - - - SNS 등록 - -
    - $config['cf_facebook_appid'], - 'secret' => $config['cf_facebook_secret'] - )); - - $facebook_user = $facebook->getUser(); - - if ($facebook_user) { - try { - $facebook_user_profile = $facebook->api('/me'); - } catch (FacebookApiException $e) { - error_log($e); - $facebook_user = null; - } - } - - echo '
  • '; - if ($facebook_user) { - echo ''; - echo ''; - echo ''; - } else { - $facebook_url = $facebook->getLoginUrl(array("redirect_uri"=>G4_SNS_URL."/facebook/callback.php", "scope"=>"publish_stream,read_stream,offline_access", "display"=>"popup")); - - echo ''; - echo ''; - echo ''; - echo ''; - } - 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"; - // 안먹히는 코드 ㅠㅠ - 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); - } - } - } - } - - 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 '
    • '; - } - //============================================================================ - ?> -
- - 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 0abf94bdf..df1874f23 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -41,10 +41,15 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - 공백없이 한글만 입력하세요."; } */ ?> - 이름과 휴대폰번호는 아래의 휴대폰 본인확인 기능을 사용하여 입력해 주십시오.' : ''; ?> - 테스트의 경우 이동통신사는 반드시 KT를 선택해 주십시오. 나머지 항목은 임의로 입력하시면 됩니다.' : ''; ?> - class="frm_input nospace " size="10"> + + 휴대폰 본인확인 후에는 이름과 휴대폰번호가 자동 입력되며 수동으로 입력할수 없게 됩니다. + + class="frm_input nospace " size="10"> + +
+ 휴대폰 본인확인 및 성인인증 완료 +
+ @@ -97,7 +102,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 휴대폰번호는 휴대폰 본인확인 기능을 이용하여 입력하세요. - class="frm_input " maxlength="20"> + class="frm_input " maxlength="20"> @@ -228,7 +233,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

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

- + 취소 @@ -236,7 +241,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 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 @@ -