From 951ea5a06bde25a9602d5f23c5efdf88e3294dbd Mon Sep 17 00:00:00 2001 From: raulmateos Date: Wed, 4 Oct 2006 16:15:20 +0000 Subject: [PATCH] 2006-10-04 Raul Mateos * operation/agentes/estado_ultimopaquete.php: Delete old comments. * general/login_page.php, logon_ok.php: Updated headers. * include/config.php: Set PHP errors disabled by default. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@214 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 +++++++- pandora_console/general/login_page.php | 23 +++++++++++++---- pandora_console/general/logon_ok.php | 22 ++++++++++++---- pandora_console/include/config.php | 25 ++++++++++++++++--- .../agentes/estado_ultimopaquete.php | 10 -------- 5 files changed, 65 insertions(+), 25 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 57d16f5fa1..a5b95a6005 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2006-10-04 Raul Mateos + + * operation/agentes/estado_ultimopaquete.php: Delete old comments. + + * general/login_page.php, logon_ok.php: Updated headers. + + * include/config.php: Set PHP errors disabled by default. + 2006-09-28 Sancho Lerena * languages/language_es_es.php: Fixed message "out of limits" @@ -12,7 +20,7 @@ * pandora_console/pandoradb_data.sql: Fixed version number and build. -2006-09-16 Raul Mateos +2006-09-23 Raul Mateos * godmode/agentes/configurar_agente.php: Comment DEBUG code added last update. diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 04068167ef..1fd60671ee 100644 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -1,9 +1,22 @@ , 2003-2006 -// Raul Mateos , 2004-2006 + +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// 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. +// 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. + ?>
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 2e6287d875..8ace925b32 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -1,9 +1,21 @@ , 2003-2006 -// Raul Mateos , 2004-2006 + +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// 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. +// 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. echo "
"; $nick = $_SESSION['id_usuario']; diff --git a/pandora_console/include/config.php b/pandora_console/include/config.php index 40c112f627..b50255fb5b 100644 --- a/pandora_console/include/config.php +++ b/pandora_console/include/config.php @@ -21,7 +21,7 @@ //Pandora Version -$build_version="PC060710"; //PCddmmyy +$build_version="PC061004"; //PCddmmyy $pandora_version="v1.2 Beta 3"; // Database configuration @@ -31,13 +31,30 @@ $dbpassword="pandora"; // Password $dbhost="localhost"; // MySQL Host $dbtype="mysql"; // Type of Database, now only "mysql" its supported $attachment_store="/var/www/pandora_console"; //This is directory where placed "attachment" directory, to upload files stores. This MUST be writtable by wwwserver user, and should be in pandora root. Please append "/" to the end :-) -$config_fontpath = "../reporting/FreeSans.ttf"; +$config_fontpath = "../reporting/FreeSans.ttf"; // Change this to your font folder, if needed. +// Do not display any ERROR +error_reporting(0); // Read rest of config from DB if (! mysql_pconnect($dbhost,$dbuser,$dbpassword)){ //Persistent connection. If you want non-persistent conn change it to mysql_connect() - exit ('Pandora Error
-

Pandora Console Error DB-001

Cannot connect with Database, please check your database setup in the ./include/config.php file and read documentation.

Probably any of your user/database/hostname values are incorrect or database is not running.

MySQL ERROR: '. mysql_error().'
 
'); + exit ('Pandora Error + +
+
+
+ +
+
+

Pandora Console Error DB-001

+ Cannot connect with Database, please check your database setup in the + ./include/config.php file and read documentation.

+ Probably any of your user/database/hostname values are incorrect or + database is not running.

+ MySQL ERROR: '. mysql_error().' +
  +
+
'); } mysql_select_db($dbname); $result2=mysql_query("SELECT * FROM tconfig"); diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index 4f8ada6079..3b08f30b93 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -23,7 +23,6 @@ function winopeng(url,wid) { nueva_ventana=open(url,wid,"width=580,height=250,status=no,toolbar=no,menubar=no"); // WARNING !! Internet Explorer DOESNT SUPPORT "-" CARACTERS IN WINDOW HANDLE VARIABLE - // I WAS 20 HOURS TESTING FOR THIS BUG >:( !!! status =wid; } function help_popup(help_id) { @@ -33,16 +32,8 @@ function help_popup(help_id) { , 2003-2006 -// Raúl Mateos , 2005-2006 -// Load global vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); if (comprueba_login() == 0) { if (isset($_GET["id_agente"])){ @@ -69,7 +60,6 @@ if (comprueba_login() == 0) { // Get last packet $sql3='SELECT * FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente = '.$id_agente.' AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo ORDER BY id_module_group, nombre'; - //$sql3='SELECT * FROM tagente_modulo WHERE id_agente = '.$id_agente.' order by id_module_group'; $label_group=0; $last_label = ""; echo "

".$lang_label["last_data_chunk"]." ".$lang_label["help"]."

";