diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index df8f3d1ed8..18913a9c02 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2008-08-22 Sancho Lerena + + * Massive header update. We're now officially on Beta1. + 2008-08-22 Sancho Lerena * pandoradb_data.sql: Removed data for locale, added for new diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php index fce9c4738c..295d709d93 100644 --- a/pandora_console/ajax.php +++ b/pandora_console/ajax.php @@ -1,8 +1,8 @@ Hello world!"; + echo "This is a sample of minimal plugin"; } /* This adds a option in the operation menu */ diff --git a/pandora_console/general/error_install.php b/pandora_console/general/error_install.php index b218c894b2..0a17bab138 100644 --- a/pandora_console/general/error_install.php +++ b/pandora_console/general/error_install.php @@ -1,7 +1,8 @@ - \ No newline at end of file + diff --git a/pandora_console/general/error_noconfig.php b/pandora_console/general/error_noconfig.php index 88957a7040..6f46a4804e 100644 --- a/pandora_console/general/error_noconfig.php +++ b/pandora_console/general/error_noconfig.php @@ -1,7 +1,8 @@ diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 52edd96909..726f9f0f3f 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -1,7 +1,8 @@ 0) + $notinit_percentage = (($data_not_init + $monitor_not_init) / ($total_checks / 100)); +else + $notinit_percentage = 0; + $module_sanity = format_numeric (100 - $notinit_percentage); $total_alerts = $data_alert + $monitor_alert; $total_fired_alerts = $monitor_alert_total+$data_alert_total; diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 2bdb1b5e51..ed97d43f47 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -1,18 +1,21 @@
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php index ce9e10bbfc..0988e15752 100644 --- a/pandora_console/general/pandora_help.php +++ b/pandora_console/general/pandora_help.php @@ -1,12 +1,20 @@ - -// Copyright (c) 2008 Jorge Gonz谩lez - +// 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 @@ -19,6 +16,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + $add_component = get_parameter ("add_component",0); echo "

