search-msg.php

* use session data, no data from post!

color-expression.php
* use session data, no data from post!

filter-host.php
* use session data, no data from post!

syslog-display.php
syslog-index.php
* corrected color an expression handling

include.php
* $_SESSION['searchmsg'] was not correctly implement
* Add session handling for color an expression

syslog-index.php
/* 2005-09-19 by mm
 * Removed the two lines below, because $_POST['sortMethode'] is never used!
 * NOTE that it is not a good approach to assign values to $_POST or to any
 * other PHP Superglobals!
	if( !isset($_POST['sortMethode']) )
		$_POST['sortMethode'] = "DESC";
 * end 2005-09-19 */

index.php
* Note, msg in the future fixed (false timestamp)

de.php
en.php
*Entry added
This commit is contained in:
Michael Meckelein 2005-09-19 14:02:16 +00:00
parent 9b307eddcc
commit e7bcb0f344
13 changed files with 129 additions and 91 deletions

View File

@ -49,13 +49,13 @@ See AUTHORS to learn who helped make it become a reality.
define('_DBSERVER', 'localhost');
// DSN (ODBC) or database name (Mysql)
define('_DBNAME', 'monitorware');
define('_DBNAME', 'phplogcon');
// Userid for database connection ***
define('_DBUSERID', 'user');
define('_DBUSERID', 'root');
// Password for database connection ***
define('_DBPWD', 'pass');
define('_DBPWD', '');
// table name
define('_DBTABLENAME', 'SystemEvents');

View File

