diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4531327f65..bf8726282c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2009-06-08 Sancho Lerena + + * Massive header update. + 2009-06-08 Esteban Sanchez * include/functions.php: Added encoding checking on safe_input(). diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php index b3b01bb918..023f1d987c 100644 --- a/pandora_console/ajax.php +++ b/pandora_console/ajax.php @@ -1,20 +1,18 @@ +//Pandora FMS- http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 @@ -11,9 +10,6 @@ // 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. /* PEAR DB manage abstraction */ diff --git a/pandora_console/extensions/update_manager/lib/libupdate_manager_client.php b/pandora_console/extensions/update_manager/lib/libupdate_manager_client.php index d6191ad539..b32fec3138 100644 --- a/pandora_console/extensions/update_manager/lib/libupdate_manager_client.php +++ b/pandora_console/extensions/update_manager/lib/libupdate_manager_client.php @@ -1,8 +1,8 @@ + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 @@ -11,8 +11,7 @@ // 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 + $prev_level = error_reporting (0); if ((include_once ('XML/RPC.php')) != 1) diff --git a/pandora_console/extensions/update_manager/lib/libupdate_manager_components.php b/pandora_console/extensions/update_manager/lib/libupdate_manager_components.php index f5e72232ad..888686d98f 100644 --- a/pandora_console/extensions/update_manager/lib/libupdate_manager_components.php +++ b/pandora_console/extensions/update_manager/lib/libupdate_manager_components.php @@ -1,8 +1,8 @@ + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 @@ -11,9 +11,7 @@ // 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. + function um_component_database_get_data ($component_db) { diff --git a/pandora_console/extensions/update_manager/lib/libupdate_manager_updates.php b/pandora_console/extensions/update_manager/lib/libupdate_manager_updates.php index 6d8531531e..1fa89a49cb 100644 --- a/pandora_console/extensions/update_manager/lib/libupdate_manager_updates.php +++ b/pandora_console/extensions/update_manager/lib/libupdate_manager_updates.php @@ -1,8 +1,8 @@ + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 @@ -11,9 +11,7 @@ // 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. + function um_update_get_last_from_filename ($component_name, $filename) { diff --git a/pandora_console/extensions/update_manager/lib/libupdate_manager_utils.php b/pandora_console/extensions/update_manager/lib/libupdate_manager_utils.php index 509b2fe39a..70035121a9 100644 --- a/pandora_console/extensions/update_manager/lib/libupdate_manager_utils.php +++ b/pandora_console/extensions/update_manager/lib/libupdate_manager_utils.php @@ -1,8 +1,8 @@ + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 @@ -11,9 +11,7 @@ // 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. + function add_prefix (&$string, $key, $prefix) { diff --git a/pandora_console/extensions/update_manager/lib/load_updatemanager.php b/pandora_console/extensions/update_manager/lib/load_updatemanager.php index 4236424ed6..14cbb8635a 100644 --- a/pandora_console/extensions/update_manager/lib/load_updatemanager.php +++ b/pandora_console/extensions/update_manager/lib/load_updatemanager.php @@ -1,8 +1,8 @@ + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 @@ -11,9 +11,7 @@ // 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. + /* Change to E_ALL for development/debugging */ diff --git a/pandora_console/extensions/update_manager/load_updatemanager.php b/pandora_console/extensions/update_manager/load_updatemanager.php index a7a547c7cf..f048d778e0 100644 --- a/pandora_console/extensions/update_manager/load_updatemanager.php +++ b/pandora_console/extensions/update_manager/load_updatemanager.php @@ -1,9 +1,8 @@ diff --git a/pandora_console/general/error_noconfig.php b/pandora_console/general/error_noconfig.php index dd5b10e473..26859966fb 100644 --- a/pandora_console/general/error_noconfig.php +++ b/pandora_console/general/error_noconfig.php @@ -1,9 +1,8 @@ diff --git a/pandora_console/general/error_perms.php b/pandora_console/general/error_perms.php index 624181301c..9b9f1d608c 100644 --- a/pandora_console/general/error_perms.php +++ b/pandora_console/general/error_perms.php @@ -1,9 +1,8 @@ diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php index 95b46c14c9..863983544a 100644 --- a/pandora_console/general/footer.php +++ b/pandora_console/general/footer.php @@ -1,9 +1,8 @@ /* */ - \ No newline at end of file + diff --git a/pandora_console/general/logoff.php b/pandora_console/general/logoff.php index 1c4b834ced..e4f1243a69 100644 --- a/pandora_console/general/logoff.php +++ b/pandora_console/general/logoff.php @@ -1,9 +1,9 @@

