From c36313ce5a32c78130f2a68673f6532a86f442a0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 12 Nov 2013 14:17:37 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=B8=ED=88=AC=EB=8D=B0=EC=9D=B4=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_form.php | 3 +- adm/config_form.php | 9 +--- adm/config_form_update.php | 1 - adm/sql_write.sql | 1 - bbs/sns_send.php | 6 --- bbs/write_comment_update.php | 1 - bbs/write_comment_update.sns.php | 26 ++-------- install/gnuboard5.sql | 1 - plugin/sns/icon/me2day.png | Bin 1370 -> 0 bytes plugin/sns/icon/me2day_cmt.png | Bin 884 -> 0 bytes plugin/sns/icon/me2day_off.png | Bin 1210 -> 0 bytes plugin/sns/me2day/_common.php | 3 -- plugin/sns/me2day/callback.php | 55 --------------------- plugin/sns/view.sns.skin.php | 2 - plugin/sns/view_comment_list.sns.skin.php | 3 -- plugin/sns/view_comment_write.sns.skin.php | 44 ++--------------- 16 files changed, 9 insertions(+), 146 deletions(-) delete mode 100644 plugin/sns/icon/me2day.png delete mode 100644 plugin/sns/icon/me2day_cmt.png delete mode 100644 plugin/sns/icon/me2day_off.png delete mode 100644 plugin/sns/me2day/_common.php delete mode 100644 plugin/sns/me2day/callback.php diff --git a/adm/board_form.php b/adm/board_form.php index 87ee32347..a70659394 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -56,8 +56,7 @@ if (!isset($board['bo_use_sns'])) { for ($i=0; $row=sql_fetch_array($result); $i++) { sql_query(" ALTER TABLE `{$g5['write_prefix']}{$row['bo_table']}` ADD `wr_facebook_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_ip`, - ADD `wr_twitter_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_facebook_user`, - ADD `wr_me2day_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_twitter_user` ", false); + ADD `wr_twitter_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_facebook_user` ", false); } } diff --git a/adm/config_form.php b/adm/config_form.php index 234144c21..a94316e9b 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -54,8 +54,7 @@ if(!isset($config['cf_facebook_appid'])) { ADD `cf_facebook_appid` VARCHAR(255) NOT NULL AFTER `cf_googl_shorturl_apikey`, 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); + ADD `cf_twitter_secret` VARCHAR(255) NOT NULL AFTER `cf_twitter_key` ", true); } // uniqid 테이블이 없을 경우 생성 @@ -939,12 +938,6 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) { - - - - 앱 등록하기 - - diff --git a/adm/config_form_update.php b/adm/config_form_update.php index 61f02ec74..e5be0a956 100644 --- a/adm/config_form_update.php +++ b/adm/config_form_update.php @@ -125,7 +125,6 @@ $sql = " update {$g5['config_table']} 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']}', diff --git a/adm/sql_write.sql b/adm/sql_write.sql index d31ed96bd..f943b0453 100644 --- a/adm/sql_write.sql +++ b/adm/sql_write.sql @@ -29,7 +29,6 @@ CREATE TABLE `__TABLE_NAME__` ( `wr_ip` varchar(255) NOT NULL, `wr_facebook_user` varchar(255) NOT NULL, `wr_twitter_user` varchar(255) NOT NULL, - `wr_me2day_user` varchar(255) NOT NULL, `wr_1` varchar(255) NOT NULL, `wr_2` varchar(255) NOT NULL, `wr_3` varchar(255) NOT NULL, diff --git a/bbs/sns_send.php b/bbs/sns_send.php index 033b29970..1e9b225db 100644 --- a/bbs/sns_send.php +++ b/bbs/sns_send.php @@ -12,12 +12,6 @@ switch($_REQUEST['sns']) { 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; diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index 10950e9ce..f14cf04ce 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -160,7 +160,6 @@ if ($w == 'c') // 댓글 입력 wr_ip = '{$_SERVER['REMOTE_ADDR']}', wr_facebook_user = '$wr_facebook_user', wr_twitter_user = '$wr_twitter_user', - wr_me2day_user = '$wr_me2day_user', wr_1 = '$wr_1', wr_2 = '$wr_2', wr_3 = '$wr_3', diff --git a/bbs/write_comment_update.sns.php b/bbs/write_comment_update.sns.php index 6548fd2c5..1e4e63436 100644 --- a/bbs/write_comment_update.sns.php +++ b/bbs/write_comment_update.sns.php @@ -1,11 +1,10 @@ post('statuses/update', array('status' => $post)); - + set_cookie('ck_twitter_checked', true, 86400*31); } $wr_twitter_user = get_session("ss_twitter_user"); } //============================================================================ - - -//============================================================================ -// 미투데이 -//---------------------------------------------------------------------------- -$wr_me2day_user = ""; -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_me2day_user = get_session("ss_me2day_user"); -} -//============================================================================ ?> \ No newline at end of file diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index e70e27c6d..e960e3394 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -299,7 +299,6 @@ CREATE TABLE IF NOT EXISTS `g5_config` ( `cf_facebook_secret` varchar(255) NOT NULL, `cf_twitter_key` varchar(255) NOT NULL, `cf_twitter_secret` varchar(255) NOT NULL, - `cf_me2day_key` varchar(255) NOT NULL, `cf_1_subj` varchar(255) NOT NULL DEFAULT '', `cf_2_subj` varchar(255) NOT NULL DEFAULT '', `cf_3_subj` varchar(255) NOT NULL DEFAULT '', diff --git a/plugin/sns/icon/me2day.png b/plugin/sns/icon/me2day.png deleted file mode 100644 index caad2cfdb157a25c94b7d9147dd9c83b67c1691c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1370 zcmV-g1*Q6lP)$(n5D>RZ2q<2*or$KoB*ls3@=aifJ&B_(;Sbl1Lyvei$P`V`5A&MgsgWnm|yA zAyEMlM2ZxUwo)jikL`B5J3H^|nc0Z#1jhHYgh@IO{V&sYjNfZG=fPkA1%gyvKPI2{-nUUTmfHbHKFQ{>@l!_aA! zW8OVgICEkMzyC5wSORRz&3j%2z8SpZnnaV5gHHoQZIhdA+A{+_ez?a>~ zW=s?XWw+r=;?%%<66EARrCNHf1VW8u0b+Qymbvm#&$g-yok5Ra*6B7t!NCbE9K z|8J0+eN+k&Nw^v=mqIH# zHig@wcU;2xQz@uL4As-4(8g_O85?U}Y{tsxXHgDZdT046$(wgGj`XO3aG8pi-)TkD z{0iurgW&-kqL#M7U4c#%aqeUiLzgwQ+%<*RO0aa74ojl#p<1ljFxv-6kDAD)Eo8<_ z|KP-|a&)|LC(0{>xOhH|LN28-x8Cx{eQH-_CAy9UH;oN9#~KGm5%~GM~hF%ETAjPGSG<9t`(q z;gAk$>dVmf@H7Z3Zu=@jdJB1Jb*Xd>-Jw3AV$&xJ5uXU{e+6}o5wt%W zM{PqCnUoE04<}Z+EP*KuUgEv|68TvMu=L3~tlH3sJs+L3gtaXPG9jRUqWaU)UB*GX=8WCWU0X=g)F$g60f{BheDRZ+bp`YX2v)ag$|(D^`6$y-I;+&Y->L&Mdy)Gc!}@W9LIf+RpH1t!}xUT zS&|_~Fr<<%ldmgFe#0{_B$UbCvx^+*cK(ACC@duu77K6fnuieemt7z9V&CWe0M$dN zxX4c=lbIrTPWcX!55wQZ&#yDna8MI3#_Ct6BSgxW*&IdZp)u^;(T{;Yb^0JEehcu* znre;G|v7yj=n!M4E7m5SV?J+Xi+Dm zLJ$QBj%((mU?3W+o4BaeYtW*%;K|N6Z&QAwCqwVMce%&Fsh=_!=rv(#0#sG@WheRT zk{@$bDZ%jzJ3bVOlxS)D-0iz-%NNaeT;m_Dklzq*-+blV*ogD(Qh+R}xG-|~=RHR| c+W!(@0F=3FZfVkjCjbBd07*qoM6N<$f`+k%=Kufz diff --git a/plugin/sns/icon/me2day_cmt.png b/plugin/sns/icon/me2day_cmt.png deleted file mode 100644 index cd7e21601fffad02ad50025bc588b9cb398da401..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 884 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP>{XE z)7O>#E*lGr4Ck*eUCm%2*N76w(vpn)B8HXg&UgTYcuIgmE~&-IMVSR9nfZAP!kmiA zKyfaRxO09%Wl?5&MhU|j{xeoUQ9iI}QEDPcsX|F+ZYqQ6cYaQw3@1n?I6tkVJh3R1 zA-3Q@NI5sy@XX@moJ63~B8Ke;w)6vqIY7eUiA8ytdFc!Xq@T3|#n>VGON)|I8NU8+ zehpLRoS&PUnpeW`?aZ|OKruFuvXIP@oK%Jt?=Gn`FfiGBx;Tbd^tMj6&IolBXxnf3 ze8P*?m?OL*{q|H<#HN zBBpi<5|br(R6fqxyxUmp`MufFAu2Z2nACX*saxn9wS(09BTy zTXhrveiPyrQ)l=i^L5WI^TQ`5sP`#%tTgP5QfO)TJWpWCTJ}>pw{Dua|J!txcT2ur z;o|S?`SX{mc=`w(XZh-~igiw^ru*?-U6B2J-=*?GiH7Ip$2r6b?DR!eu+@C%IB@lzKf{|_ z`=@A#?Xvpy^3{vlF4JJRfobF%a;KH?Di(ylZ)YXO=Gv8*~ qTQ85iy7k{}0gt;|-P&1%*0G5@&E`R7H)3tW}qfHplu*Y22M^+u;R;?FT-2{ zcNNSKbeDs`-@kuh>ZEyjdD{U3hy@5-L5BYR{hL8aNeL|Z?%g|vZ{NOwE&2EFA6zpw z!?6Vs&`d{w0Ac~Uhz%qN3I=IuX|TkdJ9oe|&`T(WA{&4n)@T+n0t65X(53%D0w6z*LsV2011N$)e2_zs@uyFp82I@37{bEB7z_*yz;Oj~AV2^yffR!b z1-T9uY0ApVU_K~FKxr8SVq;^$J^^L`aEkfz!~6H|83Y6b z7ytr@*}=h~3Y0QH27z1-ia=0sfcOs|K4iFe?;eA&urOG$rluwXC|AnK$uSri88Mif zn}gXPuxHO6hO1Yvf-MXR3i=HYfF^3S0VoJz6>owgtamX;RQ!e{ByrQpm2vcS~Tl)=Wv1}qLV^D96A zvB1(Qy1^h9fn2eF|9*y3r%o|QNJxNF04O3s$qSaLK)!HtasvAf1ePsZ22KP30R$?9 zQ1Ur44YCwiMuRN?Mbd)@55Vl4oE!#NX_%3b0agP7%a<<)2O}sR00IbZFw8LI0tJLY z-UO+E6;x(sW?;3Tayl+94$OY}@+COsfYiXs8-M@;8O(@Ys2~RotRMn;8x)bC^otC( zZQI81>eVZ-t6{+kq?rH$hy@rPAAq)Vp_f)L7sD{f)!N$HVD`0Z*T6Xvl+Hnh0jo8* zK2Y!g&HN4!K+M3ZNCfB-Tc}O&f&`=hhGFUS*|TR1SFT(E7f_%~1#%_GLS%IyvFq2b z&j1J@W?)V^1I$S#zi|C1{ws$z@+#aXb@aIOblr0u`_4R \ No newline at end of file diff --git a/plugin/sns/me2day/callback.php b/plugin/sns/me2day/callback.php deleted file mode 100644 index 179be471a..000000000 --- a/plugin/sns/me2day/callback.php +++ /dev/null @@ -1,55 +0,0 @@ -code == 0) { - - $user = json_decode(file_get_contents("http://me2day.net/api/get_person/{$user_id}.json")); - $sns_name = $user->nickname; - $sns_user = $user->id; - - set_cookie('ck_sns_name', $sns_name, 86400); - set_session('ss_me2day_user', $sns_user); - - $g5_sns_url = G5_SNS_URL; - - echo << - $(function() { - document.write("미투데이에 승인이 되었습니다."); - - var opener = window.opener; - opener.$("#wr_name").val("{$sns_name}"); - opener.$("#me2day_icon").attr("src", "{$g5_sns_url}/icon/me2day.png"); - opener.$("#me2day_checked").attr("disabled", false); - opener.$("#me2day_checked").attr("checked", true); - window.close(); - }); - -EOT; - -} else { - - echo << - $(function() { - alert("미투데이에 승인이 되지 않았습니다."); - window.close(); - }); - -EOT; - -} - -include_once(G5_PATH.'/tail.sub.php'); -?> diff --git a/plugin/sns/view.sns.skin.php b/plugin/sns/view.sns.skin.php index 3b02f4b3b..8b2910ae4 100644 --- a/plugin/sns/view.sns.skin.php +++ b/plugin/sns/view.sns.skin.php @@ -13,7 +13,6 @@ $kakao_appname = urlencode(str_replace('\"', '"', $g5['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; /* @@ -26,7 +25,6 @@ $sns_send .= '&title='.$sns_msg;
  • 페이스북으로 보내기
  • 트위터로 보내기
  • -
  • 미투데이로 보내기
  • 구글플러스로 보내기
  • 트위터에도 등록됨 - -미투데이에도 등록됨 - diff --git a/plugin/sns/view_comment_write.sns.skin.php b/plugin/sns/view_comment_write.sns.skin.php index bca1429ae..ba3e50012 100644 --- a/plugin/sns/view_comment_write.sns.skin.php +++ b/plugin/sns/view_comment_write.sns.skin.php @@ -64,7 +64,7 @@ if (!$board['bo_use_sns']) return; if (empty($_SESSION['access_token']) || empty($_SESSION['access_token']['oauth_token']) || empty($_SESSION['access_token']['oauth_token_secret'])) { $twitter_url = G5_SNS_URL."/twitter/redirect.php"; } else { - $access_token = $_SESSION['access_token']; + $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'); @@ -73,12 +73,12 @@ if (!$board['bo_use_sns']) return; $twitter_user = true; $twitter_url = $connection->getAuthorizeURL($token); break; - default : + default : $twitter_url = G5_SNS_URL."/twitter/redirect.php"; } } */ - $access_token = $_SESSION['access_token']; + $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'); @@ -87,7 +87,7 @@ if (!$board['bo_use_sns']) return; $twitter_user = true; $twitter_url = $connection->getAuthorizeURL($token); break; - default : + default : $twitter_url = G5_SNS_URL."/twitter/redirect.php"; } } @@ -106,42 +106,6 @@ if (!$board['bo_use_sns']) return; echo ''; } //============================================================================ - - - //============================================================================ - // 미투데이 - //---------------------------------------------------------------------------- - if ($config['cf_me2day_key']) { - /* - $me2day_user = false; - if (empty($_SESSION['me2day']['user_id']) || empty($_SESSION['me2day']['user_key'])) { - $result = json_decode(file_get_contents("http://me2day.net/api/get_auth_url.json?akey=".$config['cf_me2day_key'])); - $me2day_url = $result->url; - } else { - $me2day_user = true; - } - */ - - $me2day_user = get_session("ss_me2day_user"); - if (!$me2day_user) { - $result = json_decode(file_get_contents("http://me2day.net/api/get_auth_url.json?akey=".$config['cf_me2day_key'])); - $me2day_url = $result->url; - } - - echo '
  • '; - if ($me2day_user) { - echo ''; - echo ''; - echo ''; - } else { - echo ''; - echo ''; - echo ''; - echo ''; - } - echo '
  • '; - } - //============================================================================ ?>