From 173150b4e73ae6640695e5a1738f59014413e172 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Wed, 10 Apr 2013 07:57:54 +0000 Subject: [PATCH] 2013-04-10 Sergio Martin * L . L pandora_console L pandora_console/DEBIAN L pandora_console/include M pandora_console/include/functions_html.php L pandora_console/include/styles D pandora_console/include/styles/tip.css M pandora_console/include/styles/menu.css L pandora_console/include/styles/images M pandora_console/include/styles/pandora.css M pandora_console/include/functions_visual_map_editor.php M pandora_console/include/functions_groups.php L pandora_console/include/ajax M pandora_console/include/ajax/events.php M pandora_console/include/ajax/module.php L pandora_console/include/swiftmailer L pandora_console/include/swiftmailer/classes L pandora_console/include/swiftmailer/classes/Swift L pandora_console/include/swiftmailer/classes/Swift/ByteStream L pandora_console/include/swiftmailer/classes/Swift/Encoder L pandora_console/include/swiftmailer/classes/Swift/Plugins L pandora_console/include/swiftmailer/classes/Swift/Plugins/Decorator L pandora_console/include/swiftmailer/classes/Swift/Plugins/Reporters L pandora_console/include/swiftmailer/classes/Swift/Plugins/Pop L pandora_console/include/swiftmailer/classes/Swift/Plugins/Loggers L pandora_console/include/swiftmailer/classes/Swift/Mime L pandora_console/include/swiftmailer/classes/Swift/Mime/HeaderEncoder L pandora_console/include/swiftmailer/classes/Swift/Mime/ContentEncoder L pandora_console/include/swiftmailer/classes/Swift/Mime/Headers L pandora_console/include/swiftmailer/classes/Swift/Transport L pandora_console/include/swiftmailer/classes/Swift/Transport/Esmtp L pandora_console/include/swiftmailer/classes/Swift/Transport/Esmtp/Auth L pandora_console/include/swiftmailer/classes/Swift/CharacterReaderFactory L pandora_console/include/swiftmailer/classes/Swift/KeyCache L pandora_console/include/swiftmailer/classes/Swift/CharacterReader L pandora_console/include/swiftmailer/classes/Swift/StreamFilters L pandora_console/include/swiftmailer/classes/Swift/Events L pandora_console/include/swiftmailer/classes/Swift/CharacterStream L pandora_console/include/swiftmailer/classes/Swift/Mailer L pandora_console/include/swiftmailer/dependency_maps M pandora_console/include/functions_ui.php M pandora_console/include/functions.php M pandora_console/include/functions_agents.php L pandora_console/include/languages L pandora_console/include/languages/datepicker M pandora_console/include/functions_graph.php M pandora_console/include/functions_events.php M pandora_console/include/functions_menu.php L pandora_console/include/graphs L pandora_console/include/graphs/pChart L pandora_console/include/graphs/pChart/palettes L pandora_console/include/graphs/pChart/fonts L pandora_console/include/graphs/pChart/cache L pandora_console/include/graphs/pChart/data M pandora_console/include/graphs/functions_flot.php L pandora_console/include/graphs/flot M pandora_console/include/graphs/functions_gd.php L pandora_console/include/graphs/images_graphs L pandora_console/include/db M pandora_console/include/functions_reporting.php L pandora_console/include/fonts L pandora_console/include/auth L pandora_console/include/javascript M pandora_console/include/javascript/openlayers.pandora.js L pandora_console/include/javascript/tiny_mce L pandora_console/include/javascript/tiny_mce/utils L pandora_console/include/javascript/tiny_mce/plugins L pandora_console/include/javascript/tiny_mce/plugins/media L pandora_console/include/javascript/tiny_mce/plugins/media/langs L pandora_console/include/javascript/tiny_mce/plugins/media/css L pandora_console/include/javascript/tiny_mce/plugins/media/js L pandora_console/include/javascript/tiny_mce/plugins/pagebreak L pandora_console/include/javascript/tiny_mce/plugins/insertdatetime L pandora_console/include/javascript/tiny_mce/plugins/noneditable L pandora_console/include/javascript/tiny_mce/plugins/inlinepopups L pandora_console/include/javascript/tiny_mce/plugins/inlinepopups/skins L pandora_console/include/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2 L pandora_console/include/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img L pandora_console/include/javascript/tiny_mce/plugins/autolink L pandora_console/include/javascript/tiny_mce/plugins/example_dependency L pandora_console/include/javascript/tiny_mce/plugins/autoresize L pandora_console/include/javascript/tiny_mce/plugins/example L pandora_console/include/javascript/tiny_mce/plugins/example/langs L pandora_console/include/javascript/tiny_mce/plugins/example/img L pandora_console/include/javascript/tiny_mce/plugins/example/js L pandora_console/include/javascript/tiny_mce/plugins/emotions L pandora_console/include/javascript/tiny_mce/plugins/emotions/langs L pandora_console/include/javascript/tiny_mce/plugins/emotions/img L pandora_console/include/javascript/tiny_mce/plugins/emotions/js L pandora_console/include/javascript/tiny_mce/plugins/iespell L pandora_console/include/javascript/tiny_mce/plugins/save L pandora_console/include/javascript/tiny_mce/plugins/lists L pandora_console/include/javascript/tiny_mce/plugins/visualblocks L pandora_console/include/javascript/tiny_mce/plugins/visualblocks/css L pandora_console/include/javascript/tiny_mce/plugins/advhr L pandora_console/include/javascript/tiny_mce/plugins/advhr/langs L pandora_console/include/javascript/tiny_mce/plugins/advhr/css L pandora_console/include/javascript/tiny_mce/plugins/advhr/js L pandora_console/include/javascript/tiny_mce/plugins/advlist L pandora_console/include/javascript/tiny_mce/plugins/tabfocus L pandora_console/include/javascript/tiny_mce/plugins/layer L pandora_console/include/javascript/tiny_mce/plugins/advimage L pandora_console/include/javascript/tiny_mce/plugins/advimage/langs L pandora_console/include/javascript/tiny_mce/plugins/advimage/css L pandora_console/include/javascript/tiny_mce/plugins/advimage/img L pandora_console/include/javascript/tiny_mce/plugins/advimage/js L pandora_console/include/javascript/tiny_mce/plugins/preview L pandora_console/include/javascript/tiny_mce/plugins/preview/jscripts L pandora_console/include/javascript/tiny_mce/plugins/directionality L pandora_console/include/javascript/tiny_mce/plugins/wordcount L pandora_console/include/javascript/tiny_mce/plugins/visualchars L pandora_console/include/javascript/tiny_mce/plugins/legacyoutput L pandora_console/include/javascript/tiny_mce/plugins/autosave L pandora_console/include/javascript/tiny_mce/plugins/table L pandora_console/include/javascript/tiny_mce/plugins/table/langs L pandora_console/include/javascript/tiny_mce/plugins/table/css L pandora_console/include/javascript/tiny_mce/plugins/table/js L pandora_console/include/javascript/tiny_mce/plugins/advlink L pandora_console/include/javascript/tiny_mce/plugins/advlink/langs L pandora_console/include/javascript/tiny_mce/plugins/advlink/css L pandora_console/include/javascript/tiny_mce/plugins/advlink/js L pandora_console/include/javascript/tiny_mce/plugins/print L pandora_console/include/javascript/tiny_mce/plugins/nonbreaking L pandora_console/include/javascript/tiny_mce/plugins/fullpage L pandora_console/include/javascript/tiny_mce/plugins/fullpage/langs L pandora_console/include/javascript/tiny_mce/plugins/fullpage/css L pandora_console/include/javascript/tiny_mce/plugins/fullpage/js L pandora_console/include/javascript/tiny_mce/plugins/style L pandora_console/include/javascript/tiny_mce/plugins/style/langs L pandora_console/include/javascript/tiny_mce/plugins/style/css L pandora_console/include/javascript/tiny_mce/plugins/style/js L pandora_console/include/javascript/tiny_mce/plugins/searchreplace L pandora_console/include/javascript/tiny_mce/plugins/searchreplace/langs L pandora_console/include/javascript/tiny_mce/plugins/searchreplace/css L pandora_console/include/javascript/tiny_mce/plugins/searchreplace/js L pandora_console/include/javascript/tiny_mce/plugins/fullscreen L pandora_console/include/javascript/tiny_mce/plugins/spellchecker L pandora_console/include/javascript/tiny_mce/plugins/spellchecker/includes L pandora_console/include/javascript/tiny_mce/plugins/spellchecker/css L pandora_console/include/javascript/tiny_mce/plugins/spellchecker/img L pandora_console/include/javascript/tiny_mce/plugins/spellchecker/classes L pandora_console/include/javascript/tiny_mce/plugins/spellchecker/classes/utils L pandora_console/include/javascript/tiny_mce/plugins/contextmenu L pandora_console/include/javascript/tiny_mce/plugins/template L pandora_console/include/javascript/tiny_mce/plugins/template/langs L pandora_console/include/javascript/tiny_mce/plugins/template/css L pandora_console/include/javascript/tiny_mce/plugins/template/js L pandora_console/include/javascript/tiny_mce/plugins/paste L pandora_console/include/javascript/tiny_mce/plugins/paste/langs L pandora_console/include/javascript/tiny_mce/plugins/paste/js L pandora_console/include/javascript/tiny_mce/plugins/bbcode L pandora_console/include/javascript/tiny_mce/plugins/xhtmlxtras L pandora_console/include/javascript/tiny_mce/plugins/xhtmlxtras/langs L pandora_console/include/javascript/tiny_mce/plugins/xhtmlxtras/css L pandora_console/include/javascript/tiny_mce/plugins/xhtmlxtras/js L pandora_console/include/javascript/tiny_mce/langs L pandora_console/include/javascript/tiny_mce/themes L pandora_console/include/javascript/tiny_mce/themes/advanced L pandora_console/include/javascript/tiny_mce/themes/advanced/langs L pandora_console/include/javascript/tiny_mce/themes/advanced/skins L pandora_console/include/javascript/tiny_mce/themes/advanced/skins/o2k7 L pandora_console/include/javascript/tiny_mce/themes/advanced/skins/o2k7/img L pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default L pandora_console/include/javascript/tiny_mce/themes/advanced/skins/default/img L pandora_console/include/javascript/tiny_mce/themes/advanced/skins/highcontrast L pandora_console/include/javascript/tiny_mce/themes/advanced/img L pandora_console/include/javascript/tiny_mce/themes/advanced/js L pandora_console/include/javascript/tiny_mce/themes/simple L pandora_console/include/javascript/tiny_mce/themes/simple/langs L pandora_console/include/javascript/tiny_mce/themes/simple/skins L pandora_console/include/javascript/tiny_mce/themes/simple/skins/o2k7 L pandora_console/include/javascript/tiny_mce/themes/simple/skins/o2k7/img L pandora_console/include/javascript/tiny_mce/themes/simple/skins/default L pandora_console/include/javascript/tiny_mce/themes/simple/img M pandora_console/include/javascript/jquery.pandora.js L pandora_console/include/javascript/OpenLayers L pandora_console/include/javascript/OpenLayers/theme L pandora_console/include/javascript/OpenLayers/theme/default L pandora_console/include/javascript/OpenLayers/theme/default/img L pandora_console/include/javascript/OpenLayers/img L pandora_console/include/sounds L pandora_console/include/Image M pandora_console/include/functions_config.php L pandora_console/include/help L pandora_console/include/help/en L pandora_console/include/help/es L pandora_console/include/help/ja M pandora_console/include/functions_snmp_browser.php M pandora_console/include/constants.php M pandora_console/ChangeLog L pandora_console/attachment L pandora_console/attachment/mibs L pandora_console/attachment/plugin M pandora_console/index.php L pandora_console/extensions L pandora_console/extensions/dbmanager M pandora_console/extensions/agents_alerts.php L pandora_console/extensions/module_groups D pandora_console/extensions/module_groups/brick.png M pandora_console/extensions/net_tools.php M pandora_console/extensions/agents_modules.php L pandora_console/extensions/users M pandora_console/extensions/ssh_gateway.php L pandora_console/extensions/net_tools M pandora_console/extensions/net_tools/nettool.png M pandora_console/extensions/vnc_view.php M pandora_console/extensions/dbmanager.php L pandora_console/extensions/agents_modules M pandora_console/extensions/users_connected.php M pandora_console/extensions/module_groups.php L pandora_console/extensions/update_manager L pandora_console/extensions/update_manager/sql L pandora_console/extensions/update_manager/lang L pandora_console/extensions/update_manager/lib M pandora_console/extensions/update_manager/lib/functions.ajax.php L pandora_console/extensions/update_manager/lib/xmlrpc M pandora_console/extensions/update_manager/main.php L pandora_console/extensions/ssh_gateway M pandora_console/extensions/ssh_gateway/secure_console.png L pandora_console/operation L pandora_console/operation/incidents A pandora_console/operation/search_reports.getdata.php A pandora_console/operation/search_users.getdata.php M pandora_console/operation/tree.php L pandora_console/operation/visual_console M pandora_console/operation/visual_console/render_view.php A pandora_console/operation/search_modules.getdata.php A pandora_console/operation/search_main.php L pandora_console/operation/tree L pandora_console/operation/users M pandora_console/operation/users/webchat.php M pandora_console/operation/users/user_edit.php A pandora_console/operation/search_agents.getdata.php L pandora_console/operation/events M pandora_console/operation/events/events.build_table.php M pandora_console/operation/events/event_statistics.php M pandora_console/operation/events/events_list.php M pandora_console/operation/events/events.php A pandora_console/operation/search_graphs.getdata.php L pandora_console/operation/messages M pandora_console/operation/messages/message_edit.php M pandora_console/operation/messages/message_list.php M pandora_console/operation/search_reports.php L pandora_console/operation/reporting M pandora_console/operation/reporting/reporting_viewer.php M pandora_console/operation/reporting/graph_viewer.php M pandora_console/operation/search_users.php M pandora_console/operation/search_results.php A pandora_console/operation/search_alerts.getdata.php M pandora_console/operation/search_modules.php A pandora_console/operation/search_maps.getdata.php L pandora_console/operation/agentes D pandora_console/operation/agentes/datos_agente.php M pandora_console/operation/agentes/alerts_status.php M pandora_console/operation/agentes/estado_generalagente.php M pandora_console/operation/agentes/estado_agente.php M pandora_console/operation/agentes/networkmap.topology.php M pandora_console/operation/agentes/networkmap.groups.php M pandora_console/operation/agentes/exportdata.php M pandora_console/operation/agentes/networkmap_list.php M pandora_console/operation/agentes/agent_fields.php M pandora_console/operation/agentes/tactical.php M pandora_console/operation/agentes/group_view.php M pandora_console/operation/agentes/networkmap.php L pandora_console/operation/servers M pandora_console/operation/servers/recon_view.php M pandora_console/operation/search_agents.php M pandora_console/operation/search_graphs.php L pandora_console/operation/snmpconsole M pandora_console/operation/snmpconsole/snmp_mib_uploader.php M pandora_console/operation/snmpconsole/snmp_browser.php M pandora_console/operation/snmpconsole/snmp_view.php L pandora_console/operation/integria_incidents L pandora_console/operation/gis_maps M pandora_console/operation/gis_maps/render_view.php M pandora_console/operation/gis_maps/index.php M pandora_console/operation/search_alerts.php M pandora_console/operation/search_maps.php L pandora_console/operation/netflow M pandora_console/operation/netflow/nf_live_view.php L pandora_console/images M pandora_console/images/global.png A pandora_console/images/op_events.png A pandora_console/images/zoom_mc.png A pandora_console/images/input_zoom.png M pandora_console/images/pencil.png A pandora_console/images/menu_op_mark.png M pandora_console/images/unlinkpolicy.png A pandora_console/images/gm_setup.png M pandora_console/images/min.png M pandora_console/images/zoom.png M pandora_console/images/max.png A pandora_console/images/builder.png A pandora_console/images/policies_mc.png A pandora_console/images/op_workspace.png M pandora_console/images/user_green.png A pandora_console/images/agent.png A pandora_console/images/performance.png M pandora_console/images/ok.png A pandora_console/images/event_responses.png A pandora_console/images/agent_warning.png A pandora_console/images/module_critical.png A pandora_console/images/op_recon.png A pandora_console/images/email_mc.png A pandora_console/images/add_mc.png M pandora_console/images/go_first.png A pandora_console/images/gm_alerts.png A pandora_console/images/filter.png A pandora_console/images/header_user.png A pandora_console/images/gm_massive_operations.png M pandora_console/images/add.disabled.png A pandora_console/images/gm_netflow.png M pandora_console/images/percentile_item.disabled.png A pandora_console/images/alerts_extern.png M pandora_console/images/vnc.png A pandora_console/images/op_alerts.png A pandora_console/images/op_inventory.png M pandora_console/images/chart_curve.png L pandora_console/images/custom_logo M pandora_console/images/email_open.png A pandora_console/images/button_background.png M pandora_console/images/link2.png A pandora_console/images/control_stop_col.png M pandora_console/images/target.png M pandora_console/images/box.png M pandora_console/images/zoom_cross.png M pandora_console/images/cross.disabled.png A pandora_console/images/filter_mc.png M pandora_console/images/note.png M pandora_console/images/rss.png A pandora_console/images/blade.png A pandora_console/images/lock_mc.png A pandora_console/images/agent_critical.png M pandora_console/images/bell_pause.png M pandora_console/images/chart_curve.disabled.png L pandora_console/images/backgrounds A pandora_console/images/enterprise.png L pandora_console/images/skin L pandora_console/images/skin/skin_default L pandora_console/images/skin/skin_default/include L pandora_console/images/skin/skin_default/include/styles M pandora_console/images/skin/skin_default/include/styles/menu.css M pandora_console/images/skin/skin_default/include/styles/pandora.css L pandora_console/images/skin/skin_default/images A pandora_console/images/skin/skin_default/images/operating_system.png A pandora_console/images/skin/skin_default/images/snmp_wizard.png A pandora_console/images/skin/skin_default/images/global.png A pandora_console/images/skin/skin_default/images/op_events.png A pandora_console/images/skin/skin_default/images/bell_extern.png A pandora_console/images/skin/skin_default/images/go_next.png A pandora_console/images/skin/skin_default/images/policies.png A pandora_console/images/skin/skin_default/images/pencil.png A pandora_console/images/skin/skin_default/images/header_ready.png A pandora_console/images/skin/skin_default/images/agent_unknown.png A pandora_console/images/skin/skin_default/images/bell.png A pandora_console/images/skin/skin_default/images/policies_error.png A pandora_console/images/skin/skin_default/images/unlinkpolicy.png A pandora_console/images/skin/skin_default/images/gm_setup.png A pandora_console/images/skin/skin_default/images/policies_mc.png A pandora_console/images/skin/skin_default/images/builder.png A pandora_console/images/skin/skin_default/images/camera.png A pandora_console/images/skin/skin_default/images/go_last.png A pandora_console/images/skin/skin_default/images/gm_policies.png A pandora_console/images/skin/skin_default/images/op_workspace.png A pandora_console/images/skin/skin_default/images/box.disabled.png A pandora_console/images/skin/skin_default/images/agent.png A pandora_console/images/skin/skin_default/images/setup.png A pandora_console/images/skin/skin_default/images/sitemap_color.png A pandora_console/images/skin/skin_default/images/go_previous.png A pandora_console/images/skin/skin_default/images/performance.png A pandora_console/images/skin/skin_default/images/control_next.png A pandora_console/images/skin/skin_default/images/policies_brick.png A pandora_console/images/skin/skin_default/images/event_responses.png A pandora_console/images/skin/skin_default/images/services.png A pandora_console/images/skin/skin_default/images/email_outbox.png A pandora_console/images/skin/skin_default/images/lock.png A pandora_console/images/skin/skin_default/images/sound.png L pandora_console/images/skin/skin_default/images/os_icons A pandora_console/images/skin/skin_default/images/god1.png A pandora_console/images/skin/skin_default/images/gm_modules.png A pandora_console/images/skin/skin_default/images/plugin.png A pandora_console/images/skin/skin_default/images/god7.png A pandora_console/images/skin/skin_default/images/html.png A pandora_console/images/skin/skin_default/images/op_recon.png A pandora_console/images/skin/skin_default/images/control_play.png A pandora_console/images/skin/skin_default/images/gm_gis.png A pandora_console/images/skin/skin_default/images/header_refresh.png A pandora_console/images/skin/skin_default/images/email_mc.png A pandora_console/images/skin/skin_default/images/add_mc.png A pandora_console/images/skin/skin_default/images/op_reporting.png A pandora_console/images/skin/skin_default/images/config.disabled.png A pandora_console/images/skin/skin_default/images/list.png A pandora_console/images/skin/skin_default/images/tag_red.disabled.png A pandora_console/images/skin/skin_default/images/go_first.png A pandora_console/images/skin/skin_default/images/gm_servers.png A pandora_console/images/skin/skin_default/images/gm_alerts.png A pandora_console/images/skin/skin_default/images/linkpolicy.png A pandora_console/images/skin/skin_default/images/books.png A pandora_console/images/skin/skin_default/images/reporting32.png A pandora_console/images/skin/skin_default/images/op_gis.png A pandora_console/images/skin/skin_default/images/version.png A pandora_console/images/skin/skin_default/images/policies_error_db.png A pandora_console/images/skin/skin_default/images/filter.png A pandora_console/images/skin/skin_default/images/chart_bar.png A pandora_console/images/skin/skin_default/images/grid.png A pandora_console/images/skin/skin_default/images/header_user.png A pandora_console/images/skin/skin_default/images/bell_error.png A pandora_console/images/skin/skin_default/images/normal_screen.png A pandora_console/images/skin/skin_default/images/brick.png A pandora_console/images/skin/skin_default/images/gm_massive_operations.png A pandora_console/images/skin/skin_default/images/policies_ok.png A pandora_console/images/skin/skin_default/images/gm_netflow.png A pandora_console/images/skin/skin_default/images/advanced.png A pandora_console/images/skin/skin_default/images/csv_mc.png A pandora_console/images/skin/skin_default/images/op_snmp.png A pandora_console/images/skin/skin_default/images/save_mc.png A pandora_console/images/skin/skin_default/images/snmp.png A pandora_console/images/skin/skin_default/images/load.png A pandora_console/images/skin/skin_default/images/alerts_extern.png A pandora_console/images/skin/skin_default/images/header_logout.png A pandora_console/images/skin/skin_default/images/vnc.png A pandora_console/images/skin/skin_default/images/op_alerts.png A pandora_console/images/skin/skin_default/images/grid.disabled.png A pandora_console/images/skin/skin_default/images/chart_bar.disabled.png A pandora_console/images/skin/skin_default/images/op_inventory.png A pandora_console/images/skin/skin_default/images/photo.disabled.png A pandora_console/images/skin/skin_default/images/disk.disabled.png A pandora_console/images/skin/skin_default/images/chart_curve.png A pandora_console/images/skin/skin_default/images/recon.png A pandora_console/images/skin/skin_default/images/camera_mc.png A pandora_console/images/skin/skin_default/images/gm_db.png A pandora_console/images/skin/skin_default/images/reporting.png A pandora_console/images/skin/skin_default/images/custom_field.png A pandora_console/images/skin/skin_default/images/control_pause.png A pandora_console/images/skin/skin_default/images/key.png L pandora_console/images/skin/skin_default/images/mimetypes A pandora_console/images/skin/skin_default/images/wmi.png A pandora_console/images/skin/skin_default/images/link.png A pandora_console/images/skin/skin_default/images/cross.disabled.png A pandora_console/images/skin/skin_default/images/header_email.png A pandora_console/images/skin/skin_default/images/control_play_col.png A pandora_console/images/skin/skin_default/images/filter_mc.png A pandora_console/images/skin/skin_default/images/blade.png A pandora_console/images/skin/skin_default/images/lock_mc.png A pandora_console/images/skin/skin_default/images/bell_pause.png A pandora_console/images/skin/skin_default/images/chart_curve.disabled.png A pandora_console/images/skin/skin_default/images/header_down.png A pandora_console/images/skin/skin_default/images/enterprise.png A pandora_console/images/skin/skin_default/images/profiles.png A pandora_console/images/skin/skin_default/images/gm_users.png A pandora_console/images/skin/skin_default/images/email_inbox.png A pandora_console/images/skin/skin_default/images/header_chat.png A pandora_console/images/skin/skin_default/images/wand_sla.png A pandora_console/images/skin/skin_default/images/collection.png A pandora_console/images/skin/skin_default/images/god2.png A pandora_console/images/skin/skin_default/images/god4.png A pandora_console/images/skin/skin_default/images/inventory.png A pandora_console/images/skin/skin_default/images/header_user_admin.png A pandora_console/images/skin/skin_default/images/god6.png A pandora_console/images/skin/skin_default/images/header_help.png A pandora_console/images/skin/skin_default/images/gm_log.png A pandora_console/images/skin/skin_default/images/tag.png A pandora_console/images/skin/skin_default/images/control_prev.png A pandora_console/images/skin/skin_default/images/agent_mc.png A pandora_console/images/skin/skin_default/images/delete_mc.png A pandora_console/images/skin/skin_default/images/pen.png A pandora_console/images/skin/skin_default/images/plus.png L pandora_console/images/skin/skin_default/images/groups_small A pandora_console/images/skin/skin_default/images/module.png A pandora_console/images/skin/skin_default/images/gm_events.png A pandora_console/images/skin/skin_default/images/photo.png A pandora_console/images/skin/skin_default/images/csv.png A pandora_console/images/skin/skin_default/images/new_message.png A pandora_console/images/skin/skin_default/images/templates.png A pandora_console/images/skin/skin_default/images/book_edit.png A pandora_console/images/skin/skin_default/images/events_list.png A pandora_console/images/skin/skin_default/images/policies_cog.png A pandora_console/images/skin/skin_default/images/operation.png A pandora_console/images/skin/skin_default/images/xml.png A pandora_console/images/skin/skin_default/images/full_screen.png A pandora_console/images/skin/skin_default/images/module_group.png A pandora_console/images/skin/skin_default/images/policies_not_brick.png A pandora_console/images/skin/skin_default/images/heart.png A pandora_console/images/skin/skin_default/images/gm_monitoring.png A pandora_console/images/skin/skin_default/images/custom_columns.png A pandora_console/images/skin/skin_default/images/control_pause_col.png A pandora_console/images/skin/skin_default/images/custom_field_col.png A pandora_console/images/skin/skin_default/images/header_events.png A pandora_console/images/skin/skin_default/images/op_netflow.png A pandora_console/images/skin/skin_default/images/header_warning.png A pandora_console/images/skin/skin_default/images/plugin_mc.png A pandora_console/images/skin/skin_default/images/sla.png M pandora_console/images/skin/skin_default/images/binary.png A pandora_console/images/skin/skin_default/images/op_network.png A pandora_console/images/skin/skin_default/images/binary.disabled.png M pandora_console/images/profiles.png A pandora_console/images/collection.png A pandora_console/images/inventory.png A pandora_console/images/gm_log.png M pandora_console/images/images.png M pandora_console/images/cog.png A pandora_console/images/tag.png A pandora_console/images/mc_plugin.png A pandora_console/images/enterprise_icon.png M pandora_console/images/photo.png M pandora_console/images/refresh.png A pandora_console/images/events_list.png A pandora_console/images/operation.png A pandora_console/images/full_screen.png A pandora_console/images/chart_curve_overview.disabled.png M pandora_console/images/heart.png A pandora_console/images/input_add.png A pandora_console/images/gm_monitoring.png M pandora_console/images/percentile_item.png A pandora_console/images/module_warning.png A pandora_console/images/custom_field_col.png A pandora_console/images/plugin_mc.png M pandora_console/images/snmp_wizard.png M pandora_console/images/link_break.png M pandora_console/images/go_next.png M pandora_console/images/policies.png M pandora_console/images/bell.png M pandora_console/images/policies_error.png A pandora_console/images/agent_ok.png M pandora_console/images/go_last.png A pandora_console/images/services.png A pandora_console/images/sound.png L pandora_console/images/os_icons A pandora_console/images/tab_green_bg.png M pandora_console/images/plugin.png A pandora_console/images/header_refresh.png A pandora_console/images/op_reporting.png A pandora_console/images/list.png A pandora_console/images/gm_servers.png M pandora_console/images/books.png A pandora_console/images/reporting32.png A pandora_console/images/input_delete.png M pandora_console/images/div.png A pandora_console/images/input_go.png M pandora_console/images/policies_error_db.png A pandora_console/images/normal_screen.png A pandora_console/images/dashboard.png A pandora_console/images/donut.png M pandora_console/images/network.disabled.png M pandora_console/images/policies_ok.png A pandora_console/images/submenu_tree_first.png M pandora_console/images/lightning_go.png A pandora_console/images/csv_mc.png M pandora_console/images/snmp.png A pandora_console/images/recon_icon.png M pandora_console/images/default_list.png A pandora_console/images/database_history.png M pandora_console/images/chart_bar.disabled.png A pandora_console/images/help_icon.png A pandora_console/images/input_update.png A pandora_console/images/agent_notinit.png M pandora_console/images/control_pause.png A pandora_console/images/key.png L pandora_console/images/mimetypes M pandora_console/images/link.png A pandora_console/images/header_email.png M pandora_console/images/delete.png L pandora_console/images/networkmap A pandora_console/images/input_wand.png A pandora_console/images/input_tick.png M pandora_console/images/bricks.png A pandora_console/images/write_paper.png M pandora_console/images/world.png M pandora_console/images/wand_sla.png M pandora_console/images/wand.png M pandora_console/images/disk.png M pandora_console/images/group.png A pandora_console/images/header_user_admin.png A pandora_console/images/header_help.png A pandora_console/images/category.png M pandora_console/images/house.png A pandora_console/images/module.png A pandora_console/images/export25.png A pandora_console/images/xml.png A pandora_console/images/op_netflow.png L pandora_console/images/console L pandora_console/images/console/background L pandora_console/images/console/icons L pandora_console/images/console/icons/old_icons M pandora_console/images/cross.png A pandora_console/images/operating_system.png M pandora_console/images/application_edit.png M pandora_console/images/camera.png M pandora_console/images/sub.png A pandora_console/images/gm_policies.png A pandora_console/images/box.disabled.png M pandora_console/images/setup.png M pandora_console/images/go_previous.png A pandora_console/images/module_mc.png M pandora_console/images/tag_red.png A pandora_console/images/submenu_tree_middle.png A pandora_console/images/visual_console.png A pandora_console/images/email_outbox.png M pandora_console/images/attachment.png A pandora_console/images/module_notinit.png L pandora_console/images/gis_map L pandora_console/images/gis_map/icons A pandora_console/images/submenu2_tree_middle.png A pandora_console/images/html.png M pandora_console/images/control_play.png M pandora_console/images/tag_red.disabled.png M pandora_console/images/lightbulb.png A pandora_console/images/version.png M pandora_console/images/bell_error.png M pandora_console/images/brick.png M pandora_console/images/tip.png A pandora_console/images/op_snmp.png M pandora_console/images/pandora_header_logo_enterprise.png A pandora_console/images/load.png M pandora_console/images/chart_curve_threshold.png A pandora_console/images/chart.png M pandora_console/images/copy.png A pandora_console/images/op_monitoring.png M pandora_console/images/mul.png A pandora_console/images/menu_gm_mark.png A pandora_console/images/menu_lk_mark.png A pandora_console/images/gm_users.png A pandora_console/images/email_inbox.png A pandora_console/images/header_chat.png M pandora_console/images/network.png M pandora_console/images/extensions.png A pandora_console/images/submenu2_tree_last.png M pandora_console/images/database.png A pandora_console/images/delete_mc.png A pandora_console/images/input_config.png L pandora_console/images/groups_small A pandora_console/images/server_export_mc.png A pandora_console/images/input_cog.png M pandora_console/images/add.png A pandora_console/images/csv.png A pandora_console/images/module_group.png D pandora_console/images/lupa.png A pandora_console/images/control_pause_col.png A pandora_console/images/custom_columns.png A pandora_console/images/header_warning.png D pandora_console/images/user.png M pandora_console/images/binary.png A pandora_console/images/op_network.png A pandora_console/images/home.png A pandora_console/images/bell_extern.png A pandora_console/images/tab_grey_bg.png A pandora_console/images/header_blackout.png A pandora_console/images/header_ready.png A pandora_console/images/agent_unknown.png M pandora_console/images/config.png M pandora_console/images/pdf.png A pandora_console/images/control_next.png A pandora_console/images/submenu_tree_last.png M pandora_console/images/comments.png A pandora_console/images/control_stop.png M pandora_console/images/email.png M pandora_console/images/lock.png M pandora_console/images/error.png A pandora_console/images/gm_modules.png A pandora_console/images/gm_gis.png M pandora_console/images/data.png M pandora_console/images/config.disabled.png M pandora_console/images/linkpolicy.png A pandora_console/images/op_gis.png M pandora_console/images/clean.png M pandora_console/images/chart_bar.png D pandora_console/images/lupa_15x15.png L pandora_console/images/help A pandora_console/images/advanced.png A pandora_console/images/save_mc.png A pandora_console/images/module_ok.png A pandora_console/images/header_logout.png M pandora_console/images/user_suit.png M pandora_console/images/file.disabled.png L pandora_console/images/status_sets L pandora_console/images/status_sets/faces L pandora_console/images/status_sets/color_text L pandora_console/images/status_sets/default M pandora_console/images/photo.disabled.png M pandora_console/images/recon.png M pandora_console/images/lightbulb_off.png A pandora_console/images/camera_mc.png A pandora_console/images/gm_db.png M pandora_console/images/attachment_del.png A pandora_console/images/custom_field.png M pandora_console/images/eye.png M pandora_console/images/wmi.png M pandora_console/images/camera.disabled.png A pandora_console/images/control_play_col.png M pandora_console/images/sum.png M pandora_console/images/pandora_header_logo.png M pandora_console/images/avg.png A pandora_console/images/header_down.png M pandora_console/images/zoom_cross.disabled.png A pandora_console/images/module_unknown.png M pandora_console/images/server_export.png A pandora_console/images/bin.png A pandora_console/images/input_cross.png A pandora_console/images/control_prev.png A pandora_console/images/agent_mc.png A pandora_console/images/pen.png A pandora_console/images/plus.png D pandora_console/images/log-out.png A pandora_console/images/gm_events.png A pandora_console/images/new_message.png A pandora_console/images/templates.png A pandora_console/images/sla.png M pandora_console/images/binary.disabled.png M pandora_console/images/chart_curve_overview.png A pandora_console/images/mg_modules.png L pandora_console/extras L pandora_console/mobile L pandora_console/mobile/operation L pandora_console/mobile/include L pandora_console/mobile/include/style L pandora_console/mobile/images L pandora_console/general L pandora_console/general/license M pandora_console/general/login_page.php M pandora_console/general/logon_ok.php M pandora_console/general/main_menu.php L pandora_console/general/ui M pandora_console/general/header.php L pandora_console/godmode L pandora_console/godmode/groups M pandora_console/godmode/groups/modu_group_list.php M pandora_console/godmode/groups/configure_group.php M pandora_console/godmode/groups/configure_modu_group.php M pandora_console/godmode/groups/group_list.php M pandora_console/godmode/admin_access_logs.php M pandora_console/godmode/extensions.php L pandora_console/godmode/db M pandora_console/godmode/db/db_main.php M pandora_console/godmode/db/db_audit.php M pandora_console/godmode/db/db_sanity.php M pandora_console/godmode/db/db_refine.php M pandora_console/godmode/db/db_info.php M pandora_console/godmode/db/db_event.php M pandora_console/godmode/db/db_purge.php L pandora_console/godmode/agentes M pandora_console/godmode/agentes/fields_manager.php M pandora_console/godmode/agentes/planned_downtime.list.php M pandora_console/godmode/agentes/planned_downtime.editor.php M pandora_console/godmode/agentes/modificar_agente.php M pandora_console/godmode/agentes/configurar_agente.php M pandora_console/godmode/agentes/configure_field.php M pandora_console/godmode/agentes/agent_manager.php L pandora_console/godmode/servers M pandora_console/godmode/servers/recon_script.php M pandora_console/godmode/servers/plugin.php A pandora_console/godmode/servers/servers.build_table.php M pandora_console/godmode/servers/manage_recontask.php M pandora_console/godmode/servers/modificar_server.php M pandora_console/godmode/servers/manage_recontask_form.php L pandora_console/godmode/alerts M pandora_console/godmode/alerts/alert_list.php M pandora_console/godmode/alerts/configure_alert_template.php M pandora_console/godmode/alerts/alert_templates.php M pandora_console/godmode/alerts/configure_alert_action.php M pandora_console/godmode/alerts/configure_alert_command.php M pandora_console/godmode/alerts/alert_actions.php M pandora_console/godmode/alerts/alert_special_days.php M pandora_console/godmode/alerts/alert_commands.php M pandora_console/godmode/alerts/configure_alert_special_days.php L pandora_console/godmode/snmpconsole M pandora_console/godmode/snmpconsole/snmp_trap_generator.php M pandora_console/godmode/snmpconsole/snmp_alert.php M pandora_console/godmode/snmpconsole/snmp_filters.php L pandora_console/godmode/setup M pandora_console/godmode/setup/setup_general.php M pandora_console/godmode/setup/links.php M pandora_console/godmode/setup/setup.php M pandora_console/godmode/setup/os.php L pandora_console/godmode/users M pandora_console/godmode/users/user_list.php M pandora_console/godmode/users/profile_list.php M pandora_console/godmode/users/configure_user.php M pandora_console/godmode/users/configure_profile.php L pandora_console/godmode/gis_maps M pandora_console/godmode/gis_maps/configure_gis_map.php M pandora_console/godmode/gis_maps/index.php L pandora_console/godmode/events M pandora_console/godmode/events/event_edit_filter.php M pandora_console/godmode/events/events.php L pandora_console/godmode/massive M pandora_console/godmode/massive/massive_copy_modules.php M pandora_console/godmode/massive/massive_operations.php L pandora_console/godmode/modules M pandora_console/godmode/modules/manage_network_templates.php M pandora_console/godmode/modules/module_list.php L pandora_console/godmode/reporting M pandora_console/godmode/reporting/visual_console_builder.php M pandora_console/godmode/reporting/graph_builder.php M pandora_console/godmode/reporting/reporting_builder.php M pandora_console/godmode/reporting/map_builder.php M pandora_console/godmode/reporting/graphs.php L pandora_console/godmode/tag M pandora_console/godmode/tag/tag.php M pandora_console/godmode/tag/edit_tag.php L pandora_console/godmode/category M pandora_console/godmode/category/category.php M pandora_console/godmode/category/edit_category.php L pandora_console/godmode/netflow M pandora_console/godmode/netflow/nf_edit_form.php M pandora_console/godmode/netflow/nf_item_list.php M pandora_console/godmode/netflow/nf_edit.php: Changing whole visual style including icons and css git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7951 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 562 +++++++++++++++ pandora_console/extensions/agents_alerts.php | 13 +- pandora_console/extensions/agents_modules.php | 15 +- pandora_console/extensions/dbmanager.php | 2 +- pandora_console/extensions/module_groups.php | 2 +- .../extensions/module_groups/brick.png | Bin 481 -> 0 bytes pandora_console/extensions/net_tools.php | 11 +- .../extensions/net_tools/nettool.png | Bin 965 -> 1502 bytes pandora_console/extensions/ssh_gateway.php | 14 +- .../extensions/ssh_gateway/secure_console.png | Bin 818 -> 1396 bytes .../update_manager/lib/functions.ajax.php | 1 - .../extensions/update_manager/main.php | 2 +- .../extensions/users_connected.php | 9 +- pandora_console/extensions/vnc_view.php | 9 +- pandora_console/general/header.php | 360 +++++----- pandora_console/general/login_page.php | 2 +- pandora_console/general/logon_ok.php | 23 +- pandora_console/general/main_menu.php | 10 +- pandora_console/godmode/admin_access_logs.php | 2 +- .../godmode/agentes/agent_manager.php | 4 +- .../godmode/agentes/configurar_agente.php | 17 +- .../godmode/agentes/configure_field.php | 6 +- .../godmode/agentes/fields_manager.php | 4 +- .../godmode/agentes/modificar_agente.php | 11 +- .../agentes/planned_downtime.editor.php | 2 +- .../godmode/agentes/planned_downtime.list.php | 6 +- .../godmode/alerts/alert_actions.php | 18 +- .../godmode/alerts/alert_commands.php | 4 +- pandora_console/godmode/alerts/alert_list.php | 10 +- .../godmode/alerts/alert_special_days.php | 2 +- .../godmode/alerts/alert_templates.php | 10 +- .../godmode/alerts/configure_alert_action.php | 15 +- .../alerts/configure_alert_command.php | 2 +- .../alerts/configure_alert_special_days.php | 2 +- .../alerts/configure_alert_template.php | 18 +- pandora_console/godmode/category/category.php | 4 +- .../godmode/category/edit_category.php | 4 +- pandora_console/godmode/db/db_audit.php | 2 +- pandora_console/godmode/db/db_event.php | 2 +- pandora_console/godmode/db/db_info.php | 2 +- pandora_console/godmode/db/db_main.php | 4 +- pandora_console/godmode/db/db_purge.php | 2 +- pandora_console/godmode/db/db_refine.php | 2 +- pandora_console/godmode/db/db_sanity.php | 2 +- .../godmode/events/event_edit_filter.php | 2 +- pandora_console/godmode/events/events.php | 17 +- pandora_console/godmode/extensions.php | 2 +- .../godmode/gis_maps/configure_gis_map.php | 4 +- pandora_console/godmode/gis_maps/index.php | 6 +- .../godmode/groups/configure_group.php | 2 +- .../godmode/groups/configure_modu_group.php | 4 +- pandora_console/godmode/groups/group_list.php | 2 +- .../godmode/groups/modu_group_list.php | 2 +- .../godmode/massive/massive_copy_modules.php | 1 - .../godmode/massive/massive_operations.php | 6 +- .../modules/manage_network_templates.php | 8 +- .../godmode/modules/module_list.php | 2 +- pandora_console/godmode/netflow/nf_edit.php | 2 +- .../godmode/netflow/nf_edit_form.php | 10 +- .../godmode/netflow/nf_item_list.php | 2 +- .../godmode/reporting/graph_builder.php | 10 +- pandora_console/godmode/reporting/graphs.php | 8 +- .../godmode/reporting/map_builder.php | 4 +- .../godmode/reporting/reporting_builder.php | 27 +- .../reporting/visual_console_builder.php | 16 +- .../godmode/servers/manage_recontask.php | 14 +- .../godmode/servers/manage_recontask_form.php | 4 +- .../godmode/servers/modificar_server.php | 134 +--- pandora_console/godmode/servers/plugin.php | 8 +- .../godmode/servers/recon_script.php | 8 +- .../godmode/servers/servers.build_table.php | 142 ++++ pandora_console/godmode/setup/links.php | 4 +- pandora_console/godmode/setup/os.php | 6 +- pandora_console/godmode/setup/setup.php | 10 +- .../godmode/setup/setup_general.php | 14 +- .../godmode/snmpconsole/snmp_alert.php | 18 +- .../godmode/snmpconsole/snmp_filters.php | 18 +- .../snmpconsole/snmp_trap_generator.php | 4 +- pandora_console/godmode/tag/edit_tag.php | 4 +- pandora_console/godmode/tag/tag.php | 4 +- .../godmode/users/configure_profile.php | 6 +- .../godmode/users/configure_user.php | 4 +- .../godmode/users/profile_list.php | 6 +- pandora_console/godmode/users/user_list.php | 13 +- pandora_console/images/add.disabled.png | Bin 442 -> 1440 bytes pandora_console/images/add.png | Bin 700 -> 1437 bytes pandora_console/images/add_mc.png | Bin 0 -> 1386 bytes pandora_console/images/advanced.png | Bin 0 -> 1290 bytes pandora_console/images/agent.png | Bin 0 -> 1398 bytes pandora_console/images/agent_critical.png | Bin 0 -> 1403 bytes pandora_console/images/agent_mc.png | Bin 0 -> 1343 bytes pandora_console/images/agent_notinit.png | Bin 0 -> 1406 bytes pandora_console/images/agent_ok.png | Bin 0 -> 1387 bytes pandora_console/images/agent_unknown.png | Bin 0 -> 1406 bytes pandora_console/images/agent_warning.png | Bin 0 -> 1410 bytes pandora_console/images/alerts_extern.png | Bin 0 -> 1431 bytes pandora_console/images/application_edit.png | Bin 671 -> 1640 bytes pandora_console/images/attachment.png | Bin 514 -> 1429 bytes pandora_console/images/attachment_del.png | Bin 727 -> 1368 bytes pandora_console/images/avg.png | Bin 1515 -> 1604 bytes pandora_console/images/bell.png | Bin 789 -> 1540 bytes pandora_console/images/bell_error.png | Bin 813 -> 1621 bytes pandora_console/images/bell_extern.png | Bin 0 -> 1590 bytes pandora_console/images/bell_pause.png | Bin 863 -> 1658 bytes pandora_console/images/bin.png | Bin 0 -> 1579 bytes pandora_console/images/binary.disabled.png | Bin 264 -> 1341 bytes pandora_console/images/binary.png | Bin 341 -> 1352 bytes pandora_console/images/blade.png | Bin 0 -> 1300 bytes pandora_console/images/books.png | Bin 791 -> 1356 bytes pandora_console/images/box.disabled.png | Bin 0 -> 1641 bytes pandora_console/images/box.png | Bin 877 -> 1665 bytes pandora_console/images/brick.png | Bin 827 -> 1407 bytes pandora_console/images/bricks.png | Bin 959 -> 1343 bytes pandora_console/images/builder.png | Bin 0 -> 1365 bytes pandora_console/images/button_background.png | Bin 0 -> 300 bytes pandora_console/images/camera.disabled.png | Bin 509 -> 1592 bytes pandora_console/images/camera.png | Bin 864 -> 1641 bytes pandora_console/images/camera_mc.png | Bin 0 -> 1357 bytes pandora_console/images/category.png | Bin 0 -> 1339 bytes pandora_console/images/chart.png | Bin 0 -> 1443 bytes pandora_console/images/chart_bar.disabled.png | Bin 233 -> 1236 bytes pandora_console/images/chart_bar.png | Bin 286 -> 1658 bytes .../images/chart_curve.disabled.png | Bin 399 -> 1553 bytes pandora_console/images/chart_curve.png | Bin 759 -> 1709 bytes .../images/chart_curve_overview.disabled.png | Bin 0 -> 1557 bytes .../images/chart_curve_overview.png | Bin 831 -> 1653 bytes .../images/chart_curve_threshold.png | Bin 797 -> 1713 bytes pandora_console/images/clean.png | Bin 773 -> 1487 bytes pandora_console/images/cog.png | Bin 777 -> 1531 bytes pandora_console/images/collection.png | Bin 0 -> 1201 bytes pandora_console/images/comments.png | Bin 846 -> 1402 bytes pandora_console/images/config.disabled.png | Bin 418 -> 1547 bytes pandora_console/images/config.png | Bin 646 -> 1552 bytes pandora_console/images/control_next.png | Bin 0 -> 1375 bytes pandora_console/images/control_pause.png | Bin 721 -> 1393 bytes pandora_console/images/control_pause_col.png | Bin 0 -> 1388 bytes pandora_console/images/control_play.png | Bin 717 -> 1405 bytes pandora_console/images/control_play_col.png | Bin 0 -> 1388 bytes pandora_console/images/control_prev.png | Bin 0 -> 1366 bytes pandora_console/images/control_stop.png | Bin 0 -> 1354 bytes pandora_console/images/control_stop_col.png | Bin 0 -> 1366 bytes pandora_console/images/copy.png | Bin 498 -> 1333 bytes pandora_console/images/cross.disabled.png | Bin 457 -> 1526 bytes pandora_console/images/cross.png | Bin 473 -> 1563 bytes pandora_console/images/csv.png | Bin 0 -> 1502 bytes pandora_console/images/csv_mc.png | Bin 0 -> 1328 bytes pandora_console/images/custom_columns.png | Bin 0 -> 1323 bytes pandora_console/images/custom_field.png | Bin 0 -> 1306 bytes pandora_console/images/custom_field_col.png | Bin 0 -> 1405 bytes pandora_console/images/dashboard.png | Bin 0 -> 1310 bytes pandora_console/images/data.png | Bin 684 -> 1566 bytes pandora_console/images/database.png | Bin 684 -> 1566 bytes pandora_console/images/database_history.png | Bin 0 -> 1305 bytes pandora_console/images/default_list.png | Bin 451 -> 1387 bytes pandora_console/images/delete.png | Bin 695 -> 1408 bytes pandora_console/images/delete_mc.png | Bin 0 -> 1407 bytes pandora_console/images/disk.png | Bin 730 -> 1405 bytes pandora_console/images/div.png | Bin 789 -> 1570 bytes pandora_console/images/donut.png | Bin 0 -> 1367 bytes pandora_console/images/email.png | Bin 530 -> 1499 bytes pandora_console/images/email_inbox.png | Bin 0 -> 1387 bytes pandora_console/images/email_mc.png | Bin 0 -> 1290 bytes pandora_console/images/email_open.png | Bin 700 -> 1598 bytes pandora_console/images/email_outbox.png | Bin 0 -> 1399 bytes pandora_console/images/enterprise.png | Bin 0 -> 1247 bytes pandora_console/images/enterprise_icon.png | Bin 0 -> 1247 bytes pandora_console/images/error.png | Bin 543 -> 1457 bytes pandora_console/images/event_responses.png | Bin 0 -> 1370 bytes pandora_console/images/events_list.png | Bin 0 -> 1336 bytes pandora_console/images/export25.png | Bin 0 -> 1642 bytes pandora_console/images/extensions.png | Bin 621 -> 1257 bytes pandora_console/images/eye.png | Bin 728 -> 1390 bytes pandora_console/images/file.disabled.png | Bin 422 -> 1384 bytes pandora_console/images/filter.png | Bin 0 -> 1405 bytes pandora_console/images/filter_mc.png | Bin 0 -> 1294 bytes pandora_console/images/full_screen.png | Bin 0 -> 1426 bytes pandora_console/images/global.png | Bin 957 -> 1311 bytes pandora_console/images/gm_alerts.png | Bin 0 -> 1517 bytes pandora_console/images/gm_db.png | Bin 0 -> 1390 bytes pandora_console/images/gm_events.png | Bin 0 -> 1478 bytes pandora_console/images/gm_gis.png | Bin 0 -> 1554 bytes pandora_console/images/gm_log.png | Bin 0 -> 1390 bytes .../images/gm_massive_operations.png | Bin 0 -> 1230 bytes pandora_console/images/gm_modules.png | Bin 0 -> 1457 bytes pandora_console/images/gm_monitoring.png | Bin 0 -> 1403 bytes pandora_console/images/gm_netflow.png | Bin 0 -> 1374 bytes pandora_console/images/gm_policies.png | Bin 0 -> 1308 bytes pandora_console/images/gm_servers.png | Bin 0 -> 1482 bytes pandora_console/images/gm_setup.png | Bin 0 -> 1452 bytes pandora_console/images/gm_users.png | Bin 0 -> 1558 bytes pandora_console/images/go_first.png | Bin 666 -> 1352 bytes pandora_console/images/go_last.png | Bin 685 -> 1337 bytes pandora_console/images/go_next.png | Bin 676 -> 1332 bytes pandora_console/images/go_previous.png | Bin 655 -> 1313 bytes pandora_console/images/group.png | Bin 918 -> 1263 bytes pandora_console/images/header_blackout.png | Bin 0 -> 6188 bytes pandora_console/images/header_chat.png | Bin 0 -> 1449 bytes pandora_console/images/header_down.png | Bin 0 -> 1972 bytes pandora_console/images/header_email.png | Bin 0 -> 1707 bytes pandora_console/images/header_help.png | Bin 0 -> 1927 bytes pandora_console/images/header_logout.png | Bin 0 -> 1649 bytes pandora_console/images/header_ready.png | Bin 0 -> 1868 bytes pandora_console/images/header_refresh.png | Bin 0 -> 1616 bytes pandora_console/images/header_user.png | Bin 0 -> 1442 bytes pandora_console/images/header_user_admin.png | Bin 0 -> 1608 bytes pandora_console/images/header_warning.png | Bin 0 -> 1819 bytes pandora_console/images/heart.png | Bin 742 -> 1329 bytes pandora_console/images/help_icon.png | Bin 0 -> 1927 bytes pandora_console/images/home.png | Bin 0 -> 1286 bytes pandora_console/images/house.png | Bin 727 -> 1577 bytes pandora_console/images/html.png | Bin 0 -> 1617 bytes pandora_console/images/images.png | Bin 727 -> 1436 bytes pandora_console/images/input_add.png | Bin 0 -> 1324 bytes pandora_console/images/input_cog.png | Bin 0 -> 1327 bytes pandora_console/images/input_config.png | Bin 0 -> 1330 bytes pandora_console/images/input_cross.png | Bin 0 -> 1237 bytes pandora_console/images/input_delete.png | Bin 0 -> 1305 bytes pandora_console/images/input_go.png | Bin 0 -> 1153 bytes pandora_console/images/input_tick.png | Bin 0 -> 1204 bytes pandora_console/images/input_update.png | Bin 0 -> 1318 bytes pandora_console/images/input_wand.png | Bin 0 -> 1252 bytes pandora_console/images/input_zoom.png | Bin 0 -> 1255 bytes pandora_console/images/inventory.png | Bin 0 -> 1605 bytes pandora_console/images/key.png | Bin 0 -> 1325 bytes pandora_console/images/lightbulb.png | Bin 685 -> 1559 bytes pandora_console/images/lightbulb_off.png | Bin 658 -> 1538 bytes pandora_console/images/lightning_go.png | Bin 766 -> 1516 bytes pandora_console/images/link.png | Bin 324 -> 1345 bytes pandora_console/images/link2.png | Bin 649 -> 1429 bytes pandora_console/images/link_break.png | Bin 804 -> 1368 bytes pandora_console/images/linkpolicy.png | Bin 790 -> 1493 bytes pandora_console/images/list.png | Bin 0 -> 1323 bytes pandora_console/images/load.png | Bin 0 -> 1511 bytes pandora_console/images/lock.png | Bin 689 -> 1430 bytes pandora_console/images/lock_mc.png | Bin 0 -> 1400 bytes pandora_console/images/log-out.png | Bin 763 -> 0 bytes pandora_console/images/lupa.png | Bin 783 -> 0 bytes pandora_console/images/lupa_15x15.png | Bin 783 -> 0 bytes pandora_console/images/max.png | Bin 1519 -> 1577 bytes pandora_console/images/mc_plugin.png | Bin 0 -> 331 bytes pandora_console/images/menu_gm_mark.png | Bin 0 -> 957 bytes pandora_console/images/menu_lk_mark.png | Bin 0 -> 957 bytes pandora_console/images/menu_op_mark.png | Bin 0 -> 957 bytes pandora_console/images/mg_modules.png | Bin 0 -> 1457 bytes pandora_console/images/min.png | Bin 1451 -> 1546 bytes pandora_console/images/module.png | Bin 0 -> 1622 bytes pandora_console/images/module_critical.png | Bin 0 -> 1568 bytes pandora_console/images/module_group.png | Bin 0 -> 1323 bytes pandora_console/images/module_mc.png | Bin 0 -> 1407 bytes pandora_console/images/module_notinit.png | Bin 0 -> 1631 bytes pandora_console/images/module_ok.png | Bin 0 -> 1621 bytes pandora_console/images/module_unknown.png | Bin 0 -> 1609 bytes pandora_console/images/module_warning.png | Bin 0 -> 1601 bytes pandora_console/images/mul.png | Bin 803 -> 1628 bytes pandora_console/images/network.disabled.png | Bin 377 -> 1409 bytes pandora_console/images/network.png | Bin 637 -> 1646 bytes pandora_console/images/new_message.png | Bin 0 -> 1431 bytes pandora_console/images/normal_screen.png | Bin 0 -> 1457 bytes pandora_console/images/note.png | Bin 526 -> 1372 bytes pandora_console/images/ok.png | Bin 712 -> 1569 bytes pandora_console/images/op_alerts.png | Bin 0 -> 1452 bytes pandora_console/images/op_events.png | Bin 0 -> 1284 bytes pandora_console/images/op_gis.png | Bin 0 -> 1402 bytes pandora_console/images/op_inventory.png | Bin 0 -> 1427 bytes pandora_console/images/op_monitoring.png | Bin 0 -> 1425 bytes pandora_console/images/op_netflow.png | Bin 0 -> 1368 bytes pandora_console/images/op_network.png | Bin 0 -> 1480 bytes pandora_console/images/op_recon.png | Bin 0 -> 1506 bytes pandora_console/images/op_reporting.png | Bin 0 -> 1256 bytes pandora_console/images/op_snmp.png | Bin 0 -> 1148 bytes pandora_console/images/op_workspace.png | Bin 0 -> 1331 bytes pandora_console/images/operating_system.png | Bin 0 -> 1262 bytes pandora_console/images/operation.png | Bin 0 -> 1310 bytes .../images/pandora_header_logo.png | Bin 15804 -> 7170 bytes .../images/pandora_header_logo_enterprise.png | Bin 16733 -> 7170 bytes pandora_console/images/pdf.png | Bin 362 -> 1544 bytes pandora_console/images/pen.png | Bin 0 -> 1361 bytes pandora_console/images/pencil.png | Bin 474 -> 1466 bytes .../images/percentile_item.disabled.png | Bin 317 -> 1453 bytes pandora_console/images/percentile_item.png | Bin 450 -> 1454 bytes pandora_console/images/performance.png | Bin 0 -> 1293 bytes pandora_console/images/photo.disabled.png | Bin 326 -> 1427 bytes pandora_console/images/photo.png | Bin 558 -> 1461 bytes pandora_console/images/plugin.png | Bin 654 -> 1353 bytes pandora_console/images/plugin_mc.png | Bin 0 -> 303 bytes pandora_console/images/plus.png | Bin 0 -> 1533 bytes pandora_console/images/policies.png | Bin 612 -> 1331 bytes pandora_console/images/policies_error.png | Bin 778 -> 1497 bytes pandora_console/images/policies_error_db.png | Bin 797 -> 1457 bytes pandora_console/images/policies_mc.png | Bin 0 -> 1230 bytes pandora_console/images/policies_ok.png | Bin 811 -> 1579 bytes pandora_console/images/profiles.png | Bin 855 -> 1312 bytes pandora_console/images/recon.png | Bin 299 -> 1718 bytes pandora_console/images/recon_icon.png | Bin 0 -> 1506 bytes pandora_console/images/refresh.png | Bin 912 -> 1471 bytes pandora_console/images/reporting32.png | Bin 0 -> 1667 bytes pandora_console/images/rss.png | Bin 625 -> 1404 bytes pandora_console/images/save_mc.png | Bin 0 -> 1369 bytes pandora_console/images/server_export.png | Bin 714 -> 1642 bytes pandora_console/images/server_export_mc.png | Bin 0 -> 1438 bytes pandora_console/images/services.png | Bin 0 -> 1372 bytes pandora_console/images/setup.png | Bin 701 -> 1363 bytes .../skin/skin_default/images/add_mc.png | Bin 0 -> 521 bytes .../skin/skin_default/images/advanced.png | Bin 0 -> 757 bytes .../images/skin/skin_default/images/agent.png | Bin 0 -> 630 bytes .../skin/skin_default/images/agent_mc.png | Bin 0 -> 630 bytes .../skin_default/images/agent_unknown.png | Bin 0 -> 630 bytes .../skin_default/images/alerts_extern.png | Bin 0 -> 964 bytes .../images/skin/skin_default/images/bell.png | Bin 0 -> 789 bytes .../skin/skin_default/images/bell_error.png | Bin 0 -> 813 bytes .../skin/skin_default/images/bell_extern.png | Bin 0 -> 964 bytes .../skin/skin_default/images/bell_pause.png | Bin 0 -> 863 bytes .../skin_default/images/binary.disabled.png | Bin 0 -> 264 bytes .../skin/skin_default/images/binary.png | Bin 652 -> 341 bytes .../images/skin/skin_default/images/blade.png | Bin 0 -> 457 bytes .../skin/skin_default/images/book_edit.png | Bin 0 -> 771 bytes .../images/skin/skin_default/images/books.png | Bin 0 -> 791 bytes .../skin/skin_default/images/box.disabled.png | Bin 0 -> 546 bytes .../images/skin/skin_default/images/brick.png | Bin 0 -> 827 bytes .../skin/skin_default/images/builder.png | Bin 0 -> 699 bytes .../skin/skin_default/images/camera.png | Bin 0 -> 864 bytes .../skin/skin_default/images/camera_mc.png | Bin 0 -> 864 bytes .../images/chart_bar.disabled.png | Bin 0 -> 233 bytes .../skin/skin_default/images/chart_bar.png | Bin 0 -> 286 bytes .../images/chart_curve.disabled.png | Bin 0 -> 399 bytes .../skin/skin_default/images/chart_curve.png | Bin 0 -> 759 bytes .../skin/skin_default/images/collection.png | Bin 0 -> 507 bytes .../skin_default/images/config.disabled.png | Bin 0 -> 414 bytes .../skin/skin_default/images/control_next.png | Bin 0 -> 676 bytes .../skin_default/images/control_pause.png | Bin 0 -> 721 bytes .../skin_default/images/control_pause_col.png | Bin 0 -> 721 bytes .../skin/skin_default/images/control_play.png | Bin 0 -> 717 bytes .../skin_default/images/control_play_col.png | Bin 0 -> 717 bytes .../skin/skin_default/images/control_prev.png | Bin 0 -> 655 bytes .../skin_default/images/cross.disabled.png | Bin 0 -> 457 bytes .../images/skin/skin_default/images/csv.png | Bin 0 -> 652 bytes .../skin/skin_default/images/csv_mc.png | Bin 0 -> 652 bytes .../skin_default/images/custom_columns.png | Bin 0 -> 474 bytes .../skin/skin_default/images/custom_field.png | Bin 0 -> 653 bytes .../skin_default/images/custom_field_col.png | Bin 0 -> 653 bytes .../skin/skin_default/images/delete_mc.png | Bin 0 -> 544 bytes .../skin_default/images/disk.disabled.png | Bin 0 -> 360 bytes .../skin/skin_default/images/email_inbox.png | Bin 0 -> 505 bytes .../skin/skin_default/images/email_mc.png | Bin 0 -> 505 bytes .../skin/skin_default/images/email_outbox.png | Bin 0 -> 720 bytes .../skin/skin_default/images/enterprise.png | Bin 0 -> 717 bytes .../skin_default/images/event_responses.png | Bin 0 -> 736 bytes .../skin/skin_default/images/events_list.png | Bin 0 -> 744 bytes .../skin/skin_default/images/filter.png | Bin 0 -> 771 bytes .../skin/skin_default/images/filter_mc.png | Bin 0 -> 771 bytes .../skin/skin_default/images/full_screen.png | Bin 0 -> 1610 bytes .../skin/skin_default/images/global.png | Bin 0 -> 957 bytes .../skin/skin_default/images/gm_alerts.png | Bin 0 -> 964 bytes .../images/skin/skin_default/images/gm_db.png | Bin 0 -> 782 bytes .../skin/skin_default/images/gm_events.png | Bin 0 -> 748 bytes .../skin/skin_default/images/gm_gis.png | Bin 0 -> 882 bytes .../skin/skin_default/images/gm_log.png | Bin 0 -> 744 bytes .../images/gm_massive_operations.png | Bin 0 -> 583 bytes .../skin/skin_default/images/gm_modules.png | Bin 0 -> 827 bytes .../skin_default/images/gm_monitoring.png | Bin 0 -> 672 bytes .../skin/skin_default/images/gm_netflow.png | Bin 0 -> 864 bytes .../skin/skin_default/images/gm_policies.png | Bin 0 -> 751 bytes .../skin/skin_default/images/gm_servers.png | Bin 0 -> 736 bytes .../skin/skin_default/images/gm_setup.png | Bin 0 -> 736 bytes .../skin/skin_default/images/gm_users.png | Bin 0 -> 940 bytes .../skin/skin_default/images/go_first.png | Bin 0 -> 666 bytes .../skin/skin_default/images/go_last.png | Bin 0 -> 685 bytes .../skin/skin_default/images/go_next.png | Bin 0 -> 676 bytes .../skin/skin_default/images/go_previous.png | Bin 0 -> 655 bytes .../images/skin/skin_default/images/god1.png | Bin 0 -> 672 bytes .../images/skin/skin_default/images/god2.png | Bin 0 -> 964 bytes .../images/skin/skin_default/images/god4.png | Bin 0 -> 794 bytes .../images/skin/skin_default/images/god6.png | Bin 0 -> 744 bytes .../images/skin/skin_default/images/god7.png | Bin 0 -> 701 bytes .../skin_default/images/grid.disabled.png | Bin 0 -> 237 bytes .../images/skin/skin_default/images/grid.png | Bin 0 -> 239 bytes .../skin/skin_default/images/header_chat.png | Bin 0 -> 746 bytes .../skin/skin_default/images/header_down.png | Bin 0 -> 544 bytes .../skin/skin_default/images/header_email.png | Bin 0 -> 505 bytes .../skin_default/images/header_events.png | Bin 0 -> 748 bytes .../skin/skin_default/images/header_help.png | Bin 0 -> 925 bytes .../skin_default/images/header_logout.png | Bin 0 -> 660 bytes .../skin/skin_default/images/header_ready.png | Bin 0 -> 724 bytes .../skin_default/images/header_refresh.png | Bin 0 -> 835 bytes .../skin/skin_default/images/header_user.png | Bin 0 -> 744 bytes .../skin_default/images/header_user_admin.png | Bin 0 -> 717 bytes .../skin_default/images/header_warning.png | Bin 0 -> 654 bytes .../images/skin/skin_default/images/heart.png | Bin 0 -> 742 bytes .../images/skin/skin_default/images/html.png | Bin 0 -> 704 bytes .../skin/skin_default/images/inventory.png | Bin 0 -> 664 bytes .../images/skin/skin_default/images/key.png | Bin 0 -> 791 bytes .../images/skin/skin_default/images/link.png | Bin 0 -> 324 bytes .../skin/skin_default/images/linkpolicy.png | Bin 0 -> 790 bytes .../images/skin/skin_default/images/list.png | Bin 0 -> 744 bytes .../images/skin/skin_default/images/load.png | Bin 0 -> 423 bytes .../images/skin/skin_default/images/lock.png | Bin 0 -> 689 bytes .../skin/skin_default/images/lock_mc.png | Bin 0 -> 689 bytes .../skin/skin_default/images/module.png | Bin 0 -> 827 bytes .../skin/skin_default/images/module_group.png | Bin 0 -> 708 bytes .../skin/skin_default/images/new_message.png | Bin 0 -> 763 bytes .../skin_default/images/normal_screen.png | Bin 0 -> 771 bytes .../skin/skin_default/images/op_alerts.png | Bin 0 -> 789 bytes .../skin/skin_default/images/op_events.png | Bin 0 -> 748 bytes .../skin/skin_default/images/op_gis.png | Bin 0 -> 882 bytes .../skin/skin_default/images/op_inventory.png | Bin 0 -> 664 bytes .../skin/skin_default/images/op_netflow.png | Bin 0 -> 864 bytes .../skin/skin_default/images/op_network.png | Bin 0 -> 622 bytes .../skin/skin_default/images/op_recon.png | Bin 0 -> 423 bytes .../skin/skin_default/images/op_reporting.png | Bin 0 -> 704 bytes .../skin/skin_default/images/op_snmp.png | Bin 0 -> 730 bytes .../skin/skin_default/images/op_workspace.png | Bin 0 -> 870 bytes .../skin_default/images/operating_system.png | Bin 0 -> 566 bytes .../skin/skin_default/images/operation.png | Bin 0 -> 566 bytes .../images/skin/skin_default/images/pen.png | Bin 0 -> 474 bytes .../skin/skin_default/images/pencil.png | Bin 0 -> 474 bytes .../skin/skin_default/images/performance.png | Bin 0 -> 503 bytes .../skin_default/images/photo.disabled.png | Bin 0 -> 326 bytes .../images/skin/skin_default/images/photo.png | Bin 0 -> 558 bytes .../skin/skin_default/images/plugin.png | Bin 0 -> 654 bytes .../skin/skin_default/images/plugin_mc.png | Bin 0 -> 654 bytes .../images/skin/skin_default/images/plus.png | Bin 0 -> 521 bytes .../skin/skin_default/images/policies.png | Bin 0 -> 612 bytes .../skin_default/images/policies_brick.png | Bin 0 -> 774 bytes .../skin/skin_default/images/policies_cog.png | Bin 0 -> 751 bytes .../skin_default/images/policies_error.png | Bin 0 -> 778 bytes .../skin_default/images/policies_error_db.png | Bin 0 -> 797 bytes .../skin/skin_default/images/policies_mc.png | Bin 0 -> 612 bytes .../images/policies_not_brick.png | Bin 0 -> 895 bytes .../skin/skin_default/images/policies_ok.png | Bin 0 -> 811 bytes .../skin/skin_default/images/profiles.png | Bin 0 -> 855 bytes .../images/skin/skin_default/images/recon.png | Bin 0 -> 299 bytes .../skin/skin_default/images/reporting.png | Bin 0 -> 704 bytes .../skin/skin_default/images/reporting32.png | Bin 0 -> 704 bytes .../skin/skin_default/images/save_mc.png | Bin 0 -> 507 bytes .../skin/skin_default/images/services.png | Bin 0 -> 508 bytes .../images/skin/skin_default/images/setup.png | Bin 0 -> 736 bytes .../skin_default/images/sitemap_color.png | Bin 0 -> 583 bytes .../images/skin/skin_default/images/sla.png | Bin 0 -> 529 bytes .../images/skin/skin_default/images/snmp.png | Bin 0 -> 426 bytes .../skin/skin_default/images/snmp_wizard.png | Bin 0 -> 737 bytes .../images/skin/skin_default/images/sound.png | Bin 0 -> 721 bytes .../images/skin/skin_default/images/tag.png | Bin 0 -> 756 bytes .../skin_default/images/tag_red.disabled.png | Bin 0 -> 450 bytes .../skin/skin_default/images/templates.png | Bin 0 -> 561 bytes .../skin/skin_default/images/unlinkpolicy.png | Bin 0 -> 867 bytes .../skin/skin_default/images/version.png | Bin 0 -> 744 bytes .../images/skin/skin_default/images/vnc.png | Bin 0 -> 708 bytes .../skin/skin_default/images/wand_sla.png | Bin 0 -> 739 bytes .../images/skin/skin_default/images/wmi.png | Bin 0 -> 649 bytes .../images/skin/skin_default/images/xml.png | Bin 0 -> 698 bytes .../skin/skin_default/include/styles/menu.css | 12 +- .../skin_default/include/styles/pandora.css | 119 +++- pandora_console/images/sla.png | Bin 0 -> 1385 bytes pandora_console/images/snmp.png | Bin 426 -> 1295 bytes pandora_console/images/snmp_wizard.png | Bin 737 -> 1382 bytes pandora_console/images/sound.png | Bin 0 -> 1418 bytes pandora_console/images/sub.png | Bin 717 -> 1406 bytes pandora_console/images/submenu2_tree_last.png | Bin 0 -> 200 bytes .../images/submenu2_tree_middle.png | Bin 0 -> 205 bytes pandora_console/images/submenu_tree_first.png | Bin 0 -> 1025 bytes pandora_console/images/submenu_tree_last.png | Bin 0 -> 1045 bytes .../images/submenu_tree_middle.png | Bin 0 -> 1036 bytes pandora_console/images/sum.png | Bin 1410 -> 1598 bytes pandora_console/images/tab_green_bg.png | Bin 0 -> 3497 bytes pandora_console/images/tab_grey_bg.png | Bin 0 -> 2430 bytes pandora_console/images/tag.png | Bin 0 -> 1344 bytes pandora_console/images/tag_red.disabled.png | Bin 448 -> 1621 bytes pandora_console/images/tag_red.png | Bin 601 -> 1622 bytes pandora_console/images/target.png | Bin 706 -> 1367 bytes pandora_console/images/templates.png | Bin 0 -> 1444 bytes pandora_console/images/tip.png | Bin 251 -> 1260 bytes pandora_console/images/unlinkpolicy.png | Bin 867 -> 1465 bytes pandora_console/images/user.png | Bin 593 -> 0 bytes pandora_console/images/user_green.png | Bin 722 -> 1370 bytes pandora_console/images/user_suit.png | Bin 597 -> 1472 bytes pandora_console/images/version.png | Bin 0 -> 1466 bytes pandora_console/images/visual_console.png | Bin 0 -> 1411 bytes pandora_console/images/vnc.png | Bin 708 -> 1389 bytes pandora_console/images/wand.png | Bin 736 -> 1479 bytes pandora_console/images/wand_sla.png | Bin 739 -> 1327 bytes pandora_console/images/wmi.png | Bin 649 -> 1243 bytes pandora_console/images/world.png | Bin 910 -> 1775 bytes pandora_console/images/write_paper.png | Bin 0 -> 1421 bytes pandora_console/images/xml.png | Bin 0 -> 1628 bytes pandora_console/images/zoom.png | Bin 784 -> 1451 bytes .../images/zoom_cross.disabled.png | Bin 499 -> 1530 bytes pandora_console/images/zoom_cross.png | Bin 907 -> 1549 bytes pandora_console/images/zoom_mc.png | Bin 0 -> 1371 bytes pandora_console/include/ajax/events.php | 2 +- pandora_console/include/ajax/module.php | 1 - pandora_console/include/constants.php | 1 + pandora_console/include/functions.php | 1 - pandora_console/include/functions_agents.php | 17 + pandora_console/include/functions_config.php | 2 +- pandora_console/include/functions_events.php | 43 +- pandora_console/include/functions_graph.php | 20 +- pandora_console/include/functions_groups.php | 515 +++++++------- pandora_console/include/functions_html.php | 16 +- pandora_console/include/functions_menu.php | 36 +- .../include/functions_reporting.php | 113 ++-- .../include/functions_snmp_browser.php | 2 +- pandora_console/include/functions_ui.php | 106 +-- .../include/functions_visual_map_editor.php | 4 +- .../include/graphs/functions_flot.php | 2 +- .../include/graphs/functions_gd.php | 25 +- .../include/javascript/jquery.pandora.js | 17 +- .../include/javascript/openlayers.pandora.js | 8 +- pandora_console/include/styles/menu.css | 147 ++-- pandora_console/include/styles/pandora.css | 639 ++++++++++++++---- pandora_console/include/styles/tip.css | 53 -- pandora_console/index.php | 3 +- .../operation/agentes/agent_fields.php | 2 +- .../operation/agentes/alerts_status.php | 4 +- .../operation/agentes/datos_agente.php | 317 --------- .../operation/agentes/estado_agente.php | 11 +- .../agentes/estado_generalagente.php | 113 ++-- .../operation/agentes/exportdata.php | 4 +- .../operation/agentes/group_view.php | 18 +- .../operation/agentes/networkmap.groups.php | 4 +- .../operation/agentes/networkmap.php | 18 +- .../operation/agentes/networkmap.topology.php | 4 +- .../operation/agentes/networkmap_list.php | 4 +- .../operation/agentes/tactical.php | 91 +-- .../operation/events/event_statistics.php | 2 +- .../operation/events/events.build_table.php | 28 +- pandora_console/operation/events/events.php | 17 +- .../operation/events/events_list.php | 2 +- pandora_console/operation/gis_maps/index.php | 2 +- .../operation/gis_maps/render_view.php | 34 +- .../operation/messages/message_edit.php | 8 +- .../operation/messages/message_list.php | 8 +- .../operation/netflow/nf_live_view.php | 2 +- .../operation/reporting/graph_viewer.php | 12 +- .../operation/reporting/reporting_viewer.php | 29 +- .../operation/search_agents.getdata.php | 196 ++++++ pandora_console/operation/search_agents.php | 179 +---- .../operation/search_alerts.getdata.php | 199 ++++++ pandora_console/operation/search_alerts.php | 172 +---- .../operation/search_graphs.getdata.php | 57 ++ pandora_console/operation/search_graphs.php | 44 +- pandora_console/operation/search_main.php | 92 +++ .../operation/search_maps.getdata.php | 59 ++ pandora_console/operation/search_maps.php | 35 +- .../operation/search_modules.getdata.php | 149 ++++ pandora_console/operation/search_modules.php | 131 +--- .../operation/search_reports.getdata.php | 64 ++ pandora_console/operation/search_reports.php | 39 +- pandora_console/operation/search_results.php | 61 +- .../operation/search_users.getdata.php | 174 +++++ pandora_console/operation/search_users.php | 147 +--- .../operation/servers/recon_view.php | 4 +- .../operation/snmpconsole/snmp_browser.php | 8 +- .../snmpconsole/snmp_mib_uploader.php | 2 +- .../operation/snmpconsole/snmp_view.php | 8 +- pandora_console/operation/tree.php | 11 +- pandora_console/operation/users/user_edit.php | 208 +++--- pandora_console/operation/users/webchat.php | 2 +- .../operation/visual_console/render_view.php | 26 +- 558 files changed, 3761 insertions(+), 2694 deletions(-) delete mode 100644 pandora_console/extensions/module_groups/brick.png create mode 100644 pandora_console/godmode/servers/servers.build_table.php create mode 100755 pandora_console/images/add_mc.png create mode 100644 pandora_console/images/advanced.png create mode 100755 pandora_console/images/agent.png create mode 100755 pandora_console/images/agent_critical.png create mode 100755 pandora_console/images/agent_mc.png create mode 100755 pandora_console/images/agent_notinit.png create mode 100755 pandora_console/images/agent_ok.png create mode 100755 pandora_console/images/agent_unknown.png create mode 100755 pandora_console/images/agent_warning.png create mode 100644 pandora_console/images/alerts_extern.png create mode 100644 pandora_console/images/bell_extern.png create mode 100755 pandora_console/images/bin.png create mode 100644 pandora_console/images/blade.png create mode 100644 pandora_console/images/box.disabled.png create mode 100644 pandora_console/images/builder.png create mode 100644 pandora_console/images/button_background.png create mode 100755 pandora_console/images/camera_mc.png create mode 100644 pandora_console/images/category.png create mode 100755 pandora_console/images/chart.png create mode 100644 pandora_console/images/chart_curve_overview.disabled.png create mode 100755 pandora_console/images/collection.png create mode 100755 pandora_console/images/control_next.png create mode 100644 pandora_console/images/control_pause_col.png create mode 100644 pandora_console/images/control_play_col.png create mode 100755 pandora_console/images/control_prev.png create mode 100755 pandora_console/images/control_stop.png create mode 100644 pandora_console/images/control_stop_col.png create mode 100755 pandora_console/images/csv.png create mode 100755 pandora_console/images/csv_mc.png create mode 100755 pandora_console/images/custom_columns.png create mode 100644 pandora_console/images/custom_field.png create mode 100644 pandora_console/images/custom_field_col.png create mode 100644 pandora_console/images/dashboard.png create mode 100644 pandora_console/images/database_history.png create mode 100755 pandora_console/images/delete_mc.png create mode 100644 pandora_console/images/donut.png create mode 100755 pandora_console/images/email_inbox.png create mode 100755 pandora_console/images/email_mc.png create mode 100755 pandora_console/images/email_outbox.png create mode 100644 pandora_console/images/enterprise.png create mode 100755 pandora_console/images/enterprise_icon.png create mode 100755 pandora_console/images/event_responses.png create mode 100755 pandora_console/images/events_list.png create mode 100755 pandora_console/images/export25.png create mode 100644 pandora_console/images/filter.png create mode 100755 pandora_console/images/filter_mc.png create mode 100755 pandora_console/images/full_screen.png create mode 100755 pandora_console/images/gm_alerts.png create mode 100755 pandora_console/images/gm_db.png create mode 100755 pandora_console/images/gm_events.png create mode 100755 pandora_console/images/gm_gis.png create mode 100755 pandora_console/images/gm_log.png create mode 100755 pandora_console/images/gm_massive_operations.png create mode 100755 pandora_console/images/gm_modules.png create mode 100755 pandora_console/images/gm_monitoring.png create mode 100755 pandora_console/images/gm_netflow.png create mode 100755 pandora_console/images/gm_policies.png create mode 100755 pandora_console/images/gm_servers.png create mode 100755 pandora_console/images/gm_setup.png create mode 100755 pandora_console/images/gm_users.png create mode 100644 pandora_console/images/header_blackout.png create mode 100644 pandora_console/images/header_chat.png create mode 100755 pandora_console/images/header_down.png create mode 100644 pandora_console/images/header_email.png create mode 100755 pandora_console/images/header_help.png create mode 100644 pandora_console/images/header_logout.png create mode 100644 pandora_console/images/header_ready.png create mode 100644 pandora_console/images/header_refresh.png create mode 100644 pandora_console/images/header_user.png create mode 100644 pandora_console/images/header_user_admin.png create mode 100644 pandora_console/images/header_warning.png create mode 100644 pandora_console/images/help_icon.png create mode 100755 pandora_console/images/home.png create mode 100755 pandora_console/images/html.png create mode 100644 pandora_console/images/input_add.png create mode 100644 pandora_console/images/input_cog.png create mode 100644 pandora_console/images/input_config.png create mode 100644 pandora_console/images/input_cross.png create mode 100644 pandora_console/images/input_delete.png create mode 100644 pandora_console/images/input_go.png create mode 100644 pandora_console/images/input_tick.png create mode 100644 pandora_console/images/input_update.png create mode 100644 pandora_console/images/input_wand.png create mode 100644 pandora_console/images/input_zoom.png create mode 100755 pandora_console/images/inventory.png create mode 100644 pandora_console/images/key.png create mode 100755 pandora_console/images/list.png create mode 100644 pandora_console/images/load.png create mode 100644 pandora_console/images/lock_mc.png delete mode 100644 pandora_console/images/log-out.png delete mode 100644 pandora_console/images/lupa.png delete mode 100644 pandora_console/images/lupa_15x15.png create mode 100755 pandora_console/images/mc_plugin.png create mode 100755 pandora_console/images/menu_gm_mark.png create mode 100755 pandora_console/images/menu_lk_mark.png create mode 100755 pandora_console/images/menu_op_mark.png create mode 100755 pandora_console/images/mg_modules.png create mode 100755 pandora_console/images/module.png create mode 100755 pandora_console/images/module_critical.png create mode 100755 pandora_console/images/module_group.png create mode 100755 pandora_console/images/module_mc.png create mode 100755 pandora_console/images/module_notinit.png create mode 100755 pandora_console/images/module_ok.png create mode 100755 pandora_console/images/module_unknown.png create mode 100755 pandora_console/images/module_warning.png create mode 100755 pandora_console/images/new_message.png create mode 100755 pandora_console/images/normal_screen.png create mode 100755 pandora_console/images/op_alerts.png create mode 100755 pandora_console/images/op_events.png create mode 100755 pandora_console/images/op_gis.png create mode 100755 pandora_console/images/op_inventory.png create mode 100755 pandora_console/images/op_monitoring.png create mode 100755 pandora_console/images/op_netflow.png create mode 100755 pandora_console/images/op_network.png create mode 100755 pandora_console/images/op_recon.png create mode 100755 pandora_console/images/op_reporting.png create mode 100755 pandora_console/images/op_snmp.png create mode 100755 pandora_console/images/op_workspace.png create mode 100644 pandora_console/images/operating_system.png create mode 100755 pandora_console/images/operation.png create mode 100644 pandora_console/images/pen.png create mode 100644 pandora_console/images/performance.png create mode 100755 pandora_console/images/plugin_mc.png create mode 100644 pandora_console/images/plus.png create mode 100755 pandora_console/images/policies_mc.png create mode 100755 pandora_console/images/recon_icon.png create mode 100644 pandora_console/images/reporting32.png create mode 100755 pandora_console/images/save_mc.png create mode 100755 pandora_console/images/server_export_mc.png create mode 100755 pandora_console/images/services.png create mode 100755 pandora_console/images/skin/skin_default/images/add_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/advanced.png create mode 100755 pandora_console/images/skin/skin_default/images/agent.png create mode 100755 pandora_console/images/skin/skin_default/images/agent_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/agent_unknown.png create mode 100755 pandora_console/images/skin/skin_default/images/alerts_extern.png create mode 100755 pandora_console/images/skin/skin_default/images/bell.png create mode 100644 pandora_console/images/skin/skin_default/images/bell_error.png create mode 100755 pandora_console/images/skin/skin_default/images/bell_extern.png create mode 100755 pandora_console/images/skin/skin_default/images/bell_pause.png create mode 100755 pandora_console/images/skin/skin_default/images/binary.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/blade.png create mode 100755 pandora_console/images/skin/skin_default/images/book_edit.png create mode 100755 pandora_console/images/skin/skin_default/images/books.png create mode 100644 pandora_console/images/skin/skin_default/images/box.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/brick.png create mode 100755 pandora_console/images/skin/skin_default/images/builder.png create mode 100755 pandora_console/images/skin/skin_default/images/camera.png create mode 100755 pandora_console/images/skin/skin_default/images/camera_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/chart_bar.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/chart_bar.png create mode 100755 pandora_console/images/skin/skin_default/images/chart_curve.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/chart_curve.png create mode 100755 pandora_console/images/skin/skin_default/images/collection.png create mode 100644 pandora_console/images/skin/skin_default/images/config.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/control_next.png create mode 100755 pandora_console/images/skin/skin_default/images/control_pause.png create mode 100755 pandora_console/images/skin/skin_default/images/control_pause_col.png create mode 100755 pandora_console/images/skin/skin_default/images/control_play.png create mode 100755 pandora_console/images/skin/skin_default/images/control_play_col.png create mode 100755 pandora_console/images/skin/skin_default/images/control_prev.png create mode 100755 pandora_console/images/skin/skin_default/images/cross.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/csv.png create mode 100755 pandora_console/images/skin/skin_default/images/csv_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/custom_columns.png create mode 100755 pandora_console/images/skin/skin_default/images/custom_field.png create mode 100755 pandora_console/images/skin/skin_default/images/custom_field_col.png create mode 100755 pandora_console/images/skin/skin_default/images/delete_mc.png create mode 100644 pandora_console/images/skin/skin_default/images/disk.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/email_inbox.png create mode 100755 pandora_console/images/skin/skin_default/images/email_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/email_outbox.png create mode 100755 pandora_console/images/skin/skin_default/images/enterprise.png create mode 100755 pandora_console/images/skin/skin_default/images/event_responses.png create mode 100755 pandora_console/images/skin/skin_default/images/events_list.png create mode 100755 pandora_console/images/skin/skin_default/images/filter.png create mode 100755 pandora_console/images/skin/skin_default/images/filter_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/full_screen.png create mode 100755 pandora_console/images/skin/skin_default/images/global.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_alerts.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_db.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_events.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_gis.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_log.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_massive_operations.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_modules.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_monitoring.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_netflow.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_policies.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_servers.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_setup.png create mode 100755 pandora_console/images/skin/skin_default/images/gm_users.png create mode 100755 pandora_console/images/skin/skin_default/images/go_first.png create mode 100755 pandora_console/images/skin/skin_default/images/go_last.png create mode 100755 pandora_console/images/skin/skin_default/images/go_next.png create mode 100755 pandora_console/images/skin/skin_default/images/go_previous.png create mode 100755 pandora_console/images/skin/skin_default/images/god1.png create mode 100755 pandora_console/images/skin/skin_default/images/god2.png create mode 100755 pandora_console/images/skin/skin_default/images/god4.png create mode 100755 pandora_console/images/skin/skin_default/images/god6.png create mode 100755 pandora_console/images/skin/skin_default/images/god7.png create mode 100755 pandora_console/images/skin/skin_default/images/grid.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/grid.png create mode 100755 pandora_console/images/skin/skin_default/images/header_chat.png create mode 100755 pandora_console/images/skin/skin_default/images/header_down.png create mode 100755 pandora_console/images/skin/skin_default/images/header_email.png create mode 100755 pandora_console/images/skin/skin_default/images/header_events.png create mode 100755 pandora_console/images/skin/skin_default/images/header_help.png create mode 100755 pandora_console/images/skin/skin_default/images/header_logout.png create mode 100755 pandora_console/images/skin/skin_default/images/header_ready.png create mode 100755 pandora_console/images/skin/skin_default/images/header_refresh.png create mode 100755 pandora_console/images/skin/skin_default/images/header_user.png create mode 100755 pandora_console/images/skin/skin_default/images/header_user_admin.png create mode 100755 pandora_console/images/skin/skin_default/images/header_warning.png create mode 100755 pandora_console/images/skin/skin_default/images/heart.png create mode 100755 pandora_console/images/skin/skin_default/images/html.png create mode 100755 pandora_console/images/skin/skin_default/images/inventory.png create mode 100755 pandora_console/images/skin/skin_default/images/key.png create mode 100755 pandora_console/images/skin/skin_default/images/link.png create mode 100755 pandora_console/images/skin/skin_default/images/linkpolicy.png create mode 100755 pandora_console/images/skin/skin_default/images/list.png create mode 100755 pandora_console/images/skin/skin_default/images/load.png create mode 100755 pandora_console/images/skin/skin_default/images/lock.png create mode 100755 pandora_console/images/skin/skin_default/images/lock_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/module.png create mode 100755 pandora_console/images/skin/skin_default/images/module_group.png create mode 100755 pandora_console/images/skin/skin_default/images/new_message.png create mode 100755 pandora_console/images/skin/skin_default/images/normal_screen.png create mode 100755 pandora_console/images/skin/skin_default/images/op_alerts.png create mode 100755 pandora_console/images/skin/skin_default/images/op_events.png create mode 100755 pandora_console/images/skin/skin_default/images/op_gis.png create mode 100755 pandora_console/images/skin/skin_default/images/op_inventory.png create mode 100755 pandora_console/images/skin/skin_default/images/op_netflow.png create mode 100755 pandora_console/images/skin/skin_default/images/op_network.png create mode 100755 pandora_console/images/skin/skin_default/images/op_recon.png create mode 100755 pandora_console/images/skin/skin_default/images/op_reporting.png create mode 100755 pandora_console/images/skin/skin_default/images/op_snmp.png create mode 100755 pandora_console/images/skin/skin_default/images/op_workspace.png create mode 100755 pandora_console/images/skin/skin_default/images/operating_system.png create mode 100755 pandora_console/images/skin/skin_default/images/operation.png create mode 100755 pandora_console/images/skin/skin_default/images/pen.png create mode 100755 pandora_console/images/skin/skin_default/images/pencil.png create mode 100755 pandora_console/images/skin/skin_default/images/performance.png create mode 100755 pandora_console/images/skin/skin_default/images/photo.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/photo.png create mode 100755 pandora_console/images/skin/skin_default/images/plugin.png create mode 100755 pandora_console/images/skin/skin_default/images/plugin_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/plus.png create mode 100755 pandora_console/images/skin/skin_default/images/policies.png create mode 100755 pandora_console/images/skin/skin_default/images/policies_brick.png create mode 100755 pandora_console/images/skin/skin_default/images/policies_cog.png create mode 100755 pandora_console/images/skin/skin_default/images/policies_error.png create mode 100755 pandora_console/images/skin/skin_default/images/policies_error_db.png create mode 100755 pandora_console/images/skin/skin_default/images/policies_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/policies_not_brick.png create mode 100755 pandora_console/images/skin/skin_default/images/policies_ok.png create mode 100755 pandora_console/images/skin/skin_default/images/profiles.png create mode 100755 pandora_console/images/skin/skin_default/images/recon.png create mode 100755 pandora_console/images/skin/skin_default/images/reporting.png create mode 100755 pandora_console/images/skin/skin_default/images/reporting32.png create mode 100755 pandora_console/images/skin/skin_default/images/save_mc.png create mode 100755 pandora_console/images/skin/skin_default/images/services.png create mode 100755 pandora_console/images/skin/skin_default/images/setup.png create mode 100755 pandora_console/images/skin/skin_default/images/sitemap_color.png create mode 100755 pandora_console/images/skin/skin_default/images/sla.png create mode 100755 pandora_console/images/skin/skin_default/images/snmp.png create mode 100755 pandora_console/images/skin/skin_default/images/snmp_wizard.png create mode 100755 pandora_console/images/skin/skin_default/images/sound.png create mode 100755 pandora_console/images/skin/skin_default/images/tag.png create mode 100644 pandora_console/images/skin/skin_default/images/tag_red.disabled.png create mode 100755 pandora_console/images/skin/skin_default/images/templates.png create mode 100755 pandora_console/images/skin/skin_default/images/unlinkpolicy.png create mode 100755 pandora_console/images/skin/skin_default/images/version.png create mode 100755 pandora_console/images/skin/skin_default/images/vnc.png create mode 100755 pandora_console/images/skin/skin_default/images/wand_sla.png create mode 100755 pandora_console/images/skin/skin_default/images/wmi.png create mode 100755 pandora_console/images/skin/skin_default/images/xml.png create mode 100755 pandora_console/images/sla.png create mode 100755 pandora_console/images/sound.png create mode 100644 pandora_console/images/submenu2_tree_last.png create mode 100644 pandora_console/images/submenu2_tree_middle.png create mode 100644 pandora_console/images/submenu_tree_first.png create mode 100644 pandora_console/images/submenu_tree_last.png create mode 100644 pandora_console/images/submenu_tree_middle.png create mode 100755 pandora_console/images/tab_green_bg.png create mode 100755 pandora_console/images/tab_grey_bg.png create mode 100644 pandora_console/images/tag.png create mode 100755 pandora_console/images/templates.png delete mode 100644 pandora_console/images/user.png create mode 100644 pandora_console/images/version.png create mode 100644 pandora_console/images/visual_console.png create mode 100644 pandora_console/images/write_paper.png create mode 100755 pandora_console/images/xml.png create mode 100755 pandora_console/images/zoom_mc.png delete mode 100644 pandora_console/include/styles/tip.css delete mode 100644 pandora_console/operation/agentes/datos_agente.php create mode 100644 pandora_console/operation/search_agents.getdata.php create mode 100644 pandora_console/operation/search_alerts.getdata.php create mode 100644 pandora_console/operation/search_graphs.getdata.php create mode 100644 pandora_console/operation/search_main.php create mode 100644 pandora_console/operation/search_maps.getdata.php create mode 100644 pandora_console/operation/search_modules.getdata.php create mode 100644 pandora_console/operation/search_reports.getdata.php create mode 100644 pandora_console/operation/search_users.getdata.php diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index bb86b5f2c1..85a03578dd 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,565 @@ +2013-04-10 Sergio Martin + + * +M include/functions_html.php +D include/styles/tip.css +M include/styles/menu.css +M include/styles/pandora.css +M include/functions_visual_map_editor.php +M include/functions_groups.php +M include/ajax/events.php +M include/ajax/module.php +M include/functions_ui.php +M include/functions.php +M include/functions_agents.php +M include/functions_graph.php +M include/functions_events.php +M include/functions_menu.php +M include/graphs/functions_flot.php +M include/graphs/functions_gd.php +M include/functions_reporting.php +M include/javascript/openlayers.pandora.js +M include/javascript/jquery.pandora.js +M include/functions_config.php +M include/functions_snmp_browser.php +M include/constants.php +M index.php +M extensions/agents_alerts.php +D extensions/module_groups/brick.png +M extensions/net_tools.php +M extensions/agents_modules.php +M extensions/ssh_gateway.php +M extensions/net_tools/nettool.png +M extensions/vnc_view.php +M extensions/dbmanager.php +M extensions/users_connected.php +M extensions/module_groups.php +M extensions/update_manager/lib/functions.ajax.php +M extensions/update_manager/main.php +M extensions/ssh_gateway/secure_console.png +A operation/search_reports.getdata.php +A operation/search_users.getdata.php +M operation/tree.php +M operation/visual_console/render_view.php +A operation/search_modules.getdata.php +A operation/search_main.php +M operation/users/webchat.php +M operation/users/user_edit.php +A operation/search_agents.getdata.php +M operation/events/events.build_table.php +M operation/events/event_statistics.php +M operation/events/events_list.php +M operation/events/events.php +A operation/search_graphs.getdata.php +M operation/messages/message_edit.php +M operation/messages/message_list.php +M operation/search_reports.php +M operation/reporting/reporting_viewer.php +M operation/reporting/graph_viewer.php +M operation/search_users.php +M operation/search_results.php +A operation/search_alerts.getdata.php +M operation/search_modules.php +A operation/search_maps.getdata.php +D operation/agentes/datos_agente.php +M operation/agentes/alerts_status.php +M operation/agentes/estado_generalagente.php +M operation/agentes/estado_agente.php +M operation/agentes/networkmap.topology.php +M operation/agentes/networkmap.groups.php +M operation/agentes/exportdata.php +M operation/agentes/networkmap_list.php +M operation/agentes/agent_fields.php +M operation/agentes/tactical.php +M operation/agentes/group_view.php +M operation/agentes/networkmap.php +M operation/servers/recon_view.php +M operation/search_agents.php +M operation/search_graphs.php +M operation/snmpconsole/snmp_mib_uploader.php +M operation/snmpconsole/snmp_browser.php +M operation/snmpconsole/snmp_view.php +M operation/gis_maps/render_view.php +M operation/gis_maps/index.php +M operation/search_alerts.php +M operation/search_maps.php +M operation/netflow/nf_live_view.php +M images/global.png +A images/op_events.png +A images/zoom_mc.png +A images/input_zoom.png +M images/pencil.png +A images/menu_op_mark.png +M images/unlinkpolicy.png +A images/gm_setup.png +M images/min.png +M images/zoom.png +M images/max.png +A images/builder.png +A images/policies_mc.png +A images/op_workspace.png +M images/user_green.png +A images/agent.png +A images/performance.png +M images/ok.png +A images/event_responses.png +A images/agent_warning.png +A images/module_critical.png +A images/op_recon.png +A images/email_mc.png +A images/add_mc.png +M images/go_first.png +A images/gm_alerts.png +A images/filter.png +A images/header_user.png +A images/gm_massive_operations.png +M images/add.disabled.png +A images/gm_netflow.png +M images/percentile_item.disabled.png +A images/alerts_extern.png +M images/vnc.png +A images/op_alerts.png +A images/op_inventory.png +M images/chart_curve.png +M images/email_open.png +A images/button_background.png +M images/link2.png +A images/control_stop_col.png +M images/target.png +M images/box.png +M images/zoom_cross.png +M images/cross.disabled.png +A images/filter_mc.png +M images/note.png +M images/rss.png +A images/blade.png +A images/lock_mc.png +A images/agent_critical.png +M images/bell_pause.png +M images/chart_curve.disabled.png +A images/enterprise.png +M images/skin/skin_default/include/styles/menu.css +M images/skin/skin_default/include/styles/pandora.css +A images/skin/skin_default/images/operating_system.png +A images/skin/skin_default/images/snmp_wizard.png +A images/skin/skin_default/images/global.png +A images/skin/skin_default/images/op_events.png +A images/skin/skin_default/images/bell_extern.png +A images/skin/skin_default/images/go_next.png +A images/skin/skin_default/images/policies.png +A images/skin/skin_default/images/pencil.png +A images/skin/skin_default/images/header_ready.png +A images/skin/skin_default/images/agent_unknown.png +A images/skin/skin_default/images/bell.png +A images/skin/skin_default/images/policies_error.png +A images/skin/skin_default/images/unlinkpolicy.png +A images/skin/skin_default/images/gm_setup.png +A images/skin/skin_default/images/policies_mc.png +A images/skin/skin_default/images/builder.png +A images/skin/skin_default/images/camera.png +A images/skin/skin_default/images/go_last.png +A images/skin/skin_default/images/gm_policies.png +A images/skin/skin_default/images/op_workspace.png +A images/skin/skin_default/images/box.disabled.png +A images/skin/skin_default/images/agent.png +A images/skin/skin_default/images/setup.png +A images/skin/skin_default/images/sitemap_color.png +A images/skin/skin_default/images/go_previous.png +A images/skin/skin_default/images/performance.png +A images/skin/skin_default/images/control_next.png +A images/skin/skin_default/images/policies_brick.png +A images/skin/skin_default/images/event_responses.png +A images/skin/skin_default/images/services.png +A images/skin/skin_default/images/email_outbox.png +A images/skin/skin_default/images/lock.png +A images/skin/skin_default/images/sound.png +A images/skin/skin_default/images/god1.png +A images/skin/skin_default/images/gm_modules.png +A images/skin/skin_default/images/plugin.png +A images/skin/skin_default/images/god7.png +A images/skin/skin_default/images/html.png +A images/skin/skin_default/images/op_recon.png +A images/skin/skin_default/images/control_play.png +A images/skin/skin_default/images/gm_gis.png +A images/skin/skin_default/images/header_refresh.png +A images/skin/skin_default/images/email_mc.png +A images/skin/skin_default/images/add_mc.png +A images/skin/skin_default/images/op_reporting.png +A images/skin/skin_default/images/config.disabled.png +A images/skin/skin_default/images/list.png +A images/skin/skin_default/images/tag_red.disabled.png +A images/skin/skin_default/images/go_first.png +A images/skin/skin_default/images/gm_servers.png +A images/skin/skin_default/images/gm_alerts.png +A images/skin/skin_default/images/linkpolicy.png +A images/skin/skin_default/images/books.png +A images/skin/skin_default/images/reporting32.png +A images/skin/skin_default/images/op_gis.png +A images/skin/skin_default/images/version.png +A images/skin/skin_default/images/policies_error_db.png +A images/skin/skin_default/images/filter.png +A images/skin/skin_default/images/chart_bar.png +A images/skin/skin_default/images/grid.png +A images/skin/skin_default/images/header_user.png +A images/skin/skin_default/images/bell_error.png +A images/skin/skin_default/images/normal_screen.png +A images/skin/skin_default/images/brick.png +A images/skin/skin_default/images/gm_massive_operations.png +A images/skin/skin_default/images/policies_ok.png +A images/skin/skin_default/images/gm_netflow.png +A images/skin/skin_default/images/advanced.png +A images/skin/skin_default/images/csv_mc.png +A images/skin/skin_default/images/op_snmp.png +A images/skin/skin_default/images/save_mc.png +A images/skin/skin_default/images/snmp.png +A images/skin/skin_default/images/load.png +A images/skin/skin_default/images/alerts_extern.png +A images/skin/skin_default/images/header_logout.png +A images/skin/skin_default/images/vnc.png +A images/skin/skin_default/images/op_alerts.png +A images/skin/skin_default/images/grid.disabled.png +A images/skin/skin_default/images/chart_bar.disabled.png +A images/skin/skin_default/images/op_inventory.png +A images/skin/skin_default/images/photo.disabled.png +A images/skin/skin_default/images/disk.disabled.png +A images/skin/skin_default/images/chart_curve.png +A images/skin/skin_default/images/recon.png +A images/skin/skin_default/images/camera_mc.png +A images/skin/skin_default/images/gm_db.png +A images/skin/skin_default/images/reporting.png +A images/skin/skin_default/images/custom_field.png +A images/skin/skin_default/images/control_pause.png +A images/skin/skin_default/images/key.png +A images/skin/skin_default/images/wmi.png +A images/skin/skin_default/images/link.png +A images/skin/skin_default/images/cross.disabled.png +A images/skin/skin_default/images/header_email.png +A images/skin/skin_default/images/control_play_col.png +A images/skin/skin_default/images/filter_mc.png +A images/skin/skin_default/images/blade.png +A images/skin/skin_default/images/lock_mc.png +A images/skin/skin_default/images/bell_pause.png +A images/skin/skin_default/images/chart_curve.disabled.png +A images/skin/skin_default/images/header_down.png +A images/skin/skin_default/images/enterprise.png +A images/skin/skin_default/images/profiles.png +A images/skin/skin_default/images/gm_users.png +A images/skin/skin_default/images/email_inbox.png +A images/skin/skin_default/images/header_chat.png +A images/skin/skin_default/images/wand_sla.png +A images/skin/skin_default/images/collection.png +A images/skin/skin_default/images/god2.png +A images/skin/skin_default/images/god4.png +A images/skin/skin_default/images/inventory.png +A images/skin/skin_default/images/header_user_admin.png +A images/skin/skin_default/images/god6.png +A images/skin/skin_default/images/header_help.png +A images/skin/skin_default/images/gm_log.png +A images/skin/skin_default/images/tag.png +A images/skin/skin_default/images/control_prev.png +A images/skin/skin_default/images/agent_mc.png +A images/skin/skin_default/images/delete_mc.png +A images/skin/skin_default/images/pen.png +A images/skin/skin_default/images/plus.png +A images/skin/skin_default/images/module.png +A images/skin/skin_default/images/gm_events.png +A images/skin/skin_default/images/photo.png +A images/skin/skin_default/images/csv.png +A images/skin/skin_default/images/new_message.png +A images/skin/skin_default/images/templates.png +A images/skin/skin_default/images/book_edit.png +A images/skin/skin_default/images/events_list.png +A images/skin/skin_default/images/policies_cog.png +A images/skin/skin_default/images/operation.png +A images/skin/skin_default/images/xml.png +A images/skin/skin_default/images/full_screen.png +A images/skin/skin_default/images/module_group.png +A images/skin/skin_default/images/policies_not_brick.png +A images/skin/skin_default/images/heart.png +A images/skin/skin_default/images/gm_monitoring.png +A images/skin/skin_default/images/custom_columns.png +A images/skin/skin_default/images/control_pause_col.png +A images/skin/skin_default/images/custom_field_col.png +A images/skin/skin_default/images/header_events.png +A images/skin/skin_default/images/op_netflow.png +A images/skin/skin_default/images/header_warning.png +A images/skin/skin_default/images/plugin_mc.png +A images/skin/skin_default/images/sla.png +M images/skin/skin_default/images/binary.png +A images/skin/skin_default/images/op_network.png +A images/skin/skin_default/images/binary.disabled.png +M images/profiles.png +A images/collection.png +A images/inventory.png +A images/gm_log.png +M images/images.png +M images/cog.png +A images/tag.png +A images/mc_plugin.png +A images/enterprise_icon.png +M images/photo.png +M images/refresh.png +A images/events_list.png +A images/operation.png +A images/full_screen.png +A images/chart_curve_overview.disabled.png +M images/heart.png +A images/input_add.png +A images/gm_monitoring.png +M images/percentile_item.png +A images/module_warning.png +A images/custom_field_col.png +A images/plugin_mc.png +M images/snmp_wizard.png +M images/link_break.png +M images/go_next.png +M images/policies.png +M images/bell.png +M images/policies_error.png +A images/agent_ok.png +M images/go_last.png +A images/services.png +A images/sound.png +A images/tab_green_bg.png +M images/plugin.png +A images/header_refresh.png +A images/op_reporting.png +A images/list.png +A images/gm_servers.png +M images/books.png +A images/reporting32.png +A images/input_delete.png +M images/div.png +A images/input_go.png +M images/policies_error_db.png +A images/normal_screen.png +A images/dashboard.png +A images/donut.png +M images/network.disabled.png +M images/policies_ok.png +A images/submenu_tree_first.png +M images/lightning_go.png +A images/csv_mc.png +M images/snmp.png +A images/recon_icon.png +M images/default_list.png +A images/database_history.png +M images/chart_bar.disabled.png +A images/help_icon.png +A images/input_update.png +A images/agent_notinit.png +M images/control_pause.png +A images/key.png +M images/link.png +A images/header_email.png +M images/delete.png +A images/input_wand.png +A images/input_tick.png +M images/bricks.png +A images/write_paper.png +M images/world.png +M images/wand_sla.png +M images/wand.png +M images/disk.png +M images/group.png +A images/header_user_admin.png +A images/header_help.png +A images/category.png +M images/house.png +A images/module.png +A images/export25.png +A images/xml.png +A images/op_netflow.png +M images/cross.png +A images/operating_system.png +M images/application_edit.png +M images/camera.png +M images/sub.png +A images/gm_policies.png +A images/box.disabled.png +M images/setup.png +M images/go_previous.png +A images/module_mc.png +M images/tag_red.png +A images/submenu_tree_middle.png +A images/visual_console.png +A images/email_outbox.png +M images/attachment.png +A images/module_notinit.png +A images/submenu2_tree_middle.png +A images/html.png +M images/control_play.png +M images/tag_red.disabled.png +M images/lightbulb.png +A images/version.png +M images/bell_error.png +M images/brick.png +M images/tip.png +A images/op_snmp.png +M images/pandora_header_logo_enterprise.png +A images/load.png +M images/chart_curve_threshold.png +A images/chart.png +M images/copy.png +A images/op_monitoring.png +M images/mul.png +A images/menu_gm_mark.png +A images/menu_lk_mark.png +A images/gm_users.png +A images/email_inbox.png +A images/header_chat.png +M images/network.png +M images/extensions.png +A images/submenu2_tree_last.png +M images/database.png +A images/delete_mc.png +A images/input_config.png +A images/server_export_mc.png +A images/input_cog.png +M images/add.png +A images/csv.png +A images/module_group.png +D images/lupa.png +A images/control_pause_col.png +A images/custom_columns.png +A images/header_warning.png +D images/user.png +M images/binary.png +A images/op_network.png +A images/home.png +A images/bell_extern.png +A images/tab_grey_bg.png +A images/header_blackout.png +A images/header_ready.png +A images/agent_unknown.png +M images/config.png +M images/pdf.png +A images/control_next.png +A images/submenu_tree_last.png +M images/comments.png +A images/control_stop.png +M images/email.png +M images/lock.png +M images/error.png +A images/gm_modules.png +A images/gm_gis.png +M images/data.png +M images/config.disabled.png +M images/linkpolicy.png +A images/op_gis.png +M images/clean.png +M images/chart_bar.png +D images/lupa_15x15.png +A images/advanced.png +A images/save_mc.png +A images/module_ok.png +A images/header_logout.png +M images/user_suit.png +M images/file.disabled.png +M images/photo.disabled.png +M images/recon.png +M images/lightbulb_off.png +A images/camera_mc.png +A images/gm_db.png +M images/attachment_del.png +A images/custom_field.png +M images/eye.png +M images/wmi.png +M images/camera.disabled.png +A images/control_play_col.png +M images/sum.png +M images/pandora_header_logo.png +M images/avg.png +A images/header_down.png +M images/zoom_cross.disabled.png +A images/module_unknown.png +M images/server_export.png +A images/bin.png +A images/input_cross.png +A images/control_prev.png +A images/agent_mc.png +A images/pen.png +A images/plus.png +D images/log-out.png +A images/gm_events.png +A images/new_message.png +A images/templates.png +A images/sla.png +M images/binary.disabled.png +M images/chart_curve_overview.png +A images/mg_modules.png +M general/login_page.php +M general/logon_ok.php +M general/main_menu.php +M general/header.php +M godmode/groups/modu_group_list.php +M godmode/groups/configure_group.php +M godmode/groups/configure_modu_group.php +M godmode/groups/group_list.php +M godmode/admin_access_logs.php +M godmode/extensions.php +M godmode/db/db_main.php +M godmode/db/db_audit.php +M godmode/db/db_sanity.php +M godmode/db/db_refine.php +M godmode/db/db_info.php +M godmode/db/db_event.php +M godmode/db/db_purge.php +M godmode/agentes/fields_manager.php +M godmode/agentes/planned_downtime.list.php +M godmode/agentes/planned_downtime.editor.php +M godmode/agentes/modificar_agente.php +M godmode/agentes/configurar_agente.php +M godmode/agentes/configure_field.php +M godmode/agentes/agent_manager.php +M godmode/servers/recon_script.php +M godmode/servers/plugin.php +A godmode/servers/servers.build_table.php +M godmode/servers/manage_recontask.php +M godmode/servers/modificar_server.php +M godmode/servers/manage_recontask_form.php +M godmode/alerts/alert_list.php +M godmode/alerts/configure_alert_template.php +M godmode/alerts/alert_templates.php +M godmode/alerts/configure_alert_action.php +M godmode/alerts/configure_alert_command.php +M godmode/alerts/alert_actions.php +M godmode/alerts/alert_special_days.php +M godmode/alerts/alert_commands.php +M godmode/alerts/configure_alert_special_days.php +M godmode/snmpconsole/snmp_trap_generator.php +M godmode/snmpconsole/snmp_alert.php +M godmode/snmpconsole/snmp_filters.php +M godmode/setup/setup_general.php +M godmode/setup/links.php +M godmode/setup/setup.php +M godmode/setup/os.php +M godmode/users/user_list.php +M godmode/users/profile_list.php +M godmode/users/configure_user.php +M godmode/users/configure_profile.php +M godmode/gis_maps/configure_gis_map.php +M godmode/gis_maps/index.php +M godmode/events/event_edit_filter.php +M godmode/events/events.php +M godmode/massive/massive_copy_modules.php +M godmode/massive/massive_operations.php +M godmode/modules/manage_network_templates.php +M godmode/modules/module_list.php +M godmode/reporting/visual_console_builder.php +M godmode/reporting/graph_builder.php +M godmode/reporting/reporting_builder.php +M godmode/reporting/map_builder.php +M godmode/reporting/graphs.php +M godmode/tag/tag.php +M godmode/tag/edit_tag.php +M godmode/category/category.php +M godmode/category/edit_category.php +M godmode/netflow/nf_edit_form.php +M godmode/netflow/nf_item_list.php +M godmode/netflow/nf_edit.php: Change Whole visual style, + including icons and css + 2013-04-09 Dario Rodriguez * include/graphs/flot/pandora.flot.js: Fixed position algorithm for diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php index 5d2fd29f43..92cab69fe7 100755 --- a/pandora_console/extensions/agents_alerts.php +++ b/pandora_console/extensions/agents_alerts.php @@ -58,7 +58,7 @@ function mainAgentsAlerts() { $updated_info = __("Updated at realtime"); } - $updated_time = html_print_image ("images/information.png", true, array ("title" => __('Last update'), "style" => 'margin: 5px 3px 0px 10px')).$updated_info; + $updated_time = $updated_info; $refr = get_parameter('refr', 30); // By default 30 seconds @@ -86,13 +86,13 @@ function mainAgentsAlerts() { $comborefr .= ""; if ($config["pure"] == 0) { - $fullscreen = '' - . html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) + $fullscreen['text'] = '' + . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode'))) . ""; } else { - $fullscreen = '' - . html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) + $fullscreen['text'] = '' + . html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode'))) . ""; $config['refr'] = $refr; } @@ -105,7 +105,7 @@ function mainAgentsAlerts() { } // Header - ui_print_page_header (__("Agents/Alerts"), "images/bell.png", false, "", false, $onheader); + ui_print_page_header (__("Agents/Alerts"), "images/op_alerts.png", false, "", false, $onheader); // Old style table, we need a lot of special formatting,don't use table function // Prepare old-style table @@ -163,7 +163,6 @@ function mainAgentsAlerts() { // Prepare pagination ui_pagination ($nagents); - echo "
"; echo ''; echo ""; diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 938a392b2d..7663e776f1 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -59,7 +59,7 @@ function mainAgentsModules() { $updated_info = __("Updated at realtime"); } - $updated_time = html_print_image ("images/information.png", true, array ("title" => __('Last update'), "style" => 'margin: 5px 3px 0px 10px')).$updated_info; + $updated_time = $updated_info; $modulegroup = get_parameter('modulegroup', 0); $refr = get_parameter('refr', 30); // By default 30 seconds @@ -94,13 +94,13 @@ function mainAgentsModules() { $comborefr .= ""; if ($config["pure"] == 0) { - $fullscreen = '' - . html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) + $fullscreen['text'] = '' + . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode'))) . ""; } else { - $fullscreen = '' - . html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) + $fullscreen['text'] = '' + . html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode'))) . ""; $config['refr'] = $refr; } @@ -114,7 +114,7 @@ function mainAgentsModules() { } // Header - ui_print_page_header (__("Agents/Modules"), "images/bricks.png", false, "", false, $onheader); + ui_print_page_header (__("Agents/Modules"), "images/module_mc.png", false, "", false, $onheader); // Old style table, we need a lot of special formatting,don't use table function // Prepare old-style table @@ -198,7 +198,6 @@ function mainAgentsModules() { } // Prepare pagination ui_pagination ((int)count(agents_get_agents ($filter_agents))); - echo "
"; foreach ($agents as $agent) { // Get stats for this group @@ -313,4 +312,4 @@ function mainAgentsModules() { extensions_add_operation_menu_option(__("Agents/Modules view"), 'estado', 'agents_modules/icon_menu.png', "v1r1"); extensions_add_main_function('mainAgentsModules'); -?> \ No newline at end of file +?> diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php index bc2759c2ef..754012022a 100644 --- a/pandora_console/extensions/dbmanager.php +++ b/pandora_console/extensions/dbmanager.php @@ -100,7 +100,7 @@ function dbmgr_extension_main () { $sql = (string) get_parameter ('sql'); - ui_print_page_header (__('Database interface'), "", false, false, true); + ui_print_page_header (__('Database interface'), "images/gm_db.png", false, false, true); echo '
'; echo "This is an advanced extension to interface with Pandora FMS database directly from WEB console using native SQL sentences. Please note that you can damage your Pandora FMS installation if you don't know exactly what are you are doing, this means that you can severily damage your setup using this extension. This extension is intended to be used only by experienced users with a depth knowledge of Pandora FMS internals."; diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php index ad31e7947f..a5b514eed5 100644 --- a/pandora_console/extensions/module_groups.php +++ b/pandora_console/extensions/module_groups.php @@ -164,7 +164,7 @@ function mainModuleGroups() { break; } - ui_print_page_header (__("Combined table of agent group and module group"), "images/brick.png", false, "", false, ''); + ui_print_page_header (__("Combined table of agent group and module group"), "images/module_group.png", false, "", false, ''); echo "

" . __("This table shows in columns the modules group and in rows agents group. The cell shows all modules") . "

"; diff --git a/pandora_console/extensions/module_groups/brick.png b/pandora_console/extensions/module_groups/brick.png deleted file mode 100644 index f83bd06f89a271c1230cd35405e68381ef22157b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmV<70UrK|P)Px#0%A)?L;wJ)jUzGu000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM<4GcQ7 zyBg^L00Cu5L_t(2&sCAXPZMz%#y{`faUFz6h&6HpY{ZzD&{+&Hs0jlm&Q7inCQOVP z2Zl~v;Xg1W3~sV@Py!QGqois>(@;VK6fH_g+q>)cWjOldo_Bel&-*Oz`=WH}b2_hi z&FkyqwQP@y66wS3p`-ia+6{bDwnFYnF)`Hw3%1gG`dvp)T)QO3xaOes3y*X4-)CQd zC>za334lZD1jdMjYE9bEW;=N5+CSesO!+s42`CX_1R1c6d<&8D4QUF?GztCi`cCvkEG X*+Hi4;+*|?00000NkvXXu0mjf"; } -?> \ No newline at end of file +?> diff --git a/pandora_console/extensions/net_tools/nettool.png b/pandora_console/extensions/net_tools/nettool.png index 2ced559a40cca6640ce29d2ce0f68172e9d35927..9161739c27f3486244caba39164afe76401d99c4 100644 GIT binary patch literal 1502 zcmbVMZA=?=82?{e%8R@O#>U(N$KeOE(B54sr9COVzFbF@BDRgg4@R!-K`*qu+x3tF zdnvd%jM)T6rkgJTB}ScD2$^r2ap-1JGCq``F53s+g$#|PA!>YEy#hr)kePVN<^Ioe zzu)uz{GV=X-CvM*Zyo@kz|m}TN#FAHo1+8(dX6s$OTuoEY8TyHr`Ssi3^4mSF9SP5 zbQj}dXn)_qIi?W+d4Tn_i|x)9!pDWwbQ+_MhIok$K%*(j)4py-guP4`8#W@Vm#-i& z>o+0?>YbRAw=w~?xnE%1{jDBff49%zM@&s{W0a5#gcy;AqoH6pLPU+ox?Ms#r`0F| zuS3LcBeD@xyR!|pasmU_t1*=i)8VjAtH!mML2IamH5iVexCX@{`G^j?Sk`Ss$Us$B0s&J$_W5LEm zd;-ghEEk5;7HKcnBN`DY(v1{Cywka5I2_q5lvFY_O7keL#?VkGo!2@#BD$D=!q^ra z@$~Tw>S7{XkKmK~(OI1#OSQYZqcl*8hImL|rKZq98|Ui@F=5eRGa}L-wV(A9SiK&@ z@dho{puu!{9M_w5HapdzF;EuVR)=F58{2Vp1}#=+rtEsHwE@Q|jX{U&tY*8_ptsn~ z6lKY99pQ*bhkZ=OFDv=o|nsMNaT=Tre{MZ2?Z?A_0zvt?qg?4m)Wd8%}G| z4cf@p#t7^ajNdMBA$YyQ1iMWH|DE{;*Z+U2hDyPp>GAm2xMWn)45p7;!!HS2>%)Yl zoe`wv`1rBWmjRIFJ8Wi8^p^L}RLUgJpC;MioSA$Q;7FunrXap|T1$e#pF#2v{9)0x z!kUsc0-7otE*t6D0g`?27e$LuG5NgC0+o(cm&T$^^B-Y1jsovdSO>gT@%oon=d<0- zC56pL1~0EP%~NexFrX-Ik=0)29QVP`tjK3gLtt5 zBo7BZ7~)N1d*wn+E`0p3NjsL;v5@cVs+qi4aclwksnPSQZ2Z|#UH(XrjonhnR!6_R zr($uUJj*pm*5+LMovfYBIe4hb?w?4etS?0?I*CX2j09z8_kokOW@T{UB=w_d=5|~c zt1k4{XvfK9VtDFQ<-T{IrCmGkn|r3sF;Me3IG4Q(BrP+im1J!6twGQ1v7N6>i%YRH z%G|I2f>*s$?(Y)EzgY`>Psy5Ym=~jR*SR}Is@(F#qE2|NhJ4`CAE{F150gx(eBP{A zk-}MM?EKQz2gR03csUM&lS7}$v{qSS2<(3G#QPNorb{n^xst3}uTuZ%=}ySS&qC1K z@2O%>rTPPk`zKhDe1m!Tle`h+h3TTin|jN{;EqZKxi&i>p41P?Z&sDhjW1DI;QB8@ U_N8|R&Zlo&2i0o3VCfk88;qL!`v3p{ literal 965 zcmV;$13LVPP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipb| z4;Uy|!p}0~+ z93Z=*pi4mzcU_BHSKYerBI2e6#g;-)Vnqv4Gu(S}Pwu&A{HO2#T?kTq*U$6pUIPDH zfB%aCOZw~HmDvRrMj-$Y?7GfWlMB;Se^=jpIenUE007DRpMhpRoq6k{7Z&zzE)1UA zp(-D35XP4XWdq`QJl(rFjaD`m-TKywQ0hE+bIY_tQ6JU^Lr&aceOnH;S5fGcMJev=8gSlmu|eSrbiFg z!iAMJLJ2qJ$nf-`U~wn~nIbj9N0dP`Xx&$2L*s>mZ2M779H zdtMZe>nBH>UYg$W()3pSJr+cbF7lX#kz`RkN2wphlv1guc>)$2Qx?8e zvXI%?t~fpp#PM+;v$I{R(9I)&1?RP&N@*plzb%;_JS>&d@a~nATfNH7^ z!1-R3I06LpG;_}Ahw9>d9{|7^`QY;L1F)h)2M%=C5Y^NQ0DuDkcwq$f"; } } -?> \ No newline at end of file +?> diff --git a/pandora_console/extensions/ssh_gateway/secure_console.png b/pandora_console/extensions/ssh_gateway/secure_console.png index 33f343b3b3946fa8326c8edc956ea53d83f12a11..b571eb7c86d9d4701643b8f5dde550fc96693a2a 100644 GIT binary patch literal 1396 zcmbVMZ%i9y7=PQssBCozW@EU>%h4IP(cWF@zq`=2rPo5;%CI!EGh4#7J?Ke$ce^{* zLNuWU-KHNvV+3R33jUihA%0Mk=@J>4$?Aqd5)D)1hb7bKOeS;FB`o4wpy&rO6EC^k z`#ksjp6B=cdrx(Cv>7VvDggk7U^^2=-`e7<-voeWOfm>a*rEEPYM0ofW>}d6-h>$A zU@*=0a$$~53>+(PEdc0}d?czyLkH-%m^QOT8*?@-Av6Fj?ySVd`#2TGxL#gxVK+Yg z41;{ag*{;l5h2OPCHeM2nd=(th{Ol`;#2~2?}IH_8aYUFDhspel%UXA7q;S;M(3g$ z$KZ;I+ULSnNkv1Q&?m|qw3!K0oUoJ7ZZ(rug0fOg&_a*|PFirnVIm3I=Aa1@u00rv zCMSC6FcVmdg(Mf2R8@(_@k}OT&NQ1vxfdrXioyvCZn2ny8Cwtx%|Bc$SrL(oEp#bTO|LYefxn|IpabT8Ruu z93JKrv0sj(e)Ke!z^Hcj4pcNmZ0LhBkD9`!7%|?T<^(m!xG?m`oZu5QVRI5B>97(G z3t@MXq|<9>0)B^u^0$&qGf9+uY=jM1oD4}Zey7#fN|JsHWhd=EZ@@=6TLWIdzqN!7 z3W~}Kajq1XM{(D%%ssKRPv%%vlp~^;DosFVQdC7HDN4}SWiyj7#Kw7{s3|sRHD894 z`Quz7Ad6|ZQem3kfWd!fzKTu!pQ_=A3|<_Me~n8?g=VmLTpxZUtgjCzpq-J?a`ZRt z8bbRy8DzYX?6n#vosR3L*71_UW7+ zSPa{+CGW(|`gc#~Cx(B0B>!Utd|}jd;Epl({2$9Fv@oN)tiZENo^w?%zA*@omtDQ> z*{;X>U>zb*s2k6FAKM~;=l0YzJ-w(o<0it2ZtB6|y-^1+D8?ssor~qMmf6;J&D?9( zbFXNviw*Posav}F-|975=_#;FOi<&2sF0eTYP30E{;2|T$ zgRWlNpR&RXnPfw56$e>oO~$vb6#_{^X}ID#|itHEyl0a=;emC>W_y%1iw^j z@-tgKW2tHQ^=jQHyZS}&)g}|4W z{w#bnttnJhymjt}p-AmtCw_Y7QR&XX!&BesXZK&szm%(Po>(O6cYnX^yJArH?g8`e V_l|xM8Ja8JgF$}>Gu7Jt?B4~2%%A`O literal 818 zcmV-21I_%2P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye& z4>mD9G`OJv00Oc}L_t(I%cYaMZyaS5#ed&p9=kg;?8@Nqim>811v{}!g;<#)g$oxT zQmjcsfh;QpvMl}xA{VxVXhM|&1W0M}7Z{TUSq9|DE6W`(d)ZxrAIUPTz4OiYQAD;B zrOcI1bB}cHInufCoFf{I#`~+Qt6z+cj#i7JI47KQ0K{?p)Xq7FQi|Q(-Q)TB`H$4{ z^77ZSv$JnzSr$f76jmyguv{*mLrNJcrOqLQ2!#+~nx@rmw;Sndwd!>`9X`8ti>aw8 zjt&nAf&eMyvv!4GFc{G5^;lV1Aq>M%JLjwb(#c8Qy>^WUTU%^zZSh~0JtN|r!&=M8 z$Ow6!V~nv{N{R3Ltgo%{>cxwEI5)@s{ywekZNe}FKuSryUMEdcthKb;ZTkH_MNy!Y zQVa$IUK<<3ImhDSB0p_xkYyQC2*Of{dcDrf%nX0-?E}zgH0bquD5a26O5!Bp-rc** zUBAv(ckYnXYBX=$;Js!Or8Pn(HG?~alDkd6h?%(b!7Ew_fe?a9r9z(P#Bod*hIpR$L^#$&wHLUMPVnRA zLuxg{>!lNZ`}G7lKu943)>@1)SZk3|qP52JJc1xVYY#|3T;lfUJAC_12S2FcoT4Zk zS}CP{-)CWAf#Gm?e*G+3tR4anKpm03b%FYL1!FRVuqY*@Znau}OixcwE-fuRRTyIo z#uy%TTAcoVABLNJd{Ysa40q5cJB{f6efUTuNpiW_Yz&r%WSo?_QS>}&-=~%4-tzXP*^j-(f|Me07*qoM6N<$f>}p#&;S4c diff --git a/pandora_console/extensions/update_manager/lib/functions.ajax.php b/pandora_console/extensions/update_manager/lib/functions.ajax.php index a9fd1908d6..79c0d7bf99 100644 --- a/pandora_console/extensions/update_manager/lib/functions.ajax.php +++ b/pandora_console/extensions/update_manager/lib/functions.ajax.php @@ -235,7 +235,6 @@ function update_pandora_download_package() { } $info = curl_getinfo ($c); - //html_debug_print($info, true); $data = array(); $data['correct'] = 1; diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php index 885a6b9b0d..7e9457ccef 100644 --- a/pandora_console/extensions/update_manager/main.php +++ b/pandora_console/extensions/update_manager/main.php @@ -174,7 +174,7 @@ function main_view_enterprise($settings, $user_key) { $table = null; $table->width = '98%'; $table->data = array(); - $table->data[1][0] = '
'.__('Offline packages loader'). ' ' . ui_print_help_tip (__('Apply, in order, the packets corresponding to your current version'), true) . '
' . + $table->data[1][0] = '
'.__('Offline packages loader'). ' ' . ui_print_help_tip (__('Apply, in order, the packets corresponding to your current version'), true) . '
' . '' . '' . ' '; diff --git a/pandora_console/extensions/users_connected.php b/pandora_console/extensions/users_connected.php index 4e2344d97d..c44cfbec83 100644 --- a/pandora_console/extensions/users_connected.php +++ b/pandora_console/extensions/users_connected.php @@ -27,8 +27,15 @@ function users_extension_main_god ($god = true) { } } + if($god) { + $image = "images/gm_users.png"; + } + else { + $image = "images/op_workspace.png"; + } + // Header - ui_print_page_header (__("Users connected"), "images/group.png", false, "", $god); + ui_print_page_header (__("Users connected"), $image, false, "", $god); // Get user conected last 5 minutes switch ($config["dbtype"]) { diff --git a/pandora_console/extensions/vnc_view.php b/pandora_console/extensions/vnc_view.php index eb44010e66..7d7fc24da6 100644 --- a/pandora_console/extensions/vnc_view.php +++ b/pandora_console/extensions/vnc_view.php @@ -22,5 +22,12 @@ function vnc_view() { echo ""; } -extensions_add_opemode_tab_agent('vnc_view', __('VNC view'), 'images/vnc.png', 'vnc_view', "v1r1"); +$id_agente = get_parameter ("id_agente"); + +// This extension is usefull only if the agent has associated IP +$address = agents_get_address($id_agente); + +if(!empty($address)) { + extensions_add_opemode_tab_agent('vnc_view', __('VNC view'), 'images/vnc.png', 'vnc_view', "v1r1"); +} ?> diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index c1e209f5ed..d0ff8a85de 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -29,9 +29,9 @@ $_SESSION["alert_msg"] = ""; config_check(); ?> -
".__("Agents")." / ".__("Alert templates")."
+
- - - - - - - - - +
+ - 'bot', "alt" => 'user')); - else - html_print_image("images/user_green.png" , false, array("class" => 'bot', "alt" => 'user')); - ?> - [] + 0) { - echo ''; - ui_require_css_file ('dialog'); - - echo ''; - html_print_image ("images/email.png", false, - array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot")); - echo ''; - echo " "; - echo " "; - } - } - - echo ""; - - if ($config["alert_cnt"] > 0) { - echo ''; - ui_require_css_file ('dialog'); - - echo ''; - html_print_image ("images/error.png", false, - array ("title" => __('You have %d warning(s)', $config["alert_cnt"]), "id" => "yougotalert", "class" => "bot")); - echo ''; - echo " "; - echo " "; - } - - echo ''; - html_print_image("images/log-out.png", false, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout'))); - echo ''; - - // Main help icon - echo " "; - echo " "; - echo ui_print_help_icon ("main_help", true); - if ($config['metaconsole'] == 1) { - echo " "; - echo " "; - html_print_image("images/application_double.png", false, array("alt" => __('Metaconsole activated'), "class" => 'bot', "title" => __('You are using metaconsole'))); - } - ?> - - '; + $table->class = "none"; + $table->cellpadding = 0; + $table->cellspacing = 0; + $table->head = array (); + $table->data = array (); + $table->style[0] = $table->style[2] = $table->style[4] = 'width: 27px; text-align:center; height: 27px; padding-left: 12px; padding-right: 2px;'; + $table->rowclass[0] = ''; + $table->styleTable = 'margin: auto; margin-top: 20px;'; + // Servers check + $servers = array(); $servers["all"] = (int) db_get_value ('COUNT(id_server)','tserver'); $servers["up"] = (int) servers_check_status (); $servers["down"] = $servers["all"] - $servers["up"]; if ($servers["up"] == 0) { //All Servers down or no servers at all - echo html_print_image("images/cross.png", true, array("alt" => 'cross', "class" => 'bot')) . ' '.__('All systems').': '.__('Down'); + $servers_check_img = html_print_image("images/header_down.png", true, array("alt" => 'cross', "class" => 'bot', 'title' => __('All systems').': '.__('Down'))); + $servers_check_txt = __('All systems').': '.__('Down'); } elseif ($servers["down"] != 0) { //Some servers down - echo html_print_image("images/error.png", true, array("alt" => 'error', "class" => 'bot')) . ' '.$servers["down"].' '.__('servers down'); + $servers_check_img = html_print_image("images/header_warning.png", true, array("alt" => 'error', "class" => 'bot', 'title' => $servers["down"].' '.__('servers down'))); + $servers_check_txt = $servers["down"].' '.__('servers down'); } else { //All servers up - echo html_print_image("images/ok.png", true, array("alt" => 'ok', "class" => 'bot')) . ' '.__('All systems').': '.__('Ready'); + $servers_check_img = html_print_image("images/header_ready.png", true, array("alt" => 'ok', "class" => 'bot', 'title' => __('All systems').': '.__('Ready'))); + $servers_check_txt = __('All systems').': '.__('Ready'); } unset ($servers); // Since this is the header, we don't like to trickle down variables. - echo ''; - //} - ?> - - false, 'code' => false); - if ($config['enable_refr']) { - $ignored_params['refr'] = 0; - echo '' . html_print_image("images/page_refresh.png", true, array("class" => 'bot', "alt" => 'lightning')) . ' '. __('Autorefresh'); - echo ' ('.date ("i:s", $config["refr"]).')'; - echo ''; - } - else { - if (!isset($_GET['sec2'])) - $_GET['sec2'] = ''; + $servers_link_open = ''; + $servers_link_close = ''; - if (($config['refr']) && (($_GET['sec2'] == 'operation/agentes/tactical') || ($_GET['sec2'] == 'operation/agentes/estado_agente') || - ($_GET['sec2'] == 'operation/agentes/group_view') || ($_GET['sec2'] == 'operation/events/events') || - ($_GET['sec2'] == 'enterprise/dashboard/main_dashboard'))) { - - echo '' . html_print_image("images/page_refresh.png", true, array("class" => 'bot', "alt" => 'lightning')) . ' '. __('Autorefresh'); - echo ' ('.date ("i:s", $config["refr"]).')'; - echo ''; + $table->data[0][0] = $servers_link_open . $servers_check_img . $servers_link_close; + $table->data[0][1] = $servers_link_open . $servers_check_txt . $servers_link_close; + + // Autorefresh + $autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot', "alt" => 'lightning', 'title' => __('Configure autorefresh'))); + $autorefresh_txt = __('Autorefresh'); + $autorefresh_additional = ''; + + $ignored_params = array ('agent_config' => false, 'code' => false); + if ($config['enable_refr']) { + $ignored_params['refr'] = 0; + $autorefresh_txt .= ' ('.date ("i:s", $config["refr"]).')'; } else { - $ignored_params['refr'] = ''; - echo '' . html_print_image("images/page_refresh.png", true, array("class" => 'bot', "alt" => 'lightning')) . ' '. __('Autorefresh').''; - $values = array ( - '5' => __('5 seconds'), - '10' => __('10 seconds'), - '15' => __('15 seconds'), - '30' => __('30 seconds'), - (string)SECONDS_1MINUTE => __('1 minute'), - (string)SECONDS_2MINUTES => __('2 minutes'), - (string)SECONDS_5MINUTES => __('5 minutes'), - (string)SECONDS_15MINUTES => __('15 minutes'), - (string)SECONDS_30MINUTES => __('30 minutes'), - (string)SECONDS_1HOUR => __('1 hour')); - echo ''; + if (!isset($_GET['sec2'])) + $_GET['sec2'] = ''; + + if (($config['refr']) && (($_GET['sec2'] == 'operation/agentes/tactical') || ($_GET['sec2'] == 'operation/agentes/estado_agente') || + ($_GET['sec2'] == 'operation/agentes/group_view') || ($_GET['sec2'] == 'operation/events/events') || + ($_GET['sec2'] == 'enterprise/dashboard/main_dashboard'))) { + + $autorefresh_txt .= ' ('.date ("i:s", $config["refr"]).')'; + } + else { + $ignored_params['refr'] = ''; + $values = array ( + '5' => __('5 seconds'), + '10' => __('10 seconds'), + '15' => __('15 seconds'), + '30' => __('30 seconds'), + (string)SECONDS_1MINUTE => __('1 minute'), + (string)SECONDS_2MINUTES => __('2 minutes'), + (string)SECONDS_5MINUTES => __('5 minutes'), + (string)SECONDS_15MINUTES => __('15 minutes'), + (string)SECONDS_30MINUTES => __('30 minutes'), + (string)SECONDS_1HOUR => __('1 hour')); + $autorefresh_additional = ''; + unset ($values); + } } - } + $autorefresh_link_open_img = ''; + $autorefresh_link_open_txt = ''; + $autorefresh_link_close = ''; + + $table->data[0][2] = $autorefresh_link_open_img . $autorefresh_img . $autorefresh_link_close; + $table->data[0][3] = $autorefresh_link_open_txt . $autorefresh_txt . $autorefresh_link_close . $autorefresh_additional; + + // Maintenance + $maintenance_txt = __('Maintenance'); + + if ($config["alert_cnt"] > 0) { + echo ''; + ui_require_css_file ('dialog'); + + $maintenance_link = 'javascript:'; + $maintenance_title = __("System alerts detected - Please fix as soon as possible"); + $maintenance_class = $maintenance_id = 'show_systemalert_dialog white_bold'; + + $maintenance_link_open_txt = ''; + $maintenance_link_open_img = ''; + $maintenance_link_close = ''; + $maintenance_img = $maintenance_link_open_img . html_print_image ("images/header_warning.png", true, array ("title" => __('You have %d warning(s)', $config["alert_cnt"]), "id" => "yougotalert", "class" => "bot")) . $maintenance_link_close; + $maintenance_txt = $maintenance_link_open_txt . $maintenance_txt . $maintenance_link_close; + } + else { + $maintenance_img = html_print_image ("images/header_ready.png", true, array ("title" => __('There are not warnings'), "id" => "yougotalert", "class" => "bot")); + } + + $table->data[0][4] = $maintenance_img; + $table->data[0][5] = $maintenance_txt; + + html_print_table($table); + + unset($table); ?> + "; - if (isset($config["custom_logo"])) - echo html_print_image("images/custom_logo/" . $config["custom_logo"], true,array("height" => '60', "width" => '139', "alt" => 'Logo')); - echo ""; + $table->class = "none"; + $table->cellpadding = 0; + $table->cellspacing = 0; + $table->head = array (); + $table->data = array (); + $table->style[0] = $table->style[2] = 'width: 27px; text-align:center; height: 27px; padding-left: 12px; padding-right: 2px;'; + $table->rowclass[0] = ''; + $table->styleTable = 'margin-top: 20px;'; + + // User + if (is_user_admin ($config["id_user"]) == 1) + $table->data[0][0] = html_print_image("images/header_user_admin.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user')); + else + $table->data[0][0] = html_print_image("images/header_user.png" , true, array("title" => __('Edit my user'), "class" => 'bot', "alt" => 'user')); + + $table->data[0][0] = '' . $table->data[0][0] . ''; + + $table->data[0][1] = ' [' . $config["id_user"] . ']'; + + // Logout + $table->data[0][2] = ''; + $table->data[0][2] .= html_print_image("images/header_logout.png", true, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout'))); + $table->data[0][2] .= ''; + + $table->data[0][3] = ''; + $table->data[0][3] .= __('Logout'); + $table->data[0][3] .= ''; + + html_print_table($table); + + unset($table); ?>
- -
- - - onfocus="javascript: if (fieldKeyWordEmpty) $('#keywords').val('');" - size="100" style="background: white url('images/lupa_15x15.png') no-repeat right; padding: 0; padding-left:0px; margin: 0; width: 90%; height: 19px; margin-bottom: 5px; margin-left: 2px;" /> - - - -
- - 		+ ' . html_print_image("images/lightning_go.png", true, array("alt" => 'lightning_go', "class" => 'bot')) . ' '.__('Events').''; - } + $table->class = "none"; + $table->cellpadding = 0; + $table->cellspacing = 0; + $table->head = array (); + $table->data = array (); + $table->style[0] = $table->style[1] = $table->style[2] = 'text-align:right; padding-right: 2px; width: 1px;'; + $table->style[3] = 'width: 180px;'; + $table->style[4] = 'padding-left: 10px; width: 20px;'; + $table->width = "100%"; + $table->styleTable = 'margin: auto; margin-top: 20px; padding-right: 5px;'; + $table->rowclass[0] = ''; + + // Main help icon + $table->data[0][0] = ui_print_help_icon ("main_help", true, '', 'images/header_help.png'); + + // Messages + $msg_cnt = messages_get_count ($config["id_user"]); + if ($msg_cnt > 0) { + echo ''; + ui_require_css_file ('dialog'); + + $table->data[0][1] = ''; + $table->data[0][1] .= html_print_image ("images/header_email.png", true, array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot", 'style' => 'width:24px;')); + $table->data[0][1] .= ''; + } + else { + $table->data[0][1] = ''; + } + + // Chat messages + $table->data[0][2] = ""; + + // Search bar + $search_bar = '
'; + $search_bar .= ''; + $search_bar .= ''; + + //$search_bar .= 'onClick="javascript: document.quicksearch.submit()"'; + + $search_bar .= ""; + $search_bar .= '
'; + + $table->data[0][3] = $search_bar; + + $table->data[0][4] = ui_print_help_tip (__("Blank characters are used as AND conditions"), true); + + html_print_table($table); + + unset($table); ?>
@@ -270,13 +322,11 @@ config_check(); } else { ?> - $("a#autorefresh").click (function () { - var a = this; - - $(this).hide ().unbind ("click"); - $("#combo_refr").show (); + $("a.autorefresh").click (function () { + $("a.autorefresh_txt").toggle (); + $("#combo_refr").toggle (); $("select#ref").change (function () { - href = $(a).attr ("href"); + href = $(this).attr ("href"); $(document).attr ("location", href + this.value); }); @@ -287,4 +337,4 @@ config_check(); ?> }); /* ]]> */ - \ No newline at end of file + diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 37adc2cf5c..634b904732 100644 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -246,4 +246,4 @@ ui_require_jquery_file('jquery-ui-1.10.0.custom'); $('#nick').focus(); /* ]]> */ - + \ No newline at end of file diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 9d16db1006..969c93a3cd 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -87,15 +87,16 @@ echo '
' $table->width = '100%'; //Don't specify px $table->data = array (); $table->size = array (); - $table->size[1] = '150px'; - $table->size[2] = '130px'; - $table->size[4] = '200px'; + $table->size[2] = '150px'; + $table->size[3] = '130px'; + $table->size[5] = '200px'; $table->head = array (); $table->head[0] = __('User'); - $table->head[1] = __('Action'); - $table->head[2] = __('Date'); - $table->head[3] = __('Source IP'); - $table->head[4] = __('Comments'); + $table->head[1] = ''; + $table->head[2] = __('Action'); + $table->head[3] = __('Date'); + $table->head[4] = __('Source IP'); + $table->head[5] = __('Comments'); $table->title = '' . __('This is your last activity in Pandora FMS console') . ''; switch ($config["dbtype"]) { @@ -142,10 +143,10 @@ echo '
' $data[0] = '' . $session_id_usuario . ''; $data[1] = ui_print_session_action_icon ($session['accion'], true); - $data[1] .= $session['accion']; - $data[2] = ui_print_help_tip($session['fecha'], true) . human_time_comparation($session['utimestamp']); - $data[3] = $session_ip_origen; - $data[4] = io_safe_output ($session['descripcion']); + $data[2] = $session['accion']; + $data[3] = ui_print_help_tip($session['fecha'], true) . human_time_comparation($session['utimestamp']); + $data[4] = $session_ip_origen; + $data[5] = io_safe_output ($session['descripcion']); array_push ($table->data, $data); } diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index c054aaf2bd..71f589101a 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -23,7 +23,7 @@ if (! isset ($config["id_user"])) { // Menu container prepared to autohide menu echo ''; echo ''; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php index 5839c9829d..b77916dbea 100644 --- a/pandora_console/godmode/agentes/fields_manager.php +++ b/pandora_console/godmode/agentes/fields_manager.php @@ -28,7 +28,7 @@ if (!check_acl($config['id_user'], 0, "PM")) { } // Header -ui_print_page_header (__("Agents custom fields manager"), "images/note.png", false, "", true, ""); +ui_print_page_header (__("Agents custom fields manager"), "images/custom_field.png", false, "", true, ""); $create_field = (bool) get_parameter ('create_field'); $update_field = (bool) get_parameter ('update_field'); @@ -127,4 +127,4 @@ html_print_submit_button (__('Create field'), 'crt', false, 'class="sub next"'); echo '
'; echo ''; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index e1802f734a..56dd46b111 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -48,18 +48,17 @@ $tab = 'view'; /* Setup tab */ $viewtab['text'] = '' - . html_print_image ("images/zoom.png", true, array ("title" =>__('View'))) + . html_print_image ("images/operation.png", true, array ("title" =>__('View'))) . ''; -if($tab == 'view') - $viewtab['active'] = true; -else - $viewtab['active'] = false; +$viewtab['operation'] = true; + +$viewtab['active'] = false; $onheader = array('view' => $viewtab); // Header -ui_print_page_header (__('Agent configuration')." » ".__('Agents defined in Pandora'), "", false, "", true, $onheader); +ui_print_page_header (__('Agent configuration')." » ".__('Agents defined in Pandora'), "images/agent_mc.png", false, "", true, $onheader); // Perform actions $agent_to_delete = (int)get_parameter('borrar_agente'); diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php index 2210e768d5..77d62efe12 100755 --- a/pandora_console/godmode/agentes/planned_downtime.editor.php +++ b/pandora_console/godmode/agentes/planned_downtime.editor.php @@ -30,7 +30,7 @@ require_once ('include/functions_users.php'); // Header ui_print_page_header( __("Planned Downtime") . ui_print_help_icon ('planned_downtime', true), - "images/god1.png", + "images/gm_monitoring.png", false, "", true, diff --git a/pandora_console/godmode/agentes/planned_downtime.list.php b/pandora_console/godmode/agentes/planned_downtime.list.php index 1275664759..7ad4a54a86 100755 --- a/pandora_console/godmode/agentes/planned_downtime.list.php +++ b/pandora_console/godmode/agentes/planned_downtime.list.php @@ -29,10 +29,10 @@ require_once ('include/functions_users.php'); // Header ui_print_page_header( - __("Planned Downtime") . ui_print_help_icon ('planned_downtime', true), - "images/god1.png", + __("Planned Downtime"), + "images/gm_monitoring.png", false, - "", + "planned_downtime", true, ""); diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php index 2c79798145..01e546cfc6 100644 --- a/pandora_console/godmode/alerts/alert_actions.php +++ b/pandora_console/godmode/alerts/alert_actions.php @@ -61,7 +61,7 @@ if ((!$copy_action) && (!$delete_action) && (!$update_action)) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "alert_action", true); + ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/gm_alerts.png", false, "alert_action", true); } } @@ -86,7 +86,7 @@ if ($copy_action) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "alert_action", true); + ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/gm_alerts.png", false, "alert_action", true); } } } // If user tries to copy an action of others groups @@ -104,7 +104,7 @@ if ($copy_action) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "alert_action", true); + ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/gm_alerts.png", false, "alert_action", true); } } else { @@ -121,7 +121,7 @@ if ($copy_action) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "alert_action", true); + ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/gm_alerts.png", false, "alert_action", true); } } $result = alerts_clone_alert_action ($id); @@ -199,7 +199,7 @@ if ($update_action) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "alert_action", true); + ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/gm_alerts.png", false, "alert_action", true); } } } @@ -210,7 +210,7 @@ if ($update_action) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "alert_action", true); + ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/gm_alerts.png", false, "alert_action", true); } } @@ -277,7 +277,7 @@ if ($delete_action) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "alert_action", true); + ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/gm_alerts.png", false, "alert_action", true); } } // If user tries to delete an action of others groups @@ -296,7 +296,7 @@ if ($delete_action) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "alert_action", true); + ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/gm_alerts.png", false, "alert_action", true); } } else { @@ -309,7 +309,7 @@ if ($delete_action) { } else // Header - ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/god2.png", false, "", true); + ui_print_page_header (__('Alerts').' » '.__('Alert actions'), "images/gm_alerts.png", false, "", true); $result = alerts_delete_alert_action ($id); diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 6b631d806c..b3123281ec 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -124,7 +124,7 @@ if (is_ajax ()) { if (defined('METACONSOLE')) alerts_meta_print_header(); else - ui_print_page_header (__('Alerts').' » '.__('Alert commands'), "images/god2.png", false, "alert_command", true); + ui_print_page_header (__('Alerts').' » '.__('Alert commands'), "images/gm_alerts.png", false, "alert_command", true); $update_command = (bool) get_parameter ('update_command'); $create_command = (bool) get_parameter ('create_command'); @@ -302,4 +302,4 @@ html_print_submit_button (__('Create'), 'create', false, 'class="sub next"'); html_print_input_hidden ('create_alert', 1); echo ''; echo '
'; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index 2d393d506d..11bc2acac5 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -275,11 +275,11 @@ else { 'list' => array( 'active' => false, 'text' => '' . - html_print_image ("images/god6.png", true, array ("title" => __('List alerts'))) .''), + html_print_image ("images/list.png", true, array ("title" => __('List alerts'))) .''), 'builder' => array( 'active' => false, 'text' => '' . - html_print_image ("images/config.png", true, array ("title" => __('Builder alert'))) .'')); + html_print_image ("images/pen.png", true, array ("title" => __('Builder alert'))) .'')); $buttons[$tab]['active'] = true; } @@ -288,10 +288,10 @@ else { } if ($tab == 'list') { - ui_print_page_header(__('Alerts') . ' » ' . __('Manage alerts') . ' » ' . __('List'), "images/god2.png", false, "manage_alert_list", true, $buttons); + ui_print_page_header(__('Alerts') . ' » ' . __('Manage alerts') . ' » ' . __('List'), "images/gm_alerts.png", false, "manage_alert_list", true, $buttons); } else { - ui_print_page_header(__('Alerts') . ' » ' . __('Manage alerts') . ' » ' . __('Create'), "images/god2.png", false, "manage_alert_list", true, $buttons); + ui_print_page_header(__('Alerts') . ' » ' . __('Manage alerts') . ' » ' . __('Create'), "images/gm_alerts.png", false, "manage_alert_list", true, $buttons); } } @@ -329,4 +329,4 @@ else { break; } } -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/alerts/alert_special_days.php b/pandora_console/godmode/alerts/alert_special_days.php index 78803eb594..51542736dd 100644 --- a/pandora_console/godmode/alerts/alert_special_days.php +++ b/pandora_console/godmode/alerts/alert_special_days.php @@ -40,7 +40,7 @@ if (is_ajax ()) { } // Header -ui_print_page_header (__('Alerts').' » '.__('Special days list'), "images/god2.png", false, "alert_special_days", true); +ui_print_page_header (__('Alerts').' » '.__('Special days list'), "images/gm_alerts.png", false, "alert_special_days", true); $update_special_day = (bool) get_parameter ('update_special_day'); $create_special_day = (bool) get_parameter ('create_special_day'); diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php index 8a44af99e0..3f7c47999c 100644 --- a/pandora_console/godmode/alerts/alert_templates.php +++ b/pandora_console/godmode/alerts/alert_templates.php @@ -127,7 +127,7 @@ if (!$delete_template) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts')." » ". __('Alert templates'), "images/god2.png", false, "alert_template", true); + ui_print_page_header (__('Alerts')." » ". __('Alert templates'), "images/gm_alerts.png", false, "alert_template", true); } } if ($update_template) { @@ -167,7 +167,7 @@ if ($delete_template) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts')." » ". __('Alert templates'), "images/god2.png", false, "alert_template", true); + ui_print_page_header (__('Alerts')." » ". __('Alert templates'), "images/gm_alerts.png", false, "alert_template", true); } } } // If user tries to delete a template of others groups @@ -184,7 +184,7 @@ if ($delete_template) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts')." » ". __('Alert templates'), "images/god2.png", false, "alert_template", true); + ui_print_page_header (__('Alerts')." » ". __('Alert templates'), "images/gm_alerts.png", false, "alert_template", true); } } else { @@ -200,7 +200,7 @@ if ($delete_template) { alerts_meta_print_header (); } else { - ui_print_page_header (__('Alerts')." » ". __('Alert templates'), "images/god2.png", false, "alert_template", true); + ui_print_page_header (__('Alerts')." » ". __('Alert templates'), "images/gm_alerts.png", false, "alert_template", true); } } @@ -304,7 +304,7 @@ foreach ($templates as $template) { $data[4] .= html_print_input_image ('dup', 'images/copy.png', 1, '', true, array ('title' => __('Duplicate'))); $data[4] .= ' '; - $data[4] .= '  
'; + $data[4] .= ''; $data[4] .= html_print_input_hidden ('delete_template', 1, true); $data[4] .= html_print_input_hidden ('id', $template['id'], true); $data[4] .= html_print_input_image ('del', 'images/cross.png', 1, '', true, array ('title' => __('Delete'))); diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php index 2cc6483509..5d9c21d877 100644 --- a/pandora_console/godmode/alerts/configure_alert_action.php +++ b/pandora_console/godmode/alerts/configure_alert_action.php @@ -54,7 +54,7 @@ if ($al_action !== false){ if (defined('METACONSOLE')) alerts_meta_print_header(); else - ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/god2.png", false, "", true); + ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/gm_alerts.png", false, "", true); } } // If user tries to edit an action of others groups else { @@ -70,7 +70,7 @@ if ($al_action !== false){ if (defined('METACONSOLE')) alerts_meta_print_header(); else - ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/god2.png", false, "", true); + ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/gm_alerts.png", false, "", true); } else { db_pandora_audit("ACL Violation", @@ -85,7 +85,7 @@ else { if (defined('METACONSOLE')) alerts_meta_print_header(); else - ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/god2.png", false, "", true); + ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/gm_alerts.png", false, "", true); } $name = ''; @@ -105,6 +105,7 @@ if ($id) { // Hidden div with help hint to fill with javascript html_print_div(array('id' => 'help_alert_macros_hint', 'content' => ui_print_help_icon ('alert_macros', true, ui_get_full_url(false, false, false, false)), 'hidden' => true)); +$table->id = 'table_macros'; $table->width = '98%'; $table->style = array (); $table->style[0] = 'font-weight: bold'; @@ -211,17 +212,17 @@ $(document).ready (function () { // If the row is empty, hide de row if(data["fields_rows"][i] == '') { - $('#table1-field'+i).hide(); + $('#table_macros-field'+i).hide(); } else { - $('#table1-field'+i).replaceWith(data["fields_rows"][i]); + $('#table_macros-field'+i).replaceWith(data["fields_rows"][i]); $("[name=field"+i+"_value]").val(old_value); // Add help hint only in first field if(i == 1) { - var td_content = $('#table1-field'+i).find('td').eq(0); + var td_content = $('#table_macros-field'+i).find('td').eq(0); td_content.html(td_content.html() + $('#help_alert_macros_hint').html()); } - $('#table1-field').show(); + $('#table_macros-field').show(); } } diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index 1118edfada..5e925a0952 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.php @@ -58,7 +58,7 @@ if (defined('METACONSOLE')) alerts_meta_print_header(); else ui_print_page_header (__('Alerts') . ' » ' . - __('Configure alert command'), "images/god2.png", false, "", true); + __('Configure alert command'), "images/gm_alerts.png", false, "", true); $table->width = '98%'; $table->style = array (); diff --git a/pandora_console/godmode/alerts/configure_alert_special_days.php b/pandora_console/godmode/alerts/configure_alert_special_days.php index f0ff05672f..0acdf83c1e 100644 --- a/pandora_console/godmode/alerts/configure_alert_special_days.php +++ b/pandora_console/godmode/alerts/configure_alert_special_days.php @@ -49,7 +49,7 @@ if ($date == '') { } // Header -ui_print_page_header (__('Alerts').' » '.__('Configure special day'), "images/god2.png", false, "", true); +ui_print_page_header (__('Alerts').' » '.__('Configure special day'), "images/gm_alerts.png", false, "", true); $table->width = '98%'; $table->style = array (); diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index 9845655db9..e9bc1da294 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -43,11 +43,9 @@ else { } if (defined('METACONSOLE')) { - $sec = 'advanced'; } else { - $sec = 'galertas'; } @@ -64,14 +62,10 @@ if ($a_template !== false) { else { // Header if (defined('METACONSOLE')) { - alerts_meta_print_header(); - } else { - ui_print_page_header (__('Alerts').' » '.__('Configure alert template'), "", false, "conf_alert_template", true); - } } @@ -87,14 +81,10 @@ if ($a_template !== false) { if ($is_in_group) { // Header if (defined('METACONSOLE')) { - alerts_meta_print_header(); - } else { - - ui_print_page_header (__('Alerts').' » '.__('Configure alert template'), "", false, "conf_alert_template", true); - + ui_print_page_header (__('Alerts').' » '.__('Configure alert template'), "images/gm_alerts.png", false, "", true); } } else { @@ -109,14 +99,10 @@ if ($a_template !== false) { else { // Header if (defined('METACONSOLE')) { - alerts_meta_print_header(); - } else { - - ui_print_page_header (__('Alerts').' » '.__('Configure alert template'), "", false, "conf_alert_template", true); - + ui_print_page_header (__('Alerts').' » '.__('Configure alert template'), "images/gm_alerts.png", false, "", true); } } diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php index a0946542e4..03d2865ba9 100755 --- a/pandora_console/godmode/category/category.php +++ b/pandora_console/godmode/category/category.php @@ -38,7 +38,7 @@ $buttons = array( 'list' => array( 'active' => false, 'text' => '' . - html_print_image ("images/god6.png", true, array ("title" => __('List categories'))) .'')); + html_print_image ("images/list.png", true, array ("title" => __('List categories'))) .'')); $buttons[$tab]['active'] = true; @@ -47,7 +47,7 @@ if(defined('METACONSOLE')) { ui_meta_print_header(__('Categories configuration'), __('List'), $buttons); } else { - ui_print_page_header (__('Categories configuration'), "images/setup.png", false, "categories", true, $buttons); + ui_print_page_header (__('Categories configuration'), "images/gm_modules.png", false, "", true, $buttons); } // Two actions can performed in this page: search and delete categories diff --git a/pandora_console/godmode/category/edit_category.php b/pandora_console/godmode/category/edit_category.php index 0918f32813..25d8a080a7 100755 --- a/pandora_console/godmode/category/edit_category.php +++ b/pandora_console/godmode/category/edit_category.php @@ -37,7 +37,7 @@ $buttons = array( 'list' => array( 'active' => false, 'text' => '' . - html_print_image ("images/god6.png", true, array ("title" => __('List categories'))) .'')); + html_print_image ("images/list.png", true, array ("title" => __('List categories'))) .'')); $buttons[$tab]['active'] = false; @@ -46,7 +46,7 @@ if (defined('METACONSOLE')) { ui_meta_print_header(__('Categories configuration'), __('Editor'), $buttons); } else { - ui_print_page_header (__('Categories configuration'), "images/setup.png", false, "", true, $buttons); + ui_print_page_header (__('Categories configuration'), "images/gm_modules.png", false, "", true, $buttons); } diff --git a/pandora_console/godmode/db/db_audit.php b/pandora_console/godmode/db/db_audit.php index ae9ca97b71..b496f9ca78 100644 --- a/pandora_console/godmode/db/db_audit.php +++ b/pandora_console/godmode/db/db_audit.php @@ -16,7 +16,7 @@ // Load global vars global $config; -ui_print_page_header (__('Database maintenance').' » '.__('Database audit purge'), "images/god8.png", false, "", true); +ui_print_page_header (__('Database maintenance').' » '.__('Database audit purge'), "images/gm_db.png", false, "", true); check_login (); diff --git a/pandora_console/godmode/db/db_event.php b/pandora_console/godmode/db/db_event.php index e8e2e8c68c..a42c3da000 100644 --- a/pandora_console/godmode/db/db_event.php +++ b/pandora_console/godmode/db/db_event.php @@ -18,7 +18,7 @@ global $config; check_login (); -ui_print_page_header (__('Database maintenance').' » '.__('Event database cleanup'), "images/god8.png", false, "", true); +ui_print_page_header (__('Database maintenance').' » '.__('Event database cleanup'), "images/gm_db.png", false, "", true); if (! check_acl ($config['id_user'], 0, "DM")) { db_pandora_audit("ACL Violation", "Trying to access Database Management Event"); diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php index da65c06c7c..37241ac6d4 100644 --- a/pandora_console/godmode/db/db_info.php +++ b/pandora_console/godmode/db/db_info.php @@ -22,7 +22,7 @@ require_once ($config['homedir'] . '/include/functions_graph.php'); require_once($config['homedir'] . '/include/functions_agents.php'); require_once($config['homedir'] . '/include/functions_modules.php'); -ui_print_page_header (__('Database maintenance').' » '.__('Database information'), "images/god8.png", false, "", true); +ui_print_page_header (__('Database maintenance').' » '.__('Database information'), "images/gm_db.png", false, "", true); check_login (); diff --git a/pandora_console/godmode/db/db_main.php b/pandora_console/godmode/db/db_main.php index 482c1e3c94..7246a62ed7 100644 --- a/pandora_console/godmode/db/db_main.php +++ b/pandora_console/godmode/db/db_main.php @@ -66,7 +66,7 @@ switch ($config["dbtype"]) { $max_access = 1000000; $max_data = 12000000; -ui_print_page_header (__('Current database maintenance setup'), "", false, "", true); +ui_print_page_header (__('Current database maintenance setup'), "images/gm_db.png", false, "", true); echo ''; @@ -200,4 +200,4 @@ echo '

'; echo '(*) '.__('Please check your Pandora Server setup and be sure that database maintenance daemon is running. It\'s very important to keep up-to-date database to get the best performance and results in Pandora'); echo '
'; echo '
'; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/db/db_purge.php b/pandora_console/godmode/db/db_purge.php index 891eb56d4f..c768cae158 100644 --- a/pandora_console/godmode/db/db_purge.php +++ b/pandora_console/godmode/db/db_purge.php @@ -34,7 +34,7 @@ if (! check_acl ($config['id_user'], 0, "DM")) { //id_agent = -1: None selected; id_agent = 0: All $id_agent = (int) get_parameter_post ("agent", -1); -ui_print_page_header (__('Database maintenance').' » '.__('Database purge'), "images/god8.png", false, "", true); +ui_print_page_header (__('Database maintenance').' » '.__('Database purge'), "images/gm_db.png", false, "", true); echo grafico_db_agentes_purge($id_agent); diff --git a/pandora_console/godmode/db/db_refine.php b/pandora_console/godmode/db/db_refine.php index ded0f58052..5022d78591 100644 --- a/pandora_console/godmode/db/db_refine.php +++ b/pandora_console/godmode/db/db_refine.php @@ -30,7 +30,7 @@ require_once($config['homedir'] . "/include/functions_agents.php"); require_once($config['homedir'] . "/include/functions_modules.php"); require_once($config['homedir'] . '/include/functions_users.php'); -ui_print_page_header (__('Database maintenance').' » '.__('Database debug'), "images/god8.png", false, "", true); +ui_print_page_header (__('Database maintenance').' » '.__('Database debug'), "images/gm_db.png", false, "", true); if ((isset ($_GET["operacion"])) && (!isset ($_POST["update_agent"]))) { diff --git a/pandora_console/godmode/db/db_sanity.php b/pandora_console/godmode/db/db_sanity.php index e5ad3eea80..6cb81ae12e 100644 --- a/pandora_console/godmode/db/db_sanity.php +++ b/pandora_console/godmode/db/db_sanity.php @@ -26,7 +26,7 @@ if (! check_acl ($config["id_user"], 0, "DM")) { return; } -ui_print_page_header (__('Database maintenance').' » '.__('Database sanity tool'), "images/god8.png", false, "", true); +ui_print_page_header (__('Database maintenance').' » '.__('Database sanity tool'), "images/gm_db.png", false, "", true); $sanity = get_parameter ("sanity", 0); diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php index 5286d8aacd..1597528716 100644 --- a/pandora_console/godmode/events/event_edit_filter.php +++ b/pandora_console/godmode/events/event_edit_filter.php @@ -488,4 +488,4 @@ function replace_hidden_tags(what_button) { $(id_hidden).val(Base64.encode(jQuery.toJSON(value_store))); } /* ]]> */ - + \ No newline at end of file diff --git a/pandora_console/godmode/events/events.php b/pandora_console/godmode/events/events.php index 06b438e194..54f4763398 100644 --- a/pandora_console/godmode/events/events.php +++ b/pandora_console/godmode/events/events.php @@ -29,22 +29,23 @@ if (! check_acl ($config["id_user"], 0, "EW")) { $section = (string) get_parameter ("section", "filter"); // Draws header +$buttons['view'] = array('active' => false, + 'text' => '' . + html_print_image("images/operation.png", true, array("title" => __('View events'))) . '', + 'operation' => true); + $buttons['filter'] = array('active' => false, 'text' => '' . - html_print_image("images/lightning_go.png", true, array ("title" => __('Create filter'))) . ''); + html_print_image("images/filter_mc.png", true, array ("title" => __('Create filter'))) . ''); if (check_acl ($config["id_user"], 0, "PM")) { $buttons['responses'] = array('active' => false, 'text' => '' . - html_print_image("images/cog.png", true, array ("title" => __('Event responses'))) . ''); + html_print_image("images/event_responses.png", true, array ("title" => __('Event responses'))) . ''); $buttons['fields'] = array('active' => false, 'text' => '' . - html_print_image("images/pencil.png", true, array ("title" => __('Custom fields'))) . ''); + html_print_image("images/custom_columns.png", true, array ("title" => __('Custom fields'))) . ''); } -$buttons['separator'] = ''; -$buttons['view'] = array('active' => false, - 'text' => '' . - html_print_image("images/god6.png", true, array("title" => __('View events'))) . ''); switch ($section) { case 'filter': @@ -69,7 +70,7 @@ switch ($section) { } if (! defined ('METACONSOLE')) { - ui_print_page_header (__("Manage events") . $subpage, "images/lightning_go.png", false, "", true, $buttons); + ui_print_page_header (__("Manage events") . $subpage, "images/gm_events.png", false, "", true, $buttons); } else { ui_meta_print_header(__("Manage events") . $subpage, "", $buttons); diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php index 5ec65e1481..15e1001f38 100644 --- a/pandora_console/godmode/extensions.php +++ b/pandora_console/godmode/extensions.php @@ -295,8 +295,8 @@ foreach ($extensions as $file => $extension) { } else { $data[] = ""; - $data[] = ""; } + $table->data[] = $data; } html_print_table ($table); diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index 18908a4b4d..0d054d0675 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -17,7 +17,7 @@ global $config; check_login (); -ui_print_page_header (__('GIS Maps builder'), "images/server_web.png", false, "configure_gis_map", true); +ui_print_page_header (__('GIS Maps builder'), "images/gm_gis.png", false, "configure_gis_map", true); require_once ('include/functions_gis.php'); @@ -925,4 +925,4 @@ function downLayer(idLayer) { updateArrowLayers(); } } - \ No newline at end of file + diff --git a/pandora_console/godmode/gis_maps/index.php b/pandora_console/godmode/gis_maps/index.php index 0c82145bb2..df389f0475 100644 --- a/pandora_console/godmode/gis_maps/index.php +++ b/pandora_console/godmode/gis_maps/index.php @@ -62,7 +62,7 @@ switch ($action) { break; } -ui_print_page_header (__('GIS Maps builder'), "images/server_web.png", false, "gis_map_builder", true); +ui_print_page_header (__('GIS Maps builder'), "images/gm_gis.png", false, "gis_map_builder", true); $table->width = '98%'; $table->head[0] = __('Map name'); @@ -105,8 +105,8 @@ if ($maps){ $default_button = html_print_radio_button_extended('default_map', $map['id_tgis_map'], '', $checked, false, "setDefault(" . $map['id_tgis_map'] . ");", '', true); array_push($table_info, $default_button); } - $buttons = '' . html_print_image ("images/config.png", true).'  '; - $buttons .= '' . html_print_image ("images/cross.png", true).''; + $buttons = '' . html_print_image ("images/config.png", true, array('title' => __('Edit'))).'  '; + $buttons .= '' . html_print_image ("images/cross.png", true, array('title' => __('Delete'))).''; array_push ($table_info, $buttons); $table->data[] = $table_info; } diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index c267d5654d..15b19e9a71 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -89,7 +89,7 @@ else { else $title_in_header = __("Create group"); - ui_print_page_header ($title_in_header, "images/god1.png", false, "", true, ""); + ui_print_page_header ($title_in_header, "images/group.png", false, "", true, ""); $sec = 'gagente'; } diff --git a/pandora_console/godmode/groups/configure_modu_group.php b/pandora_console/godmode/groups/configure_modu_group.php index 91bb894834..5f920fa352 100644 --- a/pandora_console/godmode/groups/configure_modu_group.php +++ b/pandora_console/godmode/groups/configure_modu_group.php @@ -26,7 +26,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) { } // Header -ui_print_page_header (__("Module group management"), "images/god1.png", false, "", true, ""); +ui_print_page_header (__("Module group management"), "images/module_group.png", false, "", true, ""); // Init vars $icon = ""; @@ -79,4 +79,4 @@ else { } echo ''; echo '
'; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index c600a2fa67..fd2a1b2f3f 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -113,7 +113,7 @@ if (defined('METACONSOLE')) { } else { - ui_print_page_header (__("Groups defined in Pandora"), "images/god1.png", false, "", true, ""); + ui_print_page_header (__("Groups defined in Pandora"), "images/group.png", false, "", true, ""); $sec = 'gagente'; } diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php index 1ffe018911..f5cc823d18 100644 --- a/pandora_console/godmode/groups/modu_group_list.php +++ b/pandora_console/godmode/groups/modu_group_list.php @@ -51,7 +51,7 @@ if (is_ajax ()) { } // Header -ui_print_page_header (__("Module groups defined in Pandora"), "images/god1.png", false, "", true, ""); +ui_print_page_header (__("Module groups defined in Pandora"), "images/module_group.png", false, "", true, ""); $create_group = (bool) get_parameter ('create_group'); $update_group = (bool) get_parameter ('update_group'); diff --git a/pandora_console/godmode/massive/massive_copy_modules.php b/pandora_console/godmode/massive/massive_copy_modules.php index 53e2ae5505..ad7a7feae1 100644 --- a/pandora_console/godmode/massive/massive_copy_modules.php +++ b/pandora_console/godmode/massive/massive_copy_modules.php @@ -222,7 +222,6 @@ $(document).ready (function () { $("#source_id_agent").change (function () { var id_agent = this.value; - if (id_agent == 0) { $("#submit-go").attr("disabled", "disabled"); diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index e2d541f7a6..6fa3d5ecaf 100644 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -108,7 +108,7 @@ if ($option == '') { } $alertstab = array('text' => '' - . html_print_image ('images/bell.png', true, array ('title' => __('Alerts operations'))) + . html_print_image ('images/op_alerts.png', true, array ('title' => __('Alerts operations'))) . '', 'active' => $tab == 'massive_alerts'); $userstab = array('text' => '' @@ -138,7 +138,7 @@ if (check_acl ($config['id_user'], 0, "PM")) { $onheader['massive_alerts'] = $alertstab; $onheader['policies'] = $policiestab; -ui_print_page_header (__('Massive operations'). ' » '. $options[$option], "images/sitemap_color.png", false, "", true, $onheader); +ui_print_page_header (__('Massive operations'). ' » '. $options[$option], "images/gm_massive_operations.png", false, "", true, $onheader); // Checks if the PHP configuration is correctly if ((get_cfg_var("max_execution_time") != 0) or (get_cfg_var("max_input_time") != -1)){ @@ -258,4 +258,4 @@ switch ($option) { } break; } -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php index f68331b29e..1c91f85a79 100644 --- a/pandora_console/godmode/modules/manage_network_templates.php +++ b/pandora_console/godmode/modules/manage_network_templates.php @@ -27,7 +27,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) { } // Header -ui_print_page_header (__('Module management')." » ".__('Module template management'), "", false, "template_tab", true); +ui_print_page_header (__('Module management')." » ".__('Module template management'), "images/gm_modules.png", false, "template_tab", true); require_once ('include/functions_network_profiles.php'); @@ -205,13 +205,13 @@ foreach ($result as $row) { $data[2] = html_print_input_image ("delete_profile", "images/cross.png", $row["id_np"],'', true, array ('onclick' => 'if (!confirm(\''.__('Are you sure?').'\')) return false;')); - $data[2] .= html_print_input_image ("export_profile", "images/lightning_go.png", - $row["id_np"], '', true, array('title' => 'Export')); + $data[2] .= html_print_input_image ("export_profile", "images/csv.png", + $row["id_np"], '', true, array('title' => 'Export to CSV')); $data[2] = '' . html_print_image("images/cross.png", true, array('title' => __('Delete'))) . ''; $data[2] .= '  ' . html_print_image("images/lightning_go.png", true, array('title' => __('Export'))) . '' . + '&export_profile=' . $row['id_np'] . '">' . html_print_image("images/csv.png", true, array('title' => __('Export to CSV'))) . '' . html_print_checkbox_extended ('delete_multiple[]', $row['id_np'], false, false, '', 'class="check_delete"', true); array_push ($table->data, $data); diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php index b4592ceab3..216b2da9e8 100644 --- a/pandora_console/godmode/modules/module_list.php +++ b/pandora_console/godmode/modules/module_list.php @@ -25,7 +25,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) { } // Header -ui_print_page_header (__('Module management')." » ". __('Defined modules'), "", false, "", true); +ui_print_page_header (__('Module management')." » ". __('Defined modules'), "images/gm_modules.png", false, "", true); $update_module = (bool) get_parameter_post ('update_module'); diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php index bb176eed7f..c9c40aece1 100644 --- a/pandora_console/godmode/netflow/nf_edit.php +++ b/pandora_console/godmode/netflow/nf_edit.php @@ -34,7 +34,7 @@ $pure = get_parameter('pure', 0); //Header if (! defined ('METACONSOLE')) { - ui_print_page_header (__('Manage Netflow Filter'), "images/networkmap/so_cisco_new.png", false, "", true); + ui_print_page_header (__('Manage Netflow Filter'), "images/gm_netflow.png", false, "", true); } else { $nav_bar = array(array('link' => 'index.php?sec=main', 'text' => __('Main')), diff --git a/pandora_console/godmode/netflow/nf_edit_form.php b/pandora_console/godmode/netflow/nf_edit_form.php index 04a448ceb8..2e31bb64ae 100644 --- a/pandora_console/godmode/netflow/nf_edit_form.php +++ b/pandora_console/godmode/netflow/nf_edit_form.php @@ -48,15 +48,15 @@ if ($id) { //Header if (! defined ('METACONSOLE')) { - $buttons['edit'] = '' - . html_print_image ("images/edit.png", true, array ("title" => __('Filter list'))) + $buttons['edit']['text'] = '' + . html_print_image ("images/list.png", true, array ("title" => __('Filter list'))) . ''; - $buttons['add'] = '' - . html_print_image ("images/add.png", true, array ("title" => __('Add filter'))) + $buttons['add']['text'] = '' + . html_print_image ("images/add_mc.png", true, array ("title" => __('Add filter'))) . ''; - ui_print_page_header (__('Netflow Filter'), "images/networkmap/so_cisco_new.png", false, "", true, $buttons); + ui_print_page_header (__('Netflow Filter'), "images/gm_netflow.png", false, "", true, $buttons); } else { $nav_bar = array(array('link' => 'index.php?sec=main', 'text' => __('Main')), diff --git a/pandora_console/godmode/netflow/nf_item_list.php b/pandora_console/godmode/netflow/nf_item_list.php index 512695f60c..04388b0498 100644 --- a/pandora_console/godmode/netflow/nf_item_list.php +++ b/pandora_console/godmode/netflow/nf_item_list.php @@ -51,7 +51,7 @@ $buttons['edit_report']['text'] = ' 'index.php?sec=main', 'text' => __('Main')), diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php index a3f6aa4b54..322a79682b 100644 --- a/pandora_console/godmode/reporting/graph_builder.php +++ b/pandora_console/godmode/reporting/graph_builder.php @@ -184,10 +184,10 @@ if ($edit_graph) { html_print_image("images/setup.png", true, array ("title" => __('Setup'))) .''), 'graph_editor' => array('active' => false, 'text' => '' . - html_print_image("images/config.png", true, array ("title" => __('Graph editor'))) .''), + html_print_image("images/builder.png", true, array ("title" => __('Graph editor'))) .''), 'view' => array('active' => false, 'text' => '' . - html_print_image("images/chart_curve.png", true, array ("title" => __('View graph'))) .'') + html_print_image("images/operation.png", true, array ("title" => __('View graph'))) .'') ); $buttons[$active_tab]['active'] = true; @@ -208,13 +208,13 @@ if (isset($name)) $tab = get_parameter("tab", ""); switch ($tab) { case "main": - ui_print_page_header ($head, "", false, "graph_builder", true, $buttons); + ui_print_page_header ($head, "images/chart.png", false, "graph_builder", false, $buttons); break; case "graph_editor": - ui_print_page_header ($head, "", false, "graph_editor", true, $buttons); + ui_print_page_header ($head, "images/chart.png", false, "graph_editor", false, $buttons); break; default: - ui_print_page_header ($head, "", false, "graph_builder", true, $buttons); + ui_print_page_header ($head, "images/chart.png", false, "graph_builder", false, $buttons); break; } diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php index 43589c9162..74d28846f6 100644 --- a/pandora_console/godmode/reporting/graphs.php +++ b/pandora_console/godmode/reporting/graphs.php @@ -36,7 +36,7 @@ if (enterprise_include_once('include/functions_reporting.php') !== ENTERPRISE_NO $buttons['graph_list'] = array('active' => true, 'text' => '' . - html_print_image("images/god6.png", true, array ("title" => __('Graph list'))) .''); + html_print_image("images/list.png", true, array ("title" => __('Graph list'))) .''); if ($enterpriseEnable){ $buttons = reporting_enterprise_add_template_graph_tabs($buttons); @@ -65,7 +65,7 @@ $id = (int) get_parameter ('id'); $multiple_delete = (bool)get_parameter('multiple_delete', 0); // Header -ui_print_page_header (__('Reporting')." » ".__('Custom graphs'), "images/reporting.png", false, "", false, $buttons); +ui_print_page_header (__('Reporting')." » ".__('Custom graphs'), "images/chart.png", false, "", false, $buttons); // Delete module SQL code if ($delete_graph) { @@ -151,7 +151,7 @@ if (! empty ($graphs)) { if (check_acl ($config['id_user'], 0, "RW")) { $table->align[4] = 'center'; $table->head[4] = __('Op.'); - $table->size[4] = '70px'; + $table->size[4] = '90px'; } $table->data = array (); @@ -170,7 +170,7 @@ if (! empty ($graphs)) { $data[4] = ''.html_print_image("images/config.png", true).''; - $data[4] .= '  '; + $data[4] .= ' '; $data[4] .= ''; } echo ''; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index d44cfdda8b..f83c3de7e0 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -233,7 +233,7 @@ switch ($action) { $buttons = array( 'list_reports' => array('active' => false, 'text' => '' . - html_print_image("images/god6.png", true, array ("title" => __('Main'))) .'') + html_print_image("images/op_reporting.png", true, array ("title" => __('Main'))) .'') ); if ($enterpriseEnable) { @@ -266,7 +266,7 @@ switch ($action) { } // Page header for normal console else - ui_print_page_header (__('Reporting').' » '.__('Custom reporting'), "images/reporting.png", false, "",false, $buttons); + ui_print_page_header (__('Reporting').' » '.__('Custom reporting'), "images/op_reporting.png", false, "", false, $buttons); if ($action == 'delete_report') { $result = reports_delete_report ($idReport); @@ -377,7 +377,8 @@ switch ($action) { $next++; $table->head[$next] = '' . __('Op.') . ''; $table->size = array (); - $table->size[$next] = '60px'; + $table->size[$next] = '80px'; + $table->style[$next] = 'text-align:center;'; } @@ -405,8 +406,8 @@ switch ($action) { $data[1] = $report['description']; $data[2] = '' . - html_print_image("images/reporting.png", true) . ''; - $data[3] = '' . html_print_image("images/database_lightning.png", true) . ''; //I chose ajax.php because it's supposed to give XML anyway + html_print_image("images/html.png", true, array('title' => __('HTML view'))) . ''; + $data[3] = '' . html_print_image("images/xml.png", true, array('title' => __('Export to XML'))) . ''; //I chose ajax.php because it's supposed to give XML anyway //Calculate dinamically the number of the column @@ -454,7 +455,7 @@ switch ($action) { $data[$next] .= html_print_input_image ('edit', 'images/config.png', 1, '', true, array ('title' => __('Edit'))); $data[$next] .= ''; - $data[$next] .= '  
'; + $data[$next] .= ''; $data[$next] .= html_print_input_hidden ('id_report', $report['id_report'], true); $data[$next] .= html_print_input_hidden ('action','delete_report', true); $data[$next] .= html_print_input_image ('delete', 'images/cross.png', 1, '', @@ -1346,7 +1347,7 @@ switch ($action) { $buttons = array( 'list_reports' => array('active' => false, 'text' => '' . - html_print_image("images/god6.png", true, array ("title" => __('Main'))) .'') + html_print_image("images/op_reporting.png", true, array ("title" => __('Main'))) .'') ); $buttons = reporting_enterprise_add_main_Tabs($buttons); @@ -1377,7 +1378,7 @@ switch ($action) { } // Page header for normal console else - ui_print_page_header (__('Reporting') . $subsection, "images/reporting_edit.png", false, "", true, $buttons); + ui_print_page_header (__('Reporting') . $subsection, "images/op_reporting.png", false, "", false, $buttons); reporting_enterprise_select_main_tab($action); } @@ -1395,13 +1396,13 @@ if ($enterpriseEnable) { $buttons = array( 'main' => array('active' => false, 'text' => '' . - html_print_image("images/reporting_edit.png", true, array ("title" => __('Main'))) .''), + html_print_image("images/op_reporting.png", true, array ("title" => __('Main'))) .''), 'list_items' => array('active' => false, 'text' => '' . - html_print_image("images/god6.png", true, array ("title" => __('List items'))) .''), + html_print_image("images/list.png", true, array ("title" => __('List items'))) .''), 'item_editor' => array('active' => false, 'text' => '' . - html_print_image("images/config.png", true, array ("title" => __('Item editor'))) .'') + html_print_image("images/pen.png", true, array ("title" => __('Item editor'))) .'') ); if ($enterpriseEnable) { @@ -1410,7 +1411,7 @@ if ($enterpriseEnable) { $buttons['view'] = array('active' => false, 'text' => '' . - html_print_image("images/reporting.png", true, array ("title" => __('View report'))) .''); + html_print_image("images/operation.png", true, array ("title" => __('View report'))) .''); $buttons[$activeTab]['active'] = true; @@ -1436,7 +1437,7 @@ if ($enterpriseEnable and defined('METACONSOLE')) { ui_meta_print_header(__('Reporting'). $textReportName, "", $buttons); } else - ui_print_page_header(__('Reporting') . $textReportName, "images/reporting_edit.png", false, "reporting_" . $activeTab . "_tab", true, $buttons); + ui_print_page_header(__('Reporting') . $textReportName, "images/op_reporting.png", false, "reporting_" . $activeTab . "_tab", false, $buttons); if ($resultOperationDB !== null) { ui_print_result_message ($resultOperationDB, __('Successfull action'), __('Unsuccessfull action')); diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index 715d4d795f..b4e74ddc61 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -402,21 +402,21 @@ else { } $buttons = array( + 'view' => array('active' => false, + 'text' => '' . + html_print_image ("images/operation.png", true, array ("title" => __('View'))) .''), 'data' => array('active' => false, 'text' => '' . - html_print_image ("images/god9.png", true, array ("title" => __('Data'))) .''), + html_print_image ("images/op_reporting.png", true, array ("title" => __('Main data'))) .''), 'list_elements' => array('active' => false, 'text' => '' . - html_print_image ("images/god6.png", true, array ("title" => __('List elements'))) .''), + html_print_image ("images/list.png", true, array ("title" => __('List elements'))) .''), 'wizard' => array('active' => false, 'text' => '' . html_print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .''), 'editor' => array('active' => false, 'text' => '' . - html_print_image ("images/config.png", true, array ("title" => __('Editor'))) .''), - 'view' => array('active' => false, - 'text' => '' . - html_print_image ("images/eye.png", true, array ("title" => __('View'))) .''),); + html_print_image ("images/builder.png", true, array ("title" => __('Builder'))) .'')); if ($action == 'new' || $idVisualConsole === false) { $buttons = array('data' => $buttons['data']); //Show only the data tab @@ -428,7 +428,7 @@ if ($action == 'new' || $idVisualConsole === false) { $buttons[$activeTab]['active'] = true; if (!defined('METACONSOLE')) - ui_print_page_header(__('Visual console') . " » " . $visualConsoleName, "images/reporting_edit.png", false, "visual_console_editor_" . $activeTab . "_tab", true, $buttons); + ui_print_page_header(__('Visual console') . " » " . $visualConsoleName, "images/op_reporting.png", false, "visual_console_editor_" . $activeTab . "_tab", false, $buttons); else { // Print header //ui_meta_print_header(__('Visual console') . " » " . $visualConsoleName, "", $buttons); @@ -453,4 +453,4 @@ switch ($activeTab) { require_once($config['homedir'] . '/godmode/reporting/visual_console_builder.editor.php'); break; } -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index 396125191e..f6c625c8f6 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -29,7 +29,7 @@ if (! check_acl ($config['id_user'], 0, "AW")) { require_once($config['homedir'] . "/include/functions_network_profiles.php"); // Headers -ui_print_page_header (__('Manage recontask'), "", false, "", true); +ui_print_page_header (__('Manage recontask'), "images/gm_servers.png", false, "", true); // -------------------------------- // DELETE A RECON TASKs @@ -289,15 +289,15 @@ if ($result !== false) { } // ACTION - $data[8] = '' . html_print_image("images/eye.png", true) . ' '; - $data[8] .= '' . html_print_image("images/cross.png", true, array("border" => '0')) . ' '; - $data[8] .= '' .html_print_image("images/config.png", true) . ' '; + $data[8] = '' . html_print_image("images/eye.png", true) . ''; + $data[8] .= '' . html_print_image("images/cross.png", true, array("border" => '0')) . ''; + $data[8] .= '' .html_print_image("images/config.png", true) . ''; if($row["disabled"] == 0) { - $data[8] .= '' .html_print_image("images/b_yellow.png", true) . ''; + $data[8] .= '' .html_print_image("images/lightbulb.png", true) . ''; } else { - $data[8] .= '' .html_print_image("images/b_white.png", true) . ''; + $data[8] .= '' .html_print_image("images/lightbulb_off.png", true) . ''; } $table->data[] = $data; } @@ -314,4 +314,4 @@ echo ''; echo ""; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index d1b13ef9fd..020179aad3 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -122,7 +122,7 @@ elseif (isset ($_GET["create"]) or isset($_GET["crt"])) { } // Headers -ui_print_page_header (__('Manage recontask') . " " . ui_print_help_icon ("recontask", true), "", false, "", true); +ui_print_page_header (__('Manage recontask'), "", false, "recontask", true); $table->width='98%'; @@ -314,4 +314,4 @@ function get_explanation_recon_script(id) { ); } /* ]]> */ - \ No newline at end of file + diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 12a8c48802..2f69b00a52 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -30,7 +30,7 @@ if (! check_acl ($config["id_user"], 0, "AW")) { if (isset($_GET["server"])) { $id_server= get_parameter_get ("server"); // Headers - ui_print_page_header (__('Update Server'), "", false, "servers", true); + ui_print_page_header (__('Update Server'), "images/gm_servers.png", false, "servers", true); $sql = sprintf("SELECT name, ip_address, description FROM tserver WHERE id_server = %d",$id_server); $row = db_get_row_sql ($sql); echo ''; @@ -54,7 +54,7 @@ if (isset($_GET["server"])) { } else { // Header - ui_print_page_header (__('Pandora servers'), "", false, "servers", true); + ui_print_page_header (__('Pandora servers'), "images/gm_servers.png", false, "servers", true); // Move SNMP modules back to the enterprise server if (isset($_GET["server_reset_snmp_enterprise"])) { @@ -93,133 +93,7 @@ else { } } - - - $servers = servers_get_info (); - if ($servers === false) { - echo "
".__('There are no servers configured into the database')."
"; - return; - } - - $table->width = '98%'; - $table->size = array (); - - $table->style = array (); - $table->style[0] = 'font-weight: bold'; - - $table->align = array (); - $table->align[1] = 'center'; - $table->align[8] = 'center'; - - $table->head = array (); - $table->head[0] = __('Name'); - $table->head[1] = __('Status'); - $table->head[2] = __('Type'); - $table->head[3] = __('Load') . ui_print_help_tip (__("Modules running on this server / Total modules of this type"), true); - $table->head[4] = __('Modules'); - $table->head[5] = __('Lag') . ui_print_help_tip (__("Modules delayed / Max. Delay (sec)"), true); - $table->head[6] = __('T/Q') . ui_print_help_tip (__("Threads / Queued modules currently"), true); - // This will have a column of data such as "6 hours" - $table->head[7] = __('Updated'); - - //Only Pandora Administrator can delete servers - if (check_acl ($config["id_user"], 0, "PM")) { - $table->head[8] = '' . __('Op.') . ''; - } - - $table->data = array (); - - foreach ($servers as $server) { - $data = array (); - - $data[0] = '' . - $server['name'] . ''; - - if ($server['status'] == 0) { - $data[1] = ui_print_status_image (STATUS_SERVER_DOWN, '', true); - } - else { - $data[1] = ui_print_status_image (STATUS_SERVER_OK, '', true); - } - - // Type - $data[2] = ''.$server["img"].' ('.ucfirst($server["type"]).")"; - if ($server["master"] == 1) - $data[2] .= ui_print_help_tip (__("This is a master server"), true); - - switch ($server['type']) { - case "snmp": - case "event": - $data[3] = 'N/A'; - $data[4] = 'N/A'; - $data[5] = 'N/A'; - break; - case "export": - $data[3] = progress_bar($server["load"], 60, 20, $server["lag_txt"], 0); - $data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"]; - $data[5] = 'N/A'; - break; - default: - $data[3] = progress_bar($server["load"], 60, 20, $server["lag_txt"], 0); - $data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"]; - $data[5] = ''.$server["lag_txt"].''; - break; - } - - $data[6] = $server['threads'].' : '.$server['queued_modules']; - $data[7] = ui_print_timestamp ($server['keepalive'], true); - - //Only Pandora Administrator can delete servers - if (check_acl ($config["id_user"], 0, "PM")) { - - $data[8] = ''; - if ($server['type'] == 'data') { - $data[8] .= ''; - $data[8] .= html_print_image ('images/target.png', true, - array('title' => __('Reset module status and fired alert counts'))); - $data[8] .= '  '; - } else if ($server['type'] == 'enterprise snmp') { - $data[8] .= ''; - $data[8] .= html_print_image ('images/target.png', true, - array('title' => __('Claim back SNMP modules'))); - $data[8] .= '  '; - } - - $data[8] .= ''; - $data[8] .= html_print_image ('images/config.png', true, - array('title' => __('Edit'))); - $data[8] .= ''; - - $data[8] .= '  '; - $data[8] .= html_print_image ('images/cross.png', true, - array('title' => __('Delete'), - 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false")); - $data[8] .= ''; - } - - array_push ($table->data, $data); - } - - html_print_table ($table); - - //Legend - - echo ""; - echo ""; - echo ""; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ""; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo "
" . __('Legend') . "
'.__('Network server').''.__('Master').''.__('Data server').''.__('MD5 check').''.__('SNMP console').''.__('Plugin server').'
'.__('Recon server').''.__('WMI server').''.__('Export server').''.__('Inventory server').''.__('Web server').''.__('Prediction server').'
"; + $tiny = false; + require($config['homedir'] . '/godmode/servers/servers.build_table.php'); } ?> diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index f9feab9543..9c9b2604e7 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -81,9 +81,9 @@ if (($create != "") OR ($view != "")) { } else { if ($create != "") - ui_print_page_header (__('Plugin creation') . ui_print_help_icon("plugin_definition", true), "", false, "", true); + ui_print_page_header (__('Plugin creation'), "images/gm_servers.png", false, "plugin_definition", true); else { - ui_print_page_header (__('Plugin update') . ui_print_help_icon("plugin_definition", true), "", false, "", true); + ui_print_page_header (__('Plugin update'), "images/gm_servers.png", false, "plugin_definition", true); } } @@ -291,7 +291,7 @@ else { $sec = 'advanced'; } else { - ui_print_page_header (__('Plugins registered in Pandora FMS'), "", false, "", true); + ui_print_page_header (__('Plugins registered in Pandora FMS'), "images/gm_servers.png", false, "", true); } // Update plugin @@ -434,7 +434,7 @@ else { echo "".__('Name').""; echo "".__('Type').""; echo "".__('Command').""; - echo "" . '' . __('Op.') . '' . ""; + echo "" . '' . __('Op.') . '' . ""; $color = 0; foreach ($rows as $row) { diff --git a/pandora_console/godmode/servers/recon_script.php b/pandora_console/godmode/servers/recon_script.php index 2c8e56ec30..691655b7b8 100644 --- a/pandora_console/godmode/servers/recon_script.php +++ b/pandora_console/godmode/servers/recon_script.php @@ -68,11 +68,9 @@ if ($create != "") { if (($create != "") OR ($view != "")){ if ($create != "") - ui_print_page_header (__('Recon script creation') . - ui_print_help_icon("reconscript_definition", true), "", false, "", true); + ui_print_page_header (__('Recon script creation'), "images/gm_servers.png", false, "reconscript_definition", true); else { - ui_print_page_header (__('Recon script update') . - ui_print_help_icon("reconscript_definition", true), "", false, "", true); + ui_print_page_header (__('Recon script update'), "images/gm_servers.png", false, "reconscript_definition", true); $id_recon_script = get_parameter ("view",""); } @@ -110,7 +108,7 @@ if (($create != "") OR ($view != "")){ echo '
'; } else { - ui_print_page_header (__('Recon scripts registered in Pandora FMS'), "", false, "", true); + ui_print_page_header (__('Recon scripts registered in Pandora FMS'), "images/gm_servers.png", false, "", true); // Update reconscript if (isset($_GET["update_reconscript"])) { // if modified any parameter diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php new file mode 100644 index 0000000000..d9663e8c46 --- /dev/null +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -0,0 +1,142 @@ +".__('There are no servers configured into the database').""; + return; +} + +$table->width = '98%'; +$table->size = array (); + +$table->style = array (); +$table->style[0] = 'font-weight: bold'; + +$table->align = array (); +$table->align[1] = 'center'; +$table->align[3] = 'center'; +$table->align[4] = 'center'; +$table->align[5] = 'center'; +$table->align[8] = 'center'; + +$table->title = __('Tactical server information'); +$table->titleclass = 'tabletitle'; +$table->titlestyle = 'text-transform:uppercase;'; + +$table->head = array (); +$table->head[0] = __('Name'); +$table->head[1] = __('Status'); +$table->head[2] = __('Type'); +$table->head[3] = __('Load') . ui_print_help_tip (__("Modules running on this server / Total modules of this type"), true); +$table->head[4] = __('Modules'); +$table->head[5] = __('Lag') . ui_print_help_tip (__("Modules delayed / Max. Delay (sec)"), true); +$table->head[6] = __('T/Q') . ui_print_help_tip (__("Threads / Queued modules currently"), true); +// This will have a column of data such as "6 hours" +$table->head[7] = __('Updated'); + +//Only Pandora Administrator can delete servers +if (check_acl ($config["id_user"], 0, "PM")) { + $table->head[8] = '' . __('Op.') . ''; +} + +$table->data = array (); + +foreach ($servers as $server) { + $data = array (); + + $data[0] = '' . + $server['name'] . ''; + + if ($server['status'] == 0) { + $data[1] = ui_print_status_image (STATUS_SERVER_DOWN, '', true); + } + else { + $data[1] = ui_print_status_image (STATUS_SERVER_OK, '', true); + } + + // Type + $data[2] = ''.$server["img"].' ('.ucfirst($server["type"]).")"; + if ($server["master"] == 1) + $data[2] .= ui_print_help_tip (__("This is a master server"), true); + + switch ($server['type']) { + case "snmp": + case "event": + $data[3] = 'N/A'; + $data[4] = 'N/A'; + $data[5] = 'N/A'; + break; + case "export": + $data[3] = progress_bar($server["load"], 60, 20, $server["lag_txt"], 0); + $data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"]; + $data[5] = 'N/A'; + break; + default: + $data[3] = progress_bar($server["load"], 60, 20, $server["lag_txt"], 0); + $data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"]; + $data[5] = ''.$server["lag_txt"].''; + break; + } + + $data[6] = $server['threads'].' : '.$server['queued_modules']; + $data[7] = ui_print_timestamp ($server['keepalive'], true); + + //Only Pandora Administrator can delete servers + if (check_acl ($config["id_user"], 0, "PM")) { + $data[8] = ''; + $data[8] .= html_print_image ('images/config.png', true, + array('title' => __('Edit'))); + $data[8] .= ''; + + $data[8] .= '  '; + $data[8] .= html_print_image ('images/cross.png', true, + array('title' => __('Delete'), + 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false")); + $data[8] .= ''; + } + + if($tiny) { + unset($data[4]); + unset($data[6]); + unset($data[7]); + unset($data[8]); + } + array_push ($table->data, $data); +} + +if($tiny) { + unset($table->head[4]); + unset($table->head[6]); + unset($table->head[7]); + unset($table->head[8]); +} + +html_print_table ($table); +?> diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php index 18f7097369..9faf287d36 100644 --- a/pandora_console/godmode/setup/links.php +++ b/pandora_console/godmode/setup/links.php @@ -24,7 +24,7 @@ if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_us } // Header -ui_print_page_header (__('Link management'), "images/extensions.png", false, "", false, "" ); +ui_print_page_header (__('Link management'), "images/extensions.png", false, "", true, "" ); if (isset($_POST["create"])) { // If create @@ -156,4 +156,4 @@ else { // Main list view for Links editor echo ""; echo ""; } -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/setup/os.php b/pandora_console/godmode/setup/os.php index 6dc49d16e3..04149f5680 100644 --- a/pandora_console/godmode/setup/os.php +++ b/pandora_console/godmode/setup/os.php @@ -127,11 +127,11 @@ $buttons = array( 'list' => array( 'active' => false, 'text' => '' . - html_print_image ("images/god6.png", true, array ("title" => __('List OS'))) .''), + html_print_image ("images/list.png", true, array ("title" => __('List OS'))) .''), 'builder' => array( 'active' => false, 'text' => '' . - html_print_image ("images/config.png", true, array ("title" => __('Builder OS'))) .'')); + html_print_image ("images/builder.png", true, array ("title" => __('Builder OS'))) .'')); $buttons[$tab]['active'] = true; @@ -150,4 +150,4 @@ switch ($tab) { return; break; } -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index 1949fc1718..267fd36a43 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -70,7 +70,7 @@ $buttons = array(); // Draws header $buttons['general'] = array('active' => false, 'text' => '' . - html_print_image("images/god6.png", true, array ("title" => __('General'))) . ''); + html_print_image("images/gm_setup.png", true, array ("title" => __('General'))) . ''); if (enterprise_installed()) { $buttons = setup_enterprise_add_Tabs($buttons); @@ -78,21 +78,21 @@ if (enterprise_installed()) { $buttons['auth'] = array('active' => false, 'text' => '' . - html_print_image("images/books.png", true, array ("title" => __('Authentication'))) . ''); + html_print_image("images/key.png", true, array ("title" => __('Authentication'))) . ''); $buttons['perf'] = array('active' => false, 'text' => '' . - html_print_image("images/up.png", true, array ("title" => __('Performance'))) . ''); + html_print_image("images/performance.png", true, array ("title" => __('Performance'))) . ''); $buttons['vis'] = array('active' => false, 'text' => '' . - html_print_image("images/chart_curve.png", true, array ("title" => __('Visual styles'))) . ''); + html_print_image("images/chart.png", true, array ("title" => __('Visual styles'))) . ''); if (check_acl ($config['id_user'], 0, "AW")) { if ($config['activate_netflow']) { $buttons['net'] = array('active' => false, 'text' => '' . - html_print_image("images/networkmap/so_cisco_new.png", true, array ("title" => __('Netflow'))) . ''); + html_print_image("images/op_netflow.png", true, array ("title" => __('Netflow'))) . ''); } } diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index 1f1d6f035d..975da544af 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -192,17 +192,17 @@ $table->data[23][1] .= "  ". html_print_select($timezone_n, 'timezone' $sounds = get_sounds(); $table->data[24][0] = __('Sound for Alert fired'); $table->data[24][1] = html_print_select($sounds, 'sound_alert', $config['sound_alert'], 'replaySound(\'alert\');', '', '', true); -$table->data[24][1] .= ' ' . html_print_image("images/control_play.png", true, array("id" => "button_sound_alert", "style" => "vertical-align: middle;", "width" => "16")) . ''; +$table->data[24][1] .= ' ' . html_print_image("images/control_play_col.png", true, array("id" => "button_sound_alert", "style" => "vertical-align: middle;", "width" => "16", "title" => __('Play sound'))) . ''; $table->data[24][1] .= '
'; $table->data[25][0] = __('Sound for Monitor critical'); $table->data[25][1] = html_print_select($sounds, 'sound_critical', $config['sound_critical'], 'replaySound(\'critical\');', '', '', true); -$table->data[25][1] .= ' ' . html_print_image("images/control_play.png", true, array("id" => "button_sound_critical", "style" => "vertical-align: middle;", "width" => "16")) . ''; +$table->data[25][1] .= ' ' . html_print_image("images/control_play_col.png", true, array("id" => "button_sound_critical", "style" => "vertical-align: middle;", "width" => "16", "title" => __('Play sound'))) . ''; $table->data[25][1] .= '
'; $table->data[26][0] = __('Sound for Monitor warning'); $table->data[26][1] = html_print_select($sounds, 'sound_warning', $config['sound_warning'], 'replaySound(\'warning\');', '', '', true); -$table->data[26][1] .= ' ' . html_print_image("images/control_play.png", true, array("id" => "button_sound_warning", "style" => "vertical-align: middle;", "width" => "16")) . ''; +$table->data[26][1] .= ' ' . html_print_image("images/control_play_col.png", true, array("id" => "button_sound_warning", "style" => "vertical-align: middle;", "width" => "16", "title" => __('Play sound'))) . ''; $table->data[26][1] .= '
'; $table->data[27][0] = __('License information'); @@ -259,18 +259,18 @@ echo ''; ?> "; diff --git a/pandora_console/include/graphs/functions_gd.php b/pandora_console/include/graphs/functions_gd.php index bd3c32aa0b..b94351f1f6 100755 --- a/pandora_console/include/graphs/functions_gd.php +++ b/pandora_console/include/graphs/functions_gd.php @@ -308,10 +308,14 @@ function gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim $defined_color = ImageColorAllocate($image, $color[0], $color[1], $color[2]); } - $soft_green = ImageColorAllocate($image,176, 255, 84); - $soft_yellow = ImageColorAllocate($image,255, 230, 84); - $soft_red = ImageColorAllocate($image,255, 154, 84); - $other_red = ImageColorAllocate($image,238, 0, 0); + $soft_green = ImageColorAllocate($image,218, 235, 175); + $soft_green_border = ImageColorAllocate($image,158, 201, 103); + $soft_yellow = ImageColorAllocate($image,251, 242, 154); + $soft_yellow_border = ImageColorAllocate($image,231, 215, 82); + $soft_red = ImageColorAllocate($image,255, 196, 157); + $soft_red_border = ImageColorAllocate($image,255, 154, 84); + $other_red = ImageColorAllocate($image,239, 141, 122); + $other_red_border = ImageColorAllocate($image,255, 112, 86); ImageRectangleWithRoundedCorners($image,0,0,$width-1,$height-1,$radius,$back,false); @@ -326,17 +330,24 @@ function gd_progress_bar ($width, $height, $progress, $title, $font, $out_of_lim if (isset($defined_color)) { ImageRectangleWithRoundedCorners($image, $x1, $y1, $x2, $y2, $radius, $defined_color); } - elseif ($rating > 70) + elseif ($rating > 70) { ImageRectangleWithRoundedCorners($image, $x1, $y1, $x2, $y2, $radius, $soft_green); - elseif ($rating > 50) + $bordercolor = $soft_green_border; + } + elseif ($rating > 50) { ImageRectangleWithRoundedCorners($image, $x1, $y1, $x2, $y2, $radius, $soft_yellow); - elseif ($rating > 30) + $bordercolor = $soft_yellow_border; + } + elseif ($rating > 30) { ImageRectangleWithRoundedCorners($image, $x1, $y1, $x2, $y2, $radius, $soft_red); + $bordercolor = $soft_red_border; + } else if($rating > 0) { if($radius != 0) { $x2 = $ratingbar30; } ImageRectangleWithRoundedCorners($image, $x1, $y1, $x2, $y2, $radius, $other_red); + $bordercolor = $other_red_border; } break; case 1: diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js index bc745db54b..670828fe00 100644 --- a/pandora_console/include/javascript/jquery.pandora.js +++ b/pandora_console/include/javascript/jquery.pandora.js @@ -58,7 +58,7 @@ $(document).ready (function () { return false; }); - $("a#show_systemalert_dialog").click (function () { + $("a.show_systemalert_dialog").click (function () { jQuery.get ("ajax.php", {"page": "operation/system_alert"}, function (data, status) { @@ -175,6 +175,12 @@ $(document).ready (function () { function forced_title_callback() { // Forced title code $('.forced_title').hover(function() { + /////////////////////////////////////////// + // Put the layer in the left-top corner to fill it + /////////////////////////////////////////// + $('#forced_title_layer').css('left', 0); + $('#forced_title_layer').css('top', 0); + /////////////////////////////////////////// // Get info of the image /////////////////////////////////////////// @@ -207,7 +213,7 @@ function forced_title_callback() { var layer_padding = 4; // Deduct padding of both sides - var layer_top = img_top - layer_height - (layer_padding * 2); + var layer_top = img_top - layer_height - (layer_padding * 2) - 5; if(layer_top < 0) { layer_top = img_top + img_height + (layer_padding * 2); } @@ -218,6 +224,13 @@ function forced_title_callback() { layer_left = 0; } + var real_layer_width = layer_width + (layer_padding * 2) + 5; + var layer_right = layer_left + real_layer_width; + var screen_width = $(window).width(); + if(screen_width < layer_right) { + layer_left = screen_width - real_layer_width; + } + /////////////////////////////////////////// // Set the layer position and show /////////////////////////////////////////// diff --git a/pandora_console/include/javascript/openlayers.pandora.js b/pandora_console/include/javascript/openlayers.pandora.js index cd3a827d31..558ca810b8 100755 --- a/pandora_console/include/javascript/openlayers.pandora.js +++ b/pandora_console/include/javascript/openlayers.pandora.js @@ -227,11 +227,7 @@ function js_printMap(id_div, initial_zoom, center_latitude, center_longitude, ob * @return none */ function changeShowStatus(newShowStatus) { - - $("#button_status_" + statusShow).attr('style', ''); - statusShow = newShowStatus; - $("#button_status_" + statusShow).attr('style', 'border: 1px black solid;'); - + statusShow = newShowStatus; hideAgentsStatus(); js_refreshParentLines(); } @@ -713,4 +709,4 @@ function searchPointAgentById(id) { } return null; -} \ No newline at end of file +} diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 5797e137c1..b437db749a 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -17,9 +17,9 @@ */ .menu { - border-width: 1px 0 0 1px; + border-width: 1px 0 0 0px; border-style: solid; - border-color: #dadbdc; + border-color: #777; } .menu ul { list-style-type: none; @@ -34,13 +34,40 @@ .menu li.selected { background-color: #d9fb86 !important; } + .menu li a { - background-color: inherit; - color: #000000; + /*background-color: inherit;*/ + color: #FFFFFF; + /*font-weight: bold;*/ display:block; /* This makes it so that the whole li is clickable */ text-decoration:none; - padding: 6px; - margin-left: 23px; + padding: 9px; + margin-left: 28px; +} + +.submenu_text{ + background-repeat: no-repeat !important; + height: 100%; + padding: 8px 0px 8px 17px; + margin-left: 10px; +} + +.submenu_text_middle{ + background-image: url(../../images/submenu_tree_middle.png) !important; +} + +.submenu_text_last{ + background-image: url(../../images/submenu_tree_last.png) !important; +} + +.submenu2_text_middle{ + background-image: url(../../images/submenu2_tree_middle.png) !important; + padding-left: 25px; +} + +.submenu2_text_last{ + background-image: url(../../images/submenu2_tree_last.png) !important; + padding-left: 25px; } .menu li.subselected a{ @@ -49,37 +76,39 @@ .menu a:hover { text-decoration:none; - color: #D54E21; + border:1px; } .submenu { font-family: Georgia,"Times New Roman","Bitstream Charter",Times,serif; margin: 0px 10px 0px 0; - width: 164px; + width: 173px; } .submenu li a { - background-color: #fff; + background-color: #222; margin-left: 0px; - padding-left: 29px; + /*padding-left: 29px;*/ display:block; - border-width: 1px 1px 0 1px; + border-width: 0px 0px 0px 0px; border-style: solid; - border-color: #dadbdc; + border-color: #666; + padding: 0px; } .submenu2 li a { -background-color: #fff; + background-color: #111; margin-left: 0px; - padding-left: 40px; + padding-left: 0px; display:block; - border-width: 1px 1px 0 1px; - border-style: solid; - border-color: #dadbdc; +} + +.submenu2 li a:hover { + background-color: #111 !important; } .menu li img.toggle { visibility: hidden; float:right; - margin: -20px 2px 0 0; /* Positions it back where it should be */ + margin: -20px 0px 0 0; /* Positions it back where it should be */ border-left: 1px; } .menu li.has_submenu.selected > img.toggle, @@ -92,14 +121,18 @@ background-color: #fff; background-color: #E4E4E4 !important; } -.submenu2_not_selected a { - font-weight: normal; +.submenu_not_selected a, .submenu2_not_selected a { + font-weight: normal !important; } .menu li.submenu_selected a { font-weight: bold; } +.submenu_selected { + margin-bottom: 0px !important; +} + .menu .menu_icon, .menu li.links { background-color: #daedae; background-position: 4px 4px; @@ -112,57 +145,35 @@ background-color: #fff; } .menu { - width: 164px; + width: 173px; } /* Icons specified here */ #icon_oper-networkconsole { - background-image: url(../../images/plotchart.png); + background-image: url(../../images/op_network.png); } -#icon_oper-dashboard { - background-image: url(../../images/house.png); -} -#icon_oper-metaconsole { - background-image: url(../../images/application_double.png); -} - #icon_oper-agents { - background-image: url(../../images/bricks.png); -} -#icon_oper-services { - background-image: url(../../images/box.png); -} -#icon_oper-servers { - background-image: url(../../images/server.png); -} -#icon_oper-incidents { - background-image: url(../../images/book_edit.png); + background-image: url(../../images/op_monitoring.png); } #icon_oper-events { - background-image: url(../../images/lightning_go.png); + background-image: url(../../images/op_events.png); } /* users */ #icon_oper-users { - background-image: url(../../images/group.png); + background-image: url(../../images/op_workspace.png); } /* trap console */ #icon_oper-snmpc, #icon_god-snmpc { - background-image: url(../../images/computer_error.png); -} -#icon_oper-messages { - background-image: url(../../images/email.png); + background-image: url(../../images/op_snmp.png); } #icon_oper-reporting { - background-image: url(../../images/reporting.png); -} -#icon_oper-visualc { - background-image: url(../../images/monitor.png); + background-image: url(../../images/op_reporting.png); } #icon_oper-gismaps { - background-image: url(../../images/server_web.png); + background-image: url(../../images/op_gis.png); } #icon_oper-netflow { - background-image: url(../../images/networkmap/so_cisco_new.png); + background-image: url(../../images/op_netflow.png); } #icon_oper-extensions, #icon_god-extensions { background-image: url(../../images/extensions.png); @@ -170,52 +181,46 @@ background-color: #fff; /* Godmode images */ #icon_god-gismaps { - background-image: url(../../images/server_web.png); + background-image: url(../../images/gm_gis.png); } #icon_god-agents { - background-image: url(../../images/god1.png); + background-image: url(../../images/gm_monitoring.png); } #icon_god-massive { - background-image: url(../../images/sitemap_color.png); + background-image: url(../../images/gm_massive_operations.png); } #icon_god-services { background-image: url(../../images/box.png); } #icon_god-modules { - background-image: url(../../images/brick.png); + background-image: url(../../images/gm_modules.png); } #icon_god-alerts { - background-image: url(../../images/god2.png); + background-image: url(../../images/gm_alerts.png); } #icon_god-dbmaint { - background-image: url(../../images/god8.png); + background-image: url(../../images/gm_db.png); } #icon_god-users { - background-image: url(../../images/god3.png); + background-image: url(../../images/gm_users.png); } #icon_god-reporting { background-image: url(../../images/reporting_edit.png); } -#icon_god-map { - background-image: url(../../images/god9.png); -} -#icon_god-profiles { - background-image: url(../../images/god4.png); -} #icon_god-servers { - background-image: url(../../images/god5.png); + background-image: url(../../images/gm_servers.png); } #icon_god-audit { - background-image: url(../../images/god6.png); + background-image: url(../../images/gm_log.png); } #icon_god-netflow { - background-image: url(../../images/networkmap/so_cisco_new.png); + background-image: url(../../images/gm_netflow.png); } #icon_god-setup { - background-image: url(../../images/god7.png); + background-image: url(../../images/gm_setup.png); } #icon_god-policies { - background-image: url(../../images/policies.png); + background-image: url(../../images/gm_policies.png); } #icon_oper-inventory { background-image: url(../../images/page_white_text.png); @@ -224,13 +229,13 @@ background-color: #fff; background-image: url(../../images/tag_red.png); } #icon_god-events { - background-image: url(../../images/lightning_go.png); + background-image: url(../../images/gm_events.png); } #menu_container { z-index: 3; position: absolute; - left: -130px; + left: -140px; background-color: #AAA; height: 100%; } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 1783168c97..683c1323c6 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -39,12 +39,6 @@ div#page { background-image: none; } -div#main { - background: #fafafa; - background-image: none; -} - - #login_body { /* Set rules to fill background */ min-height: 100%; @@ -95,7 +89,7 @@ input { } input.button { font-family: Arial,Sans-serif; - border: 1px solid #ccc; + border: 4px solid #ccc; background: #fff; padding: 2px 3px; margin: 10px 15px; @@ -236,17 +230,19 @@ div#container { #border-right: solid 2px #000; #border-top: solid 2px #000; #margin-top: 5px; - background: #fff; + background: #fafafa; } div#page { width: 960px; clear: both; border-bottom: solid 5px #567953; - border-top: solid 5px #567953; + /*border-top: solid 5px #567953;*/ } div#main { + background: #fafafa; + background-image: none; width: 785px; - min-height: 500px; + min-height: 700px; float: right; padding-left: 0px; padding-top: 0px; @@ -275,7 +271,8 @@ div#head { font-size: 8pt; width: 960px; height: 62px; - padding-top: 1px; + padding-top: 0px; + margin-bottom: 8px; background-color: #274C00; } @@ -348,17 +345,47 @@ input.login { input.sub { font-weight: bold; + /* border-bottom-color: #708090; - border-right-color: #708090; + border-right-color: #708090;*/ + border-bottom-color: #BBB; + border-right-color: #BBB; + border-left-color: #BBB; /* These borders haven't made it yet in a valid standard First one is for Mozilla, second for Webkit (Safari, Konqueror), third one for IE7+ and valid CSS3. - Percentage values are invalid here but .4em seems big enough */ + Percentage values are invalid here but .6em seems big enough */ -moz-border-radius: .4em; -webkit-border-radius: .4em; border-radius: .4em; + + /* + -moz-box-shadow: inset 1px 1px 1px #CCC !important; + -webkit-box-shadow: inset 1px 1px 1px #CCC !important; + box-shadow: inset 1px 1px 1px #CCC !important;*/ + + -moz-box-shadow: inset -1px -1px 1px #CCC !important; + -webkit-box-shadow: inset -1px -1px 1px #CCC !important; + box-shadow: inset -1px -1px 1px #CCC !important; + font-size: 8pt; - background-color: #e5e5e5; - color: #000; + background-color: #e5e5e5 !important; + color: #7f7f7f; + padding: 3px 3px 3px 9px; + + /* navegadores sin soporte */ + background: white !important; + /* Safari 4-5, Chrome 1-9 + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(white), to(#c4c4c4)) !important;*/ + /* Safari 5.1+, Chrome 10+ + background: -webkit-linear-gradient(top, white, #c4c4c4) !important;*/ + /* Firefox 3.6+ + background: -moz-linear-gradient(top, white, #c4c4c4) !important;*/ + /* Opera 11.10+ + background: -o-linear-background(top, white, #c4c4c4) !important;*/ + /* IE 10 + background: -ms-linear-background(top, white, #c4c4c4) !important;*/ + /* estándar + background: linear-background(top, white, #c4c4c4) !important;*/ } input.sub[disabled] { @@ -369,142 +396,258 @@ input.next, input.upd, input.ok, input.wand, input.delete, input.cog, input.target, input.search, input.copy, input.add, input.graph, input.percentile, input.binary, input.camera, input.config, input.cancel, input.default { - padding-right: 21px; + padding-right: 30px; + } input.next { - background: #e5e5e5 url(../../images/go.png) no-repeat 98% 2px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_go.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_go.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_go.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } input.upd { - background: #e5e5e5 url(../../images/upd.png) no-repeat 98% 3px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_update.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_update.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_update.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_update.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_update.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_update.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_update.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } + input.wand { - background: #e5e5e5 url(../../images/wand.png) no-repeat 98% 3px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_wand.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_wand.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_wand.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_wand.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_wand.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_wand.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_wand.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } input.search { - background: #e5e5e5 url(../../images/zoom.png) no-repeat 98% 3px; -} -input.copy { - background: #e5e5e5 url(../../images/copy.png) no-repeat 98% 3px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_zoom.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_zoom.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_zoom.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_zoom.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_zoom.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_zoom.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_zoom.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } input.ok { - background: #e5e5e5 url(../../images/ok.png) no-repeat 98% 3px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_tick.png) no-repeat 95% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_tick.png) no-repeat 95% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_tick.png) no-repeat 95% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_tick.png) no-repeat 95% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_tick.png) no-repeat 95% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_tick.png) no-repeat 95% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_tick.png) no-repeat 95% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } input.add { - background: #e5e5e5 url(../../images/add.png) no-repeat 98% 3px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_add.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_add.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_add.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_add.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_add.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_add.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_add.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } input.cancel { - background: #e5e5e5 url(../../images/cancel.png) no-repeat 98% 3px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_cross.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_cross.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_cross.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_cross.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_cross.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_cross.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_cross.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } input.delete { - background: #e5e5e5 url(../../images/cross.png) no-repeat 98% 3px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_delete.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_delete.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_delete.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_delete.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_delete.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_delete.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_delete.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } input.cog { - background: #e5e5e5 url(../../images/cog.png) no-repeat 98% 3px; -} -input.target { - background: #e5e5e5 url(../../images/target.png) no-repeat 98% 3px; -} -input.graph { - background: #e5e5e5 url(../../images/chart_curve.png) no-repeat 98% 3px; -} -input.percentile { - background: #e5e5e5 url(../../images/chart_bar.png) no-repeat 98% 3px; -} -input.binary { - background: #e5e5e5 url(../../images/binary.png) no-repeat 98% 3px; -} -input.camera { - background: #e5e5e5 url(../../images/camera.png) no-repeat 98% 3px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_cog.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_cog.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_cog.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_cog.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_cog.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_cog.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_cog.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } input.config { - background: #e5e5e5 url(../../images/config.png) no-repeat 98% 3px; + /* Browser without multibackground support */ + background: #efefef url(../../images/input_config.png) no-repeat 90% 3px !important; + /* Safari 4-5, Chrome 1-9 */ + background: url(../../images/input_config.png) no-repeat 90% 3px, -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#dfdfdf)) !important; + /* Safari 5.1+, Chrome 10+ */ + background: url(../../images/input_config.png) no-repeat 90% 3px, -webkit-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Firefox 3.6+ */ + background: url(../../images/input_config.png) no-repeat 90% 3px, -moz-linear-gradient(top, #ffffff, #dfdfdf) !important; + /* Opera 11.10+ */ + background: url(../../images/input_config.png) no-repeat 90% 3px, -o-linear-background(top, #ffffff, #dfdfdf) !important; + /* IE 10 */ + background: url(../../images/input_config.png) no-repeat 90% 3px, -ms-linear-background(top, #ffffff, #dfdfdf) !important; + /* estándar */ + background: url(../../images/input_config.png) no-repeat 90% 3px, linear-background(top, #ffffff, #dfdfdf) !important; } -input.default { - background: #e5e5e5 url(../../images/default_list.png) no-repeat 98% 3px; +#toolbox #auto_save { + padding-top: 5px; } - #toolbox { - margin-top: 10px; + margin-top: 13px; } input.visual_editor_button_toolbox { padding-right: 25px; + padding-top: 13px; } input.delete_min { - background: #e5e5e5 url(../../images/cross.png) no-repeat center; + background: #fefefe url(../../images/cross.png) no-repeat center !important; } input.delete_min[disabled] { - background: #e5e5e5 url(../../images/cross.disabled.png) no-repeat center; + background: #fefefe url(../../images/cross.disabled.png) no-repeat center !important; } input.graph_min { - background: #e5e5e5 url(../../images/chart_curve.png) no-repeat center; + background: #fefefe url(../../images/chart_curve.png) no-repeat center !important; } input.graph_min[disabled] { - background: #e5e5e5 url(../../images/chart_curve.disabled.png) no-repeat center; + background: #fefefe url(../../images/chart_curve.disabled.png) no-repeat center !important; } input.percentile_min { - background: #e5e5e5 url(../../images/chart_bar.png) no-repeat center; + background: #fefefe url(../../images/chart_bar.png) no-repeat center !important; } input.percentile_min[disabled] { - background: #e5e5e5 url(../../images/chart_bar.disabled.png) no-repeat center; + background: #fefefe url(../../images/chart_bar.disabled.png) no-repeat center !important; } input.percentile_item_min { - background: #e5e5e5 url(../../images/percentile_item.png) no-repeat center; + background: #fefefe url(../../images/percentile_item.png) no-repeat center !important; } input.percentile_item_min[disabled] { - background: #e5e5e5 url(../../images/percentile_item.disabled.png) no-repeat center; + background: #fefefe url(../../images/percentile_item.disabled.png) no-repeat center !important; } input.binary_min { - background: #e5e5e5 url(../../images/binary.png) no-repeat center; + background: #fefefe url(../../images/binary.png) no-repeat center !important; } input.binary_min[disabled] { - background: #e5e5e5 url(../../images/binary.disabled.png) no-repeat center; + background: #fefefe url(../../images/binary.disabled.png) no-repeat center !important; } input.camera_min { - background: #e5e5e5 url(../../images/camera.png) no-repeat center; + background: #fefefe url(../../images/camera.png) no-repeat center !important; } input.camera_min[disabled] { - background: #e5e5e5 url(../../images/camera.disabled.png) no-repeat center; + background: #fefefe url(../../images/camera.disabled.png) no-repeat center !important; } input.config_min { - background: #e5e5e5 url(../../images/config.png) no-repeat center; + background: #fefefe url(../../images/config.png) no-repeat center !important; } input.config_min[disabled] { - background: #e5e5e5 url(../../images/config.disabled.png) no-repeat center; + background: #fefefe url(../../images/config.disabled.png) no-repeat center !important; } input.label_min { - background: #e5e5e5 url(../../images/tag_red.png) no-repeat center; + background: #fefefe url(../../images/tag_red.png) no-repeat center !important; } input.label_min[disabled] { - background: #e5e5e5 url(../../images/tag_red.disabled.png) no-repeat center; + background: #fefefe url(../../images/tag_red.disabled.png) no-repeat center !important; } input.icon_min { - background: #e5e5e5 url(../../images/photo.png) no-repeat center; + background: #fefefe url(../../images/photo.png) no-repeat center !important; } input.icon_min[disabled] { - background: #e5e5e5 url(../../images/photo.disabled.png) no-repeat center; + background: #fefefe url(../../images/photo.disabled.png) no-repeat center !important; } input.grid_min { - background: #e5e5e5 url(../../images/grid.png) no-repeat center; + background: #fefefe url(../../images/grid.png) no-repeat center !important; } input.grid_min[disabled] { - background: #e5e5e5 url(../../images/grid.disabled.png) no-repeat center; + background: #fefefe url(../../images/grid.disabled.png) no-repeat center !important; } input.save_min { - background: #e5e5e5 url(../../images/file.png) no-repeat center; + background: #fefefe url(../../images/file.png) no-repeat center !important; } input.save_min[disabled] { - background: #e5e5e5 url(../../images/file.disabled.png) no-repeat center; + background: #fefefe url(../../images/file.disabled.png) no-repeat center !important; } input.service_min { - background: #e5e5e5 url(../../images/sitemap_color.png) no-repeat center; + background: #fefefe url(../../images/box.png) no-repeat center !important; } input.service_min[disabled] { - background: #e5e5e5 url(../../images/sitemap.png) no-repeat center; + background: #fefefe url(../../images/box.disabled.png) no-repeat center !important; } - +div#cont { + position: fixed; +} table, img { @@ -533,6 +676,22 @@ tr.datos2b:hover, tr.datos2_id:hover, tr.datos2f9:hover { background-color: #efefef; } +/* Checkbox styles */ +td input[type=checkbox] +{ + /* Double-sized Checkboxes */ + -ms-transform: scale(1.3); /* IE */ + -moz-transform: scale(1.3); /* FF */ + -o-transform: scale(1.3); /* Opera */ + -webkit-transform: scale(1.3); /* Safari and Chrome */ + padding: 10px; + margin-top: 7px; + margin-left: 15px; + display: table-cell; + vertical-align: top; + +} + td.datos3 { background-color: #d4ddc6; } @@ -567,17 +726,17 @@ tr.disabled_row_user * { } .bg { /* op menu */ - background-color: #567953; + background: #6db431; } .bg2 { /* main page */ background-color: #0A160C; } .bg3 { /* godmode */ - background-color: #0A160C; + background: #666666; } .bg4 { /* links */ - background-color: #6BBE2F; + background-color: #989898; } .bg, .bg2, .bg3, .bg4 { position: relative; @@ -601,12 +760,20 @@ tr.disabled_row_user * { font-style: italic; } .tit { - padding: 3px 1px; + padding: 6px 0px; + height: 14px; +} +.titop { + -moz-border-top-right-radius: 6px; + -webkit-border-top-right-radius: 6px; + border-top-right-radius: 6px; + heigth: 100px; } .tit, .titb { font-weight: bold; color: #fff; text-align: center; + width: 173px; } .suc, .error, .help { padding: 4px 1px 6px 30px; @@ -686,7 +853,7 @@ ul.mn { list-style: none; padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px; - line-height: 24px; + line-height: 15px; } .gr { font-size: 10pt; @@ -708,10 +875,10 @@ div.title_line { } #menu_tab_frame { - background:#0A160C; + background:#FAFAFA; } #menu_tab_frame_view { - background:#567953; + background:#FAFAFA; } #menu_tab_frame, #menu_tab_frame_view { @@ -723,27 +890,70 @@ div.title_line { padding-right:28px; width:100%; } -#menu_tab_frame_view { - background: #567953; + +#menu_tab { + margin: 0px 0px 0px 0px !important; } + #menu_tab .mn, #menu_tab ul, #menu_tab .mn ul { padding: 0px; list-style: none; - margin: 0px; + margin: 0px 0px 0px 0px; } #menu_tab .mn li { float: right; position: relative; + margin: 0px 0px 0px 0px; } #menu_tab li a, #menu_tab a { - background: #d4ddc6; - padding: 3px 5px; - color: #666; - border-left: 2px solid #567953; + padding: 2px 0px; font-weight: bold; line-height: 18px; + margin-left: 3px; + margin-right: 0px; + + -moz-border-top-right-radius: 5px; + -webkit-border-top-right-radius: 5px; + border-top-right-radius: 5px; + + -moz-border-top-left-radius: 5px; + -webkit-border-top-left-radius: 5px; + border-top-left-radius: 5px; } +#menu_tab li>form { + padding-left: 7px; + padding-top: 4px; +} + +#menu_tab li.tab_operation, #menu_tab li.tab_godmode { + padding-left: 4px; +} + +#menu_tab li.tab_godmode a, #menu_tab a.tab_godmode { + background: #ababab url('../../images/tab_grey_bg.png'); + padding-left: 3px; + padding-right: 3px; +} + +#menu_tab li.tab_godmode.nomn_high a, #menu_tab a.tab_godmode.nomn_high, +#menu_tab li.tab_godmode a:hover, #menu_tab a.tab_godmode:hover { + background: #555555; +} + + +#menu_tab li.tab_operation a, #menu_tab a.tab_operation { + background: #6ba532 url('../../images/tab_green_bg.png'); + padding-left: 3px; + padding-right: 3px; +} + +#menu_tab li.tab_operation.nomn_high a, #menu_tab a.tab_operation.nomn_high, +#menu_tab li.tab_operation a:hover, #menu_tab a.tab_operation:hover { + background: #00AA00; +} + + #menu_tab li.separator_view { padding: 4px; } @@ -752,9 +962,8 @@ div.title_line { padding: 4px; } - #menu_tab li.nomn_high a { - background: #799E48; + /*background: #6db431;*/ color: #fff; } #menu_tab .mn li a { @@ -762,31 +971,38 @@ div.title_line { text-decoration: none; } #menu_tab li.nomn:hover a, #menu_tab li:hover ul a:hover { - background: #799E48; + /*background: #6db431;*/ color: #fff; } #menu_tab li:hover a { - background: #b2b08a url("../../images/arrow.png") no-repeat right 3px; + /*background: #b2b08a url("../../images/arrow.png") no-repeat right 3px;*/ } #menu_tab li:hover ul a, #menu_tab .mn ul { background: #db6351; border-top: none; } /* TAB TITLE */ +#menu_tab_left { + margin-left: 0px !important; +} + #menu_tab_left .mn, #menu_tab_left ul, #menu_tab_left .mn ul { + background-color: #000; color: #fff; font-weight: bold; padding: 0px 0px 0px 0px; list-style: none; - margin: 0px 0px 0px 2px; + margin: 0px 0px 0px 0px; } #menu_tab_left .mn li { float: left; position: relative; + height: 26px; + max-height: 26px; } #menu_tab_left li a, #menu_tab_left li span { /* text-transform: uppercase; */ - padding: 2px 5px 2px 5px; + padding: 3px 5px 2px 0px; color: #fff; font-weight: bold; line-height: 18px; @@ -796,12 +1012,49 @@ div.title_line { text-decoration: none; } #menu_tab_left li.view a { - background: #6a4; padding: 2px 10px 2px 10px; color: #fff; font-weight: bold; line-height: 18px; + display: none; } + +#menu_tab_left ul.mn li.view { + background: #6db431 url('../../images/tab_green_bg.png'); + width: 470px; + min-width: 300px; + padding: 2px 5px 0px; + + -moz-border-top-right-radius: 5px; + -webkit-border-top-right-radius: 5px; + border-top-right-radius: 5px; + + -moz-border-top-left-radius: 5px; + -webkit-border-top-left-radius: 5px; + border-top-left-radius: 5px; + margin-left:0px; +} + +#menu_tab_left ul.mn li.nomn { + background: #ababab url('../../images/tab_grey_bg.png'); + width: 470px; + min-width: 300px; + padding: 1px 5px; + + -moz-border-top-right-radius: 5px; + -webkit-border-top-right-radius: 5px; + border-top-right-radius: 5px; + + -moz-border-top-left-radius: 5px; + -webkit-border-top-left-radius: 5px; + border-top-left-radius: 5px; + margin-left: 0px; +} + +#menu_tab_frame *, #menu_tab_frame_view *{ + margin: 0px 0px 0px 0px !important; +} + span.users { background: url(../../images/group.png) no-repeat; } @@ -891,9 +1144,36 @@ span.rmess, span.nrmess { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; + padding: 8px 8px 8px 8px; } -.databox { - background-color: #f4f5f4; +table.databox { + background-color: #f9faf9; + border-spacing: 2px; + -moz-box-shadow: 1px 1px 1px #DDD !important; + -webkit-box-shadow: 1px 1px 1px #DDD !important; + box-shadow: 1px 1px 1px #DDD !important; +} + +.databox td, .databox th { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + border: 0px solid #fff; +} + +.tabletitle { + background: url(../../images/header_blackout.png) no-repeat; +} + +.tactical_set legend{ + text-align:left; + color: #666; +} + +.tactical_set{ + background: #f3f4f3; + border: 0px; + margin-top: -4px; } /* For use in Netflow */ @@ -1067,8 +1347,7 @@ div#main_pure { text-align: center; font-weight: bold; padding: 8px; - margin-left: -1%; - width: 101%; + margin: 0px 0px 0px 0px !important; z-index: -1; } @@ -1377,12 +1656,18 @@ div.warn { .menu li, .menu li.selected, .menu li.not_selected { display: block; - min-height: 20px; - border: 0px; - margin-bottom: 1px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; + min-height: 33px; + border-bottom: 1px solid #555; + vertical-align: middle; +} + +.submenu_not_selected { + font-weight: normal !important; +} + +/* Submenus havent borders */ +.submenu_not_selected, .submenu_selected, .submenu2 { + border: 0px !important; } /* Pandora width style theme */ @@ -1396,20 +1681,25 @@ div#page { div#main { width: auto; float: none; + padding-right: 0px; padding-left: 0px; padding-top: 0px; padding-bottom: 20px; /*CLASSIC STYLE*/ - margin-left: 175px; + margin-left: 182px; /*AUTOHIDDEN MENU*/ /*margin-left: 40px;*/ margin-right: 20px; + background: #f1f1f1; + min-width: 720px; } div#head { width: auto; height: auto; background-color: #000; - background-image: url(../../images/header_f2.jpg); + background-image: url(../../images/header_blackout.png); + height: 78px; + min-width: 882px; } div#foot { @@ -1421,10 +1711,17 @@ ol.steps { div#steps_clean { display:none; } + +#main>div, #main>table, #main>fieldset, #main>form { + margin-left: 8px; + margin-right: 8px; +} + #menu_tab_frame, #menu_tab_frame_view { width: 100%; - padding-right: 28px; - margin-left: -8px; + padding-right: 0px; + margin-left: 0px !important; + height: 27px; } div#events_list { float: left; @@ -1453,6 +1750,11 @@ div#logo_text3 { .pagination { margin-top: 4px; } +.pagination * { + margin-left: 0px !important; + margin-right: 0px !important; + vertical-align: middle; +} /*CALENDAR TOOLTIP STYLE*/ @@ -1592,6 +1894,12 @@ div.cellBig { /* Standard styles for status colos (groups, events, backgrounds...) */ +.opacity_cell { + filter:alpha(opacity=80); + -moz-opacity: 0.8; + opacity: 0.8; + -khtml-opacity: 0.8; +} tr.group_view_crit, .group_view_crit { background-color: #FA3030; @@ -1678,19 +1986,48 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel .menu li.selected { background-color: #B1B1B1 !important; + font-weight: bold; } .menu li { background-color: #fff !important; } -.submenu li a{ - background-color: #E4E4E4 !important; +.submenu li, submenu_selected { + min-height: 25px !important; + /*height: 25px !important;*/ + padding-bottom: 0px; } -.menu li a:hover, -.submenu li a:hover { - color: #000; +ul.operation li a:hover { + font-weight: bold; +} + +ul.operation ul.submenu li a:hover { + background: #222 url('../../images/menu_op_mark.png') repeat-y right; + font-weight: bold; +} + +ul.operation ul.submenu li.selected>a { + background: #222 url('../../images/menu_op_mark.png') repeat-y right; + +} + +ul.godmode li a:hover { + font-weight: bold; +} + +ul.godmode ul.submenu li a:hover { + background: #222 url('../../images/menu_gm_mark.png') repeat-y right; + font-weight: bold; +} + +ul.godmode ul.submenu li.selected>a { + background: #222 url('../../images/menu_gm_mark.png') repeat-y right; +} + +li.links a:hover { + font-weight: bold; } .is_submenu2 li { @@ -1702,7 +2039,7 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel } .menu li.submenu_selected a { - background-color: #C5C5C5 !important; + font-weight: bold; } .operation.ul, ul.operation .operation ul { @@ -1710,12 +2047,12 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel } .menu ul { - background-color: #DEDEDE !important; + background-color: #555 !important; } .menu li, .menu li.selected, .menu .li.not_selected { border-radius: 0px 0px 0px 0px; - background-color: #EBEBEB !important; + background-color: #373737 !important; } #menu_tab li.separator { @@ -1725,6 +2062,9 @@ td.datos_greyf9, td.datos_bluef9, td.datos_greenf9, td.datos_redf9, td.datos_yel input#text-id_parent.ac_input, input, textarea, select { background-color: #ffffff !important; border: 1px solid #cbcbcb; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } span#plugin_description { @@ -1751,7 +2091,7 @@ span#plugin_description { /*SIDEBAR*/ .menu_sidebar { color:#000; - background:#cccacb url('../../images/login_background.jpg') right center no-repeat; + background:#cccacb url('../../images/login_background.png') right center no-repeat; margin-left: 10px; padding-left: 0px; @@ -1797,6 +2137,53 @@ span#plugin_description { border-bottom-right-radius: 10px; } +/*Groupsview*/ + +.groupsview { + border-spacing: 0px 4px; +} + +.groupsview th { + font-size: 12px; + padding: 5px; +} + +.groupsview td.first, .groupsview th.first { + -moz-border-top-left-radius: 10px; + -webkit-border-top-left-radius: 10px; + border-top-left-radius: 10px; + + -moz-border-bottom-left-radius: 10px; + -webkit-border-bottom-left-radius: 10px; + border-bottom-left-radius: 10px; +} + +.groupsview td.last, .groupsview th.last { + -moz-border-top-right-radius: 10px; + -webkit-border-top-right-radius: 10px; + border-top-right-radius: 10px; + + -moz-border-bottom-right-radius: 10px; + -webkit-border-bottom-right-radius: 10px; + border-bottom-right-radius: 10px; +} + +a.tip { + display: inline !important; + cursor: help; +} + +input.search_input { + background: white url('../../images/input_zoom.png') no-repeat right; + padding: 0px; + padding-left:5px; + margin: 0; + width: 100%; + height: 19px; + margin-bottom: 5px; + margin-left: 2px; +} + /* Images forced title */ DIV.forced_title_layer { @@ -1811,19 +2198,7 @@ DIV.forced_title_layer { font-weight: bold; font-size: small; - -moz-border-top-right-radius: 5px; - -webkit-border-top-right-radius: 5px; - border-top-right-radius: 5px; - - -moz-border-bottom-right-radius: 5px; - -webkit-border-bottom-right-radius: 5px; - border-bottom-right-radius: 5px; - - -moz-border-top-left-radius: 5px; - -webkit-border-top-left-radius: 5px; - border-top-left-radius: 5px; - - -moz-border-bottom-left-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - border-bottom-left-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; } diff --git a/pandora_console/include/styles/tip.css b/pandora_console/include/styles/tip.css deleted file mode 100644 index d6444e6d98..0000000000 --- a/pandora_console/include/styles/tip.css +++ /dev/null @@ -1,53 +0,0 @@ -a.tip { - cursor: help; - padding: 5px 2px 5px 2px; -} -a.help { - cursor: help; - background: url(../../images/help2.png) no-repeat; - padding: 2px 2px 2px 12px; - left: 5px; - text-transform: capitalize; -} -a.info { - padding: 25px 0px 0px 0px; -} -a.tip, a.help , a.info { - position: relative; - text-decoration: none; -} -a.tip:hover { - text-decoration: none; - background-color: #efefef; -} -a.info:hover, a.help:hover { - text-decoration: none; -} -a.tip span, a.info span, a.help span { - display: none; -} -a.tip:hover span, a.info:hover span, a.help:hover span { - display: block; - text-decoration: none; - position: absolute; - z-index: 99; - top: 20px; - left: 6px; - min-width: 150px; - border: 1px solid #708090; - background-color: #d4ddc6; - color: #000; - padding: 2px; -} - -a.info:hover span { - top: 45px; - left: 20px; - width: 120px; - background-color: #ffffff; - border: 1px solid #aaaaaa; -} -a.help:hover span { - top: 15px; - width: 80px; -} diff --git a/pandora_console/index.php b/pandora_console/index.php index 59f29848a1..a4a2f83328 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -153,7 +153,7 @@ $search = get_parameter_get("head_search_keywords"); if (strlen($search) > 0) { $config['search_keywords'] = trim(get_parameter('keywords')); // If not search category providad, we'll use an agent search - $config['search_category'] = get_parameter('search_category', 'agents'); + $config['search_category'] = get_parameter('search_category', 'all'); if (($config['search_keywords'] != 'Enter keywords to search') && (strlen($config['search_keywords']) > 0)) $searchPage = true; } @@ -531,6 +531,7 @@ else { } if ($config["pure"] == 0) { + echo '
'; echo ''; // main echo '
 
'; echo ''; // page (id = page) diff --git a/pandora_console/operation/agentes/agent_fields.php b/pandora_console/operation/agentes/agent_fields.php index 66004898ff..5bf466d2cb 100755 --- a/pandora_console/operation/agentes/agent_fields.php +++ b/pandora_console/operation/agentes/agent_fields.php @@ -35,7 +35,7 @@ if (! check_acl ($config["id_user"], $agent["id_grupo"], "AR")) { require_once ("general/noaccess.php"); return; } -ui_print_page_header (__('Agent custom fields'), 'images/note.png', false, "", false); +ui_print_page_header (__('Agent custom fields'), 'images/custom_field.png', false, "", false); echo ''; // Custom fields diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 377ac92c38..d080b5e511 100644 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -99,7 +99,7 @@ else { $print_agent = true; - ui_print_page_header (__('Alert detail'), "images/bricks.png", false, "alert_validation"); + ui_print_page_header (__('Alert detail'), "images/op_alerts.png", false, "alert_validation"); } if ($alert_validate) { @@ -410,4 +410,4 @@ $(document).ready (function () { return false; }); }); - \ No newline at end of file + diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php deleted file mode 100644 index ca208446fe..0000000000 --- a/pandora_console/operation/agentes/datos_agente.php +++ /dev/null @@ -1,317 +0,0 @@ -cellpadding = 3; -$table->cellspacing = 3; -$table->width = '98%'; -$table->class = "databox"; -$table->head = array (); -$table->data = array (); -$table->align = array (); -$table->size = array (); - - -$moduletype_name = modules_get_moduletype_name (modules_get_agentmodule_type ($module_id)); - -$offset = (int) get_parameter("offset"); -$block_size = (int) $config["block_size"]; - -// The "columns" array is the number(and definition) of columns in the report: -// $columns = array( -// "COLUMN1" => array(ROW_FROM_DB_TABLE, FUNCTION_NAME_TO_FORMAT_THE_DATA, "align"=>COLUMN_ALIGNMENT, "width"=>COLUMN_WIDTH) -// "COLUMN2" => array(ROW_FROM_DB_TABLE, FUNCTION_NAME_TO_FORMAT_THE_DATA, "align"=>COLUMN_ALIGNMENT, "width"=>COLUMN_WIDTH) -// .... -// ) -// -// For each row from the query, and for each column, we'll call the FUNCTION passing as argument -// the value of the ROW. -// -$columns = array (); - -$datetime_from = strtotime ($date_from.' '.$time_from); -$datetime_to = strtotime ($date_to.' '.$time_to); - -if ($moduletype_name == "log4x") { - $table->width = "100%"; - $sql_freestring = '%' . $freestring . '%'; - - if ($selection_mode == "fromnow") { - $sql_body = sprintf ("FROM tagente_datos_log4x WHERE id_agente_modulo = %d AND message like '%s' AND utimestamp > %d ORDER BY utimestamp DESC", $module_id, $sql_freestring, get_system_time () - $period); - } - else { - $sql_body = sprintf ("FROM tagente_datos_log4x WHERE id_agente_modulo = %d AND message like '%s' AND utimestamp >= %d AND utimestamp <= %d ORDER BY utimestamp DESC", $module_id, $sql_freestring, $datetime_from, $datetime_to); - } - - $columns = array( - "Timestamp" => array("utimestamp", "modules_format_timestamp", "align" => "center" ), - "Sev" => array("severity", "modules_format_data", "align" => "center", "width" => "70px"), - "Message"=> array("message", "modules_format_verbatim", "align" => "left", "width" => "45%"), - "StackTrace" => array("stacktrace", "modules_format_verbatim", "align" => "left", "width" => "50%") - ); -} -else if (preg_match ("/string/", $moduletype_name)) { - $sql_freestring = '%' . $freestring . '%'; - if ($selection_mode == "fromnow") { - $sql_body = sprintf (" FROM tagente_datos_string WHERE id_agente_modulo = %d AND datos like '%s' AND utimestamp > %d ORDER BY utimestamp DESC", $module_id, $sql_freestring, get_system_time () - $period); - } - else { - $sql_body = sprintf (" FROM tagente_datos_string WHERE id_agente_modulo = %d AND datos like '%s' AND utimestamp >= %d AND utimestamp <= %d ORDER BY utimestamp DESC", $module_id, $sql_freestring, $datetime_from, $datetime_to); - } - - $columns = array( - "Timestamp" => array("utimestamp", "modules_format_timestamp", "align" => "left"), - "Data" => array("datos", "modules_format_data", "align" => "left"), - "Time" => array("utimestamp", "modules_format_time", "align" => "center") - ); -} -else { - if ($selection_mode == "fromnow") { - $sql_body = sprintf (" FROM tagente_datos WHERE id_agente_modulo = %d AND utimestamp > %d ORDER BY utimestamp DESC", $module_id, get_system_time () - $period); - } - else { - $sql_body = sprintf (" FROM tagente_datos WHERE id_agente_modulo = %d AND utimestamp >= %d AND utimestamp <= %d ORDER BY utimestamp DESC", $module_id, $datetime_from, $datetime_to); - } - - $columns = array( - "Timestamp" => array("utimestamp", "modules_format_timestamp", "align" => "left"), - "Data" => array("datos", "modules_format_data", "align" => "left"), - "Time" => array("utimestamp", "modules_format_time", "align" => "center") - ); -} - -$sql_body = io_safe_output($sql_body); -// Clean all codification characters - -$sql = "SELECT * " . $sql_body; -$sql_count = "SELECT count(*) " . $sql_body; - -$count = db_get_value_sql ($sql_count, $connection_handler); - -switch ($config["dbtype"]) { - case "mysql": - $sql .= " LIMIT " . $offset . "," . $block_size; - break; - case "postgresql": - $sql .= " LIMIT " . $block_size . " OFFSET " . $offset; - break; - case "oracle": - $set = array(); - $set['limit'] = $block_size; - $set['offset'] = $offset; - $sql = oracle_recode_query ($sql, $set); - break; -} - -$result = db_get_all_rows_sql ($sql, false, true, $connection_handler); -if ($result === false) { - $result = array (); -} - -if (($config['dbtype'] == 'oracle') && ($result !== false)) { - for ($i=0; $i < count($result); $i++) { - unset($result[$i]['rnum']); - } -} - -$header_title = __('Received data from')." ".modules_get_agentmodule_agent_name ($module_id)." / ".modules_get_agentmodule_name ($module_id); - -echo ""; - -echo "

".$header_title; -if ($config['history_db_enabled'] == 1) { - echo " "; - html_print_select (array ('main' => __('Main database'), 'history' => __('History database')), "connection", $connection); - ui_print_help_tip (__('Switch between the main database and the history database to retrieve module data')); -} -echo "

"; - -$formtable->width = '98%'; -$formtable->class = "databox"; -$formtable->data = array (); -$formtable->size = array (); -$formtable->size[0] = '40%'; -$formtable->size[1] = '20%'; -$formtable->size[2] = '30%'; - -$formtable->data[0][0] = html_print_radio_button_extended ("selection_mode", 'fromnow', '', $selection_mode, false, '', 'style="margin-right: 15px;"', true) . __("Choose a time from now"); -$formtable->data[0][1] = html_print_extended_select_for_time ('period', $period, '', '', '0', 10, true); - -$formtable->data[1][0] = html_print_radio_button_extended ("selection_mode", 'range','', $selection_mode, false, '', 'style="margin-right: 15px;"', true) . __("Specify time range"); -$formtable->data[1][1] = __('Timestamp from:'); - -$formtable->data[1][2] = html_print_input_text ('date_from', $date_from, '', 10, 10, true); -$formtable->data[1][2] .= html_print_input_text ('time_from', $time_from, '', 7, 7, true); - -$formtable->data[1][1] .= '
'; -$formtable->data[1][1] .= __('Timestamp to:'); - -$formtable->data[1][2] .= '
'; -$formtable->data[1][2] .= html_print_input_text ('date_to', $date_to, '', 10, 10, true); -$formtable->data[1][2] .= html_print_input_text ('time_to', $time_to, '', 7, 7, true); - -if (preg_match ("/string/", $moduletype_name) || $moduletype_name == "log4x") { - $formtable->data[2][0] = __('Free text for search'); - $formtable->data[2][1] = html_print_input_text ("freestring", $freestring, '', 20,30, true); -} - -html_print_table ($formtable); - -echo '
'; -html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"'); -echo '
'; - -echo "
"; - -$table->width = '98%'; - -// -$index = 0; -foreach($columns as $col => $attr) { - $table->head[$index] = $col; - - if (isset($attr["align"])) - $table->align[$index] = $attr["align"]; - - if (isset($attr["width"])) - $table->size[$index] = $attr["width"]; - - $index++; -} - -$id_type_web_content_string = db_get_value('id_tipo', 'ttipo_modulo', - 'nombre', 'web_content_string'); - -foreach ($result as $row) { - $data = array (); - - $is_web_content_string = (bool)db_get_value_filter('id_agente_modulo', - 'tagente_modulo', - array('id_agente_modulo' => $row['id_agente_modulo'], - 'id_tipo_modulo' => $id_type_web_content_string)); - - foreach($columns as $col => $attr) { - if ($attr[1] != "modules_format_data") { - $data[] = $attr[1] ($row[$attr[0]]); - - - } - elseif (($config['command_snapshot']) && (preg_match ("/[\n]+/i", $row[$attr[0]]))) { - // Its a single-data, multiline data (data snapshot) ? - - - // Detect string data with \n and convert to
's - $datos = preg_replace ('/\n/i','
',$row[$attr[0]]); - $datos = preg_replace ('/\s/i',' ',$datos); - - // Because this *SHIT* of print_table monster, I cannot format properly this cells - // so, eat this, motherfucker :)) - - $datos = "".$datos.""; - - // I dont why, but using index (value) method, data is automatically converted to html entities ¿? - $data[$attr[1]] = $datos; - - } - elseif ($is_web_content_string) { - //Fixed the goliat sends the strings from web - //without HTML entities - - $data[$attr[1]] = io_safe_input($row[$attr[0]]); - } - else { - // Just a string of alphanumerical data... just do print - - //Fixed the data from Selenium Plugin - if ($row[$attr[0]] != strip_tags($row[$attr[0]])) - $data[$attr[1]] = io_safe_input($row[$attr[0]]); - else - $data[$attr[1]] = $row[$attr[0]]; - } - } - - array_push ($table->data, $data); - if (count($table->data) > 200) break; -} - -if (empty ($table->data)) { - echo '

'.__('No available data to show').'

'; -} -else { - ui_pagination($count); - html_print_table ($table); - unset ($table); -} - -ui_require_jquery_file ("ui-timepicker-addon"); - -?> - - diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 4e0a7cf4d9..198e527c16 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -128,15 +128,14 @@ if (check_acl ($config['id_user'], 0, "AW")) { . html_print_image ("images/setup.png", true, array ("title" =>__('Setup'))) . ''; - if($tab == 'setup') - $setuptab['active'] = true; - else - $setuptab['active'] = false; + $setuptab['godmode'] = true; + + $setuptab['active'] = false; $onheader = array('setup' => $setuptab); } -ui_print_page_header ( __("Agent detail"), "images/bricks.png", false, "agent_status", false, $onheader); +ui_print_page_header ( __("Agent detail"), "images/agent_mc.png", false, "agent_status", false, $onheader); if(tags_has_user_acl_tags()) { ui_print_tags_warning(); @@ -527,4 +526,4 @@ $(document).ready (function () { $(this).css ("width", "180px"); }); }); - \ No newline at end of file + diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index ca6c782bf1..f3266cb8ea 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -75,15 +75,28 @@ else { $data[0] = ui_print_group_icon ($agent["id_grupo"], true) . '  '; $data[0] .= $agent_name; -$status_img = agents_tree_view_status_img ($agent["critical_count"], +$status_img = agents_detail_view_status_img ($agent["critical_count"], $agent["warning_count"], $agent["unknown_count"]); $data[1] = reporting_tiny_stats ($agent, true); -$data[2] = str_replace('.png' ,'_ball.png', $status_img); +$data[2] = $status_img; + +$table_agent->data[] = $data; +$table_agent->rowclass[] = ''; +$table_agent->cellstyle[][0] = ''; + + +$data = array(); + +$data[0] = ui_print_os_icon ($agent["id_os"], true, true, true, false, false, false, array('style' => 'margin:0px 5px 0px 4px;')) . ' '; +$data[0] .= ''.$agent["os_version"].''; +$table_agent->cellstyle[][0] = 'padding-left:50px;'; + +$data[1] = graph_agent_status ($id_agente, 160, 120, true); +$table_agent->rowspan[1][1] = 6; $table_agent->data[] = $data; $table_agent->rowclass[] = ''; -$data = array(); $addresses = agents_get_addresses($id_agente); $address = agents_get_address($id_agente); foreach ($addresses as $k => $add) { @@ -91,49 +104,32 @@ foreach ($addresses as $k => $add) { unset($addresses[$k]); } } -$data[0] = html_print_image('images/world.png', true, array('title' => __('IP address'))) . '  '; -$data[0] .= empty($address) ? '' . __('N/A') . '' : $address; -if (!empty($addresses)) { - $data[0] .= ui_print_help_tip(__('Other IP addresses').':
'.implode('
',$addresses), true); + +if(!empty($address)) { + $data = array(); + $data[0] = html_print_image('images/world.png', true, array('title' => __('IP address'))) . '  '; + $data[0] .= ''; + $data[0] .= empty($address) ? '' . __('N/A') . '' : $address; + $data[0] .= ''; + $table_agent->cellstyle[][0] = 'padding-left:50px;'; + $table_agent->data[] = $data; + $table_agent->rowclass[] = ''; } -$table_agent->cellstyle[1][0] = 'padding-left:50px;'; - -$data[1] = graph_agent_status ($id_agente, 160, 160, true); -$table_agent->rowspan[1][1] = 6; - -$table_agent->data[] = $data; -$table_agent->rowclass[] = ''; $data = array(); -$data[0] = html_print_image('images/information.png', true, array('title' => __('Agent Version'))) . '  '; +$data[0] = html_print_image('images/version.png', true, array('title' => __('Agent Version'))) . '  '; +$data[0] .= ''; $data[0] .= $agent["agent_version"]; -$table_agent->cellstyle[][0] = 'padding-left:50px;'; -$table_agent->data[] = $data; -$table_agent->rowclass[] = ''; - -$data = array(); -$data[0] = ui_print_os_icon ($agent["id_os"], true, array('title' => __('Operating system'))) . '  '; -$data[0] .= ' '.$agent["os_version"].' '; -$table_agent->cellstyle[][0] = 'padding-left:50px;'; -$table_agent->data[] = $data; -$table_agent->rowclass[] = ''; - -$data = array(); -$data[0] = html_print_image('images/bricks.png', true, array('title' => __('Parent'))) . '  '; -if ($agent["id_parent"] == 0) { - $data[0] .= '' . __('N/A') . ''; -} -else { - $data[0] .= ''.agents_get_name ($agent["id_parent"]).''; -} - +$data[0] .= ''; $table_agent->cellstyle[][0] = 'padding-left:50px;'; $table_agent->data[] = $data; $table_agent->rowclass[] = ''; $data = array(); $data[0] = html_print_image('images/default_list.png', true, array('title' => __('Description'))) . '  '; +$data[0] .= ''; $data[0] .= empty($agent["comentarios"]) ? '' . __('N/A') . '' : $agent["comentarios"]; +$data[0] .= ''; $table_agent->cellstyle[][0] = 'padding-left:50px;'; $table_agent->data[] = $data; $table_agent->rowclass[] = ''; @@ -149,7 +145,7 @@ $table_contact->class = 'databox'; $table_contact->style[0] = 'width: 30%;'; $table_contact->style[1] = 'width: 70%;'; -$table_contact->head[0] = html_print_image('images/clock.png', true) . ' ' . __('Agent contact') . ''; +$table_contact->head[0] = ' ' . __('Agent contact') . ''; $table_contact->head_colspan[0] = 2; $data = array(); @@ -187,9 +183,42 @@ $table_data->class = 'databox'; $table_data->style[0] = 'width: 30%;'; $table_data->style[1] = 'width: 70%;'; -$table_data->head[0] = html_print_image('images/page_white_text.png', true) . ' ' . __('Agent info') . ''; +$table_data->head[0] = ' ' . __('Agent info') . ''; $table_data->head_colspan[0] = 2; +if (!empty($addresses)) { + $data = array(); + $data[0] = '' . __('Other IP addresses') . ''; + $data[1] = implode('
',$addresses); + $table_data->data[] = $data; +} + +$data = array(); +$data[0] = '' . __('Parent') . ''; +if ($agent["id_parent"] == 0) { + $data[1] = '' . __('N/A') . ''; +} +else { + $data[1] = ''.agents_get_name ($agent["id_parent"]).''; +} + +$table_data->data[] = $data; + +$has_remote_conf = enterprise_hook('config_agents_has_remote_configuration',array($agent["id_agente"])); + +if(enterprise_installed()) { + $data = array(); + $data[0] = '' . __('Remote configuration') . ''; + if (!$has_remote_conf) { + $data[1] = __('Disabled'); + } + else { + $data[1] = __('Enabled'); + } + + $table_data->data[] = $data; +} + if ($config['activate_gis'] || $agent['url_address'] != '') { $data = array(); $col = 0; @@ -253,7 +282,7 @@ foreach ($fields as $field) { $table = null; $table->id = 'agent_details'; -$table->width = '100%'; +$table->width = '99%'; $table->cellspacing = 4; $table->cellpadding = 4; $table->class = 'databox'; @@ -267,7 +296,7 @@ $data[1] .= empty($table_data->data) ? '' : html_print_table($table_data, true); $table->rowspan[0][1] = 2; $data[2] = ''; @@ -275,7 +304,7 @@ $table->data[] = $data; $table->rowclass[] = ''; $data = array(); -$data[0] = '
+$data[0] = '
' . __('Events (24h)') . '' . @@ -286,7 +315,7 @@ $data[0] = '
// ACCESS RATE GRAPH if ($config["agentaccess"]) { - $data[0] .= '
+ $data[0] .= '
' . __('Agent access rate (24h)') . '' . @@ -303,4 +332,4 @@ $table->rowclass[] = ''; html_print_table($table); unset($table); -?> \ No newline at end of file +?> diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php index 4d63992448..2e67698c43 100644 --- a/pandora_console/operation/agentes/exportdata.php +++ b/pandora_console/operation/agentes/exportdata.php @@ -33,7 +33,7 @@ ui_require_javascript_file ('calendar'); // Header -ui_print_page_header (__("Export data"), "images/server_export.png"); +ui_print_page_header (__("Export data"), "images/server_export_mc.png"); $group = get_parameter_post ('group', 0); $agentName = get_parameter_post ('agent', 0); @@ -314,4 +314,4 @@ ui_require_jquery_file ('bgiframe'); $("#export_form").submit(); } /* ]]> */ - \ No newline at end of file + diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php index 4968aca74e..1c48aa73fb 100644 --- a/pandora_console/operation/agentes/group_view.php +++ b/pandora_console/operation/agentes/group_view.php @@ -73,7 +73,7 @@ else { } // Header -ui_print_page_header (__("Group view"), "images/bricks.png", false, "", false, $updated_time ); +ui_print_page_header (__("Group view"), "images/group.png", false, "", false, $updated_time ); if (tags_has_user_acl_tags()) { ui_print_tags_warning(); @@ -86,18 +86,18 @@ $counter = 1; $agents = agents_get_group_agents(array_keys($groups)); if (count($agents) > 0) { - echo '
'; + echo '
'; echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; echo ""; - echo ""; + echo ""; echo ""; - echo ""; + echo ""; echo ""; - echo ""; - echo ""; + echo ""; + echo ""; $printed_groups = array(); diff --git a/pandora_console/operation/agentes/networkmap.groups.php b/pandora_console/operation/agentes/networkmap.groups.php index 7f73c01f39..f960b549bc 100644 --- a/pandora_console/operation/agentes/networkmap.groups.php +++ b/pandora_console/operation/agentes/networkmap.groups.php @@ -94,8 +94,10 @@ if ($result !== false) { return; } + echo "
"; html_print_image ($filename_img, false, array ("alt" => __('Network map'), "usemap" => "#networkmap")); + echo "
"; require ($filename_map); } else { @@ -108,4 +110,4 @@ else { return; } -?> \ No newline at end of file +?> diff --git a/pandora_console/operation/agentes/networkmap.php b/pandora_console/operation/agentes/networkmap.php index b448047a8e..e9fedd28c7 100644 --- a/pandora_console/operation/agentes/networkmap.php +++ b/pandora_console/operation/agentes/networkmap.php @@ -194,17 +194,17 @@ if ($recenter_networkmap) { if ($pure == 1) { $buttons['screen'] = array('active' => false, 'text' => '' . - html_print_image("images/normalscreen.png", true, array ('title' => __('Normal screen'))) .''); + html_print_image("images/normal_screen.png", true, array ('title' => __('Normal screen'))) .''); } else { $buttons['screen'] = array('active' => false, 'text' => '' . - html_print_image("images/fullscreen.png", true, array ('title' => __('Full screen'))) .''); + html_print_image("images/full_screen.png", true, array ('title' => __('Full screen'))) .''); } if ($config['enterprise_installed']) { $buttons['policies'] = array('active' => $activeTab == 'policies', 'text' => '' . - html_print_image("images/policies.png", true, array ("title" => __('Policies view'))) .''); + html_print_image("images/policies_mc.png", true, array ("title" => __('Policies view'))) .''); } $buttons['groups'] = array('active' => $activeTab == 'groups', @@ -213,7 +213,7 @@ $buttons['groups'] = array('active' => $activeTab == 'groups', $buttons['topology'] = array('active' => $activeTab == 'topology', 'text' => '' . - html_print_image("images/recon.png", true, array ("title" => __('Topology view'))) .''); + html_print_image("images/op_network.png", true, array ("title" => __('Topology view'))) .''); $buttons['separator'] = array('separator' => ''); @@ -229,12 +229,12 @@ $buttons['combolist'] = $combolist; $buttons['addmap'] = array('active' => $activeTab == false, 'text' => '' . - html_print_image("images/add.png", true, array ("title" => __('Add map'))) .''); + html_print_image("images/add_mc.png", true, array ("title" => __('Add map'))) .''); if (!$nomaps && $id_networkmap != 0) { $buttons['deletemap'] = array('active' => $activeTab == false, 'text' => '' . - html_print_image("images/cross.png", true, array ("title" => __('Delete map'))) .''); + html_print_image("images/delete_mc.png", true, array ("title" => __('Delete map'))) .''); $buttons['savemap'] = array('active' => $activeTab == false, 'text' => '' . - html_print_image("images/file.png", true, array ("title" => __('Save map'))) .''); + html_print_image("images/save_mc.png", true, array ("title" => __('Save map'))) .''); } $title = ''; @@ -265,7 +265,7 @@ if (!empty($name)) { $title .= " » ". mb_substr($name, 0, 25); } -ui_print_page_header (__('Network map')." - ".$title, "images/bricks.png", false, "network_map", false, $buttons); +ui_print_page_header (__('Network map')." - ".$title, "images/op_network.png", false, "network_map", false, $buttons); if(tags_has_user_acl_tags()) { ui_print_tags_warning(); @@ -397,4 +397,4 @@ if($id_networkmap != 0) { break; } } -?> \ No newline at end of file +?> diff --git a/pandora_console/operation/agentes/networkmap.topology.php b/pandora_console/operation/agentes/networkmap.topology.php index de9a523fa4..96623da519 100644 --- a/pandora_console/operation/agentes/networkmap.topology.php +++ b/pandora_console/operation/agentes/networkmap.topology.php @@ -93,7 +93,9 @@ if ($result !== false) { return; } + echo "
"; html_print_image ($filename_img, false, array ("alt" => __('Network map'), "usemap" => "#networkmap")); + echo "
"; require ($filename_map); } else { @@ -106,4 +108,4 @@ else { return; } -?> \ No newline at end of file +?> diff --git a/pandora_console/operation/agentes/networkmap_list.php b/pandora_console/operation/agentes/networkmap_list.php index 3cc8468fbd..fd8d992e04 100644 --- a/pandora_console/operation/agentes/networkmap_list.php +++ b/pandora_console/operation/agentes/networkmap_list.php @@ -28,7 +28,7 @@ if (! check_acl ($config['id_user'], 0, "AR")) { require_once('include/functions_networkmap.php'); -ui_print_page_header(__('Network map'), "images/bricks.png", false, "network_map", false); +ui_print_page_header(__('Network map'), "images/op_network.png", false, "network_map", false); // Delete networkmap action $id_networkmap = get_parameter ('id_networkmap', 0); @@ -184,4 +184,4 @@ $networkmap_types = networkmap_get_types();
".__("Group").""; - echo "".__("Agents")."".__("Group")."".__("Agents")."".__("Agent unknown")."".__("Unknown")."".__("Unknown")."".__("Not Init")."".__("Normal")."".__("Normal")."".__("Warning")."".__("Critical")."".__("Alert fired")."".__("Critical")."".__("Alert fired")."
- \ No newline at end of file + diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index 96487644f9..1f0e1ddb75 100644 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -48,7 +48,7 @@ else { } // Header -ui_print_page_header (__("Tactical view"), "images/bricks.png", false, "", false, $updated_time ); +ui_print_page_header (__("Tactical view"), "images/op_monitoring.png", false, "", false, $updated_time); $data = reporting_get_group_stats(); if(tags_has_user_acl_tags()) { @@ -56,20 +56,21 @@ if(tags_has_user_acl_tags()) { } echo ''; -echo ''; //Left column -echo '
'; +echo ''; // --------------------------------------------------------------------- // The status horizontal bars (Global health, Monitor sanity... // --------------------------------------------------------------------- $table->width = "100%"; $table->class = ""; -$table->cellpadding = 4; -$table->cellspacing = 4; +$table->cellpadding = 2; +$table->cellspacing = 2; $table->border = 0; $table->head = array (); $table->data = array (); $table->style = array (); -$table->data[0][0] = reporting_get_stats_indicators($data, 140, 20); +$table->data[0][0] = reporting_get_stats_indicators($data, 180, 20); +$table->rowclass[] = ''; html_print_table ($table); @@ -88,15 +89,16 @@ $table->data = array (); $table->style = array (); $table->data[0][0] = reporting_get_stats_alerts($data); -$table->data[0][0] .= reporting_get_stats_modules_status($data, 200, 100) . '
'; -$table->data[0][0] .= reporting_get_stats_agents_monitors($data) . '
'; +$table->data[0][0] .= reporting_get_stats_modules_status($data, 200, 100); +$table->data[0][0] .= reporting_get_stats_agents_monitors($data); +$table->rowclass[] = ''; html_print_table($table); // --------------------------------------------------------------------- // Server performance // --------------------------------------------------------------------- if ($is_admin) { - $table->width = "100%"; + $table->width = "99%"; $table->class = ""; $table->cellpadding = 4; $table->cellspacing = 4; @@ -106,13 +108,14 @@ if ($is_admin) { $table->style = array (); $table->data[0][0] = reporting_get_stats_servers(false); + $table->rowclass[] = ''; html_print_table($table); } echo '		'; +echo ''; // --------------------------------------------------------------------- @@ -126,74 +129,8 @@ events_print_event_table ("estado<>1 $tags_condition", 10, "100%"); // Server information // --------------------------------------------------------------------- if ($is_admin) { - $serverinfo = servers_get_info (); - $cells = array (); - - if ($serverinfo === false) { - $serverinfo = array (); - } - - $table->class = "databox"; - $table->cellpadding = 4; - $table->cellspacing = 4; - $table->width = "100%"; - - $table->title = __('Tactical server information'); - $table->titlestyle = "background-color:#799E48;"; - - $table->head = array (); - $table->head[0] = __('Name'); - $table->head[1] = __('Type'); - $table->head[2] = __('Status'); - $table->head[3] = __('Load'); - $table->head[4] = __('Lag').' ' . ui_print_help_icon ("serverlag", true); - $table->align[2] = 'center'; - $table->align[3] = 'center'; - $table->align[4] = 'right'; - - $table->data = array (); - - foreach ($serverinfo as $server) { - $data = array (); - $data[0] = $server["name"]; - $data[1] = ''.$server["img"].' ('.ucfirst($server["type"]).")"; - if ($server["master"] == 1) - $data[1] .= ui_print_help_tip (__("This is a master server"), true); - - if ($server["status"] == 0){ - $data[2] = ui_print_status_image (STATUS_SERVER_DOWN, '', true); - } - else { - $data[2] = ui_print_status_image (STATUS_SERVER_OK, '', true); - } - - if ($server["type"] != "snmp") { - $data[3] = progress_bar($server["load"], 80, 20); - - if ($server["type"] != "recon"){ - $data[4] = $server["lag_txt"]; - } - else { - $data[4] = __("N/A"); - } - } - else { - $data[3] = ""; - $data[4] = __("N/A"); - } - - array_push ($table->data, $data); - } - - if (!empty ($table->data)) { - html_print_table ($table); - } - else { - echo '
' . - __('There are no servers configured in the database') . - '
'; - } - unset ($table); + $tiny = true; + require($config['homedir'] . '/godmode/servers/servers.build_table.php'); } diff --git a/pandora_console/operation/events/event_statistics.php b/pandora_console/operation/events/event_statistics.php index 204b094837..ad570d9631 100644 --- a/pandora_console/operation/events/event_statistics.php +++ b/pandora_console/operation/events/event_statistics.php @@ -29,7 +29,7 @@ if (! check_acl ($config['id_user'], 0, "ER")) { return; } //header -ui_print_page_header (__('Statistics'), "images/lightning_go.png",false, false); +ui_print_page_header (__('Statistics'), "images/op_events.png",false, false); echo ""; echo ""; diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php index 82fdbd2499..0b77a36cc7 100644 --- a/pandora_console/operation/events/events.build_table.php +++ b/pandora_console/operation/events/events.build_table.php @@ -159,7 +159,6 @@ foreach ($result as $event) { //First pass along the class of this row $myclass = get_priority_class ($event["criticity"]); - $table->rowclass[] = $myclass; //print status $estado = $event["estado"]; @@ -183,7 +182,7 @@ foreach ($result as $event) { $i = 0; $data[$i] = "#".$event["id_evento"]; - + // Pass grouped values in hidden fields to use it from modal window if ($group_rep) { $similar_ids = $event['similar_ids']; @@ -207,6 +206,7 @@ foreach ($result as $event) { // If meta activated, propagate the id of the event on node (source id) $data[$i] .= html_print_input_hidden('source_id_' . $event["id_evento"], $event['id_source_event'], true); + $table->cellclass[count($table->data)][$i] = $myclass; } else { $server_id = 0; @@ -230,6 +230,7 @@ foreach ($result as $event) { else { $data[$i] = db_get_value('name','tserver'); } + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } if (in_array('estado',$show_fields)) { @@ -243,6 +244,7 @@ foreach ($result as $event) { } if (in_array('id_evento',$show_fields)) { $data[$i] = $event["id_evento"]; + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -282,6 +284,7 @@ foreach ($result as $event) { $data[$i] .= ''; } $data[$i] .= ''; + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -303,6 +306,7 @@ foreach ($result as $event) { $data[$i] .= ''; } $data[$i] .= ''; + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -316,6 +320,7 @@ foreach ($result as $event) { $data[$i] .= ui_print_timestamp ($event["timestamp"], true); } $data[$i] .= ''; + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -325,6 +330,7 @@ foreach ($result as $event) { $user_name = $event['id_usuario']; } $data[$i] = $user_name; + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -334,6 +340,7 @@ foreach ($result as $event) { $owner_name = $event['owner_user']; } $data[$i] = $owner_name; + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -349,11 +356,13 @@ foreach ($result as $event) { } $data[$i] = $group_name; } + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } if (in_array('event_type',$show_fields)) { $data[$i] = events_print_type_description($event["event_type"], true); + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -367,6 +376,7 @@ foreach ($result as $event) { $data[$i] = '' . db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $event["id_agentmodule"]).''; } + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -389,31 +399,37 @@ foreach ($result as $event) { $data[$i] = ''; } } + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } if (in_array('criticity',$show_fields)) { $data[$i] = get_priority_name ($event["criticity"]); + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } if (in_array('user_comment',$show_fields)) { $data[$i] = '' .ui_print_truncate_text(strip_tags($event["user_comment"])) . ''; + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } if (in_array('tags',$show_fields)) { $data[$i] = tags_get_tags_formatted($event['tags']); + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } if (in_array('source',$show_fields)) { $data[$i] = $event["source"]; + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } if (in_array('id_extra',$show_fields)) { $data[$i] = $event["id_extra"]; + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -424,6 +440,7 @@ foreach ($result as $event) { else { $data[$i] = date ($config["date_format"], $event['ack_utimestamp']); } + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -451,6 +468,7 @@ foreach ($result as $event) { $data[$i] = ''; } + $table->cellclass[count($table->data)][$i] = $myclass; $i++; } @@ -462,7 +480,7 @@ foreach ($result as $event) { $data[$i] .= ''; $data[$i] .= html_print_image ("images/ok.png", true, array ("title" => __('Validate event'))); - $data[$i] .= ' '; + $data[$i] .= ''; } // Delete event @@ -471,7 +489,7 @@ foreach ($result as $event) { $data[$i] .= ''; $data[$i] .= html_print_image ("images/cross.png", true, array ("title" => __('Delete event'), "id" => 'delete_cross_' . $event['id_evento'])); - $data[$i] .= ' '; + $data[$i] .= ''; } else { $data[$i] .= html_print_image ("images/cross.disabled.png", true, @@ -483,7 +501,7 @@ foreach ($result as $event) { $data[$i] .= html_print_input_hidden('event_title_'.$event["id_evento"], "#".$event["id_evento"]." - ".$event["evento"], true); $data[$i] .= html_print_image ("images/eye.png", true, array ("title" => __('Show more'))); - $data[$i] .= ' '; + $data[$i] .= ''; $i++; if (tags_check_acl ($config["id_user"], $event["id_grupo"], "EM", $event['clean_tags']) == 1) { diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 3eee7a0d78..811c129ae3 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -248,12 +248,12 @@ if ($config["pure"] == 0 || $meta) { // Fullscreen $fullscreen['active'] = false; $fullscreen['text'] = '' . - html_print_image("images/fullscreen.png", true, array ("title" => __('Full screen'))) .''; + html_print_image("images/full_screen.png", true, array ("title" => __('Full screen'))) .''; // Event list $list['active'] = false; $list['text'] = '' . - html_print_image("images/god6.png", true, array("title" => __('Event list'))) . ''; + html_print_image("images/events_list.png", true, array("title" => __('Event list'))) . ''; // History event list $history_list['active'] = false; @@ -273,11 +273,11 @@ if ($config["pure"] == 0 || $meta) { // CSV $csv['active'] = false; $csv['text'] = '' . - html_print_image("images/disk.png", true, array ("title" => __('Export to CSV file'))) .''; + html_print_image("images/csv_mc.png", true, array ("title" => __('Export to CSV file'))) .''; // Sound events $sound_event['active'] = false; - $sound_event['text'] = '' . html_print_image('images/music_note.png', true, array('title' => __('Sound events'))) . ''; + $sound_event['text'] = '' . html_print_image('images/sound.png', true, array('title' => __('Sound events'))) . ''; // If the user has administrator permission display manage tab if (check_acl ($config["id_user"], 0, "EW")) { @@ -286,16 +286,17 @@ if ($config["pure"] == 0 || $meta) { $manage_events['text'] = '' . html_print_image("images/setup.png", true, array ("title" => __('Manage events'))) . ''; + $manage_events['godmode'] = true; + $onheader = array( - 'separator' => '', + 'manage_events' => $manage_events, 'fullscreen' => $fullscreen, 'list' => $list, 'history' => $history_list, 'rss' => $rss, 'marquee' => $marquee, 'csv' => $csv, - 'sound_event' => $sound_event, - 'manage_events' => $manage_events) ; + 'sound_event' => $sound_event) ; } else { $onheader = array('fullscreen' => $fullscreen, @@ -329,7 +330,7 @@ if ($config["pure"] == 0 || $meta) { if (! defined ('METACONSOLE')) { unset($onheader['history']); - ui_print_page_header (__("Events"), "images/lightning_go.png", + ui_print_page_header (__("Events"), "images/op_events.png", false, "eventview", false, $onheader); } else { diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 5a544f7966..9797172824 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -420,7 +420,7 @@ $table->rowclass[] = ''; $data = array(); $data[0] = '
'; $data[0] .= '' . html_print_image("images/disk.png", true, array("border" => '0', "title" => __('Save filter'), "alt" => __('Save filter'))) . '  '; -$data[0] .= '' . html_print_image("images/server_database.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . ' '; +$data[0] .= '' . html_print_image("images/load.png", true, array("border" => '0', "title" => __('Load filter'), "alt" => __('Load filter'))) . ' '; if (empty($id_name)) { $data[0] .= '[' . __('No filter loaded') . ']'; } diff --git a/pandora_console/operation/gis_maps/index.php b/pandora_console/operation/gis_maps/index.php index bc5c24995f..180eee18cc 100644 --- a/pandora_console/operation/gis_maps/index.php +++ b/pandora_console/operation/gis_maps/index.php @@ -23,7 +23,7 @@ require_once ('include/functions_gis.php'); ui_require_javascript_file('openlayers.pandora'); -ui_print_page_header(__('GIS Maps')." » ".__('Summary'), "images/server_web.png", false, ""); +ui_print_page_header(__('GIS Maps')." » ".__('Summary'), "images/op_gis.png", false, ""); $maps = gis_get_maps(); diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php index 6490dcc3b4..baaa72737d 100644 --- a/pandora_console/operation/gis_maps/render_view.php +++ b/pandora_console/operation/gis_maps/render_view.php @@ -87,16 +87,18 @@ $layers = gis_get_layers($idMap); $buttons = array(); if ($config["pure"] == 0) { - $buttons[] = '' . - html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) . ""; + $buttons[]['text'] = '' . + html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode'))) . ""; } else { - $buttons[] = '' . + $buttons[]['text'] = '' . html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) . ""; } -if (check_acl ($config["id_user"], $map['group_id'], "IW")) - $buttons [] = ''.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).''; +if (check_acl ($config["id_user"], $map['group_id'], "IW")) { + $buttons['setup']['text'] = ''.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).''; + $buttons['setup']['godmode'] = 1; +} $buttonsString = '' . html_print_image("images/bricks.png", true, array("class" => "top", "border" => '0')) . '  Agent - test_gis1
"; echo "
"; diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 884e375c88..0ef7037238 100644 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -63,19 +63,19 @@ $enable_init_date = get_parameter('enable_init_date', 0); $url = "index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=$id_report&date=$date&time=$time&pure=$pure"; -$options['setup'] = "" +$options['setup']['text'] = "" . html_print_image ("images/setup.png", true, array ("title" => __('Setup'))) . ""; if(!defined('METACONSOLE')) { if ($config["pure"] == 0) { - $options['screen'] = "" - . html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) + $options['screen']['text'] = "" + . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode'))) . ""; } else { - $options['screen'] = "" - . html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) + $options['screen']['text'] = "" + . html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode'))) . ""; } } @@ -92,7 +92,7 @@ if ($config['metaconsole'] == 1 and defined('METACONSOLE')) { } else ui_print_page_header (__('Reporting'). " » ". __('Custom reporting'). " - ".$report["name"], - "images/reporting.png", false, "", false, $options); + "images/op_reporting.png", false, "", false, $options); if ($enable_init_date) { if ($datetime_init > $datetime) { @@ -100,6 +100,7 @@ if ($enable_init_date) { } } +$table->id = 'controls_table'; $table->width = '99%'; $table->class = 'databox'; $table->style = array (); @@ -122,8 +123,10 @@ else { $table->size = array (); $table->size[0] = '60px'; $table->colspan[0][1] = 2; +$table->rowspan[0][0] = 2; +$table->style[0] = 'text-align:center;'; $table->data = array (); -$table->data[0][0] = html_print_image("images/reporting.png", true, array("width" => "32", "height" => "32")); +$table->data[0][0] = html_print_image("images/reporting32.png", true, array("width" => "32", "height" => "32")); if ($report['description'] != '') { $table->data[0][1] = '
'.$report['description'].'
'; } @@ -138,7 +141,6 @@ if ($html_enterprise !== ENTERPRISE_NOT_HOOK) { } $table->data[0][1] .= ''; -$table->data[1][0] = ''; $table->data[1][1] = '
' . __('From') . ':
'; $table->data[1][1] .= html_print_input_text ('date_init', $date_init, '', 12, 10, true). ' '; $table->data[1][1] .= html_print_input_text ('time_init', $time_init, '', 7, 7, true). ' '; @@ -164,6 +166,7 @@ echo ''; */ ui_require_jquery_file ("ui-timepicker-addon"); + ?> \ No newline at end of file + diff --git a/pandora_console/operation/search_reports.getdata.php b/pandora_console/operation/search_reports.getdata.php new file mode 100644 index 0000000000..1223c4333e --- /dev/null +++ b/pandora_console/operation/search_reports.getdata.php @@ -0,0 +1,64 @@ +1"; +} +else { + $reports_condition = " AND id_report IN (".implode(',',$userreports_id).")"; +} + +$reports = false; + +if($searchReports) { + $sql = "SELECT id_report, name, description + FROM treport + WHERE (name LIKE '%" . $stringSearchSQL . "%' OR description LIKE '%" . $stringSearchSQL . "%')".$reports_condition. + " LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); + $sql_count = "SELECT COUNT(id_report) AS count + FROM treport + WHERE (name LIKE '%" . $stringSearchSQL . "%' OR description LIKE '%" . $stringSearchSQL . "%')".$reports_condition; + + if($only_count) { + $totalReports = db_get_value_sql($sql_count); + } + else { + $reports = db_process_sql($sql); + $totalReports = db_get_value_sql($sql_count); + } +} +?> diff --git a/pandora_console/operation/search_reports.php b/pandora_console/operation/search_reports.php index c1a8c2dadf..c0273c4889 100755 --- a/pandora_console/operation/search_reports.php +++ b/pandora_console/operation/search_reports.php @@ -19,46 +19,13 @@ global $config; include_once('include/functions_reports.php'); $linkReport = false; -$searchReports = check_acl ($config["id_user"], 0, "IR"); +$searchReports = check_acl ($config["id_user"], 0, "RR"); if (check_acl ($config['id_user'], 0, "IW")) { $linkReport = true; } -$reports = false; - -//Check ACL -$userreports = reports_get_reports(); - -$userreports_id = array(); -foreach($userreports as $userreport) { - $userreports_id[] = $userreport['id_report']; -} - -if(!$userreports_id){ - $reports_condition = " AND 1<>1"; -} -else { - $reports_condition = " AND id_report IN (".implode(',',$userreports_id).")"; -} - -$reports = false; - -if($searchReports) { - $sql = "SELECT id_report, name, description - FROM treport - WHERE (name LIKE '%" . $stringSearchSQL . "%' OR description LIKE '%" . $stringSearchSQL . "%')".$reports_condition. - " LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); - $reports = db_process_sql($sql); - - $sql = "SELECT COUNT(id_report) AS count - FROM treport - WHERE (name LIKE '%" . $stringSearchSQL . "%' OR description LIKE '%" . $stringSearchSQL . "%')"; - $totalReports = db_get_row_sql($sql); - $totalReports = $totalReports['count']; -} - -if ($reports === false) { +if ($reports === false || !$searchReports) { echo "
" . __("Zero results found") . "
\n"; } else { @@ -102,4 +69,4 @@ else { html_print_table ($table); unset($table); ui_pagination ($totalReports); } -?> \ No newline at end of file +?> diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php index 87d625cf65..c02cf56647 100644 --- a/pandora_console/operation/search_results.php +++ b/pandora_console/operation/search_results.php @@ -23,6 +23,7 @@ enterprise_include ('operation/reporting/custom_reporting.php'); $searchAgents = $searchAlerts = $searchModules = check_acl($config['id_user'], 0, "AR"); $searchUsers = check_acl($config['id_user'], 0, "UM"); $searchMaps = $searchReports = $searchGraphs = check_acl($config["id_user"], 0, "IR"); +$searchMain = true; $arrayKeywords = explode(' ', $config['search_keywords']); $temp = array(); @@ -33,7 +34,7 @@ foreach ($arrayKeywords as $keyword){ $stringSearchSQL = implode(" ",$temp); if ($config['search_category'] == "all") - $searchTab = "agents"; + $searchTab = "main"; else $searchTab = $config['search_category']; @@ -54,9 +55,17 @@ $sortField = get_parameter('sort_field'); $sort = get_parameter('sort', 'none'); $selected = 'border: 1px solid black;'; +if ($searchMain) { + $main_tab = array('text' => "" + . html_print_image ("images/zoom_mc.png", true, array ("title" => __('Global search'))) . "", 'active' => $searchTab == "main"); +} +else { + $main_tab = ''; +} + if ($searchAgents) { $agents_tab = array('text' => "" - . html_print_image ("images/bricks.png", true, array ("title" => __('Agents'))) . "", 'active' => $searchTab == "agents"); + . html_print_image ("images/op_monitoring.png", true, array ("title" => __('Agents'))) . "", 'active' => $searchTab == "agents"); } else { $agents_tab = ''; @@ -64,7 +73,7 @@ else { if ($searchUsers) { $users_tab = array('text' => "" - . html_print_image ("images/group.png", true, array ("title" => __('Users'))) . "", 'active' => $searchTab == "users"); + . html_print_image ("images/op_workspace.png", true, array ("title" => __('Users'))) . "", 'active' => $searchTab == "users"); } else { $users_tab = ''; @@ -72,7 +81,7 @@ else { if ($searchAlerts) { $alerts_tab = array('text' => "" - . html_print_image ("images/god2.png", true, array ("title" => __('Alerts'))) . "", 'active' => $searchTab == "alerts"); + . html_print_image ("images/op_alerts.png", true, array ("title" => __('Alerts'))) . "", 'active' => $searchTab == "alerts"); } else { $alerts_tab = ''; @@ -80,7 +89,7 @@ else { if ($searchGraphs) { $graphs_tab = array('text' => "" - . html_print_image ("images/chart_curve.png", true, array ("title" => __('Graphs'))) . "", 'active' => $searchTab == "graphs"); + . html_print_image ("images/chart.png", true, array ("title" => __('Graphs'))) . "", 'active' => $searchTab == "graphs"); } else { $graphs_tab = ''; @@ -88,7 +97,7 @@ else { if ($searchReports) { $reports_tab = array('text' => "" - . html_print_image ("images/reporting.png", true, array ("title" => __('Reports'))) . "", 'active' => $searchTab == "reports"); + . html_print_image ("images/op_reporting.png", true, array ("title" => __('Reports'))) . "", 'active' => $searchTab == "reports"); } else { $reports_tab = ''; @@ -96,7 +105,7 @@ else { if ($searchMaps) { $maps_tab = array('text' => "" - . html_print_image ("images/camera.png", true, array ("title" => __('Maps'))) . "", 'active' => $searchTab == "maps"); + . html_print_image ("images/op_network.png", true, array ("title" => __('Maps'))) . "", 'active' => $searchTab == "maps"); } else { $maps_tab = ''; @@ -104,40 +113,64 @@ else { if ($searchModules) { $modules_tab = array('text' => "" - . html_print_image ("images/lightbulb.png", true, array ("title" => __('Modules'))) . "", 'active' => $searchTab == "modules"); + . html_print_image ("images/brick.png", true, array ("title" => __('Modules'))) . "", 'active' => $searchTab == "modules"); } else { $modules_tab = ''; } -$onheader = array('agents' => $agents_tab, 'users' => $users_tab, - 'alerts' => $alerts_tab, 'graphs' => $graphs_tab, - 'reports' => $reports_tab, 'maps' => $maps_tab, - 'modules' => $modules_tab); +$onheader = array('main' => $main_tab, + 'agents' => $agents_tab, + 'modules' => $modules_tab, + 'alerts' => $alerts_tab, + 'users' => $users_tab, + 'graphs' => $graphs_tab, + 'reports' => $reports_tab, + 'maps' => $maps_tab); -ui_print_page_header (__("Search").": \"".$config['search_keywords']."\"", "images/zoom.png", false, "", false, $onheader); +ui_print_page_header (__("Search").": \"".$config['search_keywords']."\"", "images/zoom_mc.png", false, "", false, $onheader); +$only_count = false; switch ($searchTab) { + case 'main': + $only_count = true; + require_once('search_agents.getdata.php'); + require_once('search_users.getdata.php'); + require_once('search_alerts.getdata.php'); + require_once('search_graphs.getdata.php'); + require_once('search_reports.getdata.php'); + require_once('search_maps.getdata.php'); + require_once('search_modules.getdata.php'); + + require_once('search_main.php'); + break; case 'agents': + require_once('search_agents.getdata.php'); require_once('search_agents.php'); break; case 'users': + require_once('search_users.getdata.php'); require_once('search_users.php'); break; case 'alerts': + require_once('search_alerts.getdata.php'); require_once('search_alerts.php'); break; case 'graphs': + require_once('search_graphs.getdata.php'); require_once('search_graphs.php'); break; case 'reports': + require_once('search_reports.getdata.php'); require_once('search_reports.php'); break; case 'maps': + require_once('search_maps.getdata.php'); require_once('search_maps.php'); break; case 'modules': + require_once('search_modules.getdata.php'); require_once('search_modules.php'); break; } -?> \ No newline at end of file +?> diff --git a/pandora_console/operation/search_users.getdata.php b/pandora_console/operation/search_users.getdata.php new file mode 100644 index 0000000000..2e39425683 --- /dev/null +++ b/pandora_console/operation/search_users.getdata.php @@ -0,0 +1,174 @@ + 'id_user', 'order' => 'ASC'); + break; + case 'down': + $selectUserIDDown = $selected; + $order = array('field' => 'id_user', 'order' => 'DESC'); + break; + } + break; + case 'name': + switch ($sort) { + case 'up': + $selectNameUp = $selected; + $order = array('field' => 'fullname', 'order' => 'ASC'); + break; + case 'down': + $selectNameDown = $selected; + $order = array('field' => 'fullname', 'order' => 'DESC'); + break; + } + break; + case 'email': + switch ($sort) { + case 'up': + $selectLastContactUp = $selected; + $order = array('field' => 'email', 'order' => 'ASC'); + break; + case 'down': + $selectEmailDown = $selected; + $order = array('field' => 'email', 'order' => 'DESC'); + break; + } + break; + case 'last_contact': + switch ($sort) { + case 'up': + $selectLastContactUp = $selected; + $order = array('field' => 'last_connect', 'order' => 'ASC'); + break; + case 'down': + $selectLastContactDown = $selected; + $order = array('field' => 'last_connect', 'order' => 'DESC'); + break; + } + break; + case 'last_contact': + switch ($sort) { + case 'up': + $selectLastContactUp = $selected; + $order = array('field' => 'last_connect', 'order' => 'ASC'); + break; + case 'down': + $selectLastContactDown = $selected; + $order = array('field' => 'last_connect', 'order' => 'DESC'); + break; + } + break; + case 'profile': + switch ($sort) { + case 'up': + $selectProfileUp = $selected; + $order = array('field' => 'is_admin', 'order' => 'ASC'); + break; + case 'down': + $selectProfileDown = $selected; + $order = array('field' => 'is_admin', 'order' => 'DESC'); + break; + } + break; + default: + $selectUserIDUp = $selected; + $selectUserIDDown = ''; + $selectNameUp = ''; + $selectNameDown = ''; + $selectEmailUp = ''; + $selectEmailDown = ''; + $selectLastContactUp = ''; + $selectLastContactDown = ''; + $selectProfileUp = ''; + $selectProfileDown = ''; + + $order = array('field' => 'id_user', 'order' => 'ASC'); + break; +} + +if ($searchUsers) { + $sql = "SELECT id_user, fullname, firstname, lastname, middlename, email, last_connect, is_admin, comments FROM tusuario + WHERE fullname LIKE '%" . $stringSearchSQL . "%' OR + id_user LIKE '%" . $stringSearchSQL . "%' OR + firstname LIKE '%" . $stringSearchSQL . "%' OR + lastname LIKE '%" . $stringSearchSQL . "%' OR + middlename LIKE '%" . $stringSearchSQL . "%' OR + email LIKE '%" . $stringSearchSQL . "%' + ORDER BY " . $order['field'] . " " . $order['order'] . " + LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); + $users = db_process_sql($sql); + + if($users !== false) { + //Check ACLs + $users_id = array(); + foreach($users as $key => $user){ + if (!check_acl ($config["id_user"], users_get_groups ($user["id_user"]), "UM") && $config["id_user"] != $user["id_user"]) { + unset($users[$key]); + } + else { + $users_id[] = $user["id_user"]; + } + } + + if($only_count) { + unset($users); + } + + if(!$users_id) { + $user_condition = ""; + } + else { + // Condition with the visible agents + $user_condition = " AND id_user IN (\"".implode('","',$users_id)."\")"; + } + + $sql = "SELECT COUNT(id_user) AS count FROM tusuario + WHERE (fullname LIKE '%" . $stringSearchSQL . "%' OR + firstname LIKE '%" . $stringSearchSQL . "%' OR + lastname LIKE '%" . $stringSearchSQL . "%' OR + middlename LIKE '%" . $stringSearchSQL . "%' OR + email LIKE '%" . $stringSearchSQL . "%')".$user_condition; + + $totalUsers = db_get_value_sql($sql); + } + else { + $totalUsers = 0; + } +} +?> diff --git a/pandora_console/operation/search_users.php b/pandora_console/operation/search_users.php index d4769dbe06..faca8518bc 100755 --- a/pandora_console/operation/search_users.php +++ b/pandora_console/operation/search_users.php @@ -22,152 +22,7 @@ include_once ($config['homedir'] . '/include/functions_groups.php'); $searchUsers = check_acl($config['id_user'], 0, "UM"); -$selectUserIDUp = ''; -$selectUserIDDown = ''; -$selectNameUp = ''; -$selectNameDown = ''; -$selectEmailUp = ''; -$selectEmailDown = ''; -$selectLastContactUp = ''; -$selectLastContactDown = ''; -$selectProfileUp = ''; -$selectProfileDown = ''; - -switch ($sortField) { - case 'id_user': - switch ($sort) { - case 'up': - $selectUserIDUp = $selected; - $order = array('field' => 'id_user', 'order' => 'ASC'); - break; - case 'down': - $selectUserIDDown = $selected; - $order = array('field' => 'id_user', 'order' => 'DESC'); - break; - } - break; - case 'name': - switch ($sort) { - case 'up': - $selectNameUp = $selected; - $order = array('field' => 'fullname', 'order' => 'ASC'); - break; - case 'down': - $selectNameDown = $selected; - $order = array('field' => 'fullname', 'order' => 'DESC'); - break; - } - break; - case 'email': - switch ($sort) { - case 'up': - $selectLastContactUp = $selected; - $order = array('field' => 'email', 'order' => 'ASC'); - break; - case 'down': - $selectEmailDown = $selected; - $order = array('field' => 'email', 'order' => 'DESC'); - break; - } - break; - case 'last_contact': - switch ($sort) { - case 'up': - $selectLastContactUp = $selected; - $order = array('field' => 'last_connect', 'order' => 'ASC'); - break; - case 'down': - $selectLastContactDown = $selected; - $order = array('field' => 'last_connect', 'order' => 'DESC'); - break; - } - break; - case 'last_contact': - switch ($sort) { - case 'up': - $selectLastContactUp = $selected; - $order = array('field' => 'last_connect', 'order' => 'ASC'); - break; - case 'down': - $selectLastContactDown = $selected; - $order = array('field' => 'last_connect', 'order' => 'DESC'); - break; - } - break; - case 'profile': - switch ($sort) { - case 'up': - $selectProfileUp = $selected; - $order = array('field' => 'is_admin', 'order' => 'ASC'); - break; - case 'down': - $selectProfileDown = $selected; - $order = array('field' => 'is_admin', 'order' => 'DESC'); - break; - } - break; - default: - $selectUserIDUp = $selected; - $selectUserIDDown = ''; - $selectNameUp = ''; - $selectNameDown = ''; - $selectEmailUp = ''; - $selectEmailDown = ''; - $selectLastContactUp = ''; - $selectLastContactDown = ''; - $selectProfileUp = ''; - $selectProfileDown = ''; - - $order = array('field' => 'id_user', 'order' => 'ASC'); - break; -} - -$users = false; -if ($searchUsers) { - $sql = "SELECT id_user, fullname, firstname, lastname, middlename, email, last_connect, is_admin, comments FROM tusuario - WHERE fullname LIKE '%" . $stringSearchSQL . "%' OR - id_user LIKE '%" . $stringSearchSQL . "%' OR - firstname LIKE '%" . $stringSearchSQL . "%' OR - lastname LIKE '%" . $stringSearchSQL . "%' OR - middlename LIKE '%" . $stringSearchSQL . "%' OR - email LIKE '%" . $stringSearchSQL . "%' - ORDER BY " . $order['field'] . " " . $order['order'] . " - LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); - $users = db_process_sql($sql); - - if($users !== false) { - //Check ACLs - $users_id = array(); - foreach($users as $key => $user){ - if (!check_acl ($config["id_user"], users_get_groups ($user["id_user"]), "UM") && $config["id_user"] != $user["id_user"]) { - unset($users[$key]); - } - else { - $users_id[] = $user["id_user"]; - } - } - - if(!$users_id) { - $user_condition = ""; - } - else { - // Condition with the visible agents - $user_condition = " AND id_user IN (\"".implode('","',$users_id)."\")"; - } - - $sql = "SELECT COUNT(id_user) AS count FROM tusuario - WHERE (fullname LIKE '%" . $stringSearchSQL . "%' OR - firstname LIKE '%" . $stringSearchSQL . "%' OR - lastname LIKE '%" . $stringSearchSQL . "%' OR - middlename LIKE '%" . $stringSearchSQL . "%' OR - email LIKE '%" . $stringSearchSQL . "%')".$user_condition; - $totalUsers = db_get_row_sql($sql); - - $totalUsers = $totalUsers['count']; - } -} - -if (!$users) { +if (!$users || !$searchUsers) { echo "
" . __("Zero results found") . "
\n"; } else { diff --git a/pandora_console/operation/servers/recon_view.php b/pandora_console/operation/servers/recon_view.php index 195e58cd64..ec9a3ea703 100644 --- a/pandora_console/operation/servers/recon_view.php +++ b/pandora_console/operation/servers/recon_view.php @@ -23,9 +23,9 @@ require_once ($config["homedir"] . '/include/functions_graph.php'); require_once ($config["homedir"] . '/include/functions_servers.php'); require_once ($config['homedir'] . "/include/functions_network_profiles.php"); -$options = "
  • " . html_print_image("images/refresh.png", true) . "
    • "; +$options[]['text'] = "" . html_print_image("images/header_refresh.png", true) . ""; -ui_print_page_header (__('Recon View'), "images/server.png", false, "", false, $options); +ui_print_page_header (__('Recon View'), "images/op_recon.png", false, "", false, $options); if (! check_acl ($config['id_user'], 0, "PM")) { diff --git a/pandora_console/operation/snmpconsole/snmp_browser.php b/pandora_console/operation/snmpconsole/snmp_browser.php index 2e69f7bc9c..aad6e83b25 100644 --- a/pandora_console/operation/snmpconsole/snmp_browser.php +++ b/pandora_console/operation/snmpconsole/snmp_browser.php @@ -65,15 +65,15 @@ if (! check_acl ($config['id_user'], 0, "AR")) { } // Header -$url = 'index.php?sec=estado&sec2=operation/snmpconsole/snmp_browser&refr=' . $config["refr"] . '&pure=' . $config["pure"]; +$url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_browser&refr=' . $config["refr"] . '&pure=' . $config["pure"]; if ($config["pure"]) { // Windowed - $link = '' . html_print_image("images/normalscreen.png", true, array("title" => __('Normal screen'))) . ''; + $link['text'] = '' . html_print_image("images/normal_screen.png", true, array("title" => __('Normal screen'))) . ''; } else { // Fullscreen - $link = '' . html_print_image("images/fullscreen.png", true, array("title" => __('Full screen'))) . ''; + $link['text'] = '' . html_print_image("images/full_screen.png", true, array("title" => __('Full screen'))) . ''; } -ui_print_page_header (__("SNMP Browser"), "images/computer_error.png", false, "", false, $link); +ui_print_page_header (__("SNMP Browser"), "images/op_snmp.png", false, "", false, array($link)); // SNMP tree container snmp_browser_print_container (); diff --git a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php index 100d9944cd..002ac05b2c 100644 --- a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php +++ b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php @@ -27,7 +27,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) { require_once ("include/functions_filemanager.php"); // Header -ui_print_page_header (__('MIB uploader'), "", false, "", true); +ui_print_page_header (__('MIB uploader'), "images/op_snmp.png", false, "", false); if (isset($config['filemanager']['message'])) { echo $config['filemanager']['message']; diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index c17f83638d..fc39d96900 100644 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -46,15 +46,15 @@ $url = "index.php?sec=estado&sec2=operation/snmpconsole/snmp_view&filter_agent=" if ($config["pure"]) { - $link = '' . html_print_image("images/normalscreen.png", true, array("title" => __('Normal screen'))) . ''; + $link['text'] = '' . html_print_image("images/normal_screen.png", true, array("title" => __('Normal screen'))) . ''; } else { // Fullscreen - $link = '' . html_print_image("images/fullscreen.png", true, array("title" => __('Full screen'))) . ''; + $link['text'] = '' . html_print_image("images/full_screen.png", true, array("title" => __('Full screen'))) . ''; } // Header -ui_print_page_header (__("SNMP Console"), "images/computer_error.png", false, "", false, $link); +ui_print_page_header (__("SNMP Console"), "images/op_snmp.png", false, "", false, array($link)); // OPERATIONS @@ -661,4 +661,4 @@ function toggleVisibleExtendedInfo(id_trap) { } } //--> - \ No newline at end of file + diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 9aafcdd236..074dc22ee9 100644 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -429,7 +429,6 @@ if (is_ajax ()) "period=86400&" . "id=" . $row["id_agente_modulo"]; } - //echo "" . html_print_image ("images/binary.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . ""; echo "". html_print_image ("images/binary.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . ""; echo " "; @@ -500,17 +499,17 @@ $img_style = array ("class" => "top", "width" => 16); $activeTab = get_parameter('sort_by','group'); $os_tab = array('text' => "" - . html_print_image ("images/computer.png", true, array ("title" => __('OS'))) . "", 'active' => $activeTab == "os"); + . html_print_image ("images/operating_system.png", true, array ("title" => __('OS'))) . "", 'active' => $activeTab == "os"); $group_tab = array('text' => "" . html_print_image ("images/group.png", true, array ("title" => __('Groups'))) . "", 'active' => $activeTab == "group"); $module_group_tab = array('text' => "" - . html_print_image ("images/agents_group.png", true, array ("title" => __('Module groups'))) . "", 'active' => $activeTab == "module_group"); + . html_print_image ("images/module_group.png", true, array ("title" => __('Module groups'))) . "", 'active' => $activeTab == "module_group"); if ($enterpriseEnable) { $policies_tab = array('text' => "" - . html_print_image ("images/policies.png", true, array ("title" => __('Policies'))) . "", 'active' => $activeTab == "policies"); + . html_print_image ("images/policies_mc.png", true, array ("title" => __('Policies'))) . "", 'active' => $activeTab == "policies"); } else { $policies_tab = ''; @@ -520,7 +519,7 @@ $module_tab = array('text' => "", 'active' => $activeTab == "module"); $tags_tab = array('text' => "" - . html_print_image ("images/tag_red.png", true, array ("title" => __('Tags'))) . "", 'active' => $activeTab == "tag"); + . html_print_image ("images/tag.png", true, array ("title" => __('Tags'))) . "", 'active' => $activeTab == "tag"); switch ($activeTab) { case 'group': @@ -558,7 +557,7 @@ else { . html_print_image ("images/group.png", true, array ("title" => __('Groups'))) . "", 'active' => $activeTab == "group"); $tags_tab = array('text' => "" - . html_print_image ("images/tag_red.png", true, array ("title" => __('Tags'))) . "", 'active' => $activeTab == "tag"); + . html_print_image ("images/tag.png", true, array ("title" => __('Tags'))) . "", 'active' => $activeTab == "tag"); $subsections = array('group' => $group_tab, 'tag' => $tags_tab); switch ($activeTab) { case 'group': diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 7f28b12e64..8c883b082d 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -74,7 +74,7 @@ if(enterprise_installed() && defined("METACONSOLE")) { $url = 'index.php?sec=advanced&sec2=advanced/users_setup&tab=user_edit'; } else { - ui_print_page_header (__('User detail editor'), "images/group.png", false, "", false, ""); + ui_print_page_header (__('User detail editor'), "images/op_workspace.png", false, "", false, ""); $url = 'index.php?sec=workspace&sec2=operation/users/user_edit'; } @@ -168,136 +168,146 @@ if ($status != -1) { __('Error updating user info')); } +$table->id = 'user_form'; +$table->width = '98%'; +$table->cellspacing = 4; +$table->cellpadding = 4; +$table->class = ''; -echo '
    '; - -echo ''; - -echo ''; -echo '"; - +$data = array(); +$data[0] = '' . __('User ID') . ''; +$data[1] = '' . __('Full (display) name') . ''; // Show "Picture" (in future versions, why not, allow users to upload it's own avatar here. -echo "
    '.__('User ID').''; -echo "$id"; -echo ""; if (is_user_admin ($id)) { - echo html_print_image('images/people_1.png', true); + $data[2] = html_print_image('images/people_1.png', true); } else { - echo html_print_image('images/people_2.png', true); + $data[2] = html_print_image('images/people_2.png', true); +} +if ($view_mode === false) { + $table->rowspan[0][2] = 6; +} +else { + $table->rowspan[0][2] = 4; } -echo '
    '.__('Full (display) name').''; -html_print_input_text_extended ("fullname", $user_info["fullname"], '', '', 35, 100, $view_mode, '', 'class="input"'); +$table->cellstyle[0][2] = 'text-align:center;'; +$table->rowclass[] = ''; +$table->rowstyle[] = 'font-weight: bold;'; +$table->data[] = $data; -// Not used anymore. In 3.0 database schema continues storing it, but will be removed in the future, or we will 'reuse' -// the database fields for anything more useful. +$data = array(); +$data[0] = $id; +$data[1] = html_print_input_text_extended ("fullname", $user_info["fullname"], '', '', 40, 100, $view_mode, '', 'class="input"', true); +$table->rowclass[] = ''; +$table->rowstyle[] = ''; +$table->data[] = $data; -/* -echo '
    '.__('First name').''; -html_print_input_text_extended ("firstname", $user_info["firstname"], '', '', 25, 100, $view_mode, '', 'class="input"'); +$data = array(); +$data[0] = __('E-mail'); +$data[1] = __('Phone number'); +$table->rowclass[] = ''; +$table->rowstyle[] = 'font-weight: bold;'; +$table->data[] = $data; -echo '
    '.__('Last name').''; -html_print_input_text_extended ("lastname", $user_info["lastname"], '', '', 25, 100, $view_mode, '', 'class="input"'); +$data = array(); +$data[0] = html_print_input_text_extended ("email", $user_info["email"], '', '', '40', '100', $view_mode, '', 'class="input"', true); +$data[1] = html_print_input_text_extended ("phone", $user_info["phone"], '', '', '40', '30', $view_mode, '', 'class="input"', true); +$table->rowclass[] = ''; +$table->rowstyle[] = ''; +$table->data[] = $data; -*/ if ($view_mode === false) { if ($config["user_can_update_password"]) { - echo '
    '.__('New Password').''; - html_print_input_text_extended ("password_new", "", '', '', '15', '25', $view_mode, '', 'class="input"', false, true); - echo '
    '.__('Password confirmation').''; - html_print_input_text_extended ("password_conf", "", '', '', '15', '25', $view_mode, '', 'class="input"', false, true); + $data = array(); + $data[0] = __('New Password'); + $data[1] = __('Password confirmation'); + $table->rowclass[] = ''; + $table->rowstyle[] = 'font-weight: bold;'; + $table->data[] = $data; + + $data = array(); + $data[0] = html_print_input_text_extended ("password_new", "", '', '', '40', '25', $view_mode, '', 'class="input"', true, true); + $data[1] = html_print_input_text_extended ("password_conf", "", '', '', '40', '25', $view_mode, '', 'class="input"', true, true); + $table->rowclass[] = ''; + $table->rowstyle[] = ''; + $table->data[] = $data; } else { - echo ''.__('You can not change your password from Pandora FMS under the current authentication scheme').''; + $data = array(); + $data[0] = ''.__('You can not change your password from Pandora FMS under the current authentication scheme').''; + $table->rowclass[] = ''; + $table->rowstyle[] = ''; + $table->colspan[count($table-data)][0] = 2; + $table->data[] = $data; } } -echo '
    '.__('E-mail').''; -html_print_input_text_extended ("email", $user_info["email"], '', '', '40', '100', $view_mode, '', 'class="input"'); +$data = array(); +$data[0] = __('Block size for pagination') . ui_print_help_tip(__('If checkbox is clicked then block size global configuration is used'), true); +$data[1] = __('Interactive charts') . ui_print_help_tip(__('Whether to use Javascript or static PNG graphs'), true); +$data[2] = __('Language'); +$table->rowclass[] = ''; +$table->rowstyle[] = 'font-weight: bold;'; +$table->data[] = $data; -echo '
    '.__('Phone number').''; -html_print_input_text_extended ("phone", $user_info["phone"], '', '', '10', '30', $view_mode, '', 'class="input"'); - -echo '
    '.__('Language').''; -echo html_print_select_from_sql ('SELECT id_language, name FROM tlanguage', - 'language', $user_info["language"], '', __('Default'), 'default', true); - -echo '
    '.__('Comments').''; -html_print_textarea ("comments", 2, 60, $user_info["comments"], ($view_mode ? 'readonly="readonly"' : '')); -html_print_input_hidden('quick_language_change', 1); - -$own_info = get_user_info ($config['id_user']); -if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM")) - $display_all_group = true; -else - $display_all_group = false; - -$usr_groups = (users_get_groups($config['id_user'], 'AR', $display_all_group)); -$id_usr = $config['id_user']; - -// User only can change skins if has more than one group -if (count($usr_groups) > 1) { - $isFunctionSkins = enterprise_include_once ('include/functions_skins.php'); - if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { - echo '
    ' . __('Skin') . ''; - echo skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true); - } -} - -echo '
    '.__('Interactive charts') . ui_print_help_tip(__('Whether to use Javascript or static PNG graphs'), true).''; -$values = array(-1 => __('Default'),1 => __('Yes'),0 => __('No')); -echo html_print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false); -echo '
    '.__('Block size for pagination'). ui_print_help_tip(__('If checkbox is clicked then block size global configuration is used'), true) . ''; +$data = array(); if ($user_info["block_size"] == 0) { $block_size = $config["global_block_size"]; } else { $block_size = $user_info["block_size"]; } +$data[0] = html_print_input_text ('block_size', $block_size, '', 5, 5, true); +$data[0] .= html_print_checkbox('default_block_size', 1, $user_info["block_size"] == 0, true); +$data[0] .= __('Default').' ('.$config["global_block_size"].')'; +$values = array(-1 => __('Default'),1 => __('Yes'),0 => __('No')); +$data[1] = html_print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false); +$data[2] = html_print_select_from_sql ('SELECT id_language, name FROM tlanguage', + 'language', $user_info["language"], '', __('Default'), 'default', true); +$table->rowclass[] = ''; +$table->rowstyle[] = ''; +$table->data[] = $data; -echo html_print_input_text ('block_size', $block_size, '', 5, 5, true); -echo html_print_checkbox('default_block_size', 1, $user_info["block_size"] == 0, true); -echo __('Default').' ('.$config["global_block_size"].')'; +$data = array(); +$data[0] = __('Shortcut bar') . ui_print_help_tip(__('This will activate a shortcut bar with alerts, events, messages... information'), true); +$data[1] = __('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true); +$table->rowclass[] = ''; +$table->rowstyle[] = 'font-weight: bold;'; +$table->data[] = $data; -echo '
    '.__('Shortcut bar') . ui_print_help_tip(__('This will activate a shortcut bar with alerts, events, messages... information'), true) . ''; -echo html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true); - -echo '
    '.__('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true) .''; +$data = array(); +$data[0] = html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true); $values = array ('Default' =>__('Default'), 'Dashboard'=>__('Dashboard'), 'Visual console'=>__('Visual console'), 'Event list'=>__('Event list'), 'Group view'=>__('Group view'), 'Tactical view'=>__('Tactical view'), 'Alert detail' => __('Alert detail'), 'Other'=>__('Other')); -echo html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false); -echo "  "; +$data[1] = html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false); +$data[2] = ''; +$table->rowclass[] = ''; +$table->rowstyle[] = ''; +$table->data[] = $data; -$dashboards = get_user_dashboards ($config['id_user']); -$dashboards_aux = array(); -if ($dashboards === false) { - $dashboards = array('None'=>'None'); -} -else { - foreach ($dashboards as $key=>$dashboard) { - $dashboards_aux[$dashboard['name']] = $dashboard['name']; - } -} -echo html_print_select ($dashboards_aux, 'dashboard', $user_info["data_section"], '', '', '', true); -$layouts = visual_map_get_user_layouts ($config['id_user'], true); -$layouts_aux = array(); -if ($layouts === false) { - $layouts_aux = array('None'=>'None'); -} -else { - foreach ($layouts as $layout) { - $layouts_aux[$layout] = $layout; - } -} -echo html_print_select ($layouts_aux, 'visual_console', $user_info["data_section"], '', '', '', true); +$data = array(); +$data[0] = __('Comments'); +$table->colspan[count($table->data)][0] = 3; +$table->rowclass[] = ''; +$table->rowstyle[] = 'font-weight: bold;'; +$table->data[] = $data; -echo html_print_input_text ('data_section', $user_info["data_section"], '', 60, 255, true, false); +$data = array(); +$data[0] = html_print_textarea("comments", 2, 60, $user_info["comments"], ($view_mode ? 'readonly="readonly"' : ''), true); +$data[0] .= html_print_input_hidden('quick_language_change', 1, true); +$table->colspan[count($table->data)][0] = 3; +$table->rowclass[] = ''; +$table->rowstyle[] = ''; +$table->data[] = $data; -echo '
    '; +echo ''; -echo '
    '; +html_print_table($table); + + +echo '
    '; if (!$config["user_can_update_info"]) { echo ''.__('You can not change your user info from Pandora FMS under the current authentication scheme').''; } @@ -306,6 +316,8 @@ else { } echo '
    '; +unset($table); + echo '

    '.__('Profiles/Groups assigned to this user').'

    '; $table->width = '98%'; @@ -356,7 +368,7 @@ $(document).ready (function () { }); function check_default_block_size() { - if($("#checkbox-default_block_size").attr('checked')) { + if($("#checkbox-default_block_size").is(':checked')) { $("#text-block_size").attr('disabled', true); } else { diff --git a/pandora_console/operation/users/webchat.php b/pandora_console/operation/users/webchat.php index 2eef371352..ddb1c82dc8 100644 --- a/pandora_console/operation/users/webchat.php +++ b/pandora_console/operation/users/webchat.php @@ -68,7 +68,7 @@ global $config; check_login (); -ui_print_page_header (__('Webchat'), "images/group.png", false, "", false, ""); +ui_print_page_header (__('Webchat'), "images/comments.png", false, "", false, ""); $table = null; diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php index 24ba46da8d..3c67481822 100644 --- a/pandora_console/operation/visual_console/render_view.php +++ b/pandora_console/operation/visual_console/render_view.php @@ -65,15 +65,6 @@ if (check_acl ($config["id_user"], $id_group, "RW")) { $hash = md5($config["dbpass"]. $id_layout. $config["id_user"]); - if (!defined('METACONSOLE')) - $url = ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"]); - else - $url = ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"], false, false, false); - $options['public_link']['text'] = ''. - - html_print_image ("images/camera.png", true, array ("title" => __('Show link to public Visual Console'))).''; - $options['public_link']['active'] = false; - if (!defined('METACONSOLE')) $options['setup']['text'] = ''.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).''; else { @@ -81,16 +72,25 @@ if (check_acl ($config["id_user"], $id_group, "RW")) { $options['setup']['text'] = ''.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).''; } $options['setup']['active'] = false; + + if (!defined('METACONSOLE')) + $url = ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"]); + else + $url = ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"], false, false, false); + $options['public_link']['text'] = ''. + + html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).''; + $options['public_link']['active'] = false; } if (!defined('METACONSOLE')) { if ($config["pure"] == 0) { - $options['pure']['text'] = '' . html_print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) + $options['pure']['text'] = '' . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode'))) . ""; } else { $options['pure']['text'] = '' - . html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) + . html_print_image ("images/normal_screen.png", true, array ("title" => __('Back to normal mode'))) . ""; } $options['pure']['active'] = false; @@ -98,7 +98,7 @@ if (!defined('METACONSOLE')) { if (!defined('METACONSOLE')) - ui_print_page_header (__("Visual console") . " » " . $layout_name, "images/reporting.png", false, '', false, $options); + ui_print_page_header (__("Visual console") . " » " . $layout_name, "images/op_reporting.png", false, '', false, $options); else //ui_meta_print_header(__('Visual console') . " » " . $layout_name, "", $options); @@ -191,4 +191,4 @@ $(document).ready (function () { draw_lines (lines, 'layout_map'); }); /* ]]> */ - \ No newline at end of file +