KTC-230

"ZendGuard 5.0.0 array_multisort bug is breaking encoding." Fixed. Used two sorts instead of multisort. Committed By: Kevin Fourie Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7132 c91229c3-7414-0410-bfa2-8a42b809f60b

KTC-230
"ZendGuard 5.0.0 array_multisort bug is breaking encoding." Fixed. Used two sorts instead of multisort. Committed By: Kevin Fourie Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7132 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 98518d46
Showing 1 changed file with 26 additions and 26 deletions
lib/session/SiteMap.inc
@@ -8,7 +8,7 @@
  * License Version 1.1.2 ("License"); You may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
  * http://www.knowledgetree.com/KPL
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
  * See the License for the specific language governing rights and
@@ -19,9 +19,9 @@
  *    (ii) the KnowledgeTree copyright notice
  * in the same form as they appear in the distribution.  See the License for
  * requirements.
- * 
+ *
  * The Original Code is: KnowledgeTree Open Source
- * 
+ *
  * The Initial Developer of the Original Code is The Jam Warehouse Software
  * (Pty) Ltd, trading as KnowledgeTree.
  * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
@@ -50,12 +50,12 @@ class SiteMap {
      * Whether to use the database to store the sitemap or not
      */
     var $bUseDB;
-    
+
      /**
      * Whether to the user accessing the page is a Sysadmin
      */
     var $isSysAdmin;
-    
+
      /**
      * * Whether to the user accessing the page is a Unitadmin
      */
@@ -78,7 +78,7 @@ class SiteMap {
     /**
      * Sets the database flag
      *
-     * @param boolean whether to use the database to store the sitemap or not     
+     * @param boolean whether to use the database to store the sitemap or not
      */
     function setUseDB($bUseDB) {
         $this->bUseDB = $bUseDB;
@@ -111,12 +111,12 @@ class SiteMap {
                     "order" => $iOrder);
         }
     }
-	
+
 	function addSectionColour($sSectionName, $sHtmlElement, $sColour) {
-		$this->aSectionColours[$sSectionName][$sHtmlElement] = $sColour;		
+		$this->aSectionColours[$sSectionName][$sHtmlElement] = $sColour;
 	}
-	
-	function getSectionColour($sSectionName, $sHtmlElement) {		
+
+	function getSectionColour($sSectionName, $sHtmlElement) {
 		return $this->aSectionColours[$sSectionName][$sHtmlElement];
 	}
@@ -127,7 +127,7 @@ class SiteMap {
      * @param string the corresponding page for this action
      * @param string the section this page falls under
      * @param int    the minimum access needed to access this page
-     * @param string description of the page for link presentation     
+     * @param string description of the page for link presentation
      */
     function addDefaultPage($sAction, $sPage, $sSectionName, $sRequiredAccess, $sLinkText, $bEnabled = true, $iOrder = 0) {
         if (!$this->bUseDB) {
@@ -153,7 +153,7 @@ class SiteMap {
     /**
      * Returns controller links for a section.
      * Checks whether to use the db or not and calls the appropriate method
-     * 
+     *
      * @param string the section to return links for
      */
     function getSectionLinks($sSectionName, $bSortLinks = true) {
@@ -195,7 +195,7 @@ class SiteMap {
                         if (strlen($sql->f("link_text")) > 0) {
                             $results["descriptions"][] = $sql->f("link_text");
                             // if fFolderID is set and fFolderID is in the page string
-                            // append folderID to the controller link                            
+                            // append folderID to the controller link
                             $results["links"][] = isset($iFolderID) ? generateControllerLink($sql->f("action"), "fFolderID=$iFolderID") : generateControllerLink($sql->f("action"), "");
                         }
                     }
@@ -244,11 +244,11 @@ class SiteMap {
                                 ($pages[$action]["enabled"]) && (!$pages[$action]["default"])) {
                             if (!$bSortLinks) {
 	                            $results["descriptions"][$pages[$action]["order"]] = $pages[$action]["description"];
-	                            
+
 	                            $results["links"][$pages[$action]["order"]] = isset($iFolderID) ? generateControllerLink($action, "fFolderID=$iFolderID") : generateControllerLink($action, "");
                             } else {
 	                            $results["descriptions"][] = $pages[$action]["description"];
-	                            
+
 	                            $results["links"][] = isset($iFolderID) ? generateControllerLink($action, "fFolderID=$iFolderID") : generateControllerLink($action, "");
                             }
                         }
@@ -258,9 +258,9 @@ class SiteMap {
             // now check if we have anything in the results array before returning it
             if (count($results) > 0) {
             	if ($bSortLinks) {
-	            	// alpha sort the results 
-	            	array_multisort ($results["descriptions"], SORT_ASC,
-	            	 				 $results["links"], SORT_ASC); 
+	            	// alpha sort the results
+	            	sort($results["descriptions"], SORT_ASC);
+	            	sort($results["links"], SORT_ASC);
 					reset ($results);
             	}
                 return $results;
@@ -272,7 +272,7 @@ class SiteMap {
             return false;
         }
     }
-    
+
     /**
      * Returns the link text for a page
      *
@@ -298,12 +298,12 @@ class SiteMap {
                     }
                 }
             }
-        }    	
+        }
     }
-    
+
     /**
      * Returns the page mapped to the (action, groupName) pair.
-     * Checks whether to use the db or not and calls the appropriate method     
+     * Checks whether to use the db or not and calls the appropriate method
      *
      * @param string the action to lookup pages for
      * @return string the page to redirect to, or false if the user doesn't have access to the page
@@ -383,7 +383,7 @@ class SiteMap {
     /**
      * Returns the section name of the supplied page
-     * Checks whether to use the db or not and calls the appropriate method     
+     * Checks whether to use the db or not and calls the appropriate method
      *
      * @param string the page to lookup the section for
      */
@@ -443,7 +443,7 @@ class SiteMap {
     /**
      * Returns the default action for the supplied section
-     * Checks whether to use the db or not and calls the appropriate method     
+     * Checks whether to use the db or not and calls the appropriate method
      *
      * @param string the section name to return the default action for
      * @return string the controller action for the default page for this section
@@ -629,7 +629,7 @@ class SiteMap {
                 $aFieldValue = array(
                     'name' => $section,
                 );
-                $id =& DBUtil::autoInsert($default->site_sections_table, $aFieldValues);
+                $id = DBUtil::autoInsert($default->site_sections_table, $aFieldValues);
                 // $default->log->debug("Sitemap::syncWithDB insert=$sSectionSql");
@@ -653,7 +653,7 @@ class SiteMap {
                             is_default => $page["default"],
                             is_enabled => $page["enabled"],
                         );
-                        $id =& DBUtil::autoInsert($default->sitemap_table, $aFieldValues);
+                        $id = DBUtil::autoInsert($default->sitemap_table, $aFieldValues);
                         if (PEAR::isError($id)) {
                             $default->log->debug("Sitemap::syncWithDB sitemap insert failed ($sSiteMapSql)");
                         } else {