From: shizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Date: Wed, 11 Oct 2006 13:44:31 +0000 (+0000)
Subject: bug-fix and add conf. options
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=853f6644dd9c2154809dd606d7f436ccf2b608e3;p=nucleus-jp%2Fnucleus-plugins.git

bug-fix and add conf. options


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

diff --git a/trunk/NP_Dtree/NP_Dtree.php b/trunk/NP_Dtree/NP_Dtree.php
index db46435..c45f602 100644
--- a/trunk/NP_Dtree/NP_Dtree.php
+++ b/trunk/NP_Dtree/NP_Dtree.php
@@ -1,9 +1,12 @@
 <?
 /**
- * 
+ *
+ * 0.94 bug fix
+ *		add language files
+ *		configuration by option
  * 0.93 sec fix
- * 		subcategory link bug fix
- * 
+ *		subcategory link bug fix
+ *
  */
 
 class NP_Dtree extends NucleusPlugin
@@ -26,12 +29,12 @@ class NP_Dtree extends NucleusPlugin
 
 	function getVersion()
 	{
-		return '0.93'; 
+		return '0.94'; 
 	}
 
 	function getDescription()
 	{ 
-		return 'Show Navigation Tree. Usage: &lt;%Dtree()%&gt;';
+		return _DTREE_DESCRIPTION;	//'Show Navigation Tree. Usage: &lt;%Dtree()%&gt;';
 	}
 
 	function supportsFeature($what)
@@ -44,6 +47,29 @@ class NP_Dtree extends NucleusPlugin
 		}
 	}
 
+	function install()
+	{
+		$this->createOption('folderLinks',		_DTREE_DIR_LINK,	'yesno',	'yes');
+		$this->createOption('useSelection',		_DTREE_SELECTION,	'yesno',	'no');
+		$this->createOption('useCookies',		_DTREE_COOKIE,		'yesno',	'no');
+		$this->createOption('useLines',			_DTREE_LINE,		'yesno',	'yes');
+		$this->createOption('useIcons',			_DTREE_ICON,		'yesno',	'yes');
+		$this->createOption('useStatusText',	_DTREE_ST_TEXT,		'yesno',	'no');
+		$this->createOption('closeSameLevel',	_DTREE_CL_SLEVEL,	'yesno',	'no');
+		$this->createOption('inOrder',			_DTREE_IN_ORDER,	'yesno',	'no');
+	}
+
+	function init()
+	{
+		global $admin;
+		$language = ereg_replace( '[\\|/]', '', getLanguageName());
+		if (file_exists($this->getDirectory().'language/'.$language.'.php')) {
+			include_once($this->getDirectory().'language/'.$language.'.php');
+		}else {
+			include_once($this->getDirectory().'language/english.php');
+		}
+	}
+
 	function doSkinVar($skinType, $itemid=0)
 	{ 
 		global $blogid, $catid, $subcatid;
@@ -81,8 +107,8 @@ class NP_Dtree extends NucleusPlugin
 		echo '<script type="text/javascript" src="' .
 				htmlspecialchars($this->getAdminURL()) . 'dtreedata.php?o=' . $randomID . 'd&amp;bid=' .
 				$blogid . $eq . '"></script>';
-		echo '<a href="javascript: '.$randomID.'d.openAll();">open all</a>' .
-				' | <a href="javascript: ' . $randomID . 'd.closeAll();">close all</a>';
+		echo '<a href="javascript: ' . $randomID . 'd.openAll();">' . _DTREE_OPENALL . '</a>' .
+				' | <a href="javascript: ' . $randomID . 'd.closeAll();">' . _DTREE_CLOSEALL . '</a>';
 
 	}
 
diff --git a/trunk/NP_Dtree/dtree/dtree.php b/trunk/NP_Dtree/dtree/dtree.php
index 6266a5a..5a29915 100644
--- a/trunk/NP_Dtree/dtree/dtree.php
+++ b/trunk/NP_Dtree/dtree/dtree.php
@@ -1,320 +1 @@
-/*--------------------------------------------------|
| dTree 2.05 | www.destroydrop.com/javascript/tree/ |
|---------------------------------------------------|
| Copyright (c) 2002-2003 Geir Landr$B!&(B              |
|                                                   |
| This script can be used freely as long as all     |
| copyright messages are intact.                    |
|                                                   |
| Updated: 17.04.2003                               |
|--------------------------------------------------*/
-
<?php
	$strRel = '../../../';
	include($strRel . 'config.php');
	include($DIR_LIBS . 'PLUGINADMIN.php');
		$oPluginAdmin = new PluginAdmin('Dtree');
		$this->plug =& $oPluginAdmin->plugin;
		$imgpath = $this->plug->getAdminURL();
