From 4c5292cb59059c2b841c6ce183c9df7b755a867e Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 13 Jul 2015 14:36:59 -0500
Subject: [PATCH] install: Fix code include() crash
---
bootstrap.php | 3 +--
include/class.forms.php | 2 --
setup/inc/class.installer.php | 24 +++++++++++++-----------
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/bootstrap.php b/bootstrap.php
index 6e245a142..5807fac46 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -191,14 +191,13 @@ class Bootstrap {
#include required files
require_once INCLUDE_DIR.'class.util.php';
require_once INCLUDE_DIR.'class.translation.php';
- require(INCLUDE_DIR.'class.signal.php');
+ require_once(INCLUDE_DIR.'class.signal.php');
require(INCLUDE_DIR.'class.model.php');
require(INCLUDE_DIR.'class.user.php');
require(INCLUDE_DIR.'class.auth.php');
require(INCLUDE_DIR.'class.pagenate.php'); //Pagenate helper!
require(INCLUDE_DIR.'class.log.php');
require(INCLUDE_DIR.'class.crypto.php');
- require_once(INCLUDE_DIR.'class.signal.php');
require(INCLUDE_DIR.'class.page.php');
require_once(INCLUDE_DIR.'class.format.php'); //format helpers
require_once(INCLUDE_DIR.'class.validator.php'); //Class to help with basic form input validation...please help improve it.
diff --git a/include/class.forms.php b/include/class.forms.php
index ebc3c5588..e926ae07a 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -3427,8 +3427,6 @@ class DatetimePickerWidget extends Widget {
// TODO: Add time picker -- requires time picker or selection with
// Misc::timeDropdown
echo ' ' . Misc::timeDropdown($hr, $min, $this->name . ':time');
-
- echo '</div>';
}
/**
diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php
index 6ab645e7d..24594ec40 100644
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
@@ -73,13 +73,6 @@ class Installer extends SetupWizard {
//Admin's pass confirmation.
if(!$this->errors && strcasecmp($vars['passwd'],$vars['passwd2']))
$this->errors['passwd2']=__('Password(s) do not match');
- try {
- require_once INCLUDE_DIR.'class.auth.php';
- PasswordPolicy::checkPassword($vars['passwd'], null);
- }
- catch (BadPassword $e) {
- $this->errors['passwd'] = $e->getMessage();
- }
//Check table prefix underscore required at the end!
if($vars['prefix'] && substr($vars['prefix'], -1)!='_')
@@ -118,16 +111,25 @@ class Installer extends SetupWizard {
}
}
- // bailout on errors.
- if ($this->errors)
- return false;
-
/*************** We're ready to install ************************/
define('ADMIN_EMAIL',$vars['admin_email']); //Needed to report SQL errors during install.
define('TABLE_PREFIX',$vars['prefix']); //Table prefix
Bootstrap::defineTables(TABLE_PREFIX);
Bootstrap::loadCode();
+ // Check password against password policy (after loading code)
+ try {
+ PasswordPolicy::checkPassword($vars['passwd'], null);
+ }
+ catch (BadPassword $e) {
+ $this->errors['passwd'] = $e->getMessage();
+ }
+
+ // bailout on errors.
+ if ($this->errors)
+ return false;
+
+
$debug = true; // Change it to false to squelch SQL errors.
//Last minute checks.
--
GitLab