".__('Alert association form'); pandora_help ("alerts"); diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 5c792b54e9..cee32ea4cc 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -1,9 +1,8 @@ -// Copyright (c) 2008 Sancho Lerena + +// 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 @@ -17,6 +16,7 @@ // 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("include/config.php"); diff --git a/pandora_console/godmode/agentes/manage_config.php b/pandora_console/godmode/agentes/manage_config.php index b1fbbd3c0d..2a43fbd118 100644 --- a/pandora_console/godmode/agentes/manage_config.php +++ b/pandora_console/godmode/agentes/manage_config.php @@ -2,13 +2,12 @@ // Pandora FMS - the Flexible Monitoring System // ============================================ -// Copyright (c) 2008 Artica Soluciones Tecnol贸gicas, http://www.artica.es +// 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 General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. +// 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 @@ -17,6 +16,8 @@ // 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 ("include/config.php"); diff --git a/pandora_console/godmode/agentes/manage_config_remote.php b/pandora_console/godmode/agentes/manage_config_remote.php index a8cd11b6c0..494c22e33e 100644 --- a/pandora_console/godmode/agentes/manage_config_remote.php +++ b/pandora_console/godmode/agentes/manage_config_remote.php @@ -2,12 +2,12 @@ // Pandora FMS - the Flexible Monitoring System // ============================================ -// Copyright (c) 2008 Artica Soluciones Tecnol贸gicas, http://www.artica.es +// 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 General Public License -// as published by the Free Software Foundation; version 2. +// 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 @@ -16,6 +16,8 @@ // 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 ("include/config.php"); diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 772c5d8862..0a90268b50 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -2,7 +2,7 @@ // Pandora FMS - the Flexible Monitoring System // ============================================ -// Copyright (c) 2008 Artica Soluciones Tecnol贸gicas, http://www.artica.es +// 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 @@ -15,6 +15,8 @@ // 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("include/config.php"); diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 72bae93ef4..3c35586099 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -1,12 +1,21 @@ -// Main PHP/SQL code development, project architecture and management. + +// 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 General Public License -// as published by the Free Software Foundation, version 2. +// 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("include/config.php"); diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index 3b784de35c..d19842d426 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -1,12 +1,21 @@ -// Main PHP/SQL code development, project architecture and management. + +// 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 General Public License -// as published by the Free Software Foundation, version 2. +// 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. + // General startup for established session diff --git a/pandora_console/godmode/agentes/module_manager_editor_data.php b/pandora_console/godmode/agentes/module_manager_editor_data.php index 92351a6641..de372f1b89 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_data.php +++ b/pandora_console/godmode/agentes/module_manager_editor_data.php @@ -1,8 +1,8 @@ - + + + -// Copyright (c) 2008 Esteban Sanchez +// ============================================ +// 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 @@ -16,6 +16,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +// Copyright (c) 2008 Evi Vanoost +// Please see http://pandora.sourceforge.net for full contribution list + + // Load global vars require("include/config.php"); @@ -272,36 +277,34 @@ if ($create_downtime || $update_downtime) { $sql = "SELECT * FROM tplanned_downtime"; $downtimes = get_db_all_rows_sql ($sql); - if ($downtimes === false) { - $table->colspan[0][0] = 5; - $table->data[0][0] = __('No planned downtime'); - $downtimes = array(); + if (!$downtimes) { + echo '
'.('No planned downtime').'
'; } - - foreach ($downtimes as $downtime) { - $data = array(); - $total = get_db_sql ("SELECT COUNT(id_agent) FROM tplanned_downtime_agents WHERE id_downtime = ".$downtime["id"]); + else { + foreach ($downtimes as $downtime) { + $data = array(); + $total = get_db_sql ("SELECT COUNT(id_agent) FROM tplanned_downtime_agents WHERE id_downtime = ".$downtime["id"]); - $data[0] = $downtime['name']. " ($total)"; - $data[1] = $downtime['description']; - $data[2] = date ("Y-m-d H:i", $downtime['date_from']); - $data[3] = date ("Y-m-d H:i", $downtime['date_to']); - if ($downtime["executed"] == 0){ - $data[4] = ' - '.__('Delete').''; - $data[5] = ' - '.__('Update').''; + $data[0] = $downtime['name']. " ($total)"; + $data[1] = $downtime['description']; + $data[2] = date ("Y-m-d H:i", $downtime['date_from']); + $data[3] = date ("Y-m-d H:i", $downtime['date_to']); + if ($downtime["executed"] == 0){ + $data[4] = ' + '.__('Delete').''; + $data[5] = ' + '.__('Update').''; + } + if ($downtime["executed"] == 0) + $data[6] = ""; + else + $data[6] = ""; + + array_push ($table->data, $data); } - if ($downtime["executed"] == 0) - $data[6] = ""; - else - $data[6] = ""; - - array_push ($table->data, $data); + print_table ($table); } - print_table ($table); - echo '
'; echo "
"; diff --git a/pandora_console/godmode/alerts/configure_alert.php b/pandora_console/godmode/alerts/configure_alert.php index 9bc09aaabc..9ad82046a0 100644 --- a/pandora_console/godmode/alerts/configure_alert.php +++ b/pandora_console/godmode/alerts/configure_alert.php @@ -1,20 +1,13 @@ -// Additions to Pandora FMS 1.2 graph code and new XML reporting template management -// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es -// +// 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 General Public License -// as published by the Free Software Foundation; version 2 +// 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 @@ -23,6 +16,7 @@ // 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 ("include/config.php"); diff --git a/pandora_console/godmode/alerts/modify_alert.php b/pandora_console/godmode/alerts/modify_alert.php index 0aff32c58c..8f92756457 100644 --- a/pandora_console/godmode/alerts/modify_alert.php +++ b/pandora_console/godmode/alerts/modify_alert.php @@ -1,9 +1,22 @@ , 2003-2007 -// Raul Mateos , 2005-2007 + +// 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 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 ("include/config.php"); diff --git a/pandora_console/godmode/db/db_audit.php b/pandora_console/godmode/db/db_audit.php index c1d3f16913..357e1ea064 100644 --- a/pandora_console/godmode/db/db_audit.php +++ b/pandora_console/godmode/db/db_audit.php @@ -1,14 +1,13 @@ - +, 2003-2006 -// Raul Mateos , 2005-2006 +// 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 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"); diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php index e26434afd4..3e661dfbbd 100644 --- a/pandora_console/godmode/db/db_info.php +++ b/pandora_console/godmode/db/db_info.php @@ -1,9 +1,21 @@ -, 2003-2006 -// Raul Mateos , 2005-2006 + 2008 // Load global vars diff --git a/pandora_console/godmode/db/db_info_data.php b/pandora_console/godmode/db/db_info_data.php index 899d7688e6..ca2b14d4f2 100644 --- a/pandora_console/godmode/db/db_info_data.php +++ b/pandora_console/godmode/db/db_info_data.php @@ -1,13 +1,13 @@ - -// Additions to Pandora FMS 1.2 graph code and new XML reporting template management -// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es -// + +// 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 General Public License -// as published by the Free Software Foundation; version 2 +// 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 @@ -21,7 +15,8 @@ // 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 ("include/config.php"); diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index 7c901ea0f5..b6e91e13bf 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -1,19 +1,13 @@ -// Additions to Pandora FMS 1.2 graph code and new XML reporting template management -// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es -// + +// 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 General Public License -// as published by the Free Software Foundation; version 2 +// 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 @@ -21,6 +15,8 @@ // 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 ("include/config.php"); diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php index 78130ffd62..370f4bb4f6 100644 --- a/pandora_console/godmode/modules/manage_nc_groups.php +++ b/pandora_console/godmode/modules/manage_nc_groups.php @@ -1,19 +1,13 @@ - -// Additions to Pandora FMS 1.2 graph code and new XML reporting template management -// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es -// + -// Additions to Pandora FMS 1.2 graph code and new XML reporting template management -// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es -// +