-//		$imgpath = 'nucleus/plugins/dtree/';
-
-?>
-// Node object
-var imgpath = "<?php echo $imgpath;?>";
-
-function Node(id, pid, name, url, title, target, icon, iconOpen, open) {
-	this.id = id;
-	this.pid = pid;
-	this.name = name;
-	this.url = url;
-	this.title = title;
-	this.target = target;
-	this.icon = icon;
-	this.iconOpen = iconOpen;
-	this._io = open || false;
-	this._is = false;
-	this._ls = false;
-	this._hc = false;
-	this._ai = 0;
-	this._p;
-};
-
-// Tree object
-function dTree(objName) {
-	this.config = {
		target			: null,
		folderLinks		: true,
		useSelection	: false,
		useCookies		: false,
		useLines		: true,
		useIcons		: true,
		useStatusText	: false,
		closeSameLevel	: false,
		inOrder			: false
	}
-	this.icon = {
-		root			: imgpath + 'img/base.gif',
		folder			: imgpath + 'img/folder.gif',
		folderOpen		: imgpath + 'img/folderopen.gif',
//		node			: imgpath + 'img/page.gif',
		node			: imgpath + 'img/folder.gif',
		empty			: imgpath + 'img/empty.gif',
		line			: imgpath + 'img/line.gif',
		join			: imgpath + 'img/join.gif',
		joinBottom		: imgpath + 'img/joinbottom.gif',
		plus			: imgpath + 'img/plus.gif',
		plusBottom		: imgpath + 'img/plusbottom.gif',
		minus			: imgpath + 'img/minus.gif',
		minusBottom		: imgpath + 'img/minusbottom.gif',
		nlPlus			: imgpath + 'img/nolines_plus.gif',
		nlMinus			: imgpath + 'img/nolines_minus.gif'
-	};
-	this.obj = objName;
-	this.aNodes = [];
-	this.aIndent = [];
-	this.root = new Node(-1);
-	this.selectedNode = null;
-	this.selectedFound = false;
-	this.completed = false;
-};
-
-// Adds a new node to the node array
-dTree.prototype.add = function(id, pid, name, url, title, target, icon, iconOpen, open) {
-	this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);
-};
-
-// Open/close all nodes
-dTree.prototype.openAll = function() {
-	this.oAll(true);
-};
-dTree.prototype.closeAll = function() {
-	this.oAll(false);
-};
-
-// Outputs the tree to the page
-dTree.prototype.toString = function() {
-	var str = '<div class="dtree">\n';
-	if (document.getElementById) {
-		if (this.config.useCookies) this.selectedNode = this.getSelected();
-		str += this.addNode(this.root);
-	} else str += 'Browser not supported.';
-	str += '</div>';
-	if (!this.selectedFound) this.selectedNode = null;
-	this.completed = true;
-	return str;
-};
-
-// Creates the tree structure
-dTree.prototype.addNode = function(pNode) {
-	var str = '';
-	var n=0;
-	if (this.config.inOrder) n = pNode._ai;
-	for (n; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == pNode.id) {
-			var cn = this.aNodes[n];
-			cn._p = pNode;
-			cn._ai = n;
-			this.setCS(cn);
-			if (!cn.target && this.config.target) cn.target = this.config.target;
-			if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);
-			if (!this.config.folderLinks && cn._hc) cn.url = null;
-			if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {
-					cn._is = true;
-					this.selectedNode = n;
-					this.selectedFound = true;
-			}
-			str += this.node(cn, n);
-			if (cn._ls) break;
-		}
-	}
-	return str;
-};
-
-// Creates the node icon, url and text
-dTree.prototype.node = function(node, nodeId) {
-	var str = '<div class="dTreeNode">' + this.indent(node, nodeId);
-	if (this.config.useIcons) {
-		if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
-		if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;
-		if (this.root.id == node.pid) {
-			node.icon = this.icon.root;
-			node.iconOpen = this.icon.root;
-		}
-		str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
-	}
-	if (node.url) {
-		str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';
-		if (node.title) str += ' title="' + node.title + '"';
-		if (node.target) str += ' target="' + node.target + '"';
-		if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';
-		if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))
-			str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';
-		str += '>';
-	}
-	else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)
-		str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';
-	str += node.name;
-	if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
-	str += '</div>';
-	if (node._hc) {
-		str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';
-		str += this.addNode(node);
-		str += '</div>';
-	}
-	this.aIndent.pop();
-	return str;
-};
-
-// Adds the empty and line icons
-dTree.prototype.indent = function(node, nodeId) {
-	var str = '';
-	if (this.root.id != node.pid) {
-		for (var n=0; n<this.aIndent.length; n++)
-			str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
-		(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
-		if (node._hc) {
-			str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img id="j' + this.obj + nodeId + '" src="';
-			if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
-			else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
-			str += '" alt="" /></a>';
-		} else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';
-	}
-	return str;
-};
-
-// Checks if a node has any children and if it is the last sibling
-dTree.prototype.setCS = function(node) {
-	var lastId;
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.id) node._hc = true;
-		if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;
-	}
-	if (lastId==node.id) node._ls = true;
-};
-
-// Returns the selected node
-dTree.prototype.getSelected = function() {
-	var sn = this.getCookie('cs' + this.obj);
-	return (sn) ? sn : null;
-};
-
-// Highlights the selected node
-dTree.prototype.s = function(id) {
-	if (!this.config.useSelection) return;
-	var cn = this.aNodes[id];
-	if (cn._hc && !this.config.folderLinks) return;
-	if (this.selectedNode != id) {
-		if (this.selectedNode || this.selectedNode==0) {
-			eOld = document.getElementById("s" + this.obj + this.selectedNode);
-			eOld.className = "node";
-		}
-		eNew = document.getElementById("s" + this.obj + id);
-		eNew.className = "nodeSel";
-		this.selectedNode = id;
-		if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);
-	}
-};
-
-// Toggle Open or close
-dTree.prototype.o = function(id) {
-	var cn = this.aNodes[id];
-	this.nodeStatus(!cn._io, id, cn._ls);
-	cn._io = !cn._io;
-	if (this.config.closeSameLevel) this.closeLevel(cn);
-	if (this.config.useCookies) this.updateCookie();
-};
-
-// Open or close all nodes
-dTree.prototype.oAll = function(status) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {
-			this.nodeStatus(status, n, this.aNodes[n]._ls)
-			this.aNodes[n]._io = status;
-		}
-	}
-	if (this.config.useCookies) this.updateCookie();
-};
-
-// Opens the tree to a specific node
-dTree.prototype.openTo = function(nId, bSelect, bFirst) {
-	if (!bFirst) {
-		for (var n=0; n<this.aNodes.length; n++) {
-			if (this.aNodes[n].id == nId) {
-				nId=n;
-				break;
-			}
-		}
-	}
-	var cn=this.aNodes[nId];
-	if (cn.pid==this.root.id || !cn._p) return;
-	cn._io = true;
-	cn._is = bSelect;
-	if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);
-	if (this.completed && bSelect) this.s(cn._ai);
-	else if (bSelect) this._sn=cn._ai;
-	this.openTo(cn._p._ai, false, true);
-};
-
-// Closes all nodes on the same level as certain node
-dTree.prototype.closeLevel = function(node) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {
-			this.nodeStatus(false, n, this.aNodes[n]._ls);
-			this.aNodes[n]._io = false;
-			this.closeAllChildren(this.aNodes[n]);
-		}
-	}
-}
-
-// Closes all children of a node
-dTree.prototype.closeAllChildren = function(node) {
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
-			if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
-			this.aNodes[n]._io = false;
-			this.closeAllChildren(this.aNodes[n]);		
-		}
-	}
-}
-
-// Change the status of a node(open or closed)
-dTree.prototype.nodeStatus = function(status, id, bottom) {
-	eDiv	= document.getElementById('d' + this.obj + id);
-	eJoin	= document.getElementById('j' + this.obj + id);
-	if (this.config.useIcons) {
-		eIcon	= document.getElementById('i' + this.obj + id);
-		eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
-	}
-	eJoin.src = (this.config.useLines)?
-	((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
-	((status)?this.icon.nlMinus:this.icon.nlPlus);
-	eDiv.style.display = (status) ? 'block': 'none';
-};
-
-
-// [Cookie] Clears a cookie
-dTree.prototype.clearCookie = function() {
-	var now = new Date();
-	var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);
-	this.setCookie('co'+this.obj, 'cookieValue', yesterday);
-	this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
-};
-
-// [Cookie] Sets value in a cookie
-dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {
-	document.cookie =
-		escape(cookieName) + '=' + escape(cookieValue)
-		+ (expires ? '; expires=' + expires.toGMTString() : '')
-		+ (path ? '; path=' + path : '')
-		+ (domain ? '; domain=' + domain : '')
-		+ (secure ? '; secure' : '');
-};
-
-// [Cookie] Gets a value from a cookie
-dTree.prototype.getCookie = function(cookieName) {
-	var cookieValue = '';
-	var posName = document.cookie.indexOf(escape(cookieName) + '=');
-	if (posName != -1) {
-		var posValue = posName + (escape(cookieName) + '=').length;
-		var endPos = document.cookie.indexOf(';', posValue);
-		if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));
-		else cookieValue = unescape(document.cookie.substring(posValue));
-	}
-	return (cookieValue);
-};
-
-// [Cookie] Returns ids of open nodes as a string
-dTree.prototype.updateCookie = function() {
-	var str = '';
-	for (var n=0; n<this.aNodes.length; n++) {
-		if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
-			if (str) str += '.';
-			str += this.aNodes[n].id;
-		}
-	}
-	this.setCookie('co' + this.obj, str);
-};
-
-// [Cookie] Checks if a node id is in a cookie
-dTree.prototype.isOpen = function(id) {
-	var aOpen = this.getCookie('co' + this.obj).split('.');
-	for (var n=0; n<aOpen.length; n++)
-		if (aOpen[n] == id) return true;
-	return false;
-};
-
-// If Push and pop is not implemented by the browser
-if (!Array.prototype.push) {
-	Array.prototype.push = function array_push() {
-		for(var i=0;i<arguments.length;i++)
-			this[this.length]=arguments[i];
-		return this.length;
-	}
-};
-if (!Array.prototype.pop) {
-	Array.prototype.pop = function array_pop() {
-		lastElement = this[this.length-1];
-		this.length = Math.max(this.length-1,0);
-		return lastElement;
-	}
-};
\ No newline at end of file
+/*--------------------------------------------------|
| dTree 2.05 | www.destroydrop.com/javascript/tree/ |
|---------------------------------------------------|
| Copyright (c) 2002-2003 Geir LandrE              |
|                                                   |
| This script can be used freely as long as all     |
| copyright messages are intact.                    |
|                                                   |
| Updated: 17.04.2003                               |
|--------------------------------------------------*/


