g4s merge 충돌 수정

2013-05-29 09:06:13 +09:00
parent 93848e4819 b1dcfd185c
commit 158eccb534
104 changed files with 10830 additions and 654 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,7 +8,7 @@ sirgle
 sr_*
 google*
 skin/latest/basic2
-Rankiss*
+rankiss*
 thumb.lib.php
 test.php
 g4s_tree
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@ -95,6 +95,8 @@ $sql = " insert into {$g4['board_table']}
                bo_notice = '{$board['bo_notice']}',
                bo_upload_count = '{$board[bo_upload_count]}',
                bo_use_email = '{$board[bo_use_email]}',
+                bo_use_cert = '{$board[bo_use_cert]}',
+                bo_use_sns = '{$board[bo_use_sns]}',
                bo_sort_field = '{$board['bo_sort_field']}',
                bo_1_subj = '{$board['bo_1_subj']}',
                bo_2_subj = '{$board['bo_2_subj']}',
--- a/adm/board_delete.php
+++ b/adm/board_delete.php
@ -1,28 +0,0 @@
-<?php
-$sub_menu = "300100";
-include_once('./_common.php');
-
-check_demo();
-
-if ($is_admin != 'super')
-    alert("게시판 삭제는 최고관리자만 가능합니다.");
-
-auth_check($auth[$sub_menu], 'd');
-
-check_token();
-
-// _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
-define('_BOARD_DELETE_', TRUE);
-
-// include 전에 $bo_table 값을 반드시 넘겨야 함
-$tmp_bo_table = escape_trim($_GET['bo_table']);
-$sql = " select * from {$g4['board_table']} where bo_table = '{$tmp_bo_table}' ";
-$row = sql_fetch($sql);
-if (!$row) {
-    alert('게시판을 삭제할 수 없습니다.');
-}
-
-include_once ('./board_delete.inc.php');
-
-goto_url('./board_list.php?'.$qstr.'&amp;page='.$page);
-?>
--- a/adm/board_form.php
+++ b/adm/board_form.php
@ -49,6 +49,15 @@ if (!isset($board['bo_use_cert'])) {
    sql_query(" ALTER TABLE `{$g4['board_table']}`  ADD `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' AFTER `bo_use_email` ", false);
 }

+if (!isset($board['bo_use_sns'])) {
+    sql_query(" ALTER TABLE `{$g4['board_table']}`  ADD `bo_use_sns` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_cert` ", false);
+
+    $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['board_table']}` CHANGE `bo_use_cert` `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' ", false);

 $required = "";
@ -668,6 +677,20 @@ $pg_anchor = '<ul class="anchor">
            <label for="chk_all_comment_max">전체적용</label>
        </td>
    </tr>
+    <tr>
+        <th scope="row"><label for="bo_use_sns">SNS 사용</label></th>
+        <td>
+            <?php echo help("사용에 체크하시면 소셜네트워크서비스(SNS)에 글을 퍼가거나 댓글을 동시에 등록할수 있습니다.<br>기본환경설정의 SNS 설정을 하셔야 사용이 가능합니다.") ?>
+            <input type="checkbox" name="bo_use_sns" value="1" id="bo_use_sns" <?php echo $board['bo_use_sns']?'checked':''; ?>>
+            사용
+        </td>
+        <td class="group_setting">
+            <input type="checkbox" name="chk_grp_use_sns" value="1" id="chk_grp_use_sns">
+            <label for="chk_grp_use_sns">그룹적용</label>
+            <input type="checkbox" name="chk_all_use_sns" value="1" id="chk_all_use_sns">
+            <label for="chk_all_use_sns">전체적용</label>
+        </td>
+    </tr>
    <tr>
        <th scope="row"><label for="bo_use_search">전체 검색 사용</label></th>
        <td>
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@ -77,6 +77,7 @@ $sql_common = " gr_id               = '{$_POST['gr_id']}',
                bo_use_list_content = '{$_POST['bo_use_list_content']}',
                bo_use_email        = '{$_POST['bo_use_email']}',
                bo_use_cert         = '{$_POST['bo_use_cert']}',
+                bo_use_sns          = '{$_POST['bo_use_sns']}',
                bo_table_width      = '{$_POST['bo_table_width']}',
                bo_subject_len      = '{$_POST['bo_subject_len']}',
                bo_mobile_subject_len      = '{$_POST['bo_mobile_subject_len']}',
@ -254,6 +255,7 @@ if (is_checked('chk_grp_use_list_view'))        $grp_fields .= " , bo_use_list_v
 if (is_checked('chk_grp_use_list_content'))     $grp_fields .= " , bo_use_list_content = '{$bo_use_list_content}' ";
 if (is_checked('chk_grp_use_email'))            $grp_fields .= " , bo_use_email = '{$bo_use_email}' ";
 if (is_checked('chk_grp_use_cert'))             $grp_fields .= " , bo_use_cert = '{$bo_use_cert}' ";
+if (is_checked('chk_grp_use_sns'))              $grp_fields .= " , bo_use_sns = '{$bo_use_sns}' ";
 if (is_checked('chk_grp_skin'))                 $grp_fields .= " , bo_skin = '{$bo_skin}' ";
 if (is_checked('chk_grp_mobile_skin'))          $grp_fields .= " , bo_mobile_skin = '{$bo_mobile_skin}' ";
 if (is_checked('chk_grp_gallery_cols'))         $grp_fields .= " , bo_gallery_cols = '{$bo_gallery_cols}' ";
@ -337,6 +339,7 @@ if (is_checked('chk_all_use_list_view'))        $all_fields .= " , bo_use_list_v
 if (is_checked('chk_all_use_list_content'))     $all_fields .= " , bo_use_list_content = '{$bo_use_list_content}' ";
 if (is_checked('chk_all_use_email'))            $all_fields .= " , bo_use_email = '{$bo_use_email}' ";
 if (is_checked('chk_all_use_cert'))             $all_fields .= " , bo_use_cert = '{$bo_use_cert}' ";
+if (is_checked('chk_all_use_sns'))              $all_fields .= " , bo_use_sns = '{$bo_use_sns}' ";
 if (is_checked('chk_all_skin'))                 $all_fields .= " , bo_skin = '{$bo_skin}' ";
 if (is_checked('chk_all_mobile_skin'))          $all_fields .= " , bo_mobile_skin = '{$bo_mobile_skin}' ";
 if (is_checked('chk_all_gallery_cols'))         $all_fields .= " , bo_gallery_cols = '{$bo_gallery_cols}' ";
--- a/adm/board_list.php
+++ b/adm/board_list.php
@ -103,6 +103,7 @@ $colspan = 15;
        <th scope="col">쓰기P<span class="sound_only">포인트</span></th>
        <th scope="col">댓글P<span class="sound_only">포인트</span></th>
        <th scope="col">다운P<span class="sound_only">포인트</span></th>
+        <th scope="col"><?php echo subject_sort_link('bo_use_sns') ?>SNS<br>사용</a></th>
        <th scope="col"><?php echo subject_sort_link('bo_use_search') ?>검색<br>사용</a></th>
        <th scope="col"><?php echo subject_sort_link('bo_show_menu') ?>메뉴<br>보임</a></th>
        <th scope="col"><?php echo subject_sort_link('bo_order') ?>출력<br>순서</a></th>
@ -143,6 +144,7 @@ $colspan = 15;
        <td><input type="text" name="bo_write_point[<?php echo $i ?>]" value="<?php echo $row['bo_write_point'] ?>" title="쓰기포인트" class="frm_input" size="2"></td>
        <td><input type="text" name="bo_comment_point[<?php echo $i ?>]" value="<?php echo $row['bo_comment_point'] ?>" title="댓글포인트" class="frm_input" size="2"></td>
        <td><input type="text" name="bo_download_point[<?php echo $i ?>]" value="<?php echo $row['bo_download_point'] ?>" title="다운포인트" class="frm_input" size="2"></td>
+        <td><input type="checkbox" name="bo_use_sns[<?php echo $i ?>]" value="1" id="bo_use_sns<?php echo $i ?>" <?php echo $row['bo_use_sns']?"checked":"" ?> title="선택시 SNS 사용"></td>
        <td><input type="checkbox" name="bo_use_search[<?php echo $i ?>]" value="1" id="bo_use_search_<?php echo $i ?>" <?php echo $row['bo_use_search']?"checked":"" ?> title="선택시 검색사용"></td>
        <td><input type="checkbox" name="bo_show_menu[<?php echo $i ?>]" value="1" id="bo_show_menu_<?php echo $i ?>" <?php echo $row['bo_show_menu']?"checked":"" ?> title="선택시 메뉴보이기"></td>
        <td><input type="text" name="bo_order[<?php echo $i ?>]" value="<?php echo $row['bo_order'] ?>" id="bo_order<?php echo $i ?>" title="출력순서" class="frm_input" size="2"></td>
