- Updated NEWS.txt
authorIngmar Schlecht <ingmar.schlecht@typo3.org>
Fri, 19 Jan 2007 12:55:38 +0000 (12:55 +0000)
committerIngmar Schlecht <ingmar.schlecht@typo3.org>
Fri, 19 Jan 2007 12:55:38 +0000 (12:55 +0000)
- Added SVN properties and corrected line endings of new files for AJAX page tree

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@1909 709f56b5-9817-0410-a4d7-c38de5d9e867

NEWS.txt
typo3/class.filelistfoldertree.php [changed mode: 0644->0755]
typo3/class.webpagetree.php [changed mode: 0644->0755]
typo3/tree.js [changed mode: 0644->0755]

index 6be0ace..06d1617 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -16,6 +16,13 @@ Backend
                -> The Tools->Useradmin module now displays which BE users are currently online.
        * UTF-8 for filenames
                -> You need to set $TYPO3_CONF_VARS['SYS']['UTF8filesystem'] to TRUE to enable this feature.
+       * Improved Extension Manager
+               -> Requires less memory
+               -> The EM now stores the list of extensions from TER in the database,
+               -> see http://bugs.typo3.org/view.php?id=2615
+       * Two nice usability enhancements
+               -> Using <label> tags in tceforms where appropriate to enhance usability in the Backend forms
+               -> Increase length for titles of be_users, be_groups, and fe_groups
 
 Compatibility
 =============
@@ -28,10 +35,13 @@ Speed improvements
        * TODO Dmitry: explain cache_pagesection speedup
        * TODO Dmitry: explain speedup using .htaccess
 
-Installation/Upgrade
+Development
 ====================
 
-       * ...
+       * Better getRecordTitle() function
+               -> It's now possible to define a "label_userFunc"
+               -> This makes it possible to e.g. define the label of a "persons" table as displayed in the list module to be like "Lastname, Firstname". Until now you could only define one field to be the "labelfield".
+       * Inline Relational Record Editing (see "Backend" section above)
 
 Database changes
 ================
@@ -49,6 +59,8 @@ Frontend features
        * Autologin for Frontend users is now possible!
          -> Users can decide on their own whether they want to "Stay logged in" using a checkbox. The latest version of the "newloginbox" extension is required for that.
          -> Needs to be configured in the Install Tool ("All Configuration" -> "permalogin" and "lifetime")
+       * UTF-8 for log files
+         -> TYPO3 now logs page paths in UTF-8 if config.stat_apache_niceTitle is set to "utf-8" in the TypoScript template Setup.
 
 Backend skin
 ============