<?php
	$strRel = '../../../';
	include($strRel . 'config.php');
	include($DIR_LIBS . 'PLUGINADMIN.php');
		$oPluginAdmin = new PluginAdmin('Dtree');
		$this->plug =& $oPluginAdmin->plugin;
		$imgpath = $this->plug->getAdminURL();
//		$imgpath = 'nucleus/plugins/dtree/';

?>
// Node object

var imgpath = "<?php echo $imgpath;?>";

function Node(id, pid, name, url, title, target, icon, iconOpen, open) {

	this.id = id;

	this.pid = pid;

	this.name = name;

	this.url = url;

	this.title = title;

	this.target = target;

	this.icon = icon;

	this.iconOpen = iconOpen;

	this._io = open || false;

	this._is = false;

	this._ls = false;

	this._hc = false;

	this._ai = 0;

	this._p;

};



// Tree object

function dTree(objName) {

	this.config = {
		target : null,
<?php
		if ($this->plug->getOption('folderLinks') == 'yes') {
			echo 'folderLinks : true,';
		} else {
			echo 'folderLinks : false,';
		}
		if ($this->plug->getOption('useSelection') == 'yes') {
			echo 'useSelection : true,';
		} else {
			echo 'useSelection : false,';
		}
		if ($this->plug->getOption('useCookies') == 'yes') {
			echo 'useCookies : true,';
		} else {
			echo 'useCookies : false,';
		}
		if ($this->plug->getOption('useLines') == 'yes') {
			echo 'useLines : true,';
		} else {
			echo 'useLines : false,';
		}
		if ($this->plug->getOption('useIcons') == 'yes') {
			echo 'useIcons : true,';
		} else {
			echo 'useIcons : false,';
		}
		if ($this->plug->getOption('useStatusText') == 'yes') {
			echo 'useStatusText : true,';
		} else {
			echo 'useStatusText : false,';
		}
		if ($this->plug->getOption('closeSameLevel') == 'yes') {
			echo 'closeSameLevel : true,';
		} else {
			echo 'closeSameLevel : false,';
		}
		if ($this->plug->getOption('inOrder') == 'yes') {
			echo 'inOrder : true,';
		} else {
			echo 'inOrder : false,';
		}
?>
//		folderLinks			: true,
//		useSelection		: false,
//		useCookies			: false,
//		useLines				: false,
//		useIcons				: false,
//		useStatusText		: true,
//		closeSameLevel	: true,
//		inOrder					: false
	}

	this.icon = {

		root			: imgpath + 'img/base.gif',
		folder			: imgpath + 'img/folder.gif',
		folderOpen		: imgpath + 'img/folderopen.gif',
//		node			: imgpath + 'img/page.gif',
		node			: imgpath + 'img/folder.gif',
		empty			: imgpath + 'img/empty.gif',
		line			: imgpath + 'img/line.gif',
		join			: imgpath + 'img/join.gif',
		joinBottom		: imgpath + 'img/joinbottom.gif',
		plus			: imgpath + 'img/plus.gif',
		plusBottom		: imgpath + 'img/plusbottom.gif',
		minus			: imgpath + 'img/minus.gif',
		minusBottom		: imgpath + 'img/minusbottom.gif',
		nlPlus			: imgpath + 'img/nolines_plus.gif',
		nlMinus			: imgpath + 'img/nolines_minus.gif'

	};

	this.obj = objName;

	this.aNodes = [];

	this.aIndent = [];

	this.root = new Node(-1);

	this.selectedNode = null;

	this.selectedFound = false;

	this.completed = false;

};