--- a/adm/board_list_update.php
+++ b/adm/board_list_update.php
@ -38,6 +38,7 @@ if ($_POST['act_button'] == "선택수정") {
                        bo_comment_point    = '{$_POST['bo_comment_point'][$k]}',
                        bo_download_point   = '{$_POST['bo_download_point'][$k]}',
                        bo_use_search       = '{$_POST['bo_use_search'][$k]}',
+                        bo_use_sns          = '{$_POST['bo_use_sns'][$k]}',
                        bo_show_menu        = '{$_POST['bo_show_menu'][$k]}',
                        bo_order            = '{$_POST['bo_order'][$k]}'
                  where bo_table            = '{$_POST['board_table'][$k]}' ";
--- a/adm/boardgroup_delete.php
+++ b/adm/boardgroup_delete.php
@ -1,35 +0,0 @@
-<?php
-$sub_menu = "300200";
-include_once('./_common.php');
-
-check_demo();
-
-auth_check($auth[$sub_menu], 'd');
-
-$gr_id = mysql_real_escape_string(trim($_POST['gr_id']));
-$row = sql_fetch(" select count(*) as cnt from {$g4['board_table']} where gr_id = '{$gr_id}' ");
-if ($row['cnt'])
-    alert('이 그룹에 속한 게시판이 존재하여 게시판 그룹을 삭제할 수 없습니다.\\n\\n이 그룹에 속한 게시판을 먼저 삭제하여 주십시오.', './board_list.php?sfl=gr_id&amp;stx='.$gr_id);
-
-
-/*
-// _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
-define("_BOARD_DELETE_", TRUE);
-
-$sql = " select * from $g4['board_table'] where gr_id = '$gr_id' ";
-$result = sql_query($sql);
-while ($row = sql_fetch_array($result)) {
-    $tmp_bo_table = $row['bo_table'];
-
-    include ('./board_delete.inc.php');
-}
-*/
-
-// 그룹 삭제
-sql_query(" delete from {$g4['group_table']} where gr_id = '{$gr_id}' ");
-
-// 그룹접근 회원 삭제
-sql_query(" delete from {$g4['group_member_table']} where gr_id = '{$gr_id}' ");
-
-goto_url('boardgroup_list.php?'.$qstr);
-?>
--- a/adm/config_form.php
+++ b/adm/config_form.php
@ -30,6 +30,11 @@ if(!isset($config['cf_gcaptcha_mp3'])) {
                    ADD `cf_gcaptcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", true);
 }

+if(!isset($config['cf_googl_shorturl_apikey'])) {
+    sql_query(" ALTER TABLE `{$g4['config_table']}`
+                    ADD `cf_googl_shorturl_apikey` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_gcaptcha_mp3` ", true);
+}
+
 if(!isset($config['cf_kcpcert_site_cd'])) {
    sql_query(" ALTER TABLE `{$g4['config_table']}`
                    ADD `cf_kcpcert_site_cd` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", true);
@ -48,6 +53,15 @@ if(!isset($config['cf_mobile_pages'])) {
    sql_query(" UPDATE `{$g4['config_table']}` SET cf_mobile_pages = '5' ", true);
 }

+if(!isset($config['cf_facebook_appid'])) {
+    sql_query(" ALTER TABLE `{$g4['config_table']}`
+                    ADD `cf_facebook_appid` VARCHAR(255) NOT NULL AFTER `cf_kcpcert_use`,  
+                    ADD `cf_facebook_secret` VARCHAR(255) NOT NULL AFTER `cf_facebook_appid`,
+                    ADD `cf_twitter_key` VARCHAR(255) NOT NULL AFTER `cf_facebook_secret`,
+                    ADD `cf_twitter_secret` VARCHAR(255) NOT NULL AFTER `cf_twitter_key`,
+                    ADD `cf_me2day_key` VARCHAR(255) NOT NULL AFTER `cf_twitter_secret` ", true);
+}
+
 // uniqid 테이블이 없을 경우 생성
 if(!sql_query(" select uq_id from {$g4['uniqid_table']} limit 1 ", false)) {
    sql_query(" CREATE TABLE IF NOT EXISTS `{$g4['uniqid_table']}` (
@ -68,6 +82,7 @@ $pg_anchor = '<ul class="anchor">
    <li><a href="#anc_cf_article_mail">글작성메일</a></li>
    <li><a href="#anc_cf_join_mail">가입메일</a></li>
    <li><a href="#anc_cf_vote_mail">투표메일</a></li>
+    <li><a href="#anc_cf_sns">SNS</a></li>
    <li><a href="#anc_cf_extra">여분필드</a></li>
 </ul>';
 ?>
@ -701,6 +716,56 @@ $pg_anchor = '<ul class="anchor">
    </table>
 </section>

+
+<section id="anc_cf_sns" class="cbox">
+    <h2>소셜네트워크서비스(SNS : Social Network Service)</h2>
+    <?php echo $pg_anchor ?>
+
+    <table class="frm_tbl">
+    <colgroup>
+        <col class="grid_3">
+        <col class="grid_6">
+        <col class="grid_3">
+        <col class="grid_6">
+    </colgroup>
+    <tbody>
+    <tr>
+        <th scope="row"><label for="cf_facebook_appid">페이스북 앱 ID</label></th>
+        <td>
+            <input type="text" name="cf_facebook_appid" value="<?php echo $config['cf_facebook_appid'] ?>" id="cf_facebook_appid" class="frm_input"> <a href="https://developers.facebook.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
+        </td>
+        <th scope="row"><label for="cf_facebook_secret">페이스북 앱 Secret</label></th>
+        <td>
+            <input type="text" name="cf_facebook_secret" value="<?php echo $config['cf_facebook_secret'] ?>" id="cf_facebook_secret" class="frm_input" size="35">
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="cf_twitter_key">트위터 컨슈머 Key</label></th>
+        <td>
+            <input type="text" name="cf_twitter_key" value="<?php echo $config['cf_twitter_key'] ?>" id="cf_twitter_key" class="frm_input"> <a href="https://dev.twitter.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
+        </td>
+        <th scope="row"><label for="cf_twitter_secret">트위터 컨슈머 Secret</label></th>
+        <td>
+            <input type="text" name="cf_twitter_secret" value="<?php echo $config['cf_twitter_secret'] ?>" id="cf_twitter_secret" class="frm_input" size="35">
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="cf_me2day_key">미투데이 Key</label></th>
+        <td colspan="3">
+            <input type="text" name="cf_me2day_key" value="<?php echo $config['cf_me2day_key'] ?>" id="cf_me2day_key" class="frm_input"> <a href="http://me2day.net/me2/app/get_appkey" target="_blank" class="btn_frmline">앱 등록하기</a>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="cf_googl_shorturl_apikey">구글 짧은주소 API Key</label></th>
+        <td>
+            <input type="text" name="cf_googl_shorturl_apikey" value="<?php echo $config['cf_googl_shorturl_apikey'] ?>" id="cf_googl_shorturl_apikey" class="frm_input"> <a href="http://code.google.com/apis/console/" target="_blank" class="btn_frmline">API Key 등록하기</a>
+        </td>
+    </tr>
+    </tbody>
+    </table>
+</section>
+
+
 <section id="anc_cf_extra" class="cbox">
    <h2>여분필드 기본 설정</h2>
    <?php echo $pg_anchor ?>
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@ -96,13 +96,19 @@ $sql = " update {$g4['config_table']}
                 cf_privacy = '{$_POST['cf_privacy']}',
                 cf_open_modify = '{$_POST['cf_open_modify']}',
                 cf_memo_send_point = '{$_POST['cf_memo_send_point']}',
-                 cf_kcpcert_use = '{$_POST['cf_kcpcert_use']}',
-                 cf_kcpcert_site_cd = '{$_POST['cf_kcpcert_site_cd']}',
                 cf_mobile_new_skin = '{$_POST['cf_mobile_new_skin']}',
                 cf_mobile_search_skin = '{$_POST['cf_mobile_search_skin']}',
                 cf_mobile_connect_skin = '{$_POST['cf_mobile_connect_skin']}',
                 cf_mobile_member_skin = '{$_POST['cf_mobile_member_skin']}',
                 cf_gcaptcha_mp3 = '{$_POST['cf_gcaptcha_mp3']}',
+                 cf_googl_shorturl_apikey = '{$_POST['cf_googl_shorturl_apikey']}',
+                 cf_kcpcert_site_cd = '{$_POST['cf_kcpcert_site_cd']}',
+                 cf_kcpcert_use = '{$_POST['cf_kcpcert_use']}',
+                 cf_facebook_appid = '{$_POST['cf_facebook_appid']}',
+                 cf_facebook_secret = '{$_POST['cf_facebook_secret']}',
+                 cf_twitter_key = '{$_POST['cf_twitter_key']}',
+                 cf_twitter_secret = '{$_POST['cf_twitter_secret']}',
+                 cf_me2day_key = '{$_POST['cf_me2day_key']}',
                 cf_1_subj = '{$_POST['cf_1_subj']}',
                 cf_2_subj = '{$_POST['cf_2_subj']}',
                 cf_3_subj = '{$_POST['cf_3_subj']}',
--- a/bbs/sns_send.php
+++ b/bbs/sns_send.php
@ -0,0 +1,27 @@
+<?php
+include_once("./_common.php");
+
+$title    =  str_replace('\"', '"',$_REQUEST['title']);
+$short_url = googl_short_url($_REQUEST['longurl']);
+$title_url = $title.' : '.$short_url;
+
+switch($_REQUEST['sns']) {
+    case 'facebook' :
+        header("Location:http://www.facebook.com/sharer/sharer.php?s=100&p[url]=".$short_url."&p[title]=".$title);
+        break;
+    case 'twitter' :
+        header("Location:http://twitter.com/home?status=".$title_url);
+        break;
+    case 'me2day' :
+        header("Location:http://me2day.net/posts/new?new_post[body]=".$title_url);
+        break;
+    case 'yozm' :
+        header("Location:http://yozm.daum.net/api/popup/prePost?sourceid=41&prefix=".$title_url);
+        break;
+    case 'gplus' :
+        header("Location:https://plus.google.com/share?url=".$short_url);
+        break;
+    default :
+        echo 'Error';
+}
+?>
--- a/bbs/write_comment_update.php
+++ b/bbs/write_comment_update.php
@ -143,7 +143,7 @@ if ($w == 'c') // 댓글 입력
                     wr_is_comment = 1,
                     wr_comment = '$tmp_comment',
                     wr_comment_reply = '$tmp_comment_reply',
-                     wr_subject = '$wr_subject',
+                     wr_subject = '',
                     wr_content = '$wr_content',
                     mb_id = '$mb_id',
                     wr_password = '$wr_password',
@ -167,8 +167,13 @@ 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_last = '".G4_TIME_YMDHIS."' where wr_id = '$wr_id' ");
+    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' ");

    // 새글 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']}' ) ");
@ -179,6 +184,9 @@ if ($w == 'c') // 댓글 입력
    // 포인트 부여
    insert_point($member['mb_id'], $board['bo_comment_point'], "{$board['bo_subject']} {$wr_id}-{$comment_id} 댓글쓰기", $bo_table, $comment_id, '댓글');

+    
+    $wr_subject = get_text(stripslashes($wr['wr_subject']));
+
    // 메일발송 사용
    if ($config['cf_email_use'] && $board['bo_use_email'])
    {
@ -187,7 +195,6 @@ if ($w == 'c') // 댓글 입력
        $group_admin = get_admin('group');
        $board_admin = get_admin('board');

-        $wr_subject = get_text(stripslashes($wr['wr_subject']));
        $wr_content = nl2br(get_text(stripslashes("원글\n{$wr['wr_subject']}\n\n\n댓글\n$wr_content")));

        $warr = array( ''=>'입력', 'u'=>'수정', 'r'=>'답변', 'c'=>'댓글 ', 'cu'=>'댓글 수정' );
--- a/bbs/write_comment_update.sns.php
+++ b/bbs/write_comment_update.sns.php
@ -0,0 +1,87 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
+
+if (!$board['bo_use_sns']) return;
+
+set_cookie('ck_facebook_checked', false, 86400*31);
+set_cookie('ck_twitter_checked' , false, 86400*31);
+set_cookie('ck_me2day_checked'  , false, 86400*31);
+
+//============================================================================
+// 페이스북
+//----------------------------------------------------------------------------
+if ($_POST['facebook_checked']) {
+    include_once(G4_SNS_PATH."/facebook/src/facebook.php");
+
+    $facebook = new Facebook(array(
+        'appId'  => $config['cf_facebook_appid'],
+        'secret' => $config['cf_facebook_secret']
+    ));
+
+    $user = $facebook->getUser();
+
+    if ($user) {
+        try {
+            $link = G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr['wr_parent'].'&#c_'.$comment_id;
+            $attachment = array(
+                'message'       => stripslashes($wr_content),
+                'name'          => $wr_subject,
+                'link'          => $link,
+                'description'   => stripslashes(strip_tags($wr['wr_content']))
+            );
+            // 등록
+            $facebook->api('/me/feed/', 'post', $attachment);
+            //$errors = error_get_last(); print_r2($errros); exit;
+
+            set_cookie('ck_facebook_checked', true, 86400*31);
+        } catch(FacebookApiException $e) {
+            ;;;
+        }
+    }
+
+    $wr_sns[] = "fb";
+}
+//============================================================================
+
+
+//============================================================================
+// 트위터
+//----------------------------------------------------------------------------
+if ($_POST['twitter_checked']) {
+    include_once(G4_SNS_PATH."/twitter/twitteroauth/twitteroauth.php");
+    include_once(G4_SNS_PATH."/twitter/twitterconfig.php");
+    
+    if ( !(empty($_SESSION['access_token']) || empty($_SESSION['access_token']['oauth_token']) || empty($_SESSION['access_token']['oauth_token_secret'])) ) {
+        $post = googl_short_url($comment_url).' '.$wr_content;
+        $post = utf8_strcut($post, 140);
+
+        $access_token = $_SESSION['access_token'];
+        $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
+        // 등록
+        $connection->post('statuses/update', array('status' => $post));
+    
+        set_cookie('ck_twitter_checked', true, 86400*31);
+    }
+
+    $wr_sns[] = "tw";
+}
+//============================================================================
+
+
+//============================================================================
+// 미투데이
+//----------------------------------------------------------------------------
+if ($_POST['me2day_checked']) {
+    if (!empty($_SESSION['me2day']['user_id']) && !empty($_SESSION['me2day']['user_key'])) {
+        $user_id  = $_SESSION['me2day']['user_id'];
+        $user_key = $_SESSION['me2day']['user_key'];
+        $auth_key = "12345678" . md5("12345678" . $user_key);
+        $result = file_get_contents("http://me2day.net/api/create_post/{$user_id}.json?uid={$user_id}&ukey={$auth_key}&akey=".$config['cf_me2day_key']."&post[body]=".urlencode($wr_content));
+
+        set_cookie('ck_me2day_checked', true, 86400*31);
+    }
+
+    $wr_sns[] = "me";
+}
+//============================================================================
+?>
--- a/common.php
+++ b/common.php
@ -134,8 +134,8 @@ div a {display:block;margin:50px auto 10px;width:170px;text-align:center}
 //==============================================================================
 // SESSION 설정
 //------------------------------------------------------------------------------
-ini_set("session.use_trans_sid", 0);    // PHPSESSID를 자동으로 넘기지 않음
-ini_set("url_rewriter.tags",""); // 링크에 PHPSESSID가 따라다니는것을 무력화함 (해뜰녘님께서 알려주셨습니다.)
+@ini_set("session.use_trans_sid", 0);    // PHPSESSID를 자동으로 넘기지 않음
+@ini_set("url_rewriter.tags",""); // 링크에 PHPSESSID가 따라다니는것을 무력화함 (해뜰녘님께서 알려주셨습니다.)

 session_save_path(G4_DATA_PATH.'/session');

@ -143,15 +143,6 @@ if (isset($SESSION_CACHE_LIMITER))
    @session_cache_limiter($SESSION_CACHE_LIMITER);
 else
    @session_cache_limiter("no-cache, must-revalidate");
-//==============================================================================
-
-
-//==============================================================================
-// 공용 변수
-//------------------------------------------------------------------------------
-// 기본환경설정
-// 기본적으로 사용하는 필드만 얻은 후 상황에 따라 필드를 추가로 얻음
-$config = sql_fetch(" select * from {$g4['config_table']} ");

 ini_set("session.cache_expire", 180); // 세션 캐쉬 보관시간 (분)
 ini_set("session.gc_maxlifetime", 10800); // session data의 garbage collection 존재 기간을 지정 (초)
@ -162,6 +153,15 @@ session_set_cookie_params(0, '/');
 ini_set("session.cookie_domain", G4_COOKIE_DOMAIN);

@session_start();
+//==============================================================================
+
+
+//==============================================================================
+// 공용 변수
+//------------------------------------------------------------------------------
+// 기본환경설정
+// 기본적으로 사용하는 필드만 얻은 후 상황에 따라 필드를 추가로 얻음
+$config = sql_fetch(" select * from {$g4['config_table']} ");

 define('G4_HTTP_BBS_URL',   https_url(G4_BBS_DIR, false));
 define('G4_HTTPS_BBS_URL',  https_url(G4_BBS_DIR, true));
--- a/config.php
+++ b/config.php
@ -48,7 +48,9 @@ define('G4_SKIN_DIR',       'skin');
 define('G4_GCAPTCHA_DIR',   'gcaptcha');
 define('G4_CKEDITOR_DIR',   'ckeditor');
 define('G4_MOBILE_DIR',     'mobile');
+
 define('G4_KCPCERT_DIR',    'kcpcert');
+
 define('G4_SNS_DIR',        'sns');
 define('G4_SYNDI_DIR',      'syndi');

@ -94,7 +96,9 @@ define('G4_PLUGIN_PATH',    G4_PATH.'/'.G4_PLUGIN_DIR);
 define('G4_SKIN_PATH',      G4_PATH.'/'.G4_SKIN_DIR);
 define('G4_GCAPTCHA_PATH',  G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR);
 define('G4_CKEDITOR_PATH',  G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR);
+
 define('G4_KCPCERT_PATH',   G4_PLUGIN_PATH.'/'.G4_KCPCERT_DIR);
+
 define('G4_SNS_PATH',       G4_PLUGIN_PATH.'/'.G4_SNS_DIR);
 define('G4_SYNDI_PATH',     G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR);
 define('G4_MOBILE_PATH',    G4_PATH.'/'.G4_MOBILE_DIR);
@ -128,7 +132,6 @@ define('G4_SPECIAL',        64); // 특수문자
 // 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT']
 define('G4_MOBILE_AGENT',   'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony');

-
 /********************
    기타 상수
 ********************/
--- a/css/admin.css
+++ b/css/admin.css
@ -2,7 +2,7 @@

 /* 초기화 */
 html {overflow-y:scroll}
-body {margin:0;padding:0;background:#f5f6fa;font-size:0.75em;font-family:"dotum"}
+body {margin:0;padding:0;background:#f5f6fa;color:#000;font-size:0.75em;font-family:"dotum"}
 html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0}
 h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:"dotum"}
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
--- a/css/default.css
+++ b/css/default.css
@ -2,7 +2,7 @@

 /* 초기화 */
 html {overflow-y:scroll}
-body {margin:0;padding:0;background:#f9fafe;font-size:0.75em;font-family:"dotum"}
+body {margin:0;padding:0;background:#f9fafe;color:#000;font-size:0.75em;font-family:"dotum"}
 html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0}
 h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:"dotum"}
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
--- a/css/mobile.css
+++ b/css/mobile.css
@ -2,22 +2,14 @@

 /* 초기화 */
 html {overflow-y:scroll}
+
 body {margin:0;padding:0;background:#fff;color:#000;font-size:1em;font-family:"dotum"}
+
 html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0}
 h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:"dotum"}
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
 header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
-<<<<<<< HEAD
-label, input, select, img {vertical-align:middle}
-input {margin:0;padding:0;border-radius:0;font-family:"dotum"}
-button {border-radius:0;font-size:1em;font-family:"dotum"}
-input[type=text],
-input[type=password],
-input[type=submit],
-input[type=image],
-button {border-radius:0 !important;font-size:1em} /* 모바일에서만 사용 */
-p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all}
-=======
+
 legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
 label, input, select, img {vertical-align:middle}
 input,button {margin:0;padding:0}
@ -25,7 +17,7 @@ input[type=text], input[type=password], input[type=submit], input[type=image], b
 select, textarea {font-size:1em}
 textarea {border-radius:0;-webkit-appearance:none}
 p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all}
->>>>>>> g4s
+
 hr {display:none}
 pre {overflow-x:scroll;font-size:1.1em}
 a:link,
--- a/extend/.htaccess
+++ b/extend/.htaccess
@ -1 +1 @@
-# .htaccess
+# .htaccess
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -998,7 +998,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
                if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
                    $tmp_name = $tmp_name.' '.$name;
            } else { 
-                $tmp_name = $tmp_name.' '.$name; 
+                  $tmp_name = $tmp_name." ".$name; 
            } 
        } else { 
            $tmp_name = $tmp_name.' '.$name; 
@ -2038,4 +2038,37 @@ function board_notice($bo_notice, $wr_id, $insert=false)
    }
    return implode(",", $notice_array);
 }
+
+
+// goo.gl 짧은주소 만들기
+function googl_short_url($longUrl) 
+{
+    global $config;
+
+    // Get API key from : http://code.google.com/apis/console/
+    // URL Shortener API ON
+    $apiKey = $config['cf_googl_shorturl_apikey'];
+
+    $postData = array('longUrl' => $longUrl, 'key' => $apiKey);
+    $jsonData = json_encode($postData);
+
+    $curlObj = curl_init();
+
+    curl_setopt($curlObj, CURLOPT_URL, 'https://www.googleapis.com/urlshortener/v1/url');
+    curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($curlObj, CURLOPT_SSL_VERIFYPEER, 0);
+    curl_setopt($curlObj, CURLOPT_HEADER, 0);
+    curl_setopt($curlObj, CURLOPT_HTTPHEADER, array('Content-type:application/json'));
+    curl_setopt($curlObj, CURLOPT_POST, 1);
+    curl_setopt($curlObj, CURLOPT_POSTFIELDS, $jsonData);
+
+    $response = curl_exec($curlObj);
+
+    //change the response json string to object
+    $json = json_decode($response);
+
+    curl_close($curlObj);
+
+    return $json->id;
+}
 ?>
--- a/plugin/kcp/kcpcert.head.skin.php
+++ b/plugin/kcp/kcpcert.head.skin.php
@ -0,0 +1,41 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// 휴대폰번호 체크
+if ($msg = valid_mb_hp($mb_hp))   alert($msg, "", true, true);
+if ($msg = exist_mb_hp($mb_hp, $mb_id))   alert($msg, "", true, true);
+
+$reg_mb_hp = preg_replace("/[^0-9]/", "", trim($_POST['mb_hp']));
+
+/* ======================================================================================================= */
+/* = 휴대폰인증 및 성인인증                                                                              = */
+/* ======================================================================================================= */
+if($w == '') {
+    // 본인인증체크
+    $kcpcert_no = get_session('ss_kcpcert_no');
+    if(!$kcpcert_no)
+        alert('휴대폰인증이 되지 않았습니다. 휴대폰인증을 해주세요.', '', true, true);
+
+    // 본인인증 hash 체크
+    $reg_hash = md5($reg_mb_hp.$mb_name.$kcpcert_no);
+    if(get_session('ss_kcpcert_hash') != $reg_hash)
+        alert('이름 또는 휴대폰번호가 올바르지 않습니다. 정상적인 방법으로 이용해 주세요.', '', true, true);
+
+} else if($w == 'u') {
+    // 휴대폰번호 변경체크
+    $old_hp = preg_replace("/[^0-9]/", "", trim($_POST['old_mb_hp']));
+
+    if($old_hp !== $reg_mb_hp) {
+        // 본인인증체크
+        $kcpcert_no = get_session('ss_kcpcert_no');
+        if(!$kcpcert_no)
+            alert('휴대폰번호가 변경됐습니다. 휴대폰인증을 해주세요.', '', true, true);
+
+        // 본인인증 hash 체크
+        $reg_hash = md5($reg_mb_hp.$mb_name.$kcpcert_no);
+        if(get_session('ss_kcpcert_hash') != $reg_hash)
+            alert('이름 또는 휴대폰인증 정보가 올바르지 않습니다. 정상적인 방법으로 이용해 주세요.', '', true, true);
+    }
+}
+/* ======================================================================================================= */
+?>
--- a/plugin/sns/facebook/.gitignore
+++ b/plugin/sns/facebook/.gitignore
@ -0,0 +1 @@
+/coverage/
--- a/plugin/sns/facebook/.travis.yml
+++ b/plugin/sns/facebook/.travis.yml
@ -0,0 +1,5 @@
+language: php
+php:
+  - 5.3
+  - 5.4
+script: phpunit --stderr --bootstrap tests/bootstrap.php tests/tests.php
--- a/plugin/sns/facebook/_common.php
+++ b/plugin/sns/facebook/_common.php
@ -0,0 +1,3 @@
+<?php
+include_once("../../../common.php");
+?>
--- a/plugin/sns/facebook/callback.php
+++ b/plugin/sns/facebook/callback.php
@ -0,0 +1,59 @@
+<?php
+include_once("./_common.php");
+include_once(G4_SNS_PATH."/facebook/src/facebook.php");
+
+$facebook = new Facebook(array(
+    'appId'  => $config['cf_facebook_appid'],
+    'secret' => $config['cf_facebook_secret']
+));
+
+$user = $facebook->getUser();
+
+if ($user) {
+    try {
+        $user_profile = $facebook->api('/me');
+    } catch (FacebookApiException $e) {
+        error_log($e);
+        $user = NULL;
+    }
+}
+
+$g4['title'] = '페이스북 콜백';
+include_once(G4_PATH.'/head.sub.php');
+
+if ($user) {
+    $sns_name   = $user_profile['name'];
+    $g4_sns_url = G4_SNS_URL;
+
+    set_cookie('ck_sns_name', $sns_name, 86400);
+
+    echo <<<EOT
+    <script>
+    $(function() {
+        document.write("<strong>페이스북 승인이 되었습니다.</strong>");
+
+        var opener = window.opener;
+        opener.$("#wr_name").val("{$sns_name}");
+        opener.$("#facebook_icon").attr("src", "{$g4_sns_url}/icon/facebook.png");
+        opener.$("#facebook_checked").attr("disabled", false);
+        opener.$("#facebook_checked").attr("checked", true);
+        window.close();
+    });
+    </script>
+EOT;
+
+} else {
+
+    echo <<<EOT
+    <script>
+    $(function() {
+        alert("페이스북 승인이 되지 않았습니다.");
+        window.close();
+    });
+    </script>
+EOT;
+
+}
+
+include_once(G4_PATH.'/tail.sub.php');
+?>
--- a/plugin/sns/facebook/changelog.md
+++ b/plugin/sns/facebook/changelog.md
@ -0,0 +1,28 @@
+Facebook PHP SDK (v.3.0.0)
+==========================
+
+The new PHP SDK (v3.0.0) is a major upgrade to the older one (v2.2.x):
+
+- Uses OAuth authentication flows instead of our legacy authentication flow
+- Consists of two classes. The first (class BaseFacebook) maintains the core of the upgrade, and the second one (class Facebook) is a small subclass that uses PHP sessions to store the user id and access token.
+
+If you’re currently using the PHP SDK (v2.2.x) for authentication, you will recall that the login code looked like this:
+
+     $facebook = new Facebook(…);
+     $session = $facebook->getSession();
+     if ($session) {
+       // proceed knowing you have a valid user session
+     } else {
+       // proceed knowing you require user login and/or authentication
+     }
+
+The login code is now:
+
+     $facebook = new Facebook(…);
+     $user = $facebook->getUser();
+     if ($user) {
+       // proceed knowing you have a logged in user who's authenticated
+     } else {
+       // proceed knowing you require user login and/or authentication
+     }
+
--- a/plugin/sns/facebook/composer.json
+++ b/plugin/sns/facebook/composer.json
@ -0,0 +1,22 @@
+{
+    "name": "facebook/php-sdk",
+    "description": "Facebook PHP SDK",
+    "keywords": ["facebook", "sdk"],
+    "type": "library",
+    "homepage": "https://github.com/facebook/facebook-php-sdk",
+    "license": "Apache2",
+    "authors": [
+        {
+            "name": "Facebook",
+            "homepage": "https://github.com/facebook/facebook-php-sdk/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.2.0",
+        "ext-curl": "*",
+        "ext-json": "*"
+    },
+    "autoload": {
+        "classmap": ["src"]
+    }
+}
--- a/plugin/sns/facebook/examples/example.php
+++ b/plugin/sns/facebook/examples/example.php
@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+require '../src/facebook.php';
+
+// Create our Application instance (replace this with your appId and secret).
+$facebook = new Facebook(array(
+  'appId'  => '119146498278078',
+  'secret' => '6ffd7e325e2b4fbd83a2eebf9c6f33f9',
+));
+
+// Get User ID
+$user = $facebook->getUser();
+
+// We may or may not have this data based on whether the user is logged in.
+//
+// If we have a $user id here, it means we know the user is logged into
+// Facebook, but we don't know if the access token is valid. An access
+// token is invalid if the user logged out of Facebook.
+
+if ($user) {
+  try {
+    // Proceed knowing you have a logged in user who's authenticated.
+    $user_profile = $facebook->api('/me');
+  } catch (FacebookApiException $e) {
+    error_log($e);
+    $user = null;
+  }
+}
+
+// Login or logout url will be needed depending on current user state.
+if ($user) {
+  $logoutUrl = $facebook->getLogoutUrl();
+} else {
+  $loginUrl = $facebook->getLoginUrl();
+}
+
+// This call will always work since we are fetching public data.
+$naitik = $facebook->api('/naitik');
+
+?>
+<!doctype html>
+<html xmlns:fb="http://www.facebook.com/2008/fbml">
+  <head>
+    <title>php-sdk</title>
+    <style>
+      body {
+        font-family: 'Lucida Grande', Verdana, Arial, sans-serif;
+      }
+      h1 a {
+        text-decoration: none;
+        color: #3b5998;
+      }
+      h1 a:hover {
+        text-decoration: underline;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>php-sdk</h1>
+
+    <?php if ($user): ?>
+      <a href="<?php echo $logoutUrl; ?>">Logout</a>
+    <?php else: ?>
+      <div>
+        Login using OAuth 2.0 handled by the PHP SDK:
+        <a href="<?php echo $loginUrl; ?>">Login with Facebook</a>
+      </div>
+    <?php endif ?>
+
+    <h3>PHP Cookie</h3>
+    <pre><?php print_r($_COOKIE); ?></pre>
+
+    <h3>PHP Session</h3>
+    <pre><?php print_r($_SESSION); ?></pre>
+
+    <?php if ($user): ?>
+      <h3>You</h3>
+      <img src="https://graph.facebook.com/<?php echo $user; ?>/picture">
+
+      <h3>Your User Object (/me)</h3>
+      <pre><?php print_r($user_profile); ?></pre>
+    <?php else: ?>
+      <strong><em>You are not Connected.</em></strong>
+    <?php endif ?>
+
+    <h3>Public profile of Naitik</h3>
+    <img src="https://graph.facebook.com/naitik/picture">
+    <?php echo $naitik['name']; ?>
+  </body>
+</html>
--- a/plugin/sns/facebook/examples/with_js_sdk.php
+++ b/plugin/sns/facebook/examples/with_js_sdk.php
@ -0,0 +1,62 @@
+<?php
+
+require '../src/facebook.php';
+
+$facebook = new Facebook(array(
+  'appId'  => '119146498278078',
+  'secret' => '6ffd7e325e2b4fbd83a2eebf9c6f33f9',
+));
+
+// See if there is a user from a cookie
+$user = $facebook->getUser();
+
+if ($user) {
+  try {
+    // Proceed knowing you have a logged in user who's authenticated.
+    $user_profile = $facebook->api('/me');
+  } catch (FacebookApiException $e) {
+    echo '<pre>'.htmlspecialchars(print_r($e, true)).'</pre>';
+    $user = null;
+  }
+}
+
+?>
+<!DOCTYPE html>
+<html xmlns:fb="http://www.facebook.com/2008/fbml">
+  <body>
+    <h3>PHP Cookie</h3>
+    <pre><?php print_r($_COOKIE); ?></pre>
+
+    <?php if ($user) { ?>
+      Your user profile is
+      <pre>
+        <?php print htmlspecialchars(print_r($user_profile, true)) ?>
+      </pre>
+    <?php } else { ?>
+      <fb:login-button></fb:login-button>
+    <?php } ?>
+    <div id="fb-root"></div>
+    <script>
+      window.fbAsyncInit = function() {
+        FB.init({
+          appId: '<?php echo $facebook->getAppID() ?>',
+          cookie: true,
+          xfbml: true,
+          oauth: true
+        });
+        FB.Event.subscribe('auth.login', function(response) {
+          window.location.reload();
+        });
+        FB.Event.subscribe('auth.logout', function(response) {
+          window.location.reload();
+        });
+      };
+      (function() {
+        var e = document.createElement('script'); e.async = true;
+        e.src = document.location.protocol +
+          '//connect.facebook.net/en_US/all.js';
+        document.getElementById('fb-root').appendChild(e);
+      }());
+    </script>
+  </body>
+</html>
--- a/plugin/sns/facebook/readme.md
+++ b/plugin/sns/facebook/readme.md
@ -0,0 +1,85 @@
+Facebook PHP SDK (v.3.2.2)
+
+The [Facebook Platform](http://developers.facebook.com/) is
+a set of APIs that make your app more social.
+
+This repository contains the open source PHP SDK that allows you to
+access Facebook Platform from your PHP app. Except as otherwise noted,
+the Facebook PHP SDK is licensed under the Apache Licence, Version 2.0
+(http://www.apache.org/licenses/LICENSE-2.0.html).
+
+
+Usage
+-----
+
+The [examples][examples] are a good place to start. The minimal you'll need to
+have is:
+
+    require 'facebook-php-sdk/src/facebook.php';
+
+    $facebook = new Facebook(array(
+      'appId'  => 'YOUR_APP_ID',
+      'secret' => 'YOUR_APP_SECRET',
+    ));
+
+    // Get User ID
+    $user = $facebook->getUser();
+
+To make [API][API] calls:
+
+    if ($user) {
+      try {
+        // Proceed knowing you have a logged in user who's authenticated.
+        $user_profile = $facebook->api('/me');
+      } catch (FacebookApiException $e) {
+        error_log($e);
+        $user = null;
+      }
+    }
+
+Login or logout url will be needed depending on current user state.
+
+    if ($user) {
+      $logoutUrl = $facebook->getLogoutUrl();
+    } else {
+      $loginUrl = $facebook->getLoginUrl();
+    }
+
+[examples]: http://github.com/facebook/facebook-php-sdk/blob/master/examples/example.php
+[API]: http://developers.facebook.com/docs/api
+
+
+Tests
+-----
+
+In order to keep us nimble and allow us to bring you new functionality, without
+compromising on stability, we have ensured full test coverage of the SDK.
+We are including this in the open source repository to assure you of our
+commitment to quality, but also with the hopes that you will contribute back to
+help keep it stable. The easiest way to do so is to file bugs and include a
+test case.
+
+The tests can be executed by using this command from the base directory:
+
+    phpunit --stderr --bootstrap tests/bootstrap.php tests/tests.php
+
+
+Contributing
+===========
+For us to accept contributions you will have to first have signed the
+[Contributor License Agreement](https://developers.facebook.com/opensource/cla).
+
+When commiting, keep all lines to less than 80 characters, and try to
+follow the existing style.
+
+Before creating a pull request, squash your commits into a single commit.
+
+Add the comments where needed, and provide ample explanation in the
+commit message.
+
+
+Report Issues/Bugs
+===============
+[Bugs](https://developers.facebook.com/bugs)
+
+[Questions](http://facebook.stackoverflow.com)
--- a/plugin/sns/facebook/src/base_facebook.php
+++ b/plugin/sns/facebook/src/base_facebook.php
--- a/plugin/sns/facebook/src/facebook.php
+++ b/plugin/sns/facebook/src/facebook.php
@ -0,0 +1,160 @@
+<?php
+/**
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+require_once "base_facebook.php";
+
+/**
+ * Extends the BaseFacebook class with the intent of using
+ * PHP sessions to store user ids and access tokens.
+ */
+class Facebook extends BaseFacebook
+{
+  const FBSS_COOKIE_NAME = 'fbss';
+
+  // We can set this to a high number because the main session
+  // expiration will trump this.
+  const FBSS_COOKIE_EXPIRE = 31556926; // 1 year
+
+  // Stores the shared session ID if one is set.
+  protected $sharedSessionID;
+
+  /**
+   * Identical to the parent constructor, except that
+   * we start a PHP session to store the user ID and
+   * access token if during the course of execution
+   * we discover them.
+   *
+   * @param Array $config the application configuration. Additionally
+   * accepts "sharedSession" as a boolean to turn on a secondary
+   * cookie for environments with a shared session (that is, your app
+   * shares the domain with other apps).
+   * @see BaseFacebook::__construct in facebook.php
+   */
+  public function __construct($config) {
+    if (!session_id()) {
+      session_start();
+    }
+    parent::__construct($config);
+    if (!empty($config['sharedSession'])) {
+      $this->initSharedSession();
+    }
+  }
+
+  protected static $kSupportedKeys =
+    array('state', 'code', 'access_token', 'user_id');
+
+  protected function initSharedSession() {
+    $cookie_name = $this->getSharedSessionCookieName();
+    if (isset($_COOKIE[$cookie_name])) {
+      $data = $this->parseSignedRequest($_COOKIE[$cookie_name]);
+      if ($data && !empty($data['domain']) &&
+          self::isAllowedDomain($this->getHttpHost(), $data['domain'])) {
+        // good case
+        $this->sharedSessionID = $data['id'];
+        return;
+      }
+      // ignoring potentially unreachable data
+    }
+    // evil/corrupt/missing case
+    $base_domain = $this->getBaseDomain();
+    $this->sharedSessionID = md5(uniqid(mt_rand(), true));
+    $cookie_value = $this->makeSignedRequest(
+      array(
+        'domain' => $base_domain,
+        'id' => $this->sharedSessionID,
+      )
+    );
+    $_COOKIE[$cookie_name] = $cookie_value;
+    if (!headers_sent()) {
+      $expire = time() + self::FBSS_COOKIE_EXPIRE;
+      setcookie($cookie_name, $cookie_value, $expire, '/', '.'.$base_domain);
+    } else {
+      // @codeCoverageIgnoreStart
+      self::errorLog(
+        'Shared session ID cookie could not be set! You must ensure you '.
+        'create the Facebook instance before headers have been sent. This '.
+        'will cause authentication issues after the first request.'
+      );
+      // @codeCoverageIgnoreEnd
+    }
+  }
+
+  /**
+   * Provides the implementations of the inherited abstract
+   * methods.  The implementation uses PHP sessions to maintain
+   * a store for authorization codes, user ids, CSRF states, and
+   * access tokens.
+   */
+  protected function setPersistentData($key, $value) {
+    if (!in_array($key, self::$kSupportedKeys)) {
+      self::errorLog('Unsupported key passed to setPersistentData.');
+      return;
+    }
+
+    $session_var_name = $this->constructSessionVariableName($key);
+    $_SESSION[$session_var_name] = $value;
+  }
+
+  protected function getPersistentData($key, $default = false) {
+    if (!in_array($key, self::$kSupportedKeys)) {
+      self::errorLog('Unsupported key passed to getPersistentData.');
+      return $default;
+    }
+
+    $session_var_name = $this->constructSessionVariableName($key);
+    return isset($_SESSION[$session_var_name]) ?
+      $_SESSION[$session_var_name] : $default;
+  }
+
+  protected function clearPersistentData($key) {
+    if (!in_array($key, self::$kSupportedKeys)) {
+      self::errorLog('Unsupported key passed to clearPersistentData.');
+      return;
+    }
+
+    $session_var_name = $this->constructSessionVariableName($key);
+    unset($_SESSION[$session_var_name]);
+  }
+
+  protected function clearAllPersistentData() {
+    foreach (self::$kSupportedKeys as $key) {
+      $this->clearPersistentData($key);
+    }
+    if ($this->sharedSessionID) {
+      $this->deleteSharedSessionCookie();
+    }
+  }
+
+  protected function deleteSharedSessionCookie() {
+    $cookie_name = $this->getSharedSessionCookieName();
+    unset($_COOKIE[$cookie_name]);
+    $base_domain = $this->getBaseDomain();
+    setcookie($cookie_name, '', 1, '/', '.'.$base_domain);
+  }
+
+  protected function getSharedSessionCookieName() {
+    return self::FBSS_COOKIE_NAME . '_' . $this->getAppId();
+  }
+
+  protected function constructSessionVariableName($key) {
+    $parts = array('fb', $this->getAppId(), $key);
+    if ($this->sharedSessionID) {
+      array_unshift($parts, $this->sharedSessionID);
+    }
+    return implode('_', $parts);
+  }
+}
--- a/plugin/sns/facebook/src/fb_ca_chain_bundle.crt
+++ b/plugin/sns/facebook/src/fb_ca_chain_bundle.crt
--- a/plugin/sns/facebook/tests/bootstrap.php
+++ b/plugin/sns/facebook/tests/bootstrap.php
@ -0,0 +1,5 @@
+<?php
+
+$base = realpath(dirname(__FILE__) . '/..');
+require "$base/src/base_facebook.php";
+require "$base/src/facebook.php";
--- a/plugin/sns/facebook/tests/tests.php
+++ b/plugin/sns/facebook/tests/tests.php
--- a/plugin/sns/icon/facebook.png
+++ b/plugin/sns/icon/facebook.png
--- a/plugin/sns/icon/facebook_off.png
+++ b/plugin/sns/icon/facebook_off.png
--- a/plugin/sns/icon/gplus.png
+++ b/plugin/sns/icon/gplus.png
--- a/plugin/sns/icon/gplus_off.png
+++ b/plugin/sns/icon/gplus_off.png
--- a/plugin/sns/icon/kakaotalk.png
+++ b/plugin/sns/icon/kakaotalk.png
--- a/plugin/sns/icon/kakaotalk_off.png
+++ b/plugin/sns/icon/kakaotalk_off.png
--- a/plugin/sns/icon/me2day.png
+++ b/plugin/sns/icon/me2day.png
--- a/plugin/sns/icon/me2day_off.png
+++ b/plugin/sns/icon/me2day_off.png
--- a/plugin/sns/icon/twitter.png
+++ b/plugin/sns/icon/twitter.png
--- a/plugin/sns/icon/twitter_off.png
+++ b/plugin/sns/icon/twitter_off.png
--- a/plugin/sns/me2day/_common.php
+++ b/plugin/sns/me2day/_common.php
@ -0,0 +1,3 @@
+<?php
+include_once("../../../common.php");
+?>
--- a/plugin/sns/me2day/callback.php
+++ b/plugin/sns/me2day/callback.php
@ -0,0 +1,52 @@
+<?php
+include_once("./_common.php");
+
+$user_id  = $_GET['user_id'];
+$user_key = $_GET['user_key'];
+$auth_key = "12345678" . md5("12345678" . $user_key);
+
+$_SESSION['me2day']['user_id']  = $user_id;
+$_SESSION['me2day']['user_key'] = $user_key;
+
+$g4['title'] = '미투데이 콜백';
+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;
+
+    set_cookie('ck_sns_name', $sns_name, 86400);
+
+    echo <<<EOT
+    <script>
+    $(function() {
+        document.write("<strong>미투데이에 승인이 되었습니다.</strong>");
+
+        var opener = window.opener;
+        opener.$("#wr_name").val("{$sns_name}");
+        opener.$("#me2day_icon").attr("src", "{$g4_sns_url}/icon/me2day.png");
+        opener.$("#me2day_checked").attr("disabled", false);
+        opener.$("#me2day_checked").attr("checked", true);
+        window.close();
+    });
+    </script>
+EOT;
+
+} else {
+
+    echo <<<EOT
+    <script>
+    $(function() {
+        alert("미투데이에 승인이 되지 않았습니다.");
+        window.close();
+    });
+    </script>
+EOT;
+
+}
+
+include_once(G4_PATH.'/tail.sub.php');
+?>
--- a/plugin/sns/twitter/.gitignore
+++ b/plugin/sns/twitter/.gitignore
@ -0,0 +1 @@
+config.php
--- a/plugin/sns/twitter/LICENSE
+++ b/plugin/sns/twitter/LICENSE
@ -0,0 +1,22 @@
+Copyright (c) 2009 Abraham Williams - http://abrah.am - abraham@poseurte.ch
+ 
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
--- a/plugin/sns/twitter/README.md
+++ b/plugin/sns/twitter/README.md
@ -0,0 +1,114 @@
+TwitterOAuth
+------------
+
+PHP library for working with Twitter's OAuth API.
+
+Flow Overview
+=============
+
+1. Build TwitterOAuth object using client credentials.
+2. Request temporary credentials from Twitter.
+3. Build authorize URL for Twitter.
+4. Redirect user to authorize URL.
+5. User authorizes access and returns from Twitter.
+6. Rebuild TwitterOAuth object with client credentials and temporary credentials.
+7. Get token credentials from Twitter.
+8. Rebuild TwitterOAuth object with client credentials and token credentials.
+9. Query Twitter API.
+
+Terminology
+===========
+
+The terminology has changed since 0.1.x to better match the draft-hammer-oauth IETF
+RFC. You can read that at http://tools.ietf.org/html/draft-hammer-oauth. Some of the
+terms will differ from those Twitter uses as well.
+
+client credentials - Consumer key/secret you get when registering an app with Twitter.
+temporary credentials - Previously known as the request token.
+token credentials - Previously known as the access token.
+
+Parameters
+==========
+
+There are a number of parameters you can modify after creating a TwitterOAuth object.
+
+Switch an existing TwitterOAuth install to use version 1.1 of the API.
+
+    $connection->$host = "https://api.twitter.com/1.1/";
+
+Custom useragent.
+
+    $connection->useragent = 'Custom useragent string';
+
+Verify Twitters SSL certificate.
+
+    $connection->ssl_verifypeer = TRUE;
+
+There are several more you can find in TwitterOAuth.php.
+
+Extended flow using example code
+================================
+
+To use TwitterOAuth with the Twitter API you need *TwitterOAuth.php*, *OAuth.php* and
+client credentials. You can get client credentials by registering your application at
+[dev.twitter.com/apps](https://dev.twitter.com/apps).
+
+Users start out on connect.php which displays the "Sign in with Twitter" image hyperlinked
+to redirect.php. This button should be displayed on your homepage in your login section. The
+client credentials are saved in config.php as `CONSUMER_KEY` and `CONSUMER_SECRET`. You can
+save a static callback URL in the app settings page, in the config file or use a dynamic
+callback URL later in step 2. In example use https://example.com/callback.php.
+
+1) When a user lands on redirect.php we build a new TwitterOAuth object using the client credentials.
+If you have your own configuration method feel free to use it instead of config.php.
+
+    $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET); // Use config.php client credentials
+    $connection = new TwitterOAuth('abc890', '123xyz');
+
+2) Using the built $connection object you will ask Twitter for temporary credentials. The `oauth_callback` value is required.
+
+    $temporary_credentials = $connection->getRequestToken(OAUTH_CALLBACK); // Use config.php callback URL.
+
+3) Now that we have temporary credentials the user has to go to Twitter and authorize the app
+to access and updates their data. You can also pass a second parameter of FALSE to not use [Sign
+in with Twitter](https://dev.twitter.com/docs/auth/sign-twitter).
+
+    $redirect_url = $connection->getAuthorizeURL($temporary_credentials); // Use Sign in with Twitter
+    $redirect_url = $connection->getAuthorizeURL($temporary_credentials, FALSE);
+
+4) You will now have a Twitter URL that you must send the user to.
+
+    https://api.twitter.com/oauth/authenticate?oauth_token=xyz123
+
+5) The user is now on twitter.com and may have to login. Once authenticated with Twitter they will
+will either have to click on allow/deny, or will be automatically redirected back to the callback.
+
+6) Now that the user has returned to callback.php and allowed access we need to build a new
+TwitterOAuth object using the temporary credentials.
+
+    $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $_SESSION['oauth_token'],
+    $_SESSION['oauth_token_secret']);
+
+7) Now we ask Twitter for long lasting token credentials. These are specific to the application
+and user and will act like password to make future requests. Normally the token credentials would
+get saved in your database but for this example we are just using sessions.
+
+    $token_credentials = $connection->getAccessToken($_REQUEST['oauth_verifier']);
+
+8) With the token credentials we build a new TwitterOAuth object.
+
+    $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $token_credentials['oauth_token'],
+    $token_credentials['oauth_token_secret']);
+
+9) And finally we can make requests authenticated as the user. You can GET, POST, and DELETE API
+methods. Directly copy the path from the API documentation and add an array of any parameter
+you wish to include for the API method such as curser or in_reply_to_status_id.
+
+    $account = $connection->get('account/verify_credentials');
+    $status = $connection->post('statuses/update', array('status' => 'Text of status here', 'in_reply_to_status_id' => 123456));
+    $status = $connection->delete('statuses/destroy/12345');
+
+Contributors
+============
+
+* [Abraham Williams](https://twitter.com/abraham) - Main developer, current maintainer.
--- a/plugin/sns/twitter/_common.php
+++ b/plugin/sns/twitter/_common.php
@ -0,0 +1,3 @@
+<?php
+include_once("../../../common.php");
+?>
--- a/plugin/sns/twitter/callback-sample.php
+++ b/plugin/sns/twitter/callback-sample.php
@ -0,0 +1,40 @@
+<?php
+/**
+ * @file
+ * Take the user when they return from Twitter. Get access tokens.
+ * Verify credentials and redirect to based on response from Twitter.
+ */
+
+/* Start session and load lib */
+session_start();
+require_once('twitteroauth/twitteroauth.php');
+require_once('config.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');
+}
+
+/* Create TwitteroAuth object with app key/secret and token key/secret from default phase */
+$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $_SESSION['oauth_token'], $_SESSION['oauth_token_secret']);
+
+/* Request access tokens from twitter */
+$access_token = $connection->getAccessToken($_REQUEST['oauth_verifier']);
+
+/* Save the access tokens. Normally these would be saved in a database for future use. */
+$_SESSION['access_token'] = $access_token;
+
+/* Remove no longer needed request tokens */
+unset($_SESSION['oauth_token']);
+unset($_SESSION['oauth_token_secret']);
+
+/* If HTTP response is 200 continue otherwise send to connect page to retry */
+if (200 == $connection->http_code) {
+  /* The user has been verified and the access tokens can be saved for future use */
+  $_SESSION['status'] = 'verified';
+  header('Location: ./index.php');
+} else {
+  /* Save HTTP status for error dialog on connnect page.*/
+  header('Location: ./clearsessions.php');
+}
--- a/plugin/sns/twitter/callback.php
+++ b/plugin/sns/twitter/callback.php
@ -0,0 +1,86 @@
+<?php
+include_once("./_common.php");
+
+/**
+ * @file
+ * Take the user when they return from Twitter. Get access tokens.
+ * Verify credentials and redirect to based on response from Twitter.
+ */
+
+/* Start session and load lib */
+//session_start();
+require_once(G4_SNS_PATH.'/twitter/twitteroauth/twitteroauth.php');
+require_once(G4_SNS_PATH.'/twitter/twitterconfig.php');
+
+//print_r2($_SESSION); print_r2($_REQUEST); exit;
+
+/* 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');
+}
+
+/* Create TwitteroAuth object with app key/secret and token key/secret from default phase */
+$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $_SESSION['oauth_token'], $_SESSION['oauth_token_secret']);
+
+/* Request access tokens from twitter */
+$access_token = $connection->getAccessToken($_REQUEST['oauth_verifier']);
+
+/* Save the access tokens. Normally these would be saved in a database for future use. */
+$_SESSION['access_token'] = $access_token;
+
+/* Remove no longer needed request tokens */
+unset($_SESSION['oauth_token']);
+unset($_SESSION['oauth_token_secret']);
+
+/*
+if (200 == $connection->http_code) {
+  $_SESSION['status'] = 'verified';
+  header('Location: ./index.php');
+} else {
+  header('Location: ./clearsessions.php');
+}
+exit;
+*/
+
+$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;
+
+    set_cookie('ck_sns_name', $sns_name, 86400);
+
+    echo <<<EOT
+    <script>
+    $(function() {
+        document.write("<strong>트위터에 승인이 되었습니다.</strong>");
+
+        var opener = window.opener;
+        opener.$("#wr_name").val("{$sns_name}");
+        opener.$("#twitter_icon").attr("src", "{$g4_sns_url}/icon/twitter.png");
+        opener.$("#twitter_checked").attr("disabled", false);
+        opener.$("#twitter_checked").attr("checked", true);
+        window.close();
+    });
+    </script>
+EOT;
+
+} else {
+
+    echo <<<EOT
+    <script>
+    $(function() {
+        alert("트위터에 승인이 되지 않았습니다.");
+        window.close();
+    });
+    </script>
+EOT;
+
+}
+
+include_once(G4_PATH.'/tail.sub.php');
+?>
--- a/plugin/sns/twitter/clearsessions.php
+++ b/plugin/sns/twitter/clearsessions.php
@ -0,0 +1,14 @@
+<?php
+include_once("./_common.php");
+
+/**
+ * @file
+ * Clears PHP sessions and redirects to the connect page.
+ */
+ 
+/* Load and clear sessions */
+session_start();
+session_destroy();
+ 
+/* Redirect to page with the connect to Twitter option. */
+header('Location: ./connect.php');
--- a/plugin/sns/twitter/config-sample.php
+++ b/plugin/sns/twitter/config-sample.php
@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @file
+ * A single location to store configuration.
+ */
+
+define('CONSUMER_KEY', 'CONSUMER_KEY_HERE');
+define('CONSUMER_SECRET', 'CONSUMER_SECRET_HERE');
+define('OAUTH_CALLBACK', 'http://example.com/twitteroauth/callback.php');
--- a/plugin/sns/twitter/connect.php
+++ b/plugin/sns/twitter/connect.php
@ -0,0 +1,22 @@
+<?php
+include_once("./_common.php");
+
+/**
+ * @file
+ * Check if consumer token is set and if so send user to get a request token.
+ */
+
+/**
+ * Exit with an error message if the CONSUMER_KEY or CONSUMER_SECRET is not defined.
+ */
+require_once(G4_SNS_PATH.'/twitter/twitterconfig.php');
+if (CONSUMER_KEY === '' || CONSUMER_SECRET === '' || CONSUMER_KEY === 'CONSUMER_KEY_HERE' || CONSUMER_SECRET === 'CONSUMER_SECRET_HERE') {
+  echo 'You need a consumer key and secret to test the sample code. Get one from <a href="https://dev.twitter.com/apps">dev.twitter.com/apps</a>';
+  exit;
+}
+
+/* Build an image link to start the redirect process. */
+$content = '<a href="./redirect.php"><img src="./images/lighter.png" alt="Sign in with Twitter"/></a>';
+ 
+/* Include HTML to display on the page. */
+include('html.inc');
--- a/plugin/sns/twitter/html.inc
+++ b/plugin/sns/twitter/html.inc
@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <title>Twitter OAuth in PHP</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    <style type="text/css">
+      img {border-width: 0}
+      * {font-family:'Lucida Grande', sans-serif;}
+    </style>
+  </head>
+  <body>
+    <div>
+      <h2>Welcome to a Twitter OAuth PHP example.</h2>
+
+      <p>This site is a basic showcase of Twitters OAuth authentication method. If you are having issues try <a href='./clearsessions.php'>clearing your session</a>.</p>
+
+      <p>
+        Links:
+        <a href='http://github.com/abraham/twitteroauth'>Source Code</a> &amp;
+        <a href='http://wiki.github.com/abraham/twitteroauth/documentation'>Documentation</a> |
+        Contact @<a href='http://twitter.com/abraham'>abraham</a>
+      </p>
+      <hr />
+      <?php if (isset($menu)) { ?>
+        <?php echo $menu; ?>
+      <?php } ?>
+    </div>
+    <?php if (isset($status_text)) { ?>
+      <?php echo '<h3>'.$status_text.'</h3>'; ?>
+    <?php } ?>
+    <p>
+      <pre>
+        <?php print_r($content); ?>
+      </pre>
+    </p>
+
+  </body>
+</html>
--- a/plugin/sns/twitter/images/darker.png
+++ b/plugin/sns/twitter/images/darker.png
--- a/plugin/sns/twitter/images/lighter.png
+++ b/plugin/sns/twitter/images/lighter.png
--- a/plugin/sns/twitter/index.php
+++ b/plugin/sns/twitter/index.php
@ -0,0 +1,35 @@
+<?php
+include_once("./_common.php");
+
+/**
+ * @file
+ * User has successfully authenticated with Twitter. Access tokens saved to session and DB.
+ */
+
+/* Load required lib files. */
+//session_start();
+require_once(G4_SNS_PATH.'/twitter/twitteroauth/twitteroauth.php');
+require_once(G4_SNS_PATH.'/twitter/twitterconfig.php');
+
+/* If access tokens are not available redirect to connect page. */
+if (empty($_SESSION['access_token']) || empty($_SESSION['access_token']['oauth_token']) || empty($_SESSION['access_token']['oauth_token_secret'])) {
+    header('Location: ./clearsessions.php');
+}
+/* Get user access tokens out of the session. */
+$access_token = $_SESSION['access_token'];
+
+/* Create a TwitterOauth object with consumer/user tokens. */
+$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
+
+/* If method is set change API call made. Test is called by default. */
+$content = $connection->get('account/verify_credentials');
+
+/* Some example calls */
+//$connection->get('users/show', array('screen_name' => 'abraham'));
+//$connection->post('statuses/update', array('status' => date(DATE_RFC822)));
+//$connection->post('statuses/destroy', array('id' => 5437877770));
+//$connection->post('friendships/create', array('id' => 9436992));
+//$connection->post('friendships/destroy', array('id' => 9436992));
+
+/* Include HTML to display on the page */
+include('html.inc');
--- a/plugin/sns/twitter/redirect.php
+++ b/plugin/sns/twitter/redirect.php
@ -0,0 +1,31 @@
+<?php
+include_once("./_common.php");
+
+/* Start session and load library. */
+//session_start();
+require_once(G4_SNS_PATH.'/twitter/twitteroauth/twitteroauth.php');
+require_once(G4_SNS_PATH.'/twitter/twitterconfig.php');
+
+/* Build TwitterOAuth object with client credentials. */
+$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
+ 
+/* Get temporary credentials. */
+$request_token = $connection->getRequestToken(OAUTH_CALLBACK);
+
+/* Save temporary credentials to session. */
+$_SESSION['oauth_token'] = $token = $request_token['oauth_token'];
+$_SESSION['oauth_token_secret'] = $request_token['oauth_token_secret'];
+
+//print_r2($_SESSION); exit;
+ 
+/* If last connection failed don't display authorization link. */
+switch ($connection->http_code) {
+  case 200:
+    /* Build authorize URL and redirect user to Twitter. */
+    $url = $connection->getAuthorizeURL($token);
+    header('Location: ' . $url); 
+    break;
+  default:
+    /* Show notification if something went wrong. */
+    echo 'Could not connect to Twitter. Refresh the page or try again later.';
+}
--- a/plugin/sns/twitter/twitterconfig.php
+++ b/plugin/sns/twitter/twitterconfig.php
@ -0,0 +1,10 @@
+<?php
+/**
+ * @file
+ * A single location to store configuration.
+ */
+
+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', '');
--- a/plugin/sns/twitter/twitteroauth/OAuth.php
+++ b/plugin/sns/twitter/twitteroauth/OAuth.php
@ -0,0 +1,872 @@
+<?php
+// vim: foldmethod=marker
+
+/* Generic exception class
+ */
+class OAuthException extends Exception {
+  // pass
+}
+
+class OAuthConsumer {
+  public $key;
+  public $secret;
+
+  function __construct($key, $secret, $callback_url=NULL) {
+    $this->key = $key;
+    $this->secret = $secret;
+    $this->callback_url = $callback_url;
+  }
+
+  function __toString() {
+    return "OAuthConsumer[key=$this->key,secret=$this->secret]";
+  }
+}
+
+class OAuthToken {
+  // access tokens and request tokens
+  public $key;
+  public $secret;
+
+  /**
+   * key = the token
+   * secret = the token secret
+   */
+  function __construct($key, $secret) {
+    $this->key = $key;
+    $this->secret = $secret;
+  }
+
+  /**
+   * generates the basic string serialization of a token that a server
+   * would respond to request_token and access_token calls with
+   */
+  function to_string() {
+    return "oauth_token=" .
+           OAuthUtil::urlencode_rfc3986($this->key) .
+           "&oauth_token_secret=" .
+           OAuthUtil::urlencode_rfc3986($this->secret);
+  }
+
+  function __toString() {
+    return $this->to_string();
+  }
+}
+
+/**
+ * A class for implementing a Signature Method
+ * See section 9 ("Signing Requests") in the spec
+ */
+abstract class OAuthSignatureMethod {
+  /**
+   * Needs to return the name of the Signature Method (ie HMAC-SHA1)
+   * @return string
+   */
+  abstract public function get_name();
+
+  /**
+   * Build up the signature
+   * NOTE: The output of this function MUST NOT be urlencoded.
+   * the encoding is handled in OAuthRequest when the final
+   * request is serialized
+   * @param OAuthRequest $request
+   * @param OAuthConsumer $consumer
+   * @param OAuthToken $token
+   * @return string
+   */
+  abstract public function build_signature($request, $consumer, $token);
+
+  /**
+   * Verifies that a given signature is correct
+   * @param OAuthRequest $request
+   * @param OAuthConsumer $consumer
+   * @param OAuthToken $token
+   * @param string $signature
+   * @return bool
+   */
+  public function check_signature($request, $consumer, $token, $signature) {
+    $built = $this->build_signature($request, $consumer, $token);
+    return $built == $signature;
+  }
+}
+
+/**
+ * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104] 
+ * where the Signature Base String is the text and the key is the concatenated values (each first 
+ * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&' 
+ * character (ASCII code 38) even if empty.
+ *   - Chapter 9.2 ("HMAC-SHA1")
+ */
+class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
+  function get_name() {
+    return "HMAC-SHA1";
+  }
+
+  public function build_signature($request, $consumer, $token) {
+    $base_string = $request->get_signature_base_string();
+    $request->base_string = $base_string;
+
+    $key_parts = array(
+      $consumer->secret,
+      ($token) ? $token->secret : ""
+    );
+
+    $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+    $key = implode('&', $key_parts);
+
+    return base64_encode(hash_hmac('sha1', $base_string, $key, true));
+  }
+}
+
+/**
+ * The PLAINTEXT method does not provide any security protection and SHOULD only be used 
+ * over a secure channel such as HTTPS. It does not use the Signature Base String.
+ *   - Chapter 9.4 ("PLAINTEXT")
+ */
+class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
+  public function get_name() {
+    return "PLAINTEXT";
+  }
+
+  /**
+   * oauth_signature is set to the concatenated encoded values of the Consumer Secret and 
+   * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is 
+   * empty. The result MUST be encoded again.
+   *   - Chapter 9.4.1 ("Generating Signatures")
+   *
+   * Please note that the second encoding MUST NOT happen in the SignatureMethod, as
+   * OAuthRequest handles this!
+   */
+  public function build_signature($request, $consumer, $token) {
+    $key_parts = array(
+      $consumer->secret,
+      ($token) ? $token->secret : ""
+    );
+
+    $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+    $key = implode('&', $key_parts);
+    $request->base_string = $key;
+
+    return $key;
+  }
+}
+
+/**
+ * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in 
+ * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for 
+ * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a 
+ * verified way to the Service Provider, in a manner which is beyond the scope of this 
+ * specification.
+ *   - Chapter 9.3 ("RSA-SHA1")
+ */
+abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
+  public function get_name() {
+    return "RSA-SHA1";
+  }
+
+  // Up to the SP to implement this lookup of keys. Possible ideas are:
+  // (1) do a lookup in a table of trusted certs keyed off of consumer
+  // (2) fetch via http using a url provided by the requester
+  // (3) some sort of specific discovery code based on request
+  //
+  // Either way should return a string representation of the certificate
+  protected abstract function fetch_public_cert(&$request);
+
+  // Up to the SP to implement this lookup of keys. Possible ideas are:
+  // (1) do a lookup in a table of trusted certs keyed off of consumer
+  //
+  // Either way should return a string representation of the certificate
+  protected abstract function fetch_private_cert(&$request);
+
+  public function build_signature($request, $consumer, $token) {
+    $base_string = $request->get_signature_base_string();
+    $request->base_string = $base_string;
+
+    // Fetch the private key cert based on the request
+    $cert = $this->fetch_private_cert($request);
+
+    // Pull the private key ID from the certificate
+    $privatekeyid = openssl_get_privatekey($cert);
+
+    // Sign using the key
+    $ok = openssl_sign($base_string, $signature, $privatekeyid);
+
+    // Release the key resource
+    openssl_free_key($privatekeyid);
+
+    return base64_encode($signature);
+  }
+
+  public function check_signature($request, $consumer, $token, $signature) {
+    $decoded_sig = base64_decode($signature);
+
+    $base_string = $request->get_signature_base_string();
+
+    // Fetch the public key cert based on the request
+    $cert = $this->fetch_public_cert($request);
+
+    // Pull the public key ID from the certificate
+    $publickeyid = openssl_get_publickey($cert);
+
+    // Check the computed signature against the one passed in the query
+    $ok = openssl_verify($base_string, $decoded_sig, $publickeyid);
+
+    // Release the key resource
+    openssl_free_key($publickeyid);
+
+    return $ok == 1;
+  }
+}
+
+class OAuthRequest {
+  private $parameters;
+  private $http_method;
+  private $http_url;
+  // for debug purposes
+  public $base_string;
+  public static $version = '1.0';
+  public static $POST_INPUT = 'php://input';
+
+  function __construct($http_method, $http_url, $parameters=NULL) {
+    @$parameters or $parameters = array();
+    $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
+    $this->parameters = $parameters;
+    $this->http_method = $http_method;
+    $this->http_url = $http_url;
+  }
+
+
+  /**
+   * attempt to build up a request from what was passed to the server
+   */
+  public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {
+    $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
+              ? 'http'
+              : 'https';
+    @$http_url or $http_url = $scheme .
+                              '://' . $_SERVER['HTTP_HOST'] .
+                              ':' .
+                              $_SERVER['SERVER_PORT'] .
+                              $_SERVER['REQUEST_URI'];
+    @$http_method or $http_method = $_SERVER['REQUEST_METHOD'];
+
+    // We weren't handed any parameters, so let's find the ones relevant to
+    // this request.
+    // If you run XML-RPC or similar you should use this to provide your own
+    // parsed parameter-list
+    if (!$parameters) {
+      // Find request headers
+      $request_headers = OAuthUtil::get_headers();
+
+      // Parse the query-string to find GET parameters
+      $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
+
+      // It's a POST request of the proper content-type, so parse POST
+      // parameters and add those overriding any duplicates from GET
+      if ($http_method == "POST"
+          && @strstr($request_headers["Content-Type"],
+                     "application/x-www-form-urlencoded")
+          ) {
+        $post_data = OAuthUtil::parse_parameters(
+          file_get_contents(self::$POST_INPUT)
+        );
+        $parameters = array_merge($parameters, $post_data);
+      }
+
+      // We have a Authorization-header with OAuth data. Parse the header
+      // and add those overriding any duplicates from GET or POST
+      if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") {
+        $header_parameters = OAuthUtil::split_header(
+          $request_headers['Authorization']
+        );
+        $parameters = array_merge($parameters, $header_parameters);
+      }
+
+    }
+
+    return new OAuthRequest($http_method, $http_url, $parameters);
+  }
+
+  /**
+   * pretty much a helper function to set up the request
+   */
+  public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
+    @$parameters or $parameters = array();
+    $defaults = array("oauth_version" => OAuthRequest::$version,
+                      "oauth_nonce" => OAuthRequest::generate_nonce(),
+                      "oauth_timestamp" => OAuthRequest::generate_timestamp(),
+                      "oauth_consumer_key" => $consumer->key);
+    if ($token)
+      $defaults['oauth_token'] = $token->key;
+
+    $parameters = array_merge($defaults, $parameters);
+
+    return new OAuthRequest($http_method, $http_url, $parameters);
+  }
+
+  public function set_parameter($name, $value, $allow_duplicates = true) {
+    if ($allow_duplicates && isset($this->parameters[$name])) {
+      // We have already added parameter(s) with this name, so add to the list
+      if (is_scalar($this->parameters[$name])) {
+        // This is the first duplicate, so transform scalar (string)
+        // into an array so we can add the duplicates
+        $this->parameters[$name] = array($this->parameters[$name]);
+      }
+
+      $this->parameters[$name][] = $value;
+    } else {
+      $this->parameters[$name] = $value;
+    }
+  }
+
+  public function get_parameter($name) {
+    return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
+  }
+
+  public function get_parameters() {
+    return $this->parameters;
+  }
+
+  public function unset_parameter($name) {
+    unset($this->parameters[$name]);
+  }
+
+  /**
+   * The request parameters, sorted and concatenated into a normalized string.
+   * @return string
+   */
+  public function get_signable_parameters() {
+    // Grab all parameters
+    $params = $this->parameters;
+
+    // Remove oauth_signature if present
+    // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
+    if (isset($params['oauth_signature'])) {
+      unset($params['oauth_signature']);
+    }
+
+    return OAuthUtil::build_http_query($params);
+  }
+
+  /**
+   * Returns the base string of this request
+   *
+   * The base string defined as the method, the url
+   * and the parameters (normalized), each urlencoded
+   * and the concated with &.
+   */
+  public function get_signature_base_string() {
+    $parts = array(
+      $this->get_normalized_http_method(),
+      $this->get_normalized_http_url(),
+      $this->get_signable_parameters()
+    );
+
+    $parts = OAuthUtil::urlencode_rfc3986($parts);
+
+    return implode('&', $parts);
+  }
+
+  /**
+   * just uppercases the http method
+   */
+  public function get_normalized_http_method() {
+    return strtoupper($this->http_method);
+  }
+
+  /**
+   * parses the url and rebuilds it to be
+   * scheme://host/path
+   */
+  public function get_normalized_http_url() {
+    $parts = parse_url($this->http_url);
+
+    $port = @$parts['port'];
+    $scheme = $parts['scheme'];
+    $host = $parts['host'];
+    $path = @$parts['path'];
+
+    $port or $port = ($scheme == 'https') ? '443' : '80';
+
+    if (($scheme == 'https' && $port != '443')
+        || ($scheme == 'http' && $port != '80')) {
+      $host = "$host:$port";
+    }
+    return "$scheme://$host$path";
+  }
+
+  /**
+   * builds a url usable for a GET request
+   */
+  public function to_url() {
+    $post_data = $this->to_postdata();
+    $out = $this->get_normalized_http_url();
+    if ($post_data) {
+      $out .= '?'.$post_data;
+    }
+    return $out;
+  }
+
+  /**
+   * builds the data one would send in a POST request
+   */
+  public function to_postdata() {
+    return OAuthUtil::build_http_query($this->parameters);
+  }
+
+  /**
+   * builds the Authorization: header
+   */
+  public function to_header($realm=null) {
+    $first = true;
+	if($realm) {
+      $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
+      $first = false;
+    } else
+      $out = 'Authorization: OAuth';
+
+    $total = array();
+    foreach ($this->parameters as $k => $v) {
+      if (substr($k, 0, 5) != "oauth") continue;
+      if (is_array($v)) {
+        throw new OAuthException('Arrays not supported in headers');
+      }
+      $out .= ($first) ? ' ' : ',';
+      $out .= OAuthUtil::urlencode_rfc3986($k) .
+              '="' .
+              OAuthUtil::urlencode_rfc3986($v) .
+              '"';
+      $first = false;
+    }
+    return $out;
+  }
+
+  public function __toString() {
+    return $this->to_url();
+  }
+
+
+  public function sign_request($signature_method, $consumer, $token) {
+    $this->set_parameter(
+      "oauth_signature_method",
+      $signature_method->get_name(),
+      false
+    );
+    $signature = $this->build_signature($signature_method, $consumer, $token);
+    $this->set_parameter("oauth_signature", $signature, false);
+  }
+
+  public function build_signature($signature_method, $consumer, $token) {
+    $signature = $signature_method->build_signature($this, $consumer, $token);
+    return $signature;
+  }
+
+  /**
+   * util function: current timestamp
+   */
+  private static function generate_timestamp() {
+    return time();
+  }
+
+  /**
+   * util function: current nonce
+   */
+  private static function generate_nonce() {
+    $mt = microtime();
+    $rand = mt_rand();
+
+    return md5($mt . $rand); // md5s look nicer than numbers
+  }
+}
+
+class OAuthServer {
+  protected $timestamp_threshold = 300; // in seconds, five minutes
+  protected $version = '1.0';             // hi blaine
+  protected $signature_methods = array();
+
+  protected $data_store;
+
+  function __construct($data_store) {
+    $this->data_store = $data_store;
+  }
+
+  public function add_signature_method($signature_method) {
+    $this->signature_methods[$signature_method->get_name()] =
+      $signature_method;
+  }
+
+  // high level functions
+
+  /**
+   * process a request_token request
+   * returns the request token on success
+   */
+  public function fetch_request_token(&$request) {
+    $this->get_version($request);
+
+    $consumer = $this->get_consumer($request);
+
+    // no token required for the initial token request
+    $token = NULL;
+
+    $this->check_signature($request, $consumer, $token);
+
+    // Rev A change
+    $callback = $request->get_parameter('oauth_callback');
+    $new_token = $this->data_store->new_request_token($consumer, $callback);
+
+    return $new_token;
+  }
+
+  /**
+   * process an access_token request
+   * returns the access token on success
+   */
+  public function fetch_access_token(&$request) {
+    $this->get_version($request);
+
+    $consumer = $this->get_consumer($request);
+
+    // requires authorized request token
+    $token = $this->get_token($request, $consumer, "request");
+
+    $this->check_signature($request, $consumer, $token);
+
+    // Rev A change
+    $verifier = $request->get_parameter('oauth_verifier');
+    $new_token = $this->data_store->new_access_token($token, $consumer, $verifier);
+
+    return $new_token;
+  }
+
+  /**
+   * verify an api call, checks all the parameters
+   */
+  public function verify_request(&$request) {
+    $this->get_version($request);
+    $consumer = $this->get_consumer($request);
+    $token = $this->get_token($request, $consumer, "access");
+    $this->check_signature($request, $consumer, $token);
+    return array($consumer, $token);
+  }
+
+  // Internals from here
+  /**
+   * version 1
+   */
+  private function get_version(&$request) {
+    $version = $request->get_parameter("oauth_version");
+    if (!$version) {
+      // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present. 
+      // Chapter 7.0 ("Accessing Protected Ressources")
+      $version = '1.0';
+    }
+    if ($version !== $this->version) {
+      throw new OAuthException("OAuth version '$version' not supported");
+    }
+    return $version;
+  }
+
+  /**
+   * figure out the signature with some defaults
+   */
+  private function get_signature_method(&$request) {
+    $signature_method =
+        @$request->get_parameter("oauth_signature_method");
+
+    if (!$signature_method) {
+      // According to chapter 7 ("Accessing Protected Ressources") the signature-method
+      // parameter is required, and we can't just fallback to PLAINTEXT
+      throw new OAuthException('No signature method parameter. This parameter is required');
+    }
+
+    if (!in_array($signature_method,
+                  array_keys($this->signature_methods))) {
+      throw new OAuthException(
+        "Signature method '$signature_method' not supported " .
+        "try one of the following: " .
+        implode(", ", array_keys($this->signature_methods))
+      );
+    }
+    return $this->signature_methods[$signature_method];
+  }
+
+  /**
+   * try to find the consumer for the provided request's consumer key
+   */
+  private function get_consumer(&$request) {
+    $consumer_key = @$request->get_parameter("oauth_consumer_key");
+    if (!$consumer_key) {
+      throw new OAuthException("Invalid consumer key");
+    }
+
+    $consumer = $this->data_store->lookup_consumer($consumer_key);
+    if (!$consumer) {
+      throw new OAuthException("Invalid consumer");
+    }
+
+    return $consumer;
+  }
+
+  /**
+   * try to find the token for the provided request's token key
+   */
+  private function get_token(&$request, $consumer, $token_type="access") {
+    $token_field = @$request->get_parameter('oauth_token');
+    $token = $this->data_store->lookup_token(
+      $consumer, $token_type, $token_field
+    );
+    if (!$token) {
+      throw new OAuthException("Invalid $token_type token: $token_field");
+    }
+    return $token;
+  }
+
+  /**
+   * all-in-one function to check the signature on a request
+   * should guess the signature method appropriately
+   */
+  private function check_signature(&$request, $consumer, $token) {
+    // this should probably be in a different method
+    $timestamp = @$request->get_parameter('oauth_timestamp');
+    $nonce = @$request->get_parameter('oauth_nonce');
+
+    $this->check_timestamp($timestamp);
+    $this->check_nonce($consumer, $token, $nonce, $timestamp);
+
+    $signature_method = $this->get_signature_method($request);
+
+    $signature = $request->get_parameter('oauth_signature');
+    $valid_sig = $signature_method->check_signature(
+      $request,
+      $consumer,
+      $token,
+      $signature
+    );
+
+    if (!$valid_sig) {
+      throw new OAuthException("Invalid signature");
+    }
+  }
+
+  /**
+   * check that the timestamp is new enough
+   */
+  private function check_timestamp($timestamp) {
+    if( ! $timestamp )
+      throw new OAuthException(
+        'Missing timestamp parameter. The parameter is required'
+      );
+    
+    // verify that timestamp is recentish
+    $now = time();
+    if (abs($now - $timestamp) > $this->timestamp_threshold) {
+      throw new OAuthException(
+        "Expired timestamp, yours $timestamp, ours $now"
+      );
+    }
+  }
+
+  /**
+   * check that the nonce is not repeated
+   */
+  private function check_nonce($consumer, $token, $nonce, $timestamp) {
+    if( ! $nonce )
+      throw new OAuthException(
+        'Missing nonce parameter. The parameter is required'
+      );
+
+    // verify that the nonce is uniqueish
+    $found = $this->data_store->lookup_nonce(
+      $consumer,
+      $token,
+      $nonce,
+      $timestamp
+    );
+    if ($found) {
+      throw new OAuthException("Nonce already used: $nonce");
+    }
+  }
+
+}
+
+class OAuthDataStore {
+  function lookup_consumer($consumer_key) {
+    // implement me
+  }
+
+  function lookup_token($consumer, $token_type, $token) {
+    // implement me
+  }
+
+  function lookup_nonce($consumer, $token, $nonce, $timestamp) {
+    // implement me
+  }
+
+  function new_request_token($consumer, $callback = null) {
+    // return a new token attached to this consumer
+  }
+
+  function new_access_token($token, $consumer, $verifier = null) {
+    // return a new access token attached to this consumer
+    // for the user associated with this token if the request token
+    // is authorized
+    // should also invalidate the request token
+  }
+
+}
+
+class OAuthUtil {
+  public static function urlencode_rfc3986($input) {
+  if (is_array($input)) {
+    return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input);
+  } else if (is_scalar($input)) {
+    return str_replace(
+      '+',
+      ' ',
+      str_replace('%7E', '~', rawurlencode($input))
+    );
+  } else {
+    return '';
+  }
+}
+
+
+  // This decode function isn't taking into consideration the above
+  // modifications to the encoding process. However, this method doesn't
+  // seem to be used anywhere so leaving it as is.
+  public static function urldecode_rfc3986($string) {
+    return urldecode($string);
+  }
+
+  // Utility function for turning the Authorization: header into
+  // parameters, has to do some unescaping
+  // Can filter out any non-oauth parameters if needed (default behaviour)
+  public static function split_header($header, $only_allow_oauth_parameters = true) {
+    $pattern = '/(([-_a-z]*)=("([^"]*)"|([^,]*)),?)/';
+    $offset = 0;
+    $params = array();
+    while (preg_match($pattern, $header, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
+      $match = $matches[0];
+      $header_name = $matches[2][0];
+      $header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0];
+      if (preg_match('/^oauth_/', $header_name) || !$only_allow_oauth_parameters) {
+        $params[$header_name] = OAuthUtil::urldecode_rfc3986($header_content);
+      }
+      $offset = $match[1] + strlen($match[0]);
+    }
+
+    if (isset($params['realm'])) {
+      unset($params['realm']);
+    }
+
+    return $params;
+  }
+
+  // helper to try to sort out headers for people who aren't running apache
+  public static function get_headers() {
+    if (function_exists('apache_request_headers')) {
+      // we need this to get the actual Authorization: header
+      // because apache tends to tell us it doesn't exist
+      $headers = apache_request_headers();
+
+      // sanitize the output of apache_request_headers because
+      // we always want the keys to be Cased-Like-This and arh()
+      // returns the headers in the same case as they are in the
+      // request
+      $out = array();
+      foreach( $headers AS $key => $value ) {
+        $key = str_replace(
+            " ",
+            "-",
+            ucwords(strtolower(str_replace("-", " ", $key)))
+          );
+        $out[$key] = $value;
+      }
+    } else {
+      // otherwise we don't have apache and are just going to have to hope
+      // that $_SERVER actually contains what we need
+      $out = array();
+      if( isset($_SERVER['CONTENT_TYPE']) )
+        $out['Content-Type'] = $_SERVER['CONTENT_TYPE'];
+      if( isset($_ENV['CONTENT_TYPE']) )
+        $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
+
+      foreach ($_SERVER as $key => $value) {
+        if (substr($key, 0, 5) == "HTTP_") {
+          // this is chaos, basically it is just there to capitalize the first
+          // letter of every word that is not an initial HTTP and strip HTTP
+          // code from przemek
+          $key = str_replace(
+            " ",
+            "-",
+            ucwords(strtolower(str_replace("_", " ", substr($key, 5))))
+          );
+          $out[$key] = $value;
+        }
+      }
+    }
+    return $out;
+  }
+
+  // This function takes a input like a=b&a=c&d=e and returns the parsed
+  // parameters like this
+  // array('a' => array('b','c'), 'd' => 'e')
+  public static function parse_parameters( $input ) {
+    if (!isset($input) || !$input) return array();
+
+    $pairs = explode('&', $input);
+
+    $parsed_parameters = array();
+    foreach ($pairs as $pair) {
+      $split = explode('=', $pair, 2);
+      $parameter = OAuthUtil::urldecode_rfc3986($split[0]);
+      $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
+
+      if (isset($parsed_parameters[$parameter])) {
+        // We have already recieved parameter(s) with this name, so add to the list
+        // of parameters with this name
+
+        if (is_scalar($parsed_parameters[$parameter])) {
+          // This is the first duplicate, so transform scalar (string) into an array
+          // so we can add the duplicates
+          $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]);
+        }
+
+        $parsed_parameters[$parameter][] = $value;
+      } else {
+        $parsed_parameters[$parameter] = $value;
+      }
+    }
+    return $parsed_parameters;
+  }
+
+  public static function build_http_query($params) {
+    if (!$params) return '';
+
+    // Urlencode both keys and values
+    $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));
+    $values = OAuthUtil::urlencode_rfc3986(array_values($params));
+    $params = array_combine($keys, $values);
+
+    // Parameters are sorted by name, using lexicographical byte value ordering.
+    // Ref: Spec: 9.1.1 (1)
+    uksort($params, 'strcmp');
+
+    $pairs = array();
+    foreach ($params as $parameter => $value) {
+      if (is_array($value)) {
+        // If two or more parameters share the same name, they are sorted by their value
+        // Ref: Spec: 9.1.1 (1)
+        natsort($value);
+        foreach ($value as $duplicate_value) {
+          $pairs[] = $parameter . '=' . $duplicate_value;
+        }
+      } else {
+        $pairs[] = $parameter . '=' . $value;
+      }
+    }
+    // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61)
+    // Each name-value pair is separated by an '&' character (ASCII code 38)
+    return implode('&', $pairs);
+  }
+}
--- a/plugin/sns/twitter/twitteroauth/twitteroauth.php
+++ b/plugin/sns/twitter/twitteroauth/twitteroauth.php
@ -0,0 +1,241 @@
+<?php
+
+/*
+ * Abraham Williams (abraham@abrah.am) http://abrah.am
+ *
+ * The first PHP Library to support OAuth for Twitter's REST API.
+ */
+
+/* Load OAuth lib. You can find it at http://oauth.net */
+require_once('OAuth.php');
+
+/**
+ * Twitter OAuth class
+ */
+class TwitterOAuth {
+  /* Contains the last HTTP status code returned. */
+  public $http_code;
+  /* Contains the last API call. */
+  public $url;
+  /* Set up the API root URL. */
+  public $host = "https://api.twitter.com/1/";
+  /* Set timeout default. */
+  public $timeout = 30;
+  /* Set connect timeout. */
+  public $connecttimeout = 30; 
+  /* Verify SSL Cert. */
+  public $ssl_verifypeer = FALSE;
+  /* Respons format. */
+  public $format = 'json';
+  /* Decode returned json data. */
+  public $decode_json = TRUE;
+  /* Contains the last HTTP headers returned. */
+  public $http_info;
+  /* Set the useragnet. */
+  public $useragent = 'TwitterOAuth v0.2.0-beta2';
+  /* Immediately retry the API call if the response was not successful. */
+  //public $retry = TRUE;
+
+
+
+
+  /**
+   * Set API URLS
+   */
+  function accessTokenURL()  { return 'https://api.twitter.com/oauth/access_token'; }
+  function authenticateURL() { return 'https://api.twitter.com/oauth/authenticate'; }
+  function authorizeURL()    { return 'https://api.twitter.com/oauth/authorize'; }
+  function requestTokenURL() { return 'https://api.twitter.com/oauth/request_token'; }
+
+  /**
+   * Debug helpers
+   */
+  function lastStatusCode() { return $this->http_status; }
+  function lastAPICall() { return $this->last_api_call; }
+
+  /**
+   * construct TwitterOAuth object
+   */
+  function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
+    $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
+    $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+    if (!empty($oauth_token) && !empty($oauth_token_secret)) {
+      $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
+    } else {
+      $this->token = NULL;
+    }
+  }
+
+
+  /**
+   * Get a request_token from Twitter
+   *
+   * @returns a key/value array containing oauth_token and oauth_token_secret
+   */
+  function getRequestToken($oauth_callback) {
+    $parameters = array();
+    $parameters['oauth_callback'] = $oauth_callback; 
+    $request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * Get the authorize URL
+   *
+   * @returns a string
+   */
+  function getAuthorizeURL($token, $sign_in_with_twitter = TRUE) {
+    if (is_array($token)) {
+      $token = $token['oauth_token'];
+    }
+    if (empty($sign_in_with_twitter)) {
+      return $this->authorizeURL() . "?oauth_token={$token}";
+    } else {
+       return $this->authenticateURL() . "?oauth_token={$token}";
+    }
+  }
+
+  /**
+   * Exchange request token and secret for an access token and
+   * secret, to sign API calls.
+   *
+   * @returns array("oauth_token" => "the-access-token",
+   *                "oauth_token_secret" => "the-access-secret",
+   *                "user_id" => "9436992",
+   *                "screen_name" => "abraham")
+   */
+  function getAccessToken($oauth_verifier) {
+    $parameters = array();
+    $parameters['oauth_verifier'] = $oauth_verifier;
+    $request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * One time exchange of username and password for access token and secret.
+   *
+   * @returns array("oauth_token" => "the-access-token",
+   *                "oauth_token_secret" => "the-access-secret",
+   *                "user_id" => "9436992",
+   *                "screen_name" => "abraham",
+   *                "x_auth_expires" => "0")
+   */  
+  function getXAuthToken($username, $password) {
+    $parameters = array();
+    $parameters['x_auth_username'] = $username;
+    $parameters['x_auth_password'] = $password;
+    $parameters['x_auth_mode'] = 'client_auth';
+    $request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * GET wrapper for oAuthRequest.
+   */
+  function get($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'GET', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+  
+  /**
+   * POST wrapper for oAuthRequest.
+   */
+  function post($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'POST', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+
+  /**
+   * DELETE wrapper for oAuthReqeust.
+   */
+  function delete($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'DELETE', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+
+  /**
+   * Format and sign an OAuth / API request
+   */
+  function oAuthRequest($url, $method, $parameters) {
+    if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
+      $url = "{$this->host}{$url}.{$this->format}";
+    }
+    $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
+    $request->sign_request($this->sha1_method, $this->consumer, $this->token);
+    switch ($method) {
+    case 'GET':
+      return $this->http($request->to_url(), 'GET');
+    default:
+      return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata());
+    }
+  }
+
+  /**
+   * Make an HTTP request
+   *
+   * @return API results
+   */
+  function http($url, $method, $postfields = NULL) {
+    $this->http_info = array();
+    $ci = curl_init();
+    /* Curl settings */
+    curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
+    curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
+    curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
+    curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
+    curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:'));
+    curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
+    curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader'));
+    curl_setopt($ci, CURLOPT_HEADER, FALSE);
+
+    switch ($method) {
+      case 'POST':
+        curl_setopt($ci, CURLOPT_POST, TRUE);
+        if (!empty($postfields)) {
+          curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
+        }
+        break;
+      case 'DELETE':
+        curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
+        if (!empty($postfields)) {
+          $url = "{$url}?{$postfields}";
+        }
+    }
+
+    curl_setopt($ci, CURLOPT_URL, $url);
+    $response = curl_exec($ci);
+    $this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
+    $this->http_info = array_merge($this->http_info, curl_getinfo($ci));
+    $this->url = $url;
+    curl_close ($ci);
+    return $response;
+  }
+
+  /**
+   * Get the header info to store.
+   */
+  function getHeader($ch, $header) {
+    $i = strpos($header, ':');
+    if (!empty($i)) {
+      $key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
+      $value = trim(substr($header, $i + 2));
+      $this->http_header[$key] = $value;
+    }
+    return strlen($header);
+  }
+}
--- a/skin/board/basic/list.skin.php
+++ b/skin/board/basic/list.skin.php
@ -35,9 +35,9 @@ if ($is_nogood) $colspan++;

        <?php if ($rss_href || $write_href) { ?>
        <ul class="btn_bo_user">
-            <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b02">RSS</a></li><?php } ?>
+            <?php if ($rss_href) { ?><li><a href="<?php echo $rss_href ?>" class="btn_b01">RSS</a></li><?php } ?>
            <?php if ($admin_href) { ?><li><a href="<?php echo $admin_href ?>" class="btn_admin">관리자</a></li><?php } ?>
-            <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b01">글쓰기</a></li><?php } ?>
+            <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a></li><?php } ?>
        </ul>
        <?php } ?>
    </div>
@ -115,7 +115,7 @@ if ($is_nogood) $colspan++;

             ?>
        </td>
-        <td class="td_name sv_use"><?php echo $list[$i]['name'] ?></td>
+        <td class="td_name"><?php echo $list[$i]['name'] ?></td>
        <td class="td_date"><?php echo $list[$i]['datetime2'] ?></td>
        <td class="td_num"><?php echo $list[$i]['wr_hit'] ?></td>
        <?php if ($is_good) { ?><td class="td_num"><?php echo $list[$i]['wr_good'] ?></td><?php } ?>
@ -140,7 +140,7 @@ if ($is_nogood) $colspan++;
        </ul>

        <ul class="btn_bo_user">
-            <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b01">글쓰기</a></li><?php } ?>
+            <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a></li><?php } ?>
        </ul>
    </div>
    <?php } ?>
