Ignore:
Timestamp:
Feb 19, 2014 2:28:00 AM (10 years ago)
Author:
anonymous
Message:

Merged in changes from trunk to finish Eli's branch.

Location:
branches/eli_branch
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/eli_branch

  • branches/eli_branch/lib/Hierarchy.inc.php

    r439 r467  
    44 * For details visit the project site: <http://trac.strangecode.com/codebase/>
    55 * Copyright 2001-2012 Strangecode, LLC
    6  * 
     6 *
    77 * This file is part of The Strangecode Codebase.
    88 *
     
    1111 * Free Software Foundation, either version 3 of the License, or (at your option)
    1212 * any later version.
    13  * 
     13 *
    1414 * The Strangecode Codebase is distributed in the hope that it will be useful, but
    1515 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1616 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
    1717 * details.
    18  * 
     18 *
    1919 * You should have received a copy of the GNU General Public License along with
    2020 * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
     
    2323/**
    2424 * Hierarchy.inc.php
    25  * 
     25 *
    2626 * Objective: This class provides the tools to organize pieces of data into a
    2727 * hierarchy of nodes. Any form of data (article, product, image) can be
     
    116116    {
    117117            $app =& App::getInstance();
    118    
     118
    119119            if (!isset($child_type) || !isset($child_id)) {
    120120            if ($this->node_init) {
     
    150150    {
    151151            $app =& App::getInstance();
    152    
     152
    153153            if (preg_match('/^([[:alnum:]]+)__-?([[:digit:]]+)$/', $node, $node_parts)) {
    154154            return array('node_type' => $node_parts[1], 'node_id' => $node_parts[2]);
     
    171171        $app =& App::getInstance();
    172172        $db =& DB::getInstance();
    173    
     173
    174174        if (!isset($child_type) || !isset($child_id)) {
    175175            if ($this->node_init) {
     
    250250        $app =& App::getInstance();
    251251        $db =& DB::getInstance();
    252    
     252
    253253        if (!isset($child_type) || !isset($child_id)) {
    254254            if ($this->node_init) {
     
    377377        $app =& App::getInstance();
    378378        $db =& DB::getInstance();
    379    
     379
    380380        if (!isset($child_type) || !isset($child_id)) {
    381381            if ($this->node_init) {
     
    428428        $app =& App::getInstance();
    429429        $db =& DB::getInstance();
    430    
     430
    431431        if (!isset($child_type) || !isset($child_id)) {
    432432            if ($this->node_init) {
     
    472472        $app =& App::getInstance();
    473473        $db =& DB::getInstance();
    474    
     474
    475475        if (!isset($child_type) || !isset($child_id)) {
    476476            if ($this->node_init) {
     
    564564    {
    565565        $app =& App::getInstance();
    566    
     566
    567567        if (!isset($child_type) || !isset($child_id)) {
    568568            if ($this->node_init) {
     
    625625    {
    626626        $db =& DB::getInstance();
    627    
     627
    628628        static $output = array();
    629629        static $return_flag;
     
    680680        $app =& App::getInstance();
    681681        $db =& DB::getInstance();
    682    
     682
    683683        if (!isset($child_type) || !isset($child_id)) {
    684684            if ($this->node_init) {
     
    731731    {
    732732        $app =& App::getInstance();
    733    
     733
    734734        static $output = array();
    735735        static $is_a_leaf = array();
     
    804804    {
    805805        $db =& DB::getInstance();
    806    
     806
    807807        // Reset all the category counters to zero.
    808808        $db->query("UPDATE node_tbl SET subnode_quantity = 0");
     
    828828    {
    829829        $db =& DB::getInstance();
    830    
     830
    831831        $db->query("
    832832            UPDATE node_tbl
Note: See TracChangeset for help on using the changeset viewer.