// Adds a new node to the node array

dTree.prototype.add = function(id, pid, name, url, title, target, icon, iconOpen, open) {

	this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);

};



// Open/close all nodes

dTree.prototype.openAll = function() {

	this.oAll(true);

};

dTree.prototype.closeAll = function() {

	this.oAll(false);

};



// Outputs the tree to the page

dTree.prototype.toString = function() {

	var str = '<div class="dtree">\n';

	if (document.getElementById) {

		if (this.config.useCookies) this.selectedNode = this.getSelected();

		str += this.addNode(this.root);

	} else str += 'Browser not supported.';

	str += '</div>';

	if (!this.selectedFound) this.selectedNode = null;

	this.completed = true;

	return str;

};



// Creates the tree structure

dTree.prototype.addNode = function(pNode) {

	var str = '';

	var n=0;

	if (this.config.inOrder) n = pNode._ai;

	for (n; n<this.aNodes.length; n++) {

		if (this.aNodes[n].pid == pNode.id) {

			var cn = this.aNodes[n];

			cn._p = pNode;

			cn._ai = n;

			this.setCS(cn);

			if (!cn.target && this.config.target) cn.target = this.config.target;

			if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);

			if (!this.config.folderLinks && cn._hc) cn.url = null;

			if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {

					cn._is = true;

					this.selectedNode = n;

					this.selectedFound = true;

			}

			str += this.node(cn, n);

			if (cn._ls) break;

		}

	}

	return str;

};



