2009-04-13 Esteban Sanchez <estebans@artica.es>

* general/footer.php: Removed Firefox icon. Style correction.

	* godmode/agentes/agent_manager.php: Replaced &gt; with &raquo;. Style
	correction when setting bold attributes.

	* godmode/agentes/manage_config_remote.php,
	godmode/agentes/modificar_agente.php, godmode/agentes/module_manager.php,
	godmode/alerts/alert_list.php, godmode/db/db_audit.php,
	godmode/db/db_event.php, godmode/db/db_info.php, godmode/db/db_main.php,
	godmode/db/db_purge.php, godmode/db/db_refine.php,
	godmode/groups/configure_group.php, godmode/groups/group_list.php,
	godmode/modules/manage_nc_groups.php,
	godmode/modules/manage_network_components.php,
	godmode/modules/manage_network_templates.php, 
	godmode/modules/manage_network_templates_form.php,
	godmode/modules/module_list.php, godmode/profiles/profile_list.php,
	godmode/reporting/graph_builder.php, godmode/reporting/map_builder.php,
	godmode/reporting/reporting_builder.php, godmode/servers/manage_export.php,
	godmode/servers/manage_export_form.php,
	godmode/servers/manage_recontask.php,
	godmode/servers/manage_recontask_form.php,
	godmode/servers/modificar_server.php, godmode/setup/setup_visuals.php,
	godmode/setup/links.php, godmode/setup/news.php,
	godmode/snmpconsole/snmp_alert.php, godmode/users/configure_user.php,
	godmode/users/user_list.php, operation/agentes/alerts_status.php,
	operation/agentes/estado_generalagente.php,
	operation/agentes/estado_agente.php, operation/agentes/estado_grupo.php,
	operation/agentes/estado_ultimopaquete.php,
	operation/agentes/exportdata.php, operation/agentes/networkmap.php,
	operation/agentes/status_monitor.php, operation/agentes/tactical.php,
	operation/events/events.php, operation/incidents/incident.php,
	operation/incidents/incident_detail.php,
	operation/incidents/incident_statistics.php,
	operation/messages/message.php, operation/reporting/custom_reporting.php,
	operation/reporting/graph_viewer.php,
	operation/reporting/reporting_viewer.php, operation/servers/view_server.php,
	operation/users/user.php, operation/users/user_edit.php, 
	operation/users/user_statistics.php, operation/visual_console/index.php,
	godmode/agentes/agent_template.php: Replaced &gt; with &raquo;

	* operation/agentes/datos_agente.php: Return instead of exit

	* include/javascript/jquery.pandora.controls.js: Added pandoraSelectOS
	control to preview the OS icon on a select.

	* include/functions_reports.php: Fixed a bug on delete_report() that
	returns error when the report has no content.

	* include/functions_ui.php: Removed border attribute on print_os_icon().
	Some fixes to meta refresh element on process_page_head(). Fixed 
	format_filesize() when length is zero.
	
	* godmode/menu.php: Replaced link to file manager. Added enterprise hook.

	* godmode/setup/file_manager.php: Renamed from obfuscated name filemgr.php

	* include/styles/pandora.css: Textarea width reduced to 99%

	* godmode/setup/setup.php: Added get_os_icon AJAX operation.
	
	* images/mimetypes/, images/mimetypes/zip.png, images/mimetypes/image.png,
	images/mimetypes/unknown.png, images/mimetypes/directory.png: Added to
	repository. Mime type icons.

	* extras/pandoradb_migrate_v2.x_to_v3.0.sql: Removed date comments.
	
	* include/functions_filemanager.php: Added to repository. Minimal API for
	file manager system.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1608 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Esteban Sanchez 2009-04-13 09:50:56 +00:00
parent d1bf374dac
commit 62b2912d29
74 changed files with 712 additions and 423 deletions

View File

@ -1,3 +1,74 @@
2009-04-13 Esteban Sanchez <estebans@artica.es>
* general/footer.php: Removed Firefox icon. Style correction.
* godmode/agentes/agent_manager.php: Replaced &gt; with &raquo;. Style
correction when setting bold attributes.
* godmode/agentes/manage_config_remote.php,
godmode/agentes/modificar_agente.php, godmode/agentes/module_manager.php,
godmode/alerts/alert_list.php, godmode/db/db_audit.php,
godmode/db/db_event.php, godmode/db/db_info.php, godmode/db/db_main.php,
godmode/db/db_purge.php, godmode/db/db_refine.php,
godmode/groups/configure_group.php, godmode/groups/group_list.php,
godmode/modules/manage_nc_groups.php,
godmode/modules/manage_network_components.php,
godmode/modules/manage_network_templates.php,
godmode/modules/manage_network_templates_form.php,
godmode/modules/module_list.php, godmode/profiles/profile_list.php,
godmode/reporting/graph_builder.php, godmode/reporting/map_builder.php,
godmode/reporting/reporting_builder.php, godmode/servers/manage_export.php,
godmode/servers/manage_export_form.php,
godmode/servers/manage_recontask.php,
godmode/servers/manage_recontask_form.php,
godmode/servers/modificar_server.php, godmode/setup/setup_visuals.php,
godmode/setup/links.php, godmode/setup/news.php,
godmode/snmpconsole/snmp_alert.php, godmode/users/configure_user.php,
godmode/users/user_list.php, operation/agentes/alerts_status.php,
operation/agentes/estado_generalagente.php,
operation/agentes/estado_agente.php, operation/agentes/estado_grupo.php,
operation/agentes/estado_ultimopaquete.php,
operation/agentes/exportdata.php, operation/agentes/networkmap.php,
operation/agentes/status_monitor.php, operation/agentes/tactical.php,
operation/events/events.php, operation/incidents/incident.php,
operation/incidents/incident_detail.php,
operation/incidents/incident_statistics.php,
operation/messages/message.php, operation/reporting/custom_reporting.php,
operation/reporting/graph_viewer.php,
operation/reporting/reporting_viewer.php, operation/servers/view_server.php,
operation/users/user.php, operation/users/user_edit.php,
operation/users/user_statistics.php, operation/visual_console/index.php,
godmode/agentes/agent_template.php: Replaced &gt; with &raquo;
* operation/agentes/datos_agente.php: Return instead of exit
* include/javascript/jquery.pandora.controls.js: Added pandoraSelectOS
control to preview the OS icon on a select.
* include/functions_reports.php: Fixed a bug on delete_report() that
returns error when the report has no content.
* include/functions_ui.php: Removed border attribute on print_os_icon().
Some fixes to meta refresh element on process_page_head(). Fixed
format_filesize() when length is zero.
* godmode/menu.php: Replaced link to file manager. Added enterprise hook.
* godmode/setup/file_manager.php: Renamed from obfuscated name filemgr.php
* include/styles/pandora.css: Textarea width reduced to 99%
* godmode/setup/setup.php: Added get_os_icon AJAX operation.
* images/mimetypes/, images/mimetypes/zip.png, images/mimetypes/image.png,
images/mimetypes/unknown.png, images/mimetypes/directory.png: Added to
repository. Mime type icons.
* extras/pandoradb_migrate_v2.x_to_v3.0.sql: Removed date comments.
* include/functions_filemanager.php: Added to repository. Minimal API for
file manager system.
2009-04-10 Evi Vanoost <vanooste@rcbi.rochester.edu>
* include/functions_db.php: get_group_agents fixed search

View File

