From 81e1c3c303deb234a7c75b8c90caa0da0ab9d1ed Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Mon, 17 Dec 2012 10:20:42 -0500
Subject: [PATCH] Add check to make sure we don't already have an existing
(current) installation - before we get to prereq. stage.
---
setup/install.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/setup/install.php b/setup/install.php
index 5f590da1c..130983a69 100644
--- a/setup/install.php
+++ b/setup/install.php
@@ -105,7 +105,12 @@ switch(strtolower($_SESSION['ost_installer']['s'])) {
break;
default:
//Fail IF any of the old config files exists.
- if(file_exists(INCLUDE_DIR.'settings.php') || file_exists(ROOT_DIR.'ostconfig.php'))
+ if(file_exists(INCLUDE_DIR.'settings.php')
+ || file_exists(ROOT_DIR.'ostconfig.php')
+ || (file_exists(OSTICKET_CONFIGFILE)
+ && preg_match("/define\('OSTINSTALLED',TRUE\)\;/i",
+ file_get_contents(OSTICKET_CONFIGFILE)))
+ )
$inc='file-unclean.inc.php';
else
$inc='install-prereq.inc.php';
--
GitLab