From 564ec42c33093984625b7f749c53a2f4929397de Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 9 Sep 2010 14:07:21 +0000
Subject: [PATCH] 2010-09-09  Miguel de Dios  <miguel.dedios@artica.es>

	* godmode/setup/os.list.php, godmode/setup/os.builder.php,
	godmode/setup/os.php: changed the source code and added "os.builder.php" and
	"os.list.php" for to change the management page for to be a "tab page".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3235 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                    |   6 +
 pandora_console/godmode/setup/os.builder.php |  79 ++++++++++
 pandora_console/godmode/setup/os.list.php    |  59 +++++++
 pandora_console/godmode/setup/os.php         | 156 +++++--------------
 4 files changed, 181 insertions(+), 119 deletions(-)
 create mode 100644 pandora_console/godmode/setup/os.builder.php
 create mode 100644 pandora_console/godmode/setup/os.list.php

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 2f55634129..ffba6435fd 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-09  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* godmode/setup/os.list.php, godmode/setup/os.builder.php,
+	godmode/setup/os.php: changed the source code and added "os.builder.php" and
+	"os.list.php" for to change the management page for to be a "tab page".
+
 2010-09-09  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/functions_networkmap.php: cleaned source code.
diff --git a/pandora_console/godmode/setup/os.builder.php b/pandora_console/godmode/setup/os.builder.php
new file mode 100644
index 0000000000..8d8cb203d6
--- /dev/null
+++ b/pandora_console/godmode/setup/os.builder.php
@@ -0,0 +1,79 @@
+<?php 
+
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation for version 2.
+// 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.
+
+// Load global vars
+global $config;
+
+check_login ();
+
+if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
+	audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation", "Trying to access Setup Management");
+	require ("general/noaccess.php");
+	return;
+}
+
+echo '<form id="form_setup" method="post">';
+$table = null;
+$table->width = '50%';
+
+$table->style[0] = 'font-weight: bolder; vertical-align: top;';
+
+$table->data[0][0] = __('Name:');
+$table->data[0][1] = print_input_text('name', $name, __('Name'), 20, 30, true);
+$table->data[1][0] = __('Description');
+$table->data[1][1] = print_textarea('description', 5, 10, $description, '', true);
+$icons = get_list_os_icons_dir();
+$table->data[2][0] = __('Icon');
+$table->data[2][1] = print_select($icons, 'icon',  $icon, 'show_icon_OS();', __('None'), 0, true);
+$table->data[2][1] .= ' <span id="icon_image">' . print_os_icon($idOS, false, true) . '</span>';
+
+echo '<form action="post">';
+print_table($table);
+
+print_input_hidden('id_os', $idOS);
+print_input_hidden ('action', $actionHidden);
+
+echo '<div class="action-buttons" style="width: '.$table->width.'">';
+print_submit_button ($textButton, 'update_button', false, $classButton);
+echo '</div>';
+echo '</form>';
+
+function get_list_os_icons_dir() {
+	global $config;
+	
+	$return = array();
+	
+	$items = scandir($config['homedir'] . '/images/os_icons');
+	
+	foreach ($items as $item) {
+		if (strstr($item, '_small.png') || strstr($item, '_small.gif')
+			|| strstr($item, '_small.jpg')) {
+			continue;
+		}
+		if (strstr($item, '.png') || strstr($item, '.gif')
+			|| strstr($item, '.jpg')) {
+			$return[$item] = $item;
+		}
+	}
+	
+	return $return;
+}
+?>
+<script type="text/javascript">
+
+function show_icon_OS() {
+	$("#icon_image").html('<img src="images/os_icons/' + $("#icon").val() + '" />');
+}
+</script>
\ No newline at end of file
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
new file mode 100644
index 0000000000..6919a1c301
--- /dev/null
+++ b/pandora_console/godmode/setup/os.list.php
@@ -0,0 +1,59 @@
+<?php 
+
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation for version 2.
+// 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.
+
+// Load global vars
+global $config;
+
+check_login ();
+
+if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
+	audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation", "Trying to access Setup Management");
+	require ("general/noaccess.php");
+	return;
+}
+
+$table = null;
+
+$table->width = '80%';
+$table->head[0] = '';
+$table->head[1] = __('Name');
+$table->head[2] = __('Description');
+$table->head[3] = '';
+$table->align[0] = 'center';
+$table->align[3] = 'center';
+$table->size[0] = '20px';
+$table->size[3] = '20px';
+
+$osList = get_db_all_rows_in_table('tconfig_os');
+
+$table->data = array();
+foreach ($osList as $os) {
+	$data = array();
+	$data[] = print_os_icon($os['id_os'], false, true);
+	$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=edit&tab=builder&id_os=' . $os['id_os'] . '">' . safe_output($os['name']) . '</a>';
+	$data[] = printTruncateText(safe_output($os['description']), 25, true, true);
+	if ($os['id_os'] > 13) {
+		$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=delete&tab=list&id_os=' . $os['id_os'] . '"><img src="images/cross.png" /></a>';
+	}
+	else {
+		//The original icons of pandora don't delete.
+		$data[] = '';
+	}
+	
+	$table->data[] = $data;
+}
+
+print_table($table);
+?>
\ No newline at end of file
diff --git a/pandora_console/godmode/setup/os.php b/pandora_console/godmode/setup/os.php
index 7e4931bf5f..e17f5dd74e 100644
--- a/pandora_console/godmode/setup/os.php
+++ b/pandora_console/godmode/setup/os.php
@@ -26,6 +26,7 @@ if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_use
 
 $action = get_parameter('action', 'new');
 $idOS = get_parameter('id_os', 0);