// Creates the node icon, url and text

dTree.prototype.node = function(node, nodeId) {

	var str = '<div class="dTreeNode">' + this.indent(node, nodeId);

	if (this.config.useIcons) {

		if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);

		if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;

		if (this.root.id == node.pid) {

			node.icon = this.icon.root;

			node.iconOpen = this.icon.root;

		}

		str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';

	}

	if (node.url) {

		str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';

		if (node.title) str += ' title="' + node.title + '"';

		if (node.target) str += ' target="' + node.target + '"';

		if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';

		if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))

			str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';

		str += '>';

	}

	else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)

		str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';

	str += node.name;

	if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';

	str += '</div>';

	if (node._hc) {

		str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';

		str += this.addNode(node);

		str += '</div>';

	}

	this.aIndent.pop();

	return str;

};



// Adds the empty and line icons

dTree.prototype.indent = function(node, nodeId) {

	var str = '';

	if (this.root.id != node.pid) {

		for (var n=0; n<this.aIndent.length; n++)

			str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';

		(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);

		if (node._hc) {

			str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img id="j' + this.obj + nodeId + '" src="';

			if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;

			else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );

			str += '" alt="" /></a>';

		} else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';

	}

	return str;

};



// Checks if a node has any children and if it is the last sibling

dTree.prototype.setCS = function(node) {

	var lastId;

	for (var n=0; n<this.aNodes.length; n++) {

		if (this.aNodes[n].pid == node.id) node._hc = true;

		if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;

	}

	if (lastId==node.id) node._ls = true;

};



// Returns the selected node

dTree.prototype.getSelected = function() {

	var sn = this.getCookie('cs' + this.obj);

	return (sn) ? sn : null;

};



// Highlights the selected node

dTree.prototype.s = function(id) {

	if (!this.config.useSelection) return;

	var cn = this.aNodes[id];

	if (cn._hc && !this.config.folderLinks) return;

	if (this.selectedNode != id) {

		if (this.selectedNode || this.selectedNode==0) {

			eOld = document.getElementById("s" + this.obj + this.selectedNode);

			eOld.className = "node";

		}

		eNew = document.getElementById("s" + this.obj + id);

		eNew.className = "nodeSel";

		this.selectedNode = id;

		if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);

	}

};