@ -174,7 +174,7 @@ if ($is_nogood) $colspan++;
        <option value="wr_name,0"<?php echo get_selected($sfl, 'wr_name,0'); ?>>글쓴이(코)</option>
    </select>
    <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-    <input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" id="stx" required  class="frm_input required" size="15" maxlength="15">
+    <input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" required  class="frm_input required" size="15" maxlength="15">
    <input type="submit" value="검색" class="btn_submit">
    </form>
 </fieldset>
--- a/skin/board/basic/style.css
+++ b/skin/board/basic/style.css
@ -98,6 +98,10 @@
 #bo_v_act_good,
 #bo_v_act_nogood {position:absolute;font-size:0;line-height:0;overflow:hidden}

+#bo_v_sns {margin:0 0 20px;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 5px 0 0}
+
 #bo_v form {padding-top:20px}

 /* 게시판 댓글 */
@ -127,4 +131,9 @@
 #bo_vc_w h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #bo_vc_w #char_cnt {display:block;margin:0 0 5px}

+#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 20px 0 0}
+#bo_vc_sns input {margin:0 0 0 5px}
+
 #bo_vc form {padding:0}
--- a/skin/board/basic/view.skin.php
+++ b/skin/board/basic/view.skin.php
@ -167,6 +167,11 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
        ?>
    </section>

