Clean up category class. Move category related functions into the class and remove now extranious

$catId parameter from category::display()

appbrowse.php

@@ -26,9 +26,9 @@ function admin_menu()
 }
 
 // list sub categories
-$cat = new Category($aClean['iCatId']?$aClean['iCatId']:"0");
-$catFullPath = make_cat_path($cat->getCategoryPath());
-$subs = $cat->aSubcatsIds;
+$oCat = new Category($aClean['iCatId']?$aClean['iCatId']:"0");
+$sCatFullPath = Category::make_cat_path($oCat->getCategoryPath());
+$subs = $oCat->aSubcatsIds;
 
 //display admin box
 if($_SESSION['current']->hasPriv("admin") && $aClean['iCatId'] != 0)
@@ -40,7 +40,7 @@ apidb_header("Browse Applications");
 if($subs)
 {
     echo html_frame_start("",'98%','',2);
-    echo "<p><b>Category: ". $catFullPath ."</b><br />\n";
+    echo "<p><b>Category: ". $sCatFullPath ."</b><br />\n";
     echo html_frame_end();
     
     echo html_frame_start("","98%","",0);
@@ -80,11 +80,11 @@ if($subs)
 
 
 // list applications in this category
-$apps = $cat->aApplicationsIds;
+$apps = $oCat->aApplicationsIds;
 if($apps)
 {
     echo html_frame_start("",'98%','',2);
-    echo "<p><b>Category: ". $catFullPath ."</b><br />\n";
+    echo "<p><b>Category: ". $sCatFullPath ."</b><br />\n";
     echo html_frame_end();
     
     echo html_frame_start("","98%","",0);

appview.php

@@ -13,7 +13,7 @@
  *
  * TODO:
  *  - replace sSub with iAction and replace "delete", "unqueue", etc. with integer constants DELETE, UNQUEUE, etc.
- *  - move and rename display_catpath and display_bundle in their respective modules
+ *  - move and rename display_bundle into its respective modules
  *  - replace require_once with require after checking that it won't break anything
  */
 
@@ -38,20 +38,6 @@ $aClean['iTestingId'] = makeSafe($_REQUEST['iTestingId']);
 $oApp = new Application($aClean['iAppId']);
 $oVersion = new Version($aClean['iVersionId']);
 
-/**
- * display the full path of the Category we are looking at
- */
-function display_catpath($catId, $appId, $versionId = '')
-{
-    $cat = new Category($catId);
-
-    $catFullPath = make_cat_path($cat->getCategoryPath(), $appId, $versionId);
-    echo html_frame_start("",'98%','',2);
-    echo "<p><b>Category: ". $catFullPath ."</b><br />\n";
-    echo html_frame_end();
-}
-
-
 /**
  * Displays the SUB apps that belong to this application.
  */

include/application.php

@@ -506,7 +506,8 @@ class Application {
         apidb_header("Viewing App - ".$this->sName);
 
         // cat display
-        display_catpath($this->iCatId, $this->iAppId);
+        $oCategory = new Category($this->iCatId);
+        $oCategory->display($this->iAppId);
 
         // set Vendor
         $oVendor = new Vendor($this->iVendorId);

include/category.php

@@ -163,6 +163,8 @@ class Category {
     {
         $aPath = array();
         $iCatId  = $this->iCatId;
+
+        /* loop, working up through categories until we have no parent */
         while($iCatId != 0)
         {
             $hResult = query_parameters("SELECT catName, catId, catParent FROM appCategory WHERE catId = '?'",
@@ -207,12 +209,6 @@ class Category {
         
         return $totalApps;
     }
-}
-
-
-/*
- * Application functions that are not part of the class
- */
 
     /**
      * create the Category: line at the top of appdb pages$
@@ -249,4 +245,17 @@ function make_cat_path($path, $appId = '', $versionId = '')
 
         return $str;
     }
+
+    /**
+     * display the full path of the Category we are looking at
+     */
+    function display($appId, $versionId = '')
+    {
+        $sCatFullPath = Category::make_cat_path($this->getCategoryPath(), $appId, $versionId);
+        echo html_frame_start("",'98%','',2);
+        echo "<p><b>Category: ". $sCatFullPath ."</b><br />\n";
+        echo html_frame_end();
+    }
+}
+
 ?>

include/version.php

@@ -624,7 +624,8 @@ class Version {
         apidb_header("Viewing App- ".$oApp->sName." Version - ".$this->sName);
 
         // cat
-        display_catpath($oApp->iCatId, $oApp->iAppId, $this->iVersionId);
+        $oCategory = new Category($oApp->iCatId);
+        $oCategory->display($oApp->iAppId, $this->iVersionId);
   
         // set URL
         $appLinkURL = ($oApp->sWebpage) ? "<a href=\"".$oApp->sWebpage."\">".substr(stripslashes($oApp->sWebpage),0,30)."</a>": "&nbsp;";