// Toggle Open or close

dTree.prototype.o = function(id) {

	var cn = this.aNodes[id];

	this.nodeStatus(!cn._io, id, cn._ls);

	cn._io = !cn._io;

	if (this.config.closeSameLevel) this.closeLevel(cn);

	if (this.config.useCookies) this.updateCookie();

};



// Open or close all nodes

dTree.prototype.oAll = function(status) {

	for (var n=0; n<this.aNodes.length; n++) {

		if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {

			this.nodeStatus(status, n, this.aNodes[n]._ls)

			this.aNodes[n]._io = status;

		}

	}

	if (this.config.useCookies) this.updateCookie();

};



// Opens the tree to a specific node

dTree.prototype.openTo = function(nId, bSelect, bFirst) {

	if (!bFirst) {

		for (var n=0; n<this.aNodes.length; n++) {

			if (this.aNodes[n].id == nId) {

				nId=n;

				break;

			}

		}

	}

	var cn=this.aNodes[nId];

	if (cn.pid==this.root.id || !cn._p) return;

	cn._io = true;

	cn._is = bSelect;

	if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);

	if (this.completed && bSelect) this.s(cn._ai);

	else if (bSelect) this._sn=cn._ai;

	this.openTo(cn._p._ai, false, true);

};



// Closes all nodes on the same level as certain node

dTree.prototype.closeLevel = function(node) {

	for (var n=0; n<this.aNodes.length; n++) {

		if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {

			this.nodeStatus(false, n, this.aNodes[n]._ls);

			this.aNodes[n]._io = false;

			this.closeAllChildren(this.aNodes[n]);

		}

	}

}



// Closes all children of a node

dTree.prototype.closeAllChildren = function(node) {

	for (var n=0; n<this.aNodes.length; n++) {

		if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {

			if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);

			this.aNodes[n]._io = false;

			this.closeAllChildren(this.aNodes[n]);		

		}

	}

}



// Change the status of a node(open or closed)

dTree.prototype.nodeStatus = function(status, id, bottom) {

	eDiv	= document.getElementById('d' + this.obj + id);

	eJoin	= document.getElementById('j' + this.obj + id);

	if (this.config.useIcons) {

		eIcon	= document.getElementById('i' + this.obj + id);

		eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;

	}

	eJoin.src = (this.config.useLines)?

	((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):

	((status)?this.icon.nlMinus:this.icon.nlPlus);

	eDiv.style.display = (status) ? 'block': 'none';

};





// [Cookie] Clears a cookie

dTree.prototype.clearCookie = function() {

	var now = new Date();

	var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);

	this.setCookie('co'+this.obj, 'cookieValue', yesterday);

	this.setCookie('cs'+this.obj, 'cookieValue', yesterday);

};



// [Cookie] Sets value in a cookie

dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {

	document.cookie =

		escape(cookieName) + '=' + escape(cookieValue)

		+ (expires ? '; expires=' + expires.toGMTString() : '')

		+ (path ? '; path=' + path : '')

		+ (domain ? '; domain=' + domain : '')

		+ (secure ? '; secure' : '');

};



// [Cookie] Gets a value from a cookie

dTree.prototype.getCookie = function(cookieName) {

	var cookieValue = '';

	var posName = document.cookie.indexOf(escape(cookieName) + '=');

	if (posName != -1) {

		var posValue = posName + (escape(cookieName) + '=').length;

		var endPos = document.cookie.indexOf(';', posValue);

		if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));

		else cookieValue = unescape(document.cookie.substring(posValue));

	}

	return (cookieValue);

};



// [Cookie] Returns ids of open nodes as a string

dTree.prototype.updateCookie = function() {

	var str = '';

	for (var n=0; n<this.aNodes.length; n++) {

		if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {

			if (str) str += '.';

			str += this.aNodes[n].id;

		}

	}

	this.setCookie('co' + this.obj, str);

};



// [Cookie] Checks if a node id is in a cookie

dTree.prototype.isOpen = function(id) {

	var aOpen = this.getCookie('co' + this.obj).split('.');

	for (var n=0; n<aOpen.length; n++)

		if (aOpen[n] == id) return true;

	return false;

};



// If Push and pop is not implemented by the browser

if (!Array.prototype.push) {

	Array.prototype.push = function array_push() {

		for(var i=0;i<arguments.length;i++)

			this[this.length]=arguments[i];

		return this.length;

	}

};

