From 6fdde3a7b7c3c1ab56b02431e4387cb238c4424c Mon Sep 17 00:00:00 2001
From: hkosaka <kosaka@rworks.jp>
Date: Tue, 30 Oct 2012 09:32:35 +0000
Subject: [PATCH] 2012-10-30  Hirofumi Kosaka <kosaka@rworks.jp>

	* lib/PandoraFMS/Core.pm, util/pandora_manage.pl: Added
	'description' parameter to '--create_group' CLI.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7111 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_server/ChangeLog              | 5 +++++
 pandora_server/lib/PandoraFMS/Core.pm | 8 ++++----
 pandora_server/util/pandora_manage.pl | 9 +++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index d88f82df2f..0df5bd831f 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-30  Hirofumi Kosaka <kosaka@rworks.jp>
+
+	* lib/PandoraFMS/Core.pm, util/pandora_manage.pl: Added
+	'description' parameter to '--create_group' CLI.
+
 2012-10-29  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/NetworkServer.pm,
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 0680479664..45c72c54f4 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -2124,11 +2124,11 @@ sub pandora_update_table_from_hash ($$$$$$) {
 ##########################################################################
 ## Create a group
 ##########################################################################
-sub pandora_create_group ($$$$$$$$) {
-	my ($name, $icon, $parent, $propagate, $disabled, $custom_id, $id_skin, $dbh) = @_;
+sub pandora_create_group ($$$$$$$$$) {
+	my ($name, $icon, $parent, $propagate, $disabled, $custom_id, $id_skin, $description, $dbh) = @_;
 	
-	my $group_id = db_insert ($dbh, 'id_grupo', 'INSERT INTO tgrupo (nombre, icon, parent, propagate, disabled, custom_id, id_skin) VALUES (?, ?, ?, ?, ?, ?, ?)', safe_input($name), $icon, 
-			$parent, $propagate, $disabled, $custom_id, $id_skin);
+	my $group_id = db_insert ($dbh, 'id_grupo', 'INSERT INTO tgrupo (nombre, icon, parent, propagate, disabled, custom_id, id_skin, description) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', safe_input($name), $icon, 
+			$parent, $propagate, $disabled, $custom_id, $id_skin, $description);
 				 
 	return $group_id;
 }
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index efd683d5ce..e5139fbb2e 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -87,7 +87,7 @@ sub help_screen{
 	help_screen_line('--delete_agent', '<agent_name>', 'Delete agent');
 	help_screen_line('--disable_group', '<group_name>', 'Disable agents from an entire group');
    	help_screen_line('--enable_group', '<group_name>', 'Enable agents from an entire group');
-    help_screen_line('--create_group', '<group_name> [<parent_group_name> <icon>]', 'Create an agent group');
+    help_screen_line('--create_group', '<group_name> [<parent_group_name> <icon> <description>]', 'Create an agent group');
 	help_screen_line('--stop_downtime', '<downtime_name>', 'Stop a planned downtime');
 	help_screen_line('--get_agent_group', '<agent_name>', 'Get the group name of an agent');
 	help_screen_line('--get_agent_modules', '<agent_name>', 'Get the modules of an agent');
@@ -2972,7 +2972,7 @@ sub cli_policy_add_agent() {
 ##############################################################################
 
 sub cli_create_group() {
-	my ($group_name,$parent_group_name,$icon) = @ARGV[2..4];
+	my ($group_name,$parent_group_name,$icon,$description) = @ARGV[2..5];
 		
 	my $group_id = get_group_id($dbh,$group_name);
 	non_exist_check($group_id, 'group name', $group_name);
@@ -2985,8 +2985,9 @@ sub cli_create_group() {
 	}
 
 	$icon = '' unless defined($icon);
+	$description = '' unless defined($description);
 
-	$group_id = pandora_create_group ($group_name, $icon, $parent_group_id, 0, 0, '', 0, $dbh);
+	$group_id = pandora_create_group ($group_name, $icon, $parent_group_id, 0, 0, '', 0, $description, $dbh);
 
 	if($group_id == -1) {
 		print "[ERROR] A problem has been ocurred creating group '$group_name'\n\n";
@@ -3357,7 +3358,7 @@ sub pandora_manage_main ($$$) {
 			cli_disable_policy_alerts();
 		}
 		elsif ($param eq '--create_group') {
-			param_check($ltotal, 3, 2);
+			param_check($ltotal, 4, 3);
 			cli_create_group();
 		}
 		elsif ($param eq '--add_agent_to_policy') {