@ -184,15 +184,15 @@ See AUTHORS to learn who helped make it become a reality.
$message = htmlspecialchars($message);
if(isset($_POST['regexp']) && $_POST['regexp'] != "")
if(isset($_SESSION['regexp']) && $_SESSION['regexp'] != '')
{
$_POST['regexp'] = trim($_POST['regexp']);
$_SESSION['regexp'] = trim($_SESSION['regexp']);
$messageUp = strtoupper($message);
$regexpUp = strtoupper($_POST['regexp']);
$regexpUp = strtoupper($_SESSION['regexp']);
$search_pos = strpos($messageUp, $regexpUp);
if($search_pos !== FALSE)
{
$regexpLng = strlen($_POST['regexp']);
$regexpLng = strlen($_SESSION['regexp']);
$strCount = substr_count($messageUp, $regexpUp);
$strTmp = $message;
@ -204,7 +204,7 @@ See AUTHORS to learn who helped make it become a reality.
$subStrSt = substr($strTmp, 0 , $search_pos);
$subStrExp = substr($strTmp, $search_pos, $regexpLng);
$subStrEnd = substr($strTmp, ($search_pos + $regexpLng));
$message .= $subStrSt . '<font color="' . $_POST['color'] . '">' . $subStrExp . '</font>';
$message .= $subStrSt . '<font color="' . $_SESSION['color'] . '">' . $subStrExp . '</font>';
if($i == ($strCount - 1))
$message .= $subStrEnd;

View File

@ -1,36 +1,35 @@
<?php
echo '<input type="text" name="regexp" size="30" value="';
if( isset($_POST['regexp']) )
echo PreStrFromTxt4Out($_POST['regexp']);
echo PreStrFromTxt4Out($_SESSION['regexp']);
echo '">', _MSGinCol, '<select name="color">';
echo '<option value="red" style="background-color:red"';
if (isset($_POST['color']) AND $_POST['color'] == 'red')
echo ' selected';
if ($_SESSION['color'] == 'red')
echo ' selected';
echo '>', _MSGRed, '</option>';
echo '<option value="blue" style="background-color:blue"';
if (isset($_POST['color']) AND $_POST['color'] == 'blue')
if ($_SESSION['color'] == 'blue')
echo ' selected';
echo '>', _MSGBlue, '</option>';
echo '<option value="green" style="background-color:green"';
if (isset($_POST['color']) AND $_POST['color'] == 'green')
if ($_SESSION['color'] == 'green')
echo ' selected';
echo '>', _MSGGreen, '</option>';
echo '<option value="yellow" style="background-color:yellow"';
if (isset($_POST['color']) AND $_POST['color'] == 'yellow')
if ($_SESSION['color'] == 'yellow')
echo ' selected';
echo '>', _MSGYel, '</option>';
echo '<option value="orange" style="background-color:orange"';
if (isset($_POST['color']) AND $_POST['color'] == 'orange')
if ($_SESSION['color'] == 'orange')
echo ' selected';
echo '>', _MSGOra, '</option>';

View File

@ -1,7 +1,5 @@
<?php
echo '<input type="text" name="filhost" size="30" value="';
if( isset($_POST['filhost']) )
echo $_POST['filhost'];
echo '">';
echo $_SESSION['filhost'];
echo '">';
?>

View File

@ -1,8 +1,6 @@
<?php
// search the message fild for a string
echo '<input type="text" name="searchmsg" size="30" value="';
if( isset($_POST['searchmsg']) )
echo $_POST['searchmsg'];
echo '">';
echo $_SESSION['searchmsg'];
echo '">';
?>

View File

@ -56,7 +56,7 @@ if( !isset($_SESSION['save_cookies']) )
// use the language code, only two letters are permitted
if (!isset($_SESSION['language']))
{
$_SESSION['language'] = _DEFLANG;
$_SESSION['language'] = _DEFLANG;
}
/*
@ -65,17 +65,17 @@ $_SESSION['language'] = _DEFLANG;
*/
if (!isset($_SESSION['stylesheet']))
{
$_SESSION['stylesheet'] = 'phplogcon'; // default
$_SESSION['stylesheet'] = 'phplogcon'; // default
}
if (!isset($_SESSION['debug']))
{
$_SESSION['debug'] = 0; // default
$_SESSION['debug'] = 0; // default
}
if (!isset($_SESSION['savefiltersettings']))
{
$_SESSION['savefiltersettings'] = 0; // default
$_SESSION['savefiltersettings'] = 0; // default
}
/*
@ -83,17 +83,17 @@ $_SESSION['savefiltersettings'] = 0; // default
* if the quick filter settings not configured yet.
*/
if (!isset($_SESSION['FilterInfoUnit']))
$_SESSION['FilterInfoUnit'] = _FilterInfoUnit;
$_SESSION['FilterInfoUnit'] = _FilterInfoUnit;
if (!isset($_SESSION['FilterOrderby']))
$_SESSION['FilterOrderby'] = _FilterOrderby;
$_SESSION['FilterOrderby'] = _FilterOrderby;
if (!isset($_SESSION['FilterRefresh']))
$_SESSION['FilterRefresh'] = _FilterRefresh;
$_SESSION['FilterRefresh'] = _FilterRefresh;
if (!isset($_SESSION['FilterColExp']))
$_SESSION['FilterColExp'] = _FilterColExp;
$_SESSION['FilterColExp'] = _FilterColExp;
if (!isset($_SESSION['FilterHost']))
$_SESSION['FilterHost'] = _FilterHost;
$_SESSION['FilterHost'] = _FilterHost;
if (!isset($_SESSION['FilterMsg']))
$_SESSION['FilterMsg'] = _FilterMsg;
$_SESSION['FilterMsg'] = _FilterMsg;
/*
* Filtering by ip/host
@ -101,11 +101,13 @@ $_SESSION['FilterMsg'] = _FilterMsg;
*/
if (isset($_POST['filhost']))
{
$_SESSION['filhost'] = PreStrFromTxt4DB($_POST['filhost']);
$_POST['filhost'] = PreStrFromTxt4Out($_POST['filhost']);
$_SESSION['filhost'] = PreStrFromTxt4DB($_POST['filhost']);
}
else
$_SESSION['filhost'] = '';
{
if (!isset($_SESSION['filhost']))
$_SESSION['filhost'] = '';
}
/*
@ -114,11 +116,29 @@ $_SESSION['filhost'] = '';
*/
if (isset($_POST['searchmsg']))
{
$_SESSION['searchmsg'] = PreStrFromTxt4DB($_POST['searchmsg']);
$_POST['searchmsg'] = PreStrFromTxt4Out($_POST['searchmsg']);
$_SESSION['searchmsg'] = PreStrFromTxt4DB($_POST['searchmsg']);
}
else
$_SESSION['searchmsg'] = '';
{
if (!isset($_SESSION['searchmsg']))
$_SESSION['searchmsg'] = '';
}
/*
* Color an Expression
*/
if (isset($_POST['regexp']))
{
$_SESSION['regexp'] = $_POST['regexp'];
$_SESSION['color'] = $_POST['color'];
}
else
{
if (!isset($_SESSION['regexp']))
$_SESSION['regexp'] = '';
if (!isset($_SESSION['color']))
$_SESSION['color'] = 'red';
}
if (isset($_POST['d1']))
{
@ -198,15 +218,6 @@ if( isset($_POST['show_methode']) )
}
//events-display.php
// InitVariable(2, "search", "");
// InitVariable(1, "regexp", "");
// implement this
//InitVariable(1, "color", "red");
if (!isset($_SESSION['infounit_sl']))
$_SESSION['infounit_sl'] = 1;
if (!isset($_SESSION['infounit_er']))

View File

@ -214,14 +214,19 @@ See AUTHORS to learn who helped make it become a reality.
// 2005-08-17 by therget --->
// If any date is in the future, show a message on the homepage.
$now = date("Y-m-d g:i:s");
$sqlstatement = "SELECT COUNT(*) AS datecount FROM "._DBTABLENAME ." WHERE "._DATE." > '".$now."'";
/* 2005-09-19 by mm
* $now = date("Y-m-d g:i:s"); // <-- this is a bug use H for 0 - 23 hours.
* Furthermore, use the database driver for date/time stuff!
*/
$sqlstatement = "SELECT COUNT(*) AS datecount FROM "._DBTABLENAME ." WHERE "._DATE." > ".dbc_sql_timeformat(time());
$result = db_exec($global_Con,$sqlstatement);
$db_datecount = db_fetch_array($result, "datecount");
if ($db_datecount[0] > 0)
{
echo "<br><br><b>Note:</b> There are ".$db_datecount[0]." Events in the Database, which are in the future";
echo _NoteMsgInFuture1, $db_datecount[0], _NoteMsgInFuture2;
}
// <--- End 2005-08-17 by therget
}

View File

@ -1,23 +1,31 @@
<?php
/*#### #### #### #### #### #### #### #### #### ####
/*#### #### #### #### #### #### #### #### #### ####
phpLogCon - A Web Interface to Log Data.
Copyright (C) 2003 Adiscon GmbH
Copyright (C) 2004-2005 Adiscon GmbH
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.
Version 1.1
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.
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.
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
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.
If you have questions about phpLogCon in general, please email info@adiscon.com. To learn more about phpLogCon, please visit
http://www.phplogcon.com.
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., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA.
This Project was intiated and is maintened by Rainer Gerhards <rgerhards@hq.adiscon.com>. See AUTHORS to learn who helped make
it become a reality.
If you have questions about phpLogCon in general, please email info@adiscon.com.
To learn more about phpLogCon, please visit http://www.phplogcon.com.
*/#### #### #### #### #### #### #### #### #### ####
This Project was intiated and is maintened by Rainer Gerhards <rgerhards@hq.adiscon.com>.
See AUTHORS to learn who helped make it become a reality.
*/#### #### #### #### #### #### #### #### #### ####
// Set some defaults
@ -50,7 +58,7 @@ it become a reality.
define('_DBPWD', '');
// table name
define('_DBTABLENAME', 'systemevents');
define('_DBTABLENAME', 'SystemEvents');
// Switch for connection mode
// Currently only odbc and native works
@ -95,6 +103,8 @@ it become a reality.
/*
***** BEGIN VARIOUS SETTINGS *****
*/
//Set to 1 and the Header (image/introduce sentence) will be used! Set 0 to disable it.
define('_ENABLEHEADER', 1);
//Set to 1 and User Interface will be used! Set 0 to disable it.
define('_ENABLEUI', 0);
@ -111,6 +121,10 @@ it become a reality.
// Coloring priority
define('_COLPriority', 1);
// Custom Admin Message (appears on the homepage)
define('_AdminMessage', "");
/*
***** END VARIOUS SETTINGS *****
*/

View File

@ -228,3 +228,5 @@ define('_InsPer9', 'Vergessen Sie nicht den kompletten Ordner \'install/\' zu l
define('_InsPer10', 'Diese Datein können für einen DoS auf Ihr phpLogCon genutzt werden!');
define('_InsPer11', 'Nach Löschen des Ordners können Sie zum ');
define('_InsPer12', 'Index wecheln!');
define('_NoteMsgInFuture1', '<br><br><b>Hinweis:</b> Es sind ');
define('_NoteMsgInFuture2', ' Events in der Datenbank, die ein Datum haben, das in der Zukunft liegt!');

View File

@ -228,3 +228,5 @@ define('_InsPer9', 'Don\'t forget to delete whole \'install/\' directory!');
define('_InsPer10', 'These files could be user for a DoS on your phpLogCon!');
define('_InsPer11', 'After deleting the directory, you can go to ');
define('_InsPer12', 'index');
define('_NoteMsgInFuture1', '<br><br><b>Note:</b> There are ');
define('_NoteMsgInFuture2', ' events in the database, which are in the future!');

View File

@ -1,23 +1,31 @@
<?php
/*#### #### #### #### #### #### #### #### #### ####
/*#### #### #### #### #### #### #### #### #### ####
phpLogCon - A Web Interface to Log Data.
Copyright (C) 2003 Adiscon GmbH
Copyright (C) 2004-2005 Adiscon GmbH
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.
Version 1.1
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.
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.
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
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.
If you have questions about phpLogCon in general, please email info@adiscon.com. To learn more about phpLogCon, please visit
http://www.phplogcon.com.
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., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA.
This Project was intiated and is maintened by Rainer Gerhards <rgerhards@hq.adiscon.com>. See AUTHORS to learn who helped make
it become a reality.
If you have questions about phpLogCon in general, please email info@adiscon.com.
To learn more about phpLogCon, please visit http://www.phplogcon.com.
*/#### #### #### #### #### #### #### #### #### ####
This Project was intiated and is maintened by Rainer Gerhards <rgerhards@hq.adiscon.com>.
See AUTHORS to learn who helped make it become a reality.
*/#### #### #### #### #### #### #### #### #### ####
// Set some defaults
@ -95,6 +103,8 @@ it become a reality.
/*
***** BEGIN VARIOUS SETTINGS *****
*/
//Set to 1 and the Header (image/introduce sentence) will be used! Set 0 to disable it.
define('_ENABLEHEADER', 1);
//Set to 1 and User Interface will be used! Set 0 to disable it.
define('_ENABLEUI', 0);
@ -111,6 +121,10 @@ it become a reality.
// Coloring priority
define('_COLPriority', 1);
// Custom Admin Message (appears on the homepage)
define('_AdminMessage', "");
/*
***** END VARIOUS SETTINGS *****
*/

View File

@ -149,15 +149,15 @@ See AUTHORS to learn who helped make it become a reality.
$message = htmlspecialchars($message);
if(isset($_POST['regexp']) && $_POST['regexp'] != "")
if(isset($_SESSION['regexp']) && $_SESSION['regexp'] != "")
{
$_POST['regexp'] = trim($_POST['regexp']);
$_SESSION['regexp'] = trim($_SESSION['regexp']);
$messageUp = strtoupper($message);
$regexpUp = strtoupper($_POST['regexp']);
$regexpUp = strtoupper($_SESSION['regexp']);
$search_pos = strpos($messageUp, $regexpUp);
if($search_pos !== FALSE)
{
$regexpLng = strlen($_POST['regexp']);
$regexpLng = strlen($_SESSION['regexp']);
$strCount = substr_count($messageUp, $regexpUp);
$strTmp = $message;
@ -169,7 +169,7 @@ See AUTHORS to learn who helped make it become a reality.
$subStrSt = substr($strTmp, 0 , $search_pos);
$subStrExp = substr($strTmp, $search_pos, $regexpLng);
$subStrEnd = substr($strTmp, ($search_pos + $regexpLng));
$message .= $subStrSt . '<font color="' . $_POST['color'] . '">' . $subStrExp . '</font>';
$message .= $subStrSt . '<font color="' . $_SESSION['color'] . '">' . $subStrExp . '</font>';
if($i == ($strCount - 1))
$message .= $subStrEnd;

View File

@ -29,11 +29,6 @@ See AUTHORS to learn who helped make it become a reality.
include 'include.php';
if( !isset($_POST['sortMethode']) )
$_POST['sortMethode'] = "DESC";
WriteStandardHeader(_MSGShwSlt);
//classes
@ -187,19 +182,19 @@ See AUTHORS to learn who helped make it become a reality.
$message = htmlspecialchars($message);
if(isset($_POST['regexp']) && $_POST['regexp'] != "")
if(isset($_SESSION['regexp']) && $_SESSION['regexp'] != "")
{
$_POST['regexp'] = trim($_POST['regexp']);
$_SESSION['regexp'] = trim($_SESSION['regexp']);
$messageUp = strtoupper($message);
$regexpUp = strtoupper($_POST['regexp']);
$regexpUp = strtoupper($_SESSION['regexp']);
$search_pos = strpos($messageUp, $regexpUp);
if($search_pos !== FALSE)
{
$regexpLng = strlen($_POST['regexp']);
$regexpLng = strlen($_SESSION['regexp']);
$strCount = substr_count($messageUp, $regexpUp);
$strTmp = $message;
$message = "";
$message = '';
for($i = 0; $i < $strCount; $i++)
{
$messageUp = strtoupper($strTmp);
@ -207,7 +202,7 @@ See AUTHORS to learn who helped make it become a reality.
$subStrSt = substr($strTmp, 0 , $search_pos);
$subStrExp = substr($strTmp, $search_pos, $regexpLng);
$subStrEnd = substr($strTmp, ($search_pos + $regexpLng));
$message .= $subStrSt . '<font color="' . $_POST['color'] . '">' . $subStrExp . '</font>';
$message .= $subStrSt . '<font color="' . $_SESSION['color'] . '">' . $subStrExp . '</font>';
if($i == ($strCount - 1))
$message .= $subStrEnd;