Whitespace cleanup.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3071 c91229c3-7414-0410-bfa2-8a42b809f60b

Whitespace cleanup.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3071 c91229c3-7414-0410-bfa2-8a42b809f60b
nbm
1 parent fd63735a
Showing 2 changed files with 218 additions and 206 deletions
lib/browse/FolderBrowser.inc
presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc
@@ -15,32 +15,32 @@ require_once(&quot;$default-&gt;fileSystemRoot/lib/foldermanagement/Folder.inc&quot;);
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * @version $Revision$ 
+ * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib.browse
  */
 class FolderBrowser extends Browser {
-	/**
-	 * Construct a new FolderBrowser instance with the specified sort criteria
-	 *
-	 * @param string the field to sort the results by
-	 * @param string the direction to sort the results
-	 */
-	function FolderBrowser($sSortField = "name", $sSortDirection = "asc", $aNewSortCriteria = array()) {
-		Browser::Browser($sSortField, $sSortDirection, $aNewSortCriteria);
-	}
-														 										   		  									 	  
+    /**
+     * Construct a new FolderBrowser instance with the specified sort criteria
+     *
+     * @param string the field to sort the results by
+     * @param string the direction to sort the results
+     */
+    function FolderBrowser($sSortField = "name", $sSortDirection = "asc", $aNewSortCriteria = array()) {
+        Browser::Browser($sSortField, $sSortDirection, $aNewSortCriteria);
+    }
+
     /**
      * Browse the documents by folder
      *
@@ -52,137 +52,137 @@ class FolderBrowser extends Browser {
         // XXX: Shouldn't be getting this from $_REQUEST
         $iFolderID = $_REQUEST['fFolderID'];
-		// we're browsing folders
-		$this->setBrowseStart($iFolderID);
-		$iFolderID = $iFolderID;
-		
+        // we're browsing folders
+        $this->setBrowseStart($iFolderID);
+        $iFolderID = $iFolderID;
+
         // instantiate and initialise
         $results = array();
         $sql = $default->db;
-        
+
         // no folder specified, so depending on the users groups, resolve to the right folderID
         if ($iFolderID == "") {
             // no folder specified, so start at the root folder
-                        
-            //TO DO: Need to look up all the Units           
+
+            //TO DO: Need to look up all the Units
             // look up this users unit
             $unitID = User::getUnitID($_SESSION["userID"]);
-           
-           $default->log->debug("Users UNIT = " . $unitID  ); 
-            
+
+           $default->log->debug("Users UNIT = " . $unitID  );
+
             if ($unitID) {
                 // if the user is in a unit, start at the unit's root folder
-                
+
                 // lookup the unit name
-                $unitName = lookupField($default->units_table, "name", "id", $unitID);             
+                $unitName = lookupField($default->units_table, "name", "id", $unitID);
                 // the unit root folder has the same name as the unit
                 // FIXME: dodgy i know, but its easy
                 $unitRootFolderName = $unitName;
-               
+
                 // now lookup the folderID
                 $aFolders = Folder::getList("name='$unitRootFolderName' and parent_id=1");
-               
-                $default->log->debug("Users UNIT Name = " . $unitRootFolderName  ); 
-                
+
+                $default->log->debug("Users UNIT Name = " . $unitRootFolderName  );
+
                 if (!$aFolders) {
                     // no folder exists with this name, so start at the root
-                    $default->log->debug("Users UNIT Name NO FOLDER EXISTS WITH THIS NAME" . $unitRootFolderName  ); 
+                    $default->log->debug("Users UNIT Name NO FOLDER EXISTS WITH THIS NAME" . $unitRootFolderName  );
                     $iFolderID = lookupID($default->folders_table, "parent_id", 0);
                 } else {
-                	$iFolderID = $aFolders[0]->getID();
-                	$default->log->debug("FOLDER EXISTS WITH THIS NAME" . $unitRootFolderName  ); 
+                    $iFolderID = $aFolders[0]->getID();
+                    $default->log->debug("FOLDER EXISTS WITH THIS NAME" . $unitRootFolderName  );
                 }
-                
+
             } else {
                 // else just start at the root
                 // FIXME: start at the root folder for the default organisation
                 $iFolderID = lookupID($default->folders_table, "parent_id", 0);
              }
         } else{
-            $default->log->debug("Folder specified " . $iFolderID );	
+            $default->log->debug("Folder specified " . $iFolderID );
         }
-        
+
         $default->log->debug("FolderBrowser::browseByFolder: folderID=" . $iFolderID);
-        
+
         // get the folder
         $rootFolder = Folder::get($iFolderID);
         // FIXME: check permissions for the current folder before getting children
         $results["folders"][] = & $rootFolder;
         if ($results["folders"][0]) {
-            
-            // now find all the child folders relative to this one 
+
+            // now find all the child folders relative to this one
             // FIXME: in the same unit?
-            
+
             $aLookupCriteria = $this->aSortCriteria[$this->sSortField]["lookup"];
-                        
+
             // if we're sorting by name or creator_id then sort folders in the appropriate direction
-           
+
             $aParams = array();
             $sFolderQuery = "SELECT f.id FROM $default->folders_table AS f ";/*ok*/
-			if (in_array($this->sSortField, array("name", "creator_id"))) {             
-	            if (isset($aLookupCriteria)) {
-	            	$sFolderQuery .= "INNER JOIN " . $aLookupCriteria["table"] . " lt ON f.$this->sSortField=lt.id WHERE parent_id = ?";
-	            	$sFolderQuery .= " ORDER BY lt." . $aLookupCriteria["field"] . " $this->sSortDirection";
-	            } else {
-	             	$sFolderQuery .= "WHERE parent_id = ? ORDER BY $this->sSortField $this->sSortDirection";
-	            }
-			} else {
-				$sFolderQuery .= "WHERE parent_id = ? ORDER BY f.name asc";
-			}
+            if (in_array($this->sSortField, array("name", "creator_id"))) {
+                if (isset($aLookupCriteria)) {
+                    $sFolderQuery .= "INNER JOIN " . $aLookupCriteria["table"] . " lt ON f.$this->sSortField=lt.id WHERE parent_id = ?";
+                    $sFolderQuery .= " ORDER BY lt." . $aLookupCriteria["field"] . " $this->sSortDirection";
+                } else {
+                     $sFolderQuery .= "WHERE parent_id = ? ORDER BY $this->sSortField $this->sSortDirection";
+                }
+            } else {
+                $sFolderQuery .= "WHERE parent_id = ? ORDER BY f.name asc";
+            }
             $aParams[] = $iFolderID;
-			$default->log->debug("Ordering folderQuery = $sFolderQuery");
-           
+            $default->log->debug("Ordering folderQuery = $sFolderQuery");
+
             if ($sql->query(array($sFolderQuery, $aParams))) {
                 while ($sql->next_record()) {
                   $default->log->debug("In folder iteration while, with folder_id " . $sql->f("id"));
                   // check whether to display folders which are not readable and display/hide these accordingly
-                  	$oFolder = Folder::get($sql->f("id"));
-                  	if ($default->folderHidingFlag) {
-                  		if (Permission::userHasFolderReadPermission($oFolder)) {
-                  			$default->log->debug("FOLDER PERMISSIONS: Does  have permission for folder " . $oFolder->getID() . ":" . $sql->f("id") );
-                    		$results["folders"][] =  $oFolder;
-                  		} else {
-                  			$default->log->debug("FOLDER PERMISSIONS: Does  NOT have permission for folder " . $sql->f("id") );
-                  		}
-                  	} else{
+                      $oFolder = Folder::get($sql->f("id"));
+                      if ($default->folderHidingFlag) {
+                          if (Permission::userHasFolderReadPermission($oFolder)) {
+                              $default->log->debug("FOLDER PERMISSIONS: Does  have permission for folder " . $oFolder->getID() . ":" . $sql->f("id") );
+                            $results["folders"][] =  $oFolder;
+                          } else {
+                              $default->log->debug("FOLDER PERMISSIONS: Does  NOT have permission for folder " . $sql->f("id") );
+                          }
+                      } else{
                         $results["folders"][] =  $oFolder;
-                  	}   
+                      }
                 }
             }
-            
+
             $default->log->debug("Going on to document checking");
-            
+
             // create query to retrieve documents in this folder
             $documentQuery  = "SELECT d.id as id FROM $default->documents_table AS d ";/*wc*/
             if (isset($aLookupCriteria)) {
-            	$documentQuery .= "INNER JOIN " .  $aLookupCriteria["table"] . " lt ON ";
-            	$documentQuery .= "d.$this->sSortField" . "=lt." . (isset($aLookupCriteria["joinColumn"]) ? $aLookupCriteria["joinColumn"] : "id");
-            }            
-            $documentQuery .= " WHERE d.folder_id=$iFolderID " . (isset($aLookupCriteria["whereClause"]) ? "AND lt." . $aLookupCriteria["whereClause"] : "") . " ";            
-			if (isset($aLookupCriteria)) {
-            	$documentQuery .= "ORDER BY lt." . $aLookupCriteria["field"] . " $this->sSortDirection";
+                $documentQuery .= "INNER JOIN " .  $aLookupCriteria["table"] . " lt ON ";
+                $documentQuery .= "d.$this->sSortField" . "=lt." . (isset($aLookupCriteria["joinColumn"]) ? $aLookupCriteria["joinColumn"] : "id");
+            }
+            $documentQuery .= " WHERE d.folder_id=$iFolderID " . (isset($aLookupCriteria["whereClause"]) ? "AND lt." . $aLookupCriteria["whereClause"] : "") . " ";
+            if (isset($aLookupCriteria)) {
+                $documentQuery .= "ORDER BY lt." . $aLookupCriteria["field"] . " $this->sSortDirection";
             } else {
-            	$documentQuery .= "ORDER BY $this->sSortField $this->sSortDirection";
+                $documentQuery .= "ORDER BY $this->sSortField $this->sSortDirection";
             }
             $default->log->debug("docQuery=$documentQuery");
-            
+
             // initialise access flag;
             $results["accessDenied"] = false;
             if ($sql->query($documentQuery)) {
-            	
-            	// do the check for whether this documents have folder read permission, if they do, it's all good. 
-            	$hasFolderRead = Permission::userHasFolderReadPermission($rootFolder);
-            	
+
+                // do the check for whether this documents have folder read permission, if they do, it's all good.
+                $hasFolderRead = Permission::userHasFolderReadPermission($rootFolder);
+
                 while ($sql->next_record()) {
-                	$oDocument = & Document::get($sql->f("id"));
+                    $oDocument = & Document::get($sql->f("id"));
                     // proceed if the document is live
                     if ($oDocument->isLive()) {
                         // check permissions
                         if ($hasFolderRead || Permission::userHasDocumentReadPermission($oDocument)) {
                             // add documents to array
                             // set file attributes
-                        	$results["documents"][] = $oDocument;
+                            $results["documents"][] = $oDocument;
                         } else {
                             // set access denied message
                             $results["accessDenied"] = true;
@@ -192,12 +192,12 @@ class FolderBrowser extends Browser {
             } else {
                 $_SESSION["errorMessage"] = "documents table select failed";
             }
-            
+
             return $results;
         }
     }
-    
+
     function getSectionName() {
-    	return "Manage Documents";
+        return "Manage Documents";
     }
 }
@@ -19,12 +19,12 @@ require_once(&quot;$default-&gt;uiDirectory/foldermanagement/addFolderUI.inc&quot;);
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -43,43 +43,43 @@ require_once(&quot;$default-&gt;uiDirectory/foldermanagement/addFolderUI.inc&quot;);
 function renderBrowseTypeSelect($sBrowseType) {
     // TODO: write function for onChange that checks if the new value
     return "<span class=\"browseTypeSelect\">\n
-            \t" . _("View documents by") . ": <input type=\"radio\" name=\"fBrowseType\" onclick=\"document.MainForm.submit()\" value=\"folder\"" .
-                               ((($sBrowseType=="folder") || (strlen($sBrowseType)==0)) ? " checked=\"checked\"" : "") . "/> " . _("Folders") ."\n" .
-                               "<input type=\"radio\" name=\"fBrowseType\" onclick=\"document.MainForm.submit()\" value=\"category\"" .
-                               (($sBrowseType=="category") ? " checked=\"checked\"" : "") . "/> " . _("Category") . "\n" .
-                               "<input type=\"radio\" name=\"fBrowseType\" onclick=\"document.MainForm.submit()\" value=\"documentType\"" .
-                               (($sBrowseType=="documentType") ? " checked=\"checked\"" : "") . "/> " . _("Document Type") . "\n</span>";
+        \t" . _("View documents by") . ": <input type=\"radio\" name=\"fBrowseType\" onclick=\"document.MainForm.submit()\" value=\"folder\"" .
+        ((($sBrowseType=="folder") || (strlen($sBrowseType)==0)) ? " checked=\"checked\"" : "") . "/> " . _("Folders") ."\n" .
+        "<input type=\"radio\" name=\"fBrowseType\" onclick=\"document.MainForm.submit()\" value=\"category\"" .
+        (($sBrowseType=="category") ? " checked=\"checked\"" : "") . "/> " . _("Category") . "\n" .
+        "<input type=\"radio\" name=\"fBrowseType\" onclick=\"document.MainForm.submit()\" value=\"documentType\"" .
+        (($sBrowseType=="documentType") ? " checked=\"checked\"" : "") . "/> " . _("Document Type") . "\n</span>";
 }
 // <category browse helper methods>
 /**
  * Displays the passed category path as a link
- * 
+ *
  * @param string the category name to display
  */
-function displayCategoryPathLink($aCategories) {	
+function displayCategoryPathLink($aCategories) {    
     // if the first value in arr["categories"] == Categories then we've got a list of categories
     if ($aCategories[0] == "Categories") {
         return displayCategoryLink($aCategories[0]);
     } else {
         // else the first entry is the category name, so build a little path
         return displayCategoryLink("Categories") . ($aCategories[0] ? " > " . displayCategoryLink($aCategories[0]) : "");
-    }                                              
+    }
 }
 /**
  * Displays the passed category as a link
- * 
+ *
  * @param string the category name to display
  */
 function displayCategoryLink($sCategoryName) {
     if ($sCategoryName != "") {
         return generateLink($_SERVER["PHP_SELF"],
-                            "fBrowseType=category" .
-                            // if the category title is passed in, link back to the list of categories
-                            (($sCategoryName == "Categories") ? "" : "&fCategoryName=" . urlencode($sCategoryName)),
-                            $sCategoryName);
+            "fBrowseType=category" .
+            // if the category title is passed in, link back to the list of categories
+            (($sCategoryName == "Categories") ? "" : "&fCategoryName=" . urlencode($sCategoryName)),
+            $sCategoryName);
     } else {
         return false;
     }
@@ -90,16 +90,16 @@ function displayCategoryLink($sCategoryName) {
  *
  * @param array the category browse results
  */
-function renderCategoryResults($aResults) {	   
+function renderCategoryResults($aResults) {    
     $sToRender = "";
-    
+
     //var_dump($aResults["categories"][0]);
-    // if the first value in arr["categories"] == Categories then we've got a list of categories    
+    // if the first value in arr["categories"] == Categories then we've got a list of categories
     if ($aResults["categories"][0] == "Categories") {
         // loop through categories and display them
         for ($i=1; $i<count($aResults["categories"]); $i++) {
             $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">";
-                     
+
             // category name
             $sToRender .= "<td>" . displayCategoryLink($aResults["categories"][$i]) . "</td>";
             // blank filename
@@ -109,17 +109,17 @@ function renderCategoryResults($aResults) {
             // modified date
             $sToRender .= "<td>&nbsp;</td>";
             // document type
-            $sToRender .= "<td>&nbsp;</td>";                      
+            $sToRender .= "<td>&nbsp;</td>";
             $sToRender .= "</tr>\n";
         }
     } else {
-    	if (count($aResults["categories"]) > 0) {
-	        // else the first entry is the category name, so display the documents in the category
-	        $sToRender .= renderDocumentList($aResults, _("This category contains no documents"), _("You don't have access to the documents in this category"));
-    	} else {
-    		$sToRender .= "<tr><td colspan=\"5\"><font color=\"red\">" . _("There is no Category Document Field- contact a System Administrator.") . "</font></td></tr>";
-    	}
+        if (count($aResults["categories"]) > 0) {
+            // else the first entry is the category name, so display the documents in the category
+            $sToRender .= renderDocumentList($aResults, _("This category contains no documents"), _("You don't have access to the documents in this category"));
+        } else {
+            $sToRender .= "<tr><td colspan=\"5\"><font color=\"red\">" . _("There is no Category Document Field- contact a System Administrator.") . "</font></td></tr>";
+        }
     }
     return $sToRender;
 }
@@ -129,8 +129,8 @@ function renderCategoryResults($aResults) {
 // <document type display helper methods>
 /**
  * Displays the passed document type path as a link
- * 
- * @param string the document type to display 
+ *
+ * @param string the document type to display
  */
 function displayDocumentTypePathLink($aDocumentTypes) {
     // if the first value in arr["categories"] == Categories then we've got a list of categories
@@ -144,15 +144,15 @@ function displayDocumentTypePathLink($aDocumentTypes) {
 /**
  * Displays the passed document type as a link
- * 
- * @param string the document type to display 
+ *
+ * @param string the document type to display
  */
 function displayDocumentTypeLink($aDocumentType) {
     return generateLink($_SERVER["PHP_SELF"],
-                        "fBrowseType=documentType" .
-                        // if the document type title is passed in, link back to the list of document types
-                        (($aDocumentType["name"] == "Document Types") ? "" : "&fDocumentTypeID=" . $aDocumentType["id"]),
-                        $aDocumentType["name"]);
+        "fBrowseType=documentType" .
+        // if the document type title is passed in, link back to the list of document types
+        (($aDocumentType["name"] == "Document Types") ? "" : "&fDocumentTypeID=" . $aDocumentType["id"]),
+        $aDocumentType["name"]);
 }
 /**
@@ -162,12 +162,12 @@ function displayDocumentTypeLink($aDocumentType) {
  */
 function renderDocumentTypeResults($aResults) {
     $sToRender = "";
-    
+
     // if the first value in arr["documentTypes"] == Document Types then we've got a list of document types
     if ($aResults["documentTypes"][0]["name"] == "Document Types") {
         // loop through document types and display them
         for ($i=1; $i<count($aResults["documentTypes"]); $i++) {
-            $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">";			
+            $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">";            
             // document type name
             $sToRender .= "<td>" . displayDocumentTypeLink($aResults["documentTypes"][$i]) . "</td>";
             // blank filename
@@ -177,8 +177,8 @@ function renderDocumentTypeResults($aResults) {
             // modified date
             $sToRender .= "<td>&nbsp;</td>";
             // document type
-            $sToRender .= "<td>&nbsp;</td>";                      
-            $sToRender .= "</tr>\n";                   	
+            $sToRender .= "<td>&nbsp;</td>";
+            $sToRender .= "</tr>\n";                       
         }
     } else {
         // else the first entry is the document type name, so display the documents in the document type
@@ -204,9 +204,9 @@ function renderFolderResults($aResults, $bTemplateBrowsing = false) {
         for ($i=1; $i<count($aResults["folders"]); $i++) {
             $sFolderLink = displayFolderLink($aResults["folders"][$i]);
             $oCreator = User::get($aResults["folders"][$i]->getCreatorID());
-            
+
             // the first element of the array contains the current folder name
-            $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">";            
+            $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">";
             // folder name
             $sToRender .= "<td valign=\"bottom\">" . $sFolderLink . "</td>";
             // blank filename (folder description?)
@@ -216,18 +216,18 @@ function renderFolderResults($aResults, $bTemplateBrowsing = false) {
             // modified date (TODO: add to db)
             $sToRender .= "<td valign=\"bottom\">&nbsp;</td>";
             // document type (??: display one of the mapped document types? which one?)
-            $sToRender .= "<td valign=\"bottom\">&nbsp;</td>";                        
+            $sToRender .= "<td valign=\"bottom\">&nbsp;</td>";
             $sToRender .= "</tr>\n";
         }
     } else {
         $sToRender .= "<tr><td colspan=\"5\">" . _("This folder contains no sub folders") . "</td></tr>";
     }
-        
-    $sToRender .= "<tr><td>" . renderDocumentList($aResults, _("This folder contains no documents"), 
-    											  _("You don't have access to the documents in this folder"), 
-    											  false, $bTemplateBrowsing) . 
-   				  "</td></tr>\n";
-    
+
+    $sToRender .= "<tr><td>" . renderDocumentList($aResults, _("This folder contains no documents"),
+        _("You don't have access to the documents in this folder"),
+        false, $bTemplateBrowsing) .
+        "</td></tr>\n";
+
     return $sToRender;
 }
 // </folder browse helper methods>
@@ -240,36 +240,36 @@ function renderFolderResults($aResults, $bTemplateBrowsing = false) {
  * @param string the direction currently sorted in
  */
 function renderSortHeadings($sSortBy, $sSortDirection) {
- 	global $default, $oBrowser, $fBrowseType, $fFolderID, $fCategoryName, $fDocumentTypeID;
- 	
-	$sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
-	$sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");    
-
-	// need list of display criteria and sort name
-    $aSortCriteria = $oBrowser->getSortCriteria();							 										 
-	
+     global $default, $oBrowser, $fBrowseType, $fFolderID, $fCategoryName, $fDocumentTypeID;
+     
+    $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
+    $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
+
+    // need list of display criteria and sort name
+    $aSortCriteria = $oBrowser->getSortCriteria();                                                                     
+    
     $sToRender .= "<tr bgcolor=\"$sTDBGColour\">";
-    while (list($key, $value) = each ($aSortCriteria)) {    	
-    	$sCurrentSortDirection = "asc";
-    	$displayText = $value["display"];
-    	// if the current heading is being sorted then flip the sort direction
-    	if ($sSortBy == $key) {
-    		$sCurrentSortDirection = ($sSortDirection == "asc" ? "desc" : "asc");
-    		$displayText = "<img border=\"0\" src=\"" . imgSrc($sCurrentSortDirection . ".gif") . "\">" . $displayText;
-    	}
-	  	switch ($fBrowseType) {
-	    	case "folder" : 		
-	    					$queryString = "fFolderID=$fFolderID"; 
-	                        break;
-	    	case "category" :
-			    	 		$queryString = "fCategoryName=$fCategoryName";
-	                        break;    	
-	    	case "documentType" :
-							$queryString = "fDocumentTypeID=$fDocumentTypeID";	    	 
-	                        break;
-	  	}    	
-	    $sToRender .= "<td>" . generateLink($_SERVER["PHP_SELF"], "fBrowseType=$fBrowseType&$queryString&fSortBy=$key&fSortDirection=$sCurrentSortDirection", $displayText) . "</td>";	                            	
-	}
+    while (list($key, $value) = each ($aSortCriteria)) {        
+        $sCurrentSortDirection = "asc";
+        $displayText = $value["display"];
+        // if the current heading is being sorted then flip the sort direction
+        if ($sSortBy == $key) {
+            $sCurrentSortDirection = ($sSortDirection == "asc" ? "desc" : "asc");
+            $displayText = "<img border=\"0\" src=\"" . imgSrc($sCurrentSortDirection . ".gif") . "\">" . $displayText;
+        }
+        switch ($fBrowseType) {
+            case "folder" :         
+                $queryString = "fFolderID=$fFolderID";
+                break;
+            case "category" :
+                $queryString = "fCategoryName=$fCategoryName";
+                break;        
+            case "documentType" :
+                $queryString = "fDocumentTypeID=$fDocumentTypeID";            
+                break;
+        }        
+        $sToRender .= "<td>" . generateLink($_SERVER["PHP_SELF"], "fBrowseType=$fBrowseType&$queryString&fSortBy=$key&fSortDirection=$sCurrentSortDirection", $displayText) . "</td>";                                    
+    }
     $sToRender .= "</tr>\n";
     return $sToRender;
@@ -284,19 +284,19 @@ function renderSortHeadings($sSortBy, $sSortDirection) {
  * @param boolean whether to display the complete path to the document or not
  */
 function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessage, $bDisplayFullPath = false, $bTemplateBrowsing = false) {
-	global $default;
+    global $default;
-	$iFolderCount = count($aResults["folders"]) - 1;
+    $iFolderCount = count($aResults["folders"]) - 1;
     // loop through the files and display links
     if (count($aResults["documents"]) > 0) {
         for ($i=0; $i<count($aResults["documents"]); $i++) {
-        	// in order for candy striping to work we need to take the number of folders
-        	// into account when alternating
-            $sToRender .= "<tr bgcolor=\"" . getColour($i+$iFolderCount) . "\" width=\"100%\"><td valign=\"bottom\">" . 
-            	"<input type=\"checkbox\" name=\"fDocumentIDs[]\" value=\"" . $aResults["documents"][$i]->getID() . "\"/>" .
-            			  ($bTemplateBrowsing ? displayDocumentLinkForTemplateBrowsing($aResults["documents"][$i], $bDisplayFullPath) : 
-            			  						displayDocumentLink($aResults["documents"][$i], $bDisplayFullPath)) . "</td>";
-                        
+            // in order for candy striping to work we need to take the number of folders
+            // into account when alternating
+            $sToRender .= "<tr bgcolor=\"" . getColour($i+$iFolderCount) . "\" width=\"100%\"><td valign=\"bottom\">" .
+                "<input type=\"checkbox\" name=\"fDocumentIDs[]\" value=\"" . $aResults["documents"][$i]->getID() . "\"/>" .
+                          ($bTemplateBrowsing ? displayDocumentLinkForTemplateBrowsing($aResults["documents"][$i], $bDisplayFullPath) :
+                                                  displayDocumentLink($aResults["documents"][$i], $bDisplayFullPath)) . "</td>";
+
             // #3425 the title is now the filename, and the description is the title
             $sToRender .= "<td valign=\"bottom\">" . $aResults["documents"][$i]->getName() . "</td>";
             $oCreator = User::get($aResults["documents"][$i]->getCreatorID());
@@ -305,24 +305,24 @@ function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessa
             $sToRender .= "<td valign=\"bottom\">" . $aDocumentTransaction[0]->dDateTime . "</td>";
             $oDocumentType = DocumentType::get($aResults["documents"][$i]->getDocumentTypeID());
             if ($oDocumentType) {
-            	$sToRender .= "<td valign=\"bottom\">" . $oDocumentType->getName() . "</td>";
+                $sToRender .= "<td valign=\"bottom\">" . $oDocumentType->getName() . "</td>";
             }
             $sToRender .= "</tr>\n";
         }
-		$sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
-		$sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");    
+        $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
+        $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
-		$sToRender .= "<tr bgcolor=\"". $sTDBGColour . "\"><td colspan=\"5\" valign=\"bottom\">" . 
-					  "<input type=\"checkbox\" name=\"selectall\" onClick=\"selectAll()\"/> " . _("Select all documents") . "</td></tr>";
+        $sToRender .= "<tr bgcolor=\"". $sTDBGColour . "\"><td colspan=\"5\" valign=\"bottom\">" .
+                      "<input type=\"checkbox\" name=\"selectall\" onClick=\"selectAll()\"/> " . _("Select all documents") . "</td></tr>";
-		$sToRender .= "<tr><td colspan=\"5\" >";
-		$sToRender .= "<input type=\"hidden\" name=\"fActions\">";
+        $sToRender .= "<tr><td colspan=\"5\" >";
+        $sToRender .= "<input type=\"hidden\" name=\"fActions\">";
-		$sToRender .= "<input type=\"image\" onclick=\"document.MainForm.fActions.value='move'; document.MainForm.submit()\" src=\"" . KTHtml::getMoveButton() . "\" border=\"0\"/>";
-		$sToRender .= "<input type=\"image\" onclick=\"document.MainForm.fActions.value='delete'; document.MainForm.submit()\" src=\"" . KTHtml::getDeleteButton() . "\" border=\"0\"/>";
-		$sToRender .= "</td></tr>\n";
-		// Change for group Operations
+        $sToRender .= "<input type=\"image\" onclick=\"document.MainForm.fActions.value='move'; document.MainForm.submit()\" src=\"" . KTHtml::getMoveButton() . "\" border=\"0\"/>";
+        $sToRender .= "<input type=\"image\" onclick=\"document.MainForm.fActions.value='delete'; document.MainForm.submit()\" src=\"" . KTHtml::getDeleteButton() . "\" border=\"0\"/>";
+        $sToRender .= "</td></tr>\n";
+        // Change for group Operations
     } else if ($aResults["accessDenied"]) {
@@ -338,11 +338,11 @@ function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessa
  * Appends folder and document counts to the last folder path
  */
 function appendCounts($aFolderPath, $iFolderCount, $iDocumentCount) {
-	// append to the last path component and return
-	$aFolderPath[count($aFolderPath)-1] = $aFolderPath[count($aFolderPath)-1] . 
-										  " ($iFolderCount folder" . (($iFolderCount > 1) || ($iFolderCount == 0) ? "s" : "") . 
-										  ", $iDocumentCount document" . (($iDocumentCount > 1) || ($iDocumentCount == 0) ? "s" : "") . ")";
-	return $aFolderPath;
+    // append to the last path component and return
+    $aFolderPath[count($aFolderPath)-1] = $aFolderPath[count($aFolderPath)-1] .
+        " ($iFolderCount folder" . (($iFolderCount > 1) || ($iFolderCount == 0) ? "s" : "") .
+        ", $iDocumentCount document" . (($iDocumentCount > 1) || ($iDocumentCount == 0) ? "s" : "") . ")";
+    return $aFolderPath;
 }
 /**
@@ -356,12 +356,12 @@ function appendCounts($aFolderPath, $iFolderCount, $iDocumentCount) {
 function renderPage($aResults, $sBrowseType, $sSortBy, $sSortDirection, $bTemplateBrowsing = false) {
     global $default;
-    
-	$sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
-	$sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");    
+
+    $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
+    $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
     $sToRender = renderHeading(_("Browse collection"));
-    
+
     // Script function to select all documents
     $sToRender = "\n\n<SCRIPT LANGUAGE=\"javascript\">\n ";
     $sToRender .= "<!--\n";
@@ -377,34 +377,46 @@ function renderPage($aResults, $sBrowseType, $sSortBy, $sSortDirection, $bTempla
     $sToRender .= "//-->\n";
     $sToRender .= "</SCRIPT>\n\n";
-    $sToRender .= "<table border=\"0\" cellpadding=\"5\" width=\"100%\"><tr><td bgcolor=\"$sTDBGColour\">"; 
+    $sToRender .= "<table border=\"0\" cellpadding=\"5\" width=\"100%\"><tr><td bgcolor=\"$sTDBGColour\">";
     switch ($sBrowseType) {
-        case "folder"       : $sToRender .= displayFolderPathLink(Folder::getFolderPathAsArray($aResults["folders"][0]->getID()),
-        														  appendCounts(Folder::getFolderPathNamesAsArray($aResults["folders"][0]->getID()), 
-        														  count($aResults["folders"])-1,
-        														  count($aResults["documents"]))); break;
-        case "category"     : $sToRender .= displayCategoryPathLink($aResults["categories"]); break;
-        case "documentType" : $sToRender .= displayDocumentTypePathLink($aResults["documentTypes"]); break;
+        case "folder":
+            $sToRender .= displayFolderPathLink(Folder::getFolderPathAsArray($aResults["folders"][0]->getID()),
+                appendCounts(Folder::getFolderPathNamesAsArray($aResults["folders"][0]->getID()),
+                count($aResults["folders"])-1, count($aResults["documents"])));
+                break;
+        case "category":
+            $sToRender .= displayCategoryPathLink($aResults["categories"]);
+            break;
+        case "documentType":
+            $sToRender .= displayDocumentTypePathLink($aResults["documentTypes"]);
+            break;
     }
     $sToRender .= "</td></tr></table>\n";
-    
-    // browse type select 
-   	$sToRender .=  "<table border=\"0\" width=\"100%\">\n";
+
+    // browse type select
+    $sToRender .=  "<table border=\"0\" width=\"100%\">\n";
     $sToRender .= "\t<tr><td bgcolor=\"$sTDBGColour\">" . renderBrowseTypeSelect($sBrowseType) . "</td></tr>";
     $sToRender .= "\t</table>";
-    	
+        
     // display folders|documents
-	$sToRender .= "<table border=\"0\" width=\"100%\">\n";
-	$sToRender .= renderSortHeadings($sSortBy, $sSortDirection);	
-	$sToRender .= "<tr><td>\n";    
+    $sToRender .= "<table border=\"0\" width=\"100%\">\n";
+    $sToRender .= renderSortHeadings($sSortBy, $sSortDirection);    
+    $sToRender .= "<tr><td>\n";
     switch ($sBrowseType) {
-        case "folder"       : $sToRender .= renderFolderResults($aResults, $bTemplateBrowsing); break;
-        case "category"     : $sToRender .= renderCategoryResults($aResults); break;
-        case "documentType" : $sToRender .= renderDocumentTypeResults($aResults); break;
+        case "folder":
+            $sToRender .= renderFolderResults($aResults, $bTemplateBrowsing);
+            break;
+        case "category":
+            $sToRender .= renderCategoryResults($aResults);
+            break;
+        case "documentType":
+            $sToRender .= renderDocumentTypeResults($aResults);
+            break;
     }
     $sToRender .= "</tr></td>\n";
     $sToRender .= "\t</table>";
-    
+
     return $sToRender;
 }
+
 ?>