+    <?php
+    // SNS 보내기
+    include_once($board_skin_path."/view.sns.skin.php");
+    ?>
+
    <?php
    // 코멘트 입출력
    include_once('./view_comment.php');
--- a/skin/board/basic/view.sns.skin.php
+++ b/skin/board/basic/view.sns.skin.php
@ -0,0 +1,39 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+if (!$board['bo_use_sns']) return;
+
+$sns_msg = urlencode(str_replace('\"', '"', $view['subject']));
+$sns_url = googl_short_url('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+$msg_url = $sns_msg.' : '.$sns_url;
+
+// 카카오톡 매뉴얼 : https://github.com/kakao/kakaolink-web
+$kakao_appid   = $_SERVER['HTTP_HOST']; // Mobile Site Domain 정확히 입력하지 않을 경우 이용이 제한될 수 있습니다.
+$kakao_appname = $g4['title'];
+
+$facebook_url  = 'http://www.facebook.com/sharer/sharer.php?s=100&p[url]='.$sns_url.'&p[title]='.$sns_msg;
+$twitter_url   = 'http://twitter.com/home?status='.$msg_url;
+$me2day_url    = 'http://me2day.net/posts/new?new_post[body]='.$msg_url;
+$gplus_url     = 'https://plus.google.com/share?url='.$sns_url;
+
+/*
+$sns_send  = G4_BBS_URL.'/sns_send.php?longurl='.urlencode('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+//$sns_send .= '&amp;title='.urlencode(utf8_strcut(get_text($view['subject']),140));
+$sns_send .= '&amp;title='.$sns_msg;
+*/
+
+?>
+<ul id="bo_v_sns">
+    <li><a href="<?php echo $facebook_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/facebook.png" alt="페이스북으로 보내기"></a></li>
+    <li><a href="<?php echo $twitter_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/twitter.png" alt="트위터로 보내기"></a></li>
+    <li><a href="<?php echo $me2day_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/me2day.png" alt="미투데이로 보내기"></a></li>
+    <li><a href="<?php echo $gplus_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/gplus.png" alt="구글플러스로 보내기"></a></li>
+    <?php
+    if (G4_IS_MOBILE) {
+        $kakao_url = 'kakaolink://sendurl?msg='.$sns_msg.'&amp;url='.$sns_url.'&amp;appid='.$kakao_appid.'&amp;appver=1.0&amp;type=link&amp;appname='.$kakao_appname.'&amp;apiver=2.0';
+    ?>
+    <li><a href="<?php echo $kakao_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/kakaotalk.png" alt="카카오톡으로 보내기"></a></li>
+    <?php
+    }
+    ?>
+</ul>
--- a/skin/board/basic/view_comment.skin.php
+++ b/skin/board/basic/view_comment.skin.php
@ -73,230 +73,233 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대

 </section>

-<?php
-if ($is_comment_write) {
-    if($w == '') $w = 'c';
- ?>
-<section id="bo_vc_w">
-    <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
-    <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
-    <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
-    <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
-    <input type="hidden" name="comment_id" value="<?php echo $c_id ?>" id="comment_id">
-    <input type="hidden" name="sca" value="<?php echo $sca ?>">
-    <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
-    <input type="hidden" name="stx" value="<?php echo $stx ?>">
-    <input type="hidden" name="spt" value="<?php echo $spt ?>">
-    <input type="hidden" name="page" value="<?php echo $page ?>">
-    <input type="hidden" name="is_good" value="">
+<?php if ($is_comment_write) {
+        if($w == '')
+            $w = 'c';
+    ?>
+    <aside id="bo_vc_w">
+        <h2>댓글쓰기</h2>
+        <form name="fviewcomment" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+        <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
+        <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
+        <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
+        <input type="hidden" name="comment_id" value="<?php echo $c_id ?>" id="comment_id">
+        <input type="hidden" name="sca" value="<?php echo $sca ?>">
+        <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
+        <input type="hidden" name="stx" value="<?php echo $stx ?>">
+        <input type="hidden" name="spt" value="<?php echo $spt ?>">
+        <input type="hidden" name="page" value="<?php echo $page ?>">
+        <input type="hidden" name="is_good" value="">

-    <table class="frm_tbl">
-    <tbody>
-    <?php if ($is_guest) { ?>
-    <tr>
-        <th scope="row"><label for="wr_name">이름<strong class="sound_only">필수</strong></label></th>
-        <td><input type="text" name="wr_name" id="wr_name"  required class="frm_input required" size="5" maxLength="20"></td>
-    </tr>
-    <tr>
-        <th scope="row"><label for="wr_password">패스워드<strong class="sound_only">필수</strong></label></th>
-        <td><input type="password" name="wr_password" id="wr_password"  required class="frm_input required" size="10" maxLength="20"></td>
-    </tr>
-    <?php } ?>
-    <tr>
-        <th scope="row"><label for="wr_secret">비밀글사용</label></th>
-        <td><input type="checkbox" name="wr_secret" value="secret" id="wr_secret"></td>
-    </tr>
-    <?php if ($is_guest) { ?>
-    <tr>
-        <th scope="row">자동등록방지</th>
-        <td><?php echo $captcha_html; ?></td>
-    </tr>
-    <?php } ?>
-    <tr>
-        <th scope="row">내용</th>
-        <td>
-            <?php if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?php } ?>
-            <textarea id="wr_content" name="wr_content" maxlength="10000" required class="required" title="댓글 내용"
-            <?php if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?php } ?>><?php echo $c_wr_content;  ?></textarea>
-            <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
-            <script>
-            $("textarea#wr_content[maxlength]").live("keyup change", function() {  
-                var str = $(this).val()  
-                var mx = parseInt($(this).attr("maxlength"))  
-                if (str.length > mx) {  
-                    $(this).val(str.substr(0, mx));
-                    return false;  
-                }  
-            });
-            </script>
-        </td>
-    </tr>
-    </tbody>
-    </table>
+        <table class="frm_tbl">
+        <tbody>
+        <?php if ($is_guest) { ?>
+        <tr>
+            <th scope="row"><label for="wr_name">이름<strong class="sound_only">필수</strong></label></th>
+            <td><input type="text" name="wr_name" id="wr_name"  required class="frm_input required" size="5" maxLength="20" value="<?php echo get_cookie("ck_sns_name"); ?>"></td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="wr_password">패스워드<strong class="sound_only">필수</strong></label></th>
+            <td><input type="password" name="wr_password" id="wr_password"  required class="frm_input required" size="10" maxLength="20"></td>
+        </tr>
+        <?php } ?>
+        <tr>
+            <th scope="row"><label for="wr_secret">비밀글사용</label></th>
+            <td><input type="checkbox" name="wr_secret" value="secret" id="wr_secret"></td>
+        </tr>
+        <?php if ($is_guest) { ?>
+        <tr>
+            <th scope="row">자동등록방지</th>
+            <td><?php echo $captcha_html; ?></td>
+        </tr>
+        <?php } ?>

-    <div class="btn_confirm">
-        <input type="submit" value="댓글등록" id="btn_submit" class="btn_submit" accesskey="s">
-    </div>
+        <?php 
+        include_once($board_skin_path."/view_comment.sns.skin.php");
+        ?>

-    </form>
-</section>
+        <tr>
+            <th scope="row">내용</th>
+            <td>
+                <?php if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?php } ?>
+                <textarea id="wr_content" name="wr_content" maxlength="10000" required class="required"
+                <?php if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?php } ?>><?php echo $c_wr_content;  ?></textarea>
+                <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
+                <script>
+                $("textarea#wr_content[maxlength]").live("keyup change", function() {  
+                    var str = $(this).val()  
+                    var mx = parseInt($(this).attr("maxlength"))  
+                    if (str.length > mx) {  
+                        $(this).val(str.substr(0, mx));
+                        return false;  
+                    }  
+                });
+                </script>
+            </td>
+        </tr>
+        </tbody>
+        </table>

