From 5181998d1a3f196986952317b4509a36c9e260ae Mon Sep 17 00:00:00 2001
From: slerena <slerena@gmail.com>
Date: Tue, 31 Mar 2009 14:32:58 +0000
Subject: [PATCH] 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                     |  40 ++++++++
 .../godmode/agentes/modificar_agente.php      |   2 +-
 pandora_console/godmode/menu.php              |   6 +-
 pandora_console/godmode/setup/filemgr.php     |   2 +-
 pandora_console/godmode/setup/links.php       |   2 +-
 pandora_console/godmode/setup/setup.php       |  20 +---
 .../godmode/setup/setup_visuals.php           |  92 ++++++++++++++++++
 pandora_console/images/mod_web_data.png       | Bin 0 -> 1017 bytes
 pandora_console/images/mod_web_proc.png       | Bin 0 -> 1014 bytes
 .../images/screenshot_not_found.jpg           | Bin 0 -> 1151 bytes
 pandora_console/images/server_web.png         | Bin 0 -> 876 bytes
 pandora_console/include/functions_config.php  |   9 +-
 pandora_console/include/functions_db.php      |  11 ++-
 pandora_console/include/functions_reports.php |   1 +
 pandora_console/include/styles/menu.css       |   4 +
 pandora_console/index.php                     |   4 +-
 pandora_console/operation/events/events.php   |   2 +
 pandora_console/operation/menu.php            |   4 +-
 .../operation/servers/view_server.php         |   6 +-
 pandora_console/reporting/pchart_graph.php    |  13 ++-
 20 files changed, 176 insertions(+), 42 deletions(-)
 create mode 100644 pandora_console/godmode/setup/setup_visuals.php
 create mode 100644 pandora_console/images/mod_web_data.png
 create mode 100644 pandora_console/images/mod_web_proc.png
 create mode 100644 pandora_console/images/screenshot_not_found.jpg
 create mode 100644 pandora_console/images/server_web.png

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 1d638b7ea2..f8c1cd2a5c 100644
--- a/pandora_console/ChangeLog
+++ b/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
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index e12ee028c7..e7da4ce2f4 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/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 {
 }
 
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index befa56bd37..ef5b2d7485 100644
--- a/pandora_console/godmode/menu.php
+++ b/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;
 }
 