old mode 100644 (file)
new mode 100755 (executable)
index 521ee35..121325c
-<?php\r
-/***************************************************************\r
-*  Copyright notice\r
-*\r
-*  (c) 1999-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)\r
-*  All rights reserved\r
-*\r
-*  This script is part of the TYPO3 project. The TYPO3 project is\r
-*  free software; you can redistribute it and/or modify\r
-*  it under the terms of the GNU General Public License as published by\r
-*  the Free Software Foundation; either version 2 of the License, or\r
-*  (at your option) any later version.\r
-*\r
-*  The GNU General Public License can be found at\r
-*  http://www.gnu.org/copyleft/gpl.html.\r
-*  A copy is found in the textfile GPL.txt and important notices to the license\r
-*  from the author is found in LICENSE.txt distributed with these scripts.\r
-*\r
-*\r
-*  This script is distributed in the hope that it will be useful,\r
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*  GNU General Public License for more details.\r
-*\r
-*  This copyright notice MUST APPEAR in all copies of the script!\r
-***************************************************************/\r
-/**\r
- * Folder navigation tree for the File main module\r
- *\r
- * @author     Benjamin Mack   <bmack@xnos.org>\r
- *\r
- *\r
- * [CLASS/FUNCTION INDEX of SCRIPT]\r
- *\r
- *\r
- *\r
- *   71: class fileListTree extends t3lib_browseTree\r
- *   81:     function webPageTree()\r
- *   92:     function wrapIcon($icon,&$row)\r
- *  130:     function wrapStop($str,$row)\r
- *  146:     function wrapTitle($title,$row,$bank=0)\r
- *  165:     function printTree($treeArr = '')\r
- *  271:     function PMicon($row,$a,$c,$nextCount,$exp)\r
- *  292:     function PMiconATagWrap($icon, $cmd, $isExpand = true)\r
- *  309:     function getBrowsableTree()\r
- *  377:     function getTree($uid, $depth=999, $depthData='',$blankLineCode='',$subCSSclass='')\r
- *\r
- *\r
- * TOTAL FUNCTIONS: 9\r
- * (This index is automatically created/updated by the extension "extdeveval")\r
- *\r
- */\r
-\r
-require_once (PATH_t3lib.'class.t3lib_foldertree.php');\r
-\r
-\r
-\r
-/**\r
- * Extension class for the t3lib_filetree class, needed for drag and drop and ajax functionality\r
- *\r
- * @author     Sebastian Kurfuerst <sebastian@garbage-group.de>\r
- * @author     Benjamin Mack   <bmack@xnos.org>\r
- * @package TYPO3\r
- * @subpackage core\r
- * @see class t3lib_browseTree\r
- */\r
-class filelistFolderTree extends t3lib_folderTree {\r
-\r
-       var $ext_IconMode;\r
-\r
-       /**\r
-        * Calls init functions\r
-        *\r
-        * @return      void\r
-        */\r
-       function filelistFolderTree() {\r
-               parent::t3lib_folderTree();\r
-       }\r
-\r
-       /**\r
-        * Wrapping icon in browse tree\r
-        *\r
-        * @param       string          Icon IMG code\r
-        * @param       array           Data row for element.\r
-        * @return      string          Page icon\r
-        */\r
-       function wrapIcon($icon,&$row)  {\r
-\r
-                       // Add title attribute to input icon tag\r
-               $theFolderIcon = $this->addTagAttributes($icon,($this->titleAttrib ? $this->titleAttrib.'="'.$this->getTitleAttrib($row).'"' : ''));\r
-\r
-                       // Wrap icon in click-menu link.\r
-               if (!$this->ext_IconMode)       {\r
-                       $theFolderIcon = $GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon($theFolderIcon,$row['path'],'',0);\r
-               } elseif (!strcmp($this->ext_IconMode,'titlelink'))     {\r
-                       $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->domIdPrefix.$this->getId($row).'\','.$this->bank.');';\r
-                       $theFolderIcon='<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$theFolderIcon.'</a>';\r
-               }\r
-                       // Wrap icon in a drag/drop span.\r
-               return '<span class="dragIcon" id="dragIconID_'.$this->getJumpToParam($row).'">'.$theFolderIcon.'</span>';\r
-       }\r
-\r
-\r
-       /**\r
-        * Wrapping $title in a-tags.\r
-        *\r
-        * @param       string          Title string\r
-        * @param       string          Item record\r
-        * @param       integer         Bank pointer (which mount point number)\r
-        * @return      string\r
-        * @access private\r
-        */\r
-       function wrapTitle($title,$row,$bank=0) {\r
-               $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->domIdPrefix.$this->getId($row).'\','.$bank.');';\r
-               $CSM = '';\r
-               if ($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler'])       {\r
-                       $CSM = ' oncontextmenu="'.htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('',$row['path'],'',0,'&bank='.$this->bank,'',TRUE)).'"';\r
-               }\r
-               $theFolderTitle='<a href="#" onclick="'.htmlspecialchars($aOnClick).'"'.$CSM.'>'.$title.'</a>';\r
-\r
-                       // Wrap title in a drag/drop span.\r
-               return '<span class="dragTitle" id="dragTitleID_'.$this->getJumpToParam($row).'">'.$theFolderTitle.'</span>';\r
-       }\r
-\r
-\r
-\r
-\r
-       /**\r
-        * Compiles the HTML code for displaying the structure found inside the ->tree array\r
-        *\r
-        * @param       array           "tree-array" - if blank string, the internal ->tree array is used.\r
-        * @return      string          The HTML code for the tree\r
-        */\r
-       function printTree($treeArr='') {\r
-               $titleLen = intval($this->BE_USER->uc['titleLen']);\r
-               if (!is_array($treeArr))        $treeArr = $this->tree;\r
-\r
-               $out = '\r
-                       <!-- TYPO3 folder tree structure. -->\r
-                       <ul class="tree">\r
-               ';\r
-               $titleLen=intval($this->BE_USER->uc['titleLen']);\r
-               if (!is_array($treeArr))        $treeArr=$this->tree;\r
-\r
-                       // -- evaluate AJAX request\r
-                       // IE takes anchor as parameter\r
-               $PM = t3lib_div::_GP('PM');\r
-               if(($PMpos = strpos($PM, '#')) !== false) { $PM = substr($PM, 0, $PMpos); }\r
-               $PM = explode('_', $PM);\r
-               if(($isAjaxCall = t3lib_div::_GP('ajax')) && is_array($PM) && count($PM)==4)    {\r
-                       if($PM[1])      {\r
-                               $expandedFolderUid = $PM[2];\r
-                               $ajaxOutput = '';\r
-                               $invertedDepthOfAjaxRequestedItem = 0; // We don't know yet. Will be set later.\r
-                               $doExpand = true;\r
-                       } else  {\r
-                               $expandedFolderUid = $PM[2];\r
-                               $doCollapse = true;\r
-                       }\r
-               }\r
-\r
-\r
-               // we need to count the opened <ul>'s every time we dig into another level, \r
-               // so we know how many we have to close when all children are done rendering\r
-               $closeDepth = array();\r
-\r
-               foreach($treeArr as $k => $v)   {\r
-                       $classAttr = $v['row']['_CSSCLASS'];\r
-                       $uid       = $v['row']['uid'];\r
-                       $idAttr = htmlspecialchars($this->domIdPrefix.$this->getId($v['row']).'_'.$v['bank']);\r
-                       $itemHTML  = '';\r
-\r
-                       // if this item is the start of a new level, \r
-                       // then a new level <ul> is needed, but not in ajax mode\r
-                       if($v['isFirst'] && !($doCollapse) && !($doExpand && $expandedFolderUid == $uid))       {\r
-                               $itemHTML = "<ul>\n";\r
-                       }\r
-\r
-                       // add CSS classes to the list item\r
-                       if($v['hasSub']) { $classAttr = ($classAttr) ? ' expanded': 'expanded'; }\r
-                       if($v['isLast']) { $classAttr = ($classAttr) ? ' last'  : 'last';        }\r
-\r
-                       $itemHTML .='\r
-                               <li id="'.$idAttr.'"'.($classAttr ? ' class="'.$classAttr.'"' : '').'>'.\r
-                                       $v['HTML'].\r
-                                       $this->wrapTitle($this->getTitleStr($v['row'],$titleLen),$v['row'],$v['bank']);\r
-\r
-\r
-                       if(!$v['hasSub']) { $itemHTML .= "</li>\n"; }\r
-\r
-                       // we have to remember if this is the last one\r
-                       // on level X so the last child on level X+1 closes the <ul>-tag\r
-                       if($v['isLast'] && !($doExpand && $expandedFolderUid == $uid)) { $closeDepth[$v['invertedDepth']] = 1; }\r
-\r
-\r
-                       // if this is the last one and does not have subitems, we need to close\r
-                       // the tree as long as the upper levels have last items too\r
-                       if($v['isLast'] && !$v['hasSub'] && !$doCollapse && !($doExpand && $expandedFolderUid == $uid)) {\r
-                               for ($i = $v['invertedDepth']; $closeDepth[$i] == 1; $i++) {\r
-                                       $closeDepth[$i] = 0;\r
-                                       $itemHTML .= "</ul></li>\n";\r
-                               }\r
-                       }\r
-\r
-                       // ajax request: collapse\r
-                       if($doCollapse && $expandedFolderUid == $uid) { return $itemHTML; }\r
-\r
-                       // ajax request: expand\r
-                       if($doExpand && $expandedFolderUid == $uid) {\r
-                               $ajaxOutput .= $itemHTML;\r
-                               $invertedDepthOfAjaxRequestedItem = $v['invertedDepth'];\r
-                       } elseif($invertedDepthOfAjaxRequestedItem) { \r
-                               if($v['invertedDepth'] < $invertedDepthOfAjaxRequestedItem) {\r
-                                       $ajaxOutput .= $itemHTML;\r
-                               } else {\r
-                                       return $ajaxOutput;\r
-                               }\r
-                       }\r
-\r
-                       $out .= $itemHTML;\r
-               }\r
-\r
-               if($ajaxOutput) { return $ajaxOutput; }\r
-\r
-               // finally close the first ul\r
-               $out .= "</ul>\n";\r
-               return $out;\r
-       }\r
-\r
-\r
-       /**\r
-        * Generate the plus/minus icon for the browsable tree.\r
-        *\r
-        * @param       array           record for the entry\r
-        * @param       integer         The current entry number\r
-        * @param       integer         The total number of entries. If equal to $a, a "bottom" element is returned.\r
-        * @param       integer         The number of sub-elements to the current element.\r
-        * @param       boolean         The element was expanded to render subelements if this flag is set.\r
-        * @return      string          Image tag with the plus/minus icon.\r
-        * @access private\r
-        * @see t3lib_pageTree::PMicon()\r
-        */\r
-       function PMicon($row,$a,$c,$nextCount,$exp)     {\r
-               $PM   = $nextCount ? ($exp ? 'minus' : 'plus') : 'join';\r
-               $BTM  = ($a == $c) ? 'bottom' : '';\r
-               $icon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' alt="" />';\r
-\r
-               if ($nextCount) {\r
-                       $cmd = $this->bank.'_'.($exp?'0_':'1_').$row['uid'].'_'.$this->treeName;\r
-                       $icon = $this->PMiconATagWrap($icon,$cmd,!$exp);\r
-               }\r
-               return $icon;\r
-       }\r
-\r
-\r
-       /**\r
-        * Wrap the plus/minus icon in a link\r
-        *\r
-        * @param       string          HTML string to wrap, probably an image tag.\r
-        * @param       string          Command for 'PM' get var\r
-        * @return      string          Link-wrapped input string\r
-        * @access private\r
-        */\r
-       function PMiconATagWrap($icon, $cmd, $isExpand = true)  {\r
-               if ($this->thisScript) {\r
-                               // activate dynamic ajax-based tree\r
-                       $js = htmlspecialchars('Tree.load(\''.$cmd.'\', '.intval($isExpand).', this);');\r
-                       return '<a class="pm" onclick="'.$js.'">'.$icon.'</a>';\r
-               } else {\r
-                       return $icon;\r
-               }\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * Will create and return the HTML code for a browsable tree of folders.\r
-        * Is based on the mounts found in the internal array ->MOUNTS (set in the constructor)\r
-        *\r
-        * @return      string          HTML code for the browsable tree\r
-        */\r
-       function getBrowsableTree()     {\r
-\r
-                       // Get stored tree structure AND updating it if needed according to incoming PM GET var.\r
-               $this->initializePositionSaving();\r
-\r
-                       // Init done:\r
-               $titleLen = intval($this->BE_USER->uc['titleLen']);\r
-               $treeArr = array();\r
-\r
-                       // Traverse mounts:\r
-               foreach($this->MOUNTS as $key => $val)  {\r
-                       $specUID = t3lib_div::md5int($val['path']);\r
-                       $this->specUIDmap[$specUID] = $val['path'];\r
-\r
-                               // Set first:\r
-                       $this->bank = $val['nkey'];\r
-                       $isOpen = $this->stored[$val['nkey']][$specUID] || $this->expandFirst;\r
-                       $this->reset();\r
-\r
-                               // Set PM icon:\r
-                       $cmd = $this->bank.'_'.($isOpen ? '0_' : '1_').$specUID.'_'.$this->treeName;\r
-                       $icon='<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.($isOpen?'minus':'plus').'only.gif').' alt="" />';\r
-                       $firstHtml= $this->PM_ATagWrap($icon,$cmd);\r
-\r
-                       switch($val['type'])    {\r
-                               case 'user':    $icon = 'gfx/i/_icon_ftp_user.gif';     break;\r
-                               case 'group':   $icon = 'gfx/i/_icon_ftp_group.gif'; break;\r
-                               default:                $icon = 'gfx/i/_icon_ftp.gif'; break;\r
-                       }\r
-\r
-                               // Preparing rootRec for the mount\r
-                       $firstHtml.=$this->wrapIcon('<img'.t3lib_iconWorks::skinImg($this->backPath,$icon,'width="18" height="16"').' alt="" />',$val);\r
-                       $row=array();\r
-                       $row['uid']   = $specUID;\r
-                       $row['path']  = $val['path'];\r
-                       $row['title'] = $val['name'];\r
-\r
-                               // Add the root of the mount to ->tree\r
-                       $this->tree[] = array('HTML' => $firstHtml, 'row' => $row, 'bank' => $this->bank);\r
-\r
-                               // If the mount is expanded, go down:\r
-                       if ($isOpen)\r
-                               $this->getFolderTree($val['path'], 999);\r
-\r
-                               // Add tree:\r
-                       $treeArr = array_merge($treeArr, $this->tree);\r
-               }\r
-               return $this->printTree($treeArr);\r
-       }\r
-\r
-\r
-\r
-       /**\r
-        * Fetches the data for the tree\r
-        *\r
-        * @param       string          Abs file path\r
-        * @param       integer         Max depth (recursivity limit)\r
-        * @return      integer         The count of items on the level\r
-        * @see getBrowsableTree()\r
-        */\r
-       function getFolderTree($files_path, $depth=999) {\r
-\r
-                       // This generates the directory tree\r
-               $dirs = t3lib_div::get_dirs($files_path);\r
-               if (!is_array($dirs)) return 0;\r
-\r
-               sort($dirs);\r
-               $c = count($dirs);\r
-               \r
-               $depth = intval($depth);\r
-               $HTML = '';\r
-               $a = 0;\r
-\r
-               foreach($dirs as $key => $val)  {\r
-                       $a++;\r
-                       $this->tree[] = array();        // Reserve space.\r
-                       end($this->tree);\r
-                       $treeKey = key($this->tree);    // Get the key for this space\r
-\r
-                       $val = ereg_replace('^\./','',$val);\r
-                       $title = $val;\r
-                       $path = $files_path.$val.'/';\r
-\r
-                       $specUID = t3lib_div::md5int($path);\r
-                       $this->specUIDmap[$specUID] = $path;\r
-\r
-                       $row = array();\r
-                       $row['path']  = $path;\r
-                       $row['uid']   = $specUID;\r
-                       $row['title'] = $title;\r
-\r
-                       // Make a recursive call to the next level\r
-                       if ($depth > 1 && $this->expandNext($specUID))  {\r
-                               $nextCount = $this->getFolderTree(\r
-                                       $path,\r
-                                       $depth-1,\r
-                                       $this->makeHTML ? '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.($a == $c ? 'blank' : 'line').'.gif','width="18" height="16"').' alt="" />' : ''\r
-                               );\r
-                               $exp = 1;       // Set "did expand" flag\r
-                       } else {\r
-                               $nextCount = $this->getCount($path);\r
-                               $exp = 0;       // Clear "did expand" flag\r
-                       }\r
-\r
-                               // Set HTML-icons, if any:\r
-                       if ($this->makeHTML)    {\r
-                               $HTML = $this->PMicon($row,$a,$c,$nextCount,$exp);\r
-\r
-                               $icon = 'gfx/i/_icon_'.t3lib_BEfunc::getPathType_web_nonweb($path).'folders.gif';\r
-                               if ($val == '_temp_')   {\r
-                                       $icon = 'gfx/i/sysf.gif';\r
-                                       $row['title']='TEMP';\r
-                                       $row['_title']='<b>TEMP</b>';\r
-                               }\r
-                               if ($val == '_recycler_')       {\r
-                                       $icon = 'gfx/i/recycler.gif';\r
-                                       $row['title']='RECYCLER';\r
-                                       $row['_title']='<b>RECYCLER</b>';\r
-                               }\r
-                               $HTML .= $this->wrapIcon('<img'.t3lib_iconWorks::skinImg($this->backPath, $icon, 'width="18" height="16"').' alt="" />',$row);\r
-                       }\r
-\r
-                               // Finally, add the row/HTML content to the ->tree array in the reserved key.\r
-                       $this->tree[$treeKey] = Array(\r
-                               'row'    => $row,\r
-                               'HTML'   => $HTML,\r
-                               'hasSub' => $nextCount && $this->expandNext($specUID),\r
-                               'isFirst'=> ($a == 1),\r
-                               'isLast' => false,\r
-                               'invertedDepth'=> $depth,\r
-                               'bank'   => $this->bank\r
-                       );\r
-               }\r
-\r
-               if($a) { $this->tree[$treeKey]['isLast'] = true; }\r
-               return $c;\r
-       }\r
-}\r
-\r
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.filelistfoldertree.php'])     {\r
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.filelistfoldertree.php']);\r
-}\r
+<?php
+/***************************************************************
+*  Copyright notice
+*
+*  (c) 1999-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  All rights reserved
+*
+*  This script is part of the TYPO3 project. The TYPO3 project is
+*  free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  The GNU General Public License can be found at
+*  http://www.gnu.org/copyleft/gpl.html.
+*  A copy is found in the textfile GPL.txt and important notices to the license
+*  from the author is found in LICENSE.txt distributed with these scripts.
+*
+*
+*  This script is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+/**
+ * Folder navigation tree for the File main module
+ *
+ * @author     Benjamin Mack   <bmack@xnos.org>
+ *
+ *
+ * [CLASS/FUNCTION INDEX of SCRIPT]
+ *
+ *
+ *
+ *   71: class fileListTree extends t3lib_browseTree
+ *   81:     function webPageTree()
+ *   92:     function wrapIcon($icon,&$row)
+ *  130:     function wrapStop($str,$row)
+ *  146:     function wrapTitle($title,$row,$bank=0)
+ *  165:     function printTree($treeArr = '')
+ *  271:     function PMicon($row,$a,$c,$nextCount,$exp)
+ *  292:     function PMiconATagWrap($icon, $cmd, $isExpand = true)
+ *  309:     function getBrowsableTree()
+ *  377:     function getTree($uid, $depth=999, $depthData='',$blankLineCode='',$subCSSclass='')
+ *
+ *
+ * TOTAL FUNCTIONS: 9
+ * (This index is automatically created/updated by the extension "extdeveval")
+ *
+ */
+
+require_once (PATH_t3lib.'class.t3lib_foldertree.php');
+
+
+
+/**
+ * Extension class for the t3lib_filetree class, needed for drag and drop and ajax functionality
+ *
+ * @author     Sebastian Kurfuerst <sebastian@garbage-group.de>
+ * @author     Benjamin Mack   <bmack@xnos.org>
+ * @package TYPO3
+ * @subpackage core
+ * @see class t3lib_browseTree
+ */
+class filelistFolderTree extends t3lib_folderTree {
+
+       var $ext_IconMode;
+
+       /**
+        * Calls init functions
+        *
+        * @return      void
+        */
+       function filelistFolderTree() {
+               parent::t3lib_folderTree();
+       }
+
+       /**
+        * Wrapping icon in browse tree
+        *
+        * @param       string          Icon IMG code
+        * @param       array           Data row for element.
+        * @return      string          Page icon
+        */
+       function wrapIcon($icon,&$row)  {
+
+                       // Add title attribute to input icon tag
+               $theFolderIcon = $this->addTagAttributes($icon,($this->titleAttrib ? $this->titleAttrib.'="'.$this->getTitleAttrib($row).'"' : ''));
+
+                       // Wrap icon in click-menu link.
+               if (!$this->ext_IconMode)       {
+                       $theFolderIcon = $GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon($theFolderIcon,$row['path'],'',0);
+               } elseif (!strcmp($this->ext_IconMode,'titlelink'))     {
+                       $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->domIdPrefix.$this->getId($row).'\','.$this->bank.');';
+                       $theFolderIcon='<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$theFolderIcon.'</a>';
+               }
+                       // Wrap icon in a drag/drop span.
+               return '<span class="dragIcon" id="dragIconID_'.$this->getJumpToParam($row).'">'.$theFolderIcon.'</span>';
+       }
+
+
+       /**
+        * Wrapping $title in a-tags.
+        *
+        * @param       string          Title string
+        * @param       string          Item record
+        * @param       integer         Bank pointer (which mount point number)
+        * @return      string
+        * @access private
+        */
+       function wrapTitle($title,$row,$bank=0) {
+               $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->domIdPrefix.$this->getId($row).'\','.$bank.');';
+               $CSM = '';
+               if ($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler'])       {
+                       $CSM = ' oncontextmenu="'.htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('',$row['path'],'',0,'&bank='.$this->bank,'',TRUE)).'"';
+               }
+               $theFolderTitle='<a href="#" onclick="'.htmlspecialchars($aOnClick).'"'.$CSM.'>'.$title.'</a>';
+
+                       // Wrap title in a drag/drop span.
+               return '<span class="dragTitle" id="dragTitleID_'.$this->getJumpToParam($row).'">'.$theFolderTitle.'</span>';
+       }
+
+
+
+
+       /**
+        * Compiles the HTML code for displaying the structure found inside the ->tree array
+        *
+        * @param       array           "tree-array" - if blank string, the internal ->tree array is used.
+        * @return      string          The HTML code for the tree
+        */
+       function printTree($treeArr='') {
+               $titleLen = intval($this->BE_USER->uc['titleLen']);
+               if (!is_array($treeArr))        $treeArr = $this->tree;
+
+               $out = '
+                       <!-- TYPO3 folder tree structure. -->
+                       <ul class="tree">
+               ';
+               $titleLen=intval($this->BE_USER->uc['titleLen']);
+               if (!is_array($treeArr))        $treeArr=$this->tree;
+
+                       // -- evaluate AJAX request
+                       // IE takes anchor as parameter
+               $PM = t3lib_div::_GP('PM');
+               if(($PMpos = strpos($PM, '#')) !== false) { $PM = substr($PM, 0, $PMpos); }
+               $PM = explode('_', $PM);
+               if(($isAjaxCall = t3lib_div::_GP('ajax')) && is_array($PM) && count($PM)==4)    {
+                       if($PM[1])      {
+                               $expandedFolderUid = $PM[2];
+                               $ajaxOutput = '';
+                               $invertedDepthOfAjaxRequestedItem = 0; // We don't know yet. Will be set later.
+                               $doExpand = true;
+                       } else  {
+                               $expandedFolderUid = $PM[2];
+                               $doCollapse = true;
+                       }
+               }
+
+
+               // we need to count the opened <ul>'s every time we dig into another level, 
+               // so we know how many we have to close when all children are done rendering
+               $closeDepth = array();
+
+               foreach($treeArr as $k => $v)   {
+                       $classAttr = $v['row']['_CSSCLASS'];
+                       $uid       = $v['row']['uid'];
+                       $idAttr = htmlspecialchars($this->domIdPrefix.$this->getId($v['row']).'_'.$v['bank']);
+                       $itemHTML  = '';
+
+                       // if this item is the start of a new level, 
+                       // then a new level <ul> is needed, but not in ajax mode
+                       if($v['isFirst'] && !($doCollapse) && !($doExpand && $expandedFolderUid == $uid))       {
+                               $itemHTML = "<ul>\n";
+                       }
+
+                       // add CSS classes to the list item
+                       if($v['hasSub']) { $classAttr = ($classAttr) ? ' expanded': 'expanded'; }
+                       if($v['isLast']) { $classAttr = ($classAttr) ? ' last'  : 'last';        }
+
+                       $itemHTML .='
+                               <li id="'.$idAttr.'"'.($classAttr ? ' class="'.$classAttr.'"' : '').'>'.
+                                       $v['HTML'].
+                                       $this->wrapTitle($this->getTitleStr($v['row'],$titleLen),$v['row'],$v['bank']);
+
+
+                       if(!$v['hasSub']) { $itemHTML .= "</li>\n"; }
+
+                       // we have to remember if this is the last one
+                       // on level X so the last child on level X+1 closes the <ul>-tag
+                       if($v['isLast'] && !($doExpand && $expandedFolderUid == $uid)) { $closeDepth[$v['invertedDepth']] = 1; }
+
+
+                       // if this is the last one and does not have subitems, we need to close
+                       // the tree as long as the upper levels have last items too
+                       if($v['isLast'] && !$v['hasSub'] && !$doCollapse && !($doExpand && $expandedFolderUid == $uid)) {
+                               for ($i = $v['invertedDepth']; $closeDepth[$i] == 1; $i++) {
+                                       $closeDepth[$i] = 0;
+                                       $itemHTML .= "</ul></li>\n";
+                               }
+                       }
+
+                       // ajax request: collapse
+                       if($doCollapse && $expandedFolderUid == $uid) { return $itemHTML; }
+
+                       // ajax request: expand
+                       if($doExpand && $expandedFolderUid == $uid) {
+                               $ajaxOutput .= $itemHTML;
+                               $invertedDepthOfAjaxRequestedItem = $v['invertedDepth'];
+                       } elseif($invertedDepthOfAjaxRequestedItem) { 
+                               if($v['invertedDepth'] < $invertedDepthOfAjaxRequestedItem) {
+                                       $ajaxOutput .= $itemHTML;
+                               } else {
+                                       return $ajaxOutput;
+                               }
+                       }
+
+                       $out .= $itemHTML;
+               }
+
+               if($ajaxOutput) { return $ajaxOutput; }
+
+               // finally close the first ul
+               $out .= "</ul>\n";
+               return $out;
+       }
+
+
+       /**
+        * Generate the plus/minus icon for the browsable tree.
+        *
+        * @param       array           record for the entry
+        * @param       integer         The current entry number
+        * @param       integer         The total number of entries. If equal to $a, a "bottom" element is returned.
+        * @param       integer         The number of sub-elements to the current element.
+        * @param       boolean         The element was expanded to render subelements if this flag is set.
+        * @return      string          Image tag with the plus/minus icon.
+        * @access private
+        * @see t3lib_pageTree::PMicon()
+        */
+       function PMicon($row,$a,$c,$nextCount,$exp)     {
+               $PM   = $nextCount ? ($exp ? 'minus' : 'plus') : 'join';
+               $BTM  = ($a == $c) ? 'bottom' : '';
+               $icon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' alt="" />';
+
+               if ($nextCount) {
+                       $cmd = $this->bank.'_'.($exp?'0_':'1_').$row['uid'].'_'.$this->treeName;
+                       $icon = $this->PMiconATagWrap($icon,$cmd,!$exp);
+               }
+               return $icon;
+       }
+
+
+       /**
+        * Wrap the plus/minus icon in a link
+        *
+        * @param       string          HTML string to wrap, probably an image tag.
+        * @param       string          Command for 'PM' get var
+        * @return      string          Link-wrapped input string
+        * @access private
+        */
+       function PMiconATagWrap($icon, $cmd, $isExpand = true)  {
+               if ($this->thisScript) {
+                               // activate dynamic ajax-based tree
+                       $js = htmlspecialchars('Tree.load(\''.$cmd.'\', '.intval($isExpand).', this);');
+                       return '<a class="pm" onclick="'.$js.'">'.$icon.'</a>';
+               } else {
+                       return $icon;
+               }
+       }
+
+
+
+       /**
+        * Will create and return the HTML code for a browsable tree of folders.
+        * Is based on the mounts found in the internal array ->MOUNTS (set in the constructor)
+        *
+        * @return      string          HTML code for the browsable tree
+        */
+       function getBrowsableTree()     {
+
+                       // Get stored tree structure AND updating it if needed according to incoming PM GET var.
+               $this->initializePositionSaving();
+
+                       // Init done:
+               $titleLen = intval($this->BE_USER->uc['titleLen']);
+               $treeArr = array();
+
+                       // Traverse mounts:
+               foreach($this->MOUNTS as $key => $val)  {
+                       $specUID = t3lib_div::md5int($val['path']);
+                       $this->specUIDmap[$specUID] = $val['path'];
+
+                               // Set first:
+                       $this->bank = $val['nkey'];
+                       $isOpen = $this->stored[$val['nkey']][$specUID] || $this->expandFirst;
+                       $this->reset();
+
+                               // Set PM icon:
+                       $cmd = $this->bank.'_'.($isOpen ? '0_' : '1_').$specUID.'_'.$this->treeName;
+                       $icon='<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.($isOpen?'minus':'plus').'only.gif').' alt="" />';
+                       $firstHtml= $this->PM_ATagWrap($icon,$cmd);
+
+                       switch($val['type'])    {
+                               case 'user':    $icon = 'gfx/i/_icon_ftp_user.gif';     break;
+                               case 'group':   $icon = 'gfx/i/_icon_ftp_group.gif'; break;
+                               default:                $icon = 'gfx/i/_icon_ftp.gif'; break;
+                       }
+
+                               // Preparing rootRec for the mount
+                       $firstHtml.=$this->wrapIcon('<img'.t3lib_iconWorks::skinImg($this->backPath,$icon,'width="18" height="16"').' alt="" />',$val);
+                       $row=array();
+                       $row['uid']   = $specUID;
+                       $row['path']  = $val['path'];
+                       $row['title'] = $val['name'];
+
+                               // Add the root of the mount to ->tree
+                       $this->tree[] = array('HTML' => $firstHtml, 'row' => $row, 'bank' => $this->bank);
+
+                               // If the mount is expanded, go down:
+                       if ($isOpen)
+                               $this->getFolderTree($val['path'], 999);
+
+                               // Add tree:
+                       $treeArr = array_merge($treeArr, $this->tree);
+               }
+               return $this->printTree($treeArr);
+       }
+
+
+
+       /**
+        * Fetches the data for the tree
+        *
+        * @param       string          Abs file path
+        * @param       integer         Max depth (recursivity limit)
+        * @return      integer         The count of items on the level
+        * @see getBrowsableTree()
+        */
+       function getFolderTree($files_path, $depth=999) {
+
+                       // This generates the directory tree
+               $dirs = t3lib_div::get_dirs($files_path);
+               if (!is_array($dirs)) return 0;
+
+               sort($dirs);
+               $c = count($dirs);
+               
+               $depth = intval($depth);
+               $HTML = '';
+               $a = 0;
+
+               foreach($dirs as $key => $val)  {
+                       $a++;
+                       $this->tree[] = array();        // Reserve space.
+                       end($this->tree);
+                       $treeKey = key($this->tree);    // Get the key for this space
+
+                       $val = ereg_replace('^\./','',$val);
+                       $title = $val;
+                       $path = $files_path.$val.'/';
+
+                       $specUID = t3lib_div::md5int($path);
+                       $this->specUIDmap[$specUID] = $path;
+
+                       $row = array();
+                       $row['path']  = $path;
+                       $row['uid']   = $specUID;
+                       $row['title'] = $title;
+
+                       // Make a recursive call to the next level
+                       if ($depth > 1 && $this->expandNext($specUID))  {
+                               $nextCount = $this->getFolderTree(
+                                       $path,
+                                       $depth-1,
+                                       $this->makeHTML ? '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.($a == $c ? 'blank' : 'line').'.gif','width="18" height="16"').' alt="" />' : ''
+                               );
+                               $exp = 1;       // Set "did expand" flag
+                       } else {
+                               $nextCount = $this->getCount($path);
+                               $exp = 0;       // Clear "did expand" flag
+                       }
+
+                               // Set HTML-icons, if any:
+                       if ($this->makeHTML)    {
+                               $HTML = $this->PMicon($row,$a,$c,$nextCount,$exp);
+
+                               $icon = 'gfx/i/_icon_'.t3lib_BEfunc::getPathType_web_nonweb($path).'folders.gif';
+                               if ($val == '_temp_')   {
+                                       $icon = 'gfx/i/sysf.gif';
+                                       $row['title']='TEMP';
+                                       $row['_title']='<b>TEMP</b>';
+                               }
+                               if ($val == '_recycler_')       {
+                                       $icon = 'gfx/i/recycler.gif';
+                                       $row['title']='RECYCLER';
+                                       $row['_title']='<b>RECYCLER</b>';
+                               }
+                               $HTML .= $this->wrapIcon('<img'.t3lib_iconWorks::skinImg($this->backPath, $icon, 'width="18" height="16"').' alt="" />',$row);
+                       }
+
+                               // Finally, add the row/HTML content to the ->tree array in the reserved key.
+                       $this->tree[$treeKey] = Array(
+                               'row'    => $row,
+                               'HTML'   => $HTML,
+                               'hasSub' => $nextCount && $this->expandNext($specUID),
+                               'isFirst'=> ($a == 1),
+                               'isLast' => false,
+                               'invertedDepth'=> $depth,
+                               'bank'   => $this->bank
+                       );
+               }
+
+               if($a) { $this->tree[$treeKey]['isLast'] = true; }
+               return $c;
+       }
+}
+
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.filelistfoldertree.php'])     {
+       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.filelistfoldertree.php']);
+}
 ?>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 9916bf3..bd0c662
