diff --git a/pandora_console/images/os_icons/so_big_icons/android.png b/pandora_console/images/os_icons/so_big_icons/android.png new file mode 100644 index 0000000000..73565a78ba Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/android.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/embedded.png b/pandora_console/images/os_icons/so_big_icons/embedded.png new file mode 100644 index 0000000000..e26b016f24 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/embedded.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/network.png b/pandora_console/images/os_icons/so_big_icons/network.png new file mode 100644 index 0000000000..9b1aee5f71 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/network.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/satellite.png b/pandora_console/images/os_icons/so_big_icons/satellite.png new file mode 100644 index 0000000000..8fba3d7ff0 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/satellite.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_aix.png b/pandora_console/images/os_icons/so_big_icons/so_aix.png new file mode 100644 index 0000000000..7e0971b14c Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_aix.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_bsd.png b/pandora_console/images/os_icons/so_big_icons/so_bsd.png new file mode 100644 index 0000000000..f5a476a6fa Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_bsd.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_cisco.png b/pandora_console/images/os_icons/so_big_icons/so_cisco.png new file mode 100644 index 0000000000..661f248f2b Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_cisco.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_hpux.png b/pandora_console/images/os_icons/so_big_icons/so_hpux.png new file mode 100644 index 0000000000..e9bab8b268 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_hpux.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_linux.png b/pandora_console/images/os_icons/so_big_icons/so_linux.png new file mode 100644 index 0000000000..2a5f175253 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_linux.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_mac.png b/pandora_console/images/os_icons/so_big_icons/so_mac.png new file mode 100644 index 0000000000..9dbbf22f6a Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_mac.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_mainframe.png b/pandora_console/images/os_icons/so_big_icons/so_mainframe.png new file mode 100644 index 0000000000..73ce9d6240 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_mainframe.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_other.png b/pandora_console/images/os_icons/so_big_icons/so_other.png new file mode 100644 index 0000000000..c7ed94f485 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_other.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_router.png b/pandora_console/images/os_icons/so_big_icons/so_router.png new file mode 100644 index 0000000000..441b2416f7 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_router.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_solaris.png b/pandora_console/images/os_icons/so_big_icons/so_solaris.png new file mode 100644 index 0000000000..0055c2dc90 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_solaris.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_switch.png b/pandora_console/images/os_icons/so_big_icons/so_switch.png new file mode 100644 index 0000000000..73de4894d4 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_switch.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_vmware.png b/pandora_console/images/os_icons/so_big_icons/so_vmware.png new file mode 100644 index 0000000000..90bc0a7783 Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_vmware.png differ diff --git a/pandora_console/images/os_icons/so_big_icons/so_win.png b/pandora_console/images/os_icons/so_big_icons/so_win.png new file mode 100644 index 0000000000..c46d4e8bac Binary files /dev/null and b/pandora_console/images/os_icons/so_big_icons/so_win.png differ diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 789b845004..b401f59d47 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -615,20 +615,20 @@ function ui_print_group_icon_path ($id_group, $return = false, $path = "images/g */ function ui_print_os_icon ($id_os, $name = true, $return = false, $apply_skin = true, $networkmap = false, $only_src = false, - $relative = false, $options = false) { + $relative = false, $options = false, $big_icons = false) { - - - $subfolter = 'os_icons'; + $subfolder = 'os_icons'; if ($networkmap) { - $subfolter = 'networkmap'; + $subfolder = 'networkmap'; } + if ($big_icons) + $subfolder .= '/so_big_icons'; $icon = (string) db_get_value ('icon_name', 'tconfig_os', 'id_os', (int) $id_os); $os_name = get_os_name ($id_os); if (empty ($icon)) { if ($only_src) { - $output = html_print_image("images/" . $subfolter . "/unknown.png", + $output = html_print_image("images/" . $subfolder . "/unknown.png", true, $options, true, $relative, false, true); } else { @@ -637,13 +637,13 @@ function ui_print_os_icon ($id_os, $name = true, $return = false, } else if ($apply_skin) { if ($only_src) { - $output = html_print_image("images/" . $subfolter . "/" . $icon, true, $options, true, $relative, false, true); + $output = html_print_image("images/" . $subfolder . "/" . $icon, true, $options, true, $relative, false, true); } else { if (!isset($options['title'])) { $options['title'] = $os_name; } - $output = html_print_image("images/" . $subfolter . "/" . $icon, true, $options, false, $relative, false, true); + $output = html_print_image("images/" . $subfolder . "/" . $icon, true, $options, false, $relative, false, true); } } else diff --git a/pandora_console/mobile/include/style/jquery.mobile-1.3.1.css b/pandora_console/mobile/include/style/jquery.mobile-1.3.1.css index 3d226a605e..b3a3a4c38e 100755 --- a/pandora_console/mobile/include/style/jquery.mobile-1.3.1.css +++ b/pandora_console/mobile/include/style/jquery.mobile-1.3.1.css @@ -708,19 +708,19 @@ a.ui-link-inherit { /* Active class used as the "on" state across all themes -----------------------------------------------------------------------------------------------------------*/ .ui-btn-active { - border: 1px solid #2373a5 /*{global-active-border}*/; + border: 1px solid #82B92E /*{global-active-border}*/; background: #5393c5 /*{global-active-background-color}*/; font-weight: bold; color: #fff /*{global-active-color}*/; cursor: pointer; - text-shadow: 0 /*{global-active-shadow-x}*/ 1px /*{global-active-shadow-y}*/ 0 /*{global-active-shadow-radius}*/ #3373a5 /*{global-active-shadow-color}*/; + text-shadow: 0 /*{global-active-shadow-x}*/ 1px /*{global-active-shadow-y}*/ 0 /*{global-active-shadow-radius}*/ #82B92E /*{global-active-shadow-color}*/; text-decoration: none; - background-image: -webkit-gradient(linear, left top, left bottom, from( #5393c5 /*{global-active-background-start}*/), to( #6facd5 /*{global-active-background-end}*/)); /* Saf4+, Chrome */ - background-image: -webkit-linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/); /* Chrome 10+, Saf5.1+ */ - background-image: -moz-linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/); /* FF3.6 */ - background-image: -ms-linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/); /* IE10 */ - background-image: -o-linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/); /* Opera 11.10+ */ - background-image: linear-gradient( #5393c5 /*{global-active-background-start}*/, #6facd5 /*{global-active-background-end}*/); + background-image: -webkit-gradient(linear, left top, left bottom, from( #82B92E /*{global-active-background-start}*/), to( #82B92E /*{global-active-background-end}*/)); /* Saf4+, Chrome */ + background-image: -webkit-linear-gradient( #82B92E /*{global-active-background-start}*/, #82B92E /*{global-active-background-end}*/); /* Chrome 10+, Saf5.1+ */ + background-image: -moz-linear-gradient( #82B92E /*{global-active-background-start}*/, #82B92E /*{global-active-background-end}*/); /* FF3.6 */ + background-image: -ms-linear-gradient( #82B92E /*{global-active-background-start}*/, #82B92E /*{global-active-background-end}*/); /* IE10 */ + background-image: -o-linear-gradient( #82B92E /*{global-active-background-start}*/, #82B92E /*{global-active-background-end}*/); /* Opera 11.10+ */ + background-image: linear-gradient( #82B92E /*{global-active-background-start}*/, #82B92E /*{global-active-background-end}*/); font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/; } .ui-btn-active:visited, @@ -1042,9 +1042,9 @@ a.ui-link-inherit { } .ui-focus, .ui-btn:focus { - -moz-box-shadow: inset 0 0 3px #387bbe /*{global-active-background-color}*/, 0 0 9px #387bbe /*{global-active-background-color}*/; - -webkit-box-shadow: inset 0 0 3px #387bbe /*{global-active-background-color}*/, 0 0 9px #387bbe /*{global-active-background-color}*/; - box-shadow: inset 0 0 3px #387bbe /*{global-active-background-color}*/, 0 0 9px #387bbe /*{global-active-background-color}*/; + -moz-box-shadow: inset 0 0 3px #82B92E /*{global-active-background-color}*/, 0 0 9px #82B92E /*{global-active-background-color}*/; + -webkit-box-shadow: inset 0 0 3px #82B92E /*{global-active-background-color}*/, 0 0 9px #82B92E /*{global-active-background-color}*/; + box-shadow: inset 0 0 3px #82B92E /*{global-active-background-color}*/, 0 0 9px #82B92E /*{global-active-background-color}*/; } .ui-input-text.ui-focus, .ui-input-search.ui-focus { @@ -1123,10 +1123,29 @@ div.ui-mobile-viewport { overflow-x: hidden; } .ui-header > .ui-btn-icon-notext, .ui-header-fixed.ui-fixed-hidden > .ui-btn-icon-notext { top: 6px; } .ui-header-fixed > .ui-btn-icon-notext { top: 7px;} -.ui-header .ui-title, .ui-footer .ui-title { min-height: 1.1em; text-align: center; font-size: 16px; display: block; margin: .6em 30% .8em; padding: 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; outline: 0 !important; } -.ui-footer .ui-title { margin: .6em 15px .8em; } +.ui-header .ui-title, .ui-footer .ui-title { + min-height: 1.1em; + text-align: center; + font-size: 16px; + display: block; + margin: .6em 30% .8em; + padding: 0; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + outline: 0 !important; +} +.ui-footer .ui-title { + margin: .6em 15px .8em; +} + /* content area*/ -.ui-content { border-width: 0; overflow: visible; overflow-x: hidden; padding: 15px; } +.ui-content { + border-width: 0; + overflow: hidden; + overflow-x: hidden; + padding: 5px 5px 0px 5px; +} /* corner styling for dialogs and popups */ .ui-corner-all > .ui-header:first-child, .ui-corner-all > .ui-content:first-child, @@ -2128,7 +2147,7 @@ label.ui-submit { font-size: 16px; line-height: 1.4; font-weight: normal; margin .ui-field-contain .ui-btn.ui-submit { width: 78%; display: inline-block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; } .ui-hide-label .ui-btn.ui-submit { width: auto; display: block; } } -.ui-collapsible-inset { margin: .5em 0; } +.ui-collapsible-inset { margin: .5em 2px 1px; width:99%;} .ui-collapsible-heading { font-size: 16px; display: block; margin: 0 -15px; padding: 0; position: relative; } .ui-collapsible-inset .ui-collapsible-heading { margin: 0; } .ui-collapsible-heading .ui-btn { text-align: left; margin: 0; border-left-width: 0; border-right-width: 0; } @@ -2294,7 +2313,7 @@ label.ui-submit { font-size: 16px; line-height: 1.4; font-weight: normal; margin padding: 0; } .ui-dialog-contain > .ui-content { - padding: 15px; + padding: 5px 5px 0px 5px; } .ui-dialog-contain > .ui-footer { z-index: 10; @@ -3120,7 +3139,7 @@ div.ui-slider-switch.ui-mini { } } /* Breakpoint to show as a standard table at 560px (25em x 16px) or wider */ -@media ( min-width: 25em ) { +@media ( min-width: 34.99em ) { /* Fixes table rendering when switching between breakpoints in Safari <= 5. See https://github.com/jquery/jquery-mobile/issues/5380 */ .ui-table-reflow.ui-responsive { display: table-row-group; @@ -3143,7 +3162,7 @@ div.ui-slider-switch.ui-mini { } /* Hack to make IE9 and WP7.5 treat cells like block level elements, scoped to ui-responsive class */ /* Applied in a max-width media query up to the table layout breakpoint so we don't need to negate this*/ -@media ( max-width: 25em ) { +@media ( max-width: 34.98em ) { .ui-table-reflow.ui-responsive td, .ui-table-reflow.ui-responsive th { width: 100%; @@ -3153,6 +3172,15 @@ div.ui-slider-switch.ui-mini { float: left; clear: left; } + #list_agent_Modules.ui-table-reflow.ui-responsive td.cell_0 { + width: 52% !important; + } + #list_agent_Modules.ui-table-reflow.ui-responsive td.cell_1 { + width: 15% !important; + } + #list_agent_Modules.ui-table-reflow.ui-responsive td.cell_4 { + width: 33% !important; + } } /* panel */ .ui-panel { diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css index 0c123564a7..5af548f7d0 100755 --- a/pandora_console/mobile/include/style/main.css +++ b/pandora_console/mobile/include/style/main.css @@ -34,6 +34,10 @@ body { } +.agent_graphs, .events_bar { + padding-top: 10px; +} + #tactical1 *, #tactical2 * { font-weight: bold; } @@ -520,11 +524,32 @@ table.event_details td.cell_event_name { } .agent_details { - line-height: 35px; + padding: 10px 0px 10px 0px; +} +.agent_details > img { + vertical-align: middle; + width: 20px; +} +.agent_os{ + float: right; + position: absolute; + top: 0px; + right: 0px; + padding: 10px; } -.agent_details img { - float: left; +.agent_list_ips { + padding: 10px 0px 10px 0px; +} +.agent_list_ips > img { + vertical-align: middle; + width: 20px; +} +.agent_last_contact { + padding: 10px 0px 10px 0px; +} +.agent_description { + padding: 10px 0px 10px 0px; } .agent_name { @@ -544,8 +569,8 @@ table.event_details td.cell_event_name { } #list_agents td { - height: 35px; - padding-top: 20px; + height: 25px; + padding-top: 10px; } .agents_tiny_stats_tactical { @@ -554,7 +579,33 @@ table.event_details td.cell_event_name { width: 100%; } -@media screen and (max-width: 25em) { +@media screen and (max-width: 34.99em) { + #list_agents td { + height: 35px; + padding-top: 7px; + display: table-cell; + clear: none; + padding-left: 0px !important; + padding-right: 0px !important; + } + + #list_agents td.cell_0 { + width: 45%; + border-top: 0px none; + } + #list_agents td.cell_0>span.tiny>img { + width: 5px; + height: 30px; + margin-top: -6px; + margin-left: 0px; + } + #list_agents td.cell_5 { + width: 30%; + } + #list_agents td.cell_6 { + width: 25%; + } + #list_agents .cell_2 .ui-table-cell-label, #list_agents .cell_3 .ui-table-cell-label, #list_agents .cell_6 .ui-table-cell-label, @@ -572,7 +623,6 @@ table.event_details td.cell_event_name { #list_agents .cell_2, #list_agents .cell_3, - #list_agents .cell_6, #list_agents .cell_7 { display: inline !important; float: none !important; @@ -594,7 +644,7 @@ table.event_details td.cell_event_name { } #list_agents .show_collapside { - display: inline !important; + display: none !important; } #list_agents .cell_1, @@ -605,16 +655,24 @@ table.event_details td.cell_event_name { } #list_agents .cell_0 .ui-link { - font-size: 15px; + font-size: 12px; } #list_agents .cell_6 .show_collapside { - display: inline !important; + display: none !important; } .agents_tiny_stats * { font-size: 12px !important; } + + #list_agent_Modules td { + padding-top: 7px !important; + } + + .agents_tiny_stats { + float: right; + } } /* For mobiles */ @@ -738,7 +796,7 @@ table.event_details td.cell_event_name { /*END-----------Visual maps styles---------------------------------------*/ /*INIT-----------Modules styles---------------------------------------*/ -@media screen and (max-width: 25em) { +@media screen and (max-width: 34.99em) { #list_Modules .cell_1 .ui-table-cell-label, #list_Modules .cell_5 .ui-table-cell-label, #list_Modules .cell_6 .ui-table-cell-label { @@ -755,7 +813,17 @@ table.event_details td.cell_event_name { #list_Modules .cell_3 .ui-table-cell-label, #list_Modules .cell_4 .ui-table-cell-label, #list_Modules .cell_5 .ui-table-cell-label { - display: none; + display: none !important; + } + + #list_Modules td { + height: 35px; + padding-top: 7px; + display: table-cell; + clear: none; + float: none; + padding-left: 0px !important; + padding-right: 0px !important; } #list_Modules .show_collapside { @@ -766,18 +834,43 @@ table.event_details td.cell_event_name { white-space: nowrap; } + #list_Modules .cell_1, #list_Modules .cell_2, #list_Modules .cell_3 { display: none !important; } #list_Modules .cell_0 .show_collapside, - #list_Modules .cell_1 .show_collapside { + #list_Modules .cell_1 .show_collapside, + #list_Modules .cell_4 .show_collapside, + #list_Modules .cell_5 .show_collapside { display: none !important; } #list_Modules .cell_0 .ui-link { - font-size: 15px; + font-size: 12px; + } + + #list_Modules .cell_0{ + width: 50%; + border-top: 0px none; + } + #list_Modules .cell_4{ + width: 25%; + } + #list_Modules .cell_5{ + width: 25%; + } +} + #list_Modules td.cell_0>span.tiny>img { + width: 5px; + height: 30px; + margin-top: -5px; + margin-left: 0px; + float: left; + } + #list_Modules .module_name { + font-size: 12px !important; } } @@ -795,6 +888,10 @@ table.event_details td.cell_event_name { padding-top: 20px; } +#list_agent_Modules td.cell_0 > span.tiny { + display: none; +} + #list_Modules .cell_5 img { float: left; } @@ -809,7 +906,7 @@ table.event_details td.cell_event_name { line-height: 20px; } -@media screen and (max-width: 25em) { +@media screen and (max-width: 34.99em) { #list_agent_Modules .ui-table-cell-label, #list_agent_Modules .cell_2, #list_agent_Modules .cell_3 { @@ -877,7 +974,7 @@ li.ui-btn { float: left; } -@media screen and (max-width: 25em) { +@media screen and (max-width: 34.99em) { .ui-table th, .ui-table td { padding: 8px !important; padding-left: 3px; @@ -924,7 +1021,7 @@ li.ui-btn { height: 28px !important; } -@media screen and (max-width: 25em) +@media screen and (max-width: 35em) { .events .status_row { display: none; @@ -939,12 +1036,12 @@ li.ui-btn { min-width: 50%; } - .agents_tiny_stats, .agents_last_contact { + .agents_last_contact { float: right; } } -@media screen and (min-width: 25em) +@media screen and (min-width: 35em) { .events .cell_0 .event_link{ display: none; @@ -1028,7 +1125,7 @@ li.ui-btn { } .event_name { - font-size: 18px !important; + font-size: 15px !important; } .login_logo img { @@ -1050,7 +1147,7 @@ li.ui-btn { } .event_name { - font-size: 15px; + font-size: 12px; font-weight: bold; } @@ -1199,6 +1296,11 @@ span.nobold * { line-height: 1.1em; } +.events_timestamp > img { + vertical-align: middle; + margin-left: 10px; +} + .events_agent { float: left; } @@ -1258,3 +1360,15 @@ DIV.nodata_container { .ui-table-reflow.ui-responsive { display: table !important; } + +.widget_agent_module > th { + background-color: #373737; +} +#list_agent_Modules >tbody > tr > td { + clear: none; + vertical-align: middle; + padding: 0px; +} +#list_agent_Modules > tbody > tr > td.cell_0 { + border-top: 0px none; +} \ No newline at end of file diff --git a/pandora_console/mobile/include/ui.class.php b/pandora_console/mobile/include/ui.class.php index 23a41b049d..2ef68dc749 100755 --- a/pandora_console/mobile/include/ui.class.php +++ b/pandora_console/mobile/include/ui.class.php @@ -780,6 +780,7 @@ class Table { foreach ($data as $id => $row) { $table_row = array(); foreach ($row as $key => $value) { + if (!in_array($key, $this->head)) { $this->head[] = $key; } @@ -843,45 +844,40 @@ class Table { $html = ''; $html = "\n"; + "data-mode='reflow' class='" . $this->class_table . " ui-responsive table-stroke'>"; - $html .= "\n"; - $html .= "\n"; - //Empty head for white space between rows in the responsive vertical layout - $html .= "\n"; - foreach ($this->head as $head) { - $html .= "\n"; + if ($this->head) { + $html .= ""; + $html .= ""; + //Empty head for white space between rows in the responsive vertical layout + //~ $html .= ""; + foreach ($this->head as $head) { + $html .= ""; + } + $html .= ""; + $html .= ""; } - $html .= "\n"; - $html .= "\n"; - $html .= "\n"; + $html .= ""; foreach ($this->rows as $key => $row) { $class = ''; if (isset($this->rowClass[$key])) { $class = $this->rowClass[$key]; } - $html .= "\n"; + $html .= ""; //Empty head for white space between rows in the responsive vertical layout - if (isset($this->row_heads[$key])) { - $html .= "\n"; - } - elseif ($this->row_keys_as_head_row) { - $html .= "\n"; - } - else { - $html .= "\n"; - } + foreach ($row as $key_cell => $cell) { - $html .= "\n"; + $html .= ""; } - $html .= "\n"; + + $html .= ""; } - $html .= "\n"; - $html .= "
" . $head . "
" . $head . "
" . $this->row_heads[$key] . "" . $key . "" . $cell . "" . $cell . "
\n"; + $html .= ""; + $html .= ""; return $html; } diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php index 2bb7877278..5a765eaedb 100644 --- a/pandora_console/mobile/operation/agent.php +++ b/pandora_console/mobile/operation/agent.php @@ -114,92 +114,123 @@ class Agent { $ui->showFooter(false); $ui->beginContent(); if (empty($this->agent)) { - $ui->contentAddHtml('' . __('No agent found') . ''); + $ui->contentAddHtml('' . + __('No agent found') . ''); } else { $ui->contentBeginGrid(); - if ($this->agent['disabled']) { - $agent_name = "" . $agent_name . "" . ui_print_help_tip(__('Disabled'), true); - } - else if ($this->agent['quiet']) { - $agent_name = "" . $agent_name . " " . html_print_image("images/dot_green.disabled.png", true, array("border" => '0', "title" => __('Quiet'), "alt" => "")) . ""; - } - else { - $agent_name = $agent_name; - } - - - if ($system->getConfig('metaconsole')) { - metaconsole_connect(null, $this->agent['id_tmetaconsole_setup']); - $addresses = agents_get_addresses($this->agent['id_tagente']); - } - else - $addresses = agents_get_addresses($this->id); - - if ($system->getConfig('metaconsole')) - metaconsole_restore_db(); - - $address = $this->agent['direccion']; - foreach ($addresses as $k => $add) { - if ($add == $address) { - unset($addresses[$k]); - } - } - $ip = html_print_image('images/world.png', true, array('title' => __('IP address'))) . '  '; - $ip .= empty($address) ? '' . __('N/A') . '' : $address; - if (!empty($addresses)) { - $ip .= ui_print_help_tip(__('Other IP addresses').':
'.implode('
',$addresses), true); - } - $ip .= '
'; - - $last_contact = '' . __('Last contact') . ': ' - .ui_print_timestamp ($this->agent["ultimo_contacto"], true) . '
'; - - $description = '' . __('Description') . ':
'; - if (empty($agent["comentarios"])) { - $description .= '' . __('N/A') . ''; - } - else { - $description .= $this->agent["comentarios"]; - } - - - $html = '
'; - $html .= ui_print_group_icon ($this->agent["id_grupo"], true, "groups_small", "", false) . '  '; - $html .= '' . $agent_name . '
'; - $html .= $ip; - $html .= $last_contact; - $html .= $description; - $html .= '
'; + if ($this->agent['disabled']) { + $agent_name = "" . $agent_name . "" . + ui_print_help_tip(__('Disabled'), true); + } + else if ($this->agent['quiet']) { + $agent_name = "" . $agent_name . " " . + html_print_image("images/dot_green.disabled.png", + true, array("border" => '0', "title" => __('Quiet'), "alt" => "")) . ""; + } + else { + $agent_name = $agent_name; + } + + if ($system->getConfig('metaconsole')) { metaconsole_connect(null, $this->agent['id_tmetaconsole_setup']); - } + //~ $addresses = agents_get_addresses($this->agent['id_tagente']); + } + else + $addresses = agents_get_addresses($this->id); + + if ($system->getConfig('metaconsole')) + metaconsole_restore_db(); + + $address = $this->agent['direccion']; + //~ foreach ($addresses as $k => $add) { + //~ if ($add == $address) { + //~ unset($addresses[$k]); + //~ } + //~ } + + //~ $ip = html_print_image('images/world.png', + //~ true, array('title' => __('IP address'))) . + //~ '  '; + $ip .= empty($address) ? '' . __('N/A') . + '' : $address; + + //~ if (!empty($addresses)) { + //~ $ip .= ui_print_help_tip(__('Other IP addresses') . + //~ ': ' . implode(', ',$addresses), true); + //~ } + + $last_contact = '' . __('Last contact') . + ': ' . + ui_print_timestamp ($this->agent["ultimo_contacto"], true); + + //~ $description = '' . __('Description') . ': '; + if (empty($agent["comentarios"])) { + $description .= '' . __('N/A') . ''; + } + else { + $description .= $this->agent["comentarios"]; + } + + $html = '
'; + $html .= '' . $agent_name . + ''; + $html .= '
'; + $html .= '
' . ui_print_os_icon ($this->agent["id_os"], false, true, + true, false, false, false, false, true) . '
'; + $html .= '
'; + $html .= $ip . ' - ' . + groups_get_name ($this->agent["id_grupo"], true); + $html .= '
+
'; + $html .= $last_contact; + $html .= '
+
'; + $html .= $description; + $html .= '
'; + + if ($system->getConfig('metaconsole')) { + metaconsole_connect(null, + $this->agent['id_tmetaconsole_setup']); + } + $ui->contentGridAddCell($html, 'agent_details'); - ob_start(); - $html = '
'; - $html .= "" . __('Modules by status') . "
"; - $html .= graph_agent_status ($this->id, 160, 160, true); - $graph_js = ob_get_clean(); - $html = $graph_js . $html; - unset($this->agent['fired_count']); - if ($this->agent['total_count'] > 0) { - $html .= '' . reporting_tiny_stats($this->agent, true) . '
'; - } - $html .= "" . __('Events (24h)') . "

"; - $html .= '
'; - $html .= '
'; - $html .= '
'; + + ob_start(); + + $html = '
'; + $html .= "" . __('Modules by status') . ""; + $html .= graph_agent_status ($this->id, 160, 160, true); + $graph_js = ob_get_clean(); + $html = $graph_js . $html; + + unset($this->agent['fired_count']); + + if ($this->agent['total_count'] > 0) { + $html .= '
' . + reporting_tiny_stats($this->agent, true, 'agent', ' ') . '
'; + } + + $html .= '
'; + $html .= '
'; + $html .= "" . __('Events (24h)') . ""; + $html .= '
'; + $html .= '
'; $ui->contentGridAddCell($html, 'agent_graphs'); $ui->contentEndGrid(); + if ($system->getConfig('metaconsole')) metaconsole_restore_db(); $modules = new Modules(); + if ($system->getConfig('metaconsole')) $filters = array('id_agent' => $this->agent['id_tagente'], 'all_modules' => true, 'status' => -1); else $filters = array('id_agent' => $this->id, 'all_modules' => true, 'status' => -1); + $modules->setFilters($filters); $modules->disabledColumns(array('agent')); $ui->contentBeginCollapsible(__('Modules')); @@ -208,19 +239,24 @@ class Agent { if ($system->getConfig('metaconsole')) { metaconsole_connect(null, $this->agent['id_tmetaconsole_setup']); - } + } + $alerts = new Alerts(); + if ($system->getConfig('metaconsole')) $filters = array('id_agent' => $this->agent['id_tagente'], 'all_alerts' => true); else $filters = array('id_agent' => $this->id, 'all_alerts' => true); + $alerts->setFilters($filters); $alerts->disabledColumns(array('agent')); $ui->contentBeginCollapsible(__('Alerts')); $ui->contentCollapsibleAddItem($alerts->listAlertsHtml(true)); $ui->contentEndCollapsible(); + if ($system->getConfig('metaconsole')) metaconsole_restore_db(); + $events = new Events(); $events->addJavascriptDialog(); diff --git a/pandora_console/mobile/operation/agents.php b/pandora_console/mobile/operation/agents.php index 3430d088b9..1a11e49108 100644 --- a/pandora_console/mobile/operation/agents.php +++ b/pandora_console/mobile/operation/agents.php @@ -325,7 +325,7 @@ class Agents { $row[7] = $row[__('Modules')] = '' . - '' . reporting_tiny_stats($agent, true) . ' '; + '' . reporting_tiny_stats($agent, true, 'agent', ' ') . ' '; $last_time = strtotime ($agent["ultimo_contacto"]); $now = time (); diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php index 18977219e5..f17a655d2a 100644 --- a/pandora_console/mobile/operation/events.php +++ b/pandora_console/mobile/operation/events.php @@ -105,7 +105,7 @@ class Events { $status_icon = html_print_image($img_st, true, false, false, false, false, true); $row = array(); - $row[] = '' . __('Event Name') . '
' . io_safe_output($event['evento']) . '
'; + $row[] = '' . __('Event Name') . '
' . io_safe_output(str_replace(array(' ',''), ' ', $event['evento'])) . '
'; if ($event["id_agente"] == 0) { $agent_name = __('System'); @@ -115,7 +115,7 @@ class Events { } $row_1 = '' . $agent_name . ''; - $row_1 .= '' . $status_icon . '
' . ui_print_timestamp ($event['timestamp_rep'], true, array('units' => 'tiny')) . ''; + $row_1 .= '' . ui_print_timestamp ($event['timestamp_rep'], true, array('units' => 'tiny')) . $status_icon . ''; $row[] = $row_1; @@ -966,10 +966,10 @@ class Events { var new_rows = \"\"; $.each(data.events, function(key, event) { new_rows = \"\" + - \"\" + + \"\" + event[0] + \"\" + - \"\" + event[1] + \"\" + + \"\" + event[1] + \"\" + \"\" + new_rows; }); diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php index c1b18fb427..62da58e81f 100644 --- a/pandora_console/mobile/operation/module_graph.php +++ b/pandora_console/mobile/operation/module_graph.php @@ -84,7 +84,7 @@ class ModuleGraph { $this->height = (int)$system->getRequest('height', 0); //Sancho says "put the height to 1/2 for to make more beautyful" - //$this->height = $this->height / 2; + $this->height = $this->height / 1.5; $this->height -= 80; //Correct the height @@ -279,37 +279,34 @@ class ModuleGraph { ob_start(); ?>