Commit a60df6232b132304575c43073961a05b40c7551f
1 parent
260dfbdf
StoryId 778896:Updated Bypass Mechanism
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Showing
2 changed files
with
6 additions
and
12 deletions
control.php
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 36 | * | 36 | * |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | -// | 39 | +// check if system has been installed |
| 40 | require_once("setup/wizard/install_util.php"); | 40 | require_once("setup/wizard/install_util.php"); |
| 41 | // Check if system has been installed | 41 | // Check if system has been installed |
| 42 | $iu = new InstallUtil(); | 42 | $iu = new InstallUtil(); |
setup/wizard/index.php
| @@ -41,19 +41,13 @@ | @@ -41,19 +41,13 @@ | ||
| 41 | */ | 41 | */ |
| 42 | require_once("install_util.php"); | 42 | require_once("install_util.php"); |
| 43 | $ui = new InstallUtil(); | 43 | $ui = new InstallUtil(); |
| 44 | - $bypass = false; | ||
| 45 | // Bypass | 44 | // Bypass |
| 46 | -// if(isset($_GET['bypass'])) { | ||
| 47 | -// $bypass = $_GET['bypass']; | ||
| 48 | -// $_SESSION['bypass'] = $bypass; | ||
| 49 | -// } | ||
| 50 | - | ||
| 51 | -// if(isset($_SESSION['bypass'])) { | ||
| 52 | -// | ||
| 53 | -// $bypass = $_SESSION['bypass']; | ||
| 54 | -// } | 45 | + if(isset($_GET['bypass'])) { |
| 46 | + if($_GET['bypass']) | ||
| 47 | + touch("install"); | ||
| 48 | + } | ||
| 55 | 49 | ||
| 56 | - if(!$ui->isSystemInstalled() || $bypass) { | 50 | + if(!$ui->isSystemInstalled()) { |
| 57 | require("installer.php"); | 51 | require("installer.php"); |
| 58 | } else { | 52 | } else { |
| 59 | echo "System has been installed <a href='../../'>Goto Login</a>"; | 53 | echo "System has been installed <a href='../../'>Goto Login</a>"; |