2011-03-17 Raul Mateos <raulofpandora@gmail.com>

* operation/menu.php, godmode/menu.php, godmode/setup/setup.php,
	extensions/pandora_logs.php, extensions/dbmanager.php:
	Cleaned code and updated year.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4107 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2011-03-17 20:51:46 +00:00
parent 74072427d7
commit 96e78fd22f
6 changed files with 35 additions and 53 deletions

View File

@ -1,3 +1,9 @@
2011-03-17 Raul Mateos <raulofpandora@gmail.com>
* operation/menu.php, godmode/menu.php, godmode/setup/setup.php,
extensions/pandora_logs.php, extensions/dbmanager.php:
Cleaned code and updated year.
2011-03-17 Sergio Martin <sergio.martin@artica.es>
* operation/integria_incidents

View File

@ -2,7 +2,7 @@
//Pandora FMS- http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@ -78,21 +78,20 @@ function dbmanager_query ($sql, &$error) {
function dbmgr_extension_main () {
require_css_file ('dbmanager', 'extensions/dbmanager/');
global $config;
if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
pandora_audit("ACL Violation", "Trying to access Setup Management");
require ("general/noaccess.php");
return;
}
global $config;
if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
pandora_audit("ACL Violation", "Trying to access Setup Management");
require ("general/noaccess.php");
return;
}
$sql = (string) get_parameter ('sql');
print_page_header (__('Database interface'), "", false, false, true);
echo '<div class="notify">';
echo "This is an advanced extension to interface with Pandora FMS database directly from WEB console using native SQL sentences. Please note that <b>you can damage</b> your Pandora FMS installation if you don't know </b>exactly</b> what are you doing, this means that you can severily damage your setup using this extension. This extension is intended to be used <b>only by experienced users</b> with a depth knowledgue of Pandora FMS internals.";
echo "This is an advanced extension to interface with Pandora FMS database directly from WEB console using native SQL sentences. Please note that <b>you can damage</b> your Pandora FMS installation if you don't know </b>exactly</b> what are you are doing, this means that you can severily damage your setup using this extension. This extension is intended to be used <b>only by experienced users</b> with a depth knowledge of Pandora FMS internals.";
echo '</div>';
echo "<br />";

View File

@ -2,7 +2,7 @@
//Pandora FMS- http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@ -38,11 +38,11 @@ function view_logfile ($file_name) {
function pandoralogs_extension_main () {
global $config;
if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
pandora_audit("ACL Violation", "Trying to access Setup Management");
require ("general/noaccess.php");
return;
}
if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
pandora_audit("ACL Violation", "Trying to access Setup Management");
require ("general/noaccess.php");
return;
}
print_page_header (__("System logfile viewer"), "images/extensions.png", false, "", true, "" );