if (!Array.prototype.pop) {

	Array.prototype.pop = function array_pop() {

		lastElement = this[this.length-1];

		this.length = Math.max(this.length-1,0);

		return lastElement;

	}

};
\ No newline at end of file
diff --git a/trunk/NP_Dtree/dtree/dtreedata.php b/trunk/NP_Dtree/dtree/dtreedata.php
index a69f508..7d69810 100644
--- a/trunk/NP_Dtree/dtree/dtreedata.php
+++ b/trunk/NP_Dtree/dtree/dtreedata.php
@@ -14,7 +14,8 @@ global $CONF;
 	$CategoryKey = ($usePathInfo) ? $CONF['CategoryKey'] : 'catid';
 
 //	$objectId = requestVar('o');
-	$objectId = 'tree' . intval(substr(requestVar('o'), 4));
+	$objectId = 'tree' . preg_replace('|[^0-9a-f]|i', '', substr(requestVar('o'), 4));
+//	$objectId = 'tree' . intval(substr(requestVar('o'), 4));
 	$blogid = intRequestVar('bid');
 	if (empty($blogid)) $blogid = intval($CONF['DefaultBlog']);
 	$blogname = getBlogNameFromID($blogid);
@@ -63,7 +64,7 @@ global $CONF;
 //		$url = createBlogidLink($blogid, array('catid'=>$catid));
 		$url = createCategoryLink($catid);
 //		$url = createBlogidLink($blogid, array("$CategoryKey"=>$catid));
-		echo $objectId . ".add(" . $n . ",0,'" . htmlspecialchars($o->cname) . "','" . htmlspecialchars($url) . "');\n";
+		echo $objectId . ".add(" . $n . ",0,'" . htmlspecialchars($o->cname) . "','" . htmlspecialchars($url) . "','" . htmlspecialchars($o->cdesc) . "');\n";
 		$catFilter[] = $catid;
 		$n++;
 	}
@@ -106,8 +107,9 @@ global $CONF;
 //		$url = createBlogidLink($blogid, array('catid'=>$u->catid, 'subcatid'=>$scatid));
 		$url = createCategoryLink($u->catid, array($subrequest => $scatid));
 //		$url = createBlogidLink($blogid, array("$CategoryKey"=>$u->catid, 'subcatid'=>$scatid));
+		$scat_desc = $b->getCategoryDesc($catid);
 		$pnode = (!empty($parent_id)) ? $nodeArray['subcat'][$parent_id] : $nodeArray['cat'][$cat_id];
-		echo $objectId . ".add(" . $nodeArray['subcat'][$scatid] . "," . $pnode . ",'" . htmlspecialchars($u->sname) . "','" . $url . "');\n";
+		echo $objectId . ".add(" . $nodeArray['subcat'][$scatid] . "," . $pnode . ",'" . htmlspecialchars($u->sname) . "','" . htmlspecialchars($url) . "','" . htmlspecialchars($u->sdesc) . "');\n";
 	}
 
 	echo "document.write(" . $objectId . ");\n";