-<?php\r
-/***************************************************************\r
-*  Copyright notice\r
-*\r
-*  (c) 1999-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)\r
-*  All rights reserved\r
-*\r
-*  This script is part of the TYPO3 project. The TYPO3 project is\r
-*  free software; you can redistribute it and/or modify\r
-*  it under the terms of the GNU General Public License as published by\r
-*  the Free Software Foundation; either version 2 of the License, or\r
-*  (at your option) any later version.\r
-*\r
-*  The GNU General Public License can be found at\r
-*  http://www.gnu.org/copyleft/gpl.html.\r
-*  A copy is found in the textfile GPL.txt and important notices to the license\r
-*  from the author is found in LICENSE.txt distributed with these scripts.\r
-*\r
-*\r
-*  This script is distributed in the hope that it will be useful,\r
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*  GNU General Public License for more details.\r
-*\r
-*  This copyright notice MUST APPEAR in all copies of the script!\r
-***************************************************************/\r
-/**\r
- * Page navigation tree for the Web module\r
- *\r
- * Revised for TYPO3 3.6 2/2003 by Kasper Skaarhoj\r
- * XHTML compliant\r
- *\r
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>\r
- * @author     Benjamin Mack   <bmack@xnos.org>\r
- *\r
- *\r
- * [CLASS/FUNCTION INDEX of SCRIPT]\r
- *\r
- *\r
- *\r
- *   71: class webPageTree extends t3lib_browseTree\r
- *   81:     function webPageTree()\r
- *   92:     function wrapIcon($icon,&$row)\r
- *  130:     function wrapStop($str,$row)\r
- *  146:     function wrapTitle($title,$row,$bank=0)\r
- *  165:     function printTree($treeArr = '')\r
- *  271:     function PMicon($row,$a,$c,$nextCount,$exp)\r
- *  292:     function PMiconATagWrap($icon, $cmd, $isExpand = true)\r
- *  309:     function getBrowsableTree()\r
- *  377:     function getTree($uid, $depth=999, $depthData='',$blankLineCode='',$subCSSclass='')\r
- *\r
- *\r
- * TOTAL FUNCTIONS: 9\r
- * (This index is automatically created/updated by the extension "extdeveval")\r
- *\r
- */\r
-\r
-\r
-require_once(PATH_t3lib.'class.t3lib_browsetree.php');\r
-\r
-\r
-/**\r
- * Extension class for the t3lib_browsetree class, specially made \r
- * for browsing pages in the Web module\r
- *\r
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>\r
- * @author     Benjamin Mack   <bmack@xnos.org>\r
- * @package TYPO3\r
- * @subpackage core\r
- * @see class t3lib_browseTree\r
- */\r
-class webPageTree extends t3lib_browseTree {\r
-\r
-       var $ext_showPageId;\r
-       var $ext_IconMode;\r
-\r
-       /**\r
-        * Calls init functions\r
-        *\r
-        * @return      void\r
-        */\r
-       function webPageTree() {\r
-               $this->init();\r
-       }\r
-\r
-       /**\r
-        * Wrapping icon in browse tree\r
-        *\r
-        * @param       string          Icon IMG code\r
-        * @param       array           Data row for element.\r
-        * @return      string          Page icon\r
-        */\r
-       function wrapIcon($icon,&$row)  {\r
-                       // If the record is locked, present a warning sign.\r
-               if ($lockInfo=t3lib_BEfunc::isRecordLocked('pages',$row['uid']))        {\r
-                       $aOnClick = 'alert('.$GLOBALS['LANG']->JScharCode($lockInfo['msg']).');return false;';\r
-                       $lockIcon='<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.\r
-                               '<img'.t3lib_iconWorks::skinImg('','gfx/recordlock_warning3.gif','width="17" height="12"').' title="'.htmlspecialchars($lockInfo['msg']).'" alt="" />'.\r
-                               '</a>';\r
-               } else $lockIcon = '';\r
-\r
-                       // Add title attribute to input icon tag\r
-               $thePageIcon = $this->addTagAttributes($icon, $this->titleAttrib.'="'.$this->getTitleAttrib($row).'"');\r
-\r
-                       // Wrap icon in click-menu link.\r
-               if (!$this->ext_IconMode)       {\r
-                       $thePageIcon = $GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon($thePageIcon,'pages',$row['uid'],0,'&bank='.$this->bank);\r
-               } elseif (!strcmp($this->ext_IconMode,'titlelink'))     {\r
-                       $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->treeName.'\');';\r
-                       $thePageIcon='<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$thePageIcon.'</a>';\r
-               }\r
-\r
-                       // Wrap icon in a drag/drop span.\r
-               $dragDropIcon = '<span class="dragIcon" id="dragIconID_'.$row['uid'].'">'.$thePageIcon.'</span>';\r
-\r
-                       // Add Page ID:\r
-               $pageIdStr = '';\r
-               if ($this->ext_showPageId) { $pageIdStr = '['.$row['uid'].']&nbsp;'; }\r
-\r
-               return $dragDropIcon.$lockIcon.$pageIdStr;\r
-       }\r
-\r
-       /**\r
-        * Adds a red "+" to the input string, $str, if the field "php_tree_stop" in the $row (pages) is set\r
-        *\r
-        * @param       string          Input string, like a page title for the tree\r
-        * @param       array           record row with "php_tree_stop" field\r
-        * @return      string          Modified string\r
-        * @access private\r
-        */\r
-       function wrapStop($str,$row)    {\r
-               if ($row['php_tree_stop'])      {\r
-                       $str.='<a href="'.htmlspecialchars(t3lib_div::linkThisScript(array('setTempDBmount' => $row['uid']))).'" class="typo3-red">+</a> ';\r
-               }\r
-               return $str;\r
-       }\r
-\r
-       /**\r
-        * Wrapping $title in a-tags.\r
-        *\r
-        * @param       string          Title string\r
-        * @param       string          Item record\r
-        * @param       integer         Bank pointer (which mount point number)\r
-        * @return      string\r
-        * @access      private\r
-        */\r
-       function wrapTitle($title,$row,$bank=0) {\r
-               $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->domIdPrefix.$this->getId($row).'\','.$bank.');';\r
-               $CSM = '';\r
-               if ($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler'])       {\r
-                       $CSM = ' oncontextmenu="return '.htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('','pages',$row['uid'],0,'&bank='.$this->bank,'',TRUE)).';"';\r
-               }\r
-               $thePageTitle='<a href="#" onclick="'.htmlspecialchars($aOnClick).'"'.$CSM.'>'.$title.'</a>';\r
-\r
-                       // Wrap title in a drag/drop span.\r
-               return '<span class="dragTitle" id="dragTitleID_'.$row['uid'].'">'.$thePageTitle.'</span>';\r
-       }\r
-\r
-       \r
-       /**\r
-        * Compiles the HTML code for displaying the structure found inside the ->tree array\r
-        *\r
-        * @param       array           "tree-array" - if blank string, the internal ->tree array is used.\r
-        * @return      string          The HTML code for the tree\r
-        */\r
-       function printTree($treeArr = '')   {\r
-               $titleLen = intval($this->BE_USER->uc['titleLen']);\r
-               if (!is_array($treeArr))        $treeArr = $this->tree;\r
-\r
-               $out = '\r
-                       <!-- TYPO3 tree structure. -->\r
-                       <ul class="tree">\r
-               ';\r
-\r
-                       // -- evaluate AJAX request\r
-                       // IE takes anchor as parameter\r
-               $PM = t3lib_div::_GP('PM');\r
-               if(($PMpos = strpos($PM, '#')) !== false) { $PM = substr($PM, 0, $PMpos); }\r
-               $PM = explode('_', $PM);\r
-               if(($isAjaxCall = t3lib_div::_GP('ajax')) && is_array($PM) && count($PM)==4)    {\r
-                       if($PM[1])      {\r
-                               $expandedPageUid = $PM[2];\r
-                               $ajaxOutput = '';\r
-                               $invertedDepthOfAjaxRequestedItem = 0; // We don't know yet. Will be set later.\r
-                               $doExpand = true;\r
-                       } else  {\r
-                               $collapsedPageUid = $PM[2];\r
-                               $doCollapse = true;\r
-                       }\r
-               }\r
-\r
-               // we need to count the opened <ul>'s every time we dig into another level, \r
-               // so we know how many we have to close when all children are done rendering\r
-               $closeDepth = array();\r
-\r
-               foreach($treeArr as $k => $v)   {\r
-                       $classAttr = $v['row']['_CSSCLASS'];\r
-                       $uid       = $v['row']['uid'];\r
-                       $idAttr = htmlspecialchars($this->domIdPrefix.$this->getId($v['row']).'_'.$v['bank']);\r
-                       $itemHTML  = '';\r
-\r
-                       // if this item is the start of a new level, \r
-                       // then a new level <ul> is needed, but not in ajax mode\r
-                       if($v['isFirst'] && !($doCollapse) && !($doExpand && $expandedPageUid == $uid)) {\r
-                               $itemHTML = '<ul>';\r
-                       }\r
-\r
-                       // add CSS classes to the list item\r
-                       if($v['hasSub']) { $classAttr .= ($classAttr) ? ' expanded': 'expanded'; }\r
-                       if($v['isLast']) { $classAttr .= ($classAttr) ? ' last' : 'last';        }\r
-\r
-                       $itemHTML .='\r
-                               <li id="'.$idAttr.'"'.($classAttr ? ' class="'.$classAttr.'"' : '').'>'.\r
-                                       $v['HTML'].\r
-                                       $this->wrapTitle($this->getTitleStr($v['row'],$titleLen),$v['row'],$v['bank'])."\n";\r
-\r
-\r
-                       if(!$v['hasSub']) { $itemHTML .= '</li>'; }\r
-\r
-                       // we have to remember if this is the last one\r
-                       // on level X so the last child on level X+1 closes the <ul>-tag\r
-                       if($v['isLast'] && !($doExpand && $expandedPageUid == $uid)) { $closeDepth[$v['invertedDepth']] = 1; }\r
-\r
-\r
-                       // if this is the last one and does not have subitems, we need to close\r
-                       // the tree as long as the upper levels have last items too\r
-                       if($v['isLast'] && !$v['hasSub'] && !$doCollapse && !($doExpand && $expandedPageUid == $uid)) {\r
-                               for ($i = $v['invertedDepth']; $closeDepth[$i] == 1; $i++) {\r
-                                       $closeDepth[$i] = 0;\r
-                                       $itemHTML .= '</ul></li>';\r
-                               }\r
-                       }\r
-\r
-                       // ajax request: collapse\r
-                       if($doCollapse && $collapsedPageUid == $uid) { return $itemHTML; }\r
-\r
-                       // ajax request: expand\r
-                       if($doExpand && $expandedPageUid == $uid) {\r
-                               $ajaxOutput .= $itemHTML;\r
-                               $invertedDepthOfAjaxRequestedItem = $v['invertedDepth'];\r
-                       } elseif($invertedDepthOfAjaxRequestedItem) { \r
-                               if($v['invertedDepth'] < $invertedDepthOfAjaxRequestedItem) {\r
-                                       $ajaxOutput .= $itemHTML;\r
-                               } else {\r
-                                       return $ajaxOutput;\r
-                               }\r
-                       }\r
-\r
-                       $out .= $itemHTML;\r
-               }\r
-\r
-               if($ajaxOutput) { return $ajaxOutput; }\r
-\r
-               // finally close the first ul\r
-               $out .= '</ul>';\r
-               return $out;\r
-       }\r
-\r
-\r
-       /**\r
-        * Generate the plus/minus icon for the browsable tree.\r
-        *\r
-        * @param       array           record for the entry\r
-        * @param       integer         The current entry number\r
-        * @param       integer         The total number of entries. If equal to $a, a "bottom" element is returned.\r
-        * @param       integer         The number of sub-elements to the current element.\r
-        * @param       boolean         The element was expanded to render subelements if this flag is set.\r
-        * @return      string          Image tag with the plus/minus icon.\r
-        * @access private\r
-        * @see t3lib_pageTree::PMicon()\r
-        */\r
-       function PMicon($row,$a,$c,$nextCount,$exp)     {\r
-               $PM   = $nextCount ? ($exp ? 'minus' : 'plus') : 'join';\r
-               $BTM  = ($a == $c) ? 'bottom' : '';\r
-               $icon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' alt="" />';\r
-\r
-               if ($nextCount) {\r
-                       $cmd = $this->bank.'_'.($exp?'0_':'1_').$row['uid'].'_'.$this->treeName;\r
-                       $icon = $this->PMiconATagWrap($icon,$cmd,!$exp);\r
-               }\r
-               return $icon;\r
-       }\r
-\r
-\r
-       /**\r
-        * Wrap the plus/minus icon in a link\r
-        *\r
-        * @param       string          HTML string to wrap, probably an image tag.\r
-        * @param       string          Command for 'PM' get var\r
-        * @return      string          Link-wrapped input string\r
-        * @access private\r
-        */\r
-       function PMiconATagWrap($icon, $cmd, $isExpand = true)  {\r
-               if ($this->thisScript) {\r
-                               // activate dynamic ajax-based tree\r
-                       $js = htmlspecialchars('Tree.load(\''.$cmd.'\', '.intval($isExpand).', this);');\r
-                       return '<a class="pm" onclick="'.$js.'">'.$icon.'</a>';\r
-               } else {\r
-                       return $icon;\r
-               }\r
-       }\r
-\r
-\r
-       /**\r
-        * Will create and return the HTML code for a browsable tree\r
-        * Is based on the mounts found in the internal array ->MOUNTS (set in the constructor)\r
-        *\r
-        * @return      string          HTML code for the browsable tree\r
-        */\r
-       function getBrowsableTree() {\r
-\r
-                       // Get stored tree structure AND updating it if needed according to incoming PM GET var.\r
-               $this->initializePositionSaving();\r
-\r
-                       // Init done:\r
-               $titleLen = intval($this->BE_USER->uc['titleLen']);\r
-               $treeArr = array();\r
-               \r
-                       // Traverse mounts:\r
-               foreach($this->MOUNTS as $idx => $uid)  {\r
-\r
-                               // Set first:\r
-                       $this->bank = $idx;\r
-                       $isOpen = $this->stored[$idx][$uid] || $this->expandFirst;\r
-\r
-                               // Save ids while resetting everything else.\r
-                       $curIds = $this->ids;\r
-                       $this->reset();\r
-                       $this->ids = $curIds;\r
-\r
-                               // Set PM icon for root of mount:\r
-                       $cmd = $this->bank.'_'.($isOpen? "0_" : "1_").$uid.'_'.$this->treeName;\r
-                       $icon='<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.($isOpen?'minus':'plus').'only.gif').' alt="" />';\r
-                       $firstHtml = $this->PMiconATagWrap($icon,$cmd);\r
-\r
-                               // Preparing rootRec for the mount\r
-                       if ($uid)   {\r
-                               $rootRec = $this->getRecord($uid);\r
-                               $firstHtml.=$this->getIcon($rootRec);\r
-                       } else {\r
-                               // Artificial record for the tree root, id=0\r
-                               $rootRec = $this->getRootRecord($uid);\r
-                               $firstHtml.=$this->getRootIcon($rootRec);\r
-                       }\r
-\r
-                       if (is_array($rootRec)) {\r
-                                       // In case it was swapped inside getRecord due to workspaces.\r
-                               $uid = $rootRec['uid'];\r
-\r
-                                       // Add the root of the mount to ->tree\r
-                               $this->tree[] = array('HTML'=>$firstHtml, 'row'=>$rootRec, 'bank'=>$this->bank, 'hasSub'=>true, 'invertedDepth'=>1000);\r
-\r
-                                       // If the mount is expanded, go down:\r
-                               if ($isOpen)    {\r
-                                               // Set depth:\r
-                                       if ($this->addSelfId) { $this->ids[] = $uid; }\r
-                                       $this->getTree($uid, 999, '', $rootRec['_SUBCSSCLASS']);\r
-                               }\r
-                                       // Add tree:\r
-                               $treeArr=array_merge($treeArr,$this->tree);\r
-                       }\r
-               }\r
-               return $this->printTree($treeArr);\r
-       }\r
-\r
-\r
-       /**\r
-        * Fetches the data for the tree\r
-        *\r
-        * @param       integer         item id for which to select subitems (parent id)\r
-        * @param       integer         Max depth (recursivity limit)\r
-        * @param       string          ? (internal)\r
-        * @return      integer         The count of items on the level\r
-        */\r
-       function getTree($uid, $depth=999, $blankLineCode='', $subCSSclass='') {\r
-\r
-                       // Buffer for id hierarchy is reset:\r
-               $this->buffer_idH = array();\r
-\r
-                       // Init vars\r
-               $depth = intval($depth);\r
-               $HTML = '';\r
-               $a = 0;\r
-\r
-               $res = $this->getDataInit($uid, $subCSSclass);\r
-               $c = $this->getDataCount($res);\r
-               $crazyRecursionLimiter = 999;\r
-\r
-                       // Traverse the records:\r
-               while ($crazyRecursionLimiter > 0 && $row = $this->getDataNext($res,$subCSSclass))      {\r
-                       $a++;\r
-                       $crazyRecursionLimiter--;\r
-                       \r
-                       $newID = $row['uid'];\r
-                       $this->tree[]=array();    // Reserve space.\r
-                       end($this->tree);\r
-                       $treeKey = key($this->tree);    // Get the key for this space\r
-                       $LN = ($a==$c) ? 'blank' : 'line';\r
-\r
-                               // If records should be accumulated, do so\r
-                       if ($this->setRecs) { $this->recs[$row['uid']] = $row; }\r
-\r
-                               // Accumulate the id of the element in the internal arrays\r
-                       $this->ids[]=$idH[$row['uid']]['uid'] = $row['uid'];\r
-                       $this->ids_hierarchy[$depth][] = $row['uid'];\r
-\r
-                               // Make a recursive call to the next level\r
-                       if ($depth > 1 && $this->expandNext($newID) && !$row['php_tree_stop'])  {\r
-                               $nextCount=$this->getTree(\r
-                                       $newID,\r
-                                       $depth-1,\r
-                                       $blankLineCode.','.$LN,\r
-                                       $row['_SUBCSSCLASS']\r
-                               );\r
-                               if (count($this->buffer_idH)) { $idH[$row['uid']]['subrow']=$this->buffer_idH; }\r
-                               $exp = 1; // Set "did expand" flag\r
-                       } else {\r
-                               $nextCount = $this->getCount($newID);\r
-                               $exp = 0; // Clear "did expand" flag\r
-                       }\r
-\r
-                               // Set HTML-icons, if any:\r
-                       if ($this->makeHTML)    {\r
-                               $HTML = $this->PMicon($row,$a,$c,$nextCount,$exp);\r
-                               $HTML.= $this->wrapStop($this->getIcon($row),$row);\r
-                       }\r
-\r
-                               // Finally, add the row/HTML content to the ->tree array in the reserved key.\r
-                       $this->tree[$treeKey] = array(\r
-                               'row'    => $row,\r
-                               'HTML'   => $HTML,\r
-                               'hasSub' => $nextCount&&$this->expandNext($newID),\r
-                               'isFirst'=> $a==1,\r
-                               'isLast' => false,\r
-                               'invertedDepth'=> $depth,\r
-                               'blankLineCode'=> $blankLineCode,\r
-                               'bank' => $this->bank\r
-                       );\r
-               }\r
-\r
-               if($a) { $this->tree[$treeKey]['isLast'] = true; }\r
-\r
-               $this->getDataFree($res);\r
-               $this->buffer_idH = $idH;\r
-               return $c;\r
-       }\r
-}\r
-\r
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.webpagetree.php'])    {\r
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.webpagetree.php']);\r
-}\r
+<?php
+/***************************************************************
+*  Copyright notice
+*
+*  (c) 1999-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  All rights reserved
+*
+*  This script is part of the TYPO3 project. The TYPO3 project is
+*  free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  The GNU General Public License can be found at
+*  http://www.gnu.org/copyleft/gpl.html.
+*  A copy is found in the textfile GPL.txt and important notices to the license
+*  from the author is found in LICENSE.txt distributed with these scripts.
+*
+*
+*  This script is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+/**
+ * Page navigation tree for the Web module
+ *
+ * Revised for TYPO3 3.6 2/2003 by Kasper Skaarhoj
+ * XHTML compliant
+ *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author     Benjamin Mack   <bmack@xnos.org>
+ *
+ *
+ * [CLASS/FUNCTION INDEX of SCRIPT]
+ *
+ *
+ *
+ *   71: class webPageTree extends t3lib_browseTree
+ *   81:     function webPageTree()
+ *   92:     function wrapIcon($icon,&$row)
+ *  130:     function wrapStop($str,$row)
+ *  146:     function wrapTitle($title,$row,$bank=0)
+ *  165:     function printTree($treeArr = '')
+ *  271:     function PMicon($row,$a,$c,$nextCount,$exp)
+ *  292:     function PMiconATagWrap($icon, $cmd, $isExpand = true)
+ *  309:     function getBrowsableTree()
+ *  377:     function getTree($uid, $depth=999, $depthData='',$blankLineCode='',$subCSSclass='')
+ *
+ *
+ * TOTAL FUNCTIONS: 9
+ * (This index is automatically created/updated by the extension "extdeveval")
+ *
+ */
+
+
+require_once(PATH_t3lib.'class.t3lib_browsetree.php');
+
+
+/**
+ * Extension class for the t3lib_browsetree class, specially made 
+ * for browsing pages in the Web module
+ *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author     Benjamin Mack   <bmack@xnos.org>
+ * @package TYPO3
+ * @subpackage core
+ * @see class t3lib_browseTree
+ */
+class webPageTree extends t3lib_browseTree {
+
+       var $ext_showPageId;
+       var $ext_IconMode;
+
+       /**
+        * Calls init functions
+        *
+        * @return      void
+        */
+       function webPageTree() {
+               $this->init();
+       }
+
+       /**
+        * Wrapping icon in browse tree
+        *
+        * @param       string          Icon IMG code
+        * @param       array           Data row for element.
+        * @return      string          Page icon
+        */
+       function wrapIcon($icon,&$row)  {
+                       // If the record is locked, present a warning sign.
+               if ($lockInfo=t3lib_BEfunc::isRecordLocked('pages',$row['uid']))        {
+                       $aOnClick = 'alert('.$GLOBALS['LANG']->JScharCode($lockInfo['msg']).');return false;';
+                       $lockIcon='<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.
+                               '<img'.t3lib_iconWorks::skinImg('','gfx/recordlock_warning3.gif','width="17" height="12"').' title="'.htmlspecialchars($lockInfo['msg']).'" alt="" />'.
+                               '</a>';
+               } else $lockIcon = '';
+
+                       // Add title attribute to input icon tag
+               $thePageIcon = $this->addTagAttributes($icon, $this->titleAttrib.'="'.$this->getTitleAttrib($row).'"');
+
+                       // Wrap icon in click-menu link.
+               if (!$this->ext_IconMode)       {
+                       $thePageIcon = $GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon($thePageIcon,'pages',$row['uid'],0,'&bank='.$this->bank);
+               } elseif (!strcmp($this->ext_IconMode,'titlelink'))     {
+                       $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->treeName.'\');';
+                       $thePageIcon='<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$thePageIcon.'</a>';
+               }
+
+                       // Wrap icon in a drag/drop span.
+               $dragDropIcon = '<span class="dragIcon" id="dragIconID_'.$row['uid'].'">'.$thePageIcon.'</span>';
+
+                       // Add Page ID:
+               $pageIdStr = '';
+               if ($this->ext_showPageId) { $pageIdStr = '['.$row['uid'].']&nbsp;'; }
+
+               return $dragDropIcon.$lockIcon.$pageIdStr;
+       }
+
+       /**
+        * Adds a red "+" to the input string, $str, if the field "php_tree_stop" in the $row (pages) is set
+        *
+        * @param       string          Input string, like a page title for the tree
+        * @param       array           record row with "php_tree_stop" field
+        * @return      string          Modified string
+        * @access private
+        */
+       function wrapStop($str,$row)    {
+               if ($row['php_tree_stop'])      {
+                       $str.='<a href="'.htmlspecialchars(t3lib_div::linkThisScript(array('setTempDBmount' => $row['uid']))).'" class="typo3-red">+</a> ';
+               }
+               return $str;
+       }
+
+       /**
+        * Wrapping $title in a-tags.
+        *
+        * @param       string          Title string
+        * @param       string          Item record
+        * @param       integer         Bank pointer (which mount point number)
+        * @return      string
+        * @access      private
+        */
+       function wrapTitle($title,$row,$bank=0) {
+               $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->domIdPrefix.$this->getId($row).'\','.$bank.');';
+               $CSM = '';
+               if ($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler'])       {
+                       $CSM = ' oncontextmenu="return '.htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('','pages',$row['uid'],0,'&bank='.$this->bank,'',TRUE)).';"';
+               }
+               $thePageTitle='<a href="#" onclick="'.htmlspecialchars($aOnClick).'"'.$CSM.'>'.$title.'</a>';
+
+                       // Wrap title in a drag/drop span.
+               return '<span class="dragTitle" id="dragTitleID_'.$row['uid'].'">'.$thePageTitle.'</span>';
+       }
+
+       
+       /**
+        * Compiles the HTML code for displaying the structure found inside the ->tree array
+        *
+        * @param       array           "tree-array" - if blank string, the internal ->tree array is used.
+        * @return      string          The HTML code for the tree
+        */
+       function printTree($treeArr = '')   {
+               $titleLen = intval($this->BE_USER->uc['titleLen']);
+               if (!is_array($treeArr))        $treeArr = $this->tree;
+
+               $out = '
+                       <!-- TYPO3 tree structure. -->
+                       <ul class="tree">
+               ';
+
+                       // -- evaluate AJAX request
+                       // IE takes anchor as parameter
+               $PM = t3lib_div::_GP('PM');
+               if(($PMpos = strpos($PM, '#')) !== false) { $PM = substr($PM, 0, $PMpos); }
+               $PM = explode('_', $PM);
+               if(($isAjaxCall = t3lib_div::_GP('ajax')) && is_array($PM) && count($PM)==4)    {
+                       if($PM[1])      {
+                               $expandedPageUid = $PM[2];
+                               $ajaxOutput = '';
+                               $invertedDepthOfAjaxRequestedItem = 0; // We don't know yet. Will be set later.
+                               $doExpand = true;
+                       } else  {
+                               $collapsedPageUid = $PM[2];
+                               $doCollapse = true;
+                       }
+               }
+
+               // we need to count the opened <ul>'s every time we dig into another level, 
+               // so we know how many we have to close when all children are done rendering
+               $closeDepth = array();
+
+               foreach($treeArr as $k => $v)   {
+                       $classAttr = $v['row']['_CSSCLASS'];
+                       $uid       = $v['row']['uid'];
+                       $idAttr = htmlspecialchars($this->domIdPrefix.$this->getId($v['row']).'_'.$v['bank']);
+                       $itemHTML  = '';
+
+                       // if this item is the start of a new level, 
+                       // then a new level <ul> is needed, but not in ajax mode
+                       if($v['isFirst'] && !($doCollapse) && !($doExpand && $expandedPageUid == $uid)) {
+                               $itemHTML = '<ul>';
+                       }
+
+                       // add CSS classes to the list item
+                       if($v['hasSub']) { $classAttr .= ($classAttr) ? ' expanded': 'expanded'; }
+                       if($v['isLast']) { $classAttr .= ($classAttr) ? ' last' : 'last';        }
+
+                       $itemHTML .='
+                               <li id="'.$idAttr.'"'.($classAttr ? ' class="'.$classAttr.'"' : '').'>'.
+                                       $v['HTML'].
+                                       $this->wrapTitle($this->getTitleStr($v['row'],$titleLen),$v['row'],$v['bank'])."\n";
+
+
+                       if(!$v['hasSub']) { $itemHTML .= '</li>'; }
+
+                       // we have to remember if this is the last one
+                       // on level X so the last child on level X+1 closes the <ul>-tag
+                       if($v['isLast'] && !($doExpand && $expandedPageUid == $uid)) { $closeDepth[$v['invertedDepth']] = 1; }
+
+
+                       // if this is the last one and does not have subitems, we need to close
+                       // the tree as long as the upper levels have last items too
+                       if($v['isLast'] && !$v['hasSub'] && !$doCollapse && !($doExpand && $expandedPageUid == $uid)) {
+                               for ($i = $v['invertedDepth']; $closeDepth[$i] == 1; $i++) {
+                                       $closeDepth[$i] = 0;
+                                       $itemHTML .= '</ul></li>';
+                               }
+                       }
+
+                       // ajax request: collapse
+                       if($doCollapse && $collapsedPageUid == $uid) { return $itemHTML; }
+
+                       // ajax request: expand
+                       if($doExpand && $expandedPageUid == $uid) {
+                               $ajaxOutput .= $itemHTML;
+                               $invertedDepthOfAjaxRequestedItem = $v['invertedDepth'];
+                       } elseif($invertedDepthOfAjaxRequestedItem) { 
+                               if($v['invertedDepth'] < $invertedDepthOfAjaxRequestedItem) {
+                                       $ajaxOutput .= $itemHTML;
+                               } else {
+                                       return $ajaxOutput;
+                               }
+                       }
+
+                       $out .= $itemHTML;
+               }
+
+               if($ajaxOutput) { return $ajaxOutput; }
+
+               // finally close the first ul
+               $out .= '</ul>';
+               return $out;
+       }
+
+
+       /**
+        * Generate the plus/minus icon for the browsable tree.
+        *
+        * @param       array           record for the entry
+        * @param       integer         The current entry number
+        * @param       integer         The total number of entries. If equal to $a, a "bottom" element is returned.
+        * @param       integer         The number of sub-elements to the current element.
+        * @param       boolean         The element was expanded to render subelements if this flag is set.
+        * @return      string          Image tag with the plus/minus icon.
+        * @access private
+        * @see t3lib_pageTree::PMicon()
+        */
+       function PMicon($row,$a,$c,$nextCount,$exp)     {
+               $PM   = $nextCount ? ($exp ? 'minus' : 'plus') : 'join';
+               $BTM  = ($a == $c) ? 'bottom' : '';
+               $icon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.$PM.$BTM.'.gif','width="18" height="16"').' alt="" />';
+
+               if ($nextCount) {
+                       $cmd = $this->bank.'_'.($exp?'0_':'1_').$row['uid'].'_'.$this->treeName;
+                       $icon = $this->PMiconATagWrap($icon,$cmd,!$exp);
+               }
+               return $icon;
+       }
+
+
+       /**
+        * Wrap the plus/minus icon in a link
+        *
+        * @param       string          HTML string to wrap, probably an image tag.
+        * @param       string          Command for 'PM' get var
+        * @return      string          Link-wrapped input string
+        * @access private
+        */
+       function PMiconATagWrap($icon, $cmd, $isExpand = true)  {
+               if ($this->thisScript) {
+                               // activate dynamic ajax-based tree
+                       $js = htmlspecialchars('Tree.load(\''.$cmd.'\', '.intval($isExpand).', this);');
+                       return '<a class="pm" onclick="'.$js.'">'.$icon.'</a>';
+               } else {
+                       return $icon;
+               }
+       }
+
+
+       /**
+        * Will create and return the HTML code for a browsable tree
+        * Is based on the mounts found in the internal array ->MOUNTS (set in the constructor)
+        *
+        * @return      string          HTML code for the browsable tree
+        */
+       function getBrowsableTree() {
+
+                       // Get stored tree structure AND updating it if needed according to incoming PM GET var.
+               $this->initializePositionSaving();
+
+                       // Init done:
+               $titleLen = intval($this->BE_USER->uc['titleLen']);
+               $treeArr = array();
+               
+                       // Traverse mounts:
+               foreach($this->MOUNTS as $idx => $uid)  {
+
+                               // Set first:
+                       $this->bank = $idx;
+                       $isOpen = $this->stored[$idx][$uid] || $this->expandFirst;
+
+                               // Save ids while resetting everything else.
+                       $curIds = $this->ids;
+                       $this->reset();
+                       $this->ids = $curIds;
+
+                               // Set PM icon for root of mount:
+                       $cmd = $this->bank.'_'.($isOpen? "0_" : "1_").$uid.'_'.$this->treeName;
+                       $icon='<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.($isOpen?'minus':'plus').'only.gif').' alt="" />';
+                       $firstHtml = $this->PMiconATagWrap($icon,$cmd);
+
+                               // Preparing rootRec for the mount
+                       if ($uid)   {
+                               $rootRec = $this->getRecord($uid);
+                               $firstHtml.=$this->getIcon($rootRec);
+                       } else {
+                               // Artificial record for the tree root, id=0
+                               $rootRec = $this->getRootRecord($uid);
+                               $firstHtml.=$this->getRootIcon($rootRec);
+                       }
+
+                       if (is_array($rootRec)) {
+                                       // In case it was swapped inside getRecord due to workspaces.
+                               $uid = $rootRec['uid'];
+
+                                       // Add the root of the mount to ->tree
+                               $this->tree[] = array('HTML'=>$firstHtml, 'row'=>$rootRec, 'bank'=>$this->bank, 'hasSub'=>true, 'invertedDepth'=>1000);
+
+                                       // If the mount is expanded, go down:
+                               if ($isOpen)    {
+                                               // Set depth:
+                                       if ($this->addSelfId) { $this->ids[] = $uid; }
+                                       $this->getTree($uid, 999, '', $rootRec['_SUBCSSCLASS']);
+                               }
+                                       // Add tree:
+                               $treeArr=array_merge($treeArr,$this->tree);
+                       }
+               }
+               return $this->printTree($treeArr);
+       }
+
+
+       /**
+        * Fetches the data for the tree
+        *
+        * @param       integer         item id for which to select subitems (parent id)
+        * @param       integer         Max depth (recursivity limit)
+        * @param       string          ? (internal)
+        * @return      integer         The count of items on the level
+        */
+       function getTree($uid, $depth=999, $blankLineCode='', $subCSSclass='') {
+
+                       // Buffer for id hierarchy is reset:
+               $this->buffer_idH = array();
+
+                       // Init vars
+               $depth = intval($depth);
+               $HTML = '';
+               $a = 0;
+
+               $res = $this->getDataInit($uid, $subCSSclass);
+               $c = $this->getDataCount($res);
+               $crazyRecursionLimiter = 999;
+
+                       // Traverse the records:
+               while ($crazyRecursionLimiter > 0 && $row = $this->getDataNext($res,$subCSSclass))      {
+                       $a++;
+                       $crazyRecursionLimiter--;
+                       
+                       $newID = $row['uid'];
+                       $this->tree[]=array();    // Reserve space.
+                       end($this->tree);
+                       $treeKey = key($this->tree);    // Get the key for this space
+                       $LN = ($a==$c) ? 'blank' : 'line';
+
+                               // If records should be accumulated, do so
+                       if ($this->setRecs) { $this->recs[$row['uid']] = $row; }
+
+                               // Accumulate the id of the element in the internal arrays
+                       $this->ids[]=$idH[$row['uid']]['uid'] = $row['uid'];
+                       $this->ids_hierarchy[$depth][] = $row['uid'];
+
+                               // Make a recursive call to the next level
+                       if ($depth > 1 && $this->expandNext($newID) && !$row['php_tree_stop'])  {
+                               $nextCount=$this->getTree(
+                                       $newID,
+                                       $depth-1,
+                                       $blankLineCode.','.$LN,
+                                       $row['_SUBCSSCLASS']
+                               );
+                               if (count($this->buffer_idH)) { $idH[$row['uid']]['subrow']=$this->buffer_idH; }
+                               $exp = 1; // Set "did expand" flag
+                       } else {
+                               $nextCount = $this->getCount($newID);
+                               $exp = 0; // Clear "did expand" flag
+                       }
+
+                               // Set HTML-icons, if any:
+                       if ($this->makeHTML)    {
+                               $HTML = $this->PMicon($row,$a,$c,$nextCount,$exp);
+                               $HTML.= $this->wrapStop($this->getIcon($row),$row);
+                       }
+
+                               // Finally, add the row/HTML content to the ->tree array in the reserved key.
+                       $this->tree[$treeKey] = array(
+                               'row'    => $row,
+                               'HTML'   => $HTML,
+                               'hasSub' => $nextCount&&$this->expandNext($newID),
+                               'isFirst'=> $a==1,
+                               'isLast' => false,
+                               'invertedDepth'=> $depth,
+                               'blankLineCode'=> $blankLineCode,
+                               'bank' => $this->bank
+                       );
+               }
+
+               if($a) { $this->tree[$treeKey]['isLast'] = true; }
+
+               $this->getDataFree($res);
+               $this->buffer_idH = $idH;
+               return $c;
+       }
+}
+
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.webpagetree.php'])    {
+       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.webpagetree.php']);
+}
 ?>
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
index 13876ae..4704911
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 *
 *  This copyright notice MUST APPEAR in all copies of this script
