From 1aedb197ad4ec40523952aa4ac5a359941e83f8c Mon Sep 17 00:00:00 2001 From: raulmateos Date: Thu, 17 Mar 2011 22:01:01 +0000 Subject: [PATCH] 2011-03-17 Raul Mateos * extensions/dbmanager.php, extensions/pandora_logs.php, general/*.php, index.php, ajax.php, operation/search_*.php, operation/menu.php, operation/extensions.php, godmode/menu.php, godmode/extensions.php, admin_access_logs.php: Cleaned code and updated page disclaimers. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4108 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 ++ pandora_console/ajax.php | 8 +-- pandora_console/extensions/dbmanager.php | 10 +-- pandora_console/extensions/pandora_logs.php | 10 +-- pandora_console/general/error_authconfig.php | 50 ++++++------- pandora_console/general/error_dbconfig.php | 42 +++++------ pandora_console/general/error_emptyconfig.php | 40 +++++------ pandora_console/general/error_install.php | 35 +++++---- pandora_console/general/error_noconfig.php | 39 +++++----- pandora_console/general/error_perms.php | 36 +++++----- pandora_console/general/footer.php | 12 ++-- pandora_console/general/header.php | 72 ++++++++++--------- pandora_console/general/links_menu.php | 10 +-- pandora_console/general/login_page.php | 10 +-- pandora_console/general/logoff.php | 9 +-- pandora_console/general/logon_failed.php | 10 +-- pandora_console/general/logon_ok.php | 10 +-- pandora_console/general/main_menu.php | 10 +-- pandora_console/general/noaccess.php | 21 +++--- pandora_console/general/pandora_help.php | 11 +-- pandora_console/godmode/admin_access_logs.php | 9 +-- pandora_console/godmode/extensions.php | 14 ++-- pandora_console/godmode/menu.php | 7 +- pandora_console/index.php | 6 +- pandora_console/install.php | 8 ++- pandora_console/operation/extensions.php | 9 +-- pandora_console/operation/menu.php | 8 +-- pandora_console/operation/search_agents.php | 12 ++-- pandora_console/operation/search_alerts.php | 12 ++-- pandora_console/operation/search_graphs.php | 10 +-- pandora_console/operation/search_maps.php | 10 +-- pandora_console/operation/search_modules.php | 16 +++-- pandora_console/operation/search_reports.php | 12 ++-- pandora_console/operation/search_results.php | 10 +-- pandora_console/operation/search_users.php | 10 +-- 35 files changed, 327 insertions(+), 278 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d990e74482..f505094615 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2011-03-17 Raul Mateos + + * extensions/dbmanager.php, extensions/pandora_logs.php, general/*.php, + index.php, ajax.php, operation/search_*.php, operation/menu.php, + operation/extensions.php, godmode/menu.php, godmode/extensions.php, + admin_access_logs.php: Cleaned code and updated page disclaimers. + 2011-03-17 Raul Mateos * operation/menu.php, godmode/menu.php, godmode/setup/setup.php, diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php index db5e51b8a7..0b5a37050d 100644 --- a/pandora_console/ajax.php +++ b/pandora_console/ajax.php @@ -1,17 +1,17 @@ @@ -32,27 +33,26 @@
-
-
-

Problem with Pandora FMS auth system

-
- +
+
+

Problem with Pandora FMS auth system

+
+ +
+
+ Cannot connect to the database, please check your database setup in the include/config.php file or read the documentation on how to setup Pandora FMS.

+ Probably one or more of your user, database or hostname values are incorrect or + the database server is not running.

+ DB ERROR: + +
+
+ If you have modified auth system, problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:

DELETE FROM tconfig WHERE token = "auth";
+
+
-
- Cannot connect to the database, please check your database setup in the include/config.php file or read the documentation on how to setup Pandora FMS.

- Probably one or more of your user, database or hostname values are incorrect or - the database server is not running.

- DB ERROR: - -
-
- If you have modified auth system, problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:

DELETE FROM tconfig WHERE token = "auth";
-
- -
-
diff --git a/pandora_console/general/error_dbconfig.php b/pandora_console/general/error_dbconfig.php index be7b833bf8..7bbe311661 100644 --- a/pandora_console/general/error_dbconfig.php +++ b/pandora_console/general/error_dbconfig.php @@ -2,22 +2,23 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 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 -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation for version 2. +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. - ?> -Pandora FMS - The Flexible Monitoring System - Console error +Pandora FMS - The Flexible Monitoring System - Console Error @@ -32,22 +33,21 @@
-
-
-

Problem with Pandora FMS database

-
- +
+
+

Problem with Pandora FMS database

+
+ +
+
+ Cannot connect to the database, please check your database setup in the include/config.php file or read the documentation on how to setup Pandora FMS.

+ Probably one or more of your user, database or hostname values are incorrect or + the database server is not running.

+ DB ERROR: +
  +
+
-
- Cannot connect to the database, please check your database setup in the include/config.php file or read the documentation on how to setup Pandora FMS.

- Probably one or more of your user, database or hostname values are incorrect or - the database server is not running.

- DB ERROR: -
  -
-
-
-
diff --git a/pandora_console/general/error_emptyconfig.php b/pandora_console/general/error_emptyconfig.php index 536d5295cd..71799f7441 100644 --- a/pandora_console/general/error_emptyconfig.php +++ b/pandora_console/general/error_emptyconfig.php @@ -2,17 +2,18 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 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 -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation for version 2. +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. - ?> @@ -32,22 +33,21 @@
-
-
-

Empty configuration table

-
- +
+
+

Empty configuration table

+
+ +
+
+ Cannot load configuration variables from database. Please check your database setup in the + include/config.php file or read the documentation on how to setup Pandora FMS.

+ Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date. +

Pandora FMS Console cannot find include/config.php or this file has invalid + permissions and HTTP server cannot read it. Please read documentation to fix this problem. +
+
-
- Cannot load configuration variables from database. Please check your database setup in the - include/config.php file or read the documentation on how to setup Pandora FMS.

- Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date. -

Pandora FMS Console cannot find include/config.php or this file has invalid - permissions and HTTP server cannot read it. Please read documentation to fix this problem. -
- -
-
diff --git a/pandora_console/general/error_install.php b/pandora_console/general/error_install.php index 53eee0201e..73441aaf3d 100644 --- a/pandora_console/general/error_install.php +++ b/pandora_console/general/error_install.php @@ -2,17 +2,18 @@ // 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 -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation for version 2. +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. - ?> @@ -31,21 +32,19 @@ -
-
-
-

Installer active

-
- Pandora FMS
- +
+
+

Installer active

+
+ Pandora FMS +
+


+ For security reasons, normal operation is not possible until you delete installer file. + Please delete the ./install.php file before running Pandora FMS Console. +
+
-


- For security reasons, normal operation is not possible until you delete installer file. - Please delete the ./install.php file before running Pandora FMS Console. -
-
-
diff --git a/pandora_console/general/error_noconfig.php b/pandora_console/general/error_noconfig.php index ac61474047..de4721ecb1 100644 --- a/pandora_console/general/error_noconfig.php +++ b/pandora_console/general/error_noconfig.php @@ -2,17 +2,18 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 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 -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation for version 2. +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. - ?> @@ -32,21 +33,21 @@
-
-
-

No configuration file found

-
- +
+
+

No configuration file found

+
+ +
+
+

Pandora FMS Console cannot find include/config.php or this file has invalid + permissions and HTTP server cannot read it. Please read documentation to fix this problem. +
+
+ You may try to run the installation wizard to create one. +
+
-
-

Pandora FMS Console cannot find include/config.php or this file has invalid - permissions and HTTP server cannot read it. Please read documentation to fix this problem. -
-
- You may try to run the installation wizard to create one. -
-
-
diff --git a/pandora_console/general/error_perms.php b/pandora_console/general/error_perms.php index c3a2ccb9df..831b73b019 100644 --- a/pandora_console/general/error_perms.php +++ b/pandora_console/general/error_perms.php @@ -2,14 +2,16 @@ // 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 -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation for version 2. +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. ?> @@ -31,20 +33,20 @@
-
-
-

Bad permission for include/config.php

-
- Pandora FMS
+
+
+

Bad permission for include/config.php

+
+ Pandora FMS
+
+


+ For security reasons, config.php must have restrictive permissions, and "other" users + should not read it or write to it. It should be written only for owner + (usually www-data or http daemon user), normal operation is not possible until you change + permissions for include/config.php file. Please do it, it's for your security. +
+
-


- For security reasons, config.php must have restrictive permissions, and "other" users - should not read it or write to it. It should be written only for owner - (usually www-data or http daemon user), normal operation is not possible until you change - permissions for include/config.php file. Please do it, it's for your security. -
-
-
diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php index 00fae5e939..6bfc2526ec 100644 --- a/pandora_console/general/footer.php +++ b/pandora_console/general/footer.php @@ -2,18 +2,18 @@ // 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 -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation for version 2. +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. - - if (isset($_SERVER['REQUEST_TIME'])) { $time = $_SERVER['REQUEST_TIME']; } else { diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index b1e3bc2b30..5c381bc2fc 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -2,14 +2,16 @@ // 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 -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation for version 2. +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. require_once ("include/functions_messages.php"); @@ -129,43 +131,43 @@ $msg_cnt = 0; - + - +
+ + + 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;" /> + + +
+ + + + -
- - - 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;" /> - - -
-' . print_image("images/lightning_go.png", true, array("alt" => 'lightning_go', "class" => 'bot')) . ' '.__('Events').''; } -?> - - - ' . print_image("images/lightning_go.png", true, array("alt" => 'lightning_go', "class" => 'bot')) . ' '.__('Events').''; -} - ?> - + ?> +