Correct JavaScipt-related ones.

Reform $javascript => define 'PKWK_ALLOW_JAVASCRIPT' for admin
Revive OpenTrackback() JavaScript with $trackback_javascript option

diff --git a/lib/html.php b/lib/html.php
index 94817b2..3c04b6e 100644 (file)
--- a/lib/html.php
+++ b/lib/html.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: html.php,v 1.9 2004/10/17 13:51:49 henoheno Exp $
+// $Id: html.php,v 1.10 2004/10/30 07:02:46 henoheno Exp $
 //
 
 // ËÜʸ¤ò½ÐÎÏ
@@ -10,7 +10,8 @@ function catbody($title,$page,$body)
 {
        global $script, $vars, $arg, $defaultpage, $whatsnew, $help_page, $hr;
        global $related_link, $cantedit, $function_freeze, $search_word_color, $_msg_word;
-       global $foot_explain, $note_hr, $head_tags, $trackback, $referer, $javascript;
+       global $foot_explain, $note_hr, $head_tags;
+       global $trackback, $trackback_javascript, $referer, $javascript;
        global $_LANG, $_LINK, $_IMAGE;
 
        global $html_transitional; // FALSE:XHTML1.1 TRUE:XHTML1.0 Transitional
@@ -24,10 +25,9 @@ function catbody($title,$page,$body)
 
        $_LINK = $_IMAGE = array();
 
-       // Add script header when ...
-       if ($trackback) {
-               $javascript = 1;
-       }
+       // 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'] : '';
        $r_page = rawurlencode($_page);

diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index e7f155a..a8cd0c7 100644 (file)
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.ini.php,v 1.90 2004/10/21 13:10:32 henoheno Exp $
+// $Id: pukiwiki.ini.php,v 1.91 2004/10/30 07:02:46 henoheno Exp $
 //
 // PukiWiki setting file
 
@@ -81,20 +81,23 @@ $interwiki    = 'InterWikiName';    // InterWikiName 
 $menubar      = 'MenuBar';     // ¥á¥Ë¥å¡¼¤È¤·¤Æɽ¼¨¤µ¤»¤ëÆâÍƤò½ñ¤¯¥Ú¡¼¥¸
 
 /////////////////////////////////////////////////
+// Allow using JavaScript
+//   JavaScript¤ò»ÈÍѤ¹¤ë¥×¥é¥°¥¤¥ó¤Ê¤É¤Î
+//   µ¡Ç½¤òÍÞÀ©¤·¤Þ¤¹
+define('PKWK_ALLOW_JAVASCRIPT', 0);    // 0 or 1
+
+/////////////////////////////////////////////////
 // TrackBackµ¡Ç½¤ò»ÈÍѤ¹¤ë
 $trackback = 0;
 
+// Show trackbacks with an another window
+$trackback_javascript = 0;
+
 /////////////////////////////////////////////////
 // Refererµ¡Ç½¤ò»ÈÍѤ¹¤ë
 $referer = 0;
 
 /////////////////////////////////////////////////
-// Script¤ËJavaScript¤ò»ÈÍѤ¹¤ë (¾ï¤Ë¥Ø¥Ã¥À¤ò½ÐÎϤ¹¤ë)
-// $trackback¤Ê¤É¡¢¤¤¤¯¤Ä¤«¤ÎÀßÄê¤Ë¤è¤Ã¤Æ¤Ï
-// ¼«Æ°Åª¤Ëon¤Ë¤Ê¤ê¤Þ¤¹
-// $javascript = 0;
-
-/////////////////////////////////////////////////
 // WikiName¤ò *̵¸ú¤Ë* ¤¹¤ë
 $nowikiname = 0;
 

diff --git a/skin/pukiwiki.skin.php b/skin/pukiwiki.skin.php
index b141e13..3803d6c 100644 (file)
--- a/skin/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.skin.php,v 1.13 2004/10/17 13:51:49 henoheno Exp $
+// $Id: pukiwiki.skin.php,v 1.14 2004/10/30 07:02:46 henoheno Exp $
 //
 
 // Prohibit direct access
@@ -55,13 +55,13 @@ if ($html_transitional) { ?>
  <meta http-equiv="content-type" content="application/xhtml+xml; charset=<?php echo CONTENT_CHARSET ?>" />
  <meta http-equiv="content-style-type" content="text/css" />
 <?php if (! $is_read)  { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?>
-<?php if ($javascript) { ?> <meta http-equiv="Content-Script-Type" content="text/javascript" /><?php } ?>
+<?php if (PKWK_JAVASCRIPT && isset($javascript)) { ?> <meta http-equiv="Content-Script-Type" content="text/javascript" /><?php } ?>
 
  <title><?php echo "$title - $page_title" ?></title>
  <link rel="stylesheet" href="skin/pukiwiki.css.php?charset=<?php echo $css_charset ?>" type="text/css" media="screen" charset="<?php echo $css_charset ?>" />
  <link rel="stylesheet" href="skin/pukiwiki.css.php?charset=<?php echo $css_charset ?>&amp;media=print" type="text/css" media="print" charset="<?php echo $css_charset ?>" />
 
-<?php if ($trackback) { ?> <script type="text/javascript" src="skin/trackback.js"></script><?php } ?>
+<?php if (PKWK_JAVASCRIPT && $trackback_javascript) { ?> <script type="text/javascript" src="skin/trackback.js"></script><?php } ?>
 
 <?php echo $head_tag ?>
 </head>
@@ -80,13 +80,16 @@ if ($html_transitional) { ?>
 
 <div id="navigator">
 <?php
-function _navigator($key, $value = ''){
+function _navigator($key, $value = '', $javascript = ''){
        $lang = $GLOBALS['_LANG']['skin'];
        $link = $GLOBALS['_LINK'];
        if (! isset($lang[$key])) { echo 'LANG NOT FOUND'; return FALSE; }
        if (! isset($link[$key])) { echo 'LINK NOT FOUND'; return FALSE; }
+       if (! PKWK_JAVASCRIPT) $javascript = '';
 
-       echo '<a href="' . $link[$key] . '">' . (($value === '') ? $lang[$key] : $value) . '</a>';
+       echo '<a href="' . $link[$key] . '" ' . $javascript . '>' .
+               (($value === '') ? $lang[$key] : $value) .
+               '</a>';
 
        return TRUE;
 }
@@ -120,7 +123,8 @@ function _navigator($key, $value = ''){
  ]
 
 <?php if ($trackback) { ?> &nbsp;
- [ <?php _navigator('trackback', $lang['trackback'] . '(' . tb_count($_page) . ')') ?> ]
+ [ <?php _navigator('trackback', $lang['trackback'] . '(' . tb_count($_page) . ')',
+       ($trackback_javascript == 1) ? 'onClick="OpenTrackback(this.href); return false"' : '') ?> ]
 <?php } ?>
 <?php if ($referer)   { ?> &nbsp;
  [ <?php _navigator('refer') ?> ]