From 813d5dc10a6b5dcc88fc1898cfc6dddd702e6857 Mon Sep 17 00:00:00 2001 From: slerena Date: Sun, 16 Dec 2007 23:56:31 +0000 Subject: [PATCH] 2007-12-16 Sancho Lerena * pandoradb.sql: New field for tagente_modulo: disabled, to be able to disable individual modules on an agent. * index.php: Version number is now officially "1.4dev". There is a long way to finish 1.4. * operation/servers/view_server_detail.php: FIX. If no tasks, show a little message. * images/console/icons/smalldot*: New small graph for graph console. * reporting/fgraph.php: FIX. Combined graphs with components of scale =1 does not readjust automatically. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@683 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 16 ++++++++++++++++ .../images/console/icons/smalldot.png | Bin 0 -> 309 bytes .../images/console/icons/smalldot_bad.png | Bin 0 -> 486 bytes .../images/console/icons/smalldot_ok.png | Bin 0 -> 309 bytes pandora_console/index.php | 2 +- .../operation/servers/view_server_detail.php | 2 ++ pandora_console/pandoradb.sql | 1 + pandora_console/reporting/fgraph.php | 3 ++- 8 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pandora_console/images/console/icons/smalldot.png create mode 100644 pandora_console/images/console/icons/smalldot_bad.png create mode 100644 pandora_console/images/console/icons/smalldot_ok.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index eeb6a709c4..9de07203db 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,19 @@ +2007-12-16 Sancho Lerena + + * pandoradb.sql: New field for tagente_modulo: disabled, to be + able to disable individual modules on an agent. + + * index.php: Version number is now officially "1.4dev". There is + a long way to finish 1.4. + + * operation/servers/view_server_detail.php: FIX. If no tasks, show + a little message. + + * images/console/icons/smalldot*: New small graph for graph console. + + * reporting/fgraph.php: FIX. Combined graphs with components of scale =1 + does not readjust automatically. + 2007-12-16 Raul Mateos * include/languages/language_en.php, language_es_es.php, language_fr.php, diff --git a/pandora_console/images/console/icons/smalldot.png b/pandora_console/images/console/icons/smalldot.png new file mode 100644 index 0000000000000000000000000000000000000000..ecabe45315ccf8e9dc0b8ea00029b88eca5efa68 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^AT~D#8<2F%laT;YEa{HEjtmSN`?>!lvI6;RN#5=* zKpF^sI`6IrQk(@Ik;On=!XV7ZFl!D-+hk7{#}J9jy%#s~HYG5)JnXku$vMEIc0-C= zn5}^MrH<^uQxTSJveGXYN{)rGZ#c^7(GlU{sQhb|_q(|Ai_4-N5AbB4son9QLp#n; zNvH4tOQF8s#sgx@cj$ks<&(_oZ(y4FK1GA6NJTlR$wuMpY?B55oYydGnJ5P}Yb`iZ z>#}Dt&yK|F>DB_b9*QkKEO~xn`Yv;Y?TX!x-_M-{be>vONJNQqer|4RUI_z3#jRpJ tFJB!`-$0G?Iwu1-PI`nEeE-7Bz!3DDU3tRk)B>Om22WQ%mvv4FO#mp}W-9;y literal 0 HcmV?d00001 diff --git a/pandora_console/images/console/icons/smalldot_bad.png b/pandora_console/images/console/icons/smalldot_bad.png new file mode 100644 index 0000000000000000000000000000000000000000..9e2577ddde29b0a436e87a6713cc39167fed650c GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^AT~D#8<2F%laT;YEa{HEjtmSN`?>!lvI6;RN#5=* zKpF^sI`6IrQk(@Ik;On=!XV7ZFl!D_8>5S-i(`ny<0rRrVK`#0x~cTwh$<>iylWq1fTX6d%_mO;c_Ky_%rVDfr&^ z#9zO5u}2B#BhP(!ykYx)w&q!`{`=0v>;J#xm$^!pVTNr&{ht}__vgFLedRyjUHq)T zHoNop!q)$Fo|HUSkC{R8HUII7xLL1i|A)S`sENtm7PkJ+fDVQj7&5bRKyfD6i;4Q(X%DjbJ;darVsj23B@fc!ME2qOci>^ts2p|s`7xt zlf3~dHVFxpr`AbxJ*Z#bB;93`dRu>8aRd#JY$<_a6iRkw>)7z&{ z*?e~pXAS(|aQ>8y{I#6-K;c8Xr%V6ZC^`3-an08Qr}i8$xWqfrMLfnQ~DRO z|H~sbzg6w;PMv6201RZcs*s2h=ltB<)VvY~hKgIodS1Rdp1y$^=XFj7aGdlAE%^S0 amw_SZIlJ!lvI6;RN#5=* zKpF^sI`6IrQk(@Ik;On=!XV7ZFl!D-+hk7{#}J9jy%#s~HYG5)JnXku$vMEIc0-C= zn5}^MrH<^uQxTSJveGXYN{)rGZ#c^7(GlU{sQhb|_q(|Ai_4-N5AbB4son9QLp#n; zNvH4tOQF8s#sgx@cj$ks<&(_oZ(y4FK1GA6NJTlR$wuMpY?B55oYydGnJ5P}Yb`iZ z>#}Dt&yK|F>DB_b9*QkKEO~xn`Yv;Y?TX!x-_M-{be>vONJNQqer|4RUI_z3#jRpJ tFJB!`-$0G?Iwu1-PI`nEeE-7Bz!3DDU3tRk)B>Om22WQ%mvv4FO#mp}W-9;y literal 0 HcmV?d00001 diff --git a/pandora_console/index.php b/pandora_console/index.php index b76be01d56..0fe865833e 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -25,7 +25,7 @@ //Pandora Version, if not defined here it would take from config.php $build_version="PC071216"; -$pandora_version="v1.4 Beta1"; +$pandora_version="v1.4dev"; global $build_version; global $pandora_version; diff --git a/pandora_console/operation/servers/view_server_detail.php b/pandora_console/operation/servers/view_server_detail.php index af65bfe52e..4f1b57ab1e 100644 --- a/pandora_console/operation/servers/view_server_detail.php +++ b/pandora_console/operation/servers/view_server_detail.php @@ -131,6 +131,8 @@ if ((comprueba_login() == 0) AND (give_acl($id_user, 0, "AR")==1) ) { } } echo ""; + } else { + echo "This server has no recon tasks assigned"; } } } diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 1e750c1fea..167821fd7b 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -127,6 +127,7 @@ CREATE TABLE `tagente_modulo` ( `id_module_group` int(4) unsigned default '0', `flag` tinyint(3) unsigned default '1', `id_modulo` int(11) unsigned NULL default 0, + `disabled` tinyint(3) unsigned default '0', PRIMARY KEY (`id_agente_modulo`, `id_agente`), KEY `tam_agente` (`id_agente`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/reporting/fgraph.php b/pandora_console/reporting/fgraph.php index 81089b09e8..cc41689fa9 100644 --- a/pandora_console/reporting/fgraph.php +++ b/pandora_console/reporting/fgraph.php @@ -210,7 +210,8 @@ function graphic_combined_module ($module_list, $weight_list, $periodo, $width, } for ($y = 0; $y < $module_number; $y++){ - $weight_list[$y] = ($max_value / $mod_data[$y]) + ($weight_list[$y]-1); + // Disabled autoadjusment, is not working fine :( + // $weight_list[$y] = ($max_value / $mod_data[$y]) + ($weight_list[$y]-1); if ($weight_list[$y] != 1) $module_list_name[$y] .= " (x". format_numeric($weight_list[$y],1).")"; $module_list_name[$y] = $module_list_name[$y]." (MAX: ".format_numeric($mod_data[$y]).")";