-<script>
-var save_before = '';
-var save_html = document.getElementById('bo_vc_w').innerHTML;
+        <div class="btn_confirm">
+            <input type="submit" class="btn_submit" value="댓글등록">
+        </div>
+
+        </form>
+    </aside>
+
+    <script>
+    var save_before = '';
+    var save_html = document.getElementById('bo_vc_w').innerHTML;
+
+    function good_and_write()
+    {
+        var f = document.fviewcomment;
+        if (fviewcomment_submit(f)) {
+            f.is_good.value = 1;
+            f.submit();
+        } else {
+            f.is_good.value = 0;
+        }
+    }
+
+    function fviewcomment_submit(f)
+    {
+        var pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자

-function good_and_write()
-{
-    var f = document.fviewcomment;
-    if (fviewcomment_submit(f)) {
-        f.is_good.value = 1;
-        f.submit();
-    } else {
        f.is_good.value = 0;
-    }
-}

-function fviewcomment_submit(f)
-{
-    var pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자
-
-    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({
-        url: g4_bbs_url+"/filter.ajax.php",
-        type: "POST",
-        data: {
-            "subject": "",
-            "content": f.wr_content.value
-        },
-        dataType: "json",
-        async: false,
-        cache: false,
-        success: function(data, textStatus) {
-            subject = data.subject;
-            content = data.content;
-        }
-    });
-
-    if (content) {
-        alert("내용에 금지단어('"+content+"')가 포함되어있습니다");
-        f.wr_content.focus();
-        return false;
-    }
-
-    // 양쪽 공백 없애기
-    var pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자
-    document.getElementById('wr_content').value = document.getElementById('wr_content').value.replace(pattern, "");
-    if (char_min > 0 || char_max > 0)
-    {
-        check_byte('wr_content', 'char_count');
-        var cnt = parseInt(document.getElementById('char_count').innerHTML);
-        if (char_min > 0 && char_min > cnt)
+        /*
+        var s;
+        if (s = word_filter_check(document.getElementById('wr_content').value))
        {
-            alert("댓글은 "+char_min+"글자 이상 쓰셔야 합니다.");
-            return false;
-        } else if (char_max > 0 && char_max < cnt)
-        {
-            alert("댓글은 "+char_max+"글자 이하로 쓰셔야 합니다.");
+            alert("내용에 금지단어('"+s+"')가 포함되어있습니다");
+            document.getElementById('wr_content').focus();
            return false;
        }
-    }
-    else if (!document.getElementById('wr_content').value)
-    {
-        alert("댓글을 입력하여 주십시오.");
-        return false;
-    }
+        */

-    if (typeof(f.wr_name) != 'undefined')
-    {
-        f.wr_name.value = f.wr_name.value.replace(pattern, "");
-        if (f.wr_name.value == '')
-        {
-            alert('이름이 입력되지 않았습니다.');
-            f.wr_name.focus();
+        var subject = "";
+        var content = "";
+        $.ajax({
+            url: g4_bbs_url+"/filter.ajax.php",
+            type: "POST",
+            data: {
+                "subject": "",
+                "content": f.wr_content.value
+            },
+            dataType: "json",
+            async: false,
+            cache: false,
+            success: function(data, textStatus) {
+                subject = data.subject;
+                content = data.content;
+            }
+        });
+
+        if (content) {
+            alert("내용에 금지단어('"+content+"')가 포함되어있습니다");
+            f.wr_content.focus();
            return false;
        }
-    }

-    if (typeof(f.wr_password) != 'undefined')
-    {
-        f.wr_password.value = f.wr_password.value.replace(pattern, "");
-        if (f.wr_password.value == '')
+        // 양쪽 공백 없애기
+        var pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자
+        document.getElementById('wr_content').value = document.getElementById('wr_content').value.replace(pattern, "");
+        if (char_min > 0 || char_max > 0)
        {
-            alert('패스워드가 입력되지 않았습니다.');
-            f.wr_password.focus();
+            check_byte('wr_content', 'char_count');
+            var cnt = parseInt(document.getElementById('char_count').innerHTML);
+            if (char_min > 0 && char_min > cnt)
+            {
+                alert("댓글은 "+char_min+"글자 이상 쓰셔야 합니다.");
+                return false;
+            } else if (char_max > 0 && char_max < cnt)
+            {
+                alert("댓글은 "+char_max+"글자 이하로 쓰셔야 합니다.");
+                return false;
+            }
+        }
+        else if (!document.getElementById('wr_content').value)
+        {
+            alert("댓글을 입력하여 주십시오.");
            return false;
        }
-    }

-    <?php if($is_guest) echo chk_captcha_js();  ?>
-
-    document.getElementById("btn_submit").disabled = "disabled";
-
-    return true;
-}
-
-function comment_box(comment_id, work)
-{
-    var el_id;
-    // 댓글 아이디가 넘어오면 답변, 수정
-    if (comment_id)
-    {
-        if (work == 'c')
-            el_id = 'reply_' + comment_id;
-        else
-            el_id = 'edit_' + comment_id;
-    }
-    else
-        el_id = 'bo_vc_w';
-
-    if (save_before != el_id)
-    {
-        if (save_before)
+        if (typeof(f.wr_name) != 'undefined')
        {
-            document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
+            f.wr_name.value = f.wr_name.value.replace(pattern, "");
+            if (f.wr_name.value == '')
+            {
+                alert('이름이 입력되지 않았습니다.');
+                f.wr_name.focus();
+                return false;
+            }
        }

-        document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
-        // 댓글 수정
-        if (work == 'cu')
+        if (typeof(f.wr_password) != 'undefined')
        {
-            document.getElementById('wr_content').value = document.getElementById('save_comment_' + comment_id).value;
-            if (typeof char_count != 'undefined')
-                check_byte('wr_content', 'char_count');
-            if (document.getElementById('secret_comment_'+comment_id).value)
-                document.getElementById('wr_secret').checked = true;
+            f.wr_password.value = f.wr_password.value.replace(pattern, "");
+            if (f.wr_password.value == '')
+            {
+                alert('패스워드가 입력되지 않았습니다.');
+                f.wr_password.focus();
+                return false;
+            }
+        }
+
+        <?php if($is_guest) echo chk_captcha_js();  ?>
+
+        return true;
+    }
+
+    function comment_box(comment_id, work)
+    {
+        var el_id;
+        // 댓글 아이디가 넘어오면 답변, 수정
+        if (comment_id)
+        {
+            if (work == 'c')
+                el_id = 'reply_' + comment_id;
            else
-                document.getElementById('wr_secret').checked = false;
+                el_id = 'edit_' + comment_id;
        }
+        else
+            el_id = 'bo_vc_w';

-        document.getElementById('comment_id').value = comment_id;
-        document.getElementById('w').value = work;
+        if (save_before != el_id)
+        {
+            if (save_before)
+            {
+                document.getElementById(save_before).style.display = 'none';
+                document.getElementById(save_before).innerHTML = '';
+            }

-        save_before = el_id;
+            document.getElementById(el_id).style.display = '';
+            document.getElementById(el_id).innerHTML = save_html;
+            // 댓글 수정
+            if (work == 'cu')
+            {
+                document.getElementById('wr_content').value = document.getElementById('save_comment_' + comment_id).value;
+                if (typeof char_count != 'undefined')
+                    check_byte('wr_content', 'char_count');
+                if (document.getElementById('secret_comment_'+comment_id).value)
+                    document.getElementById('wr_secret').checked = true;
+                else
+                    document.getElementById('wr_secret').checked = false;
+            }
+
+            document.getElementById('comment_id').value = comment_id;
+            document.getElementById('w').value = work;
+
+            save_before = el_id;
+        }
    }
-}

-function comment_delete()
-{
-    return confirm("이 댓글을 삭제하시겠습니까?");
-}
+    function comment_delete()
+    {
+        return confirm("이 댓글을 삭제하시겠습니까?");
+    }

-comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님)
-</script>
-<?php } ?>
+    comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님)
+    </script>
+    <?php } ?>
--- a/skin/board/basic/view_comment.sns.skin.php
+++ b/skin/board/basic/view_comment.sns.skin.php
@ -0,0 +1,130 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+if (!$board['bo_use_sns']) return;
+?>
+<tr>
+    <th scope="row">SNS 등록</th>
+    <td>
+        <ul id="bo_vc_sns">
+        <?php
+        //============================================================================
+        // 페이스북
+        //----------------------------------------------------------------------------
+        if ($config['cf_facebook_appid']) {
+            include_once(G4_SNS_PATH."/facebook/src/facebook.php");
+            $facebook = new Facebook(array(
+                'appId'  => $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 '<li>';
+            if ($facebook_user) {
+                echo '<img src="'.G4_SNS_URL.'/icon/facebook.png" id="facebook_icon">';
+                echo '<label for="" class="sound_only">페이스북 동시 등록</label>';
+                echo '<input type="checkbox" name="facebook_checked" id="facebook_checked" '.(get_cookie('ck_facebook_checked')?'checked':'').' value="1">';
+            } else {
+                $facebook_url = $facebook->getLoginUrl(array("redirect_uri"=>G4_SNS_URL."/facebook/callback.php", "scope"=>"publish_stream,read_stream,offline_access", "display"=>"popup"));
+
+                echo '<a href="'.$facebook_url.'" id="facebook_url" onclick="return false;"><img src="'.G4_SNS_URL.'/icon/facebook'.($facebook_user?'':'_off').'.png" id="facebook_icon"></a>';
+                echo '<label for="" class="sound_only">페이스북 동시 등록</label>';
+                echo '<input type="checkbox" name="facebook_checked" id="facebook_checked" disabled value="1">';
+                echo '<script>$(function(){ $("#facebook_url").click(function(){ window.open(this.href, "facebook_url", "width=600,height=250"); }); });</script>';
+            }
+            echo '</li>';
+        }
+        //============================================================================
+
+
+        //============================================================================
+        // 트위터
+        //----------------------------------------------------------------------------
+        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 '<li>';
+            if ($twitter_user) {
+                echo '<img src="'.G4_SNS_URL.'/icon/twitter.png" id="twitter_icon">';
+                echo '<label for="" class="sound_only">트위터 동시 등록</label>';
+                echo '<input type="checkbox" name="twitter_checked" id="twitter_checked" '.(get_cookie('ck_twitter_checked')?'checked':'').' value="1">';
+            } else {
+                echo '<a href="'.$twitter_url.'" id="twitter_url" onclick="return false;"><img src="'.G4_SNS_URL.'/icon/twitter'.($twitter_user?'':'_off').'.png" id="twitter_icon"></a>';
+                echo '<label for="" class="sound_only">트위터 동시 등록</label>';
+                echo '<input type="checkbox" name="twitter_checked" id="twitter_checked" disabled value="1">';
+                echo '<script>$(function(){ $("#twitter_url").click(function(){ window.open(this.href, "twitter_url", "width=600,height=250"); }); });</script>';
+            }
+            echo '</li>';
+        }
+        //============================================================================
+
+
+        //============================================================================
+        // 미투데이
+        //----------------------------------------------------------------------------
+        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 '<li>';
+            if ($me2day_user) {
+                echo '<img src="'.G4_SNS_URL.'/icon/me2day.png" id="me2day_icon">';
+                echo '<label for="" class="sound_only">미투데이 동시 등록</label>';
+                echo '<input type="checkbox" name="me2day_checked" id="me2day_checked" '.(get_cookie('ck_me2day_checked')?'checked':'').' value="1">';
+            } else {
+                echo '<a href="'.$me2day_url.'" id="me2day_url" onclick="return false;"><img src="'.G4_SNS_URL.'/icon/me2day'.($me2day_user?'':'_off').'.png" id="me2day_icon"></a>';
+                echo '<label for="" class="sound_only">미투데이 동시 등록</label>';
+                echo '<input type="checkbox" name="me2day_checked" id="me2day_checked" disabled value="1">';
+                echo '<script>$(function(){ $("#me2day_url").click(function(){ window.open(this.href, "me2day_url", "width=1000,height=800"); }); });</script>';
+            }
+            echo '</li>';
+        }
+        //============================================================================
+        ?>
+        </ul>
+    </td>
+</tr>
--- a/skin/board/basic/write.skin.php
+++ b/skin/board/basic/write.skin.php
@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

 <link rel="stylesheet" href="<?php echo $board_skin_url ?>/style.css">