+*
+*  TYPO3 SVN ID: $Id$
+*
 ***************************************************************/
 
        // Call this function, refresh_nav(), from another script in the backend if you want
-       // to refresh the navigation frame (eg. after having changed a page title or moved pages etc.)\r
-       //              See t3lib_BEfunc::getSetUpdateSignal()\r
-function refresh_nav() { window.setTimeout('_refresh_nav();',0); }\r
+       // to refresh the navigation frame (eg. after having changed a page title or moved pages etc.)
+       //              See t3lib_BEfunc::getSetUpdateSignal()
+function refresh_nav() { window.setTimeout('_refresh_nav();',0); }
 function _refresh_nav()        {
        var r = new Date();
        // randNum is useful so pagetree does not get cached in browser cache when refreshing
@@ -39,15 +42,15 @@ var Tree = {
 
        // reloads a part of the page tree (useful when "expand" / "collapse")
        load: function(params, isExpand, obj) {
-               new Ajax.Request(this.thisScript, {\r
-                       method: 'get',\r
-                       parameters: 'ajax=1&PM=' + params,\r
+               new Ajax.Request(this.thisScript, {
+                       method: 'get',
+                       parameters: 'ajax=1&PM=' + params,
                        onComplete: function(xhr) {
-                                       // the parent node needs to be overwritten, not the object\r
+                                       // the parent node needs to be overwritten, not the object
                                $(obj.parentNode).replace(xhr.responseText);
                                Tree.registerDragDropHandlers();
                                Tree.reSelectActiveItem();
-                       }\r
+                       }
                });
        },
 
@@ -76,15 +79,16 @@ var Tree = {
        // highlights an active list item in the page tree and registers it to the top-frame
        // used when loading the page for the first time
        highlightActiveItem: function(frameSetModule, highlightID) {
-               this.frameSetModule = frameSetModule;\r
+               this.frameSetModule = frameSetModule;
 
                // Remove all items that are already highlighted
                obj = $(top.fsMod.navFrameHighlightedID[frameSetModule]);
-               if (obj) Element.removeClassName(obj, 'active');\r
+               if (obj) Element.removeClassName(obj, 'active');
 
-               // Set the new item\r
-               top.fsMod.navFrameHighlightedID[frameSetModule] = highlightID;\r
-               if ($(highlightID)) Element.addClassName(highlightID, 'active');\r       }
+               // Set the new item
+               top.fsMod.navFrameHighlightedID[frameSetModule] = highlightID;
+               if ($(highlightID)) Element.addClassName(highlightID, 'active');
+       }
 
 }