Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_tree_directory

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

diff --git a/ChangeLog b/ChangeLog
index 658ab00..d82be12 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 2010-11-24  Steffen Kamper  <steffen@typo3.org>
 
+       * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_tree_directory
        * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_tceforms_directory
        * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_stddb_directory
        * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_spritemanager_directory

diff --git a/t3lib/tree/class.t3lib_tree_abstractdataprovider.php b/t3lib/tree/class.t3lib_tree_abstractdataprovider.php
index c5c2795..14d536f 100644 (file)
--- a/t3lib/tree/class.t3lib_tree_abstractdataprovider.php
+++ b/t3lib/tree/class.t3lib_tree_abstractdataprovider.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Abstract Tree Data Provider
@@ -56,6 +56,7 @@ abstract class t3lib_tree_AbstractDataProvider {
         * @param t3lib_tree_Node $node
         * @return t3lib_tree_NodeCollection
         */
-        abstract public function getNodes(t3lib_tree_Node $node);
+       abstract public function getNodes(t3lib_tree_Node $node);
 }
+
 ?>
\ No newline at end of file

diff --git a/t3lib/tree/class.t3lib_tree_abstractstateprovider.php b/t3lib/tree/class.t3lib_tree_abstractstateprovider.php
index 4cb3476..b404006 100644 (file)
--- a/t3lib/tree/class.t3lib_tree_abstractstateprovider.php
+++ b/t3lib/tree/class.t3lib_tree_abstractstateprovider.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Abstract State Provider
@@ -49,4 +49,5 @@ abstract class t3lib_tree_AbstractStateProvider {
         */
        abstract public function getState();
 }
+
 ?>
\ No newline at end of file

diff --git a/t3lib/tree/class.t3lib_tree_abstracttree.php b/t3lib/tree/class.t3lib_tree_abstracttree.php
index 0937032..e006ff2 100644 (file)
--- a/t3lib/tree/class.t3lib_tree_abstracttree.php
+++ b/t3lib/tree/class.t3lib_tree_abstracttree.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Abstract Tree
@@ -61,6 +61,7 @@ abstract class t3lib_tree_AbstractTree {
        public function getDataProvider() {
                return $this->dataProvider;
        }
+
        /**
         * @param t3lib_tree_renderer_Abstract $dataProvider
         * @return void

diff --git a/t3lib/tree/class.t3lib_tree_node.php b/t3lib/tree/class.t3lib_tree_node.php
index 5e0e893..922cf58 100644 (file)
--- a/t3lib/tree/class.t3lib_tree_node.php
+++ b/t3lib/tree/class.t3lib_tree_node.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Tree Node
@@ -76,7 +76,7 @@ class t3lib_tree_Node implements t3lib_tree_ComparableNode, Serializable {
         * @param t3lib_tree_NodeCollection $childNodes
         * @return void
         */
-       public function setChildNodes (t3lib_tree_NodeCollection $childNodes) {
+       public function setChildNodes(t3lib_tree_NodeCollection $childNodes) {
                $this->childNodes = $childNodes;
        }
 
@@ -140,7 +140,7 @@ class t3lib_tree_Node implements t3lib_tree_ComparableNode, Serializable {
         * @param t3lib_tree_Node $parentNode
         * @return void
         */
-       public function setParentNode (t3lib_tree_Node $parentNode = NULL) {
+       public function setParentNode(t3lib_tree_Node $parentNode = NULL) {
                $this->parentNode = $parentNode;
        }
 
@@ -149,7 +149,7 @@ class t3lib_tree_Node implements t3lib_tree_ComparableNode, Serializable {
         *
         * @return t3lib_tree_Node
         */
-       public function getParentNode () {
+       public function getParentNode() {
                return $this->parentNode;
        }
 
@@ -220,16 +220,16 @@ class t3lib_tree_Node implements t3lib_tree_ComparableNode, Serializable {
 
                if (isset($data['parentNode']) && $data['parentNode'] !== '') {
                        $this->setParentNode(t3lib_div::makeInstance(
-                               $data['parentNode']['serializeClassName'],
-                               $data['parentNode']
-                       ));
+                                                                        $data['parentNode']['serializeClassName'],
+                                                                        $data['parentNode']
+                                                                ));
                }
 
                if (isset($data['childNodes']) && $data['childNodes'] !== '') {
                        $this->setChildNodes(t3lib_div::makeInstance(
-                               $data['childNodes']['serializeClassName'],
-                               $data['childNodes']
-                       ));
+                                                                        $data['childNodes']['serializeClassName'],
+                                                                        $data['childNodes']
+                                                                ));
                }
        }
 
@@ -257,4 +257,5 @@ class t3lib_tree_Node implements t3lib_tree_ComparableNode, Serializable {
                $this->dataFromArray($arrayRepresentation);
        }
 }
+
 ?>
\ No newline at end of file

diff --git a/t3lib/tree/class.t3lib_tree_nodecollection.php b/t3lib/tree/class.t3lib_tree_nodecollection.php
index 294082e..2772fe9 100644 (file)
--- a/t3lib/tree/class.t3lib_tree_nodecollection.php
+++ b/t3lib/tree/class.t3lib_tree_nodecollection.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Tree Node Collection
@@ -125,4 +125,5 @@ class t3lib_tree_NodeCollection extends ArrayObject {
                }
        }
 }