@@ -32,4 +30,4 @@
'.$REMOTE_ADDR.''; ?>
- \ No newline at end of file + diff --git a/pandora_console/general/logon_failed.php b/pandora_console/general/logon_failed.php index 0fe4b0db13..e66eb9f118 100644 --- a/pandora_console/general/logon_failed.php +++ b/pandora_console/general/logon_failed.php @@ -1,9 +1,8 @@
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 5f83cf6c11..27aacd41e4 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -1,21 +1,17 @@ "; // activity -?> \ No newline at end of file +?> diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 3b58fdb748..faf57b5a91 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -1,9 +1,8 @@
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php index cd8f359b37..8d169c49ad 100644 --- a/pandora_console/general/pandora_help.php +++ b/pandora_console/general/pandora_help.php @@ -1,9 +1,9 @@ \ No newline at end of file +?> diff --git a/pandora_console/include/auth/ldap.php b/pandora_console/include/auth/ldap.php index 7abf51344b..42ba81b9f7 100644 --- a/pandora_console/include/auth/ldap.php +++ b/pandora_console/include/auth/ldap.php @@ -1,20 +1,18 @@ \ No newline at end of file +?> diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php index 9b2fc0be2a..e15e9b9357 100644 --- a/pandora_console/include/functions_custom_graphs.php +++ b/pandora_console/include/functions_custom_graphs.php @@ -1,21 +1,19 @@ -// Please see http://pandora.sourceforge.net for full contribution list +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 Lesser General Public License (LGPL) -// 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 // 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. function get_events ($filter = false, $fields = false) { return get_db_all_rows_filter ('tevento', $filter, $fields); diff --git a/pandora_console/include/functions_exportserver.php b/pandora_console/include/functions_exportserver.php index f08be737d0..f27f9037a7 100644 --- a/pandora_console/include/functions_exportserver.php +++ b/pandora_console/include/functions_exportserver.php @@ -1,23 +1,18 @@ -// Please see http://pandora.sourceforge.net for full contribution list -// -// This file is part of Pandora FMS. -// -// Pandora FMS 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. -// -// Pandora FMS is distributed in the hope that it will be useful, + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 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 // GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Pandora FMS. If not, see . /** * Gets all export servers out of the database @@ -65,4 +60,4 @@ function get_exportservers_info ($active = 1, $row = "name") { return $return; } -?> \ No newline at end of file +?> diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php index 31fe1623ad..4318f064d6 100644 --- a/pandora_console/include/functions_extensions.php +++ b/pandora_console/include/functions_extensions.php @@ -1,21 +1,18 @@ -// Please see http://pandora.sourceforge.net for full contribution list + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 Lesser General Public License (LGPL) -// 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 // 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. /** * Gets all the possible priorities for incidents in an array diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 9a98ad8cce..1edb4b50a2 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -1,21 +1,18 @@ -// Please see http://pandora.sourceforge.net for full contribution list +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 Lesser General Public License (LGPL) -// 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 // 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. + require_once ('include/functions_modules.php'); diff --git a/pandora_console/include/functions_network_profiles.php b/pandora_console/include/functions_network_profiles.php index b7deaf9082..0557b44f7a 100644 --- a/pandora_console/include/functions_network_profiles.php +++ b/pandora_console/include/functions_network_profiles.php @@ -1,21 +1,19 @@ -// Additions to Pandora FMS 1.2 graph code and new XML reporting template management -// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es -// -// 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 -// 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. +// Pandora FMS - the Flexible Monitoring System +// ============================================= +// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L + +// 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 + +// 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. +*/ */ * { @@ -58,4 +52,4 @@ dd.help_t4 {margin-left: 92px; margin-top: 3px; margin-bottom: 2px;} div.logo {float:left;} div.toc {padding-left: 200px;} div.rayah {border-top: 1px solid #708090; width: 100%;} -div.rayah2 {clear:both; border-top: 1px solid #708090; width: 100%; padding-bottom: 35px;} \ No newline at end of file +div.rayah2 {clear:both; border-top: 1px solid #708090; width: 100%; padding-bottom: 35px;} diff --git a/pandora_console/include/styles/ie.css b/pandora_console/include/styles/ie.css index da2a814e1b..4ac0de642d 100644 --- a/pandora_console/include/styles/ie.css +++ b/pandora_console/include/styles/ie.css @@ -1,21 +1,20 @@ /* - Pandora FMS - the Flexible Monitoring System - ============================================ - Copyright (c) 2004-2009 Sancho Lerena, slerena@openideas.info - Copyright (c) 2005-2009 Artica Soluciones Tecnologicas - Copyright (c) 2004-2009 Raul Mateos Martin, raulofpandora@gmail.com - Copyright (c) 2008-2009 Evi Vanoost, vanooste@rcbi.rochester.edu +// Pandora FMS - the Flexible Monitoring System +// ============================================= +// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L - 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 - 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. +// 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 + +// 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. +*/ */ .title .toggle { diff --git a/pandora_console/include/styles/install.css b/pandora_console/include/styles/install.css index 41201cb3fb..6b6cf87f25 100644 --- a/pandora_console/include/styles/install.css +++ b/pandora_console/include/styles/install.css @@ -1,108 +1,110 @@ -/* -// Pandora FMS - the Free monitoring system -// ======================================== -// Copyright (c) 2004-2007 Sancho Lerena, slerena@gmail.com -// Main PHP/SQL code development and project architecture and management -// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com -// CSS and some PHP additions -// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com -// Javascript Active Console code. -// Copyright (c) 2006 Jose Navarro -// Additions to Pandora FMS 1.2 graph code and new XML reporting template management -// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es -// -// 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 -// 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. -*/ - -h1 { - font: bold 1em Arial, Sans-serif; - text-transform: uppercase; - font-size: 18px; - color: #ffffff; -} - -h2 { - font: bold 1em Arial, Sans-serif; - text-transform: uppercase; - font-size: 14px; -} - -div#install_container { - margin: 0 auto; - margin-top: 35px; - width: 600px; -} -div#logo_img { - text-align: center; - width: 200px; -} -div#wizard { - text-align: left; - border: 1px solid #999; - margin-top: 3em; - padding: 20px; - padding-left: 20px; - width: 600px; - background-color: #fafafa; -} -div#install_box, div#install_img { - float: right; - padding-right: 20px; - margin-top: 0px; - width: 350px; -} -div#install_img { - margin-bottom: 25px; - margin-left: 25px; -} -div#foot_install { - font-size: 7pt; - color: #fff; - margin-top: solid 2px #000; - padding-top: 5px; - padding-bottom: 5px; - padding-left: 20px; - padding-right: 20px; - text-align: center; - background: #777; - width: 600px; - border-left: 1px solid #999; - border-right: 1px solid #999; -} -div#foot_install a{ - color: #ccc; -} -input#step4, input#step4:hover { - width: 70px; - height: 16px; - border: 0px; - background-color: #fafafa; -} -div.warn { - background: url(../../images/info.png) no-repeat; - color: #ac4444; - margin-top: 7px; - padding: 2px 1px 6px 25px; -} -div.info { - background: url(../../images/information.png) no-repeat; - color: #000000; - margin-top: 7px; - padding: 2px 1px 6px 25px; -} -span.arr{ - background: url(../../images/arrow.png) no-repeat; - margin-top: 2px; - margin-left: 5px; - padding: 2px 1px 6px 15px; - display: block; -} +/* +// Pandora FMS - the Flexible Monitoring System +// ============================================= +// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L + +// 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 + +// 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. +*/ +*/ + +h1 { + font: bold 1em Arial, Sans-serif; + text-transform: uppercase; + font-size: 18px; + color: #ffffff; +} + +h2 { + font: bold 1em Arial, Sans-serif; + text-transform: uppercase; + font-size: 14px; +} + +div#install_container { + margin: 0 auto; + margin-top: 35px; + width: 600px; +} +div#logo_img { + text-align: center; + width: 200px; +} +div#wizard { + text-align: left; + border: 1px solid #999; + margin-top: 3em; + padding: 20px; + padding-left: 20px; + width: 600px; + background-color: #fafafa; +} +div#install_box, div#install_img { + float: right; + padding-right: 20px; + margin-top: 0px; + width: 350px; +} +div#install_img { + margin-bottom: 25px; + margin-left: 25px; +} +div#foot_install { + font-size: 7pt; + color: #fff; + margin-top: solid 2px #000; + padding-top: 5px; + padding-bottom: 5px; + padding-left: 20px; + padding-right: 20px; + text-align: center; + background: #777; + width: 600px; + border-left: 1px solid #999; + border-right: 1px solid #999; +} +div#foot_install a{ + color: #ccc; +} +input#step4, input#step4:hover { + width: 70px; + height: 16px; + border: 0px; + background-color: #fafafa; +} +div.warn { + background: url(../../images/info.png) no-repeat; + color: #ac4444; + margin-top: 7px; + padding: 2px 1px 6px 25px; +} +div.info { + background: url(../../images/information.png) no-repeat; + color: #000000; + margin-top: 7px; + padding: 2px 1px 6px 25px; +} +span.arr{ + background: url(../../images/arrow.png) no-repeat; + margin-top: 2px; + margin-left: 5px; + padding: 2px 1px 6px 15px; + display: block; + font-face: verdana,arial, sans; + font-size: 8.5pt; +} +body { + font-face: verdana,arial, sans; + font-size: 9pt; + background-color: #fff; +} + diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 9a1eb1657b..9d27f6824a 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -1,23 +1,20 @@ /* - Pandora FMS - the Flexible Monitoring System - ============================================ - Copyright (c) 2004-2008 Sancho Lerena, slerena@openideas.info - Copyright (c) 2005-2009 Artica Soluciones Tecnologicas - Copyright (c) 2004-2009 Raul Mateos Martin, raulofpandora@gmail.com - Copyright (c) 2008-2009 Evi Vanoost, vanooste@rcbi.rochester.edu - Copyright (c) 2006-2007 Jose Navarro jose@jnavarro.net - Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com +// Pandora FMS - the Flexible Monitoring System +// ============================================= +// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L - 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 - 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. +// 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 + +// 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. +*/ */ .menu { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 1ceb590274..b6998aa701 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -6,13 +6,12 @@ Description: The default Pandora FMS theme layout // Pandora FMS - the Flexible Monitoring System // ============================================= -// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.comnt -// Copyright (c) 2004-2008 Raul Mateos Martin, raulofpandora@gmail.com -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas, info@artica.es -// Copyright (c) 2008-2009 Evi Vanoost, vanooste@rcbi.rochester.edu +// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L + // 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 + // 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 +20,7 @@ Description: The default Pandora FMS theme layout // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + * { font-family: verdana, sans-serif; font-size: 8pt; diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 62ba7d7070..45f18e4061 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -4,21 +4,14 @@ Author: The Pandora FMS team Name: Black theme Description: A theme with a dark style -// Pandora FMS - the Free monitoring system -// ======================================== -// Copyright (c) 2004-2007 Sancho Lerena, slerena@gmail.com -// Main PHP/SQL code development and project architecture and management -// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com -// CSS and some PHP additions -// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com -// Javascript Active Console code. -// Copyright (c) 2006 Jose Navarro -// 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) 2004-2009 Artica Soluciones Tecnológicas S.L + // 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 + // 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 @@ -27,6 +20,7 @@ Description: A theme with a dark style // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +*/ @import url(pandora.css); diff --git a/pandora_console/include/styles/pandora_blackmetal.css b/pandora_console/include/styles/pandora_blackmetal.css index 85732fdbca..da3e824053 100644 --- a/pandora_console/include/styles/pandora_blackmetal.css +++ b/pandora_console/include/styles/pandora_blackmetal.css @@ -19,6 +19,23 @@ Description: A theme with a variable width layout // 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. + +// Pandora FMS - the Flexible Monitoring System +// ============================================= +// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L + +// 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 + +// 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. + */ @import url(pandora_width.css); diff --git a/pandora_console/include/styles/pandora_minimal.css b/pandora_console/include/styles/pandora_minimal.css index a82a537c81..8619911f2b 100644 --- a/pandora_console/include/styles/pandora_minimal.css +++ b/pandora_console/include/styles/pandora_minimal.css @@ -4,21 +4,14 @@ Author: The Pandora FMS team Name: Minimal theme Description: A minimal layout -// Pandora FMS - the Free monitoring system -// ======================================== -// Copyright (c) 2004-2007 Sancho Lerena, slerena@gmail.com -// Main PHP/SQL code development and project architecture and management -// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com -// CSS and some PHP additions -// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com -// Javascript Active Console code. -// Copyright (c) 2006 Jose Navarro -// 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) 2004-2009 Artica Soluciones Tecnológicas S.L + // 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 + // 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 @@ -27,6 +20,7 @@ Description: A minimal layout // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +*/ * { font-family: verdana, sans-serif; diff --git a/pandora_console/include/styles/pandora_red.css b/pandora_console/include/styles/pandora_red.css index 3a52e6eef2..0eba471c96 100644 --- a/pandora_console/include/styles/pandora_red.css +++ b/pandora_console/include/styles/pandora_red.css @@ -4,21 +4,14 @@ Author: The Pandora FMS team Name: Red theme Description: A red theme for Pandora FMS -// Pandora FMS - the Free monitoring system -// ======================================== -// Copyright (c) 2004-2007 Sancho Lerena, slerena@gmail.com -// Main PHP/SQL code development and project architecture and management -// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com -// CSS and some PHP additions -// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com -// Javascript Active Console code. -// Copyright (c) 2006 Jose Navarro -// 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) 2004-2009 Artica Soluciones Tecnológicas S.L + // 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 + // 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 @@ -27,6 +20,7 @@ Description: A red theme for Pandora FMS // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +*/ @import url(op.css); @import url(god.css); diff --git a/pandora_console/include/styles/pandora_width.css b/pandora_console/include/styles/pandora_width.css index 241afc04db..0ee7c6b28d 100644 --- a/pandora_console/include/styles/pandora_width.css +++ b/pandora_console/include/styles/pandora_width.css @@ -4,21 +4,14 @@ Author: The Pandora FMS team Name: Panoramic theme Description: A theme with a variable width layout -// Pandora FMS - the Free monitoring system -// ======================================== -// Copyright (c) 2004-2007 Sancho Lerena, slerena@gmail.com -// Main PHP/SQL code development and project architecture and management -// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com -// CSS and some PHP additions -// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com -// Javascript Active Console code. -// Copyright (c) 2006 Jose Navarro -// 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) 2004-2009 Artica Soluciones Tecnológicas S.L + // 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 + // 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 @@ -27,6 +20,7 @@ Description: A theme with a variable width layout // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +*/ @import url(pandora.css); diff --git a/pandora_console/include/styles/tip.css b/pandora_console/include/styles/tip.css index f5137d7e3f..541e4ca1ed 100644 --- a/pandora_console/include/styles/tip.css +++ b/pandora_console/include/styles/tip.css @@ -88,4 +88,4 @@ a.info2:hover span { a.help:hover span { top: 15px; width: 80px; -} \ No newline at end of file +} diff --git a/pandora_console/index.php b/pandora_console/index.php index bb3b355ef2..5941fd47a3 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -1,24 +1,18 @@ diff --git a/pandora_console/reporting/fgraph.php b/pandora_console/reporting/fgraph.php index f3d432ac38..8ba1d50764 100644 --- a/pandora_console/reporting/fgraph.php +++ b/pandora_console/reporting/fgraph.php @@ -1,21 +1,20 @@ -// Please see http://pandora.sourceforge.net for full contribution list +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 +// modify it under the terms of the GNU Lesser 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. + + abstract class PandoraGraphAbstract { public $width = 300; diff --git a/pandora_console/reporting/pchart_graph.php b/pandora_console/reporting/pchart_graph.php index a11b7439f2..38807f0c1d 100644 --- a/pandora_console/reporting/pchart_graph.php +++ b/pandora_console/reporting/pchart_graph.php @@ -1,9 +1,9 @@ -// Please see http://pandora.sourceforge.net for full contribution list + +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2005-2009 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 @@ -12,9 +12,8 @@ // 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. + + require_once ('pChart/pData.class'); require_once ('pChart/pChart.class'); diff --git a/pandora_console/reporting/stat_win.php b/pandora_console/reporting/stat_win.php index 2b63adfae8..e5113c897b 100644 --- a/pandora_console/reporting/stat_win.php +++ b/pandora_console/reporting/stat_win.php @@ -1,9 +1,9 @@ '; print_submit_button ('GO', "submit", false, 'class="sub next"'); -echo '
'; \ No newline at end of file +echo '
';