[TEP-COMMIT] CVS: catalog/catalog/includes/boxes categories.php,1.26,1.27

Update of /pack/cvsroots/oscommerce/catalog/catalog/includes/boxes
In directory sunsite.dk:/tmp/cvs-serv6740

Modified Files:
	categories.php 
Log Message:
use the new categoryTree class


Index: categories.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/includes/boxes/categories.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- categories.php	2003/11/17 19:46:49	1.26
+++ categories.php	2004/02/16 07:26:01	1.27
@@ -5,58 +5,10 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2003 osCommerce
+  Copyright (c) 2004 osCommerce
 
   Released under the GNU General Public License
 */
-
-  function tep_show_category($counter) {
-    global $tree, $categories_string, $cPath_array;
-
-    for ($i=0; $i<$tree[$counter]['level']; $i++) {
-      $categories_string .= "&nbsp;&nbsp;";
-    }
-
-    $categories_string .= '<a href="';
-
-    if ($tree[$counter]['parent'] == 0) {
-      $cPath_new = 'cPath=' . $counter;
-    } else {
-      $cPath_new = 'cPath=' . $tree[$counter]['path'];
-    }
-
-    $categories_string .= tep_href_link(FILENAME_DEFAULT, $cPath_new) . '">';
-
-    if (isset($cPath_array) && in_array($counter, $cPath_array)) {
-      $categories_string .= '<b>';
-    }
-
-// display category name
-    $categories_string .= $tree[$counter]['name'];
-
-    if (isset($cPath_array) && in_array($counter, $cPath_array)) {
-      $categories_string .= '</b>';
-    }
-
-    if (tep_has_category_subcategories($counter)) {
-      $categories_string .= '-&gt;';
-    }
-
-    $categories_string .= '</a>';
-
-    if (SHOW_COUNTS == 'true') {
-      $products_in_category = tep_count_products_in_category($counter);
-      if ($products_in_category > 0) {
-        $categories_string .= '&nbsp;(' . $products_in_category . ')';
-      }
-    }
-
-    $categories_string .= '<br>';
-
-    if ($tree[$counter]['next_id'] != false) {
-      tep_show_category($tree[$counter]['next_id']);
-    }
-  }
 ?>
 <!-- categories //-->
           <tr>
@@ -66,70 +18,16 @@
   $info_box_contents[] = array('text' => BOX_HEADING_CATEGORIES);
 
   new infoBoxHeading($info_box_contents, true, false);
-
-  $categories_string = '';
-  $tree = array();
-
-  $categories_query = tep_db_query("select c.categories_id, cd.categories_name, c.parent_id from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.parent_id = '0' and c.categories_id = cd.categories_id and cd.language_id='" . (int)$osC_Session->value('languages_id') ."' order by sort_order, cd.categories_name");
-  while ($categories = tep_db_fetch_array($categories_query))  {
-    $tree[$categories['categories_id']] = array('name' => $categories['categories_name'],
-                                                'parent' => $categories['parent_id'],
-                                                'level' => 0,
-                                                'path' => $categories['categories_id'],
-                                                'next_id' => false);
-
-    if (isset($parent_id)) {
-      $tree[$parent_id]['next_id'] = $categories['categories_id'];
-    }
-
-    $parent_id = $categories['categories_id'];
-
-    if (!isset($first_element)) {
-      $first_element = $categories['categories_id'];
-    }
-  }
-
-  //------------------------
-  if (tep_not_null($cPath)) {
-    $new_path = '';
-    reset($cPath_array);
-    while (list($key, $value) = each($cPath_array)) {
-      unset($parent_id);
-      unset($first_id);
-      $categories_query = tep_db_query("select c.categories_id, cd.categories_name, c.parent_id from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.parent_id = '" . (int)$value . "' and c.categories_id = cd.categories_id and cd.language_id='" . (int)$osC_Session->value('languages_id') ."' order by sort_order, cd.categories_name");
-      if (tep_db_num_rows($categories_query)) {
-        $new_path .= $value;
-        while ($row = tep_db_fetch_array($categories_query)) {
-          $tree[$row['categories_id']] = array('name' => $row['categories_name'],
-                                               'parent' => $row['parent_id'],
-                                               'level' => $key+1,
-                                               'path' => $new_path . '_' . $row['categories_id'],
-                                               'next_id' => false);
 
-          if (isset($parent_id)) {
-            $tree[$parent_id]['next_id'] = $row['categories_id'];
-          }
-
-          $parent_id = $row['categories_id'];
-
-          if (!isset($first_id)) {
-            $first_id = $row['categories_id'];
-          }
-
-          $last_id = $row['categories_id'];
-        }
-        $tree[$last_id]['next_id'] = $tree[$value]['next_id'];
-        $tree[$value]['next_id'] = $first_id;
-        $new_path .= '_';
-      } else {
-        break;
-      }
-    }
-  }
-  tep_show_category($first_element);
+  $osC_CategoryTree = new osC_CategoryTree;
+  $osC_CategoryTree->setCategoryPath($cPath, '<b>', '</b>');
+  $osC_CategoryTree->setParentGroupString('', '');
+  $osC_CategoryTree->setParentString('', '->');
+  $osC_CategoryTree->setChildString('', '<br>');
+  $osC_CategoryTree->setSpacerString('&nbsp;', 2);
 
   $info_box_contents = array();
-  $info_box_contents[] = array('text' => $categories_string);
+  $info_box_contents[] = array('text' => $osC_CategoryTree->buildTree());
 
   new infoBox($info_box_contents);
 ?>



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click