+
 ?>
\ No newline at end of file

diff --git a/t3lib/tree/class.t3lib_tree_representationnode.php b/t3lib/tree/class.t3lib_tree_representationnode.php
index 1c688d3..0b9e5d6 100644 (file)
--- a/t3lib/tree/class.t3lib_tree_representationnode.php
+++ b/t3lib/tree/class.t3lib_tree_representationnode.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Representation Tree Node
@@ -124,7 +124,7 @@ class t3lib_tree_RepresentationNode extends t3lib_tree_Node {
        /**
         * @return string
         */
-       public function getType () {
+       public function getType() {
                return $this->type;
        }
 
@@ -155,12 +155,12 @@ class t3lib_tree_RepresentationNode extends t3lib_tree_Node {
        public function toArray() {
                $arrayRepresentation = parent::toArray();
                $arrayRepresentation = array_merge($arrayRepresentation, array(
-                       'label' => $this->label,
-                       'type' => $this->type,
-                       'class' => $this->class,
-                       'icon' => $this->icon,
-                       'callbackAction' => $this->callbackAction
-               ));
+                                                                                                                                         'label' => $this->label,
+                                                                                                                                         'type' => $this->type,
+                                                                                                                                         'class' => $this->class,
+                                                                                                                                         'icon' => $this->icon,
+                                                                                                                                         'callbackAction' => $this->callbackAction
+                                                                                                                                ));
                return $arrayRepresentation;
        }
 
@@ -180,4 +180,5 @@ class t3lib_tree_RepresentationNode extends t3lib_tree_Node {
                $this->setCallbackAction($data['callbackAction']);
        }
 }
+
 ?>
\ No newline at end of file

diff --git a/t3lib/tree/class.t3lib_tree_sortednodecollection.php b/t3lib/tree/class.t3lib_tree_sortednodecollection.php
index cb4ea2e..9471f7b 100644 (file)
--- a/t3lib/tree/class.t3lib_tree_sortednodecollection.php
+++ b/t3lib/tree/class.t3lib_tree_sortednodecollection.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Sorted Tree Node Collection
@@ -71,9 +71,9 @@ class t3lib_tree_SortedNodeCollection extends t3lib_tree_NodeCollection {
                        if ($this->offsetGet($divider)->equals($node)) {
                                return $divider;
                        } elseif ($this->offsetGet($divider)->compareTo($node) > 0) {
-                               return $this->binarySearch($node, $start , $divider - 1);
+                               return $this->binarySearch($node, $start, $divider - 1);
                        } else {
-                               return $this->binarySearch($node, $divider + 1 , $end);
+                               return $this->binarySearch($node, $divider + 1, $end);
                        }
                } else {
                        if ($this->offsetGet($start)->equals($node)) {
@@ -125,4 +125,5 @@ class t3lib_tree_SortedNodeCollection extends t3lib_tree_NodeCollection {
                }
        }
 }
+
 ?>
\ No newline at end of file

diff --git a/t3lib/tree/extdirect/class.t3lib_tree_extdirect_abstractextjstree.php b/t3lib/tree/extdirect/class.t3lib_tree_extdirect_abstractextjstree.php
index 253307a..4a8e97a 100644 (file)
--- a/t3lib/tree/extdirect/class.t3lib_tree_extdirect_abstractextjstree.php
+++ b/t3lib/tree/extdirect/class.t3lib_tree_extdirect_abstractextjstree.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Abstract ExtJS tree based on ExtDirect

diff --git a/t3lib/tree/renderer/class.t3lib_tree_renderer_abstract.php b/t3lib/tree/renderer/class.t3lib_tree_renderer_abstract.php
index da4f636..3bca935 100644 (file)
--- a/t3lib/tree/renderer/class.t3lib_tree_renderer_abstract.php
+++ b/t3lib/tree/renderer/class.t3lib_tree_renderer_abstract.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Abstract Renderer
@@ -60,4 +60,5 @@ abstract class t3lib_tree_Renderer_Abstract {
         */
        abstract public function renderTree(t3lib_tree_AbstractTree $tree, $recursive = TRUE);
 }
