From ace21f5c6fe368d2df7c6785451431d8fc56b333 Mon Sep 17 00:00:00 2001
From: shizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Date: Sat, 4 Nov 2006 09:22:52 +0000
Subject: [PATCH] bug fix

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/plugin@472 1ca29b6e-896d-4ea0-84a5-967f57386b96
---
 trunk/NP_Dtree/dtree/dtree.php     |   2 +-
 trunk/NP_Dtree/dtree/dtreedata.php | 344 +++++++++++++++++++------------------
 2 files changed, 178 insertions(+), 168 deletions(-)

diff --git a/trunk/NP_Dtree/dtree/dtree.php b/trunk/NP_Dtree/dtree/dtree.php
index 5a29915..a230716 100644
--- a/trunk/NP_Dtree/dtree/dtree.php
+++ b/trunk/NP_Dtree/dtree/dtree.php
@@ -1 +1 @@
-/*--------------------------------------------------|
| 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
+/*--------------------------------------------------|
| 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');
		$plug =& $oPluginAdmin->plugin;
		$imgpath = $plug->getAdminURL();
//		$imgpath = 'nucleus/plugins/dtree/';

		if ($plug->getOption('folderLinks') == 'yes') {
			$folderLinks = 'true,';
		} else {
			$folderLinks = 'false,';
		}
		if ($plug->getOption('useSelection') == 'yes') {
			$useSelection = 'true,';
		} else {
			$useSelection = 'false,';
		}
		if ($plug->getOption('useCookies') == 'yes') {
			$useCookies = 'true,';
		} else {
			$useCookies = 'false,';
		}
		if ($plug->getOption('useLines') == 'yes') {
			$useLines = 'true,';
		} else {
			$useLines = 'false,';
		}
		if ($plug->getOption('useIcons') == 'yes') {
			$useIcons = 'true,';
		} else {
			$useIcons = 'false,';
		}
		if ($plug->getOption('useStatusText') == 'yes') {
			$useStatusText = 'true,';
		} else {
			$useStatusText = 'false,';
		}
		if ($plug->getOption('closeSameLevel') == 'yes') {
			$closeSameLevel = 'true,';
		} else {
			$closeSameLevel = 'false,';
		}
		if ($plug->getOption('inOrder') == 'yes') {
			$inOrder = 'true';
		} else {
			$inOrder = 'false';
		}

?>
// 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		: <?php echo $folderLinks ?>
		useSelection	: <?php echo $useSelection ?>
		useCookies		: <?php echo $useCookies ?>
		useLines		: <?php echo $useLines ?>
		useIcons		: <?php echo $useIcons ?>
		useStatusText	: <?php echo $useStatusText ?>
		closeSameLevel	: <?php echo $closeSameLevel ?>
		inOrder			: <?php echo $inOrder ?>

//		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 7d69810..30644d7 100644
--- a/trunk/NP_Dtree/dtree/dtreedata.php
+++ b/trunk/NP_Dtree/dtree/dtreedata.php
@@ -1,169 +1,179 @@
 <?php
-global $CONF;
-	$strRel = '../../../';
-	include($strRel . 'config.php');
-
-	$usePathInfo = ($CONF['URLMode'] == 'pathinfo');
-
-	if ($usePathInfo) {
-		if (empty($CONF['CategoryKey'])) {
-			$CONF['CategoryKey'] = 'category';
-		}
-	}
-
-	$CategoryKey = ($usePathInfo) ? $CONF['CategoryKey'] : 'catid';
-
-//	$objectId = requestVar('o');
-	$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);
-
-		$b =& $manager->getBlog($blogid);
-		$blogurl = $b->getURL();
-		if (!$blogurl) {
-			if($blog) {
-				$b_tmp =& $manager->getBlog($blogid);
-				$blogurl = $b_tmp->getURL();
-			}
-			if (!$blogurl) {
-				$blogurl = $CONF['IndexURL'];
-				if (!$usePathInfo) {
-					if ($data['type'] == 'pageparser') {
-						$blogurl .= 'index.php';
-					} else {
-						$blogurl = $CONF['Self'];
-					}
-				}
-			}
-		}
-		if ($usePathInfo) {
-			if (substr($blogurl, -1) == '/') { 
-				$blogurl = substr($blogurl, 0, -1);
-			}
-		}
-
-		$CONF['BlogURL'] = $blogurl;
-		$CONF['ItemURL'] = $blogurl;
-		$CONF['CategoryURL'] = $blogurl;
-		$CONF['ArchiveURL'] = $blogurl;
-		$CONF['ArchiveListURL'] = $blogurl;
-		$CONF['SearchURL'] = $blogurl;
-
-	echo $objectId . "=new dTree('" . htmlspecialchars($objectId) . "');\n";
-	
-	echo $objectId . ".add(0,-1,'" . htmlspecialchars($blogname) . "');\n";
-	
-	$resq = 'SELECT * FROM %s WHERE cblog = %d';
-	$res = sql_query(sprintf($resq, sql_table('category'), $blogid));
-	$n = 1;
-	while ($o = mysql_fetch_object($res)) {
-		$catid = intval($o->catid);
-		$nodeArray['cat'][$catid] = $n;
-//		$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) . "','" . htmlspecialchars($o->cdesc) . "');\n";
-		$catFilter[] = $catid;
-		$n++;
-	}
-	
-	global $manager; 
-	if (!$manager->pluginInstalled('NP_MultipleCategories')) {
-		$mPlugin =& $manager->getPlugin('NP_MultipleCategories');
-		$subrequest = $mPlugin->getRequestName();
-		echo 'document.write(' . $objectId . ');';
-		if ($itemid = intRequestVar('id')) {
-			$que = 'SELECT icat as result FROM %s WHERE inumber = %d';
-			$catid = quickQuery(sprintf($que, sql_table('item'), $itemid));
-			$catid = intval($catid);
-			$nodeId = 's' . $objectId . $nodeArray['cat'][$catid];
-			echo "document.getElementById('" . htmlspecialchars($nodeId) . "').className = 'selectedNode';";
-		}
-		return;
-	}
-
-	if ($catFilter[1]) {
-		$catFilter = @join(', ', $catFilter);
-		$catFilter = ' IN (' . $catFilter . ')';
-	} else {
-		$catFilter = '=' . $catFilter;
-	}
-	
-	$query = 'SELECT * FROM %s WHERE catid %s';
-	$res = sql_query(sprintf($query, sql_table('plug_multiple_categories_sub'), $catFilter));
-	while ($o = mysql_fetch_object($res)) {
-		$scatid = intval($o->scatid);
-		$nodeArray['subcat'][$scatid] = $n;
-		$n++;
-	}
-	$query = 'SELECT * FROM %s WHERE catid %s';
-	$res = sql_query(sprintf($query, sql_table('plug_multiple_categories_sub'), $catFilter));
-	while ($u = mysql_fetch_object($res)) {
-		$scatid = intval($u->scatid);
-		$parent_id = intval($u->parentid);
-		$cat_id = intval($u->catid);
-//		$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) . "','" . htmlspecialchars($url) . "','" . htmlspecialchars($u->sdesc) . "');\n";
-	}
-
-	echo "document.write(" . $objectId . ");\n";
-
-
-	if ($sid = intRequestVar('sid')) {
-//		$sid = intRequestVar('sid');
-		$nodeId = 's' . $objectId . $nodeArray['subcat'][$sid];
-		echo "document.getElementById('" . $nodeId . "').className='urlselected';\n";
-		echo $objectId . ".openTo(" . $nodeArray['subcat'][$sid] . ",true);\n";
-	} elseif ($cid = intRequestVar('cid')) {
-//		$cid = intRequestVar('cid');
-		$nodeId = 's' . $objectId . $nodeArray['cat'][$cid];
-		echo "document.getElementById('" . $nodeId . "').className='urlselected';\n";
-		echo $objectId . ".openTo(" . $nodeArray['cat'][$cid] . ",true);\n";
-	}
-
-
-
-	if ($itemid = intRequestVar('id')) {
-		$que = 'SELECT icat as result FROM %s WHERE inumber = %d';
-		$catid = quickQuery($que, sql_table('item'), $itemid);
-		$catid = intva($catid);
-//		$catid = quickQuery('SELECT icat as result FROM ' . sql_table('item') . ' WHERE inumber = ' . $itemid);
-		$nodeId = 's' . $objectId.$nodeArray['cat'][$catid];
-		echo "document.getElementById('" . $nodeId . "').className='selectedNode';\n";
-		
-		//multi catid
-		$que = 'SELECT categories as result FROM %s WHERE item_id = %d';
-		$catids = quickQuery(sprintf($que, sql_table('plug_multiple_categories'), $itemid));
-		if ($catids) {
-			$catids = explode(',', $catids);
-			for ($i=0;$i<count($catids);$i++) {
-				$catidTemp = intval($catids[$i]);
-				if ($catidTemp != $catid) {
-					$nodeId = 's' . $objectId . $nodeArray['cat'][$catidTemp];
-					echo "document.getElementById('" . $nodeId . "').className='selectedCatNode';\n";
-				}
-			}
-		}
-		
-		//(multi) subcatid
-		$que = 'SELECT subcategories as result FROM %s WHERE item_id = %d';
-		$scatids = quickQuery(sprintf($que, sql_table('plug_multiple_categories'), $itemid));
-		if ($scatids) {
-			$scatids = explode(',', $scatids);
-			for ($i=0;$i<count($scatids);$i++) {
-				$scatid = intval($scatids[$i]);
-				$nodeId = 's' . $objectId . $nodeArray['subcat'][$scatid];
-				echo "document.getElementById('" . $nodeId . "').className='selectedScatNode';\n";
-				echo $objectId . ".openTo(" . $nodeArray['subcat'][$scatid] . ",true);\n";
-			}
-		}
-	}
-
-
+/**
+ *
+ * DATA creation script for dTree
+ *
+ */
+
+global $CONF, $manager;
+    $strRel = '../../../';
+    include($strRel . 'config.php');
+
+    $usePathInfo = ($CONF['URLMode'] == 'pathinfo');
+
+//  $objectId = requestVar('o');
+    $objectId = 'tree' . preg_replace('|[^0-9a-f]|i', '', substr(requestVar('o'), 4));
+    $blogid   = intRequestVar('bid');
+    if (empty($blogid)) $blogid = intval($CONF['DefaultBlog']);
+    $blogname = getBlogNameFromID($blogid);
+
+    $b =& $manager->getBlog($blogid);
+    $blogurl = $b->getURL();
+    if (!$blogurl) {
+        if($blog) {
+            $b_tmp =& $manager->getBlog($blogid);
+            $blogurl = $b_tmp->getURL();
+        }
+        if (!$blogurl) {
+            $blogurl = $CONF['IndexURL'];
+            if (!$usePathInfo) {
+                if ($data['type'] == 'pageparser') {
+                    $blogurl .= 'index.php';
+                } else {
+                    $blogurl = $CONF['Self'];
+                }
+            }
+        }
+    }
+    if ($usePathInfo) {
+        if (substr($blogurl, -1) == '/') { 
+            $blogurl = substr($blogurl, 0, -1);
+        }
+    }
+
+    $CONF['BlogURL']        = $blogurl;
+    $CONF['ItemURL']        = $blogurl;
+    $CONF['CategoryURL']    = $blogurl;
+    $CONF['ArchiveURL']     = $blogurl;
+    $CONF['ArchiveListURL'] = $blogurl;
+    $CONF['SearchURL']      = $blogurl;
+
+    echo $objectId . "=new dTree('" . htmlspecialchars($objectId) . "');\n";
+    
+    echo $objectId . ".add(0,-1,'" . htmlspecialchars($blogname) . "');\n";
+    
+    $resq = 'SELECT * FROM %s WHERE cblog = %d';
+    $res = sql_query(sprintf($resq, sql_table('category'), $blogid));
+    $n = 1;
+    while ($o = mysql_fetch_object($res)) {
+        $catid = intval($o->catid);
+        $nodeArray['cat'][$catid] = $n;
+//      $url = createBlogidLink($blogid, array('catid'=>$catid));
+        $url = createCategoryLink($catid);
+//      $url = createBlogidLink($blogid, array("$CategoryKey"=>$catid));
+        $printData = $objectId
+                   . ".add(" . $n
+                   . ",0,'"
+                   . htmlspecialchars($o->cname) . "','"
+                   . htmlspecialchars($url) . "','"
+                   . htmlspecialchars($o->cdesc) . "');\n";
+        echo $printData;
+        $catFilter[] = $catid;
+        $n++;
+    }
+    
+    if (!$manager->pluginInstalled('NP_MultipleCategories')) {
+        echo 'document.write(' . $objectId . ');';
+        if ($itemid = intRequestVar('id')) {
+            $que = 'SELECT icat as result FROM %s WHERE inumber = %d';
+            $catid = quickQuery(sprintf($que, sql_table('item'), $itemid));
+            $catid = intval($catid);
+            $nodeId = 's' . $objectId . $nodeArray['cat'][$catid];
+            echo "document.getElementById('" . htmlspecialchars($nodeId) . "').className = 'selectedNode';";
+        }
+        return;
+    }
+
+    if ($catFilter[1]) {
+        $catFilter = @join(', ', $catFilter);
+        $catFilter = ' IN (' . $catFilter . ')';
+    } else {
+        $catFilter = '=' . $catFilter;
+    }
+    
+    $query = 'SELECT * FROM %s WHERE catid %s ORDER BY scatid';
+    $res = sql_query(sprintf($query, sql_table('plug_multiple_categories_sub'), $catFilter));
+    while ($o = mysql_fetch_object($res)) {
+        $scatid = intval($o->scatid);
+        $nodeArray['subcat'][$scatid] = $n;
+        $n++;
+    }
+    $query = 'SELECT * FROM %s WHERE catid %s ORDER BY scatid';
+    $res = sql_query(sprintf($query, sql_table('plug_multiple_categories_sub'), $catFilter));
+    $mcategories =& $manager->getPlugin('NP_MultipleCategories');
+    if (method_exists($mcategories, "getRequestName")) {
+        $subrequest = $mcategories->getRequestName();
+    } else {
+        $subrequest = 'subcatid';
+    }
+
+    while ($u = mysql_fetch_object($res)) {
+        $scatid = intval($u->scatid);
+        $parent_id = intval($u->parentid);
+        $cat_id = intval($u->catid);
+//      $url = createBlogidLink($blogid, array('catid'=>$u->catid, 'subcatid'=>$scatid));
+        $url = createCategoryLink($cat_id, array($subrequest => $scatid));
+//      $url = createBlogidLink($blogid, array("$CategoryKey"=>$u->catid, 'subcatid'=>$scatid));
+
+        $pnode = (!empty($parent_id)) ? $nodeArray['subcat'][$parent_id] : $nodeArray['cat'][$cat_id];
+        $printData = $objectId . ".add(" . $nodeArray['subcat'][$scatid] . ","
+                   . $pnode . ",'"
+                   . htmlspecialchars($u->sname) . "','"
+                   . htmlspecialchars($url) . "','"
+                   . htmlspecialchars($u->sdesc) . "');\n";
+        echo $printData;
+    }
+
+    echo "document.write(" . $objectId . ");\n";
+
+
+    if ($sid = intRequestVar('sid')) {
+//      $sid = intRequestVar('sid');
+        $nodeId = 's' . $objectId . $nodeArray['subcat'][$sid];
+        echo "document.getElementById('" . $nodeId . "').className='urlselected';\n";
+        echo $objectId . ".openTo(" . $nodeArray['subcat'][$sid] . ",true);\n";
+    } elseif ($cid = intRequestVar('cid')) {
+//      $cid = intRequestVar('cid');
+        $nodeId = 's' . $objectId . $nodeArray['cat'][$cid];
+        echo "document.getElementById('" . $nodeId . "').className='urlselected';\n";
+        echo $objectId . ".openTo(" . $nodeArray['cat'][$cid] . ",true);\n";
+    }
+
+
+
+    if ($itemid = intRequestVar('id')) {
+        $que = 'SELECT icat as result FROM %s WHERE inumber = %d';
+        $catid = quickQuery($que, sql_table('item'), $itemid);
+        $catid = intva($catid);
+//      $catid = quickQuery('SELECT icat as result FROM ' . sql_table('item') . ' WHERE inumber = ' . $itemid);
+        $nodeId = 's' . $objectId.$nodeArray['cat'][$catid];
+        echo "document.getElementById('" . $nodeId . "').className='selectedNode';\n";
+        
+        //multi catid
+        $que = 'SELECT categories as result FROM %s WHERE item_id = %d';
+        $catids = quickQuery(sprintf($que, sql_table('plug_multiple_categories'), $itemid));
+        if ($catids) {
+            $catids = explode(',', $catids);
+            for ($i=0;$i<count($catids);$i++) {
+                $catidTemp = intval($catids[$i]);
+                if ($catidTemp != $catid) {
+                    $nodeId = 's' . $objectId . $nodeArray['cat'][$catidTemp];
+                    echo "document.getElementById('" . $nodeId . "').className='selectedCatNode';\n";
+                }
+            }
+        }
+        
+        //(multi) subcatid
+        $que = 'SELECT subcategories as result FROM %s WHERE item_id = %d';
+        $scatids = quickQuery(sprintf($que, sql_table('plug_multiple_categories'), $itemid));
+        if ($scatids) {
+            $scatids = explode(',', $scatids);
+            for ($i=0;$i<count($scatids);$i++) {
+                $scatid = intval($scatids[$i]);
+                $nodeId = 's' . $objectId . $nodeArray['subcat'][$scatid];
+                echo "document.getElementById('" . $nodeId . "').className='selectedScatNode';\n";
+                echo $objectId . ".openTo(" . $nodeArray['subcat'][$scatid] . ",true);\n";
+            }
+        }
+    }
 ?>
\ No newline at end of file
-- 
2.11.0