From: henoheno <henoheno>
Date: Sun, 8 Oct 2006 11:27:06 +0000 (+0900)
Subject: BugTrack2/62: Removed trackback.js and related setting $trackback_javascript.
X-Git-Tag: r1_5_end-eucjp~41
X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki.git;a=commitdiff_plain;h=2257212cf11912e51515dbe99d2d272f89428084

BugTrack2/62: Removed trackback.js and related setting $trackback_javascript.
This JavaScript function OpenTrackback() MUST BE A COPY of MovableType's function OpenTrackback().
There must be a wrong precedure of creating, So 'written by upk' must not be true, so this code seems not GPL-licensed.
You can check this by searching 'OpenTrackback' at http://www.google.com/codesearch .
---

diff --git a/lib/html.php b/lib/html.php
index 965ae07..c8e1039 100644
--- a/lib/html.php
+++ b/lib/html.php
@@ -14,8 +14,7 @@ function catbody($title, $page, $body)
 	global $script, $vars, $arg, $defaultpage, $whatsnew, $help_page, $hr;
 	global $attach_link, $related_link, $cantedit, $function_freeze;
 	global $search_word_color, $_msg_word, $foot_explain, $note_hr, $head_tags;
-	global $trackback, $trackback_javascript, $referer, $javascript;
-	global $nofollow;
+	global $trackback, $referer, $javascript, $nofollow;
 	global $_LANG, $_LINK, $_IMAGE;
 
 	global $pkwk_dtd;     // XHTML 1.1, XHTML1.0, HTML 4.01 Transitional...
@@ -30,7 +29,6 @@ function catbody($title, $page, $body)
 	$_LINK = $_IMAGE = array();
 
 	// Add JavaScript header when ...
-	if ($trackback && $trackback_javascript) $javascript = 1; // Set something If you want
 	if (! PKWK_ALLOW_JAVASCRIPT) unset($javascript);
 
 	$_page  = isset($vars['page']) ? $vars['page'] : '';
diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index 5e68172..952622c 100644
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: pukiwiki.ini.php,v 1.140 2006/06/11 14:35:39 henoheno Exp $
+// $Id: pukiwiki.ini.php,v 1.143 2006/10/08 11:27:06 henoheno Exp $
 // Copyright (C)
 //   2002-2006 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -160,9 +160,6 @@ define('PKWK_ALLOW_JAVASCRIPT', 0);
 // Enable Trackback
 $trackback = 0;
 
-// Show trackbacks with an another window (using JavaScript)
-$trackback_javascript = 0;
-
 /////////////////////////////////////////////////
 // Referer list feature
 $referer = 0;
diff --git a/skin/tdiary.skin.php b/skin/tdiary.skin.php
index a784f5f..ef709f0 100644
--- a/skin/tdiary.skin.php
+++ b/skin/tdiary.skin.php
@@ -651,8 +651,7 @@ function _navigator($key, $value = '', $javascript = ''){
    <?php _navigator('help')   ?>
 
 <?php if ($trackback) { ?> &nbsp;
-   <?php _navigator('trackback', $lang['trackback'] . '(' . tb_count($_page) . ')',
- 	($trackback_javascript == 1) ? 'onclick="OpenTrackback(this.href); return false"' : '') ?>
+   <?php _navigator('trackback', $lang['trackback'] . '(' . tb_count($_page) . ')') ?>
 <?php } ?>
 <?php if ($referer)   { ?> &nbsp;
    <?php _navigator('refer') ?>
diff --git a/skin/trackback.js b/skin/trackback.js
deleted file mode 100644
index c0a2759..0000000
--- a/skin/trackback.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: trackback.js,v 1.5 2006/10/08 10:55:00 henoheno Exp $
-// Copyright (C) 2003 Originally written by upk
-// License: GPL v2 or (at your option) any later version
-//
-// JavaScript for TrackBack feature
-
-function OpenTrackback (c) {
-	window.open(c,'trackback','width=480,height=480,scrollbars=yes,status=yes');
-}