diff --git a/pandora_console/godmode/setup/filemgr.php b/pandora_console/godmode/setup/filemgr.php
index 1d124ccdfd..195b8cb2e6 100644
--- a/pandora_console/godmode/setup/filemgr.php
+++ b/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;
diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php
index 7ce8656cbf..161906dbf9 100644
--- a/pandora_console/godmode/setup/links.php
+++ b/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;
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 4aaeda1b75..f9596bfac3 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/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);
 
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
new file mode 100644
index 0000000000..0be4a01710
--- /dev/null
+++ b/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>
diff --git a/pandora_console/images/mod_web_data.png b/pandora_console/images/mod_web_data.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c5019619b55c652efc2f98baf75c6a78d3f7d8a
GIT binary patch
literal 1017
zcmV<V0|xwwP)<h;3K|Lk000e1NJLTq001oj000mO1^@s6g8ugD00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXG{
z3mPUxopK-m00VhRL_t(Y$HkUiXdG1($A5QrcE|2+c9U%OBZ<j2OM=qHHkC#yK2<@5
zg7~6DZ66}Vg5ZN73i?_KqWIniHDW1<`0*l2@udWUCf1T_OlZ^8=4+Fk&F)V3Yj$>b
zt`EgnlI%xqA%D2c%(>?<hkO6$oWEcjM&BJj4ZPt{)dLbVY1;)UnNl3e`3q-Hd`^8x
zKs0&(_xo;$CiWfJ+8BNBi(!{T`Dth%5<Yq`%0O=bx2BQFmsnWVxjehf^`+#r5aQH@
zvnQ_JXVRicd?UX*#+Tpzbj0J^_v?$t4v9lUAu{<A`q~nzHw61Sps3Ru4lp&l%8wJX
zn+WlAlf<__d5}q~0D*w_=Vzaai^pP}q*Lp3^~dpdbyGAetS>L3+7?Q!#4{r?YPJkq
zoSZucJjwrutV09Y3O$t9Klt)YB-G(MHZq7)v8k$FPy|j@#pP6SYbxPD8{MHG!FCTL
z@rQ}_bRK>6{qti@xGftbE$&+N>~-T6pWl7zNW7nHCdEeCO{ix-Qi3f3p&)FFM7qHD
zm;U79#AW=N<iKDLz)Ov4q}gfR57b<-5{yPVn7W=MHWb2^|NSYSP4mQX93cc!N>&pa
zn57ckK|jEeJ)?(dRTWKhp?E`N^Co)EqFAnxD_U529U<<-3Lyvw16-ZIf#y^JI-7JP
z(E>F@3-+BS?QkfzQ7{#cxrSHONEW(CIbBq1HfFlYaHT@IY|-ZRP%IYN-y0-ZvH;TT
z5mcw5tlwNo^&B3I5bNva*77P73%9XwQL;RI{LKuSsPX0t2g&7fT>0w;v_%1aYjEY%
zX>~LxGO>%_?(~qg+P7EcSFmgqfM{PY#}5ZdB-3mf1&p%bR>nrxbqvGcp^jeW7uNy4
zZgBOq*ga^44m*<m?96L#C6Y#d@{c7JS9MI&WO`<fbiRU~DX^I>vU$6NVHj)}WikcH
z>PF_5CL_JxKxx(rTk=x@vdPrROVjpuwhfOz66S{)gN)_Es@5o5RWzqyDJ%IqSz+?`
zg^Up5G<%4x6FENi;Vb>IzHy(w-SucJLZr)wra38^6%u-uYd6<fSxe0chdSDV_Sj8-
z)Z?$Xhq~BlZ0{U!J$Le*afjx99*5cvLP%*>Wwo*>h4RT)AB~;62bD()`lFGsYN$UR
n6y&x=gMyU1?8zoWXbb-UvSfNr#5usF00000NkvXXu0mjf^Bvip

literal 0
HcmV?d00001