+
 ?>
\ No newline at end of file

diff --git a/t3lib/tree/renderer/class.t3lib_tree_renderer_extjsjson.php b/t3lib/tree/renderer/class.t3lib_tree_renderer_extjsjson.php
index 376af10..d577085 100644 (file)
--- a/t3lib/tree/renderer/class.t3lib_tree_renderer_extjsjson.php
+++ b/t3lib/tree/renderer/class.t3lib_tree_renderer_extjsjson.php
@@ -59,6 +59,7 @@ class t3lib_tree_Renderer_ExtJsJson extends t3lib_tree_Renderer_Abstract {
                        $nodeArray['children'] = $children;
                        $this->recursionLevel--;
                }
+
                return $nodeArray;
        }
 
@@ -68,11 +69,12 @@ class t3lib_tree_Renderer_ExtJsJson extends t3lib_tree_Renderer_Abstract {
        protected function getNodeArray(t3lib_tree_RepresentationNode $node) {
                $nodeArray = array(
                        'iconCls' => $node->getIcon(),
-                       'text' => $node->getLabel() ,
+                       'text' => $node->getLabel(),
                        'leaf' => !$node->hasChildNodes(),
                        'id' => $node->getId(),
                        'uid' => $node->getId()
                );
+
                return $nodeArray;
        }
 
@@ -98,7 +100,7 @@ class t3lib_tree_Renderer_ExtJsJson extends t3lib_tree_Renderer_Abstract {
         * @return mixed
         */
        public function renderNodeCollection(t3lib_tree_NodeCollection $collection, $recursive = TRUE) {
-               foreach($collection as $node) {
+               foreach ($collection as $node) {
                        $treeItems[] = $this->renderNode($node, $recursive);
                }
                return $treeItems;

diff --git a/t3lib/tree/renderer/class.t3lib_tree_renderer_unorderedlist.php b/t3lib/tree/renderer/class.t3lib_tree_renderer_unorderedlist.php
index f297d11..e22dc01 100644 (file)
--- a/t3lib/tree/renderer/class.t3lib_tree_renderer_unorderedlist.php
+++ b/t3lib/tree/renderer/class.t3lib_tree_renderer_unorderedlist.php
@@ -1,29 +1,29 @@
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
-*  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!
-***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2010 TYPO3 Tree Team <http://forge.typo3.org/projects/typo3v4-extjstrees>
+ *  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!
+ ***************************************************************/
 
 /**
  * Renderer for unordered lists
@@ -48,7 +48,7 @@ class t3lib_tree_Renderer_UnorderedList extends t3lib_tree_Renderer_Abstract {
         * @return mixed
         */
        public function renderNode(t3lib_tree_RepresentationNode $node, $recursive = TRUE) {
-               $code = '<li><span class="' . $node->getIcon() .'">&nbsp;</span>' . $node->getLabel();
+               $code = '<li><span class="' . $node->getIcon() . '">&nbsp;</span>' . $node->getLabel();
                if ($recursive && $node->getChildNodes() !== NULL) {
                        $this->recursionLevel++;
                        $code .= $this->renderNodeCollection($node->getChildNodes());
@@ -56,6 +56,7 @@ class t3lib_tree_Renderer_UnorderedList extends t3lib_tree_Renderer_Abstract {
 
                }
                $code .= '</li>';
+
                return $code;
        }
 
@@ -71,6 +72,7 @@ class t3lib_tree_Renderer_UnorderedList extends t3lib_tree_Renderer_Abstract {
                $code = '<ul class="level' . $this->recursionLevel . '" style="margin-left:10px">';
                $code .= $this->renderNode($tree->getRoot(), $recursive);
                $code .= '</ul>';
+
                return $code;
        }
 
@@ -83,11 +85,13 @@ class t3lib_tree_Renderer_UnorderedList extends t3lib_tree_Renderer_Abstract {
         */
        public function renderNodeCollection(t3lib_tree_NodeCollection $collection, $recursive = TRUE) {
                $code = '<ul class="level' . $this->recursionLevel . '" style="margin-left:10px">';
-               foreach($collection as $node) {
+               foreach ($collection as $node) {
                        $code .= $this->renderNode($node, $recursive);
                }
                $code .= '</ul>';
+
                return $code;
        }
 }
+
 ?>
\ No newline at end of file

diff --git a/t3lib/tree/tca/class.t3lib_tree_tca_databasenode.php b/t3lib/tree/tca/class.t3lib_tree_tca_databasenode.php
index f73a7d5..90dc112 100644 (file)
--- a/t3lib/tree/tca/class.t3lib_tree_tca_databasenode.php
+++ b/t3lib/tree/tca/class.t3lib_tree_tca_databasenode.php
@@ -133,7 +133,7 @@ class t3lib_tree_Tca_DatabaseNode extends t3lib_tree_RepresentationNode {
         * @return void
         */
        public function setHasChildren($value) {
-               $this->hasChildren = (boolean)$value;
+               $this->hasChildren = (boolean) $value;
        }
 
        /**

diff --git a/t3lib/tree/tca/class.t3lib_tree_tca_databasetreedataprovider.php b/t3lib/tree/tca/class.t3lib_tree_tca_databasetreedataprovider.php
index af5cb1e..5d38e22 100644 (file)
--- a/t3lib/tree/tca/class.t3lib_tree_tca_databasetreedataprovider.php
+++ b/t3lib/tree/tca/class.t3lib_tree_tca_databasetreedataprovider.php
@@ -251,6 +251,7 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                        }
                        $node->setChildNodes($childNodes);
                }
+
                return $node;
        }
 
@@ -282,10 +283,10 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                $nodeData = NULL;
                if ($node->getId() !== 0) {
                        $nodeData = current($GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
-                               '*',
-                               $this->tableName,
-                               'uid=' . $node->getId()
-                       ));
+                                                                       '*',
+                                                                       $this->tableName,
+                                                                       'uid=' . $node->getId()
+                                                               ));
                }
                if ($nodeData == NULL) {
                        $nodeData = array(
@@ -298,7 +299,8 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                if (count($children)) {
                        $storage = t3lib_div::makeInstance('t3lib_tree_NodeCollection');
                        foreach ($children as $child) {
-                               $node = t3lib_div::makeInstance('t3lib_tree_Node');;
+                               $node = t3lib_div::makeInstance('t3lib_tree_Node');
+                               ;
                                $node->setId($child);
                                if ($level <= $this->levelMaximum) {
                                        $children = $this->getChildrenOf($node, $level + 1);
@@ -309,6 +311,7 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                                $storage->append($node);
                        }
                }
+
                return $storage;
        }
 
@@ -348,12 +351,12 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                $uid = $row['uid'];
 
                $columnConfiguration = $GLOBALS['TCA'][$this->getTableName()]['columns'][$this->getLookupField()]['config'];
-               switch ((string)$columnConfiguration['type']) {
+               switch ((string) $columnConfiguration['type']) {
                        case 'inline':
                        case 'select':
                                if ($columnConfiguration['MM']) {
                                        $dbGroup = t3lib_div::makeInstance('t3lib_loadDBGroup');
-                                               // dummy field for setting "look from other site"
+                                       // dummy field for setting "look from other site"
                                        $columnConfiguration['MM_oppositeField'] = 'children';
 
                                        $dbGroup->start(
@@ -370,8 +373,8 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                                                'uid',
                                                $columnConfiguration['foreign_table'],
                                                " (CONCAT(','," . $columnConfiguration['foreign_field'] . ",',') LIKE '%," . intval($uid) . ",%' "
-                                                       . (intval($uid) == 0 ? (" OR " . $columnConfiguration['foreign_field'] . " = ''") : '' )
-                                                       . ") " . t3lib_BEfunc::deleteClause( $columnConfiguration['foreign_table'])
+                                               . (intval($uid) == 0 ? (" OR " . $columnConfiguration['foreign_field'] . " = ''") : '')
+                                               . ") " . t3lib_BEfunc::deleteClause($columnConfiguration['foreign_table'])
                                        );
                                        foreach ($records as $record) {
                                                $relatedUids[] = $record['uid'];
@@ -381,29 +384,31 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                                                'uid',
                                                $columnConfiguration['foreign_table'],
                                                " (CONCAT(','," . $this->getLookupField() . ",',') LIKE '%," . intval($uid) . ",%' "
-                                                       . (intval($uid) == 0 ? (" OR " . $this->getLookupField() . " = ''") : '' )
-                                                       . ") " . t3lib_BEfunc::deleteClause( $columnConfiguration['foreign_table'])
+                                               . (intval($uid) == 0 ? (" OR " . $this->getLookupField() . " = ''") : '')
+                                               . ") " . t3lib_BEfunc::deleteClause($columnConfiguration['foreign_table'])
                                        );
                                        foreach ($records as $record) {
                                                $relatedUids[] = $record['uid'];
                                        }
                                }
-                               break;
+                       break;
                        case 'group':
                                $records = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
                                        'uid',
                                        $columnConfiguration['foreign_table'],
                                        " (CONCAT(','," . $this->getLookupField() . ",',') LIKE '%," . intval($uid) . ",%' "
-                                               . (intval($uid) == 0 ? (" OR " . $this->getLookupField() . " = ''") : '' )
-                                               . ") " . t3lib_BEfunc::deleteClause( $columnConfiguration['foreign_table'])
+                                       . (intval($uid) == 0 ? (" OR " . $this->getLookupField() . " = ''") : '')
+                                       . ") " . t3lib_BEfunc::deleteClause($columnConfiguration['foreign_table'])
                                );
                                foreach ($records as $record) {
                                        $relatedUids[] = $record['uid'];
                                }
                        break;
                }
+
                return $relatedUids;
        }
+
        /**
         * Gets related children records depending on TCA configuration
         *
@@ -416,7 +421,7 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                $value = $row[$this->getLookupField()];
 
                $columnConfiguration = $GLOBALS['TCA'][$this->getTableName()]['columns'][$this->getLookupField()]['config'];
-               switch ((string)$columnConfiguration['type']) {
+               switch ((string) $columnConfiguration['type']) {
                        case 'inline':
                        case 'select':
                                if ($columnConfiguration['MM']) {
@@ -443,11 +448,12 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                                } else {
                                        $relatedUids = t3lib_div::intExplode(',', $value, TRUE);
                                }
-                               break;
+                       break;
                        case 'group':
                                $relatedUids = t3lib_div::intExplode(',', $value, TRUE);
                        break;
                }
+
                return $relatedUids;
        }
 

diff --git a/t3lib/tree/tca/class.t3lib_tree_tca_dataproviderfactory.php b/t3lib/tree/tca/class.t3lib_tree_tca_dataproviderfactory.php
index 82e5d16..2d87297 100644 (file)
--- a/t3lib/tree/tca/class.t3lib_tree_tca_dataproviderfactory.php
+++ b/t3lib/tree/tca/class.t3lib_tree_tca_dataproviderfactory.php
@@ -82,7 +82,7 @@ class t3lib_tree_Tca_DataProviderFactory {
                                }
 
                                if (isset($treeConfiguration['appearance']['expandAll'])) {
-                                       $dataProvider->setExpandAll((boolean)$treeConfiguration['appearance']['expandAll']);
+                                       $dataProvider->setExpandAll((boolean) $treeConfiguration['appearance']['expandAll']);
                                }
 
                                if (isset($treeConfiguration['appearance']['maxLevels'])) {
@@ -115,7 +115,7 @@ class t3lib_tree_Tca_DataProviderFactory {
                        }
 
                } elseif ($tcaConfiguration['internal_type'] == 'file') {
-                               // Not implemented yet
+                       // Not implemented yet
                        throw new InvalidArgumentException(
                                'TCA Tree configuration is invalid: tree for "internal_type=file" not implemented yet',
                                '1288215891'
@@ -123,11 +123,12 @@ class t3lib_tree_Tca_DataProviderFactory {
                } else {
                        throw new InvalidArgumentException(
                                'TCA Tree configuration is invalid: tree for "internal_type=' .
-                                       $tcaConfiguration['internal_type'] .
-                                       '" not implemented yet',
+                               $tcaConfiguration['internal_type'] .
+                               '" not implemented yet',
                                '1288215892'
                        );
                }
+
                return $dataProvider;
        }
 }

diff --git a/t3lib/tree/tca/class.t3lib_tree_tca_extjsarrayrenderer.php b/t3lib/tree/tca/class.t3lib_tree_tca_extjsarrayrenderer.php
index 5108a61..e03c0c1 100644 (file)
--- a/t3lib/tree/tca/class.t3lib_tree_tca_extjsarrayrenderer.php
+++ b/t3lib/tree/tca/class.t3lib_tree_tca_extjsarrayrenderer.php
@@ -47,14 +47,15 @@ class t3lib_tree_Tca_ExtJsArrayRenderer extends t3lib_tree_Renderer_ExtJsJson {
                $nodeArray = array_merge(
                        $nodeArray,
                        array(
-                               'expanded' => $node->getExpanded(),
-                               'expandable' => $node->hasChildNodes(),
-                               'checked' => $node->getSelected(),
+                                'expanded' => $node->getExpanded(),
+                                'expandable' => $node->hasChildNodes(),
+                                'checked' => $node->getSelected(),
                        )
                );
                if (!$node->getSelectable()) {
                        unset ($nodeArray['checked']);
                }
+
                return $nodeArray;
        }