+$tab = get_parameter('tab', 'builder');
 
 if ($idOS) {
 	$os = get_db_row_filter('tconfig_os', array('id_os' => $idOS));
@@ -39,8 +40,7 @@ else {
 	$icon = get_parameter('icon',0);
 }
 
-// Header
-print_page_header(__('Edit OS'), "", false, "", true);
+$message = '';
 
 switch ($action) {
 	default:
@@ -65,17 +65,15 @@ switch ($action) {
 		$resultOrId = process_sql_insert('tconfig_os', $values);
 		
 		if ($resultOrId === false) {
-			print_error_message(__('Fail to create OS'));
+			$message = print_error_message(__('Fail to create OS'), '', true);
+			$tab = 'builder';
 			$actionHidden = 'save';
 			$textButton = __('Create');
 			$classButton = 'class="sub next"';
 		}
 		else {
-			$idOs = $resultOrId;
-			print_success_message(__('Success to create OS'));
-			$actionHidden = 'update';
-			$textButton = __('Update');
-			$classButton = 'class="sub upd"';
+			$message = print_success_message(__('Success to create OS'), '', true);
+			$tab = 'list';
 		}
 		break;
 	case 'update':
@@ -92,7 +90,10 @@ switch ($action) {
 		}
 		$result = process_sql_update('tconfig_os', $values, array('id_os' => $idOS));
 		
-		print_result_message($result, __('Success to update OS'), __('Error to update OS'));
+		$message = print_result_message($result, __('Success to update OS'), __('Error to update OS'), '', true);
+		if ($result !== false) {
+			$tab = 'list';
+		}
 		
 		$actionHidden = 'update';
 		$textButton = __('Update');
@@ -104,125 +105,42 @@ switch ($action) {
 		$count = $count[0]['count'];
 		
 		if ($count > 0) {
-			print_error_message(__('There are agents with this OS.'));
+			$message = print_error_message(__('There are agents with this OS.'), '', true);
 		}
 		else {
 			$result = (bool)process_sql_delete('tconfig_os', array('id_os' => $idOS));
 			
-			print_result_message($result, __('Success to delete'), __('Error to delete'));
+			$message = print_result_message($result, __('Success to delete'), __('Error to delete'), '', true);
 		}
-		
-		$idOS = 0;
-		$name = get_parameter('name', '');
-		$description = get_parameter('description', '');
-		$icon = get_parameter('icon',0);
-		
-		$actionHidden = 'save';
-		$textButton = __('Create');
-		$classButton = 'class="sub next"';
 		break;
 }
 
-$table = null;
+$buttons = array(
+	'list' => array(
+		'active' => false,
+		'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&tab=list">' . 
+			print_image ("images/god6.png", true, array ("title" => __('List OS'))) .'</a>'),
+	'builder' => array(
+		'active' => false,
+		'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&tab=builder">' . 
+			print_image ("images/config.png", true, array ("title" => __('Builder OS'))) .'</a>'));
 
-$table->width = '80%';
-$table->head[0] = '';
-$table->head[1] = __('Name');
-$table->head[2] = __('Description');
-$table->head[3] = '';
-$table->align[0] = 'center';
-$table->align[3] = 'center';
-$table->size[0] = '20px';
-$table->size[3] = '20px';
+			
+$buttons[$tab]['active'] = true;
 
-$osList = get_db_all_rows_in_table('tconfig_os');
+// Header
+print_page_header(__('Edit OS'), "", false, "", true, $buttons);
 
-$table->data = array();
-foreach ($osList as $os) {
-	$data = array();
-	$data[] = print_os_icon($os['id_os'], false, true);
-	$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=edit&id_os=' . $os['id_os'] . '">' . safe_output($os['name']) . '</a>';
-	$data[] = printTruncateText(safe_output($os['description']), 25, true, true);
-	if ($os['id_os'] > 13) {
-		$data[] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/os&action=delete&id_os=' . $os['id_os'] . '"><img src="images/cross.png" /></a>';
-	}
-	else {
-		//The original icons of pandora don't delete.
-		$data[] = '';
-	}
-	
-	$table->data[] = $data;
+echo $message;
+
+switch ($tab) {
+	case 'list':
+		require_once('godmode/setup/os.list.php');
+		return;
+		break;
+	case 'builder':
+		require_once('godmode/setup/os.builder.php');
+		return;
+		break;
 }
-
-$htmlListOS = print_table($table, true);
-
-toggle($htmlListOS,__('List of OS'), __('Toggle'));
-
-echo '<form id="form_setup" method="post">';
-unset($table->head);
-unset($table->align);
-unset($table->size);
-unset($table->data);
-
-$table->width = '50%';
-
-$table->style[0] = 'font-weight: bolder; vertical-align: top;';
-
-$table->data[0][0] = __('Name:');
-$table->data[0][1] = print_input_text('name', $name, __('Name'), 20, 30, true);
-$table->data[1][0] = __('Description');
-$table->data[1][1] = print_textarea('description', 5, 10, $description, '', true);
-$icons = get_list_os_icons_dir();
-$table->data[2][0] = __('Icon');
-$table->data[2][1] = print_select($icons, 'icon',  $icon, 'show_icon_OS();', __('None'), 0, true);
-$table->data[2][1] .= ' <span id="icon_image">' . print_os_icon($idOS, false, true) . '</span>';
-
-
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_button(__('New OS'), 'new_button', false, 'new_os();', 'class="sub add"');
-echo '</div>';
-echo '<form action="post">';
-print_table($table);
-
-print_input_hidden('id_os', $idOS);
-print_input_hidden ('action', $actionHidden);
-
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
-print_submit_button ($textButton, 'update_button', false, $classButton);
-echo '</div>';
-echo '</form>';
-
-function get_list_os_icons_dir() {
-	global $config;
-	
-	$return = array();
-	
-	$items = scandir($config['homedir'] . '/images/os_icons');
-	
-	foreach ($items as $item) {
-		if (strstr($item, '_small.png') || strstr($item, '_small.gif')
-			|| strstr($item, '_small.jpg')) {
-			continue;
-		}
-		if (strstr($item, '.png') || strstr($item, '.gif')
-			|| strstr($item, '.jpg')) {
-			$return[$item] = $item;
-		}
-	}
-	
-	return $return;
-}
-?>
-<script type="text/javascript">
-function new_os() {
-	location.href='<?php
-		if ($config['https']) echo "https://";
-		else echo "http://";
-		echo $_SERVER['SERVER_NAME'] . $config['homeurl'] . '/index.php?sec=gsetup&sec2=godmode/setup/os&action=new';
-		?>';
-}
-
-function show_icon_OS() {
-	$("#icon_image").html('<img src="images/os_icons/' + $("#icon").val() + '" />');
-}
-</script>
\ No newline at end of file
+?>
\ No newline at end of file