diff -Nru php-horde-tree-2.0.4/debian/changelog php-horde-tree-2.0.5/debian/changelog --- php-horde-tree-2.0.4/debian/changelog 2016-06-08 18:09:46.000000000 +0000 +++ php-horde-tree-2.0.5/debian/changelog 2017-09-26 20:42:37.000000000 +0000 @@ -1,3 +1,9 @@ +php-horde-tree (2.0.5-1) unstable; urgency=medium + + * New upstream version 2.0.5 + + -- Mathieu Parent Tue, 26 Sep 2017 22:42:37 +0200 + php-horde-tree (2.0.4-5) unstable; urgency=medium * Update Standards-Version to 3.9.8, no change diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/doc/Horde/Tree/COPYING php-horde-tree-2.0.5/Horde_Tree-2.0.4/doc/Horde/Tree/COPYING --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/doc/Horde/Tree/COPYING 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/doc/Horde/Tree/COPYING 1970-01-01 00:00:00.000000000 +0000 @@ -1,458 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/doc/Horde/Tree/UPGRADING php-horde-tree-2.0.5/Horde_Tree-2.0.4/doc/Horde/Tree/UPGRADING --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/doc/Horde/Tree/UPGRADING 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/doc/Horde/Tree/UPGRADING 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -====================== - Upgrading Horde_Tree -====================== - -:Contact: dev@lists.horde.org - -.. contents:: Contents -.. section-numbering:: - - -This lists the API changes between releases of the package. - - -Upgrading to 2.0 -================ - - - The tree renderers have been separated from the tree - representation. Horde_Tree represents a tree structure. The - Horde_Tree_Render_* classes are the actual tree renderers. - - - Horde_Tree::factory() is now Horde_Tree_Renderer::factory() and - has a different signature. - - - The Horde_Tree_Renderer constructor has a different signature than - the old Horde_Tree constructor. - - - The Horde_Tree::EXTRA_* constants are now called - Horde_Tree_Renderer::EXTRA_*. - - - Horde_Tree::addNode() takes a single hash as the parameter now. diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Exception.php php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Exception.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Exception.php 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Exception.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Tree - */ -class Horde_Tree_Exception extends Horde_Exception_Wrapped -{ -} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Base.php php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Base.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Base.php 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Base.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,293 +0,0 @@ - - * @author Jan Schneider - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Tree - */ -abstract class Horde_Tree_Renderer_Base -{ - /** - * The tree object. - * - * @var Horde_Tree - */ - protected $_tree; - - /** - * Hash with header information. - * - * @var array - */ - protected $_header = array(); - - /** - * An array containing all the tree nodes. - * - * @var array - */ - protected $_nodes = array(); - - /** - * An array containing extra columns for the tree nodes. - * - * @var array - */ - protected $_extra = array(); - - /** - * Keep count of how many extra columns there are on the left side - * of the node. - * - * @var integer - */ - protected $_colsLeft = 0; - - /** - * Keep count of how many extra columns there are on the right side - * of the node. - * - * @var integer - */ - protected $_colsRight = 0; - - /** - * Option values. - * - * @var array - */ - protected $_options = array( - 'lines' => true - ); - - /** - * Stores the sorting criteria temporarily. - * - * @var string - */ - protected $_sortCriteria; - - /** - * Should the tree be rendered statically? - * - * @var boolean - */ - protected $_static = false; - - /** - * Constructor. - * - * @param Horde_Tree $tree A tree object. - * @param array $params Additional parameters. - */ - public function __construct(Horde_Tree $tree, array $params = array()) - { - $this->_tree = $tree; - $this->setOption($params); - } - - /** - * Provide a simpler renderer to fallback to. - * - * @return string The next best renderer. - * @throws Horde_Tree_Exception - */ - public function fallback() - { - throw new Horde_Tree_Exception('No fallback renderer found.'); - } - - /** - * Returns the tree. - * - * @param boolean $static If true the tree nodes can't be expanded and - * collapsed and the tree gets rendered expanded. - * This option has no effect in this driver. - * - * @return string The HTML code of the rendered tree. - */ - public function getTree($static = false) - { - $this->_nodes = $this->_tree->getNodes(); - - $tree = ''; - foreach ($this->_tree->getRootNodes() as $node_id) { - $tree .= $this->_buildTree($node_id); - } - - return $tree; - } - - /** - * Recursive function to walk through the tree array and build the output. - * - * Should be overwritten by a sub-class if it doesn't implement - * its own getTree() method. - * - * @param string $node_id The Node ID. - * - * @return string The tree rendering. - */ - protected function _buildTree($id) - { - return ''; - } - - /** - * Renders the tree. - * - * @param boolean $static If true the tree nodes can't be expanded and - * collapsed and the tree gets rendered expanded. - */ - public function renderTree($static = false) - { - echo $this->getTree($static); - } - - /** - * Sets an option. - * - * @param mixed $option The option name -or- an array of option - * name/value pairs. See constructor for available - * options. - * @param mixed $value The option's value. - */ - public function setOption($options, $value = null) - { - if (!is_array($options)) { - $options = array($options => $value); - } - - foreach ($options as $option => $value) { - $this->_options[$option] = $value; - } - } - - /** - * Gets an option's value. - * - * @param string $option The name of the option to fetch. - * - * @return mixed The option's value. - */ - public function getOption($option) - { - return isset($this->_options[$option]) - ? $this->_options[$option] - : null; - } - - /** - * Adds a node to the node tree array. - * - * @param array $node A hash with node properties: - * - id: (string) The unique node id. - * - parent: (string) The parent's unique node id. - * - label: (string) The text label for the node. - * - expanded: (boolean) Is this level expanded or not. - * - params: (array) Any other parameters to set - * (see addNodeParams() of the renderers - * for full details). - */ - public function addNode($node) - { - $this->_tree->addNode($node); - - /* If any extra columns included here add them now. */ - if (!empty($node['right'])) { - $this->addNodeExtra($node['id'], - Horde_Tree_Renderer::EXTRA_RIGHT, - $node['right']); - } - if (!empty($node['left'])) { - $this->addNodeExtra($node['id'], - Horde_Tree_Renderer::EXTRA_LEFT, - $node['left']); - } - } - - /** - * Adds additional parameters to a node. - * - * @param string $id The unique node id. - * @param array $params Parameters to set (key/value pairs). - */ - public function addNodeParams($id, $params = array()) - { - $this->_tree->addNodeParams($id, $params); - } - - /** - * Adds extra columns to be displayed to the side of the node. - * - * @param mixed $id The unique node id. - * @param integer $side Which side to place the extra columns on. - * @param array $extra Extra columns to display. - */ - public function addNodeExtra($id, $side, $extra) - { - $id = $this->_tree->nodeId($id); - - if (!is_array($extra)) { - $extra = array($extra); - } - - $col_count = count($extra); - - switch ($side) { - case Horde_Tree_Renderer::EXTRA_LEFT: - $this->_extra[$id][Horde_Tree_Renderer::EXTRA_LEFT] = $extra; - if ($col_count > $this->_colsLeft) { - $this->_colsLeft = $col_count; - } - break; - - case Horde_Tree_Renderer::EXTRA_RIGHT: - $this->_extra[$id][Horde_Tree_Renderer::EXTRA_RIGHT] = $extra; - if ($col_count > $this->_colsRight) { - $this->_colsRight = $col_count; - } - break; - } - } - - /** - * Adds column headers to the tree table. - * - * @param array $header An array containing hashes with header - * information. - */ - public function setHeader($header) - { - $this->_header = $header; - } - - /** - * Sorts the tree by the specified node property. - * - * @param string $criteria The node property to sort by. - */ - public function sort($criteria) - { - return $this->_tree->sort($criteria); - } - - /** - * Check the current environment to see if we can render the tree. - * - * @return boolean Whether or not this backend will function. - */ - public function isSupported() - { - return true; - } -} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Html.php php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Html.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Html.php 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Html.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,512 +0,0 @@ - - * @author Jan Schneider - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Tree - */ -class Horde_Tree_Renderer_Html extends Horde_Tree_Renderer_Base -{ - /** - * Node position list. - * - * @var array - */ - protected $_node_pos = array(); - - /** - * Drop line cache. - * - * @var array - */ - protected $_dropline = array(); - - /** - * Current value of the alt tag count. - * - * @var integer - */ - protected $_altCount = 0; - - /** - * Images array. - * - * @var array - */ - protected $_images = array( - 'line' => null, - 'blank' => null, - 'join' => null, - 'join_bottom' => null, - 'join_top' => null, - 'plus' => null, - 'plus_bottom' => null, - 'plus_only' => null, - 'minus' => null, - 'minus_bottom' => null, - 'minus_only' => null, - 'null_only' => null, - 'folder' => null, - 'folderopen' => null, - 'leaf' => null - ); - - /** - * Constructor. - * - * @param string $name The name of this tree instance. - * @param array $params Additional parameters: - * 
-     * alternate - (boolean) Alternate shading in the table?
-     *             DEFAULT: false
-     * class - (string) The class to use for the table.
-     *         DEFAULT: ''
-     * hideHeaders - (boolean) Don't render any HTML for the header row, just
-     *               use the widths.
-     *               DEFAULT: false
-     * lines - (boolean) Show tree lines?
-     *         DEFAULT: true
-     * lines_base - (boolean) Show tree lines for the base level? Requires
-     *              'lines' to be true also.
-     *              DEFAULT: false
-     * multiline - (boolean) Do the node labels contain linebreaks?
-     *             DEFAULT: false
-     *
- */ - public function __construct($name, array $params = array()) - { - $params = array_merge(array( - 'lines' => true - ), $params); - - parent::__construct($name, $params); - } - - /** - * Returns the tree. - * - * @param boolean $static If true the tree nodes can't be expanded and - * collapsed and the tree gets rendered expanded. - * - * @return string The HTML code of the rendered tree. - */ - public function getTree($static = false) - { - $this->_static = (bool)$static; - return $this->_buildHeader() . parent::getTree($static); - } - - /** - * Adds column headers to the tree table. - * - * @param array $header An array containing hashes with header - * information. The following keys are allowed: - * 
-     * class - The CSS class of the header cell
-     * html - The HTML content of the header cell
-     *
- */ - public function setHeader($header) - { - parent::setHeader($header); - } - - /** - * Returns the HTML code for a header row, if necessary. - * - * @return string The HTML code of the header row or an empty string. - */ - protected function _buildHeader() - { - if (!count($this->_header) || - $this->getOption('hideHeaders')) { - return ''; - } - - $className = 'horde-tree-row-header'; - - /* If using alternating row shading, work out correct - * shade. */ - if ($this->getOption('alternate')) { - $className .= ' item' . $this->_altCount; - $this->_altCount = 1 - $this->_altCount; - } - - $html = '
'; - - foreach ($this->_header as $header) { - $html .= ''; - } - - return $html . '
'; - } - - /** - * Recursive function to walk through the tree array and build the output. - * - * @param string $node_id The Node ID. - * - * @return string The tree rendering. - */ - protected function _buildTree($node_id) - { - $node = $this->_nodes[$node_id]; - $output = $this->_buildLine($node_id); - - if (isset($node['children']) && $node['expanded']) { - foreach ($node['children'] as $key => $val) { - $this->_node_pos[$val] = array( - 'count' => count($node['children']), - 'pos' => $key + 1 - ); - $output .= $this->_buildTree($val); - } - } - - return $output; - } - - /** - * Function to create a single line of the tree. - * - * @param string $node_id The Node ID. - * - * @return string The rendered line. - */ - protected function _buildLine($node_id) - { - $node = $this->_nodes[$node_id]; - - $className = 'horde-tree-row'; - if (!empty($node['class'])) { - $className .= ' ' . $node['class']; - } - - /* If using alternating row shading, work out correct - * shade. */ - if ($this->getOption('alternate')) { - $className .= ' item' . $this->_altCount; - $this->_altCount = 1 - $this->_altCount; - } - - $line = '
'; - - /* If we have headers, track which logical "column" we're in - * for any given cell of content. */ - $column = 0; - - if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT])) { - $extra = $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT]; - $cMax = count($extra); - while ($column < $cMax) { - $line .= $this->_addColumn($column) . $extra[$column] . ''; - ++$column; - } - } - - $line .= $this->_addColumn($column++); - - if ($this->getOption('multiline')) { - $line .= '
'; - } - - for ($i = intval($this->_static); $i < $node['indent']; ++$i) { - $line .= $this->_generateImage(($this->_dropline[$i] && $this->getOption('lines')) ? $this->_images['line'] : $this->_images['blank']); - } - $line .= $this->_setNodeToggle($node_id) . $this->_setNodeIcon($node_id); - if ($this->getOption('multiline')) { - $line .= ''; - } - $line .= $this->_setLabel($node_id); - - if ($this->getOption('multiline')) { - $line .= '
'; - } - - $line .= ''; - - if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT])) { - $extra = $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT]; - $cMax = count($extra); - for ($c = 0, $cMax = count($extra); $c < $cMax; ++$c) { - $line .= $this->_addColumn($column++) . $extra[$c] . ''; - } - } - - return $line . "
\n"; - } - - /** - */ - protected function _addColumn($column) - { - $line = '_header[$column]['class'])) { - $line .= ' class="' . $this->_header[$column]['class'] . '"'; - } - return $line . '>'; - } - - /** - * Sets the label on the tree line. - * - * @param string $node_id The Node ID. - * - * @return string The label for the tree line. - */ - protected function _setLabel($node_id) - { - $node = $this->_nodes[$node_id]; - - $output = ''; - - $label = $node['label']; - if (!empty($node['url'])) { - $target = ''; - if (!empty($node['target'])) { - $target = ' target="' . $node['target'] . '"'; - } elseif ($target = $this->getOption('target')) { - $target = ' target="' . $target . '"'; - } - $output .= '' . $label . ''; - } else { - $output .= $label; - } - - return $output . ''; - } - - /** - * Sets the node toggle on the tree line. - * - * @param string $node_id The Node ID. - * - * @return string The node toggle for the tree line. - */ - protected function _setNodeToggle($node_id) - { - $link_start = ''; - $node = $this->_nodes[$node_id]; - - /* Top level node. */ - if ($node['indent'] == 0) { - $this->_dropline[0] = false; - - if ($this->_static) { - return ''; - } - - /* KEY: - * 0: Only node - * 1: Top node - * 2: Middle node - * 3: Bottom node */ - $node_type = 0; - if ($this->getOption('lines_base') && - (count($this->_root_nodes) > 1)) { - switch (array_search($node_id, $this->_root_nodes)) { - case 0: - $node_type = 1; - $this->_dropline[0] = true; - break; - - case (count($this->_root_nodes) - 1): - $node_type = 3; - break; - - default: - $node_type = 2; - $this->_dropline[0] = true; - break; - } - } - - if (isset($node['children'])) { - if (!$this->getOption('lines')) { - $img = $this->_images['blank']; - } elseif ($node['expanded']) { - $img = $node_type - ? (($node_type == 2) ? $this->_images['minus'] : $this->_images['minus_bottom']) - : $this->_images['minus_only']; - } else { - $img = $node_type - ? (($node_type == 2) ? $this->_images['plus'] : $this->_images['plus_bottom']) - : $this->_images['plus_only']; - } - - $link_start = $this->_generateUrlTag($node_id); - } else { - if ($this->getOption('lines')) { - switch ($node_type) { - case 0: - $img = $this->_images['null_only']; - break; - - case 1: - $img = $this->_images['join_top']; - break; - - case 2: - $img = $this->_images['join']; - break; - - case 3: - $img = $this->_images['join_bottom']; - break; - } - } else { - $img = $this->_images['blank']; - } - } - } elseif (isset($node['children'])) { - /* Node with children. */ - if ($this->_node_pos[$node_id]['pos'] < $this->_node_pos[$node_id]['count']) { - /* Not last node. */ - if (!$this->getOption('lines')) { - $img = $this->_images['blank']; - } elseif ($this->_static) { - $img = $this->_images['join']; - } elseif ($node['expanded']) { - $img = $this->_images['minus']; - } else { - $img = $this->_images['plus']; - } - $this->_dropline[$node['indent']] = true; - } else { - /* Last node. */ - if (!$this->getOption('lines')) { - $img = $this->_images['blank']; - } elseif ($this->_static) { - $img = $this->_images['join_bottom']; - } elseif ($node['expanded']) { - $img = $this->_images['minus_bottom']; - } else { - $img = $this->_images['plus_bottom']; - } - $this->_dropline[$node['indent']] = false; - } - - if (!$this->_static) { - $link_start = $this->_generateUrlTag($node_id); - } - } else { - /* Node without children. */ - if ($this->_node_pos[$node_id]['pos'] < $this->_node_pos[$node_id]['count']) { - /* Not last node. */ - $img = $this->getOption('lines') - ? $this->_images['join'] - : $this->_images['blank']; - - $this->_dropline[$node['indent']] = true; - } else { - /* Last node. */ - $img = $this->getOption('lines') - ? $this->_images['join_bottom'] - : $this->_images['blank']; - - $this->_dropline[$node['indent']] = false; - } - } - - return $link_start . - $this->_generateImage($img, 'horde-tree-toggle') . - ($link_start ? '' : ''); - } - - /** - * Generate a link URL. - * - * @param string $node_id The node ID. - * - * @return string The link tag. - */ - protected function _generateUrlTag($node_id) - { - $url = new Horde_Url($_SERVER['PHP_SELF']); - return $url->add(Horde_Tree::TOGGLE . $this->_tree->instance, $node_id)->link(); - } - - /** - * Generate the icon image. - * - * @param string $src The source image. - * @param string $class Additional class to add to image. - * @param string $alt Alt text to add to the image. - * - * @return string A HTML tag to display the image. - */ - protected function _generateImage($src, $class = '', $alt = null) - { - $img = ''; - } - - /** - * Sets the icon for the node. - * - * @param string $node_id The Node ID. - * - * @return string The node icon for the tree line. - */ - protected function _setNodeIcon($node_id) - { - $node = $this->_nodes[$node_id]; - - if (isset($node['icon'])) { - if (empty($node['icon'])) { - return ''; - } - - /* Node has a user defined icon. */ - $img = (isset($node['iconopen']) && $node['expanded']) - ? $node['iconopen'] - : $node['icon']; - } elseif (isset($node['children'])) { - /* Standard icon set: node with children. */ - $img = $node['expanded'] - ? $this->_images['folderopen'] - : $this->_images['folder']; - } else { - /* Standard icon set: leaf node (no children). */ - $img = $this->_images['leaf']; - } - - return $this->_generateImage($img, 'horde-tree-icon', isset($node['iconalt']) ? htmlspecialchars($node['iconalt']) : null); - } - -} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Jquerymobile.php php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Jquerymobile.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Jquerymobile.php 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Jquerymobile.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ - - * @author Jan Schneider - * @category Horde - * @deprecated API of _buildTree() fails strict PHP code check - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Tree - */ -class Horde_Tree_Renderer_Jquerymobile extends Horde_Tree_Renderer_Base -{ - /** - * Returns the tree. - * - * @return string The HTML code of the rendered tree. - */ - public function getTree($static = false) - { - $this->_nodes = $this->_tree->getNodes(); - - $tree = ''; - foreach (array(true, false) as $special) { - foreach ($this->_tree->getRootNodes() as $node_id) { - $tree .= $this->_buildTree($node_id, $special); - } - } - - return $tree; - } - - /** - * Recursive function to walk through the tree array and build the output. - * - * @param string $node_id The Node ID. - * - * @return string The tree rendering. - */ - protected function _buildTree($node_id, $special) - { - $node = $this->_nodes[$node_id]; - $output = ''; - - if ($node['special'] == $special) { - $output = '_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT])) { - $output .= implode(' ', $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT]); - } - if (!empty($node['url'])) { - $output .= ' $value) { - $output .= ' ' . $attribute . '="' . htmlspecialchars($value) . '"'; - } - } - $output .= '>'; - } - $output .= $this->_getIcon($node_id) . $node['label']; - if (!empty($node['url'])) { - $output .= ''; - } - if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT])) { - $output .= '' . implode(' ', $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT]) . ''; - } - $output .= ''; - } - - if (isset($node['children'])) { - foreach ($node['children'] as $val) { - $output .= $this->_buildTree($val, $special); - } - } - - return $output; - } - - /** - * Sets the icon for the node. - * - * @param string $node_id The Node ID. - * - * @return string The node icon for the tree line. - */ - protected function _getIcon($node_id) - { - $node = $this->_nodes[$node_id]; - if (empty($node['icon'])) { - return ''; - } - return ''; - } - -} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Select.php php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Select.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Select.php 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Select.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ - tag rendering. - * - * Additional node parameters: - * - selected: (boolean) Whether the node is selected. - * - * Copyright 2005-2015 Horde LLC (http://www.horde.org/) - * - * See the enclosed file COPYING for license information (LGPL). If you - * did not receive this file, see http://www.horde.org/licenses/lgpl21. - * - * @author Ben Chavet - * @author Jan Schneider - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Tree - */ -class Horde_Tree_Renderer_Select extends Horde_Tree_Renderer_Base -{ - /** - * Should the tree be rendered statically? - * - * @var boolean - */ - protected $_static = true; - - /** - * Recursive function to walk through the tree array and build the output. - * - * @param string $node_id The Node ID. - * - * @return string The tree rendering. - */ - protected function _buildTree($node_id) - { - $node = $this->_nodes[$node_id]; - - $output = ''; - - if (isset($node['children']) && $node['expanded']) { - foreach ($node['children'] as $val) { - $output .= $this->_buildTree($val); - } - } - - return $output; - } - -} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Simplehtml.php php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Simplehtml.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Simplehtml.php 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer/Simplehtml.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ - - * @author Jan Schneider - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Tree - */ -class Horde_Tree_Renderer_Simplehtml extends Horde_Tree_Renderer_Base -{ - /** - * Should the tree be rendered statically? - * - * @var boolean - */ - protected $_static = true; - - /** - * Recursive function to walk through the tree array and build the output. - * - * @param string $node_id The Node ID. - * - * @return string The tree rendering. - */ - protected function _buildTree($node_id) - { - $node = $this->_nodes[$node_id]; - - $output = ''; - if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT])) { - $output .= implode(' ', $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT]); - } - $output .= str_repeat(' ', $node['indent'] * 2); - - $output .= empty($node['url']) - ? $node['label'] - : '' . $node['label'] . ''; - if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT])) { - $output .= implode(' ', $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT]); - } - - if (isset($node['children'])) { - $output .= ' [' . - $this->_generateUrlTag($node_id) . - ($node['expanded'] ? '-' : '+') . - ']'; - } - - $output .= ''; - - if (isset($node['children']) && $node['expanded']) { - foreach ($node['children'] as $val) { - $output .= $this->_buildTree($val); - } - } - - return $output; - } - - /** - * Generate a link URL. - * - * @param string $node_id The node ID. - * - * @return string The link tag. - */ - protected function _generateUrlTag($node_id) - { - $url = new Horde_Url($_SERVER['PHP_SELF']); - return $url->add(Horde_Tree::TOGGLE . $this->_tree->instance, $node_id)->link(); - } - -} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer.php php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer.php 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree/Renderer.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ - - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Tree - */ - -/** - * The Horde_Tree_Renderer class contains constants and a factory for - * the tree renderers. - * - * @author Jan Schneider - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Tree - */ -class Horde_Tree_Renderer -{ - /* Display extra columns. */ - const EXTRA_LEFT = 0; - const EXTRA_RIGHT = 1; - - /** - * Attempts to return a concrete instance. - * - * @param string $renderer Either the tree renderer driver or a full - * class name to use. - * @param array $params Any additional parameters the constructor - * needs. Either 'name' or 'tree' must be - * specified. Common parameters are: - * - name: (string) The name of this tree instance. - * - tree: (Horde_Tree) An existing tree object. - * - session: (array) Callbacks used to store session data. Must define - * two keys: 'get' and 'set'. Function definitions: - * (string) = get([string - Instance], [string - ID]); - * set([string - Instance], [string - ID], [boolean - value]); - * DEFAULT: No session storage - * - * @return Horde_Tree The newly created concrete instance. - * @throws Horde_Tree_Exception - */ - public static function factory($renderer, $params = array()) - { - if (!isset($params['tree']) && !isset($params['name'])) { - throw new BadFunctionCallException('Either "name" or "tree" parameters must be specified.'); - } - - if (isset($params['tree'])) { - $tree = $params['tree']; - unset($params['tree']); - } else { - $tree = new Horde_Tree( - $params['name'], - isset($params['session']) ? $params['session'] : array()); - unset($params['name']); - } - unset($params['session']); - - $ob = null; - - /* Base drivers (in Tree/ directory). */ - $class = __CLASS__ . '_' . Horde_String::ucfirst($renderer); - if (class_exists($class)) { - $ob = new $class($tree, $params); - } else { - /* Explicit class name, */ - $class = $renderer; - if (class_exists($class)) { - $ob = new $class($tree, $params); - } - } - - if ($ob) { - if ($ob->isSupported()) { - return $ob; - } - - $params['tree'] = $tree; - return self::factory($ob->fallback(), $params); - } - - throw new Horde_Tree_Exception('Horde_Tree renderer not found: ' . $renderer); - } -} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree.php php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.4/lib/Horde/Tree.php 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.4/lib/Horde/Tree.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,270 +0,0 @@ - - * @author Michael Slusarz - * @author Jan Schneider - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Tree - */ -class Horde_Tree implements Countable -{ - /** - * The preceding text, before the Horde_Tree instance name, used for - * collapse/expand submissions. - */ - const TOGGLE = 'ht_toggle_'; - - /** - * The name of this instance. - * - * @var string - */ - public $instance; - - /** - * Callbacks used to store session data. - * - * @var array - */ - protected $_session = array(); - - /** - * An array containing all the tree nodes. - * - * @var array - */ - protected $_nodes = array(); - - /** - * The top-level nodes in the tree. - * - * @var array - */ - protected $_root_nodes = array(); - - /** - * Constructor. - * - * @param string $name The name of this tree instance. - * @param array $session Callbacks used to store session data. Must define - * two keys: 'get' and 'set'. Function definitions: - * (string) = get([string - Instance], [string - ID]); - * set([string - Instance], [string - ID], [boolean - value]); - * DEFAULT: No session storage - */ - public function __construct($name, $session = array()) - { - $this->instance = $name; - $this->_session = $session; - } - - /** - * Adds a node to the node tree array. - * - * @param array $node A hash with node properties: - * - id: (string) The unique node id. - * - parent: (string) The parent's unique node id. - * - label: (string) The text label for the node. - * - expanded: (boolean) Is this level expanded or not. - * - params: (array) Any other parameters to set - * (see addNodeParams() of the renderers - * for full details). - */ - public function addNode($node) - { - $node = array_merge( - array('parent' => null, - 'expanded' => true, - 'params' => array()), - $node); - - $nodeid = $this->nodeId($node['id']); - $expanded = $node['expanded']; - - if ($this->_session) { - $toggle_id = Horde_Util::getFormData(Horde_Tree::TOGGLE . $this->instance); - - if ($nodeid == $toggle_id) { - /* We have a URL toggle request for this node. */ - $expanded = (call_user_func($this->_session['get'], $this->instance, $node['id']) !== null) - /* Use session state if it is set. */ - ? !call_user_func($this->_session['get'], $this->instance, $nodeid) - /* Otherwise use what was passed through the function. */ - : !$node['expanded']; - call_user_func($this->_session['set'], $this->instance, $nodeid, $expanded); - } elseif (($exp_get = call_user_func($this->_session['get'], $this->instance, $nodeid)) !== null) { - /* If we have a saved session state use it. */ - $expanded = $exp_get; - } - } - - $this->_nodes[$nodeid]['label'] = $node['label']; - $this->_nodes[$nodeid]['expanded'] = $expanded; - - /* If any params included here add them now. */ - if (!empty($node['params'])) { - $this->addNodeParams($node['id'], $node['params']); - } - - if (is_null($node['parent'])) { - if (!in_array($nodeid, $this->_root_nodes)) { - $this->_root_nodes[] = $nodeid; - } - } else { - $parent = $this->nodeId($node['parent']); - if (empty($this->_nodes[$parent]['children'])) { - $this->_nodes[$parent]['children'] = array(); - } - if (!in_array($nodeid, $this->_nodes[$parent]['children'])) { - $this->_nodes[$parent]['children'][] = $nodeid; - } - } - } - - /** - * Adds additional parameters to a node. - * - * @param string $id The unique node id. - * @param array $params Parameters to set (key/value pairs). - */ - public function addNodeParams($id, $params = array()) - { - $id = $this->nodeId($id); - - if (!is_array($params)) { - $params = array($params); - } - - foreach ($params as $p_id => $p_val) { - // Set only non-null params. - if (!is_null($p_val)) { - // TODO: In H6 don't convert to string here. - $this->_nodes[$id][$p_id] = is_object($p_val) - ? strval($p_val) - : $p_val; - } - } - } - - /** - * Returns the root node IDs. - * - * @return array The root nodes. - */ - public function getRootNodes() - { - return $this->_root_nodes; - } - - /** - * Returns the nodes of the tree. - * - * @return array The nodes with IDs as keys and node hashes as values. - */ - public function getNodes() - { - $this->_buildIndents($this->_root_nodes); - return $this->_nodes; - } - - /** - * Sorts the tree by the specified node property. - * - * @param string $criteria The node property to sort by. - * @param integer $id Used internally for recursion. - */ - public function sort($criteria, $id = -1) - { - if (!isset($this->_nodes[$id]['children'])) { - return; - } - - if ($criteria == 'key') { - ksort($this->_nodes[$id]['children']); - } else { - $this->_sortCriteria = $criteria; - usort($this->_nodes[$id]['children'], array($this, 'sortHelper')); - } - - foreach ($this->_nodes[$id]['children'] as $child) { - $this->sort($criteria, $child); - } - } - - /** - * Helper method for sort() to compare two tree elements. - */ - public function sortHelper($a, $b) - { - if (!isset($this->_nodes[$a][$this->_sortCriteria])) { - return 1; - } - - if (!isset($this->_nodes[$b][$this->_sortCriteria])) { - return -1; - } - - return strcoll($this->_nodes[$a][$this->_sortCriteria], - $this->_nodes[$b][$this->_sortCriteria]); - } - - /** - * Returns whether the specified node is currently expanded. - * - * @param mixed $id The unique node id. - * - * @return boolean True if the specified node is expanded. - */ - public function isExpanded($id) - { - $id = $this->nodeId($id); - - return isset($this->_nodes[$id]) - ? $this->_nodes[$id]['expanded'] - : false; - } - - /** - * Set the indent level for each node in the tree. - * - * @param array $nodes TODO - * @param integer $indent TODO - */ - protected function _buildIndents($nodes, $indent = 0) - { - foreach ($nodes as $id) { - $this->_nodes[$id]['indent'] = $indent; - if (!empty($this->_nodes[$id]['children'])) { - $this->_buildIndents($this->_nodes[$id]['children'], $indent + 1); - } - } - } - - /** - * Returns the escaped node ID. - * - * @param string $id Node ID. - * - * @return string Escaped node ID. - */ - public function nodeId($id) - { - return rawurlencode($id); - } - - /* Countable methods. */ - - public function count() - { - return count($this->_nodes); - } -} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/doc/Horde/Tree/COPYING php-horde-tree-2.0.5/Horde_Tree-2.0.5/doc/Horde/Tree/COPYING --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/doc/Horde/Tree/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/doc/Horde/Tree/COPYING 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,458 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/doc/Horde/Tree/UPGRADING php-horde-tree-2.0.5/Horde_Tree-2.0.5/doc/Horde/Tree/UPGRADING --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/doc/Horde/Tree/UPGRADING 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/doc/Horde/Tree/UPGRADING 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,30 @@ +====================== + Upgrading Horde_Tree +====================== + +:Contact: dev@lists.horde.org + +.. contents:: Contents +.. section-numbering:: + + +This lists the API changes between releases of the package. + + +Upgrading to 2.0 +================ + + - The tree renderers have been separated from the tree + representation. Horde_Tree represents a tree structure. The + Horde_Tree_Render_* classes are the actual tree renderers. + + - Horde_Tree::factory() is now Horde_Tree_Renderer::factory() and + has a different signature. + + - The Horde_Tree_Renderer constructor has a different signature than + the old Horde_Tree constructor. + + - The Horde_Tree::EXTRA_* constants are now called + Horde_Tree_Renderer::EXTRA_*. + + - Horde_Tree::addNode() takes a single hash as the parameter now. diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Exception.php php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Exception.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Exception.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Exception.php 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,17 @@ + + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Tree + */ +class Horde_Tree_Exception extends Horde_Exception_Wrapped +{ +} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Base.php php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Base.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Base.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Base.php 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,293 @@ + + * @author Jan Schneider + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Tree + */ +abstract class Horde_Tree_Renderer_Base +{ + /** + * The tree object. + * + * @var Horde_Tree + */ + protected $_tree; + + /** + * Hash with header information. + * + * @var array + */ + protected $_header = array(); + + /** + * An array containing all the tree nodes. + * + * @var array + */ + protected $_nodes = array(); + + /** + * An array containing extra columns for the tree nodes. + * + * @var array + */ + protected $_extra = array(); + + /** + * Keep count of how many extra columns there are on the left side + * of the node. + * + * @var integer + */ + protected $_colsLeft = 0; + + /** + * Keep count of how many extra columns there are on the right side + * of the node. + * + * @var integer + */ + protected $_colsRight = 0; + + /** + * Option values. + * + * @var array + */ + protected $_options = array( + 'lines' => true + ); + + /** + * Stores the sorting criteria temporarily. + * + * @var string + */ + protected $_sortCriteria; + + /** + * Should the tree be rendered statically? + * + * @var boolean + */ + protected $_static = false; + + /** + * Constructor. + * + * @param Horde_Tree $tree A tree object. + * @param array $params Additional parameters. + */ + public function __construct(Horde_Tree $tree, array $params = array()) + { + $this->_tree = $tree; + $this->setOption($params); + } + + /** + * Provide a simpler renderer to fallback to. + * + * @return string The next best renderer. + * @throws Horde_Tree_Exception + */ + public function fallback() + { + throw new Horde_Tree_Exception('No fallback renderer found.'); + } + + /** + * Returns the tree. + * + * @param boolean $static If true the tree nodes can't be expanded and + * collapsed and the tree gets rendered expanded. + * This option has no effect in this driver. + * + * @return string The HTML code of the rendered tree. + */ + public function getTree($static = false) + { + $this->_nodes = $this->_tree->getNodes(); + + $tree = ''; + foreach ($this->_tree->getRootNodes() as $node_id) { + $tree .= $this->_buildTree($node_id); + } + + return $tree; + } + + /** + * Recursive function to walk through the tree array and build the output. + * + * Should be overwritten by a sub-class if it doesn't implement + * its own getTree() method. + * + * @param string $node_id The Node ID. + * + * @return string The tree rendering. + */ + protected function _buildTree($id) + { + return ''; + } + + /** + * Renders the tree. + * + * @param boolean $static If true the tree nodes can't be expanded and + * collapsed and the tree gets rendered expanded. + */ + public function renderTree($static = false) + { + echo $this->getTree($static); + } + + /** + * Sets an option. + * + * @param mixed $option The option name -or- an array of option + * name/value pairs. See constructor for available + * options. + * @param mixed $value The option's value. + */ + public function setOption($options, $value = null) + { + if (!is_array($options)) { + $options = array($options => $value); + } + + foreach ($options as $option => $value) { + $this->_options[$option] = $value; + } + } + + /** + * Gets an option's value. + * + * @param string $option The name of the option to fetch. + * + * @return mixed The option's value. + */ + public function getOption($option) + { + return isset($this->_options[$option]) + ? $this->_options[$option] + : null; + } + + /** + * Adds a node to the node tree array. + * + * @param array $node A hash with node properties: + * - id: (string) The unique node id. + * - parent: (string) The parent's unique node id. + * - label: (string) The text label for the node. + * - expanded: (boolean) Is this level expanded or not. + * - params: (array) Any other parameters to set + * (see addNodeParams() of the renderers + * for full details). + */ + public function addNode($node) + { + $this->_tree->addNode($node); + + /* If any extra columns included here add them now. */ + if (!empty($node['right'])) { + $this->addNodeExtra($node['id'], + Horde_Tree_Renderer::EXTRA_RIGHT, + $node['right']); + } + if (!empty($node['left'])) { + $this->addNodeExtra($node['id'], + Horde_Tree_Renderer::EXTRA_LEFT, + $node['left']); + } + } + + /** + * Adds additional parameters to a node. + * + * @param string $id The unique node id. + * @param array $params Parameters to set (key/value pairs). + */ + public function addNodeParams($id, $params = array()) + { + $this->_tree->addNodeParams($id, $params); + } + + /** + * Adds extra columns to be displayed to the side of the node. + * + * @param mixed $id The unique node id. + * @param integer $side Which side to place the extra columns on. + * @param array $extra Extra columns to display. + */ + public function addNodeExtra($id, $side, $extra) + { + $id = $this->_tree->nodeId($id); + + if (!is_array($extra)) { + $extra = array($extra); + } + + $col_count = count($extra); + + switch ($side) { + case Horde_Tree_Renderer::EXTRA_LEFT: + $this->_extra[$id][Horde_Tree_Renderer::EXTRA_LEFT] = $extra; + if ($col_count > $this->_colsLeft) { + $this->_colsLeft = $col_count; + } + break; + + case Horde_Tree_Renderer::EXTRA_RIGHT: + $this->_extra[$id][Horde_Tree_Renderer::EXTRA_RIGHT] = $extra; + if ($col_count > $this->_colsRight) { + $this->_colsRight = $col_count; + } + break; + } + } + + /** + * Adds column headers to the tree table. + * + * @param array $header An array containing hashes with header + * information. + */ + public function setHeader($header) + { + $this->_header = $header; + } + + /** + * Sorts the tree by the specified node property. + * + * @param string $criteria The node property to sort by. + */ + public function sort($criteria) + { + return $this->_tree->sort($criteria); + } + + /** + * Check the current environment to see if we can render the tree. + * + * @return boolean Whether or not this backend will function. + */ + public function isSupported() + { + return true; + } +} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Html.php php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Html.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Html.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Html.php 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,512 @@ + + * @author Jan Schneider + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Tree + */ +class Horde_Tree_Renderer_Html extends Horde_Tree_Renderer_Base +{ + /** + * Node position list. + * + * @var array + */ + protected $_node_pos = array(); + + /** + * Drop line cache. + * + * @var array + */ + protected $_dropline = array(); + + /** + * Current value of the alt tag count. + * + * @var integer + */ + protected $_altCount = 0; + + /** + * Images array. + * + * @var array + */ + protected $_images = array( + 'line' => null, + 'blank' => null, + 'join' => null, + 'join_bottom' => null, + 'join_top' => null, + 'plus' => null, + 'plus_bottom' => null, + 'plus_only' => null, + 'minus' => null, + 'minus_bottom' => null, + 'minus_only' => null, + 'null_only' => null, + 'folder' => null, + 'folderopen' => null, + 'leaf' => null + ); + + /** + * Constructor. + * + * @param string $name The name of this tree instance. + * @param array $params Additional parameters: + * 
+     * alternate - (boolean) Alternate shading in the table?
+     *             DEFAULT: false
+     * class - (string) The class to use for the table.
+     *         DEFAULT: ''
+     * hideHeaders - (boolean) Don't render any HTML for the header row, just
+     *               use the widths.
+     *               DEFAULT: false
+     * lines - (boolean) Show tree lines?
+     *         DEFAULT: true
+     * lines_base - (boolean) Show tree lines for the base level? Requires
+     *              'lines' to be true also.
+     *              DEFAULT: false
+     * multiline - (boolean) Do the node labels contain linebreaks?
+     *             DEFAULT: false
+     *
+ */ + public function __construct($name, array $params = array()) + { + $params = array_merge(array( + 'lines' => true + ), $params); + + parent::__construct($name, $params); + } + + /** + * Returns the tree. + * + * @param boolean $static If true the tree nodes can't be expanded and + * collapsed and the tree gets rendered expanded. + * + * @return string The HTML code of the rendered tree. + */ + public function getTree($static = false) + { + $this->_static = (bool)$static; + return $this->_buildHeader() . parent::getTree($static); + } + + /** + * Adds column headers to the tree table. + * + * @param array $header An array containing hashes with header + * information. The following keys are allowed: + * 
+     * class - The CSS class of the header cell
+     * html - The HTML content of the header cell
+     *
+ */ + public function setHeader($header) + { + parent::setHeader($header); + } + + /** + * Returns the HTML code for a header row, if necessary. + * + * @return string The HTML code of the header row or an empty string. + */ + protected function _buildHeader() + { + if (!count($this->_header) || + $this->getOption('hideHeaders')) { + return ''; + } + + $className = 'horde-tree-row-header'; + + /* If using alternating row shading, work out correct + * shade. */ + if ($this->getOption('alternate')) { + $className .= ' item' . $this->_altCount; + $this->_altCount = 1 - $this->_altCount; + } + + $html = '
'; + + foreach ($this->_header as $header) { + $html .= ''; + } + + return $html . '
'; + } + + /** + * Recursive function to walk through the tree array and build the output. + * + * @param string $node_id The Node ID. + * + * @return string The tree rendering. + */ + protected function _buildTree($node_id) + { + $node = $this->_nodes[$node_id]; + $output = $this->_buildLine($node_id); + + if (isset($node['children']) && $node['expanded']) { + foreach ($node['children'] as $key => $val) { + $this->_node_pos[$val] = array( + 'count' => count($node['children']), + 'pos' => $key + 1 + ); + $output .= $this->_buildTree($val); + } + } + + return $output; + } + + /** + * Function to create a single line of the tree. + * + * @param string $node_id The Node ID. + * + * @return string The rendered line. + */ + protected function _buildLine($node_id) + { + $node = $this->_nodes[$node_id]; + + $className = 'horde-tree-row'; + if (!empty($node['class'])) { + $className .= ' ' . $node['class']; + } + + /* If using alternating row shading, work out correct + * shade. */ + if ($this->getOption('alternate')) { + $className .= ' item' . $this->_altCount; + $this->_altCount = 1 - $this->_altCount; + } + + $line = '
'; + + /* If we have headers, track which logical "column" we're in + * for any given cell of content. */ + $column = 0; + + if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT])) { + $extra = $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT]; + $cMax = count($extra); + while ($column < $cMax) { + $line .= $this->_addColumn($column) . $extra[$column] . ''; + ++$column; + } + } + + $line .= $this->_addColumn($column++); + + if ($this->getOption('multiline')) { + $line .= '
'; + } + + for ($i = intval($this->_static); $i < $node['indent']; ++$i) { + $line .= $this->_generateImage(($this->_dropline[$i] && $this->getOption('lines')) ? $this->_images['line'] : $this->_images['blank']); + } + $line .= $this->_setNodeToggle($node_id) . $this->_setNodeIcon($node_id); + if ($this->getOption('multiline')) { + $line .= ''; + } + $line .= $this->_setLabel($node_id); + + if ($this->getOption('multiline')) { + $line .= '
'; + } + + $line .= ''; + + if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT])) { + $extra = $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT]; + $cMax = count($extra); + for ($c = 0, $cMax = count($extra); $c < $cMax; ++$c) { + $line .= $this->_addColumn($column++) . $extra[$c] . ''; + } + } + + return $line . "
\n"; + } + + /** + */ + protected function _addColumn($column) + { + $line = '_header[$column]['class'])) { + $line .= ' class="' . $this->_header[$column]['class'] . '"'; + } + return $line . '>'; + } + + /** + * Sets the label on the tree line. + * + * @param string $node_id The Node ID. + * + * @return string The label for the tree line. + */ + protected function _setLabel($node_id) + { + $node = $this->_nodes[$node_id]; + + $output = ''; + + $label = $node['label']; + if (!empty($node['url'])) { + $target = ''; + if (!empty($node['target'])) { + $target = ' target="' . $node['target'] . '"'; + } elseif ($target = $this->getOption('target')) { + $target = ' target="' . $target . '"'; + } + $output .= '' . $label . ''; + } else { + $output .= $label; + } + + return $output . ''; + } + + /** + * Sets the node toggle on the tree line. + * + * @param string $node_id The Node ID. + * + * @return string The node toggle for the tree line. + */ + protected function _setNodeToggle($node_id) + { + $link_start = ''; + $node = $this->_nodes[$node_id]; + + /* Top level node. */ + if ($node['indent'] == 0) { + $this->_dropline[0] = false; + + if ($this->_static) { + return ''; + } + + /* KEY: + * 0: Only node + * 1: Top node + * 2: Middle node + * 3: Bottom node */ + $node_type = 0; + if ($this->getOption('lines_base') && + (count($this->_root_nodes) > 1)) { + switch (array_search($node_id, $this->_root_nodes)) { + case 0: + $node_type = 1; + $this->_dropline[0] = true; + break; + + case (count($this->_root_nodes) - 1): + $node_type = 3; + break; + + default: + $node_type = 2; + $this->_dropline[0] = true; + break; + } + } + + if (isset($node['children'])) { + if (!$this->getOption('lines')) { + $img = $this->_images['blank']; + } elseif ($node['expanded']) { + $img = $node_type + ? (($node_type == 2) ? $this->_images['minus'] : $this->_images['minus_bottom']) + : $this->_images['minus_only']; + } else { + $img = $node_type + ? (($node_type == 2) ? $this->_images['plus'] : $this->_images['plus_bottom']) + : $this->_images['plus_only']; + } + + $link_start = $this->_generateUrlTag($node_id); + } else { + if ($this->getOption('lines')) { + switch ($node_type) { + case 0: + $img = $this->_images['null_only']; + break; + + case 1: + $img = $this->_images['join_top']; + break; + + case 2: + $img = $this->_images['join']; + break; + + case 3: + $img = $this->_images['join_bottom']; + break; + } + } else { + $img = $this->_images['blank']; + } + } + } elseif (isset($node['children'])) { + /* Node with children. */ + if ($this->_node_pos[$node_id]['pos'] < $this->_node_pos[$node_id]['count']) { + /* Not last node. */ + if (!$this->getOption('lines')) { + $img = $this->_images['blank']; + } elseif ($this->_static) { + $img = $this->_images['join']; + } elseif ($node['expanded']) { + $img = $this->_images['minus']; + } else { + $img = $this->_images['plus']; + } + $this->_dropline[$node['indent']] = true; + } else { + /* Last node. */ + if (!$this->getOption('lines')) { + $img = $this->_images['blank']; + } elseif ($this->_static) { + $img = $this->_images['join_bottom']; + } elseif ($node['expanded']) { + $img = $this->_images['minus_bottom']; + } else { + $img = $this->_images['plus_bottom']; + } + $this->_dropline[$node['indent']] = false; + } + + if (!$this->_static) { + $link_start = $this->_generateUrlTag($node_id); + } + } else { + /* Node without children. */ + if ($this->_node_pos[$node_id]['pos'] < $this->_node_pos[$node_id]['count']) { + /* Not last node. */ + $img = $this->getOption('lines') + ? $this->_images['join'] + : $this->_images['blank']; + + $this->_dropline[$node['indent']] = true; + } else { + /* Last node. */ + $img = $this->getOption('lines') + ? $this->_images['join_bottom'] + : $this->_images['blank']; + + $this->_dropline[$node['indent']] = false; + } + } + + return $link_start . + $this->_generateImage($img, 'horde-tree-toggle') . + ($link_start ? '' : ''); + } + + /** + * Generate a link URL. + * + * @param string $node_id The node ID. + * + * @return string The link tag. + */ + protected function _generateUrlTag($node_id) + { + $url = new Horde_Url($_SERVER['PHP_SELF']); + return $url->add(Horde_Tree::TOGGLE . $this->_tree->instance, $node_id)->link(); + } + + /** + * Generate the icon image. + * + * @param string $src The source image. + * @param string $class Additional class to add to image. + * @param string $alt Alt text to add to the image. + * + * @return string A HTML tag to display the image. + */ + protected function _generateImage($src, $class = '', $alt = null) + { + $img = ''; + } + + /** + * Sets the icon for the node. + * + * @param string $node_id The Node ID. + * + * @return string The node icon for the tree line. + */ + protected function _setNodeIcon($node_id) + { + $node = $this->_nodes[$node_id]; + + if (isset($node['icon'])) { + if (empty($node['icon'])) { + return ''; + } + + /* Node has a user defined icon. */ + $img = (isset($node['iconopen']) && $node['expanded']) + ? $node['iconopen'] + : $node['icon']; + } elseif (isset($node['children'])) { + /* Standard icon set: node with children. */ + $img = $node['expanded'] + ? $this->_images['folderopen'] + : $this->_images['folder']; + } else { + /* Standard icon set: leaf node (no children). */ + $img = $this->_images['leaf']; + } + + return $this->_generateImage($img, 'horde-tree-icon', isset($node['iconalt']) ? htmlspecialchars($node['iconalt']) : null); + } + +} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Jquerymobile.php php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Jquerymobile.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Jquerymobile.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Jquerymobile.php 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,104 @@ + + * @author Jan Schneider + * @category Horde + * @deprecated API of _buildTree() fails strict PHP code check + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Tree + */ +class Horde_Tree_Renderer_Jquerymobile extends Horde_Tree_Renderer_Base +{ + /** + * Returns the tree. + * + * @return string The HTML code of the rendered tree. + */ + public function getTree($static = false) + { + $this->_nodes = $this->_tree->getNodes(); + + $tree = ''; + foreach (array(true, false) as $special) { + foreach ($this->_tree->getRootNodes() as $node_id) { + $tree .= $this->_buildTree($node_id, $special); + } + } + + return $tree; + } + + /** + * Recursive function to walk through the tree array and build the output. + * + * @param string $node_id The Node ID. + * + * @return string The tree rendering. + */ + protected function _buildTree($node_id, $special) + { + $node = $this->_nodes[$node_id]; + $output = ''; + + if ($node['special'] == $special) { + $output = '_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT])) { + $output .= implode(' ', $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT]); + } + if (!empty($node['url'])) { + $output .= ' $value) { + $output .= ' ' . $attribute . '="' . htmlspecialchars($value) . '"'; + } + } + $output .= '>'; + } + $output .= $this->_getIcon($node_id) . $node['label']; + if (!empty($node['url'])) { + $output .= ''; + } + if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT])) { + $output .= '' . implode(' ', $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT]) . ''; + } + $output .= ''; + } + + if (isset($node['children'])) { + foreach ($node['children'] as $val) { + $output .= $this->_buildTree($val, $special); + } + } + + return $output; + } + + /** + * Sets the icon for the node. + * + * @param string $node_id The Node ID. + * + * @return string The node icon for the tree line. + */ + protected function _getIcon($node_id) + { + $node = $this->_nodes[$node_id]; + if (empty($node['icon'])) { + return ''; + } + return ''; + } + +} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Select.php php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Select.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Select.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Select.php 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,55 @@ + tag rendering. + * + * Additional node parameters: + * - selected: (boolean) Whether the node is selected. + * + * Copyright 2005-2017 Horde LLC (http://www.horde.org/) + * + * See the enclosed file COPYING for license information (LGPL). If you + * did not receive this file, see http://www.horde.org/licenses/lgpl21. + * + * @author Ben Chavet + * @author Jan Schneider + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Tree + */ +class Horde_Tree_Renderer_Select extends Horde_Tree_Renderer_Base +{ + /** + * Should the tree be rendered statically? + * + * @var boolean + */ + protected $_static = true; + + /** + * Recursive function to walk through the tree array and build the output. + * + * @param string $node_id The Node ID. + * + * @return string The tree rendering. + */ + protected function _buildTree($node_id) + { + $node = $this->_nodes[$node_id]; + + $output = ''; + + if (isset($node['children']) && $node['expanded']) { + foreach ($node['children'] as $val) { + $output .= $this->_buildTree($val); + } + } + + return $output; + } + +} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Simplehtml.php php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Simplehtml.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Simplehtml.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer/Simplehtml.php 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,87 @@ + + * @author Jan Schneider + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Tree + */ +class Horde_Tree_Renderer_Simplehtml extends Horde_Tree_Renderer_Base +{ + /** + * Should the tree be rendered statically? + * + * @var boolean + */ + protected $_static = true; + + /** + * Recursive function to walk through the tree array and build the output. + * + * @param string $node_id The Node ID. + * + * @return string The tree rendering. + */ + protected function _buildTree($node_id) + { + $node = $this->_nodes[$node_id]; + + $output = ''; + if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT])) { + $output .= implode(' ', $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_LEFT]); + } + $output .= str_repeat(' ', $node['indent'] * 2); + + $output .= empty($node['url']) + ? $node['label'] + : '' . $node['label'] . ''; + if (isset($this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT])) { + $output .= implode(' ', $this->_extra[$node_id][Horde_Tree_Renderer::EXTRA_RIGHT]); + } + + if (isset($node['children'])) { + $output .= ' [' . + $this->_generateUrlTag($node_id) . + ($node['expanded'] ? '-' : '+') . + ']'; + } + + $output .= ''; + + if (isset($node['children']) && $node['expanded']) { + foreach ($node['children'] as $val) { + $output .= $this->_buildTree($val); + } + } + + return $output; + } + + /** + * Generate a link URL. + * + * @param string $node_id The node ID. + * + * @return string The link tag. + */ + protected function _generateUrlTag($node_id) + { + $url = new Horde_Url($_SERVER['PHP_SELF']); + return $url->add(Horde_Tree::TOGGLE . $this->_tree->instance, $node_id)->link(); + } + +} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer.php php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree/Renderer.php 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,90 @@ + + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Tree + */ + +/** + * The Horde_Tree_Renderer class contains constants and a factory for + * the tree renderers. + * + * @author Jan Schneider + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Tree + */ +class Horde_Tree_Renderer +{ + /* Display extra columns. */ + const EXTRA_LEFT = 0; + const EXTRA_RIGHT = 1; + + /** + * Attempts to return a concrete instance. + * + * @param string $renderer Either the tree renderer driver or a full + * class name to use. + * @param array $params Any additional parameters the constructor + * needs. Either 'name' or 'tree' must be + * specified. Common parameters are: + * - name: (string) The name of this tree instance. + * - tree: (Horde_Tree) An existing tree object. + * - session: (array) Callbacks used to store session data. Must define + * two keys: 'get' and 'set'. Function definitions: + * (string) = get([string - Instance], [string - ID]); + * set([string - Instance], [string - ID], [boolean - value]); + * DEFAULT: No session storage + * + * @return Horde_Tree The newly created concrete instance. + * @throws Horde_Tree_Exception + */ + public static function factory($renderer, $params = array()) + { + if (!isset($params['tree']) && !isset($params['name'])) { + throw new BadFunctionCallException('Either "name" or "tree" parameters must be specified.'); + } + + if (isset($params['tree'])) { + $tree = $params['tree']; + unset($params['tree']); + } else { + $tree = new Horde_Tree( + $params['name'], + isset($params['session']) ? $params['session'] : array()); + unset($params['name']); + } + unset($params['session']); + + $ob = null; + + /* Base drivers (in Tree/ directory). */ + $class = __CLASS__ . '_' . Horde_String::ucfirst($renderer); + if (class_exists($class)) { + $ob = new $class($tree, $params); + } else { + /* Explicit class name, */ + $class = $renderer; + if (class_exists($class)) { + $ob = new $class($tree, $params); + } + } + + if ($ob) { + if ($ob->isSupported()) { + return $ob; + } + + $params['tree'] = $tree; + return self::factory($ob->fallback(), $params); + } + + throw new Horde_Tree_Exception('Horde_Tree renderer not found: ' . $renderer); + } +} diff -Nru php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree.php php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree.php --- php-horde-tree-2.0.4/Horde_Tree-2.0.5/lib/Horde/Tree.php 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-tree-2.0.5/Horde_Tree-2.0.5/lib/Horde/Tree.php 2017-09-19 12:05:06.000000000 +0000 @@ -0,0 +1,270 @@ + + * @author Michael Slusarz + * @author Jan Schneider + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Tree + */ +class Horde_Tree implements Countable +{ + /** + * The preceding text, before the Horde_Tree instance name, used for + * collapse/expand submissions. + */ + const TOGGLE = 'ht_toggle_'; + + /** + * The name of this instance. + * + * @var string + */ + public $instance; + + /** + * Callbacks used to store session data. + * + * @var array + */ + protected $_session = array(); + + /** + * An array containing all the tree nodes. + * + * @var array + */ + protected $_nodes = array(); + + /** + * The top-level nodes in the tree. + * + * @var array + */ + protected $_root_nodes = array(); + + /** + * Constructor. + * + * @param string $name The name of this tree instance. + * @param array $session Callbacks used to store session data. Must define + * two keys: 'get' and 'set'. Function definitions: + * (string) = get([string - Instance], [string - ID]); + * set([string - Instance], [string - ID], [boolean - value]); + * DEFAULT: No session storage + */ + public function __construct($name, $session = array()) + { + $this->instance = $name; + $this->_session = $session; + } + + /** + * Adds a node to the node tree array. + * + * @param array $node A hash with node properties: + * - id: (string) The unique node id. + * - parent: (string) The parent's unique node id. + * - label: (string) The text label for the node. + * - expanded: (boolean) Is this level expanded or not. + * - params: (array) Any other parameters to set + * (see addNodeParams() of the renderers + * for full details). + */ + public function addNode($node) + { + $node = array_merge( + array('parent' => null, + 'expanded' => true, + 'params' => array()), + $node); + + $nodeid = $this->nodeId($node['id']); + $expanded = $node['expanded']; + + if ($this->_session) { + $toggle_id = Horde_Util::getFormData(Horde_Tree::TOGGLE . $this->instance); + + if ($nodeid == $toggle_id) { + /* We have a URL toggle request for this node. */ + $expanded = (call_user_func($this->_session['get'], $this->instance, $node['id']) !== null) + /* Use session state if it is set. */ + ? !call_user_func($this->_session['get'], $this->instance, $nodeid) + /* Otherwise use what was passed through the function. */ + : !$node['expanded']; + call_user_func($this->_session['set'], $this->instance, $nodeid, $expanded); + } elseif (($exp_get = call_user_func($this->_session['get'], $this->instance, $nodeid)) !== null) { + /* If we have a saved session state use it. */ + $expanded = $exp_get; + } + } + + $this->_nodes[$nodeid]['label'] = $node['label']; + $this->_nodes[$nodeid]['expanded'] = $expanded; + + /* If any params included here add them now. */ + if (!empty($node['params'])) { + $this->addNodeParams($node['id'], $node['params']); + } + + if (is_null($node['parent'])) { + if (!in_array($nodeid, $this->_root_nodes)) { + $this->_root_nodes[] = $nodeid; + } + } else { + $parent = $this->nodeId($node['parent']); + if (empty($this->_nodes[$parent]['children'])) { + $this->_nodes[$parent]['children'] = array(); + } + if (!in_array($nodeid, $this->_nodes[$parent]['children'])) { + $this->_nodes[$parent]['children'][] = $nodeid; + } + } + } + + /** + * Adds additional parameters to a node. + * + * @param string $id The unique node id. + * @param array $params Parameters to set (key/value pairs). + */ + public function addNodeParams($id, $params = array()) + { + $id = $this->nodeId($id); + + if (!is_array($params)) { + $params = array($params); + } + + foreach ($params as $p_id => $p_val) { + // Set only non-null params. + if (!is_null($p_val)) { + // TODO: In H6 don't convert to string here. + $this->_nodes[$id][$p_id] = is_object($p_val) + ? strval($p_val) + : $p_val; + } + } + } + + /** + * Returns the root node IDs. + * + * @return array The root nodes. + */ + public function getRootNodes() + { + return $this->_root_nodes; + } + + /** + * Returns the nodes of the tree. + * + * @return array The nodes with IDs as keys and node hashes as values. + */ + public function getNodes() + { + $this->_buildIndents($this->_root_nodes); + return $this->_nodes; + } + + /** + * Sorts the tree by the specified node property. + * + * @param string $criteria The node property to sort by. + * @param integer $id Used internally for recursion. + */ + public function sort($criteria, $id = -1) + { + if (!isset($this->_nodes[$id]['children'])) { + return; + } + + if ($criteria == 'key') { + ksort($this->_nodes[$id]['children']); + } else { + $this->_sortCriteria = $criteria; + usort($this->_nodes[$id]['children'], array($this, 'sortHelper')); + } + + foreach ($this->_nodes[$id]['children'] as $child) { + $this->sort($criteria, $child); + } + } + + /** + * Helper method for sort() to compare two tree elements. + */ + public function sortHelper($a, $b) + { + if (!isset($this->_nodes[$a][$this->_sortCriteria])) { + return 1; + } + + if (!isset($this->_nodes[$b][$this->_sortCriteria])) { + return -1; + } + + return strcoll($this->_nodes[$a][$this->_sortCriteria], + $this->_nodes[$b][$this->_sortCriteria]); + } + + /** + * Returns whether the specified node is currently expanded. + * + * @param mixed $id The unique node id. + * + * @return boolean True if the specified node is expanded. + */ + public function isExpanded($id) + { + $id = $this->nodeId($id); + + return isset($this->_nodes[$id]) + ? $this->_nodes[$id]['expanded'] + : false; + } + + /** + * Set the indent level for each node in the tree. + * + * @param array $nodes TODO + * @param integer $indent TODO + */ + protected function _buildIndents($nodes, $indent = 0) + { + foreach ($nodes as $id) { + $this->_nodes[$id]['indent'] = $indent; + if (!empty($this->_nodes[$id]['children'])) { + $this->_buildIndents($this->_nodes[$id]['children'], $indent + 1); + } + } + } + + /** + * Returns the escaped node ID. + * + * @param string $id Node ID. + * + * @return string Escaped node ID. + */ + public function nodeId($id) + { + return rawurlencode($id); + } + + /* Countable methods. */ + + public function count() + { + return count($this->_nodes); + } +} diff -Nru php-horde-tree-2.0.4/package.xml php-horde-tree-2.0.5/package.xml --- php-horde-tree-2.0.4/package.xml 2015-04-28 16:06:19.000000000 +0000 +++ php-horde-tree-2.0.5/package.xml 2017-09-19 12:05:07.000000000 +0000 @@ -1,5 +1,5 @@ - + Horde_Tree pear.horde.org Horde Tree API @@ -22,10 +22,10 @@ slusarz@horde.org yes - 2015-04-28 - + 2017-09-19 + - 2.0.4 + 2.0.5 2.0.0 @@ -34,28 +34,28 @@ LGPL-2.1 -* [jan] Fix issues with certain locales like Turkish. +* [jan] Mark PHP 7 as supported. - - - - - - - - + + + + + + + + 5.3.0 - 6.0.0alpha1 - 6.0.0alpha1 + 8.0.0alpha1 + 8.0.0alpha1 1.7.0 @@ -368,5 +368,20 @@ * [jan] Fix issues with certain locales like Turkish. + + + 2.0.5 + 2.0.0 + + + stable + stable + + 2017-09-19 + LGPL-2.1 + +* [jan] Mark PHP 7 as supported. + +