From 8549dccd52c95045a72a4139404411da85424e28 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 20 Apr 2015 16:24:59 +0200
Subject: [PATCH] Fixed the order and hierarchy of groups in group view

---
 pandora_console/include/functions_modules.php |  2 ++
 pandora_console/include/functions_users.php   |  7 ++++--
 .../operation/agentes/group_view.php          | 24 +++++++++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 78b560ead0..dade8717c3 100644
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -1631,6 +1631,8 @@ function modules_get_previous_data ($id_agent_module, $utimestamp = 0, $string =
 		ORDER BY utimestamp DESC',
 		$id_agent_module, $utimestamp, $utimestamp - SECONDS_2DAY);
 	
+	
+	
 	$search_in_history_db = db_search_in_history_db($utimestamp);
 	
 	return db_get_row_sql ($sql, $search_in_history_db);
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index 04d992d16f..ebc8138707 100644
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -137,7 +137,10 @@ function users_get_groups_for_select($id_user,  $privilege = "AR", $returnAllGro
  *
  * @return array A list of the groups the user has certain privileges.
  */
-function users_get_groups ($id_user = false, $privilege = "AR", $returnAllGroup = true, $returnAllColumns = false, $id_groups = null, $keys_field = 'id_grupo') {
+function users_get_groups ($id_user = false, $privilege = "AR",
+	$returnAllGroup = true, $returnAllColumns = false, $id_groups = null,
+	$keys_field = 'id_grupo') {
+	
 	if (empty ($id_user)) {
 		global $config;
 		
@@ -159,7 +162,7 @@ function users_get_groups ($id_user = false, $privilege = "AR", $returnAllGroup
 		$groups = db_get_all_rows_filter('tgrupo', array('id_grupo' => $list_id_groups, 'order' => 'parent, nombre'));
 	}
 	else {
-		$groups = db_get_all_rows_in_table ('tgrupo', 'parent, nombre');
+		$groups = db_get_all_rows_in_table ('tgrupo', array('parent', 'nombre'));
 	}
 	
 	$user_groups = array ();
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index 00a027de51..106fb5b8b6 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -53,7 +53,16 @@ if (isset ($_GET["update_netgroup"])) {
 }
 
 // Get group list that user has access
-$groups_full = users_get_groups ($config['id_user'], "AR", true, true);
+$groups_full = users_get_groups ($config['id_user'], "AR", true, true,
+	null, 'id_grupo', true);
+
+foreach ($groups_full as $i => $g) {
+	if ($g['id_grupo'] == 0) {
+		$groups_full[$i]['parent'] = -1;
+	}
+}
+
+$groups_full = sort_by_hierarchy($groups_full);
 
 $groups = array();
 foreach ($groups_full as $group) {
@@ -140,5 +149,16 @@ else {
 		"</div>";
 }
 
+function sort_by_hierarchy($groups, $parent = -1) {
+	$return = array();
+	foreach ($groups as $g) {
+		if ($g['parent'] == $parent) {
+			$return[] = $g;
+			
+			$return = array_merge($return, sort_by_hierarchy($groups, $g['id_grupo']));
+		}
+	}
+	
+	return $return;
+}
 ?>
-