2009-03-31 Sancho Lerena <slerena@artica.es>

* include/styles/menu.css: Added icons for dashboard option (enterprise).
	
	* include/functions_config.php: Added support for round_corner option.
	
	* include/functions_db.php: Temporal support (not really work) for enterprise
	servers webcheck/goliat and inventory. This code should be corrected when
	make final dbstruct changes for new server_type numeric field.
	
	* include/functions_reports.php: Fixed an annoying notice.
	
	* index.php: Dashboard is not entered automatically on login in enterprise.
	
	* operation/events/events.php: Events from group 0 always displayed.
	
	* operation/servers/view_server.php: Icon for server status is now smaller.
	
	* operation/menu.php: New enterprise hook for Dashboard menu entry.
	
	* reporting/pchart_graph.php: Round corners on progressbar acording to
	setup option. Color of border is smoother.
	
	* godmode/setup/links.php: Fixed ACL condition (AND -> OR).
	
	* godmode/setup/setup.php: Fixed ACL. Moved visual options to other setup.
	
	* godmode/setup/filemgr.php: Fixed ACL condition (AND -> OR).
	
	* godmode/agentes/modificar_agente.php: Support for IP address search.
	
	* godmode/menu.php: Added new setup section for visual options.
	
	* godmode/setup/setup_visuals.php: New setup section for visual options.
	
	* images/mod_web_proc.png,
	  images/screenshot_not_found.jpg
	  images/mod_web_data.png
	  images/server_web.png: New icons added for enterprise options.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1580 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,43 @@
+2009-03-31  Sancho Lerena  <slerena@artica.es>
+
+	* include/styles/menu.css: Added icons for dashboard option (enterprise).
+	
+	* include/functions_config.php: Added support for round_corner option.
+	
+	* include/functions_db.php: Temporal support (not really work) for enterprise
+	servers webcheck/goliat and inventory. This code should be corrected when
+	make final dbstruct changes for new server_type numeric field.
+	
+	* include/functions_reports.php: Fixed an annoying notice.
+	
+	* index.php: Dashboard is not entered automatically on login in enterprise.
+	
+	* operation/events/events.php: Events from group 0 always displayed.
+	
+	* operation/servers/view_server.php: Icon for server status is now smaller.
+	
+	* operation/menu.php: New enterprise hook for Dashboard menu entry.
+	
+	* reporting/pchart_graph.php: Round corners on progressbar acording to
+	setup option. Color of border is smoother.
+	
+	* godmode/setup/links.php: Fixed ACL condition (AND -> OR).
+	
+	* godmode/setup/setup.php: Fixed ACL. Moved visual options to other setup.
+	
+	* godmode/setup/filemgr.php: Fixed ACL condition (AND -> OR).
+	
+	* godmode/agentes/modificar_agente.php: Support for IP address search.
+	
+	* godmode/menu.php: Added new setup section for visual options.
+	
+	* godmode/setup/setup_visuals.php: New setup section for visual options.
+	
+	* images/mod_web_proc.png,
+	  images/screenshot_not_found.jpg
+          images/mod_web_data.png
+          images/server_web.png: New icons added for enterprise options.
+      
 2009-03-31  Sancho Lerena <slerena@artica.es>
 
 	* operation/events/events.php: Fixed and allow to everybody to see

pandora_console/godmode/agentes/modificar_agente.php

@@ -106,7 +106,7 @@ echo "</td></table>";
 
 $search_sql = '';
 if ($search != ""){
-	$search_sql = " AND nombre LIKE '%$search%' ";
+	$search_sql = " AND ( nombre LIKE '%$search%' OR direccion LIKE '%$search%') ";
 } else {
 }
 

pandora_console/godmode/menu.php

@@ -152,13 +152,11 @@ if (give_acl ($config['id_user'], 0, "PM")) {
 	$menu["gsetup"]["id"] = "god-setup";
 	
 	$sub = array ();
-	
+
+	$sub["godmode/setup/setup_visuals"]["text"] = __('Visual styles');
 	$sub["godmode/setup/filemgr"]["text"] = __('File Manager');
-	
 	$sub["godmode/setup/links"]["text"] = __('Links');
-	
 	$sub["godmode/setup/news"]["text"] = __('Site news');
-	
 	$menu["gsetup"]["sub"] = $sub;
 }
 

pandora_console/godmode/setup/filemgr.php

@@ -21,7 +21,7 @@ require_once ("include/config.php");
 
 check_login ();
 
