OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

nucleus-plugins: Commit

Nucleus CMS日本語版用プラグインのうち、日本語版開発者がサポートしているもの


Commit MetaInfo

Revisionc331eca08e3cc8f94d3739c30544c853315bebf2 (tree)
Time2006-10-15 21:47:56
Authorhsur <hsur@1ca2...>
Commiterhsur

Log Message

SpamCheckについて微調整
Ticket処理を追加(NP_0TicketForPlugin併用を前提)

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/plugin@453 1ca29b6e-896d-4ea0-84a5-967f57386b96

Change Summary

Incremental Difference

--- a/trunk/NP_TrackBack/NP_TrackBack.php
+++ b/trunk/NP_TrackBack/NP_TrackBack.php
@@ -31,7 +31,7 @@
3131
3232 //modify start+++++++++
3333 function _createItemLink($itemid, $b){
34- global $CONF, $manager, $blog;
34+ global $CONF, $manager;
3535 $blogurl = $b->getURL();
3636
3737 if (!$blogurl) {
@@ -64,7 +64,7 @@
6464 */
6565 function doSkinVar($skinType, $what = '', $tb_id = '', $amount = 'limit-1') {
6666
67- global $itemid;
67+ global $itemid, $manager, $CONF;
6868
6969 //modify start+++++++++
7070 if(eregi('limit', $tb_id)){
@@ -138,6 +138,10 @@
138138 case 'manualpingformlink':
139139 echo $this->getManualPingUrl($tb_id);
140140 break;
141+
142+ case 'sendpinglink':
143+ echo $manager->addTicketToUrl($CONF['PluginURL'] . 'trackback/index.php?action=ping&amp;id=' . intval($tb_id));
144+ break;
141145
142146 // Insert TrackBack count
143147 case 'count':
@@ -216,7 +220,7 @@
216220 */
217221 function doAction($type)
218222 {
219- global $CONF;
223+ global $CONF,$manager;
220224 switch ($type) {
221225
222226 // When no action type is given, assume it's a ping
@@ -232,7 +236,6 @@
232236 // Manual ping
233237 case 'ping':
234238 $errorMsg = $this->handlePing();
235-
236239 if ($errorMsg != '')
237240 $this->showManualPingError(intRequestVar('tb_id'), $errorMsg);
238241 else
@@ -257,6 +260,8 @@
257260
258261 // Detect trackback
259262 case 'detect':
263+ if (!$manager->checkTicket()) return '';
264+
260265 list($url, $title) =
261266 $this->getURIfromLink(html_entity_decode(requestVar('tb_link')));
262267
@@ -281,6 +286,8 @@
281286
282287 // delete a trackback(local)
283288 case 'deletelc':
289+ if (!$manager->checkTicket()) return _ERROR_BADTICKET;
290+
284291 $err = $this->deleteLocal(intRequestVar('tb_id'), intRequestVar('from_id'));
285292 if( $err )
286293 return $err;
@@ -433,8 +440,10 @@
433440 );
434441
435442 if ($member->isLoggedIn() && $member->isAdmin()){
436- $gVars['admin'] = '<a href="' . $CONF['PluginURL'] . 'trackback/index.php?action=list&amp;id=' . intval($tb_id) . '" target="_blank">[admin]</a>';
437- $gVars['pingform'] = '<a href="' . $CONF['PluginURL'] . 'trackback/index.php?action=ping&amp;id=' . intval($tb_id) . '" target="_blank">[pingform]</a>';
443+ $adminurl = $manager->addTicketToUrl($CONF['PluginURL'] . 'trackback/index.php?action=list&amp;id=' . intval($tb_id));
444+ $pingformurl = $manager->addTicketToUrl($CONF['PluginURL'] . 'trackback/index.php?action=ping&amp;id=' . intval($tb_id));
445+ $gVars['admin'] = '<a href="' . $adminurl . '" target="_blank">[admin]</a>';
446+ $gVars['pingform'] = '<a href="' . $pingformurl . '" target="_blank">[pingform]</a>';
438447 }
439448
440449 echo TEMPLATE::fill($this->getOption('tplHeader'), $gVars);
@@ -1025,7 +1034,7 @@
10251034 'live' => true,
10261035
10271036 /* Backwards compatibility with SpamCheck API 1*/
1028- 'data' => $url . ' ' . $title . ' ' . $excerpt . ' ' . $blog_name,
1037+ 'data' => $url . "\n" . $title . "\n" . $excerpt . "\n" . $blog_name . "\n" . serverVar('HTTP_USER_AGENT'),
10291038 'ipblock' => true,
10301039 );
10311040
@@ -1221,8 +1230,7 @@
12211230
12221231 function getRequiredURL($itemid){
12231232 global $manager;
1224-// $blog = & $manager->getBlog(getBlogIDFromItemID($item['itemid']));
1225- $blog = & $manager->getBlog(getBlogIDFromItemID($itemid));
1233+ $blog = & $manager->getBlog(getBlogIDFromItemID($item['itemid']));
12261234 if( $this->isEnableLinkCheck($itemid) )
12271235 return $this->_createItemLink($itemid, $blog);
12281236 return null;
@@ -2512,7 +2520,7 @@ function _strip_controlchar($string){
25122520 * Show the list of TrackBack pings for a certain Trackback ID
25132521 */
25142522 function showLocalList($tb_id) {
2515- global $CONF;
2523+ global $CONF, $manager;
25162524
25172525 // create SQL query
25182526 $query = 'SELECT t.from_id as from_id , i.ititle as ititle, i.ibody as ibody, i.itime as itime, i.iblog as iblog FROM '.sql_table('plugin_tb_lc').' as t, '.sql_table('item').' as i WHERE t.tb_id='.intval($tb_id) .' and i.inumber=t.from_id ORDER BY i.itime DESC';
@@ -2539,7 +2547,7 @@ function _strip_controlchar($string){
25392547 'timestamp' => strftime('%Y-%m-%d',strtotime($o->itime)),
25402548 'title' => htmlspecialchars($o->ititle),
25412549 'excerpt' => htmlspecialchars(shorten(strip_tags($o->ibody),200,'...')),
2542- 'delete' => $canDelete?'<a href="'.$CONF['ActionURL'].'?action=plugin&amp;name=TrackBack&amp;type=deletelc&amp;tb_id='.$tb_id.'&amp;from_id='.$o->from_id.'">[delete]</a>':'',
2550+ 'delete' => $canDelete?'<a href="'. $manager->addTicketToUrl($CONF['ActionURL'].'?action=plugin&amp;name=TrackBack&amp;type=deletelc&amp;tb_id='.intval($tb_id).'&amp;from_id='.intval($o->from_id)).'">[delete]</a>':'',
25432551 'tburl' => $this->getTrackBackUrl($tb_id),
25442552 'commentcount'=> quickQuery('SELECT COUNT(*) as result FROM '.sql_table('comment').' WHERE citem=' . intval($o->from_id))
25452553 );
@@ -2562,7 +2570,7 @@ function _strip_controlchar($string){
25622570 function canDelete($tb_id) {
25632571 global $member, $manager;
25642572
2565- if (!$member->isLoggedIn()) return 0;
2573+ if ( ! $member->isLoggedIn() ) return 0;
25662574
25672575 $checkIDs = $this->getOption('CheckIDs');
25682576 $itemExists =& $manager->existsItem($tb_id,0,0);
@@ -2583,7 +2591,7 @@ function _strip_controlchar($string){
25832591 function getName() { return 'TrackBack'; }
25842592 function getAuthor() { return 'rakaz + nakahara21 + hsur'; }
25852593 function getURL() { return 'http://blog.cles.jp/np_cles/category/31/subcatid/3'; }
2586- function getVersion() { return '2.0.3 jp6'; }
2594+ function getVersion() { return '2.0.3 jp7'; }
25872595 function getDescription() { return _TB_DESCRIPTION; }
25882596
25892597 //modify start+++++++++
--- a/trunk/NP_TrackBack/trackback/autodetect.php
+++ b/trunk/NP_TrackBack/trackback/autodetect.php
@@ -1,14 +1,14 @@
11 <?php
2-
32 $strRel = '../../../';
43 include($strRel . 'config.php');
4+
5+ global $manager, $CONF;
6+ $action = $manager->addTicketToUrl($CONF['ActionURL'] . '?action=plugin&name=TrackBack&type=detect')
57 ?>
6-
7- var TrackbackAction = "<?php echo $CONF['ActionURL'];?>";
88 var xmlhttp = false;
99 var inProgress = false;
1010
11- var TrackbackAction = "<?php echo $CONF['ActionURL'];?>";
11+ var TrackbackAction = "<?php echo $action; ?>";
1212 var TrackbackSource = new Array;
1313 var TrackbackName = new Array;
1414 var TrackbackURL = new Array;
@@ -61,7 +61,7 @@
6161 // The reason we use GET instead of POST is because
6262 // Opera does not properly support setting headers yet,
6363 // which is a requirement for using POST.
64- xmlhttp.open("GET", TrackbackAction + "?action=plugin&name=TrackBack&type=detect&tb_link=" + escape(Lookup), true);
64+ xmlhttp.open("GET", TrackbackAction + "&tb_link=" + escape(Lookup), true);
6565 xmlhttp.onreadystatechange = tbStateChange;
6666 xmlhttp.send('');
6767 }
--- a/trunk/NP_TrackBack/trackback/japanese-euc.help.html
+++ b/trunk/NP_TrackBack/trackback/japanese-euc.help.html
@@ -125,6 +125,10 @@ div.tb div.info {
125125 <h3>日本語版更新履歴</h3>
126126
127127 <ul>
128+ <li>Version 2.0.3jp7 : (2006/*/*)</li>
129+ <li>　[Changed] SpamChekについて微調整</li>
130+ <li>　[Fixed] セキュリティの向上(ticket処理の追加。CSRF対策)</li>
131+
128132 <li>Version 2.0.3jp6 : (2006/09/30)</li>
129133 <li>　[Fixed] セキュリティの向上</li>
130134
@@ -135,7 +139,7 @@ div.tb div.info {
135139 <li>　[Changed] SQLのクォートを"から'に変更</li>
136140 <li>　[Fixed] mb_emulator環境にてエラーが出る問題を修正</li>
137141 <li>　[Fixed] curlが有効な環境でエラーが出る問題を修正</li>
138-
142+
139143 <li>Version 2.0.3jp4 : (2006/07/15)</li>
140144 <li>　[Added] AutoDiscoveryURL出力時にSpamCheckを行うようにした</li>
141145 <li>　[Added] メッセージ、デフォルト値を日本語化</li>
--- a/trunk/NP_TrackBack/trackback/japanese-utf8.help.html
+++ b/trunk/NP_TrackBack/trackback/japanese-utf8.help.html
@@ -125,6 +125,10 @@ div.tb div.info {
125125 <h3>日本語版更新履歴</h3>
126126
127127 <ul>
128+ <li>Version 2.0.3jp7 : (2006/*/*)</li>
129+ <li>　[Changed] SpamChekについて微調整</li>
130+ <li>　[Fixed] セキュリティの向上(ticket処理の追加。CSRF対策)</li>
131+
128132 <li>Version 2.0.3jp6 : (2006/09/30)</li>
129133 <li>　[Fixed] セキュリティの向上</li>
130134
--- a/trunk/NP_TrackBack/trackback/mkeuc.sh
+++ b/trunk/NP_TrackBack/trackback/mkeuc.sh
@@ -7,3 +7,5 @@ do
77 eucfile=`echo $utf8file | sed 's/japanese-utf8/japanese-euc/'`
88 nkf -e -W -d < $utf8file > $eucfile
99 done
10+
11+nkf -e -W -d < japanese-utf8.help.html > japanese-euc.help.html
Show on old repository browser