Merge lp:~simonsp/ocsinventory-ocsreports/fix-sort-tag-page into lp:ocsinventory-ocsreports/stable-1.3

[Paul W. Simons]

This fixes an issue where the tag would silently not sort as can be seen in ver 1.02, and fixes the issue where sorting on Computer count causes an SQL error which can be seen after revision 6 in ocsreports-stable.

The security fix in revision number 6 escaped the quotes in $_POST and $_GET. This caused the sql to break when trying to sort on the tag page by Computer count.

Code was put in place to handle sorting of Computer count differently. This patch removes that code so that sorting on Computer count doesn't send the language file entry as the contents to be sorted, eg. "Computer count" (with the quotes), and instead treats it the way all other sorts are treated.

I checked the trunk branch, and this bug does not exist there. The trunk properly sorts on the tag page.

Unmerged revisions

48. By Paul W. Simons on 2010-03-12

This fixes an issue where the tag would silently not sort as can be seen in ver 1.02, and fixes the issue where sorting on Computer count causes an SQL error which can be seen after revision 6 in ocsreports-stable.

The security fix in revision number 6 escaped the quotes in $_POST and $_GET. This caused the sql to break when trying to sort on the tag page by Computer count.

Code was put in place to handle sorting of Computer count differently. This patch removes that code so that sorting on Computer count doesn't send the language file entry as the contents to be sorted, eg. "Computer count" (with the quotes), and instead treats it the way all other sorts are treated.

=== modified file 'preferences.php'
--- preferences.php	2010-02-10 16:14:58 +0000
+++ preferences.php	2010-03-12 21:55:22 +0000
@@ -584,19 +584,18 @@
 				$isDateTime[$colname->name] =($colname->type == "datetime" || $colname->type == "timestamp" ? 1 : 0);
 
 				if($sortable) {	
-					if( ! in_array($colname->name, array($l->g(28)) ) ) {// Not grouping requests
-						$vraiNomChamp = array_search( $colname->name, $_SESSION["storedRequest"]->select );
-											
-						/*if( ! $vraiNomChamp ) {
-							$ind = array_search( $colname->name, $_SESSION["currentRegistry"] );
-							$vraiNomChamp = urlencode("\"".$_SESSION["currentRegistry"][$ind]."\"");
-						}*/
-								
-						if( ! $vraiNomChamp )
-							$vraiNomChamp = array_search( $colname->name, $_SESSION["currentFieldList"] );							
-						}
-					else					
-						$vraiNomChamp = "\"".$colname->name."\"";
+					//With the security fix (Revisions 5,6 stable) not sorting on group requests
+					//will actually cause sql errors, and not display the page.  Just allow group
+					//request sorting.
+					$vraiNomChamp = array_search( $colname->name, $_SESSION["storedRequest"]->select );
+
+					/*if( ! $vraiNomChamp ) {
+						$ind = array_search( $colname->name, $_SESSION["currentRegistry"] );
+						$vraiNomChamp = urlencode("\"".$_SESSION["currentRegistry"][$ind]."\"");
+					}*/
+
+					if( ! $vraiNomChamp )
+						$vraiNomChamp = array_search( $colname->name, $_SESSION["currentFieldList"] );
 					//echo "if( $vraiNomChamp == ".$_SESSION["c"]." || \"\'\".".$colname->name.".\"\'\" == ".$_SESSION["c"]." ) \";";
 					echo "<td align='center'><table><tr><td>";
 					$hrefSort = "<a href=index.php?$pref&c=".urlencode($vraiNomChamp)."&a=$a&rev=1&page=1>";