objectGetHeader() should return a TableRow instance as this is closer to what the information

represents and is a much more useful form.

include/appData.php

@@ -305,13 +305,12 @@ class appData
 
     function objectGetHeader($sType)
     {
-        $aCells = array(
+        $oTableRow = new TableRow();
-            "Submission Date",
+        $oTableRow->AddTextCell("Submission Date");
-            "Submitter",
+        $oTableRow->AddTextCell("Submitter");
-            "Application",
+        $oTableRow->AddTextCell("Application");
-            "Version");
+        $oTableRow->AddTextCell("Version");
-
+        return $oTableRow;
-        return $aCells;
     }
 
     function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sType)

include/application.php

@@ -884,13 +884,12 @@ class Application {
 
     function objectGetHeader()
     {
-        $aCells = array(
+        $oTableRow = new TableRow();
-                "Submission Date",
+        $oTableRow->AddTextCell("Submission Date");
-                "Submitter",
+        $oTableRow->AddTextCell("Submitter");
-                "Vendor",
+        $oTableRow->AddTextCell("Vendor");
-                "Application");
+        $oTableRow->AddTextCell("Application");
-
+        return $oTableRow;
-        return $aCells;
     }
 
     function objectGetTableRow()

include/browse_newest_apps.php

@@ -57,12 +57,18 @@ class browse_newest_apps
 
   function objectGetHeader()
   {
-    $aCells = array(
+      $oTableRow = new TableRow();
-                    array("Submission Date", "color=\"white\""),
-                    array("Application", "color=\"white\""),
-                    array("Description", "color=\"white\""));
 
-    return $aCells;
+      $oTableCell = new TableCell("Submission Date");
+      $oTableRow->AddCell($oTableCell);
+
+      $oTableCell = new TableCell("Application");
+      $oTableRow->AddCell($oTableCell);
+
+      $oTableCell = new TableCell("Description");
+      $oTableRow->AddCell($oTableCell);
+
+      return $oTableRow;
   }
 
   function objectGetTableRow()

include/distribution.php

@@ -423,12 +423,17 @@ class distribution {
 
     function objectGetHeader()
     {
-        $aCells = array(
+        $oTableRow = new TableRow();
-            "Distribution name",
-            "Distribution url",
-            array("Linked Tests", "align=\"right\""));
 
-        return $aCells;
+        $oTableRow->AddTextCell("Distribution name");
+
+        $oTableRow->AddTextCell("Distribution url");
+
+        $oTableCell = new TableCell("Linked Tests");
+        $oTableCell->SetAlign("right");
+        $oTableRow->AddCell($oTableCell);
+
+        return $oTableRow;
     }
 
     function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0)

include/maintainer.php

@@ -648,14 +648,13 @@ class maintainer
 
     function ObjectGetHeader()
     {
-        $aCells = array(
+        $oTableRow = new TableRow();
-            "Submission Date",
+        $oTableRow->AddTextCell("Submission Date");
-            "Application Name",
+        $oTableRow->AddTextCell("Application Name");
-            "Version",
+        $oTableRow->AddTextCell("Version");
-            "Super maintainer?",
+        $oTableRow->AddTextCell("Super maintainer?");
-            "Submitter");
+        $oTableRow->AddTextCell("Submitter");
-
+        return $oTableRow;
-        return $aCells;
     }
 
     function ObjectGetTableRow()

include/objectManager.php

@@ -643,14 +643,18 @@ class ObjectManager
     function outputHeader($sClass)
     {
         $oObject = new $this->sClass();
-        $aCells = $oObject->objectGetHeader();
+        $oTableRow = $oObject->objectGetHeader();
 
         /* Add an action column if the user can edit this class, or if it is a queue.
            Even though a user annot process items, he can edit his queued submissions */
         if($oObject->canEdit() || $this->bIsQueue)
-            $aCells[] = "Action";
+        {
+            $oTableRow->AddTextCell("Action");
+        }
 
-        echo html_tr($aCells, $sClass);
+        $oTableRow->SetClass($sClass);
+
+        echo $oTableRow->GetString();
     }
 
     function handleMultiPageControls($aClean, $bItemsPerPageSelector = TRUE)

include/table.php

@@ -68,7 +68,7 @@ class TableRowClick
 
     $sStr.= ' onclick="DoNav(\''.$this->shUrl.'\');"';
 
-    return $sStr;    
+    return $sStr;
   }
 }
 

include/testData.php

@@ -991,15 +991,15 @@ class testData{
 
     function objectGetHeader()
     {
-        $aCells = array(
+        $oTableRow = new TableRow();
-                "Submission Date",
+        $oTableRow->AddTextCell("Submission Date");
-                "Submitter",
+        $oTableRow->AddTextCell("Submitter");
-                "Application",
+        $oTableRow->AddTextCell("Application");
-                "Version",
+        $oTableRow->AddTextCell("Version");
-                "Release",
+        $oTableRow->AddTextCell("Release");
-                "Has maintainer",
+        $oTableRow->AddTextCell("Has maintainer");
-                "Rating");
+        $oTableRow->AddTextCell("Rating");
-        return $aCells;
+        return $oTableRow;
     }
 
     function objectGetTableRow()

include/vendor.php

@@ -237,12 +237,17 @@ class Vendor {
 
     function objectGetHeader()
     {
-        $aCells = array(
+        $oTableRow = new TableRow();
-            "Name",
+        
-            "Website",
+        $oTableRow->AddTextCell("Name");
-            array("Linked apps", "align=\"right\""));
 
-        return $aCells;
+        $oTableRow->AddTextCell("Website");
+
+        $oTableCell = new TableCell("Linked apps");
+        $oTableCell->SetAlign("right");
+        $oTableRow->AddCell($oTableCell);
+
+        return $oTableRow;
     }
 
     // returns an OMTableRow instance

include/version.php

@@ -1399,13 +1399,13 @@ class version {
 
     function objectGetHeader()
     {
-        $aCells = array(
+        $oTableRow = new TableRow();
-                "Submission Date",
+        $oTableRow->AddTextCell("Submission Date");
-                "Submitter",
+        $oTableRow->AddTextCell("Submitter");
-                "Vendor",
+        $oTableRow->AddTextCell("Vendor");
-                "Application",
+        $oTableRow->AddTextCell("Application");
-                "Version");
+        $oTableRow->AddTextCell("Version");
-        return $aCells;
+        return $oTableRow;
     }
 
     function objectGetItemsPerPage($bQueued = false)