-<h1 id="container_title"><?php echo $g4['title'] ?></h1>
+<h1 id="wrapper_title"><?php echo $g4['title'] ?></h1>

 <form name="fwrite" id="fwrite" action="<?php echo $action_url ?>" onsubmit="return fwrite_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off" style="width:<?php echo $width; ?>">
 <input type="hidden" name="w" value="<?php echo $w ?>">
@ -147,7 +147,7 @@ echo $option_hidden;
    <p>
       작성하신 내용을 제출하시려면 <strong>글쓰기</strong> 버튼을, 작성을 취소하고 목록으로 돌아가시려면 <strong>취소</strong> 링크를 누르세요.
    </p>
-    <input type="submit" value="글쓰기" id="btn_submit" class="btn_submit" accesskey="s">
+    <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
    <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
 </div>
 </form>
@ -218,8 +218,6 @@ function fwrite_submit(f)

    <?php echo $captcha_js; // 캡챠 사용시 자바스크립트에서 입력된 캡챠를 검사함  ?>

-    document.getElementById("btn_submit").disabled = "disabled";
-    
    return true;
 }
 </script>
--- a/skin/board/gallery/list.skin.php
+++ b/skin/board/gallery/list.skin.php
@ -171,7 +171,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
        <option value="wr_name,0"<?php echo get_selected($sfl, "wr_name,0"); ?>>글쓴이(코)</option>
    </select>
    <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-    <input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" id="stx" required class="frm_input required" size="15" maxlength="15">
