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 (file)
--- 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 (file)
--- a/trunk/NP_Dtree/dtree/dtree.php
+++ b/trunk/NP_Dtree/dtree/dtree.php
@@ -1,320 +1 @@
-/*--------------------------------------------------|\r| dTree 2.05 | www.destroydrop.com/javascript/tree/ |\r|---------------------------------------------------|\r| Copyright (c) 2002-2003 Geir Landr\e$B!&\e(B              |\r|                                                   |\r| This script can be used freely as long as all     |\r| copyright messages are intact.                    |\r|                                                   |\r| Updated: 17.04.2003                               |\r|--------------------------------------------------*/\r
-\r<?php\r        $strRel = '../../../';\r include($strRel . 'config.php');\r       include($DIR_LIBS . 'PLUGINADMIN.php');\r                $oPluginAdmin = new PluginAdmin('Dtree');\r              $this->plug =& $oPluginAdmin->plugin;\r          $imgpath = $this->plug->getAdminURL();
-//             $imgpath = 'nucleus/plugins/dtree/';
-
-?>
-// Node object\r
-var imgpath = "<?php echo $imgpath;?>";
-
-function Node(id, pid, name, url, title, target, icon, iconOpen, open) {\r
-       this.id = id;\r
-       this.pid = pid;\r
-       this.name = name;\r
-       this.url = url;\r
-       this.title = title;\r
-       this.target = target;\r
-       this.icon = icon;\r
-       this.iconOpen = iconOpen;\r
-       this._io = open || false;\r
-       this._is = false;\r
-       this._ls = false;\r
-       this._hc = false;\r
-       this._ai = 0;\r
-       this._p;\r
-};\r
-\r
-// Tree object\r
-function dTree(objName) {\r
-       this.config = {\r                target                  : null,\r                folderLinks             : true,\r                useSelection    : false,\r               useCookies              : false,\r               useLines                : true,\r                useIcons                : true,\r                useStatusText   : false,\r               closeSameLevel  : false,\r               inOrder                 : false\r        }\r
-       this.icon = {\r
-               root                    : imgpath + 'img/base.gif',\r            folder                  : imgpath + 'img/folder.gif',\r          folderOpen              : imgpath + 'img/folderopen.gif',\r//            node                    : imgpath + 'img/page.gif',\r            node                    : imgpath + 'img/folder.gif',\r          empty                   : imgpath + 'img/empty.gif',\r           line                    : imgpath + 'img/line.gif',\r            join                    : imgpath + 'img/join.gif',\r            joinBottom              : imgpath + 'img/joinbottom.gif',\r              plus                    : imgpath + 'img/plus.gif',\r            plusBottom              : imgpath + 'img/plusbottom.gif',\r              minus                   : imgpath + 'img/minus.gif',\r           minusBottom             : imgpath + 'img/minusbottom.gif',\r             nlPlus                  : imgpath + 'img/nolines_plus.gif',\r            nlMinus                 : imgpath + 'img/nolines_minus.gif'\r
-       };\r
-       this.obj = objName;\r
-       this.aNodes = [];\r
-       this.aIndent = [];\r
-       this.root = new Node(-1);\r
-       this.selectedNode = null;\r
-       this.selectedFound = false;\r
-       this.completed = false;\r
-};\r
-\r
-// Adds a new node to the node array\r
-dTree.prototype.add = function(id, pid, name, url, title, target, icon, iconOpen, open) {\r
-       this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);\r
-};\r
-\r
-// Open/close all nodes\r
-dTree.prototype.openAll = function() {\r
-       this.oAll(true);\r
-};\r
-dTree.prototype.closeAll = function() {\r
-       this.oAll(false);\r
-};\r
-\r
-// Outputs the tree to the page\r
-dTree.prototype.toString = function() {\r
-       var str = '<div class="dtree">\n';\r
-       if (document.getElementById) {\r
-               if (this.config.useCookies) this.selectedNode = this.getSelected();\r
-               str += this.addNode(this.root);\r
-       } else str += 'Browser not supported.';\r
-       str += '</div>';\r
-       if (!this.selectedFound) this.selectedNode = null;\r
-       this.completed = true;\r
-       return str;\r
-};\r
-\r
-// Creates the tree structure\r
-dTree.prototype.addNode = function(pNode) {\r
-       var str = '';\r
-       var n=0;\r
-       if (this.config.inOrder) n = pNode._ai;\r
-       for (n; n<this.aNodes.length; n++) {\r
-               if (this.aNodes[n].pid == pNode.id) {\r
-                       var cn = this.aNodes[n];\r
-                       cn._p = pNode;\r
-                       cn._ai = n;\r
-                       this.setCS(cn);\r
-                       if (!cn.target && this.config.target) cn.target = this.config.target;\r
-                       if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);\r
-                       if (!this.config.folderLinks && cn._hc) cn.url = null;\r
-                       if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {\r
-                                       cn._is = true;\r
-                                       this.selectedNode = n;\r
-                                       this.selectedFound = true;\r
-                       }\r
-                       str += this.node(cn, n);\r
-                       if (cn._ls) break;\r
-               }\r
-       }\r
-       return str;\r
-};\r
-\r
-// Creates the node icon, url and text\r
-dTree.prototype.node = function(node, nodeId) {\r
-       var str = '<div class="dTreeNode">' + this.indent(node, nodeId);\r
-       if (this.config.useIcons) {\r
-               if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);\r
-               if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;\r
-               if (this.root.id == node.pid) {\r
-                       node.icon = this.icon.root;\r
-                       node.iconOpen = this.icon.root;\r
-               }\r
-               str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';\r
-       }\r
-       if (node.url) {\r
-               str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';\r
-               if (node.title) str += ' title="' + node.title + '"';\r
-               if (node.target) str += ' target="' + node.target + '"';\r
-               if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';\r
-               if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))\r
-                       str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';\r
-               str += '>';\r
-       }\r
-       else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)\r
-               str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';\r
-       str += node.name;\r
-       if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';\r
-       str += '</div>';\r
-       if (node._hc) {\r
-               str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';\r
-               str += this.addNode(node);\r
-               str += '</div>';\r
-       }\r
-       this.aIndent.pop();\r
-       return str;\r
-};\r
-\r
-// Adds the empty and line icons\r
-dTree.prototype.indent = function(node, nodeId) {\r
-       var str = '';\r
-       if (this.root.id != node.pid) {\r
-               for (var n=0; n<this.aIndent.length; n++)\r
-                       str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';\r
-               (node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);\r
-               if (node._hc) {\r
-                       str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img id="j' + this.obj + nodeId + '" src="';\r
-                       if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;\r
-                       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 ) );\r
-                       str += '" alt="" /></a>';\r
-               } else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';\r
-       }\r
-       return str;\r
-};\r
-\r
-// Checks if a node has any children and if it is the last sibling\r
-dTree.prototype.setCS = function(node) {\r
-       var lastId;\r
-       for (var n=0; n<this.aNodes.length; n++) {\r
-               if (this.aNodes[n].pid == node.id) node._hc = true;\r
-               if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;\r
-       }\r
-       if (lastId==node.id) node._ls = true;\r
-};\r
-\r
-// Returns the selected node\r
-dTree.prototype.getSelected = function() {\r
-       var sn = this.getCookie('cs' + this.obj);\r
-       return (sn) ? sn : null;\r
-};\r
-\r
-// Highlights the selected node\r
-dTree.prototype.s = function(id) {\r
-       if (!this.config.useSelection) return;\r
-       var cn = this.aNodes[id];\r
-       if (cn._hc && !this.config.folderLinks) return;\r
-       if (this.selectedNode != id) {\r
-               if (this.selectedNode || this.selectedNode==0) {\r
-                       eOld = document.getElementById("s" + this.obj + this.selectedNode);\r
-                       eOld.className = "node";\r
-               }\r
-               eNew = document.getElementById("s" + this.obj + id);\r
-               eNew.className = "nodeSel";\r
-               this.selectedNode = id;\r
-               if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);\r
-       }\r
-};\r
-\r
-// Toggle Open or close\r
-dTree.prototype.o = function(id) {\r
-       var cn = this.aNodes[id];\r
-       this.nodeStatus(!cn._io, id, cn._ls);\r
-       cn._io = !cn._io;\r
-       if (this.config.closeSameLevel) this.closeLevel(cn);\r
-       if (this.config.useCookies) this.updateCookie();\r
-};\r
-\r
-// Open or close all nodes\r
-dTree.prototype.oAll = function(status) {\r
-       for (var n=0; n<this.aNodes.length; n++) {\r
-               if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {\r
-                       this.nodeStatus(status, n, this.aNodes[n]._ls)\r
-                       this.aNodes[n]._io = status;\r
-               }\r
-       }\r
-       if (this.config.useCookies) this.updateCookie();\r
-};\r
-\r
-// Opens the tree to a specific node\r
-dTree.prototype.openTo = function(nId, bSelect, bFirst) {\r
-       if (!bFirst) {\r
-               for (var n=0; n<this.aNodes.length; n++) {\r
-                       if (this.aNodes[n].id == nId) {\r
-                               nId=n;\r
-                               break;\r
-                       }\r
-               }\r
-       }\r
-       var cn=this.aNodes[nId];\r
-       if (cn.pid==this.root.id || !cn._p) return;\r
-       cn._io = true;\r
-       cn._is = bSelect;\r
-       if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);\r
-       if (this.completed && bSelect) this.s(cn._ai);\r
-       else if (bSelect) this._sn=cn._ai;\r
-       this.openTo(cn._p._ai, false, true);\r
-};\r
-\r
-// Closes all nodes on the same level as certain node\r
-dTree.prototype.closeLevel = function(node) {\r
-       for (var n=0; n<this.aNodes.length; n++) {\r
-               if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {\r
-                       this.nodeStatus(false, n, this.aNodes[n]._ls);\r
-                       this.aNodes[n]._io = false;\r
-                       this.closeAllChildren(this.aNodes[n]);\r
-               }\r
-       }\r
-}\r
-\r
-// Closes all children of a node\r
-dTree.prototype.closeAllChildren = function(node) {\r
-       for (var n=0; n<this.aNodes.length; n++) {\r
-               if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {\r
-                       if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);\r
-                       this.aNodes[n]._io = false;\r
-                       this.closeAllChildren(this.aNodes[n]);          \r
-               }\r
-       }\r
-}\r
-\r
-// Change the status of a node(open or closed)\r
-dTree.prototype.nodeStatus = function(status, id, bottom) {\r
-       eDiv    = document.getElementById('d' + this.obj + id);\r
-       eJoin   = document.getElementById('j' + this.obj + id);\r
-       if (this.config.useIcons) {\r
-               eIcon   = document.getElementById('i' + this.obj + id);\r
-               eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;\r
-       }\r
-       eJoin.src = (this.config.useLines)?\r
-       ((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):\r
-       ((status)?this.icon.nlMinus:this.icon.nlPlus);\r
-       eDiv.style.display = (status) ? 'block': 'none';\r
-};\r
-\r
-\r
-// [Cookie] Clears a cookie\r
-dTree.prototype.clearCookie = function() {\r
-       var now = new Date();\r
-       var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);\r
-       this.setCookie('co'+this.obj, 'cookieValue', yesterday);\r
-       this.setCookie('cs'+this.obj, 'cookieValue', yesterday);\r
-};\r
-\r
-// [Cookie] Sets value in a cookie\r
-dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {\r
-       document.cookie =\r
-               escape(cookieName) + '=' + escape(cookieValue)\r
-               + (expires ? '; expires=' + expires.toGMTString() : '')\r
-               + (path ? '; path=' + path : '')\r
-               + (domain ? '; domain=' + domain : '')\r
-               + (secure ? '; secure' : '');\r
-};\r
-\r
-// [Cookie] Gets a value from a cookie\r
-dTree.prototype.getCookie = function(cookieName) {\r
-       var cookieValue = '';\r
-       var posName = document.cookie.indexOf(escape(cookieName) + '=');\r
-       if (posName != -1) {\r
-               var posValue = posName + (escape(cookieName) + '=').length;\r
-               var endPos = document.cookie.indexOf(';', posValue);\r
-               if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));\r
-               else cookieValue = unescape(document.cookie.substring(posValue));\r
-       }\r
-       return (cookieValue);\r
-};\r
-\r
-// [Cookie] Returns ids of open nodes as a string\r
-dTree.prototype.updateCookie = function() {\r
-       var str = '';\r
-       for (var n=0; n<this.aNodes.length; n++) {\r
-               if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {\r
-                       if (str) str += '.';\r
-                       str += this.aNodes[n].id;\r
-               }\r
-       }\r
-       this.setCookie('co' + this.obj, str);\r
-};\r
-\r
-// [Cookie] Checks if a node id is in a cookie\r
-dTree.prototype.isOpen = function(id) {\r
-       var aOpen = this.getCookie('co' + this.obj).split('.');\r
-       for (var n=0; n<aOpen.length; n++)\r
-               if (aOpen[n] == id) return true;\r
-       return false;\r
-};\r
-\r
-// If Push and pop is not implemented by the browser\r
-if (!Array.prototype.push) {\r
-       Array.prototype.push = function array_push() {\r
-               for(var i=0;i<arguments.length;i++)\r
-                       this[this.length]=arguments[i];\r
-               return this.length;\r
-       }\r
-};\r
-if (!Array.prototype.pop) {\r
-       Array.prototype.pop = function array_pop() {\r
-               lastElement = this[this.length-1];\r
-               this.length = Math.max(this.length-1,0);\r
-               return lastElement;\r
-       }\r
-};
\ No newline at end of file
+/*--------------------------------------------------|\r| dTree 2.05 | www.destroydrop.com/javascript/tree/ |\r|---------------------------------------------------|\r| Copyright (c) 2002-2003 Geir Landr\81E              |\r|                                                   |\r| This script can be used freely as long as all     |\r| copyright messages are intact.                    |\r|                                                   |\r| Updated: 17.04.2003                               |\r|--------------------------------------------------*/\r\r\r<?php\r   $strRel = '../../../';\r include($strRel . 'config.php');\r       include($DIR_LIBS . 'PLUGINADMIN.php');\r                $oPluginAdmin = new PluginAdmin('Dtree');\r              $this->plug =& $oPluginAdmin->plugin;\r          $imgpath = $this->plug->getAdminURL();\r//               $imgpath = 'nucleus/plugins/dtree/';\r\r?>\r// Node object\r\rvar imgpath = "<?php echo $imgpath;?>";\r\rfunction Node(id, pid, name, url, title, target, icon, iconOpen, open) {\r\r    this.id = id;\r\r this.pid = pid;\r\r       this.name = name;\r\r     this.url = url;\r\r       this.title = title;\r\r   this.target = target;\r\r this.icon = icon;\r\r     this.iconOpen = iconOpen;\r\r     this._io = open || false;\r\r     this._is = false;\r\r     this._ls = false;\r\r     this._hc = false;\r\r     this._ai = 0;\r\r this._p;\r\r};\r\r\r\r// Tree object\r\rfunction dTree(objName) {\r\r     this.config = {\r                target : null,\r<?php\r           if ($this->plug->getOption('folderLinks') == 'yes') {\r                  echo 'folderLinks : true,';\r            } else {\r                       echo 'folderLinks : false,';\r           }\r              if ($this->plug->getOption('useSelection') == 'yes') {\r                 echo 'useSelection : true,';\r           } else {\r                       echo 'useSelection : false,';\r          }\r              if ($this->plug->getOption('useCookies') == 'yes') {\r                   echo 'useCookies : true,';\r             } else {\r                       echo 'useCookies : false,';\r            }\r              if ($this->plug->getOption('useLines') == 'yes') {\r                     echo 'useLines : true,';\r               } else {\r                       echo 'useLines : false,';\r              }\r              if ($this->plug->getOption('useIcons') == 'yes') {\r                     echo 'useIcons : true,';\r               } else {\r                       echo 'useIcons : false,';\r              }\r              if ($this->plug->getOption('useStatusText') == 'yes') {\r                        echo 'useStatusText : true,';\r          } else {\r                       echo 'useStatusText : false,';\r         }\r              if ($this->plug->getOption('closeSameLevel') == 'yes') {\r                       echo 'closeSameLevel : true,';\r         } else {\r                       echo 'closeSameLevel : false,';\r                }\r              if ($this->plug->getOption('inOrder') == 'yes') {\r                      echo 'inOrder : true,';\r                } else {\r                       echo 'inOrder : false,';\r               }\r?>\r//         folderLinks                     : true,\r//              useSelection            : false,\r//             useCookies                      : false,\r//             useLines                                : false,\r//             useIcons                                : false,\r//             useStatusText           : true,\r//              closeSameLevel  : true,\r//              inOrder                                 : false\r        }\r\r     this.icon = {\r\r         root                    : imgpath + 'img/base.gif',\r            folder                  : imgpath + 'img/folder.gif',\r          folderOpen              : imgpath + 'img/folderopen.gif',\r//            node                    : imgpath + 'img/page.gif',\r            node                    : imgpath + 'img/folder.gif',\r          empty                   : imgpath + 'img/empty.gif',\r           line                    : imgpath + 'img/line.gif',\r            join                    : imgpath + 'img/join.gif',\r            joinBottom              : imgpath + 'img/joinbottom.gif',\r              plus                    : imgpath + 'img/plus.gif',\r            plusBottom              : imgpath + 'img/plusbottom.gif',\r              minus                   : imgpath + 'img/minus.gif',\r           minusBottom             : imgpath + 'img/minusbottom.gif',\r             nlPlus                  : imgpath + 'img/nolines_plus.gif',\r            nlMinus                 : imgpath + 'img/nolines_minus.gif'\r\r   };\r\r    this.obj = objName;\r\r   this.aNodes = [];\r\r     this.aIndent = [];\r\r    this.root = new Node(-1);\r\r     this.selectedNode = null;\r\r     this.selectedFound = false;\r\r   this.completed = false;\r\r};\r\r\r\r// Adds a new node to the node array\r\rdTree.prototype.add = function(id, pid, name, url, title, target, icon, iconOpen, open) {\r\r        this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);\r\r};\r\r\r\r// Open/close all nodes\r\rdTree.prototype.openAll = function() {\r\r   this.oAll(true);\r\r};\r\rdTree.prototype.closeAll = function() {\r\r this.oAll(false);\r\r};\r\r\r\r// Outputs the tree to the page\r\rdTree.prototype.toString = function() {\r\r     var str = '<div class="dtree">\n';\r\r    if (document.getElementById) {\r\r                if (this.config.useCookies) this.selectedNode = this.getSelected();\r\r           str += this.addNode(this.root);\r\r       } else str += 'Browser not supported.';\r\r       str += '</div>';\r\r      if (!this.selectedFound) this.selectedNode = null;\r\r    this.completed = true;\r\r        return str;\r\r};\r\r\r\r// Creates the tree structure\r\rdTree.prototype.addNode = function(pNode) {\r\r var str = '';\r\r var n=0;\r\r      if (this.config.inOrder) n = pNode._ai;\r\r       for (n; n<this.aNodes.length; n++) {\r\r          if (this.aNodes[n].pid == pNode.id) {\r\r                 var cn = this.aNodes[n];\r\r                      cn._p = pNode;\r\r                        cn._ai = n;\r\r                   this.setCS(cn);\r\r                       if (!cn.target && this.config.target) cn.target = this.config.target;\r\r                 if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);\r\r                 if (!this.config.folderLinks && cn._hc) cn.url = null;\r\r                        if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {\r\r                                  cn._is = true;\r\r                                        this.selectedNode = n;\r\r                                        this.selectedFound = true;\r\r                    }\r\r                     str += this.node(cn, n);\r\r                      if (cn._ls) break;\r\r            }\r\r     }\r\r     return str;\r\r};\r\r\r\r// Creates the node icon, url and text\r\rdTree.prototype.node = function(node, nodeId) {\r\r    var str = '<div class="dTreeNode">' + this.indent(node, nodeId);\r\r      if (this.config.useIcons) {\r\r           if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);\r\r           if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;\r\r               if (this.root.id == node.pid) {\r\r                       node.icon = this.icon.root;\r\r                   node.iconOpen = this.icon.root;\r\r               }\r\r             str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';\r\r       }\r\r     if (node.url) {\r\r               str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';\r\r                if (node.title) str += ' title="' + node.title + '"';\r\r         if (node.target) str += ' target="' + node.target + '"';\r\r              if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';\r\r                if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))\r\r                 str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';\r\r          str += '>';\r\r   }\r\r     else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)\r\r             str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';\r\r     str += node.name;\r\r     if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';\r\r str += '</div>';\r\r      if (node._hc) {\r\r               str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';\r\r             str += this.addNode(node);\r\r            str += '</div>';\r\r      }\r\r     this.aIndent.pop();\r\r   return str;\r\r};\r\r\r\r// Adds the empty and line icons\r\rdTree.prototype.indent = function(node, nodeId) {\r\r        var str = '';\r\r if (this.root.id != node.pid) {\r\r               for (var n=0; n<this.aIndent.length; n++)\r\r                     str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';\r\r          (node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);\r\r             if (node._hc) {\r\r                       str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img id="j' + this.obj + nodeId + '" src="';\r\r                        if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;\r\r                  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 ) );\r\r                  str += '" alt="" /></a>';\r\r             } else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';\r\r     }\r\r     return str;\r\r};\r\r\r\r// Checks if a node has any children and if it is the last sibling\r\rdTree.prototype.setCS = function(node) {\r\r       var lastId;\r\r   for (var n=0; n<this.aNodes.length; n++) {\r\r            if (this.aNodes[n].pid == node.id) node._hc = true;\r\r           if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;\r\r       }\r\r     if (lastId==node.id) node._ls = true;\r\r};\r\r\r\r// Returns the selected node\r\rdTree.prototype.getSelected = function() {\r\r var sn = this.getCookie('cs' + this.obj);\r\r     return (sn) ? sn : null;\r\r};\r\r\r\r// Highlights the selected node\r\rdTree.prototype.s = function(id) {\r\r   if (!this.config.useSelection) return;\r\r        var cn = this.aNodes[id];\r\r     if (cn._hc && !this.config.folderLinks) return;\r\r       if (this.selectedNode != id) {\r\r                if (this.selectedNode || this.selectedNode==0) {\r\r                      eOld = document.getElementById("s" + this.obj + this.selectedNode);\r\r                   eOld.className = "node";\r\r              }\r\r             eNew = document.getElementById("s" + this.obj + id);\r\r          eNew.className = "nodeSel";\r\r           this.selectedNode = id;\r\r               if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);\r\r   }\r\r};\r\r\r\r// Toggle Open or close\r\rdTree.prototype.o = function(id) {\r\r  var cn = this.aNodes[id];\r\r     this.nodeStatus(!cn._io, id, cn._ls);\r\r cn._io = !cn._io;\r\r     if (this.config.closeSameLevel) this.closeLevel(cn);\r\r  if (this.config.useCookies) this.updateCookie();\r\r};\r\r\r\r// Open or close all nodes\r\rdTree.prototype.oAll = function(status) {\r\r for (var n=0; n<this.aNodes.length; n++) {\r\r            if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {\r\r                       this.nodeStatus(status, n, this.aNodes[n]._ls)\r\r                        this.aNodes[n]._io = status;\r\r          }\r\r     }\r\r     if (this.config.useCookies) this.updateCookie();\r\r};\r\r\r\r// Opens the tree to a specific node\r\rdTree.prototype.openTo = function(nId, bSelect, bFirst) {\r\r       if (!bFirst) {\r\r                for (var n=0; n<this.aNodes.length; n++) {\r\r                    if (this.aNodes[n].id == nId) {\r\r                               nId=n;\r\r                                break;\r\r                        }\r\r             }\r\r     }\r\r     var cn=this.aNodes[nId];\r\r      if (cn.pid==this.root.id || !cn._p) return;\r\r   cn._io = true;\r\r        cn._is = bSelect;\r\r     if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);\r\r  if (this.completed && bSelect) this.s(cn._ai);\r\r        else if (bSelect) this._sn=cn._ai;\r\r    this.openTo(cn._p._ai, false, true);\r\r};\r\r\r\r// Closes all nodes on the same level as certain node\r\rdTree.prototype.closeLevel = function(node) {\r\r      for (var n=0; n<this.aNodes.length; n++) {\r\r            if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {\r\r                   this.nodeStatus(false, n, this.aNodes[n]._ls);\r\r                        this.aNodes[n]._io = false;\r\r                   this.closeAllChildren(this.aNodes[n]);\r\r                }\r\r     }\r\r}\r\r\r\r// Closes all children of a node\r\rdTree.prototype.closeAllChildren = function(node) {\r\r for (var n=0; n<this.aNodes.length; n++) {\r\r            if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {\r\r                    if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);\r\r                        this.aNodes[n]._io = false;\r\r                   this.closeAllChildren(this.aNodes[n]);          \r\r              }\r\r     }\r\r}\r\r\r\r// Change the status of a node(open or closed)\r\rdTree.prototype.nodeStatus = function(status, id, bottom) {\r\r   eDiv    = document.getElementById('d' + this.obj + id);\r\r       eJoin   = document.getElementById('j' + this.obj + id);\r\r       if (this.config.useIcons) {\r\r           eIcon   = document.getElementById('i' + this.obj + id);\r\r               eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;\r\r       }\r\r     eJoin.src = (this.config.useLines)?\r\r   ((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):\r\r   ((status)?this.icon.nlMinus:this.icon.nlPlus);\r\r        eDiv.style.display = (status) ? 'block': 'none';\r\r};\r\r\r\r\r\r// [Cookie] Clears a cookie\r\rdTree.prototype.clearCookie = function() {\r\r     var now = new Date();\r\r var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);\r\r        this.setCookie('co'+this.obj, 'cookieValue', yesterday);\r\r      this.setCookie('cs'+this.obj, 'cookieValue', yesterday);\r\r};\r\r\r\r// [Cookie] Sets value in a cookie\r\rdTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {\r\r    document.cookie =\r\r             escape(cookieName) + '=' + escape(cookieValue)\r\r                + (expires ? '; expires=' + expires.toGMTString() : '')\r\r               + (path ? '; path=' + path : '')\r\r              + (domain ? '; domain=' + domain : '')\r\r                + (secure ? '; secure' : '');\r\r};\r\r\r\r// [Cookie] Gets a value from a cookie\r\rdTree.prototype.getCookie = function(cookieName) {\r\r       var cookieValue = '';\r\r var posName = document.cookie.indexOf(escape(cookieName) + '=');\r\r      if (posName != -1) {\r\r          var posValue = posName + (escape(cookieName) + '=').length;\r\r           var endPos = document.cookie.indexOf(';', posValue);\r\r          if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));\r\r                else cookieValue = unescape(document.cookie.substring(posValue));\r\r     }\r\r     return (cookieValue);\r\r};\r\r\r\r// [Cookie] Returns ids of open nodes as a string\r\rdTree.prototype.updateCookie = function() {\r\r   var str = '';\r\r for (var n=0; n<this.aNodes.length; n++) {\r\r            if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {\r\r                       if (str) str += '.';\r\r                  str += this.aNodes[n].id;\r\r             }\r\r     }\r\r     this.setCookie('co' + this.obj, str);\r\r};\r\r\r\r// [Cookie] Checks if a node id is in a cookie\r\rdTree.prototype.isOpen = function(id) {\r\r  var aOpen = this.getCookie('co' + this.obj).split('.');\r\r       for (var n=0; n<aOpen.length; n++)\r\r            if (aOpen[n] == id) return true;\r\r      return false;\r\r};\r\r\r\r// If Push and pop is not implemented by the browser\r\rif (!Array.prototype.push) {\r\r       Array.prototype.push = function array_push() {\r\r                for(var i=0;i<arguments.length;i++)\r\r                   this[this.length]=arguments[i];\r\r               return this.length;\r\r   }\r\r};\r\rif (!Array.prototype.pop) {\r\r    Array.prototype.pop = function array_pop() {\r\r          lastElement = this[this.length-1];\r\r            this.length = Math.max(this.length-1,0);\r\r              return lastElement;\r\r   }\r\r};
\ 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 (file)
--- 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 (file)
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 (file)
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',      'Æó¤Ä°Ê¾å¤Î»Þ¤òƱ»þ¤ËŸ³«¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¤«¡©(\8e¢Á´¤Æ³«¤¯\8e£\8e¢Á´¤ÆÊĤ¸¤ë\8e£¤Ï¤³¤ÎÀßÄê¤Ë±Æ¶Á¤µ¤ì¤Þ¤»¤ó)');
+       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 (file)
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