diff --git a/pandora_console/images/mod_web_proc.png b/pandora_console/images/mod_web_proc.png
new file mode 100644
index 0000000000000000000000000000000000000000..be01453683f6253bb9cafc5f1481a3737b6e7c89
GIT binary patch
literal 1014
zcmV<S0}1?zP)<h;3K|Lk000e1NJLTq001oj000mO1^@s6g8ugD00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXG{
z3mP_9Dq=(c00VYOL_t(Y$HkUiXdG1($A5QrcE@fu*(96&NMf?hlAv_4O{I~FPgPK%
zAigM3+lNT8Aow7Ng1(l5D8BbWjaUjIe!PfMd?|sTiM6B}6WTPjNjAIL+3fCgzh-B5
z=lW38ny@=dTj?K$nfaeN%sKb`?>$Gb1Cwu0p9EfWsp>unnzZebl*}nE<?OlB$3CSw
zBp@7~|9-z6!hzp~e+-lFd^YZJDL;&jM8b#nM;RFm;MFv8#R@CyIu{q$xw@8~7ebsk
zcly}ny9`=5__zA*7Wv|vA5V02?fLonBL~ERu@Jdp1$}c3)fa+2Jy6ye3<sE7Oz{28
z;x<A&=@9tNJNGhZ6(A7s{rL0~aq&p3mux0Q-*6m%Uq5BDMrwT()wWO?6`q=i(XeIU
z{Or;h;BoF8vWX02JMvIoeed&Akx)<9k%>{<icMYhfg*6LDjv6rS5pZGI_VDu33hid
z5r2^AK=0v~-#t6!pl#VAXmQ)sjBo0%bosp}4#kJb=Q3<ny@Uq#A|==o5DLP!NM=iX
zd*OG^&s@Z>N%oBn0KCv@k2tN?-9RmrYr$xwhq<e1Vq+m}`R|{K`7Do(#}Psxr6iHu
z!mL#25BdQP-8XrdR$b9F4~j2DzG$KsEXvgeg|dZJ)DhyAuMmQ8Fu>*IYiMp2px5C<
z5^YFBw88IQX_rf}jgqN!n49=ijdZDxjN3!KVPj_NjMr*Zs}`NU4$9>+dk2H0D;7YO
z`vldkD5>iknSq0&5n@CA+*nUAvvLy)4;8C}55HPK6AfN}Za;-WflGf}gU%?xFKv{(
zRk`ofh9Vn{uP-fcVA(1F(V;<(9t@I9XW2GN7*)ZIoQ<yQ7>2<EJ%cQ-rU1TdQF`gX
z$rj1U9e%qt{mH3U-bkj6;_Pp0tR{3!(`0^OiEOcko-47PFSC8Kf?*hJ8C7y6Nn$Ja
zlS4~y2d%W<TGIgebmsVldHWmNhDRR?^WB0$&hlW@8&s`2np?1zm;9NoG5hOEP6%<*
z;ZzU~+&#&bqf_s{G#ne6?(%ng9*#wb^mU<WZpvnjq@L%>^%NVMnI+*;C)=1knzi+I
zTDEjb@IS`x-Vx6;$KRTEY2IgXsofxily+U#YpYTyAARw`)R{J?ymp2tc4%GvUzKUM
kVKn1*ZaCS(ubGX%0GAAWO%+9<c>n+a07*qoM6N<$f?yfiKL7v#

literal 0
HcmV?d00001

diff --git a/pandora_console/images/screenshot_not_found.jpg b/pandora_console/images/screenshot_not_found.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2d1a753be2adac8ea92b119ee1a8d22d0b5ab4df
GIT binary patch
literal 1151
zcmex=<NpH&0WUXCHwH#VMg|WcWcdG&LD;z{HL)Z$MWH;iBtya7(>LJ%Z3brsR%R9!
z7G_o;!OF_Y#?HgR4g~z%+?+gu{6a#4{DOkQVlv{wB2uD)f)a`nQnIr0^76vsN-9cn
zDl&5Nav(z(fm+$w*!eg(_~b+cMdU~Z{|_(-axiRRIKj-Q#K0uT$SlbC{|JK=10w@7
z$O{O-%Fe;e#sZWx5@2LtWM%?#SXrS87@3$^SOwXH6xoFh9Rm}U3L7_zm<5$i6m<$+
zxbY%Tj|hrUU_(Kog2)y?L~k+hFf#%j!Ys&O&v0b{!hSMY%3uGc`(4=bYV%i{j?HOW
zPx~ethXxB9`nXh__YA%DJ^N<q_0YY-ep}P-x5S>Dm$m%<G&LprnN|O;o5Z@uT`<`4
z*XVq8Rq=~eYoBLjEYrQyxhnmX)gkk?-I^CSti4<wu`_P*#K$HsXT?^|&*<Cyb^ZeF
zU%$N{Yps6P8`P!z<(TQ-{dcXGndn{H+Eaby^6E!7&Tia)G;~+>?uqYT+UqWUwk5q~
zNBpjL`xj*H*`2%p;mi9!Z<i+DI?j~%V#mZaFTPyO7oVrGKPhY0qC4kXL(Y7?T{qi*
z4b!a)r8T_8zS~!1USITf)~_mG<L5rdryPDCxVQDy_Kg+G_UdKN+&DXHeS6)+Si!Tx
ze_R9hG@yqbYx(WI?cLpnix(X&xjKDjsHv~uV^@)@qQ(BpJ_`zd{o+;Df9%E`!|oq7
zb>6?`-YVaoSEGCU_3GP~Y_7~>liPZ9*Pn~|d(NCav3l0iQ_q(gJ`W9kD)^saBEy%t
z?Jutv?YK1OR_46dTxUzKhfn(&Y~oV$ymJ1M^)2eGAD*f6yx5YE{HI)NUiJ57X0xaM
z`t80%?Esql3a%7o9J>6eSkLWC#MaPTi*L=CIseDI&d2sAe_en3{oh@ObC%|xx4tdQ
zySIMtnX~%^_niM8YVA_(-cmD5y?IAIb6d%(f{z+q>#ho#zdutGp7nKpzQ?EZdpxg?
zN$L3i<d!d*HW$rC1_qhpqMU~h@1Hrje)q<tyWx7FTh8m69Q$nT9{G~*M4!o@xohk0
z*T22O@kh`8q0X7p5*4?$SJwSKm3w>nhwsU=RxQuyeKvRTn!VPB1@X^i#lK^>1jAOU
J3Dp0;2>{p>h{ON@

literal 0
HcmV?d00001

diff --git a/pandora_console/images/server_web.png b/pandora_console/images/server_web.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b5e80d1ee6a5518482e50cc56b936dc2cdd5fd7
GIT binary patch
literal 876
zcmV-y1C#uTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXH3
z4Js*<J{?H_00QhuL_t(I%dL}LXj^3*hoASH_nc#sG-;dWqm6CW(4s83b+X9Bt0|~3
z6mOI%-9=?M5O0K`ptn*G#rs`|6-PnD>5WW=H?uIcvzCo^E3WHYKeL=HA5C(SbCR6b
z3)#f&*5~^FdoKR`eu4)${@&~<;4NLs{R%AQ`wgX7&~)wW+|1M$58jLW!S}zMG<EIA
ziLqqj$bmFtsVD)<qFisXwrR7tvdN8&!et@E$+?-StN#(a_U`AoV7TYESB@SO2Pfi`
z>rL#P4P+<|J^kR=q!LjUR<=1mzj7BLp1miL0MTgZr{|x^iYGDyl!|!<N3%o*hj3bL
z@|){O-$Uy*c`lcs>#OL6OV`f;PXlOge)!c#$#{SGXl@)s^XbSCXaYk@OhXc|B#CG*
zL-81~z96~mqojuij=b@~*=YbR90{B}oE@c7E^@~W5Fg%$Qs65<Xb9h9x76VKi_2V?
zUnF8F_Kyz(yb2&|PCJ%P_Oo!KKxQJ2um1gPy;9<-$t*$$lu~T(-l5fOG8Bsd90t%@
zUPrSm6D<^{Qg30`JRG-6&GGQ+HbVTP6GD)PMY+0q6U&eQ0{~LjHNV<uX~EVGA!$))
z3{o^qI$fVusl#Nujq7^!hJrYb!@g9ELem2%0Z2pB^0&5%!-vL`WJZR#y}8Z&+8!Pz
zO)to&-(JBIUEY5A0JU0;rE52#Hx2MRfTp_Lb4#mRc)kQ6J(A+sp%}Y`5_hW&s;=O6
z*~hkRs?{ow^ru)|&jWk|pfCM=?)-S}rPD&!%}CIo$JF^{ahc`3qSkQPYq;z=F1Zn%
z!k))g+2`8Y&aZPbQ}5g_Ql(Hlaq+VMo$tewk0towN|mx_;&r;XUI)t%Y*Z9~71~_-
zW34QNIQ7sLj!l33`e<fkHXP|QAI~I74u-KT1E<wy*RJsAtvp*h#p^<s#~<3lJ^BX5
z%ok3ap4F|ui|Dcsgiy-ws7`xb3GK75Kbbzm|IOcUY&Z8Y+8vbu0000<MNUMnLSTZw
C0HXH*

literal 0
HcmV?d00001

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 4509730545..4ab58faea8 100644
--- a/pandora_console/include/functions_config.php
+++ b/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 {
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index b403bce741..46588b91f4 100644
--- a/pandora_console/include/functions_db.php
+++ b/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;
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index 9cbb42a7ff..2dce229bac 100644
--- a/pandora_console/include/functions_reports.php
+++ b/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;
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index ea3bd1d145..078ffa1ad3 100644
--- a/pandora_console/include/styles/menu.css
+++ b/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;
 }
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 29a7afa103..bb3b355ef2 100644
--- a/pandora_console/index.php
+++ b/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) {
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 77a1fe5389..44a89892ff 100644
--- a/pandora_console/operation/events/events.php
+++ b/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);
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 732df27862..b0d2a627d8 100644
--- a/pandora_console/operation/menu.php
+++ b/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";
diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php
index a09ce98e07..09b700a175 100644
--- a/pandora_console/operation/servers/view_server.php
+++ b/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>";
 }
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/reporting/pchart_graph.php b/pandora_console/reporting/pchart_graph.php
index e7f0cda22f..4eccc29110 100644
--- a/pandora_console/reporting/pchart_graph.php
+++ b/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 ();