View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
@ -34,7 +34,6 @@ if (check_acl ($config['id_user'], 0, "AW")) {
if (check_acl ($config["id_user"], 0, "PM")) {
$sub["godmode/groups/group_list"]["text"] = __('Manage groups');
$sub["godmode/groups/modu_group_list"]["text"] = __('Module groups');
$sub["godmode/agentes/planned_downtime"]["text"] = __('Scheduled downtime');
$sub["godmode/agentes/fields_manager"]["text"] = __('Manage custom fields');
}
@ -50,11 +49,8 @@ if (check_acl ($config['id_user'], 0, "AW")) {
$sub = array ();
$sub["godmode/massive/massive_operations&amp;tab=massive_agents"]["text"] = __('Agents operations');
$sub["godmode/massive/massive_operations&amp;tab=massive_modules"]["text"] = __('Modules operations');
$sub["godmode/massive/massive_operations&amp;tab=massive_alerts"]["text"] = __('Alerts operations');
enterprise_hook('massivepolicies_submenu');
$menu["gmassive"]["sub"] = $sub;
@ -71,15 +67,11 @@ if (check_acl ($config['id_user'], 0, "PM")) {
$sub = array ();
$sub["godmode/modules/manage_nc_groups"]["text"] = __('Component groups');
$sub["godmode/modules/manage_network_components"]["text"] = __('Network components');
enterprise_hook ('components_submenu');
$sub["godmode/modules/manage_network_templates"]["text"] = __('Module templates');
enterprise_hook ('inventory_submenu');
$menu["gmodules"]["sub"] = $sub;
}
@ -90,9 +82,8 @@ if (check_acl ($config['id_user'], 0, "LM")) {
$sub = array ();
$sub["godmode/alerts/alert_templates"]["text"] = __('Templates');
$sub["godmode/alerts/alert_actions"]["text"] = __('Actions');
if (check_acl ($config['id_user'], 0, "PM")) {
$sub["godmode/alerts/alert_commands"]["text"] = __('Commands');
}
@ -121,7 +112,6 @@ if (check_acl($config['id_user'], 0, "LW")) {
$sub = array ();
//$sub["godmode/snmpconsole/snmp_alert"]["text"] = __('Component groups');
$sub['godmode/snmpconsole/snmp_filters']['text'] = __('SNMP filters');
enterprise_hook ('snmpconsole_submenu');
$menu["gsnmpconsole"]["sub"] = $sub;
@ -139,9 +129,8 @@ if (check_acl ($config['id_user'], 0, "IW")) {
// Custom graph builder
$sub["godmode/reporting/graphs"]["text"] = __('Graph builder');
enterprise_hook ('reporting_godmenu');
$menu["greporting"]["sub"] = $sub;
}
if (check_acl ($config['id_user'], 0, "IW")) {
@ -164,16 +153,13 @@ if (check_acl ($config['id_user'], 0, "PM")) {
$menu["gservers"]["text"] = __('Manage servers');
$menu["gservers"]["sec2"] = "godmode/servers/modificar_server";
$menu["gservers"]["id"] = "god-servers";
$sub = array ();
$sub["godmode/servers/manage_recontask"]["text"] = __('Manage recontask');
$sub["godmode/servers/plugin"]["text"] = __('Manage plugins');
$sub["godmode/servers/recon_script"]["text"] = __('Manage recon script');
enterprise_hook('export_target_submenu');
$menu["gservers"]["sub"] = $sub;
}
@ -186,7 +172,7 @@ if (check_acl ($config['id_user'], 0, "PM")) {
$menu["glog"]["text"] = __('System audit log');
$menu["glog"]["sec2"] = "godmode/admin_access_logs";
$menu["glog"]["id"] = "god-audit";
// Setup
$menu["gsetup"]["text"] = __('Setup');
$menu["gsetup"]["sec2"] = "godmode/setup/setup";
@ -206,8 +192,8 @@ if (check_acl ($config['id_user'], 0, "PM")) {
enterprise_hook ('historydb_submenu');
enterprise_hook ('enterprise_acl_submenu');
enterprise_hook ('skins_submenu');
$sub["extras/pandora_diag"]["text"] = __('Diagnostic info');
$menu["gsetup"]["sub"] = $sub;
}
@ -218,15 +204,10 @@ if (check_acl ($config['id_user'], 0, "DM")) {
$sub = array ();
$sub["godmode/db/db_info"]["text"] = __('DB information');
$sub["godmode/db/db_purge"]["text"] = __('Database purge');
$sub["godmode/db/db_refine"]["text"] = __('Database debug');
$sub["godmode/db/db_audit"]["text"] = __('Database audit');
$sub["godmode/db/db_event"]["text"] = __('Database event');
$sub["godmode/db/db_sanity"]["text"] = __('Database sanity');
$menu["gdbman"]["sub"] = $sub;

View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
@ -99,7 +99,6 @@ $table->data[11][0] = __('Enforce https');
$table->data[11][1] = __('Yes').'&nbsp;'.print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to Pandora FMS Console. Do you want to continue?') . "')) return false", '', true) .'&nbsp;&nbsp;';
$table->data[11][1] .= __('No').'&nbsp;'.print_radio_button ('https', 0, '', $config["https"], true);
$table->data[14][0] = __('Attachment store');
$table->data[14][1] = print_input_text ('attachment_store', $config["attachment_store"], '', 50, 255, true);

View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
@ -29,9 +29,7 @@ $menu['class'] = 'operation';
if (check_acl ($config['id_user'], 0, "AR")) {
enterprise_hook ('metaconsole_menu');
enterprise_hook ('dashboard_menu');
enterprise_hook ('services_menu');
//View agents
@ -225,11 +223,11 @@ if (check_acl ($config['id_user'], 0, "AR")) {
$menu["eventos"]["sub"] = $sub;
}
// ANY user can view itself !
// Users
$menu["usuarios"]["text"] = __('Edit my user');
$menu["usuarios"]["sec2"] = "operation/users/user_edit";
$menu["usuarios"]["id"] = "oper-users";
// ANY user can view him/herself !
// Users
$menu["usuarios"]["text"] = __('Edit my user');
$menu["usuarios"]["sec2"] = "operation/users/user_edit";
$menu["usuarios"]["id"] = "oper-users";
//End of Users
@ -260,7 +258,6 @@ if (check_acl ($config['id_user'], 0, "AR")) {
$sub = array ();
$sub["operation/reporting/custom_reporting"]["text"] = __('Custom reporting');
$sub["operation/reporting/graph_viewer"]["text"] = __('Custom graphs');
$menu["reporting"]["sub"] = $sub;