-if (! give_acl ($config['id_user'], 0, "PM") || ! is_user_admin ($config['id_user'])) {
+if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
 	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access File manager");
 	require ("general/noaccess.php");
 	exit;

pandora_console/godmode/setup/links.php

@@ -21,7 +21,7 @@ require_once ("include/config.php");
 
 check_login ();
 
-if (! give_acl ($config['id_user'], 0, "PM") || ! is_user_admin ($config['id_user'])) {
+if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
 	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Link Management");
 	require ("general/noaccess.php");
 	exit;

pandora_console/godmode/setup/setup.php

@@ -21,7 +21,7 @@ require_once ("include/config.php");
 
 check_login ();
 
-if (! give_acl ($config['id_user'], 0, "PM") || ! is_user_admin ($config['id_user'])) {
+if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
 	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Setup Management");
 	require ("general/noaccess.php");
 	return;
@@ -57,15 +57,6 @@ $table->data[1][1] .= print_input_text ('date_format', $config["date_format"], '
 $table->data[2][0] = __('Remote config directory');
 $table->data[2][1] = print_input_text ('remote_config', $config["remote_config"], '', 30, 100, true);
 
-$table->data[3][0] = __('Graph color (min)');
-$table->data[3][1] = print_input_text ('graph_color1', $config["graph_color1"], '', 8, 8, true);
-
-$table->data[4][0] = __('Graph color (avg)');
-$table->data[4][1] = print_input_text ('graph_color2', $config["graph_color2"], '', 8, 8, true);
-
-$table->data[5][0] = __('Graph color (max)');
-$table->data[5][1] = print_input_text ('graph_color3', $config["graph_color3"], '', 8, 8, true);
-
 $table->data[6][0] = __('SLA period (seconds)');
 $table->data[6][1] = print_input_text ('sla_period', $config["sla_period"], '', 8, 8, true);
 
@@ -75,21 +66,12 @@ $table->data[7][1] = print_input_text ('days_compact', $config["days_compact"],
 $table->data[8][0] = __('Max. days before purge');
 $table->data[8][1] = print_input_text ('days_purge', $config["days_purge"], '', 5, 5, true);
 
-$table->data[9][0] = __('Graphic resolution (1-low, 5-high)');
-$table->data[9][1] = print_input_text ('graph_res', $config["graph_res"], '', 5, 5, true);
-
 $table->data[10][0] = __('Compact interpolation in hours (1 Fine-20 bad)');
 $table->data[10][1] = print_input_text ('step_compact', $config["step_compact"], '', 5, 5, true);
 
 $table->data[11][0] = __('Auto login (Hash) password');
 $table->data[11][1] = print_input_text ('loginhash_pwd', $config["loginhash_pwd"], '', 15, 15, true);
 
-$table->data[13][0] = __('Style template');
-$table->data[13][1] = print_select (get_css_themes (), 'style', $config["style"].'.css', '', '', '', true);
-
-$table->data[14][0] = __('Block size for pagination');
-$table->data[14][1] = print_input_text ('block_size', $config["block_size"], '', 5, 5, true);
-
 $table->data[15][0] = __('Default hours for event view');
 $table->data[15][1] = print_input_text ('event_view_hr', $config["event_view_hr"], '', 5, 5, true);
 

pandora_console/godmode/setup/setup_visuals.php

@@ -0,0 +1,92 @@
+<?php 
+
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
+// Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
+// Please see http://pandora.sourceforge.net 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.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+// Load global vars
+require_once ("include/config.php");
+
+check_login ();
+
+if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
+	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Visual Setup Management");
+	require ("general/noaccess.php");
+	return;
+}
+
+// Load enterprise extensions
+enterprise_include ('godmode/setup/setup_visuals.php');
+
+/*
+ NOTICE FOR DEVELOPERS:
+ 
+ Update operation is done in config_process.php
+ This is done in that way so the user can see the changes inmediatly.
+ If you added a new token, please check update_config() in functions_config.php
+ to add it there.
+*/
+
+require_once ('include/functions_themes.php');
+
+echo "<h2>".__('Setup')." &gt; ";
+echo __('Visual configuration')."</h2>";
+
+$table->width = '90%';
+$table->data = array ();
+
+$table->data[1][0] = __('Date format string') . print_help_icon("date_format", true);
+$table->data[1][1] = '<em>'.__('Example').'</em> '.date ($config["date_format"]);
+$table->data[1][1] .= print_input_text ('date_format', $config["date_format"], '', 30, 100, true);
+
+$table->data[2][0] = __('Graph color (min)');
+$table->data[2][1] = print_input_text ('graph_color1', $config["graph_color1"], '', 8, 8, true);
+
+$table->data[3][0] = __('Graph color (avg)');
+$table->data[3][1] = print_input_text ('graph_color2', $config["graph_color2"], '', 8, 8, true);
+
+$table->data[4][0] = __('Graph color (max)');
+$table->data[4][1] = print_input_text ('graph_color3', $config["graph_color3"], '', 8, 8, true);
+
+$table->data[5][0] = __('Graphic resolution (1-low, 5-high)');
+$table->data[5][1] = print_input_text ('graph_res', $config["graph_res"], '', 5, 5, true);
+
+$table->data[6][0] = __('Style template');
+$table->data[6][1] = print_select (get_css_themes (), 'style', $config["style"].'.css', '', '', '', true);
+
+$table->data[7][0] = __('Block size for pagination');
+$table->data[7][1] = print_input_text ('block_size', $config["block_size"], '', 5, 5, true);
+
+$table->data[8][0] = __('Use round corners');
+$table->data[8][1] = print_checkbox ('round_corner', 1, $config["round_corner"], true);
+
+echo '<form id="form_setup" method="POST" action="index.php?sec=gsetup&amp;sec2=godmode/setup/setup_visuals">';
+print_input_hidden ('update_config', 1);
+print_table ($table);
+echo '<div class="action-buttons" style="width: '.$table->width.'">';
+print_submit_button (__('Update'), 'update_button', false, 'class="sub upd"');
+echo '</div>';
+echo '</form>';
+
+require_css_file ("color-picker");
+require_jquery_file ("colorpicker");
+?>
+<script language="javascript" type="text/javascript">
+$(document).ready (function () {
+	$("#form_setup #text-graph_color1").attachColorPicker();
+	$("#form_setup #text-graph_color2").attachColorPicker();
+	$("#form_setup #text-graph_color3").attachColorPicker();
+});
+</script>

pandora_console/include/functions_config.php

@@ -70,7 +70,7 @@ function update_config () {
 	if (! isset ($config['id_user']))
 		return false;
 	
-	if (! give_acl ($config['id_user'], 0, "PM") || ! is_user_admin ($config['id_user']))
+	if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user']))
 		return false;
 	
 	$update_config = (bool) get_parameter ('update_config');
@@ -105,6 +105,7 @@ function update_config () {
 	update_config_value ('loginhash_pwd', (string) get_parameter ('loginhash_pwd', $config["loginhash_pwd"]));
 	update_config_value ('https', (bool) get_parameter ('https'));
 	update_config_value ('compact_header', (bool) get_parameter ('compact_header'));
+	update_config_value ('round_corner', (bool) get_parameter ('round_corner'));
 }
 
 /**
@@ -212,7 +213,11 @@ function process_config () {
 	
 	if (isset ($_SESSION['id_usuario']))
 		$config["id_user"] = $_SESSION["id_usuario"];
-	
+
+	if (!isset ($config["round_corner"])) {
+		update_config_value ('round_corner', false);
+	}
+
 	if (!isset ($config["auth"])) {
 		require_once ($config["homedir"]."/include/auth/mysql.php");
 	} else {

pandora_console/include/functions_db.php

@@ -2713,6 +2713,14 @@ function get_server_info ($id_server = -1) {
 			$server["img"] = print_image ("images/plugin.png", true, array ("title" => __('Plugin Server')));
 			$server["type"] = "plugin";
 			$id_modulo = 4;
+		} elseif ($server['web_server'] == 1) {
+                        $server["img"] = print_image ("images/serverweb.png", true, array ("title" => __('WEB Server')));
+                        $server["type"] = "web";
+                        $id_modulo = 7;
+		} elseif ($server['inventory_server'] == 1) {
+                        $server["img"] = print_image ("images/page_white_text.png", true, array ("title" => __('Inventory Server')));
+                        $server["type"] = "inventory";
+                        $id_modulo = 0;
 		} else {
 			$server["img"] = '';
 			$server["type"] = "unknown";
@@ -2722,9 +2730,6 @@ function get_server_info ($id_server = -1) {
 		if ($server['master'] == 1) {
 			$server["img"] .= print_image ("images/master.png", true, array ("title" => __('Master Server')));
 		}
-		if ($server['checksum'] == 1){
-			$server["img"] .= print_image ("images/binary.png", true, array ("title" => __('MD5 Check')));
-		}
 		
 		if (empty ($modules_info[$server["id_server"]])) {
 			$server["modules"] = 0;

pandora_console/include/functions_reports.php

@@ -70,6 +70,7 @@ function get_reports ($filter = false, $fields = false) {
 	
 	$reports = array ();
 	$all_reports = get_db_all_rows_filter ('treport', $filter, $fields);
+	if ($all_reports !== FALSE)
 	foreach ($all_reports as $report){
 		if ($config['id_user'] != $report['id_user'] && ! give_acl ($config['id_user'], $report['id_group'], 'AR'))
 			continue;

pandora_console/include/styles/menu.css

@@ -89,6 +89,10 @@
 }
 
 /* Icons specified here */
+#icon_oper-dashboard {
+ 	background: #E9F3D2 url(../../images/house.png) no-repeat 4px 4px;
+}
+
 #icon_oper-agents {
 	background: #E9F3D2 url(../../images/bricks.png) no-repeat 4px 4px;
 }

pandora_console/index.php

@@ -221,9 +221,7 @@ if ($page != "") {
 		echo '<br /><strong class="error">'.__('Sorry! I can\'t find the page!').'</strong>';
 	}
 } else {
-	if (enterprise_hook ('load_logon_ok') === ENTERPRISE_NOT_HOOK) {
-		require ("general/logon_ok.php");
-	}
+	require ("general/logon_ok.php");
 }
 
 if ($config["pure"] == 0) {

pandora_console/operation/events/events.php

@@ -107,6 +107,8 @@ $groups = get_user_groups ($config["id_user"], "AR");
 // Add group "0".
 $groups[0]="System";
 
+$groups[0]="System";
+
 $event_view_hr = (int) get_parameter ("event_view_hr", $config["event_view_hr"]);
 $id_user_ack = get_parameter ("id_user_ack", 0);
 $group_rep = (int) get_parameter ("group_rep", 1);

pandora_console/operation/menu.php

@@ -29,7 +29,9 @@ $menu['class'] = 'operation';
 
 // Agent read, Server read
 if (give_acl ($config['id_user'], 0, "AR")) {
-	
+
+	enterprise_hook ('dashboard_menu');
+
 	//View agents
 	$menu["estado"]["text"] = __('View agents');
 	$menu["estado"]["sec2"] = "operation/agentes/tactical";

pandora_console/operation/servers/view_server.php

@@ -65,9 +65,9 @@ foreach ($servers as $server) {
 	$data[0] = "<b>".$server['name']."</b>";
 	
 	if ($server['status'] == 0) {
-		$data[1] = print_image ("images/pixel_red.png", true, array ("width" => 20, "height" => 20));
+		$data[1] = print_image ("images/pixel_red.png", true, array ("width" => 10, "height" => 10));
 	} else {
-		$data[1] = print_image ("images/pixel_green.png", true, array ("width" => 20, "height" => 20));
+		$data[1] = print_image ("images/pixel_green.png", true, array ("width" => 10, "height" => 10));
 	}
 	
 	// Load
@@ -86,4 +86,4 @@ if (!empty ($table->data)) {
 } else {
 	echo "<div class='nf'>".__('There are no servers configured into the database')."</div>";
 }
-?>
+?>

pandora_console/reporting/pchart_graph.php

@@ -312,9 +312,14 @@ class PchartGraph extends PandoraGraphAbstract {
 		// Dataset definition
 		$this->graph = new pChart ($this->width, $this->height);
 		$this->graph->setFontProperties ($this->fontpath, 8);
-		
-		$radius = ($this->height > 18) ? 10 : 0;
-		
+
+		// Round corners defined in global setup
+		global $config;
+		if ($config["round_corner"] != 0)	
+			$radius = ($this->height > 18) ? 7 : 0;
+		else
+			$radius = 0;
+
 		$ratio = (int) $value / 100 * $this->width;
 		
 		/* Color stuff */
@@ -351,7 +356,7 @@ class PchartGraph extends PandoraGraphAbstract {
 		}
 		if ($this->border) {
 			$this->graph->drawRoundedRectangle (0, 0, $this->width - 1 , $this->height - 1,
-				$radius, 0, 0, 0);
+				$radius, 157, 157, 157);
 		}
 		
 		$this->graph->Stroke ();