From 01b849973569532b2644c82ecf7cc8f4014f2bd6 Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Mon, 29 Sep 2008 12:07:47 +0200
Subject: [PATCH] Fixed wrong database version insert in install.php as well as
 incorrect redirect login page during install

---
 src/include/functions_common.php | 6 +++---
 src/install.php                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index 7aae607..314c2ea 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -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') )
 				{
diff --git a/src/install.php b/src/install.php
index e586776..a76bb84 100644
--- a/src/install.php
+++ b/src/install.php
@@ -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!