mirror of
https://github.com/rsyslog/loganalyzer.git
synced 2025-09-25 10:57:52 +02:00
Fixed a bug in the convert.php script which inserted the wrong database version number
This caused phpLogCon to force an database upgrade which is not needed at all.
This commit is contained in:
parent
2368febba9
commit
2d089f1c94
@ -162,7 +162,7 @@ else if ( $content['CONVERT_STEP'] == 3 )
|
||||
}
|
||||
|
||||
// Append INSERT Statement for Config Table to set the Database Version ^^!
|
||||
$mycommands[count($mycommands)] = "INSERT INTO `" . GetConfigSetting("UserDBPref") . "config` (`propname`, `propvalue`, `is_global`) VALUES ('database_installedversion', '" . $content['database_internalversion'] . "', " . $content['database_internalversion'] . ")";
|
||||
$mycommands[count($mycommands)] = "INSERT INTO `" . GetConfigSetting("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!
|
||||
|
@ -260,7 +260,7 @@ else if ( $content['INSTALL_STEP'] == 3 )
|
||||
if ( isset($_GET['errormsg']) )
|
||||
{
|
||||
$content['iserror'] = "true";
|
||||
$content['errormsg'] = urldecode($_GET['errormsg']);
|
||||
$content['errormsg'] = urldecode( DB_StripSlahes($_GET['errormsg']) );
|
||||
}
|
||||
}
|
||||
else if ( $content['INSTALL_STEP'] == 4 )
|
||||
@ -461,7 +461,7 @@ else if ( $content['INSTALL_STEP'] == 6 )
|
||||
if ( isset($_GET['errormsg']) )
|
||||
{
|
||||
$content['iserror'] = "true";
|
||||
$content['errormsg'] = urldecode($_GET['errormsg']);
|
||||
$content['errormsg'] = urldecode( DB_StripSlahes($_GET['errormsg']) );
|
||||
}
|
||||
}
|
||||
else // NO Database means NO user management, so next step!
|
||||
@ -553,7 +553,7 @@ else if ( $content['INSTALL_STEP'] == 7 )
|
||||
if ( isset($_GET['errormsg']) )
|
||||
{
|
||||
$content['iserror'] = "true";
|
||||
$content['errormsg'] = urldecode($_GET['errormsg']);
|
||||
$content['errormsg'] = urldecode( DB_StripSlahes($_GET['errormsg']) );
|
||||
}
|
||||
}
|
||||
else if ( $content['INSTALL_STEP'] == 8 )
|
||||
|
@ -27,7 +27,7 @@
|
||||
<table width="100%" cellpadding="2" cellspacing="1" border="0" align="center" class="with_border_alternate">
|
||||
<tr>
|
||||
<td class="title">
|
||||
<h1 align="center">{LN_CONVERT_TITLETOP}</h1>
|
||||
<h3 align="center">{LN_CONVERT_TITLETOP}</h3>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
@ -56,7 +56,7 @@
|
||||
<table width="100%" cellpadding="2" cellspacing="1" border="0" align="center" class="with_border_alternate">
|
||||
<tr>
|
||||
<td class="title">
|
||||
<h1 align="center">{INSTALL_TITLETOP}</h1>
|
||||
<h3 align="center">{INSTALL_TITLETOP}</h3>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
Loading…
x
Reference in New Issue
Block a user