+    <input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" required class="frm_input required" size="15" maxlength="15">
    <input type="submit" value="검색" class="btn_submit">
    </form>
 </fieldset>
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@ -48,7 +48,7 @@
 .btn_bo_adm {float:left}
 .btn_bo_adm li {float:left;margin-right:5px}
 .btn_bo_adm input {padding:0 10px;height:25px;border:1px solid #e8180c !important;background:#e8180c;color:#fff;text-decoration:none;vertical-align:middle;cursor:pointer}
-.bo_notice td {background:#f5f6fa}
+.bo_notice td {background:#f7f7f2}
 .bo_notice td a {font-weight:bold}
 .td_num strong {color:#000}
 .bo_cate_link {display:inline-block;margin:0 3px 0 0;padding:0 6px 0 0;border-right:1px solid #e7f1ed;color:#999 !important;font-weight:bold;text-decoration:none} /* 글제목줄 분류스타일 */
@ -122,6 +122,10 @@
 #bo_v_act_good,
 #bo_v_act_nogood {position:absolute;font-size:0;line-height:0;overflow:hidden}

+#bo_v_sns {margin:0 0 20px;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 5px 0 0}
+
 #bo_v form {padding-top:20px}

 /* 게시판 댓글 */
@ -151,4 +155,9 @@
 #bo_vc_w h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #bo_vc_w #char_cnt {display:block;margin:0 0 5px}

+#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 20px 0 0}
+#bo_vc_sns input {margin:0 0 0 5px}
+
 #bo_vc form {padding:0}
--- a/skin/board/gallery/view.skin.php
+++ b/skin/board/gallery/view.skin.php
@ -156,7 +156,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
        </div>
        <?php } else {
            if($board['bo_use_good'] || $board['bo_use_nogood']) {
-         ?>
+        ?>
        <div id="bo_v_act">
            <?php if($board['bo_use_good']) { ?><span>추천 <strong><?php echo number_format($view['wr_good']) ?></strong></span><?php } ?>
            <?php if($board['bo_use_nogood']) { ?><span>비추천 <strong><?php echo number_format($view['wr_nogood']) ?></strong></span><?php } ?>
@ -164,9 +164,14 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
        <?php
            }
        }
-         ?>
+        ?>
    </section>

+    <?php
+    // SNS 보내기
+    include_once($board_skin_path."/view.sns.skin.php");
+    ?>
+
    <?php
    // 코멘트 입출력
    include_once('./view_comment.php');
--- a/skin/board/gallery/view.sns.skin.php
+++ b/skin/board/gallery/view.sns.skin.php
@ -0,0 +1,39 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+if (!$board['bo_use_sns']) return;
+
+$sns_msg = urlencode(str_replace('\"', '"', $view['subject']));
+$sns_url = googl_short_url('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+$msg_url = $sns_msg.' : '.$sns_url;
+
+// 카카오톡 매뉴얼 : https://github.com/kakao/kakaolink-web
+$kakao_appid   = $_SERVER['HTTP_HOST']; // Mobile Site Domain 정확히 입력하지 않을 경우 이용이 제한될 수 있습니다.
+$kakao_appname = $g4['title'];
+
+$facebook_url  = 'http://www.facebook.com/sharer/sharer.php?s=100&p[url]='.$sns_url.'&p[title]='.$sns_msg;
+$twitter_url   = 'http://twitter.com/home?status='.$msg_url;
+$me2day_url    = 'http://me2day.net/posts/new?new_post[body]='.$msg_url;
+$gplus_url     = 'https://plus.google.com/share?url='.$sns_url;
+
+/*
+$sns_send  = G4_BBS_URL.'/sns_send.php?longurl='.urlencode('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+//$sns_send .= '&amp;title='.urlencode(utf8_strcut(get_text($view['subject']),140));
+$sns_send .= '&amp;title='.$sns_msg;
+*/
+
+?>
+<ul id="bo_v_sns">
+    <li><a href="<?php echo $facebook_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/facebook.png" alt="페이스북으로 보내기"></a></li>
+    <li><a href="<?php echo $twitter_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/twitter.png" alt="트위터로 보내기"></a></li>
+    <li><a href="<?php echo $me2day_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/me2day.png" alt="미투데이로 보내기"></a></li>
+    <li><a href="<?php echo $gplus_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/gplus.png" alt="구글플러스로 보내기"></a></li>
+    <?php
+    if (G4_IS_MOBILE) {
+        $kakao_url = 'kakaolink://sendurl?msg='.$sns_msg.'&amp;url='.$sns_url.'&amp;appid='.$kakao_appid.'&amp;appver=1.0&amp;type=link&amp;appname='.$kakao_appname.'&amp;apiver=2.0';
+    ?>
+    <li><a href="<?php echo $kakao_url; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/kakaotalk.png" alt="카카오톡으로 보내기"></a></li>
+    <?php
+    }
+    ?>
+</ul>
--- a/skin/board/gallery/view_comment.skin.php
+++ b/skin/board/gallery/view_comment.skin.php
@ -73,230 +73,233 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대

 </section>

-<?php
-if ($is_comment_write) {
-    if($w == '') $w = 'c';
- ?>
-<section id="bo_vc_w">
-    <h2>댓글쓰기</h2>
-    <form name="fviewcomment" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
-    <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
-    <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
-    <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
-    <input type="hidden" name="comment_id" value="<?php echo $c_id ?>" id="comment_id">
-    <input type="hidden" name="sca" value="<?php echo $sca ?>">
-    <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
-    <input type="hidden" name="stx" value="<?php echo $stx ?>">
-    <input type="hidden" name="spt" value="<?php echo $spt ?>">
-    <input type="hidden" name="page" value="<?php echo $page ?>">
-    <input type="hidden" name="is_good" value="">
+<?php if ($is_comment_write) {
+        if($w == '')
+            $w = 'c';
+    ?>
+    <aside id="bo_vc_w">
+        <h2>댓글쓰기</h2>
+        <form name="fviewcomment" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
+        <input type="hidden" name="w" value="<?php echo $w ?>" id="w">
+        <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
+        <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
+        <input type="hidden" name="comment_id" value="<?php echo $c_id ?>" id="comment_id">
+        <input type="hidden" name="sca" value="<?php echo $sca ?>">
+        <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
+        <input type="hidden" name="stx" value="<?php echo $stx ?>">
+        <input type="hidden" name="spt" value="<?php echo $spt ?>">
+        <input type="hidden" name="page" value="<?php echo $page ?>">
+        <input type="hidden" name="is_good" value="">

-    <table class="frm_tbl">
-    <tbody>
-    <?php if ($is_guest) { ?>
-    <tr>
-        <th scope="row"><label for="wr_name">이름<strong class="sound_only">필수</strong></label></th>
-        <td><input type="text" name="wr_name" id="wr_name"  required class="frm_input required" size="5" maxLength="20"></td>
-    </tr>
-    <tr>
-        <th scope="row"><label for="wr_password">패스워드<strong class="sound_only">필수</strong></label></th>
-        <td><input type="password" name="wr_password" id="wr_password"  required class="frm_input required" size="10" maxLength="20"></td>
-    </tr>
-    <?php } ?>
-    <tr>
-        <th scope="row"><label for="wr_secret">비밀글사용</label></th>
-        <td><input type="checkbox" name="wr_secret" value="secret" id="wr_secret"></td>
-    </tr>
-    <?php if ($is_guest) { ?>
-    <tr>
-        <th scope="row">자동등록방지</th>
-        <td><?php echo $captcha_html; ?></td>
-    </tr>
-    <?php } ?>
-    <tr>
-        <th scope="row">내용</th>
-        <td>
-            <?php if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?php } ?>
-            <textarea id="wr_content" name="wr_content" maxlength="10000" required class="required" title="댓글 내용"
-            <?php if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?php } ?>><?php echo $c_wr_content;  ?></textarea>
-            <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
-            <script>
-            $("textarea#wr_content[maxlength]").live("keyup change", function() {  
-                var str = $(this).val()  
-                var mx = parseInt($(this).attr("maxlength"))  
-                if (str.length > mx) {  
-                    $(this).val(str.substr(0, mx));
-                    return false;  
-                }  
-            });
-            </script>
-        </td>
-    </tr>
-    </tbody>
-    </table>
+        <table class="frm_tbl">
+        <tbody>
+        <?php if ($is_guest) { ?>
+        <tr>
+            <th scope="row"><label for="wr_name">이름<strong class="sound_only">필수</strong></label></th>
+            <td><input type="text" name="wr_name" id="wr_name"  required class="frm_input required" size="5" maxLength="20" value="<?php echo get_cookie("ck_sns_name"); ?>"></td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="wr_password">패스워드<strong class="sound_only">필수</strong></label></th>
+            <td><input type="password" name="wr_password" id="wr_password"  required class="frm_input required" size="10" maxLength="20"></td>
+        </tr>
+        <?php } ?>
+        <tr>
+            <th scope="row"><label for="wr_secret">비밀글사용</label></th>
+            <td><input type="checkbox" name="wr_secret" value="secret" id="wr_secret"></td>
+        </tr>
+        <?php if ($is_guest) { ?>
+        <tr>
+            <th scope="row">자동등록방지</th>
+            <td><?php echo $captcha_html; ?></td>
+        </tr>
+        <?php } ?>

-    <div class="btn_confirm">
-        <input type="submit" value="댓글등록" id="btn_submit" class="btn_submit" accesskey="s">
-    </div>
+        <?php
+        include_once($board_skin_path."/view_comment.sns.skin.php");
+        ?>

-    </form>
-</section>
+        <tr>
+            <th scope="row">내용</th>
+            <td>
+                <?php if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?php } ?>
+                <textarea id="wr_content" name="wr_content" maxlength="10000" required class="required"
+                <?php if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?php } ?>><?php echo $c_wr_content;  ?></textarea>
+                <?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
+                <script>
+                $("textarea#wr_content[maxlength]").live("keyup change", function() {  
+                    var str = $(this).val()  
+                    var mx = parseInt($(this).attr("maxlength"))  
+                    if (str.length > mx) {  
+                        $(this).val(str.substr(0, mx));
+                        return false;  
+                    }  
+                });
+                </script>
+            </td>
+        </tr>
+        </tbody>
+        </table>

-<script>
-var save_before = '';
-var save_html = document.getElementById('bo_vc_w').innerHTML;
+        <div class="btn_confirm">
+            <input type="submit" class="btn_submit" value="댓글등록">
+        </div>
+
+        </form>
+    </aside>
+
+    <script>
+    var save_before = '';
+    var save_html = document.getElementById('bo_vc_w').innerHTML;
+
+    function good_and_write()
+    {
+        var f = document.fviewcomment;
+        if (fviewcomment_submit(f)) {
+            f.is_good.value = 1;
+            f.submit();
+        } else {
+            f.is_good.value = 0;
+        }
+    }
+
+    function fviewcomment_submit(f)
+    {
+        var pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자

-function good_and_write()
-{
-    var f = document.fviewcomment;
-    if (fviewcomment_submit(f)) {
-        f.is_good.value = 1;
-        f.submit();
-    } else {
        f.is_good.value = 0;
-    }
-}

-function fviewcomment_submit(f)
-{
-    var pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자
-
-    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({
-        url: g4_bbs_url+"/filter.ajax.php",
-        type: "POST",
-        data: {
-            "subject": "",
-            "content": f.wr_content.value
-        },
-        dataType: "json",
-        async: false,
-        cache: false,
-        success: function(data, textStatus) {
-            subject = data.subject;
-            content = data.content;
-        }
-    });
-
-    if (content) {
-        alert("내용에 금지단어('"+content+"')가 포함되어있습니다");
-        f.wr_content.focus();
-        return false;
-    }
-
-    // 양쪽 공백 없애기
-    var pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자
-    document.getElementById('wr_content').value = document.getElementById('wr_content').value.replace(pattern, "");
-    if (char_min > 0 || char_max > 0)
-    {
-        check_byte('wr_content', 'char_count');
-        var cnt = parseInt(document.getElementById('char_count').innerHTML);
-        if (char_min > 0 && char_min > cnt)
+        /*
+        var s;
+        if (s = word_filter_check(document.getElementById('wr_content').value))
        {
-            alert("댓글은 "+char_min+"글자 이상 쓰셔야 합니다.");
-            return false;
-        } else if (char_max > 0 && char_max < cnt)
-        {
-            alert("댓글은 "+char_max+"글자 이하로 쓰셔야 합니다.");
+            alert("내용에 금지단어('"+s+"')가 포함되어있습니다");
+            document.getElementById('wr_content').focus();
            return false;
        }
-    }
-    else if (!document.getElementById('wr_content').value)
-    {
-        alert("댓글을 입력하여 주십시오.");
-        return false;
-    }
+        */

-    if (typeof(f.wr_name) != 'undefined')
-    {
-        f.wr_name.value = f.wr_name.value.replace(pattern, "");
-        if (f.wr_name.value == '')
-        {
-            alert('이름이 입력되지 않았습니다.');
-            f.wr_name.focus();
+        var subject = "";
+        var content = "";
+        $.ajax({
+            url: g4_bbs_url+"/filter.ajax.php",
+            type: "POST",
+            data: {
+                "subject": "",
+                "content": f.wr_content.value
+            },
+            dataType: "json",
+            async: false,
+            cache: false,
+            success: function(data, textStatus) {
+                subject = data.subject;
+                content = data.content;
+            }
+        });
+
+        if (content) {
+            alert("내용에 금지단어('"+content+"')가 포함되어있습니다");
+            f.wr_content.focus();
            return false;
        }
-    }

-    if (typeof(f.wr_password) != 'undefined')
-    {
-        f.wr_password.value = f.wr_password.value.replace(pattern, "");
-        if (f.wr_password.value == '')
+        // 양쪽 공백 없애기
+        var pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자
+        document.getElementById('wr_content').value = document.getElementById('wr_content').value.replace(pattern, "");
+        if (char_min > 0 || char_max > 0)
        {
-            alert('패스워드가 입력되지 않았습니다.');
-            f.wr_password.focus();
+            check_byte('wr_content', 'char_count');
+            var cnt = parseInt(document.getElementById('char_count').innerHTML);
+            if (char_min > 0 && char_min > cnt)
+            {
+                alert("댓글은 "+char_min+"글자 이상 쓰셔야 합니다.");
+                return false;
+            } else if (char_max > 0 && char_max < cnt)
+            {
+                alert("댓글은 "+char_max+"글자 이하로 쓰셔야 합니다.");
+                return false;
+            }
+        }
+        else if (!document.getElementById('wr_content').value)
+        {
+            alert("댓글을 입력하여 주십시오.");
            return false;
        }
-    }

-    <?php if($is_guest) echo chk_captcha_js();  ?>
-
-    document.getElementById("btn_submit").disabled = "disabled";
-
-    return true;
-}
-
-function comment_box(comment_id, work)
-{
-    var el_id;
-    // 댓글 아이디가 넘어오면 답변, 수정
-    if (comment_id)
-    {
-        if (work == 'c')
-            el_id = 'reply_' + comment_id;
-        else
-            el_id = 'edit_' + comment_id;
-    }
-    else
-        el_id = 'bo_vc_w';
-
-    if (save_before != el_id)
-    {
-        if (save_before)
+        if (typeof(f.wr_name) != 'undefined')
        {
-            document.getElementById(save_before).style.display = 'none';
-            document.getElementById(save_before).innerHTML = '';
+            f.wr_name.value = f.wr_name.value.replace(pattern, "");
+            if (f.wr_name.value == '')
+            {
+                alert('이름이 입력되지 않았습니다.');
+                f.wr_name.focus();
+                return false;
+            }
        }

-        document.getElementById(el_id).style.display = '';
-        document.getElementById(el_id).innerHTML = save_html;
-        // 댓글 수정
-        if (work == 'cu')
+        if (typeof(f.wr_password) != 'undefined')
        {
-            document.getElementById('wr_content').value = document.getElementById('save_comment_' + comment_id).value;
-            if (typeof char_count != 'undefined')
-                check_byte('wr_content', 'char_count');
-            if (document.getElementById('secret_comment_'+comment_id).value)
-                document.getElementById('wr_secret').checked = true;
+            f.wr_password.value = f.wr_password.value.replace(pattern, "");
+            if (f.wr_password.value == '')
+            {
+                alert('패스워드가 입력되지 않았습니다.');
+                f.wr_password.focus();
+                return false;
+            }
+        }
+
+        <?php if($is_guest) echo chk_captcha_js();  ?>
+
+        return true;
+    }
+
+    function comment_box(comment_id, work)
+    {
+        var el_id;
+        // 댓글 아이디가 넘어오면 답변, 수정
+        if (comment_id)
+        {
+            if (work == 'c')
+                el_id = 'reply_' + comment_id;
            else
-                document.getElementById('wr_secret').checked = false;
+                el_id = 'edit_' + comment_id;
        }
+        else
+            el_id = 'bo_vc_w';

-        document.getElementById('comment_id').value = comment_id;
-        document.getElementById('w').value = work;
+        if (save_before != el_id)
+        {
+            if (save_before)
+            {
+                document.getElementById(save_before).style.display = 'none';
+                document.getElementById(save_before).innerHTML = '';
+            }

-        save_before = el_id;
+            document.getElementById(el_id).style.display = '';
+            document.getElementById(el_id).innerHTML = save_html;
+            // 댓글 수정
+            if (work == 'cu')
+            {
+                document.getElementById('wr_content').value = document.getElementById('save_comment_' + comment_id).value;
+                if (typeof char_count != 'undefined')
+                    check_byte('wr_content', 'char_count');
+                if (document.getElementById('secret_comment_'+comment_id).value)
+                    document.getElementById('wr_secret').checked = true;
+                else
+                    document.getElementById('wr_secret').checked = false;
+            }
+
+            document.getElementById('comment_id').value = comment_id;
+            document.getElementById('w').value = work;
+
+            save_before = el_id;
+        }
    }
-}

-function comment_delete()
-{
-    return confirm("이 댓글을 삭제하시겠습니까?");
-}
+    function comment_delete()
+    {
+        return confirm("이 댓글을 삭제하시겠습니까?");
+    }

-comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님)
-</script>
-<?php } ?>
+    comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님)
+    </script>
+    <?php } ?>
--- a/skin/board/gallery/view_comment.sns.skin.php
+++ b/skin/board/gallery/view_comment.sns.skin.php
@ -0,0 +1,130 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+if (!$board['bo_use_sns']) return;
+?>
+<tr>
+    <th scope="row">SNS 등록</th>
+    <td>
+        <ul id="bo_vc_sns">
+        <?php
+        //============================================================================
+        // 페이스북
+        //----------------------------------------------------------------------------
+        if ($config['cf_facebook_appid']) {
+            include_once(G4_SNS_PATH."/facebook/src/facebook.php");
+            $facebook = new Facebook(array(
+                'appId'  => $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 '<li>';
+            if ($facebook_user) {
+                echo '<img src="'.G4_SNS_URL.'/icon/facebook.png" id="facebook_icon">';
+                echo '<label for="" class="sound_only">페이스북 동시 등록</label>';
+                echo '<input type="checkbox" name="facebook_checked" id="facebook_checked" '.(get_cookie('ck_facebook_checked')?'checked':'').' value="1">';
+            } else {
+                $facebook_url = $facebook->getLoginUrl(array("redirect_uri"=>G4_SNS_URL."/facebook/callback.php", "scope"=>"publish_stream,read_stream,offline_access", "display"=>"popup"));
+
+                echo '<a href="'.$facebook_url.'" id="facebook_url" onclick="return false;"><img src="'.G4_SNS_URL.'/icon/facebook'.($facebook_user?'':'_off').'.png" id="facebook_icon"></a>';
+                echo '<label for="" class="sound_only">페이스북 동시 등록</label>';
+                echo '<input type="checkbox" name="facebook_checked" id="facebook_checked" disabled value="1">';
+                echo '<script>$(function(){ $("#facebook_url").click(function(){ window.open(this.href, "facebook_url", "width=600,height=250"); }); });</script>';
+            }
+            echo '</li>';
+        }
+        //============================================================================
+
+
+        //============================================================================
+        // 트위터
+        //----------------------------------------------------------------------------
+        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 '<li>';
+            if ($twitter_user) {
+                echo '<img src="'.G4_SNS_URL.'/icon/twitter.png" id="twitter_icon">';
+                echo '<label for="" class="sound_only">트위터 동시 등록</label>';
+                echo '<input type="checkbox" name="twitter_checked" id="twitter_checked" '.(get_cookie('ck_twitter_checked')?'checked':'').' value="1">';
+            } else {
+                echo '<a href="'.$twitter_url.'" id="twitter_url" onclick="return false;"><img src="'.G4_SNS_URL.'/icon/twitter'.($twitter_user?'':'_off').'.png" id="twitter_icon"></a>';
+                echo '<label for="" class="sound_only">트위터 동시 등록</label>';
+                echo '<input type="checkbox" name="twitter_checked" id="twitter_checked" disabled value="1">';
+                echo '<script>$(function(){ $("#twitter_url").click(function(){ window.open(this.href, "twitter_url", "width=600,height=250"); }); });</script>';
+            }
+            echo '</li>';
+        }
+        //============================================================================
+
+
+        //============================================================================
+        // 미투데이
+        //----------------------------------------------------------------------------
+        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 '<li>';
+            if ($me2day_user) {
+                echo '<img src="'.G4_SNS_URL.'/icon/me2day.png" id="me2day_icon">';
+                echo '<label for="" class="sound_only">미투데이 동시 등록</label>';
+                echo '<input type="checkbox" name="me2day_checked" id="me2day_checked" '.(get_cookie('ck_me2day_checked')?'checked':'').' value="1">';
+            } else {
+                echo '<a href="'.$me2day_url.'" id="me2day_url" onclick="return false;"><img src="'.G4_SNS_URL.'/icon/me2day'.($me2day_user?'':'_off').'.png" id="me2day_icon"></a>';
+                echo '<label for="" class="sound_only">미투데이 동시 등록</label>';
+                echo '<input type="checkbox" name="me2day_checked" id="me2day_checked" disabled value="1">';
+                echo '<script>$(function(){ $("#me2day_url").click(function(){ window.open(this.href, "me2day_url", "width=1000,height=800"); }); });</script>';
+            }
+            echo '</li>';
+        }
+        //============================================================================
+        ?>
+        </ul>
+    </td>
+</tr>
--- a/skin/board/gallery/write.skin.php
+++ b/skin/board/gallery/write.skin.php
@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

 <link rel="stylesheet" href="<?php echo $board_skin_url ?>/style.css">

-<h1 id="container_title"><?php echo $g4['title'] ?></h1>
+<h1 id="wrapper_title"><?php echo $g4['title'] ?></h1>

 <form name="fwrite" id="fwrite" action="<?php echo $action_url ?>" onsubmit="return fwrite_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off" style="width:<?php echo $width; ?>">
 <input type="hidden" name="w" value="<?php echo $w ?>">
--- a/skin/connect/basic/current_connect.skin.php
+++ b/skin/connect/basic/current_connect.skin.php
@ -18,18 +18,18 @@ for ($i=0; $i<count($list); $i++) {
    $location = conv_content($list[$i]['lo_location'], 0);
    // 최고관리자에게만 허용
    // 이 조건문은 가능한 변경하지 마십시오.
-    if ($list[$i]['lo_url'] && $is_admin == 'super') $display_location = '<a href="'.$list[$i]['lo_url'].'">'.$location.'</a>';
+    if ($list[$i]['lo_url'] && $is_admin == 'super') $display_location = "<a href=\"".$list[$i]['lo_url']."\">".$location."</a>";
    else $display_location = $location;
 ?>
    <tr>
        <td class="td_num"><?php echo $list[$i]['num'] ?></td>
-        <td class="td_name sv_use"><?php echo $list[$i]['name'] ?></td>
+        <td class="td_name"><?php echo $list[$i]['name'] ?></td>
        <td><?php echo $display_location ?></td>
    </tr>
 <?php
 }
 if ($i == 0)
-    echo '<tr><td colspan="3" class="empty_table">현재 접속자가 없습니다.</td></tr>';
+    echo "<tr><td colspan=\"3\" class=\"empty_table\">현재 접속자가 없습니다.</td></tr>";
 ?>
 </tbody>
 </table>
--- a/skin/latest/basic/latest.skin.php
+++ b/skin/latest/basic/latest.skin.php
@ -4,8 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

 <link rel="stylesheet" href="<?php echo $latest_skin_url ?>/style.css">

-<section class="lat">
-    <h2 class="lat_title"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><?php echo $bo_subject ?></a></h2>
+<div class="lt">
+    <strong class="lt_title"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><?php echo $bo_subject ?></a></strong>
    <ul>
    <?php for ($i=0; $i<count($list); $i++) {  ?>
        <li>
@ -37,5 +37,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    <li>게시물이 없습니다.</li>
    <?php }  ?>
    </ul>
-    <div class="lat_more"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><span class="sound_only"><?php echo $bo_subject ?></span>더보기</a></div>
-</section>
+    <div class="lt_more"><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $bo_table ?>"><span class="sound_only"><?php echo $bo_subject ?></span>더보기</a></div>
+</div>
--- a/skin/latest/basic/style.css
+++ b/skin/latest/basic/style.css
@ -1,7 +1,7 @@
 /* 새글 스킨 (latest) */
-.lat_pc {float:left;margin-left:20px}
-.lat {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #ddd}
-.lat ul {margin:0 0 10px;padding:0;list-style:none}
-.lat li {padding:3px 0}
-.lat_title {display:block;padding:10px 0 8px}
-.lat_more {position:absolute;top:10px;right:0}
+.lt_pc {float:left;margin-left:20px}
+.lt {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #ddd}
+.lt ul {margin:0 0 10px;padding:0;list-style:none}
+.lt li {padding:3px 0}
+.lt_title {display:block;padding:10px 0 8px}
+.lt_more {position:absolute;top:10px;right:0}
--- a/skin/member/basic/formmail.skin.php
+++ b/skin/member/basic/formmail.skin.php
@ -93,4 +93,4 @@ function fformmail_submit(f)

    return true;
 }
-</script>
+</script>
--- a/skin/member/basic/login.skin.php
+++ b/skin/member/basic/login.skin.php
@ -54,4 +54,4 @@ function flogin_submit(f)
 {
    return true;
 }
-</script>
+</script>
--- a/skin/member/basic/member_confirm.skin.php
+++ b/skin/member/basic/member_confirm.skin.php
@ -44,4 +44,4 @@ function fmemberconfirm_submit(f)

    return true;
 }
-</script>
+</script>
--- a/skin/member/basic/memo_form.skin.php
+++ b/skin/member/basic/memo_form.skin.php
@ -56,4 +56,4 @@ function fmemoform_submit(f)

    return true;
 }
-</script>
+</script>
--- a/skin/member/basic/memo_view.skin.php
+++ b/skin/member/basic/memo_view.skin.php
@ -40,6 +40,7 @@ else {
            <?php echo conv_content($memo['me_memo'], 0) ?>
        </p>
    </article>
+
    <div class="btn_win">
        <?php if($prev_link) {  ?>
        <a href="<?php echo $prev_link ?>">이전쪽지</a>
--- a/skin/member/basic/password_lost.skin.php
+++ b/skin/member/basic/password_lost.skin.php
@ -41,4 +41,4 @@ $(function() {
    var left = sw / 2 - cw / 2;
    moveTo(left, top);
 });
-</script>
+</script>
--- a/skin/member/basic/profile.skin.php
+++ b/skin/member/basic/profile.skin.php
@ -42,4 +42,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    <div class="btn_win">
        <button type="button" onclick="window.close();">창닫기</button>
    </div>
-</div>
+</div>
--- a/skin/member/basic/register_form.skin.php
+++ b/skin/member/basic/register_form.skin.php
@ -8,11 +8,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <form id="fregisterform" name="fregisterform" action="<?php echo $register_action_url ?>" onsubmit="return fregisterform_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off">
 <input type="hidden" name="w" value="<?php echo $w ?>">
 <input type="hidden" name="url" value="<?php echo $urlencode ?>">
-<?php if (isset($member['mb_sex'])) {  ?><input type="hidden" name="mb_sex" value="<?php echo $member['mb_sex'] ?>"><?php } ?>
+<input type="hidden" name="agree" value="<?php echo $agree ?>">
+<input type="hidden" name="agree2" value="<?php echo $agree2 ?>">
+<?php if (isset($member['mb_sex'])) {  ?><input type="hidden" name="mb_sex" value="<?php echo $member['mb_sex'] ?>"><?php }  ?>
 <?php if (isset($member['mb_nick_date']) && $member['mb_nick_date'] > date("Y-m-d", G4_SERVER_TIME - ($config['cf_nick_modify'] * 86400))) { // 별명수정일이 지나지 않았다면  ?>
 <input type="hidden" name="mb_nick_default" value="<?php echo $member['mb_nick'] ?>">
 <input type="hidden" name="mb_nick" value="<?php echo $member['mb_nick'] ?>">
-<?php } ?>
+<?php }  ?>

 <table class="frm_tbl">
 <caption>사이트 이용정보 입력</caption>
@ -39,19 +41,10 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
    <th scope="row"><label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label></th>
    <td>
-        <?php if ($w=="u" && $config['cf_kcpcert_use']) { ?>
-        <span class="frm_info">휴대폰 본인확인 후에는 이름과 휴대폰번호가 자동 입력되며 수동으로 입력할수 없게 됩니다.</span>
-        <?php } ?>
-        <input type="text" id="reg_mb_name" name="mb_name" value="<?php echo $member['mb_name'] ?>" <?php echo $required ?> <?php if ($w=='u') echo 'readonly'; ?> class="frm_input nospace <?php echo $required ?> <?php echo $readonly ?>" size="10">
-        <?php if ($w=="u" && $config['cf_kcpcert_use']) { ?>
-        <button type="button" id="win_kcpcert" class="btn_frmline">휴대폰 본인확인</button>
-        <noscript>휴대폰 본인확인을 위해서는 자바스크립트 사용이 가능해야합니다.</noscript>
-        <?php } ?>
-        <?php if ($member['mb_hp_certify']) { ?>
-        <div id="msg_hp_certify">
-            휴대폰 <strong>본인확인</strong><?php if ($member['mb_hp_certify']) { ?> 및 <strong>성인인증</strong><?php } ?> 완료
-        </div>
-        <?php } ?>
+        <?php /* if ($w=='') { echo "<span class=\"frm_info\">공백없이 한글만 입력하세요.</span>"; } */ ?>
+        <?php echo $config['cf_kcpcert_use'] ? '<span class="frm_info">이름과 휴대폰번호는 아래의 휴대폰 본인확인 기능을 사용하여 입력해 주십시오.</span>' : '';  ?>
+        <?php echo ($config['cf_kcpcert_use']=='test') ? '<span class="frm_info">테스트의 경우 이동통신사는 반드시 KT를 선택해 주십시오. 나머지 항목은 임의로 입력하시면 됩니다.</span>' : '';  ?>
+        <input type="text" id="reg_mb_name" name="mb_name" value="<?php echo $member['mb_name'] ?>" <?php echo $required ?> <?php if ($config['cf_kcpcert_use']!=''||$w=='u') echo 'readonly'; ?> class="frm_input nospace <?php echo $required ?> <?php echo $readonly ?>" size="10">
    </td>
 </tr>
 <?php if ($req_nick) {  ?>
@ -67,17 +60,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
        <span id="msg_mb_nick"></span>
    </td>
 </tr>
-<?php } ?>
+<?php }  ?>

 <tr>
    <th scope="row"><label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label></th>
    <td>
        <?php if ($config['cf_use_email_certify']) {  ?>
        <span class="frm_info">
-            <?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?>
-            <?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; } ?>
+            <?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; }  ?>
+            <?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; }  ?>
        </span>
