tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-26 03:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source 
Merge branch 'beta' into devel

Conflicts:

	src/include/functions_common.php
This commit is contained in:
Andre Lorbach 2008-09-29 14:03:28 +02:00
commit 3571c59277
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,4 +1,15 @@
---------------------------------------------------------------------------
Version 2.5.12 (beta), 2008-09-29
- Fixed several SQL issues in the logstream classes when filtering
was used.
- Enhanced all content menus in the main site, reduced coding as well.
- Added support for URL detection within the data of string fields, these
links can be opened in new windows.
- Fixed bug when excluding more then one string filter from the
same field type.
- Fixed wrong database version insert in install.php as well as
incorrect redirect login page during install.
---------------------------------------------------------------------------
Version 2.5.11 (beta), 2008-09-25
- Fixed the "next page" button when a logstream disk source was used.
The "next page" button stopped working as a side effect of some

6
src/include/functions_common.php
View File

@ -649,9 +649,9 @@ function InitConfigurationValues()
// Check if user needs to be logged in
if ( GetConfigSetting("UserDBLoginRequired", false) )
{
// User needs to be logged in, redirect to login page
if ( !defined("IS_NOLOGINPAGE") )
RedirectToUserLogin();
// Redirect USER if not on loginpage or installpage!
if ( !defined("IS_NOLOGINPAGE") && !defined("IN_PHPLOGCON_INSTALL") )
RedirectToUserLogin();
}
else if ( defined('IS_ADMINPAGE') )
{

2
src/install.php
View File

@ -404,7 +404,7 @@ else if ( $content['INSTALL_STEP'] == 5 )
}
// Append INSERT Statement for Config Table to set the Database Version ^^!
$mycommands[count($mycommands)] = "INSERT INTO `" . $_SESSION["UserDBPref"] . "config` (`propname`, `propvalue`, `is_global`) VALUES ('database_installedversion', '" . $content['database_internalversion'] . "', " . $content['database_internalversion'] . ")";
$mycommands[count($mycommands)] = "INSERT INTO `" . $_SESSION["UserDBPref"] . "config` (`propname`, `propvalue`, `is_global`) VALUES ('database_installedversion', '" . $content['database_internalversion'] . "', 1)";
// --- Now execute all commands
ini_set('error_reporting', E_WARNING); // Enable Warnings!