diff --git a/pandora_console/godmode/agentes/alert_manager.php b/pandora_console/godmode/agentes/alert_manager.php index dcd29d379f..c361800f02 100644 --- a/pandora_console/godmode/agentes/alert_manager.php +++ b/pandora_console/godmode/agentes/alert_manager.php @@ -155,7 +155,7 @@ while ($row=mysql_fetch_array($result)){ -  +  @@ -197,7 +197,7 @@ _data_
-  +  +     - + @@ -241,10 +243,10 @@ if ($update_alert != 1) { $result2=mysql_query($sql2); while ($row2=mysql_fetch_array($result2)){ if ($row2["id_tipo_modulo"] != -1) { - $sql1='SELECT nombre FROM ttipo_modulo WHERE id_tipo = '.$row2["id_tipo_modulo"]; + $sql1='SELECT nombre FROM ttipo_modulo WHERE id_tipo = '.$row2["id_tipo_modulo"].''; $result=mysql_query($sql1); while ($row=mysql_fetch_array($result)){ - echo ""; } } else // for -1, is a special module, keep alive monitor !! echo ""; diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index fc05c54284..8da1e1be5d 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -243,9 +243,10 @@ if (isset($_POST["insert_alert"])){ // if created alert '$min_alerts', '$alert_text')"; $result=mysql_query($sql_insert); - if (! $result) + if (! $result) { + echo $sql_insert; echo "

".$lang_label["create_alert_no"]."

"; - else + } else $id_agente = mysql_insert_id(); echo "

".$lang_label["create_alert_ok"]."

"; diff --git a/pandora_console/include/styles/install.css b/pandora_console/include/styles/install.css new file mode 100644 index 0000000000..fe0cb54d3e --- /dev/null +++ b/pandora_console/include/styles/install.css @@ -0,0 +1,82 @@ +/* +// 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. +*/ + +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; +} \ No newline at end of file