-        <?php } ?>
+        <?php }  ?>
        <input type="hidden" name="old_email" value="<?php echo $member['mb_email'] ?>">
        <input type="text" name="mb_email" value="<?php echo isset($member['mb_email'])?$member['mb_email']:''; ?>" id="reg_mb_email" required class="frm_input email required" size="50" maxlength="100">
    </td>
@ -88,27 +81,37 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    <th scope="row"><label for="reg_mb_homepage">홈페이지<?php if ($config['cf_req_homepage']){ ?><strong class="sound_only">필수</strong><?php } ?></label></th>
    <td><input type="text" name="mb_homepage" value="<?php echo $member['mb_homepage'] ?>" id="reg_mb_homepage" <?php echo $config['cf_req_homepage']?"required":""; ?> class="frm_input <?php echo $config['cf_req_homepage']?"required":""; ?>" size="50" maxlength="255"></td>
 </tr>
-<?php } ?>
+<?php }  ?>

 <?php if ($config['cf_use_tel']) {  ?>
 <tr>
    <th scope="row"><label for="reg_mb_tel">전화번호<?php if ($config['cf_req_tel']) { ?><strong class="sound_only">필수</strong><?php } ?></label></th>
    <td><input type="text" name="mb_tel" value="<?php echo $member['mb_tel'] ?>" id="reg_mb_tel" <?php echo $config['cf_req_tel']?"required":""; ?> class="frm_input <?php echo $config['cf_req_tel']?"required":""; ?>" maxlength="20"></td>
 </tr>
-<?php } ?>
+<?php }  ?>

-<?php if ($config['cf_use_hp']) {  ?>
+<?php if ($config['cf_use_hp'] || $config['cf_kcpcert_use']) {  ?>
 <tr>
    <th scope="row"><label for="reg_mb_hp">휴대폰번호<?php if ($config['cf_req_hp']) { ?><strong class="sound_only">필수</strong><?php } ?></label></th>
-    <td><input type="text" name="mb_hp" value="<?php echo $member['mb_hp'] ?>" id="reg_mb_hp" <?php echo ($config['cf_req_hp'])?"required":""; ?> class="frm_input <?php echo ($config['cf_req_hp'])?"required":""; ?>" maxlength="20"></td>
+    <td>
+        <?php if ($config['cf_kcpcert_use']) { ?>
+        <span class="frm_info">휴대폰번호는 휴대폰 본인확인 기능을 이용하여 입력하세요.</span>
+        <?php } ?>
+        <input type="text" name="mb_hp" value="<?php echo $member[mb_hp] ?>" id="reg_mb_hp" <?php echo ($config['cf_req_hp']||$config['cf_kcpcert_use'])?"required":""; ?> class="frm_input <?php echo ($config['cf_req_hp']||$config['cf_kcpcert_use'])?"required":""; ?>" <?php echo $config['cf_kcpcert_use']?"readonly":""; ?>  maxlength="20">
+        <?php if ($config['cf_kcpcert_use']) { ?>
+        <input type="hidden" name="old_mb_hp" value="<?php echo $member['mb_hp'] ?>">
+        <button type="button" id="win_kcpcert" class="btn_frmline">휴대폰 본인확인</button>
+        <noscript>휴대폰 본인확인을 위해서는 자바스크립트 사용이 가능해야합니다.</noscript>
+        <?php } ?>
+    </td>
 </tr>
-<?php } ?>
+<?php }  ?>

 <?php if ($config['cf_use_addr']) { ?>
 <tr>
    <th scope="row">
        주소
-        <?php if ($config['cf_req_addr']) { ?><strong class="sound_only">필수</strong><?php } ?>
+        <?php if ($config['cf_req_addr']) { ?><strong class="sound_only">필수</strong><?php }  ?>
    </th>
    <td>
        <label for="reg_mb_zip1" class="sound_only">우편번호 앞자리<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
@ -129,7 +132,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
        </script>
    </td>
 </tr>
-<?php } ?>
+<?php }  ?>
 </table>

 <table class="frm_tbl">
@ -139,14 +142,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    <th scope="row"><label for="reg_mb_signature">서명<?php if ($config['cf_req_signature']){ ?><strong class="sound_only">필수</strong><?php } ?></label></th>
    <td><textarea name="mb_signature" id="reg_mb_signature" <?php echo $config['cf_req_signature']?"required":""; ?> class="<?php echo $config['cf_req_signature']?"required":""; ?>"><?php echo $member['mb_signature'] ?></textarea></td>
 </tr>
-<?php } ?>
+<?php }  ?>

 <?php if ($config['cf_use_profile']) {  ?>
 <tr>
    <th scope="row"><label for="reg_mb_profile">자기소개</label></th>
    <td><textarea name="mb_profile" id="reg_mb_profile" <?php echo $config['cf_req_profile']?"required":""; ?> class="<?php echo $config['cf_req_profile']?"required":""; ?>"><?php echo $member['mb_profile'] ?></textarea></td>
 </tr>
-<?php } ?>
+<?php }  ?>

 <?php if ($config['cf_use_member_icon'] && $member['mb_level'] >= $config['cf_icon_level']) {  ?>
 <tr>
@ -157,14 +160,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
            gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
        </span>
        <input type="file" name="mb_icon" id="reg_mb_icon" class="frm_input">
-        <?php if ($w == 'u' && file_exists($mb_icon_path)) {  ?>
-        <img src="<?php echo $mb_icon_url; ?>" alt="회원아이콘">
+        <?php if ($w == 'u' && file_exists($mb_icon)) {  ?>
        <input type="checkbox" name="del_mb_icon" value="1" id="del_mb_icon">
        <label for="del_mb_icon">삭제</label>
-        <?php } ?>
+        <?php }  ?>
    </td>
 </tr>
-<?php } ?>
+<?php }  ?>

 <tr>
    <th scope="row"><label for="reg_mb_mailling">메일링서비스</label></th>
@ -182,7 +184,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
        휴대폰 문자메세지를 받겠습니다.
    </td>
 </tr>
-<?php } ?>
+<?php }  ?>

 <?php if (isset($member['mb_open_date']) && $member['mb_open_date'] <= date("Y-m-d", G4_SERVER_TIME - ($config['cf_open_modify'] * 86400)) || empty($member['mb_open_date'])) { // 정보공개 수정일이 지났다면 수정가능  ?>
 <tr>
@ -207,14 +209,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
        <input type="hidden" name="mb_open" value="<?php echo $member['mb_open'] ?>">
    </td>
 </tr>
-<?php } ?>
+<?php }  ?>

 <?php if ($w == "" && $config['cf_use_recommend']) {  ?>
 <tr>
    <th scope="row"><label for="reg_mb_recommend">추천인아이디</label></th>
-    <td><input type="text" name="mb_recommend" id="reg_mb_recommend" class="frm_input"></td>
+    <td><input type="text" name="mb_recommend" id="reg_mb_recommend" class="frm_input" required></td>
 </tr>
-<?php } ?>
+<?php }  ?>

 <tr>
    <th scope="row">자동등록방지</th>
@ -226,7 +228,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    <p>
        작성하신 내용를 발송하시려면 <strong><?php echo $w==''?'회원가입':'정보수정'; ?></strong> 버튼을, 작성을 취소하고 창을 닫으시려면 <strong>취소</strong> 링크를 누르세요.
    </p>
-    <input type="submit" value="<?php echo $w==''?'회원가입':'정보수정'; ?>" id="btn_submit" class="btn_submit" accesskey="s">
+    <input type="submit" value="<?php echo $w==''?'회원가입':'정보수정'; ?>" class="btn_submit" accesskey="s">
    <a href="<?php echo $g4['path'] ?>/" class="btn_cancel">취소</a>
 </div>
 </form>
@ -234,13 +236,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <?php
 if ($config['cf_kcpcert_use']) {
    // 휴대폰인증 form
-    include_once(G4_KCPCERT_PATH.'/kcpcert_form.php');
+    include_once(G4_KCP_PATH.'/kcpcert_form.php');
 ?>
+
 <script>
 $(function() {
+    $("#reg_zip_find").css("display", "inline-block");
+    $("#reg_mb_zip1, #reg_mb_zip2, #reg_mb_addr1").attr("readonly", true);
+
    // 휴대폰인증
    $('#win_kcpcert').click(function() {
-        auth_type_check();
+        auth_type_check($("#reg_mb_name").val());
        return false;
    });
 });
@ -248,11 +254,6 @@ $(function() {
 <?php } ?>

 <script>
-$(function() {
-    $("#reg_zip_find").css("display", "inline-block");
-    $("#reg_mb_zip1, #reg_mb_zip2, #reg_mb_addr1").attr("readonly", true);
-});
-
 // submit 최종 폼체크
 function fregisterform_submit(f)
 {
@ -295,6 +296,15 @@ function fregisterform_submit(f)
            f.mb_name.focus();
            return false;
        }
+
+        /*
+        var pattern = /([^가-힣\x20])/i;
+        if (pattern.test(f.mb_name.value)) {
+            alert('이름은 한글로 입력하십시오.');
+            f.mb_name.select();
+            return false;
+        }
+        */
    }

    // 별명 검사
@ -327,7 +337,7 @@ function fregisterform_submit(f)
        }
    }

-    if (typeof(f.mb_recommend) != 'undefined' && f.mb_recommend.value) {
+    if (typeof(f.mb_recommend) != 'undefined') {
        if (f.mb_id.value == f.mb_recommend.value) {
            alert('본인을 추천할 수 없습니다.');
            f.mb_recommend.focus();
@ -342,9 +352,32 @@ function fregisterform_submit(f)
        }
    }

-    <?php echo chk_captcha_js();  ?>
+    <?php if ($config['cf_kcpcert_use']) {  ?>
+    var error = "";
+    $.ajax({
+        url: "<?php echo G4_KCP_URL ?>/kcpcert.ajax.php",
+        type: "POST",
+        data: {
+            "w":        f.w.value,
+            "mb_name":  f.mb_name.value,
+            "mb_hp":    f.mb_hp.value,
+            "old_mb_hp":f.old_mb_hp.value
+        },
+        dataType: "json",
+        async: false,
+        cache: false,
+        success: function(data, textStatus) {
+            error = data.error;
+        }
+    });

-    document.getElementById("btn_submit").disabled = "disabled";
+    if (error) {
+        alert(error);
+        return false;
+    }
+    <?php } ?>
+
+    <?php echo chk_captcha_js();  ?>

    return true;
 }
--- a/skin/member/basic/register_form_update.head.skin.php
+++ b/skin/member/basic/register_form_update.head.skin.php
@ -0,0 +1,7 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+if ($config['cf_kcpcert_use']) {
+    include_once(G4_KCP_PATH.'/kcpcert.head.skin.php');
+}
+?>
--- a/skin/member/basic/register_form_update.tail.skin.php
+++ b/skin/member/basic/register_form_update.tail.skin.php
@ -0,0 +1,7 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+if ($config['cf_kcpcert_use']) {
+    include_once(G4_KCP_PATH.'/kcpcert.tail.skin.php');
+}
+?>
--- a/skin/member/basic/scrap.skin.php
+++ b/skin/member/basic/scrap.skin.php
@ -38,4 +38,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    <div class="btn_win">
        <button type="button" onclick="window.close();">창닫기</button>
    </div>
-</div>
+</div>
--- a/skin/member/basic/zip.skin.php
+++ b/skin/member/basic/zip.skin.php
@ -64,4 +64,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    }
    </script>
    <?php }  ?>
-</div>
+</div>
--- a/skin/new/basic/new.skin.php
+++ b/skin/new/basic/new.skin.php
@ -55,7 +55,7 @@ for ($i=0; $i<count($list); $i++)
    <td class="td_group"><a href="./new.php?gr_id=<?php echo $list[$i]['gr_id'] ?>"><?php echo $gr_subject ?></a></td>
    <td class="td_board"><a href="./board.php?bo_table=<?php echo $list[$i]['bo_table'] ?>"><?php echo $bo_subject ?></a></td>
    <td><a href="<?php echo $list[$i]['href'] ?>"><?php echo $list[$i]['comment'] ?><?php echo $wr_subject ?></a></td>
-    <td class="td_name sv_use"><div><?php echo $list[$i]['name'] ?></div></td>
+    <td class="td_name"><div><?php echo $list[$i]['name'] ?></div></td>
    <td class="td_date"><?php echo $list[$i]['datetime2'] ?></td>
 </tr>
 <?php }  ?>
--- a/skin/outlogin/basic/outlogin.skin.1.php
+++ b/skin/outlogin/basic/outlogin.skin.1.php
@ -4,7 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

 <link rel="stylesheet" href="<?php echo $outlogin_skin_url ?>/style.css">

-<aside id="ol_before" class="ol">
+<section id="ol_before" class="ol">
    <h2>회원로그인</h2>
    <!-- 로그인 전 외부로그인 시작 -->
    <form name="foutlogin" action="<?php echo $outlogin_action_url ?>" onsubmit="return fhead_submit(this);" method="post" autocomplete="off">
@ -25,12 +25,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        </div>
    </fieldset>
    </form>
-</aside>
+</section>

 <script>
 $omi = $('#ol_id');
 $omp = $('#ol_pw');
-$omp.css('display','inline-block').css('width',103);
+$omp.css('display','inline-block').css('width',104);
 $omi_label = $('#ol_idlabel');
 $omi_label.addClass('ol_idlabel');
 $omp_label = $('#ol_pwlabel');
--- a/skin/outlogin/basic/outlogin.skin.2.php
+++ b/skin/outlogin/basic/outlogin.skin.2.php
@ -5,9 +5,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 <link rel="stylesheet" href="<?php echo $outlogin_skin_url ?>/style.css">

 <!-- 로그인 후 외부로그인 시작 -->
-<aside id="ol_after" class="ol">
+<section id="ol_after" class="ol">
    <header id="ol_after_hd">
-        <h2>회원정보</h2>
+        <h2>나의 회원정보</h2>
        <strong><?php echo $nick ?>님</strong>
        <?php if ($is_admin == 'super' || $is_auth) {  ?><a href="<?php echo G4_ADMIN_URL ?>" class="btn_admin">관리자 모드</a><?php }  ?>
    </header>
@ -32,7 +32,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        <a href="<?php echo G4_BBS_URL ?>/member_confirm.php?url=register_form.php" id="ol_after_info">정보수정</a>
        <a href="<?php echo G4_BBS_URL ?>/logout.php" id="ol_after_logout">로그아웃</a>
    </footer>
-</aside>
+</section>

 <script>
 // 탈퇴의 경우 아래 코드를 연동하시면 됩니다.
--- a/skin/outlogin/basic/style.css
+++ b/skin/outlogin/basic/style.css
@ -5,9 +5,11 @@

 #ol_before {}
 #ol_before fieldset {position:relative}
-#ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:167px;height:22px;border:1px solid #b8c9c2;line-height:1.6em}
+#ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:168px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;line-height:1.6em}
+#ol_id:focus {border-color:#333;background:#21272e;color:#fff}
 .ol_idlabel {position:absolute;top:6px;left:5px;color:#333;font-size:0.95em}
-#ol_pw {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:167px;height:22px;border:1px solid #b8c9c2;vertical-align:top;line-height:1.6em}
+#ol_pw {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:168px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:top;line-height:1.6em}
+#ol_pw:focus {border-color:#333;background:#21272e;color:#fff}
 .ol_pwlabel {position:absolute;top:35px;left:5px;color:#333;font-size:0.95em}
 #auto_login {}
 #auto_login_label {letter-spacing:-0.1em}
@ -27,12 +29,14 @@
 #ol_after_private li {float:left}
 #ol_after_private a {display:block;padding-top:8px;height:37px;background:#f7f7f7;text-align:center}
 #ol_after_private a strong {display:block;padding-top:3px;color:#000;font-weight:normal}
-#ol_after_private a:focus, #ol_after_private a:hover {background:#333;color:#fff;text-decoration:none}
+#ol_after_private a:focus,
+#ol_after_private a:hover {background:#333;color:#fff;text-decoration:none}
 #ol_after_private a:focus strong,
 #ol_after_private a:hover strong {color:#fff;text-decoration:none}
 #ol_after_memo {width:50px;margin-right:1px}
-#ol_after_pt {width:79px;margin-right:1px}
+#ol_after_pt {width:80px;margin-right:1px}
 #ol_after_scrap {width:48px;line-height:2.6em !important}
 #ol_after_ft {text-align:justify}
-#ol_after_ft a {display:inline-block;width:87px;height:22px;background:#333;color:#fff;text-align:center;line-height:1.8em}
-#ol_after_ft a:focus, #ol_after_ft a:hover {text-decoration:none !important}
+#ol_after_ft a {display:inline-block;width:88px;height:22px;background:#333;color:#fff;text-align:center;line-height:1.8em}
+#ol_after_ft a:focus,
+#ol_after_ft a:hover {text-decoration:none !important}
--- a/skin/poll/basic/poll.skin.php
+++ b/skin/poll/basic/poll.skin.php
@ -7,7 +7,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 <form name="fpoll" action="<?php echo G4_BBS_URL ?>/poll_update.php" onsubmit="return fpoll_submit(this);" method="post">
 <input type="hidden" name="po_id" value="<?php echo $po_id ?>">
 <input type="hidden" name="skin_dir" value="<?php echo $skin_dir ?>">
-<aside id="poll">
+<section id="poll">
    <header>
        <h2>설문조사</h2>
        <?php if ($is_admin == "super") {  ?><a href="<?php echo G4_ADMIN_URL ?>/poll_form.php?w=u&amp;po_id=<?php echo $po_id ?>" class="btn_admin">설문조사 관리</a><?php }  ?>
@ -22,7 +22,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        <input type="submit" value="투표하기">
        <a href="<?php echo G4_BBS_URL."/poll_result.php?po_id=$po_id&amp;skin_dir=$skin_dir" ?>" target="_blank" onclick="poll_result(this.href); return false;">결과보기</a>
    </footer>
-</aside>
+</section>
 </form>

 <script>
--- a/skin/poll/basic/style.css
+++ b/skin/poll/basic/style.css
@ -1,5 +1,5 @@
 /* 설문조사 스킨 */
-#poll {border-top:1px solid #d9e1e5}
+#poll {border-top:1px solid #e7f1ed}
 #poll header {position:relative;padding:15px 14px 0}
 #poll h2 {}
 #poll header .btn_admin {margin-top:5px;width:158px;text-align:center}
--- a/skin/popular/basic/popular.skin.php
+++ b/skin/popular/basic/popular.skin.php
@ -4,16 +4,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

 <link rel="stylesheet" href="<?php echo $popular_skin_url ?>/style.css">

-<aside id="popular">
+<section id="popular">
    <div>
        <h2>인기검색어</h2>
-        <?php
-        for ($i=0; $i<count($list); $i++) {
-            if ($i == 0) echo '<ul>'.PHP_EOL;
-        ?>
+        <ul>
+        <?php for ($i=0; $i<count($list); $i++) {  ?>
            <li><a href="<?php echo G4_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo $list[$i]['pp_word'] ?></a></li>
-        <?php }
-        if ($i > 0) echo '</ul>'.PHP_EOL;
-        ?>
+        <?php }  ?>
+        </ul>
    </div>
-</aside>
+</section>
--- a/Show More
+++ b/Show More