diff --git a/trunk/NP_Dtree/dtree/language/english.php b/trunk/NP_Dtree/dtree/language/english.php
new file mode 100644
index 0000000..d5e2eef
--- /dev/null
+++ b/trunk/NP_Dtree/dtree/language/english.php
@@ -0,0 +1,13 @@
+<?php
+	define('_DTREE_DESCRIPTION',	'Show Navigation Tree. Usage: &lt;%Dtree()%&gt;');
+	define('_DTREE_DIR_LINK',		'Should folders be links.');
+	define('_DTREE_SELECTION',	'Nodes can be selected(highlighted).');
+	define('_DTREE_COOKIE',		'The tree uses cookies to rember it\'s state.');
+	define('_DTREE_LINE',			'Tree is drawn with lines.');
+	define('_DTREE_ICON',			'Tree is drawn with icons.');
+	define('_DTREE_ST_TEXT',		'Displays node names in the statusbar instead of the url.');
+	define('_DTREE_CL_SLEVEL',	'Only one node within a parent can be expanded at the same time. [Open All] and [Close All] functions do not work when this is enabled.');
+	define('_DTREE_IN_ORDER',		'If parent nodes are always added before children, setting this to true speeds up the tree.');
+	define('_DTREE_OPENALL',		'Open All');
+	define('_DTREE_CLOSEALL',		'Close All');
+?>
\ No newline at end of file
diff --git a/trunk/NP_Dtree/dtree/language/japanese-euc.php b/trunk/NP_Dtree/dtree/language/japanese-euc.php
new file mode 100644
index 0000000..148cfee
--- /dev/null
+++ b/trunk/NP_Dtree/dtree/language/japanese-euc.php
@@ -0,0 +1,13 @@
+<?php
+	define('_DTREE_DESCRIPTION',	'¥Ä¥ê¡¼É½¼¨¤Î¥«¥Æ¥´¥ê¡¦¥µ¥Ö¥«¥Æ¥´¥ê¥á¥Ë¥å¡¼<br />¥¹¥­¥ó¡¢¤Þ¤¿¤Ï¥Æ¥ó¥×¥ì¡¼¥È¤Ë[&lt;%Dtree()%&gt;]¤Èµ­½Ò');
+	define('_DTREE_DIR_LINK',		'¥Õ¥©¥ë¥À¡¼¤Î¥ê¥ó¥¯¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«¡©');
+	define('_DTREE_SELECTION',	'ÁªÂòÃæ¤Î¥«¥Æ¥´¥ê¡¦¥µ¥Ö¥«¥Æ¥´¥ê¤ò¥Ï¥¤¥é¥¤¥È¤·¤Þ¤¹¤«¡©');
+	define('_DTREE_COOKIE',		'¥¯¥Ã¥­¡¼¤ò»ÈÍѤ·¤Æ¥Ä¥ê¡¼¤Î¾õÂÖ¤òÊݸ¤·¤Þ¤¹¤«¡©');
+	define('_DTREE_LINE',			'¥Ä¥ê¡¼¤Î¥é¥¤¥ó¤òɽ¼¨¤·¤Þ¤¹¤«¡©');
+	define('_DTREE_ICON',			'¥¢¥¤¥³¥ó¤ò»ÈÍѤ·¤Þ¤¹¤«¡©');
+	define('_DTREE_ST_TEXT',		'URL¤ÎÂå¤ï¤ê¤Ë¥«¥Æ¥´¥ê¡¦¥µ¥Ö¥«¥Æ¥´¥ê̾¤ò¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼¤Ëɽ¼¨¤·¤Þ¤¹¤«¡©');
+	define('_DTREE_CL_SLEVEL',	'Æó¤Ä°Ê¾å¤Î»Þ¤òƱ»þ¤ËŸ³«¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¤«¡©(Ž¢Á´¤Æ³«¤¯Ž£Ž¢Á´¤ÆÊĤ¸¤ëŽ£¤Ï¤³¤ÎÀßÄê¤Ë±Æ¶Á¤µ¤ì¤Þ¤»¤ó)');
+	define('_DTREE_IN_ORDER',		'If parent nodes are always added before children, setting this to true speeds up the tree.');
+	define('_DTREE_OPENALL',		'Á´¤Æ³«¤¯');
+	define('_DTREE_CLOSEALL',		'Á´¤ÆÊĤ¸¤ë');
+?>
\ No newline at end of file
diff --git a/trunk/NP_Dtree/dtree/language/japanese-utf8.php b/trunk/NP_Dtree/dtree/language/japanese-utf8.php
new file mode 100644
index 0000000..f2e484e
--- /dev/null
+++ b/trunk/NP_Dtree/dtree/language/japanese-utf8.php
@@ -0,0 +1,13 @@
+<?php
+	define('_DTREE_DESCRIPTION',	'ツリー表示のカテゴリ・サブカテゴリメニュー<br />スキン、またはテンプレートに[&lt;%Dtree()%&gt;]と記述');
+	define('_DTREE_DIR_LINK',		'フォルダーのリンクを有効にしますか？');
+	define('_DTREE_SELECTION',	'選択中のカテゴリ・サブカテゴリをハイライトしますか？');
+	define('_DTREE_COOKIE',		'クッキーを使用してツリーの状態を保存しますか？');
+	define('_DTREE_LINE',			'ツリーのラインを表示しますか？');
+	define('_DTREE_ICON',			'アイコンを使用しますか？');
+	define('_DTREE_ST_TEXT',		'URLの代わりにカテゴリ・サブカテゴリ名をステータスバーに表示しますか？');
+	define('_DTREE_CL_SLEVEL',	'二つ以上の枝を同時に展開しないようにしますか？(｢全て開く｣｢全て閉じる｣はこの設定に影響されません)');
+	define('_DTREE_IN_ORDER',		'If parent nodes are always added before children, setting this to true speeds up the tree.');
+	define('_DTREE_OPENALL',		'全て開く');
+	define('_DTREE_CLOSEALL',		'全て閉じる');
+?>
\ No newline at end of file