@ -1,5 +1,3 @@
-- Changes on 1x March 09
ALTER TABLE treport_content_sla_combined CHANGE sla_max `sla_max` double(18,2) NOT NULL default 0;
ALTER TABLE treport_content_sla_combined CHANGE sla_min `sla_min` double(18,2) NOT NULL default 0;
ALTER TABLE treport_content_sla_combined CHANGE sla_limit `sla_limit` double(18,2) NOT NULL default 0;
@ -281,30 +279,19 @@ CREATE TABLE IF NOT EXISTS `tlocal_component_group` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--Changes added 16 February 2009
ALTER TABLE tplugin ADD `plugin_type` int(2) UNSIGNED NOT NULL default 0;
ALTER TABLE treport_content ADD `description` mediumtext;
ALTER TABLE treport_content MODIFY `type` varchar(30) default 'simple_graph';
ALTER TABLE treport_content ADD `id_agent` int(10) unsigned NOT NULL default 0;
-- Changes added 19 February 2009
ALTER TABLE `tmensajes` CHANGE `timestamp` `timestamp` BIGINT( 20 ) UNSIGNED NOT NULL DEFAULT '0';
-- Changes added 20 February 2009
ALTER TABLE `tevento` CHANGE `event_type` `event_type` ENUM( 'unknown', 'alert_fired', 'alert_recovered', 'alert_ceased', 'alert_manual_validation', 'recon_host_detected', 'system', 'error', 'new_agent', 'going_up_warning', 'going_up_critical', 'going_down_warning', 'going_down_normal', 'going_down_critical', 'going_up_normal' ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'unknown';
-- Changes on 1th April 09
ALTER TABLE tagente ADD `server_name` varchar(255) default '';
ALTER TABLE tevento ADD `user_comment` varchar(255) NOT NULL default '';
ALTER TABLE tusuario ADD `language` varchar(10) default NULL;
ALTER TABLE tserver ADD `server_type` tinyint(3) unsigned NOT NULL default '0';
ALTER TABLE tserver ADD `queued_modules` int(5) unsigned NOT NULL default '0';
ALTER TABLE tserver ADD `threads` int(5) unsigned NOT NULL default '0';

View File

@ -23,15 +23,12 @@ if (isset($_SERVER['REQUEST_TIME'])) {
$time = get_system_time ();
}
echo '<a class="white_bold" target="_blank" href="general/license/pandora_info_'.$config["language"].'.html">Pandora FMS '.$pandora_version.' - Build '.$build_version.'</a><br />';
echo '<a class="white_bold" target="_blank" href="general/license/pandora_info_'.$config["language"].'.html">';
echo 'Pandora FMS '.$pandora_version.' - Build '.$build_version;
echo '</a><br />';
echo '<a class="white">'. __('Page generated at') . ' '. print_timestamp ($time, true, array ("prominent" => "timestamp")); //Always use timestamp here
echo '</a>';
if (isset ($config['debug'])) {
echo ' - Saved '.format_numeric ($sql_cache["saved"]).' Queries';
}
echo '</a><br />';
echo '<a href="http://www.mozilla-europe.org/en/firefox/">';
if (file_exists("images/firefox.png"))
print_image ("images/firefox.png", false, array ("align" => "middle", "title" => __('Pandora FMS console is best viewed with Firefox web browser'), "alt" => __('Get Firefox')));
echo '</a>';
?>

View File

@ -32,15 +32,15 @@ if (!isset ($id_agente)) {
echo "<h2>".__('Agent configuration');
$new_agent = (bool) get_parameter ('new_agent');
if ($new_agent) {
echo " &gt; ".__('Create agent');
echo " &raquo; ".__('Create agent');
} else {
echo " &gt; ".__('Update agent');
echo " &raquo; ".__('Update agent');
}
echo "</h2>";
echo '<div style="height: 5px">&nbsp;</div>';
// Agent remote configuration editor
$agent_md5 = md5 ($nombre_agente, FALSE);
$agent_md5 = md5 ($nombre_agente, false);
$filename['md5'] = $config["remote_config"] . "/" . $agent_md5 . ".md5";
$filename['conf'] = $config["remote_config"] . "/" . $agent_md5 . ".conf";
@ -60,14 +60,14 @@ if (isset($_GET["disk_conf_delete"])) {
echo '<form name="conf_agent" method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
$table->width = '95%';
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->class = "databox_color";
$table->head = array ();
$table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->data = array ();
$table->data[0][0] = '<b>'.__('Agent name').'</b>'.print_help_tip (__("The agent's name must be the same as the one defined at the console"), true);
$table->data[0][0] = __('Agent name').print_help_tip (__("The agent's name must be the same as the one defined at the console"), true);
$table->data[0][1] = print_input_text ('agente', $nombre_agente, '', 30, 100,true);
if (isset ($id_agente) && $id_agente != "") {
@ -83,7 +83,7 @@ if (file_exists ($filename['md5'])) {
$table->data[0][1] .= '</a>'.print_help_tip (__('You can remotely edit this agent configuration'), true);
}
$table->data[1][0] = '<b>'.__('IP Address').'</b>';
$table->data[1][0] = __('IP Address');
$table->data[1][1] = print_input_text ('direccion', $direccion_agente, '', 16, 100, true);
if (! $new_agent) {
@ -98,58 +98,57 @@ if (! $new_agent) {
$groups = get_user_groups ($config["id_user"]);
$agents = get_group_agents (array_keys ($groups));
$table->data[2][0] = '<b>'.__('Parent').'</b>';
$table->data[2][0] = __('Parent');
$table->data[2][1] = print_select ($agents, 'id_parent', $id_parent, '', __('None'), 0, true, false, false); //I use get_agent_name because the user might not have rights to the current parent
$table->data[3][0] = '<b>'.__('Group').'</b>';
$table->data[3][0] = __('Group');
$table->data[3][1] = print_select_from_sql ('SELECT id_grupo, nombre FROM tgrupo WHERE id_grupo > 1 ORDER BY nombre', 'grupo', $grupo, '', '', 0, true);
$table->data[4][0] = '<b>'.__('Interval').'</b>';
$table->data[4][0] = __('Interval');
$table->data[4][1] = print_input_text ('intervalo', $intervalo, '', 16, 100, true);
$table->data[5][0] = '<b>'.__('OS').'</b>';
$table->data[5][0] = __('OS');
$table->data[5][1] = print_select_from_sql ('SELECT id_os, name FROM tconfig_os ORDER BY name', 'id_os', $id_os, '', '', '0', true);
// Network server
$table->data[6][0] = '<b>'.__('Network Server').'</b>'.print_help_tip (__('You must select a Network Server for the Agent, so it can work properly with this kind of modules'), true);
$table->data[6][0] = __('Network Server').print_help_tip (__('You must select a Network Server for the Agent, so it can work properly with this kind of modules'), true);
$table->data[6][1] = print_select_from_sql ('SELECT id_server, name FROM tserver WHERE network_server = 1 ORDER BY name', 'network_server', $id_network_server, '', '', 0, true);
// Plugin server
$table->data[7][0] = '<b>'.__('Plugin Server').'</b>'.print_help_tip (__('You must select a Plugin Server for the Agent, so it can work properly with this kind of modules'), true);
$table->data[7][0] = __('Plugin Server').print_help_tip (__('You must select a Plugin Server for the Agent, so it can work properly with this kind of modules'), true);
$table->data[7][1] = print_select_from_sql ('SELECT id_server, name FROM tserver WHERE plugin_server = 1 ORDER BY name', 'plugin_server', $id_plugin_server, '', '', 0, true);
// WMI Server
$table->data[8][0] = '<b>'.__('WMI Server').'</b>'.print_help_tip (__('You must select a WMI Server for the Agent, so it can work properly with this kind of modules'), true);
$table->data[8][0] = __('WMI Server').print_help_tip (__('You must select a WMI Server for the Agent, so it can work properly with this kind of modules'), true);
$table->data[8][1] = print_select_from_sql ('SELECT id_server, name FROM tserver WHERE wmi_server = 1 ORDER BY name', 'wmi_server', $id_wmi_server, '', '', 0, true);
// Prediction Server
$table->data[9][0] = '<b>'.__('Prediction Server').'</b>'.print_help_tip (__('You must select a Prediction Server for the Agent, so it can work properly with this kind of modules'), true);
$table->data[9][0] = __('Prediction Server').print_help_tip (__('You must select a Prediction Server for the Agent, so it can work properly with this kind of modules'), true);
$table->data[9][1] = print_select_from_sql ('SELECT id_server, name FROM tserver WHERE prediction_server = 1 ORDER BY name', 'prediction_server', $id_prediction_server, '', '', 0, true);
// 10
enterprise_hook ('inventory_server');
// Custom ID
$table->data[11][0] = '<b>'.__('Custom ID').'</b>';
$table->data[11][0] = __('Custom ID');
$table->data[11][1] = print_input_text ('custom_id', $custom_id, '', 16, 255, true);
// Description
$table->data[12][0] = '<b>'.__('Description').'</b>';
$table->data[12][0] = __('Description');
$table->data[12][1] = print_input_text ('comentarios', $comentarios, '', 45, 255, true);
// Learn mode / Normal mode
$table->data[13][0] = '<b>'.__('Module definition').'</b>'.print_help_icon("module_definition", true);
$table->data[13][0] = __('Module definition').print_help_icon("module_definition", true);
$table->data[13][1] = __('Learning mode').' '.print_radio_button_extended ("modo", 1, '', $modo, false, '', 'style="margin-right: 40px;"', true);
$table->data[13][1] .= __('Normal mode').' '.print_radio_button_extended ("modo", 0, '', $modo, false, '', 'style="margin-right: 40px;"', true);
// Status (Disabled / Enabled)
$table->data[14][0] = '<b>'.__('Status').'</b>';
$table->data[14][0] = __('Status');
$table->data[14][1] = __('Disabled').' '.print_radio_button_extended ("disabled", 1, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
$table->data[14][1] .= __('Active').' '.print_radio_button_extended ("disabled", 0, '', $disabled, false, '', 'style="margin-right: 40px;"', true);
// Remote configuration
$table->data[15][0] = '<b>'.__('Remote configuration').'</b>';
$table->data[15][0] = __('Remote configuration');
if (file_exists ($filename['md5'])) {
$table->data[15][1] = date ("F d Y H:i:s.", fileatime ($filename['md5']));
@ -157,7 +156,7 @@ if (file_exists ($filename['md5'])) {
$table->data[15][1] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=main&amp;disk_conf_delete=1&amp;id_agente='.$id_agente.'">';
$table->data[15][1] .= print_image ("images/cross.png", true).'</a>';
} else {
$table->data[15][1] = '<i>'.__('Not available').'</i>';
$table->data[15][1] = '<em>'.__('Not available').'</em>';
}
print_table ($table);

View File

@ -85,7 +85,7 @@ if (isset ($_POST["template_id"])) {
// Main header
echo "<h2>".__('Agent configuration')." &gt; ".__('Module templates')."</h2>";
echo "<h2>".__('Agent configuration')." &raquo; ".__('Module templates')."</h2>";
// ==========================
// TEMPLATE ASSIGMENT FORM
@ -160,4 +160,4 @@ if (!empty ($table->data)) {
echo '<div class="nf">No modules</div>';
}
?>
?>

View File

@ -94,7 +94,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) {
} else {
// title
echo '<h2>'.__('Agent configuration'). ' &gt; '. __('Remote configuration Management').'</h2>';
echo '<h2>'.__('Agent configuration'). ' &raquo; '. __('Remote configuration management').'</h2>';
echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/manage_config_remote&operacion=1">';
echo "<table width='650' border='0' cellspacing='4' cellpadding='4' class='databox'>";

View File

@ -54,7 +54,7 @@ if (isset ($_GET["borrar_agente"])) { // if delete agent
exit;
}
}
echo "<h2>".__('Agent configuration')." &gt; ".__('Agents defined in Pandora')."</h2>";
echo "<h2>".__('Agent configuration')." &raquo; ".__('Agents defined in Pandora')."</h2>";
// Show group selector
if (isset($_POST["ag_group"])){

View File

@ -24,7 +24,7 @@ if (!isset ($id_agente)) {
enterprise_include ('godmode/agentes/module_manager.php');
echo "<h2>".__('Agent configuration')." &gt; ".__('Modules')."</h2>";
echo "<h2>".__('Agent configuration')." &raquo; ".__('Modules')."</h2>";
// Create module/type combo
echo '<table width="300" cellpadding="4" cellspacing="4" class="databox">';

View File

@ -186,7 +186,7 @@ if ($disable_alert) {
}
if ($id_agente) {
echo '<h1>'.__('Agent configuration').' &gt; '.__('Alerts').'</h1>';
echo '<h1>'.__('Agent configuration').' &raquo; '.__('Alerts').'</h1>';
$agents = array ($id_agente => get_agent_name ($id_agente));
} else {
echo '<h1>'.__('Alerts').'</h1>';

View File

@ -69,7 +69,7 @@ if (isset($_POST["purgedb"])){ # Fixed 2005-1-13, nil
}
# End of get parameters block
echo "<h2>".__('Database Maintenance')." &gt; ";
echo "<h2>".__('Database Maintenance')." &raquo; ";
echo __('Database Audit purge')."</h2>";
echo "<table cellpadding='4' cellspacing='4' class='databox'>";

View File

@ -42,7 +42,7 @@ if (isset ($_POST["date_purge"])){
}
# End of get parameters block
echo "<h2>".__('Database Maintenance')." &gt; ".__('Event Database cleanup')."</h2>";
echo "<h2>".__('Database Maintenance')." &raquo; ".__('Event Database cleanup')."</h2>";
$row = get_db_row_sql ("SELECT COUNT(*) AS total, MIN(timestamp) AS first_date, MAX(timestamp) AS latest_date FROM tevento");

View File

@ -39,7 +39,7 @@ if (! give_acl ($config['id_user'], 0, "DM")) {
- A more powerful selection (by Agent, by Module, etc).
*/
echo "<h2>".__('Database Maintenance')." &gt; ";
echo "<h2>".__('Database Maintenance')." &raquo; ";
echo __('Database Information')."</h2>";
echo '<div id="db_info_graph">';
echo '<table border=0>';

View File

@ -37,7 +37,7 @@ if (! give_acl ($config['id_user'], 0, "DM")) {
- A more powerful selection (by Agent, by Module, etc).
*/
echo '<h2>'.__('Database Maintenance').' &gt; '.__('Current database maintenance setup').'</h2>
echo '<h2>'.__('Database Maintenance').' &raquo; '.__('Current database maintenance setup').'</h2>
<table width="550" cellspacing="3" cellpadding="3" border="0">
<tr><td>
<i>'.__('Max. time before compact data').':</i>&nbsp;<b>'.$config['days_compact'].' '.__('days').'</b><br /><br />

View File

@ -32,7 +32,7 @@ if (! give_acl ($config['id_user'], 0, "DM")) {
//id_agent = -1: None selected; id_agent = 0: All
$id_agent = (int) get_parameter_post ("agent", -1);
echo '<h2>'.__('Database Maintenance').' &gt; '.__('Database purge').'</h2>
echo '<h2>'.__('Database Maintenance').' &raquo; '.__('Database purge').'</h2>
<img src="reporting/fgraph.php?tipo=db_agente_purge&id='.$id_agent.'" />
<br /><br />
<h3>'.__('Get data from agent').'</h3>';

View File

@ -29,7 +29,7 @@ if (! give_acl ($config['id_user'], 0, "DM")) {
exit;
}
echo '<h2>'.__('Database Maintenance').' &gt; '.__('Database debug').'</h2>';
echo '<h2>'.__('Database Maintenance').' &raquo; '.__('Database debug').'</h2>';
if ((isset ($_GET["operacion"])) && (!isset ($_POST["update_agent"]))) {

View File

@ -54,7 +54,7 @@ if ($id_group) {
}
}
echo "<h2>".__('Group management')." &gt; ";
echo "<h2>".__('Group management')." &raquo; ";
if ($id_group) {
echo __('Update group');
} else {

View File

@ -123,7 +123,7 @@ if ($delete_group) {
echo "<h3 class='suc'>".__('Group successfully deleted')."</h3>";
}
echo "<h2>".__('Group management')." &gt; ";
echo "<h2>".__('Group management')." &raquo; ";
echo __('Groups defined in Pandora')."</h2>";
$table->width = '65%';

View File

@ -60,7 +60,9 @@ if (give_acl ($config['id_user'], 0, "PM")) {
$sub = array ();
$sub["godmode/modules/manage_nc_groups"]["text"] = __('Component groups');
$sub["godmode/modules/manage_network_components"]["text"] = __('Module components');
$sub["godmode/modules/manage_network_components"]["text"] = __('Network components');
enterprise_hook ('components_submenu');
$sub["godmode/modules/manage_network_templates"]["text"] = __('Module templates');
@ -164,7 +166,7 @@ if (give_acl ($config['id_user'], 0, "PM")) {
$sub = array ();
$sub["godmode/setup/setup_visuals"]["text"] = __('Visual styles');
$sub["godmode/setup/filemgr"]["text"] = __('File Manager');
$sub["godmode/setup/file_manager"]["text"] = __('File manager');
$sub["godmode/setup/links"]["text"] = __('Links');
$sub["godmode/setup/news"]["text"] = __('Site news');
$menu["gsetup"]["sub"] = $sub;

View File

@ -32,7 +32,7 @@ $create = (bool) get_parameter ('create');
$update = (bool) get_parameter ('update');
$delete = (bool) get_parameter ('delete');
echo '<h2>'.__('Module management').' &gt; '. __('Component group management').'</h2>';
echo '<h2>'.__('Module management').' &raquo; '. __('Component group management').'</h2>';
if ($create) {
$name = (string) get_parameter ('name');

View File

@ -134,7 +134,7 @@ if (isset($_GET["delete"])){ // if delete
// ------------------
// SHOW MODULES
// ------------------
echo "<h2>".__('Module management')." &gt; ";
echo "<h2>".__('Module management')." &raquo; ";
echo __('Module component management')."</h2>";
// Show group selector

View File

@ -103,7 +103,7 @@ if ($export_profile) {
exit;
}
echo "<h2>".__('Module management')." &gt; ".__('Module template management')."</h2>";
echo "<h2>".__('Module management')." &raquo; ".__('Module template management')."</h2>";
$result = get_db_all_rows_in_table ("tnetwork_profile", "name");

View File

@ -98,7 +98,7 @@ if (isset ($_GET["create"]) || isset ($_GET["update"])) {
$name = "";
}
echo "<h2>".__('Module management')." &gt; ".__('Module template management')."</h2>";
echo "<h2>".__('Module management')." &raquo; ".__('Module template management')."</h2>";
if ($id_np < 1) {
echo '<form name="new_temp" method="post" action="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np='.$id_np.'&create=1">';

View File

@ -48,7 +48,7 @@ if ($update_module) {
echo "<h3 class='suc'>".__('Module updated successfully')."</h3>";
}
echo "<h2>".__('Module management')." &gt; ";
echo "<h2>".__('Module management')." &raquo; ";
echo __('Defined modules')."</h2>";
echo "<table cellpadding='4' cellspacing='4' width='750' class='databox'>";

View File

@ -120,7 +120,7 @@ if ($create_profile) {
$id_profile = 0;
}
echo '<h2>'.__('Profile management').' &gt; '.$page_title.'</h2>';
echo '<h2>'.__('Profile management').' &raquo; '.$page_title.'</h2>';
// Edit profile
if ($id_profile || $new_profile) {

View File

@ -199,7 +199,7 @@ if (! isset($_GET["delete_module"])) {
}
}
echo "<h2>".__('Reporting')." &gt; ";
echo "<h2>".__('Reporting')." &raquo; ";
if (isset ($chunk1)) {
echo __('Graph builder module list')."</h2>";
echo "<form method='post' action='index.php?sec=greporting&sec2=godmode/reporting/graph_builder&delete_module=1'>";

View File

@ -259,7 +259,7 @@ if ($id_layout) {
$height = $layout['height'];
}
echo "<h2>".__('Reporting')." &gt; ".__('Map builder');
echo "<h2>".__('Reporting')." &raquo; ".__('Map builder');
print_help_icon ("map_builder");
echo "</h2>";

View File

@ -212,8 +212,8 @@ if ($edit_sla_report_content) {
$report_content = get_db_row ('treport_content', 'id_rc', $id_report_content);
/* Show all SLAs defined in the report content */
echo '<h2>'.__('Reporting')." &gt; ";
echo __('Custom reporting builder')." &gt; ";
echo '<h2>'.__('Reporting')." &raquo; ";
echo __('Custom reporting builder')." &raquo; ";
echo '<a href="index.php?sec=greporting&sec2=godmode/reporting/reporting_builder&edit_report=1&id_report='.
$id_report.'">'.$report['name'].'</a></h2>';
echo '<h2>'.__('SLAs defined')."</h2>";
@ -290,7 +290,7 @@ if ($edit_sla_report_content) {
} elseif ($edit_report || $id_report) {
/* Edit and creation report form */
$id_agent = get_parameter_post ("id_agent",0);
echo "<h2>".__('Reporting')." &gt; ";
echo "<h2>".__('Reporting')." &raquo; ";
echo __('Custom reporting builder');
echo " <a href='index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id=".$id_report."'><img src='images/reporting.png'></A>";
@ -484,7 +484,7 @@ if ($edit_sla_report_content) {
}
} else {
// Report LIST
echo "<h2>".__('Reporting')." &gt; ";
echo "<h2>".__('Reporting')." &raquo; ";
echo __('Custom reporting')."</h2>";
$reports = get_reports (array ('order' => 'name'),

View File

@ -86,7 +86,7 @@ if ($create) {
}
// List export servers
echo "<h2>".__('Pandora servers')." &gt; ".__('export targets')."</h2>";
echo "<h2>".__('Pandora servers')." &raquo; ".__('export targets')."</h2>";
$result = get_db_all_rows_in_table ("tserver_export");
if (!$result) {

View File

@ -58,7 +58,7 @@ else {
$options = '';
}
echo '<h2>'.__('Pandora servers').' &gt; '.__('export targets');
echo '<h2>'.__('Pandora servers').' &raquo; '.__('export targets');
//print_help_icon ("exportserver");
echo '</h2>';

View File

@ -92,7 +92,7 @@ if (isset($_GET["create"])) {
// --------------------------------
// SHOW TABLE WITH ALL RECON TASKs
// --------------------------------
echo "<h2>".__('Pandora servers')." &gt; ".__('Manage recontask')."</h2>";
echo "<h2>".__('Pandora servers')." &raquo; ".__('Manage recontask')."</h2>";
$result = get_db_all_rows_in_table ("trecon_task");
$color=1;

View File

@ -53,7 +53,7 @@ if (isset ($_GET["update"])) { // Edit mode
$id_os = -1; // Any
}
echo '<h2>'.__('Pandora servers').' &gt; '.__('Manage recontask');
echo '<h2>'.__('Pandora servers').' &raquo; '.__('Manage recontask');
print_help_icon ("recontask");
echo '</h2>';

View File

@ -53,7 +53,7 @@ if (isset ($_GET["delete"])) {
if (isset($_GET["server"])) {
$id_server= get_parameter_get ("server");
echo "<h2>".__('Pandora servers')." &gt; ".__('Update Server')."</h2>";
echo "<h2>".__('Pandora servers')." &raquo; ".__('Update Server')."</h2>";
$sql = sprintf("SELECT name, ip_address, description FROM tserver WHERE id_server = %d",$id_server);
$row = get_db_row_sql ($sql);
echo '<form name="servers" method="POST" action="index.php?sec=gservers&sec2=godmode/servers/modificar_server&update=1">';
@ -76,7 +76,7 @@ if (isset($_GET["server"])) {
} else {
$result = get_db_all_rows_in_table ("tserver");
echo "<h2>".__('Pandora servers')." &gt; ".__('Manage servers')."</h2>";
echo "<h2>".__('Pandora servers')." &raquo; ".__('Manage servers')."</h2>";
if ($result !== false) {
$table->cellpadding = 4;

View File

@ -0,0 +1,230 @@
<?php
// Pandora FMS - the Flexible Monitoring System
// ============================================
// Copyright (c) 2009 Artica Soluciones Tecnológicas, http://www.artica.es
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Load global vars
require_once ("include/config.php");
check_login ();
if (! give_acl ($config['id_user'], 0, "PM")) {
audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access File manager");
require ("general/noaccess.php");
return;
}
require_once ("include/functions_filemanager.php");
$delete_file = (bool) get_parameter ('delete_file');
$upload_file = (bool) get_parameter ('upload_file');
$create_dir = (bool) get_parameter ('create_dir');
// Upload file
if ($upload_file) {
if (isset ($_FILES['file']) && $_FILES['file']['name'] != "") {
$filename = $_FILES['file']['name'];
$filesize = $_FILES['file']['size'];
$directory = (string) get_parameter ('directory');
// Copy file to directory and change name
$nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename;
if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) {
echo "<h3 class=error>".__('attach_error')."</h3>";
} else {
// Delete temporal file
unlink ($_FILES['file']['tmp_name']);
}
}
}
if ($delete_file) {
echo "<h1>".__('Deleting file')."</h1>";
$file = (string) get_parameter ('filename');
$directory = (string) get_parameter ('directory');
$full_filename = $directory.'/'.$file;
if (!is_dir ($full_filename)){
echo "<h3>".__('Deleting')." ".$full_filename."</h3>";
unlink ($full_filename);
}
}
echo "<h1>".__('File manager')."</h1>";
$directory = (string) get_parameter ('directory', "/");
// CREATE DIR
if ($create_dir) {
$dirname = (string) get_parameter ('dirname');
if ($dirname) {
@mkdir ($directory.'/'.$dirname);
echo '<h3>'.__('Created directory %s', $dirname).'</h3>';
}
}
// A miminal security check to avoid directory traversal
if (preg_match ("/\.\./", $directory))
$directory = "images";
if (preg_match ("/^\//", $directory))
$directory = "images";
if (preg_match ("/^manager/", $directory))
$directory = "images";
/* Add custom directories here */
$fallback_directory = "images";
$available_directories['images'] = "images";
$available_directories['attachment'] = "attachment";
$available_directories['languages'] = "languages";
$banned_directories['include'] = true;
$banned_directories['godmode'] = true;
$banned_directories['operation'] = true;
$banned_directories['reporting'] = true;
$banned_directories['general'] = true;
$banned_directories[ENTERPRISE_DIR] = true;
if (isset ($banned_directories[$directory]))
$directory = $fallback_directory;
// Current directory
$available_directories[$directory] = $directory;
$real_directory = realpath ($config['homedir'].'/'.$directory);
$table->width = '50%';
$table->data = array ();
$table->data[0][0] = __('Directory');
$table->data[0][1] = print_select (get_file_manager_available_directories (),
'directory', $directory, '', 'this.form.submit()', '', true, false);
if (! is_file_manager_writable_dir ($real_directory)) {
echo "<h3 class='error'>".__('Current directory is not writable by HTTP Server')."</h3>";
echo '<p>';
echo __('Please check that current directory has write rights for HTTP server');
echo '</p>';
} else {
$table->data[1][0] = __('Upload file');
$table->data[1][1] = print_input_file ('file', true, $options = false);
$table->data[1][2] = print_submit_button (__('Go'), 'go', false,
'class="sub next"', true);
$table->data[1][2] .= print_input_hidden ('upload_file', 1, true);
}
echo '<form method="post" action="index.php?sec=gsetup&amp;sec2=godmode/setup/file_manager" enctype="multipart/form-data">';
print_table ($table);
echo '</form>';
echo '<h2>'.__('Index of %s', $directory).'</h2>';
// List files
if (! is_dir ($real_directory)) {
echo __('Directory %s doesn\'t exist!', $directory);
return;
}
$files = list_file_manager_dir ($real_directory);
if (count ($files) == 0) {
echo __('No files found');
return;
}
$table->width = '90%';
$table->class = 'listing';
$table->colspan = array ();
$table->data = array ();
$table->head = array ();
$table->size = array ();
$table->size[0] = '24px';
$table->head[0] = '';
$table->head[1] = __('Name');
$table->head[2] = __('Last modification');
$table->head[3] = __('Size');
$table->head[4] = '';
$prev_dir = split ("/", $directory);
$prev_dir_str = "";
for ($i = 0; $i < (count ($prev_dir) - 1); $i++) {
$prev_dir_str .= $prev_dir[$i];
if ($i < (count ($prev_dir) - 2))
$prev_dir_str .= "/";
}
if ($prev_dir_str != '') {
$table->data[0][0] = print_image ('go_previous.png', true);
$table->data[0][1] = '<a href="index.php?sec=gsetup&amp;sec2=godmode/setup/file_manager&directory='.$prev_dir_str.'">';
$table->data[0][1] .= __('Parent directory');
$table->data[0][1] .='</a>';
$table->colspan[0][1] = 5;
}
if (is_writable ($real_directory)) {
$table->data[0][0] = print_image ('images/mimetypes/directory.png', true,
array ('title' => __('Create directory')));
$table->data[0][1] = '<form method="post" action="index.php?sec=gsetup&amp;sec2=godmode/setup/file_manager">';
$table->data[0][1] .= print_input_text ('dirname', '', '', 15, 255, true);
$table->data[0][1] .= print_submit_button (__('Create'), 'crt', false, 'class="sub next"', true);
$table->data[0][1] .= print_input_hidden ('directory', $directory, true);
$table->data[0][1] .= print_input_hidden ('create_dir', 1, true);
$table->data[0][1] .= '</form>';
$table->colspan[0][1] = 5;
}
foreach ($files as $fileinfo) {
$data = array ();
switch ($fileinfo['mime']) {
case MIME_DIR:
$data[0] = print_image ('images/mimetypes/directory.png', true);
break;
case MIME_IMAGE:
$data[0] = print_image ('images/mimetypes/image.png', true);
break;
case MIME_ZIP:
$data[0] = print_image ('images/mimetypes/zip.png', true);
break;
default:
$data[0] = print_image ('images/mimetypes/unknown.png', true);
}
if ($fileinfo['is_dir']) {
$data[1] = '<a href="index.php?sec=gsetup&sec2=godmode/setup/file_manager&directory='.$directory.'/'.$fileinfo['name'].'">'.$fileinfo['name'].'</a>';
} else {
$data[1] = '<a href="'.$fileinfo['url'].'">'.$fileinfo['name'].'</a>';
}
$data[2] = print_timestamp ($fileinfo['last_modified'], true,
array ('prominent' => true));
if ($fileinfo['is_dir']) {
$data[3] = '';
} else {
$data[3] = format_filesize ($fileinfo['size']);
}
array_push ($table->data, $data);
}
print_table ($table);
?>

View File

@ -1,266 +0,0 @@
<?php
// Pandora FMS - the Flexible Monitoring System
// ============================================
// Copyright (c) 2009 Artica Soluciones Tecnológicas, http://www.artica.es
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation for version 2.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Load global vars
require_once ("include/config.php");
check_login ();
if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access File manager");
require ("general/noaccess.php");
exit;
}
// Upload file
if (isset($_GET["upload_file"])) {
if (isset($_FILES["userfile"]) && ( $_FILES['userfile']['name'] != "" )){ //if file
$tipo = $_FILES['userfile']['type'];
$filename= $_FILES['userfile']['name'];
$filesize = $_FILES['userfile']['size'];
$directory = get_parameter ("directory","");
// Copy file to directory and change name
$nombre_archivo = $config["homedir"]."/".$directory."/".$filename;
if (!(copy($_FILES['userfile']['tmp_name'], $nombre_archivo ))){
echo "<h3 class=error>".__("attach_error")."</h3>";
} else {
// Delete temporal file
unlink ($_FILES['userfile']['tmp_name']);
}
}
}
// Delete file
$delete = get_parameter ("delete", "");
if ($delete != ""){
echo "<h1>".__("Deleting file")."</h1>";
$file = get_parameter ("delete", "");
$directory = get_parameter ("directory", "");
$full_filename = $directory . "/". $file;
if (!is_dir ($full_filename)){
echo "<h3>".__("Deleting")." ".$full_filename."</h3>";
unlink ($full_filename);
}
}
echo "<h1>".__("File manager")."</h1>";
$current_directory = get_parameter ("directory", "/");
// CREATE DIR
// Upload file
if (isset($_GET["create_dir"])) {
$newdir = get_parameter ("newdir","");
if ($newdir != ""){
mkdir($current_directory."/".$newdir);
echo "<h3>".__("Created directory '$newdir'")."</h3>";
}
}
// A miminal security check to avoid directory traversal
if (preg_match("/\.\./", $current_directory))
$current_directory = "images";
if (preg_match("/^\//", $current_directory))
$current_directory = "images";
if (preg_match("/^manager/", $current_directory))
$current_directory = "images";
echo "<form method='post' action='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&upload_file' enctype='multipart/form-data'>";
echo "<table cellpadding='4' cellspacing='4' width='550' class='databox'>";
echo "<tr><td class='datos'>";
echo __("Base directory");
echo "<td class='datos'>";
/* Add custom directories here */
$fallback_directory = "images";
$available_directory["images"] = "images";
$available_directory["attachment"] = "attachment";
$available_directory["include/languages"] = "languages";
$banned_directory["include"] = 1;
$banned_directory["godmode"] = 1;
$banned_directory["operation"] = 1;
$banned_directory["reporting"] = 1;
$banned_directory["general"] = 1;
$banned_directory["enterprise"] = 1;
if (isset($banned_directory[$current_directory]))
$current_directory = $fallback_directory;
// Current directory
$available_directory[$current_directory] = $current_directory;
print_select ($available_directory, 'directory', $current_directory, '', '', '', false, false);
echo "&nbsp;&nbsp;<input type=submit value='".__("Go")."'>";
$real_directory = $config["homedir"] . "/". $current_directory;
if (is_writable($real_directory)) {
echo "<tr><td class='datos'>";
echo __("Upload new file");
echo "<td class='datos'>";
echo "<input type='file' size=25 name='userfile' value='userfile'>";
echo "&nbsp;&nbsp;";
echo "<input type=submit value='".__("Upload")."'>";
echo "</form>";
echo "</table>";
} else {
echo "</form>";
echo "</table>";
echo "<h3 class='error'>".__('Current directory is not writtable by HTTP Server')."</h3>";
echo '<p>';
echo __('Please check that current directory has write rights for HTTP server');
echo "</p>";
}
echo "<h2>".__("Current directory"). " : ".$current_directory . " <a href='index.php?manager=filemgr&directory=$current_directory'><img src='images/arrow_refresh.png' border=0></a></h2>";
// Upload form
// List files
$directoryHandler = "";
$result = array ();
if (! $directoryHandler = @opendir ($real_directory)) {
echo ("<pre>\nerror: directory \"$current_directory\" doesn't exist!\n</pre>\n");
return 0;
}
while (false !== ($fileName = @readdir ($directoryHandler))) {
$result[$fileName] = $fileName;
// TODO: Read filetype (image, directory)
// If directory create a link to navigate.
}
asort($result, SORT_STRING);
if (@count ($result) === 0) {
echo __ ("No files found");
} else {
asort ($result);
echo "<table width='750' class='listing'>";
$prev_dir = split( "/", $current_directory );
$prev_dir_str = "";
for ($ax = 0; $ax < (count($prev_dir)-1); $ax++){
$prev_dir_str .= $prev_dir[$ax];
if ($ax < (count($prev_dir)-2))
$prev_dir_str .= "/";
}
if ($prev_dir_str != ""){
echo "<tr><td colspan=6>";
echo "<a href='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&directory=$prev_dir_str'>".__("Go prev. directory")." <img src='images/go-previous.png' border=0></a>";
echo "</th></tr>";
}
echo "<tr><th>";
echo __ ("Filename");
echo "<th>";
echo __ ("Image info");
echo "<th>";
echo __ ("Last update");
echo "<th>";
echo __ ("Owner");
echo "<th>";
echo __ ("Perms");
echo "<th>";
echo __ ("Filesize");
echo "<th>";
echo __ ("File type");
echo "<th>";
echo __ ("Directory");
echo "<th>";
echo __ ("Del");
while (@count($result) > 0){
$temp = array_shift ($result);
$fullfilename = $current_directory.'/'.$temp;
$mimetype = "";
if (($temp != "..") AND ($temp != ".")){
echo "<tr><td>";
if (!is_dir ($current_directory.'/'.$temp)){
echo "<a href='$fullfilename'>$temp</A>";
} else
echo "<a href='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&directory=$current_directory/$temp'>/$temp</a>";
echo "<td>";
if (preg_match("/image/", $mimetype)){
list($ancho, $altura, $tipo, $atr) = getimagesize($fullfilename);
echo $ancho."x".$altura;
}
echo "<td>";
if (!is_dir ($fullfilename))
echo date("F d Y H:i:s.", filemtime($fullfilename));
echo "<td>";
if (!is_dir ($fullfilename))
echo fileowner($fullfilename);
echo "<td>";
if (!is_dir ($fullfilename))
if (!is_readable($fullfilename))
echo "<font color=#ff0000>";
echo __("Read");
echo "<td>";
if (!is_dir ($fullfilename))
echo filesize($fullfilename);
else
echo "&lt;DIR&gt;";
echo "<td>";
if (!is_dir ($fullfilename))
echo $mimetype;
else
echo "&lt;DIR&gt;";
echo "<td align=center>";
if (!is_dir ($fullfilename))
echo "<img src='images/disk.png' border=0>";
else
echo "<img src='images/drive_network.png' border=0>";
echo "<td>";
echo "<a href='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&directory=$current_directory&delete=$temp'><img src='images/cross.png' border=0></a>";
}
}
echo "</table>";
if (is_writable($current_directory)){
echo "<br><br>";
echo "<form method='post' action='index.php?sec=gsetup&amp;sec2=godmode/setup/filemgr&create_dir=1&directory=$current_directory'>";
echo __("Create directory");
echo "&nbsp;&nbsp;";
echo "<input type=text size=15 name='newdir'>";
echo "&nbsp;&nbsp;";
echo "<input type=submit value='Make dir'>";
echo "</form>";
}
}
?>

View File

@ -83,7 +83,7 @@ if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_use
}
// Create link
echo "<h2>".__('Pandora Setup')." &gt; ";
echo "<h2>".__('Pandora Setup')." &raquo; ";
echo __('Link management')."</h2>";
echo '<table class="databox" cellpadding="4" cellspacing="4" width="500">';
echo '<form name="ilink" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/links">';
@ -111,7 +111,7 @@ if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_use
}
else { // Main list view for Links editor
echo "<h2>".__('Pandora Setup')." &gt; ";
echo "<h2>".__('Pandora Setup')." &raquo; ";
echo __('Link management')."</h3>";
echo "<table cellpadding='4' cellspacing='4' class='databox'>";
echo "<th width='180px'>".__('Link name')."</th>";

View File

@ -88,7 +88,7 @@ if ((isset ($_GET["form_add"])) || (isset ($_GET["form_edit"]))) {
}
// Create news
echo "<h2>".__('Pandora Setup')." &gt; ";
echo "<h2>".__('Pandora Setup')." &raquo; ";
echo __('Site news management')."</h2>";
echo '<table class="databox" cellpadding="4" cellspacing="4" width="500">';
echo '<form name="ilink" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/news">';
@ -117,7 +117,7 @@ if ((isset ($_GET["form_add"])) || (isset ($_GET["form_edit"]))) {
<input name='crtbutton' type='submit' class='sub upd' value='".__('Update')."'>";
echo '</form></td></tr></table>';
} else { // Main list view for Links editor
echo "<h2>".__('Pandora Setup')." &gt; ";
echo "<h2>".__('Pandora Setup')." &raquo; ";
echo __('Site news management')."</h3>";
echo "<table cellpadding='4' cellspacing='4' class='databox' width=600>";
echo "<th>".__('Subject')."</th>";

View File

@ -21,12 +21,24 @@ require_once ("include/config.php");
check_login ();
if (is_ajax ()) {
$get_os_icon = (bool) get_parameter ('get_os_icon');
if ($get_os_icon) {
$id_os = (int) get_parameter ('id_os');
print_os_icon ($id_os, false);
return;
}
return;
}
if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Setup Management");
require ("general/noaccess.php");
return;
}
// Load enterprise extensions
enterprise_include ('godmode/setup/setup.php');

View File

@ -41,7 +41,7 @@ enterprise_include ('godmode/setup/setup_visuals.php');
require_once ('include/functions_themes.php');
echo "<h2>".__('Setup')." &gt; ";
echo "<h2>".__('Setup')." &raquo; ";
echo __('Visual configuration')."</h2>";
$table->width = '90%';

View File

@ -137,9 +137,9 @@ if ((isset ($_GET["update_alert"])) && ($_GET["update_alert"] != -1)) {
if (isset ($_GET["update_alert"])) {
//the update_alert means the form should be displayed. If update_alert > 1 then an existing alert is updated
if ($id_as) {
echo "<h2>Pandora SNMP &gt; ".__('Update alert')."</h2>";
echo "<h2>".__('Update alert')."</h2>";
} else {
echo "<h2>Pandora SNMP &gt; ".__('Create alert')."</h2>";
echo "<h2>".__('Create alert')."</h2>";
}
echo '<form name="agente" method="post" action="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&submit='.$id_as.'">';
echo '<table cellpadding="4" cellspacing="4" width="650" class="databox_color">';
@ -250,7 +250,7 @@ if (isset ($_GET["update_alert"])) {
// End table
echo "</td></tr></table>";
} else {
echo "<h2>Pandora SNMP &gt; ".__('Alert Overview')."</h2>";
echo "<h2>".__('Alert Overview')."</h2>";
//Overview
$result = get_db_all_rows_in_table ("talert_snmp");
if ($result === false) {

View File

@ -157,7 +157,7 @@ if ($delete_profile) {
__('Could not be deleted'));
}
echo "<h2>".__('Pandora users')." &gt; ".__('User detail editor')."</h2>";
echo "<h2>".__('Pandora users')." &raquo; ".__('User detail editor')."</h2>";
$table->width = '50%';
$table->data = array ();

View File

@ -42,7 +42,7 @@ if (isset ($_GET["user_del"])) { //delete user
__('There was a problem deleting the profile'));
}
echo '<h2>'.__('User management').' &gt; '.__('Users defined in Pandora').'</h2>';
echo '<h2>'.__('User management').' &raquo; '.__('Users defined in Pandora').'</h2>';
$table->cellpadding = 4;
$table->cellspacing = 4;

Binary file not shown.

After

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 558 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

View File

@ -0,0 +1,216 @@
<?php
// Pandora FMS - the Flexible Monitoring System
// ============================================
// Copyright (c) 2008 Artica Soluciones Tecnologicas, http://www.artica.es
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License (LGPL)
// as published by the Free Software Foundation for version 2.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
define ('MIME_UNKNOWN', 0);
define ('MIME_DIR', 1);
define ('MIME_IMAGE', 2);
define ('MIME_ZIP', 3);
if (!function_exists ('mime_content_type')) {
/**
* Gets the MIME type of a file.
*
* Help function in case mime_magic is not loaded on PHP.
*
* @param string Filename to get MIME type.
*
* @return The MIME type of the file.
*/
function mime_content_type ($filename) {
$mime_types = array (
'txt' => 'text/plain',
'htm' => 'text/html',
'html' => 'text/html',
'php' => 'text/html',
'css' => 'text/css',
'js' => 'application/javascript',
'json' => 'application/json',
'xml' => 'application/xml',
'swf' => 'application/x-shockwave-flash',
'flv' => 'video/x-flv',
// images
'png' => 'image/png',
'jpe' => 'image/jpeg',
'jpeg' => 'image/jpeg',
'jpg' => 'image/jpeg',
'gif' => 'image/gif',
'bmp' => 'image/bmp',
'ico' => 'image/vnd.microsoft.icon',
'tiff' => 'image/tiff',
'tif' => 'image/tiff',
'svg' => 'image/svg+xml',
'svgz' => 'image/svg+xml',
// archives
'zip' => 'application/zip',
'rar' => 'application/x-rar-compressed',
'exe' => 'application/x-msdownload',
'msi' => 'application/x-msdownload',
'cab' => 'application/vnd.ms-cab-compressed',
'gz' => 'application/x-gzip',
'gz' => 'application/x-bzip2',
// audio/video
'mp3' => 'audio/mpeg',
'qt' => 'video/quicktime',
'mov' => 'video/quicktime',
// adobe
'pdf' => 'application/pdf',
'psd' => 'image/vnd.adobe.photoshop',
'ai' => 'application/postscript',
'eps' => 'application/postscript',
'ps' => 'application/postscript',
// ms office
'doc' => 'application/msword',
'rtf' => 'application/rtf',
'xls' => 'application/vnd.ms-excel',
'ppt' => 'application/vnd.ms-powerpoint',
// open office
'odt' => 'application/vnd.oasis.opendocument.text',
'ods' => 'application/vnd.oasis.opendocument.spreadsheet'
);
$ext = strtolower (array_pop (explode ('.', $filename)));
if (array_key_exists ($ext, $mime_types)) {
return $mime_types[$ext];
} elseif (function_exists ('finfo_open')) {
$finfo = finfo_open (FILEINFO_MIME);
$mimetype = finfo_file ($finfo, $filename);
finfo_close ($finfo);
return $mimetype;
} else {
return 'application/octet-stream';
}
}
}
/**
* Get the available directories of the file manager.
*
* @return array An array with all the directories where the file manager can
* operate.
*/
function get_file_manager_available_directories () {
$dirs = array ();
$dirs['images'] = "images";
$dirs['attachment'] = "attachment";
$dirs['languages'] = "languages";
return $dirs;
}
/**
* Check if a dirname is available for the file manager.
*
* @param string Dirname to check.
*
* @return array An array with all the directories where the file manager can
* operate.
*/
function is_file_manager_available_directory ($dirname) {
$dirs = get_file_manager_available_directories ();
return isset ($dirs[$dirname]);
}
/**
* Check if a directory is writable.
*
* @param string Directory path to check.
* @param bool If set, it will try to make the directory writeable if it's not.
*
* @param bool Wheter the directory is writeable or not.
*/
function is_file_manager_writable_dir ($dirpath, $force = false) {
if (! is_file_manager_available_directory (basename ($dirpath)))
return false;
if (! $force)
return is_writable ($dirpath);
return (is_writable ($dirpath) || @chmod ($dirpath, 0755));
}
/**
* Check if a directory is writable.
*
* @param string Directory path to check.
* @param bool If set, it will try to make the directory writeable if it's not.
*
* @param bool Wheter the directory is writeable or not.
*/
function get_file_manager_file_info ($filepath) {
global $config;
$realpath = realpath ($filepath);
$info = array ('mime' => MIME_UNKNOWN,
'mime_extend' => mime_content_type ($filepath),
'link' => 0,
'is_dir' => false,
'name' => basename ($realpath),
'url' => $config['homeurl'].str_ireplace ($config['homedir'], '', $realpath),
'realpath' => $realpath,
'size' => filesize ($realpath),
'last_modified' => filemtime ($realpath)
);
$zip_mimes = array ('application/zip',
'application/x-rar-compressed',
'application/x-gzip',
'application/x-bzip2');
if (is_dir ($filepath)) {
$info['mime'] = MIME_DIR;
$info['is_dir'] = true;
$info['size'] = 0;
} else if (strpos ($info['mime_extend'], 'image') === 0) {
$info['mime'] = MIME_IMAGE;
} else if (in_array ($info['mime_extend'], $zip_mimes)) {
$info['mime'] = MIME_ZIP;
}
return $info;
}
/**
* Check if a directory is writable.
*
* @param string Directory path to check.
* @param bool If set, it will try to make the directory writeable if it's not.
*
* @param bool Wheter the directory is writeable or not.
*/
function list_file_manager_dir ($dirpath) {
$files = array ();
$dirs = array ();
$dir = opendir ($dirpath);
while ($file = @readdir ($dir)) {
/* Ignore hidden files */
if ($file[0] == '.')
continue;
$info = get_file_manager_file_info ($dirpath.'/'.$file);
if ($info['is_dir']) {
$dirs[$file] = $info;
} else {
$files[$file] = $info;
}
}
ksort ($files);
ksort ($dirs);
closedir ($dir);
return array_merge ($dirs, $files);
}
?>

View File

@ -673,7 +673,7 @@ function get_group_agents_detailed_reporting ($id_group, $period = 0, $date = 0,
if ($return === false)
echo $output;
return $output;
}

View File

@ -138,10 +138,8 @@ function delete_report ($id_report) {
$report = get_report ($id_report);
if ($report === false)
return false;
$res1 = @process_sql_delete ('treport_content', array ('id_report' => $id_report));
$res2 = @process_sql_delete ('treport', array ('id_report' => $id_report));
return $res1 && $res2;
@process_sql_delete ('treport_content', array ('id_report' => $id_report));
return @process_sql_delete ('treport', array ('id_report' => $id_report));
}
/**

View File

@ -230,7 +230,7 @@ function print_os_icon ($id_os, $name = true, $return = false) {
return "-";
}
$output = '<img src="images/'.$icon.'" border="0" alt="'.$os_name.'" title="'.$os_name.'" />';
$output = '<img src="images/'.$icon.'" alt="'.$os_name.'" title="'.$os_name.'" />';
if ($name === true) {
$output .= ' - '.$os_name;
@ -583,14 +583,15 @@ function process_page_head ($string, $bitfield) {
if ($config['https']) {
/* Check with "on" because some web servers like Cherokee always
set this value even if SSL is not enabled */
if (isset ($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == true || $_SERVER['HTTPS'] == 'on')) {
if (isset ($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] === true || $_SERVER['HTTPS'] == 'on')) {
$protocol = 'https';
$ssl = true;
}
}
$query = $protocol.'://' . $_SERVER['SERVER_NAME'];
if ($_SERVER['SERVER_PORT'] != 80 && ($ssl && $_SERVER['SERVER_PORT'] != 443)) {
if ((!$ssl && $_SERVER['SERVER_PORT'] != 80) || ($ssl && $_SERVER['SERVER_PORT'] != 443)) {
$query .= ":".$_SERVER['SERVER_PORT'];
}
$query .= $_SERVER['SCRIPT_NAME'];
@ -997,7 +998,7 @@ function print_moduletype_icon ($id_moduletype, $return = false) {
function format_filesize ($bytes) {
$bytes = (int) $bytes;
$strs = array ('B', 'kB', 'MB', 'GB', 'TB');
if ($bytes < 0) {
if ($bytes <= 0) {
return "0 ".$strs[0];
}
$con = 1024;
@ -1013,47 +1014,48 @@ function format_filesize ($bytes) {
*
* @return array An array with the image path, image width and image height.
*/
function get_status_images_path()
{
function get_status_images_path () {
global $config;
$imageset = $config["status_images_set"];
if (strpos($imageset, ",") === false) $imageset .= ",40x18";
list($imageset, $sizes) = split(",", $imageset, 2);
if (strpos ($imageset, ",") === false)
$imageset .= ",40x18";
list ($imageset, $sizes) = split (",", $imageset, 2);
if (strpos($sizes, "x") === false) $sizes .= "x18";
list($imagewidth, $imageheight) = split("x", $sizes, 2); // 40x18
if (strpos ($sizes, "x") === false)
$sizes .= "x18";
list ($imagewidth, $imageheight) = split ("x", $sizes, 2);
$imagespath = "images/status_sets/$imageset";
$imagespath = 'images/status_sets/'.$imageset;
return array($imagespath);
return array ($imagespath);
}
define('STATUS_MODULE_OK', 'module_ok.png');
define('STATUS_MODULE_CRITICAL', 'module_critical.png');
define('STATUS_MODULE_WARNING', 'module_warning.png');
define ('STATUS_MODULE_OK', 'module_ok.png');
define ('STATUS_MODULE_CRITICAL', 'module_critical.png');
define ('STATUS_MODULE_WARNING', 'module_warning.png');
define('STATUS_AGENT_CRITICAL', 'agent_critical.png');
define('STATUS_AGENT_WARNING', 'agent_warning.png');
define('STATUS_AGENT_DOWN', 'agent_down.png');
define('STATUS_AGENT_OK', 'agent_ok.png');
define('STATUS_AGENT_NO_DATA', 'agent_no_data.png');
define('STATUS_AGENT_NO_MONITORS', 'agent_no_monitors.png');
define ('STATUS_AGENT_CRITICAL', 'agent_critical.png');
define ('STATUS_AGENT_WARNING', 'agent_warning.png');
define ('STATUS_AGENT_DOWN', 'agent_down.png');
define ('STATUS_AGENT_OK', 'agent_ok.png');
define ('STATUS_AGENT_NO_DATA', 'agent_no_data.png');
define ('STATUS_AGENT_NO_MONITORS', 'agent_no_monitors.png');
define('STATUS_ALERT_FIRED', 'alert_fired.png');
define('STATUS_ALERT_NOT_FIRED', 'alert_not_fired.png');
define('STATUS_ALERT_DISABLED', 'alert_disabled.png');
define ('STATUS_ALERT_FIRED', 'alert_fired.png');
define ('STATUS_ALERT_NOT_FIRED', 'alert_not_fired.png');
define ('STATUS_ALERT_DISABLED', 'alert_disabled.png');
define('STATUS_SERVER_OK', 'server_ok.png');
define('STATUS_SERVER_DOWN', 'server_down.png');
function print_status_image($type, $title = "", $return = false) {
list($imagepath) = get_status_images_path();
define ('STATUS_SERVER_OK', 'server_ok.png');
define ('STATUS_SERVER_DOWN', 'server_down.png');
function print_status_image ($type, $title = "", $return = false) {
list ($imagepath) = get_status_images_path ();
$imagepath .= "/" . $type;
return print_image ($imagepath, $return, array ("border" => 0, "title" => $title));
return print_image ($imagepath, $return, array ("title" => $title));
}
?>

View File

@ -164,9 +164,52 @@
};
}
});
$.extend ({
pandoraSelectOS: new function() {
this.defaults = {
alertSelect: "select#id_od",
spanPreview: "#os_preview",
debug: false
};
/* public methods */
this.construct = function (settings) {
return this.each (function() {
this.config = {};
this.config = $.extend (this.config, $.pandoraSelectOS.defaults, settings);
var config = this.config;
$(this).change (function () {
var id_os = this.value;
$(config.spanPreview).fadeOut ('fast', function () {
$("img", config.spanPreview).remove ();
jQuery.post ('ajax.php',
{"page": "godmode/setup/setup",
"get_os_icon": 1,
"id_os": id_os
},
function (data) {
$(config.spanPreview)
.append (data)
.fadeIn ('fast');
},
"html"
);
});
});
});
};
}
});
$.fn.extend({
pandoraSelectGroup: $.pandoraSelectGroup.construct,
pandoraSelectAgentModule: $.pandoraSelectAgentModule.construct,
pandoraSelectAgentAlert: $.pandoraSelectAgentAlert.construct
pandoraSelectAgentAlert: $.pandoraSelectAgentAlert.construct,
pandoraSelectOS: $.pandoraSelectOS.construct
});
}) (jQuery);

View File

@ -35,7 +35,7 @@ input, textarea {
textarea {
padding: 5px;
min-height: 100px;
width: 100%;
width: 99%;
}
textarea.conf_editor {
padding: 5px;

View File

@ -102,7 +102,7 @@ if ($tab != '') {
$url = $url.'&tab='.$tab;
}
echo "<h2>".__('Pandora Agents')." &gt; ".__('Alerts').'</h2>';
echo "<h2>".__('Pandora Agents')." &raquo; ".__('Alerts').'</h2>';
echo '<form method="post" action="'.$url.'">';

View File

@ -29,7 +29,7 @@ if (! give_acl ($config['id_user'], $group, "AR") || $module_id == 0) {
audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation",
"Trying to access Agent Data view");
require ("general/noaccess.php");
exit;
return;
}
if (isset ($_GET["delete"])) {

View File

@ -53,7 +53,7 @@ $ag_group = get_parameter ("ag_group", $group_id);
$ag_group = get_parameter_get ("ag_group_refresh", $ag_group); //if it isn't set, defaults to prev. value
$search = get_parameter ("search", "");
echo "<h2>".__('Pandora Agents')." &gt; ".__('Summary')."</h2>";
echo "<h2>".__('Pandora Agents')." &raquo; ".__('Summary')."</h2>";
// Show group selector (POST)
if (isset($_POST["ag_group"])){

View File

@ -36,7 +36,7 @@ if (! give_acl ($config["id_user"], $agent["id_grupo"], "AR")) {
return;
}
echo "<h2>".__('Pandora Agents')." &gt; ".__('Agent general information')."</h2>";
echo "<h2>".__('Pandora Agents')." &raquo; ".__('Agent general information')."</h2>";
// Blank space below title
echo '<div style="height: 10px">&nbsp;</div>';

View File

@ -29,7 +29,7 @@ if (! give_acl ($config['id_user'], 0, "AR")) {
require ("general/noaccess.php");
exit;
}
echo "<h2>".__('Pandora Agents')." &gt; ".__('Group view')."</h2>";
echo "<h2>".__('Pandora Agents')." &raquo; ".__('Group view')."</h2>";
// Update network modules for this group
// Check for Network FLAG change request

View File

@ -46,7 +46,7 @@ $label_group = 0;
$last_label = "";
// Title
echo "<h2>".__('Pandora Agents')." &gt; ";
echo "<h2>".__('Pandora Agents')." &raquo; ";
echo __('Display of last data modules received by agent');
echo "&nbsp;<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente&tab=data'><img src='images/refresh.png'></A>";
echo "</h2>";

View File

@ -98,7 +98,7 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){
$export_type = 3; // Standard table;
// Header
echo "<h2>".__('Pandora Agents')." &gt; ";
echo "<h2>".__('Pandora Agents')." &raquo; ";
echo __('Database export results')."</h2>";
if ($export_type == 1) { // CSV
@ -246,7 +246,7 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){
$config['js'][] = 'calendar';
echo "<h2>".__('Pandora Agents')." &gt; ";
echo "<h2>".__('Pandora Agents')." &raquo; ";
echo __('Export data')."</h2>";
echo '<form method="post" action="index.php?sec=estado&sec2=operation/agentes/exportdata" name="export_form">';

View File

@ -253,7 +253,7 @@ $simple = (boolean) get_parameter ('simple', 0);
$regen = (boolean) get_parameter ('regen',1); // Always regen by default
$font_size = (int) get_parameter ('font_size', 12);
echo '<h2>'.__('Pandora Agents').' &gt; '.__('Network Map').'&nbsp;';
echo '<h2>'.__('Pandora Agents').' &raquo; '.__('Network Map').'&nbsp;';
if ($pure == 1) {
echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/networkmap&amp;pure=0">';
print_image ("images/monitor.png", false, array ('title' => __('Normal screen'), 'alt' => __('Normal screen')));

View File

@ -30,7 +30,7 @@ if (! give_acl ($config['id_user'], 0, "AR") && ! give_acl ($config['id_user'],
exit;
}
echo "<h2>".__('Pandora Agents')." &gt; ".__('Full list of Monitors')."</h2>";
echo "<h2>".__('Pandora Agents')." &raquo; ".__('Full list of Monitors')."</h2>";
$ag_freestring = get_parameter ("ag_freestring", "");
$ag_modulename = get_parameter ("ag_modulename", "");

View File

@ -47,7 +47,7 @@ function print_cells_temp ($cells) {
}
echo "<h2>".__('Pandora Agents')." &gt; ".__('Tactical view')."</h2>";
echo "<h2>".__('Pandora Agents')." &raquo; ".__('Tactical view')."</h2>";
$data = get_group_stats ();

View File

@ -171,7 +171,7 @@ $url = "index.php?sec=eventos&amp;sec2=operation/events/events&amp;search=".rawu
echo '<h3 id="result" style="display:none">&nbsp;</h3>';
echo "<h2>".__('Events')." &gt; ".__('Main event view'). "&nbsp;";
echo "<h2>".__('Events')." &raquo; ".__('Main event view'). "&nbsp;";
if ($config["pure"] == 1) {
echo '<a target="_top" href="'.$url.'&amp;pure=0">';

View File

@ -172,7 +172,7 @@ if (empty ($result)) {
$count = count ($result);
}
echo '<h2>'.__('Incident management').' &gt; '.__('Manage incidents').'</h2>
echo '<h2>'.__('Incident management').' &raquo; '.__('Manage incidents').'</h2>
<form name="visualizacion" method="post" action="index.php?sec=incidencias&amp;sec2=operation/incidents/incident">
<table class="databox" cellpadding="4" cellspacing="4" width="95%"><tr>
<td valign="middle"><h3>'.__('Filter').'</h3>';

View File

@ -207,10 +207,10 @@ echo "<script type=\"text/javascript\">
if (isset ($id_inc)) { //If $id_inc is set (when $_GET["id"] is set, not $_GET["insert_form"]
echo '<form name="accion_form" method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident&action=update">';
echo '<input type="hidden" name="id_inc" value="'.$id_inc.'">';
echo '<h2>'.__('Incident management').' &gt; '.__('Incident details').' #'.$id_inc.'</h2>';
echo '<h2>'.__('Incident management').' &raquo; '.__('Incident details').' #'.$id_inc.'</h2>';
} else {
echo '<form name="accion_form" method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident&action=insert">';
echo '<h2>'.__('Incident management').' &gt; '.__('Create incident').'</h2>';
echo '<h2>'.__('Incident management').' &raquo; '.__('Create incident').'</h2>';
}
echo '<table cellpadding="4" cellspacing="4" class="databox" width="650px">';

View File

@ -27,7 +27,7 @@ if (! give_acl ($config['id_user'], 0, "IR") == 1) {
require ("general/noaccess.php");
exit;
}
echo "<h2>".__('Incident management')." &gt; ".__('Statistics')."</h2>";
echo "<h2>".__('Incident management')." &raquo; ".__('Statistics')."</h2>";
echo '<table width="90%">
<tr><td valign="top"><h3>'.__('Incidents by status').'</h3>

View File

@ -63,7 +63,7 @@ if (isset ($_GET["mark_read"]) || isset ($_GET["mark_unread"])) {
}
if (isset ($_GET["new_msg"])) { //create message
echo "<h2>".__('Messages')." &gt; ".__('New message').'</h2>';
echo "<h2>".__('Messages')." &raquo; ".__('New message').'</h2>';
echo '<form method="POST" action="index.php?sec=messages&amp;sec2=operation/messages/message&amp;send_message=1">
<table width="600" class="databox_color" cellpadding="4" cellspacing="4">
<tr>
@ -94,7 +94,7 @@ if (isset ($_GET["new_msg"])) { //create message
echo '</td></tr></table></form>';
} elseif (isset ($_GET["read_message"])) {
echo "<h2>".__('Messages')." &gt; ".__('Read message').'</h2>';
echo "<h2>".__('Messages')." &raquo; ".__('Read message').'</h2>';
$message_id = (int) get_parameter ("read_message");
$message = get_message ($message_id);
@ -140,7 +140,7 @@ if (isset ($_GET["new_msg"])) { //create message
if (isset ($_GET["read_message"]) || !isset ($_GET["new_msg"])) {
if (empty ($config["pure"]) && !is_ajax ()) {
echo "<h2>".__('Messages')." &gt; ".__('Message overview').'</h2>';
echo "<h2>".__('Messages')." &raquo; ".__('Message overview').'</h2>';
}
//Get number of messages

View File

@ -24,7 +24,7 @@ require_once ('include/functions_reports.php');
// Load enterprise extensions
enterprise_include ('operation/reporting/custom_reporting.php');
echo "<h2>".__('Reporting')." &gt; ";
echo "<h2>".__('Reporting')." &raquo; ";
echo __('Custom reporting')."</h2>";
$reports = get_reports ();

View File

@ -91,7 +91,7 @@ if ($view_graph) {
exit;
}
echo "<h2>".__('Reporting')." &gt; ";
echo "<h2>".__('Reporting')." &raquo; ";
echo __('Combined image render')."</h2>";
echo "<table class='databox_frame' cellpadding=0 cellspacing=0>";
echo "<tr><td>";
@ -129,7 +129,7 @@ if ($view_graph) {
echo "</form>";
}
}
echo "<h2>" . __('Reporting') . " &gt; ";
echo "<h2>" . __('Reporting') . " &raquo; ";
echo __('Custom graph viewer') . "</h2>";
$graphs = get_user_custom_graphs ();

View File

@ -49,7 +49,7 @@ if ($report['private'] && ($report['id_user'] != $config['id_user'] && ! is_user
$date = (string) get_parameter ('date', date ('Y-m-j'));
$time = (string) get_parameter ('time', date ('h:iA'));
echo "<h2>".__('Reporting')." &gt; ";
echo "<h2>".__('Reporting')." &raquo; ";
echo __('Custom reporting')." - ";
echo $report['name']."</h2>";

View File

@ -33,11 +33,9 @@ $total_modules_network = 0;
$total_modules_data = 0;
echo "<h2>".__('Pandora servers')." &gt; ".__('Configuration detail')."</h2>";
echo "<h2>".__('Pandora servers')." &raquo; ".__('Configuration detail')."</h2>";
$total_modules = (int) get_db_sql ("SELECT COUNT(*)
FROM tagente_modulo
WHERE tagente_modulo.disabled = 0");
$total_modules = (int) get_db_value ('COUNT(*)', 'tagente_modulo', 'disabled', 0);
$servers = get_server_info ();
$table->width = '98%';

View File

@ -22,7 +22,7 @@ require_once ("include/config.php");
check_login ();
echo '<h2>'.__('Pandora users').' &gt; '.__('Users defined in Pandora').'</h2>';
echo '<h2>'.__('Pandora users').' &raquo; '.__('Users defined in Pandora').'</h2>';
$table->cellpadding = 4;
$table->cellspacing = 4;
@ -144,4 +144,4 @@ foreach ($profiles as $profile) {
print_table ($table);
unset ($table);
?>
?>

View File

@ -67,7 +67,7 @@ if (isset ($_GET["modified"]) && !$view_mode) {
$user_info = $upd_info;
}
echo "<h2>".__('Pandora users')." &gt; ".__('User detail editor')."</h2>";
echo "<h2>".__('Pandora users')." &raquo; ".__('User detail editor')."</h2>";
echo '<form name="user_mod" method="post" action="index.php?sec=usuarios&amp;sec2=operation/users/user_edit&amp;modified=1&amp;id='.$id.'">';

View File

@ -21,7 +21,7 @@ require_once ("include/config.php");
check_login ();
echo "<h2>".__('Users defined in Pandora')." &gt; ".__('User activity statistics')."</h2>";
echo "<h2>".__('Users defined in Pandora')." &raquo; ".__('User activity statistics')."</h2>";
print_image ("reporting/fgraph.php?tipo=user_activity", false, array ("border" => 0));
?>

View File

@ -19,7 +19,7 @@
// Login check
check_login ();
echo "<h2>".__('Visual console')." &gt; ".__('Summary')."</h2>";
echo "<h2>".__('Visual console')." &raquo; ".__('Summary')."</h2>";
require_once ('include/functions_visual_map.php');
$layouts = get_user_layouts ();