Elgg / Elgg

install/cli/travis.php

Indentation +19 added lines, -19 removed lines

@@ -4,27 +4,27 @@
  * Configuration array for Elgg installation on Travis
  */
 return [
-	// database parameters
-	'dbuser' => 'root',
-	'dbpassword' => 'password',
-	'dbname' => 'elgg',
+    // database parameters
+    'dbuser' => 'root',
+    'dbpassword' => 'password',
+    'dbname' => 'elgg',
 
-	// We use a wonky dbprefix to catch any cases where folks hardcode "elgg_"
-	// instead of using config->dbprefix
-	'dbprefix' => 't_i_elgg_',
+    // We use a wonky dbprefix to catch any cases where folks hardcode "elgg_"
+    // instead of using config->dbprefix
+    'dbprefix' => 't_i_elgg_',
 
-	// site settings
-	'sitename' => 'Elgg Travis Site',
-	'siteemail' => 'no_reply@travis.elgg.org',
-	'wwwroot' => 'http://localhost:8888/',
-	'dataroot' => getenv('HOME') . '/elgg_data/',
+    // site settings
+    'sitename' => 'Elgg Travis Site',
+    'siteemail' => 'no_reply@travis.elgg.org',
+    'wwwroot' => 'http://localhost:8888/',
+    'dataroot' => getenv('HOME') . '/elgg_data/',
 
-	// admin account
-	'displayname' => 'Administrator',
-	'email' => 'admin@travis.elgg.org',
-	'username' => 'admin',
-	'password' => 'fancypassword',
+    // admin account
+    'displayname' => 'Administrator',
+    'email' => 'admin@travis.elgg.org',
+    'username' => 'admin',
+    'password' => 'fancypassword',
 
-	// timezone
-	'timezone' => 'UTC'
+    // timezone
+    'timezone' => 'UTC'
 ];
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	'sitename' => 'Elgg Travis Site',
 	'siteemail' => 'no_reply@travis.elgg.org',
 	'wwwroot' => 'http://localhost:8888/',
-	'dataroot' => getenv('HOME') . '/elgg_data/',
+	'dataroot' => getenv('HOME').'/elgg_data/',
 
 	// admin account
 	'displayname' => 'Administrator',

engine/classes/ElggInstaller.php

Indentation +1406 added lines, -1406 removed lines

@@ -34,1414 +34,1414 @@
  */
 class ElggInstaller {
 	
-	private $steps = [
-		'welcome',
-		'requirements',
-		'database',
-		'settings',
-		'admin',
-		'complete',
-		];
-
-	private $has_completed = [
-		'config' => false,
-		'database' => false,
-		'settings' => false,
-		'admin' => false,
-	];
-
-	private $is_action = false;
-
-	private $autoLogin = true;
-
-	/**
-	 * @var ServiceProvider
-	 */
-	private $services;
-
-	/**
-	 * @var Config
-	 */
-	private $config;
-
-	/**
-	 * @var Application
-	 */
-	private $app;
-
-	/**
-	 * Dispatches a request to one of the step controllers
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	public function run() {
-		$this->getApp();
-
-		$this->is_action = $this->services->request->getMethod() === 'POST';
-
-		$step = get_input('step', 'welcome');
-
-		if (!in_array($step, $this->getSteps())) {
-			$msg = elgg_echo('InstallationException:UnknownStep', [$step]);
-			throw new InstallationException($msg);
-		}
-
-		$this->determineInstallStatus();
+    private $steps = [
+        'welcome',
+        'requirements',
+        'database',
+        'settings',
+        'admin',
+        'complete',
+        ];
+
+    private $has_completed = [
+        'config' => false,
+        'database' => false,
+        'settings' => false,
+        'admin' => false,
+    ];
+
+    private $is_action = false;
+
+    private $autoLogin = true;
+
+    /**
+     * @var ServiceProvider
+     */
+    private $services;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var Application
+     */
+    private $app;
+
+    /**
+     * Dispatches a request to one of the step controllers
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    public function run() {
+        $this->getApp();
+
+        $this->is_action = $this->services->request->getMethod() === 'POST';
+
+        $step = get_input('step', 'welcome');
+
+        if (!in_array($step, $this->getSteps())) {
+            $msg = elgg_echo('InstallationException:UnknownStep', [$step]);
+            throw new InstallationException($msg);
+        }
+
+        $this->determineInstallStatus();
 	
-		$this->checkInstallCompletion($step);
-
-		// check if this is an install being resumed
-		$this->resumeInstall($step);
-
-		$this->finishBootstrapping($step);
-
-		$params = $this->services->request->request->all();
-
-		$method = "run" . ucwords($step);
-		$this->$method($params);
-	}
-
-	/**
-	 * Build the application needed by the installer
-	 *
-	 * @return Application
-	 * @throws InstallationException
-	 */
-	protected function getApp() {
-		if ($this->app) {
-			return $this->app;
-		}
-
-		$config = new Config();
-		$config->elgg_config_locks = false;
-		$config->installer_running = true;
-		$config->dbencoding = 'utf8mb4';
-
-		$this->config = $config;
-		$this->services = new ServiceProvider($config);
-
-		$app = Application::factory([
-			'service_provider' => $this->services,
-			'handle_exceptions' => false,
-			'handle_shutdown' => false,
-		]);
-
-		// Don't set global $CONFIG, because loading the settings file may require it to write to
-		// it, and it can have array sets (e.g. cookie config) that fail when using a proxy for
-		// the config service.
-		//$app->setGlobalConfig();
-
-		Application::setInstance($app);
-		$app->loadCore();
-		$this->app = $app;
-
-		$this->services->setValue('session', \ElggSession::getMock());
-		$this->services->views->setViewtype('installation');
-		$this->services->views->registerPluginViews(Paths::elgg());
-		$this->services->translator->registerTranslations(Paths::elgg() . "install/languages/", true);
-
-		return $this->app;
-	}
-
-	/**
-	 * Set the auto login flag
-	 *
-	 * @param bool $flag Auto login
-	 *
-	 * @return void
-	 */
-	public function setAutoLogin($flag) {
-		$this->autoLogin = (bool) $flag;
-	}
-
-	/**
-	 * A batch install of Elgg
-	 *
-	 * All required parameters must be passed in as an associative array. See
-	 * $requiredParams for a list of them. This creates the necessary files,
-	 * loads the database, configures the site settings, and creates the admin
-	 * account. If it fails, an exception is thrown. It does not check any of
-	 * the requirements as the multiple step web installer does.
-	 *
-	 * @param array $params          Array of key value pairs
-	 * @param bool  $create_htaccess Should .htaccess be created
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	public function batchInstall(array $params, $create_htaccess = false) {
-		$this->getApp();
-
-		$defaults = [
-			'dbhost' => 'localhost',
-			'dbprefix' => 'elgg_',
-			'language' => 'en',
-			'siteaccess' => ACCESS_PUBLIC,
-		];
-		$params = array_merge($defaults, $params);
-
-		$required_params = [
-			'dbuser',
-			'dbpassword',
-			'dbname',
-			'sitename',
-			'wwwroot',
-			'dataroot',
-			'displayname',
-			'email',
-			'username',
-			'password',
-		];
-		foreach ($required_params as $key) {
-			if (empty($params[$key])) {
-				$msg = elgg_echo('install:error:requiredfield', [$key]);
-				throw new InstallationException($msg);
-			}
-		}
-
-		// password is passed in once
-		$params['password1'] = $params['password2'] = $params['password'];
-
-		if ($create_htaccess) {
-			$rewrite_tester = new ElggRewriteTester();
-			if (!$rewrite_tester->createHtaccess($params['wwwroot'])) {
-				throw new InstallationException(elgg_echo('install:error:htaccess'));
-			}
-		}
-
-		$this->determineInstallStatus();
-
-		if (!$this->has_completed['config']) {
-			if (!$this->createSettingsFile($params)) {
-				throw new InstallationException(elgg_echo('install:error:settings'));
-			}
-		}
-
-		$this->loadSettingsFile();
-
-		// Make sure settings file matches parameters
-		$config = $this->config;
-		$config_keys = [
-			// param key => config key
-			'dbhost' => 'dbhost',
-			'dbuser' => 'dbuser',
-			'dbpassword' => 'dbpass',
-			'dbname' => 'dbname',
-			'dataroot' => 'dataroot',
-			'dbprefix' => 'dbprefix',
-		];
-		foreach ($config_keys as $params_key => $config_key) {
-			if ($params[$params_key] !== $config->$config_key) {
-				throw new InstallationException(elgg_echo('install:error:settings_mismatch', [$config_key]));
-			}
-		}
-
-		if (!$this->connectToDatabase()) {
-			throw new InstallationException(elgg_echo('install:error:databasesettings'));
-		}
-
-		if (!$this->has_completed['database']) {
-			if (!$this->installDatabase()) {
-				throw new InstallationException(elgg_echo('install:error:cannotloadtables'));
-			}
-		}
-
-		// load remaining core libraries
-		$this->finishBootstrapping('settings');
-
-		if (!$this->saveSiteSettings($params)) {
-			throw new InstallationException(elgg_echo('install:error:savesitesettings'));
-		}
-
-		if (!$this->createAdminAccount($params)) {
-			throw new InstallationException(elgg_echo('install:admin:cannot_create'));
-		}
-	}
-
-	/**
-	 * Renders the data passed by a controller
-	 *
-	 * @param string $step The current step
-	 * @param array  $vars Array of vars to pass to the view
-	 *
-	 * @return void
-	 */
-	protected function render($step, $vars = []) {
-		$vars['next_step'] = $this->getNextStep($step);
-
-		$title = elgg_echo("install:$step");
-		$body = elgg_view("install/pages/$step", $vars);
+        $this->checkInstallCompletion($step);
+
+        // check if this is an install being resumed
+        $this->resumeInstall($step);
+
+        $this->finishBootstrapping($step);
+
+        $params = $this->services->request->request->all();
+
+        $method = "run" . ucwords($step);
+        $this->$method($params);
+    }
+
+    /**
+     * Build the application needed by the installer
+     *
+     * @return Application
+     * @throws InstallationException
+     */
+    protected function getApp() {
+        if ($this->app) {
+            return $this->app;
+        }
+
+        $config = new Config();
+        $config->elgg_config_locks = false;
+        $config->installer_running = true;
+        $config->dbencoding = 'utf8mb4';
+
+        $this->config = $config;
+        $this->services = new ServiceProvider($config);
+
+        $app = Application::factory([
+            'service_provider' => $this->services,
+            'handle_exceptions' => false,
+            'handle_shutdown' => false,
+        ]);
+
+        // Don't set global $CONFIG, because loading the settings file may require it to write to
+        // it, and it can have array sets (e.g. cookie config) that fail when using a proxy for
+        // the config service.
+        //$app->setGlobalConfig();
+
+        Application::setInstance($app);
+        $app->loadCore();
+        $this->app = $app;
+
+        $this->services->setValue('session', \ElggSession::getMock());
+        $this->services->views->setViewtype('installation');
+        $this->services->views->registerPluginViews(Paths::elgg());
+        $this->services->translator->registerTranslations(Paths::elgg() . "install/languages/", true);
+
+        return $this->app;
+    }
+
+    /**
+     * Set the auto login flag
+     *
+     * @param bool $flag Auto login
+     *
+     * @return void
+     */
+    public function setAutoLogin($flag) {
+        $this->autoLogin = (bool) $flag;
+    }
+
+    /**
+     * A batch install of Elgg
+     *
+     * All required parameters must be passed in as an associative array. See
+     * $requiredParams for a list of them. This creates the necessary files,
+     * loads the database, configures the site settings, and creates the admin
+     * account. If it fails, an exception is thrown. It does not check any of
+     * the requirements as the multiple step web installer does.
+     *
+     * @param array $params          Array of key value pairs
+     * @param bool  $create_htaccess Should .htaccess be created
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    public function batchInstall(array $params, $create_htaccess = false) {
+        $this->getApp();
+
+        $defaults = [
+            'dbhost' => 'localhost',
+            'dbprefix' => 'elgg_',
+            'language' => 'en',
+            'siteaccess' => ACCESS_PUBLIC,
+        ];
+        $params = array_merge($defaults, $params);
+
+        $required_params = [
+            'dbuser',
+            'dbpassword',
+            'dbname',
+            'sitename',
+            'wwwroot',
+            'dataroot',
+            'displayname',
+            'email',
+            'username',
+            'password',
+        ];
+        foreach ($required_params as $key) {
+            if (empty($params[$key])) {
+                $msg = elgg_echo('install:error:requiredfield', [$key]);
+                throw new InstallationException($msg);
+            }
+        }
+
+        // password is passed in once
+        $params['password1'] = $params['password2'] = $params['password'];
+
+        if ($create_htaccess) {
+            $rewrite_tester = new ElggRewriteTester();
+            if (!$rewrite_tester->createHtaccess($params['wwwroot'])) {
+                throw new InstallationException(elgg_echo('install:error:htaccess'));
+            }
+        }
+
+        $this->determineInstallStatus();
+
+        if (!$this->has_completed['config']) {
+            if (!$this->createSettingsFile($params)) {
+                throw new InstallationException(elgg_echo('install:error:settings'));
+            }
+        }
+
+        $this->loadSettingsFile();
+
+        // Make sure settings file matches parameters
+        $config = $this->config;
+        $config_keys = [
+            // param key => config key
+            'dbhost' => 'dbhost',
+            'dbuser' => 'dbuser',
+            'dbpassword' => 'dbpass',
+            'dbname' => 'dbname',
+            'dataroot' => 'dataroot',
+            'dbprefix' => 'dbprefix',
+        ];
+        foreach ($config_keys as $params_key => $config_key) {
+            if ($params[$params_key] !== $config->$config_key) {
+                throw new InstallationException(elgg_echo('install:error:settings_mismatch', [$config_key]));
+            }
+        }
+
+        if (!$this->connectToDatabase()) {
+            throw new InstallationException(elgg_echo('install:error:databasesettings'));
+        }
+
+        if (!$this->has_completed['database']) {
+            if (!$this->installDatabase()) {
+                throw new InstallationException(elgg_echo('install:error:cannotloadtables'));
+            }
+        }
+
+        // load remaining core libraries
+        $this->finishBootstrapping('settings');
+
+        if (!$this->saveSiteSettings($params)) {
+            throw new InstallationException(elgg_echo('install:error:savesitesettings'));
+        }
+
+        if (!$this->createAdminAccount($params)) {
+            throw new InstallationException(elgg_echo('install:admin:cannot_create'));
+        }
+    }
+
+    /**
+     * Renders the data passed by a controller
+     *
+     * @param string $step The current step
+     * @param array  $vars Array of vars to pass to the view
+     *
+     * @return void
+     */
+    protected function render($step, $vars = []) {
+        $vars['next_step'] = $this->getNextStep($step);
+
+        $title = elgg_echo("install:$step");
+        $body = elgg_view("install/pages/$step", $vars);
 				
-		echo elgg_view_page(
-				$title,
-				$body,
-				'default',
-				[
-					'step' => $step,
-					'steps' => $this->getSteps(),
-					]
-				);
-		exit;
-	}
-
-	/**
-	 * Step controllers
-	 */
-
-	/**
-	 * Welcome controller
-	 *
-	 * @param array $vars Not used
-	 *
-	 * @return void
-	 */
-	protected function runWelcome($vars) {
-		$this->render('welcome');
-	}
-
-	/**
-	 * Requirements controller
-	 *
-	 * Checks version of php, libraries, permissions, and rewrite rules
-	 *
-	 * @param array $vars Vars
-	 *
-	 * @return void
-	 */
-	protected function runRequirements($vars) {
-
-		$report = [];
-
-		// check PHP parameters and libraries
-		$this->checkPHP($report);
-
-		// check URL rewriting
-		$this->checkRewriteRules($report);
-
-		// check for existence of settings file
-		if ($this->checkSettingsFile($report) != true) {
-			// no file, so check permissions on engine directory
-			$this->isInstallDirWritable($report);
-		}
-
-		// check the database later
-		$report['database'] = [[
-			'severity' => 'info',
-			'message' => elgg_echo('install:check:database')
-		]];
-
-		// any failures?
-		$numFailures = $this->countNumConditions($report, 'failure');
-
-		// any warnings
-		$numWarnings = $this->countNumConditions($report, 'warning');
-
-
-		$params = [
-			'report' => $report,
-			'num_failures' => $numFailures,
-			'num_warnings' => $numWarnings,
-		];
-
-		$this->render('requirements', $params);
-	}
-
-	/**
-	 * Database set up controller
-	 *
-	 * Creates the settings.php file and creates the database tables
-	 *
-	 * @param array $submissionVars Submitted form variables
-	 *
-	 * @return void
-	 */
-	protected function runDatabase($submissionVars) {
-
-		$formVars = [
-			'dbuser' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-				],
-			'dbpassword' => [
-				'type' => 'password',
-				'value' => '',
-				'required' => false,
-				],
-			'dbname' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-				],
-			'dbhost' => [
-				'type' => 'text',
-				'value' => 'localhost',
-				'required' => true,
-				],
-			'dbprefix' => [
-				'type' => 'text',
-				'value' => 'elgg_',
-				'required' => true,
-				],
-			'dataroot' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-			],
-			'wwwroot' => [
-				'type' => 'url',
-				'value' => _elgg_services()->config->wwwroot,
-				'required' => true,
-			],
-			'timezone' => [
-				'type' => 'dropdown',
-				'value' => 'UTC',
-				'options' => \DateTimeZone::listIdentifiers(),
-				'required' => true
-			]
-		];
-
-		if ($this->checkSettingsFile()) {
-			// user manually created settings file so we fake out action test
-			$this->is_action = true;
-		}
-
-		if ($this->is_action) {
-			call_user_func(function () use ($submissionVars, $formVars) {
-				// only create settings file if it doesn't exist
-				if (!$this->checkSettingsFile()) {
-					if (!$this->validateDatabaseVars($submissionVars, $formVars)) {
-						// error so we break out of action and serve same page
-						return;
-					}
-
-					if (!$this->createSettingsFile($submissionVars)) {
-						return;
-					}
-				}
-
-				// check db version and connect
-				if (!$this->connectToDatabase()) {
-					return;
-				}
-
-				if (!$this->installDatabase()) {
-					return;
-				}
-
-				system_message(elgg_echo('install:success:database'));
-
-				$this->continueToNextStep('database');
-			});
-		}
-
-		$formVars = $this->makeFormSticky($formVars, $submissionVars);
-
-		$params = ['variables' => $formVars,];
-
-		if ($this->checkSettingsFile()) {
-			// settings file exists and we're here so failed to create database
-			$params['failure'] = true;
-		}
-
-		$this->render('database', $params);
-	}
-
-	/**
-	 * Site settings controller
-	 *
-	 * Sets the site name, URL, data directory, etc.
-	 *
-	 * @param array $submissionVars Submitted vars
-	 *
-	 * @return void
-	 */
-	protected function runSettings($submissionVars) {
-		$formVars = [
-			'sitename' => [
-				'type' => 'text',
-				'value' => 'My New Community',
-				'required' => true,
-				],
-			'siteemail' => [
-				'type' => 'email',
-				'value' => '',
-				'required' => false,
-				],
-			'siteaccess' => [
-				'type' => 'access',
-				'value' => ACCESS_PUBLIC,
-				'required' => true,
-				],
-		];
-
-		if ($this->is_action) {
-			call_user_func(function () use ($submissionVars, $formVars) {
-				if (!$this->validateSettingsVars($submissionVars, $formVars)) {
-					return;
-				}
-
-				if (!$this->saveSiteSettings($submissionVars)) {
-					return;
-				}
-
-				system_message(elgg_echo('install:success:settings'));
-
-				$this->continueToNextStep('settings');
-			});
-		}
-
-		$formVars = $this->makeFormSticky($formVars, $submissionVars);
-
-		$this->render('settings', ['variables' => $formVars]);
-	}
-
-	/**
-	 * Admin account controller
-	 *
-	 * Creates an admin user account
-	 *
-	 * @param array $submissionVars Submitted vars
-	 *
-	 * @return void
-	 */
-	protected function runAdmin($submissionVars) {
-		$formVars = [
-			'displayname' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-				],
-			'email' => [
-				'type' => 'email',
-				'value' => '',
-				'required' => true,
-				],
-			'username' => [
-				'type' => 'text',
-				'value' => '',
-				'required' => true,
-				],
-			'password1' => [
-				'type' => 'password',
-				'value' => '',
-				'required' => true,
-				'pattern' => '.{6,}',
-				],
-			'password2' => [
-				'type' => 'password',
-				'value' => '',
-				'required' => true,
-				],
-		];
-
-		if ($this->is_action) {
-			call_user_func(function () use ($submissionVars, $formVars) {
-				if (!$this->validateAdminVars($submissionVars, $formVars)) {
-					return;
-				}
-
-				if (!$this->createAdminAccount($submissionVars, $this->autoLogin)) {
-					return;
-				}
-
-				system_message(elgg_echo('install:success:admin'));
-
-				$this->continueToNextStep('admin');
-			});
-		}
-
-		// Bit of a hack to get the password help to show right number of characters
-		// We burn the value into the stored translation.
-		$lang = $this->services->translator->getCurrentLanguage();
-		$translations = $this->services->translator->getLoadedTranslations();
-		$this->services->translator->addTranslation($lang, [
-			'install:admin:help:password1' => sprintf(
-				$translations[$lang]['install:admin:help:password1'],
-				$this->config->min_password_length
-			),
-		]);
-
-		$formVars = $this->makeFormSticky($formVars, $submissionVars);
-
-		$this->render('admin', ['variables' => $formVars]);
-	}
-
-	/**
-	 * Controller for last step
-	 *
-	 * @return void
-	 */
-	protected function runComplete() {
-
-		// nudge to check out settings
-		$link = elgg_format_element([
-			'#tag_name' => 'a',
-			'#text' => elgg_echo('install:complete:admin_notice:link_text'),
-			'href' => elgg_normalize_url('admin/settings/basic'),
-		]);
-		$notice = elgg_echo('install:complete:admin_notice', [$link]);
-		elgg_add_admin_notice('fresh_install', $notice);
-
-		$this->render('complete');
-	}
-
-	/**
-	 * Step management
-	 */
-
-	/**
-	 * Get an array of steps
-	 *
-	 * @return array
-	 */
-	protected function getSteps() {
-		return $this->steps;
-	}
-
-	/**
-	 * Forwards the browser to the next step
-	 *
-	 * @param string $currentStep Current installation step
-	 *
-	 * @return void
-	 */
-	protected function continueToNextStep($currentStep) {
-		$this->is_action = false;
-		forward($this->getNextStepUrl($currentStep));
-	}
-
-	/**
-	 * Get the next step as a string
-	 *
-	 * @param string $currentStep Current installation step
-	 *
-	 * @return string
-	 */
-	protected function getNextStep($currentStep) {
-		$index = 1 + array_search($currentStep, $this->steps);
-		if (isset($this->steps[$index])) {
-			return $this->steps[$index];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Get the URL of the next step
-	 *
-	 * @param string $currentStep Current installation step
-	 *
-	 * @return string
-	 */
-	protected function getNextStepUrl($currentStep) {
-		$nextStep = $this->getNextStep($currentStep);
-		return $this->config->wwwroot . "install.php?step=$nextStep";
-	}
-
-	/**
-	 * Updates $this->has_completed according to the current installation
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	protected function determineInstallStatus() {
-		$path = Paths::settingsFile();
-		if (!is_file($path) || !is_readable($path)) {
-			return;
-		}
-
-		$this->loadSettingsFile();
-
-		$this->has_completed['config'] = true;
-
-		// must be able to connect to database to jump install steps
-		$dbSettingsPass = $this->checkDatabaseSettings(
-			$this->config->dbuser,
-			$this->config->dbpass,
-			$this->config->dbname,
-			$this->config->dbhost
-		);
-
-		if (!$dbSettingsPass) {
-			return;
-		}
-
-		$db = $this->services->db;
-
-		// check that the config table has been created
-		$result = $db->getData("SHOW TABLES");
-		if ($result) {
-			foreach ($result as $table) {
-				$table = (array) $table;
-				if (in_array("{$db->prefix}config", $table)) {
-					$this->has_completed['database'] = true;
-				}
-			}
-			if ($this->has_completed['database'] == false) {
-				return;
-			}
-		} else {
-			// no tables
-			return;
-		}
-
-		// check that the config table has entries
-		$query = "SELECT COUNT(*) AS total FROM {$db->prefix}config";
-		$result = $db->getData($query);
-		if ($result && $result[0]->total > 0) {
-			$this->has_completed['settings'] = true;
-		} else {
-			return;
-		}
-
-		// check that the users entity table has an entry
-		$query = "SELECT COUNT(*) AS total FROM {$db->prefix}users_entity";
-		$result = $db->getData($query);
-		if ($result && $result[0]->total > 0) {
-			$this->has_completed['admin'] = true;
-		} else {
-			return;
-		}
-	}
-
-	/**
-	 * Security check to ensure the installer cannot be run after installation
-	 * has finished. If this is detected, the viewer is sent to the front page.
-	 *
-	 * @param string $step Installation step to check against
-	 *
-	 * @return void
-	 */
-	protected function checkInstallCompletion($step) {
-		if ($step != 'complete') {
-			if (!in_array(false, $this->has_completed)) {
-				// install complete but someone is trying to view an install page
-				forward();
-			}
-		}
-	}
-
-	/**
-	 * Check if this is a case of a install being resumed and figure
-	 * out where to continue from. Returns the best guess on the step.
-	 *
-	 * @param string $step Installation step to resume from
-	 *
-	 * @return string
-	 */
-	protected function resumeInstall($step) {
-		// only do a resume from the first step
-		if ($step !== 'welcome') {
-			return;
-		}
-
-		if ($this->has_completed['database'] == false) {
-			return;
-		}
-
-		if ($this->has_completed['settings'] == false) {
-			forward("install.php?step=settings");
-		}
-
-		if ($this->has_completed['admin'] == false) {
-			forward("install.php?step=admin");
-		}
-
-		// everything appears to be set up
-		forward("install.php?step=complete");
-	}
-
-	/**
-	 * Bootstrapping
-	 */
-
-	/**
-	 * Load remaining engine libraries and complete bootstrapping
-	 *
-	 * @param string $step Which step to boot strap for. Required because
-	 *                     boot strapping is different until the DB is populated.
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	protected function finishBootstrapping($step) {
-
-		$index_db = array_search('database', $this->getSteps());
-		$index_settings = array_search('settings', $this->getSteps());
-		$index_admin = array_search('admin', $this->getSteps());
-		$index_complete = array_search('complete', $this->getSteps());
-		$index_step = array_search($step, $this->getSteps());
-
-		// To log in the user, we need to use the Elgg core session handling.
-		// Otherwise, use default php session handling
-		$use_elgg_session = ($index_step == $index_admin && $this->is_action) || ($index_step == $index_complete);
-		if (!$use_elgg_session) {
-			$session = ElggSession::fromFiles($this->config);
-			$session->setName('Elgg_install');
-			$this->services->setValue('session', $session);
-		}
-
-		if ($index_step > $index_db) {
-			// once the database has been created, load rest of engine
-
-			// dummy site needed to boot
-			$this->config->site = new ElggSite();
-
-			$this->app->bootCore();
-		}
-	}
-
-	/**
-	 * Load settings
-	 *
-	 * @return void
-	 * @throws InstallationException
-	 */
-	protected function loadSettingsFile() {
-		try {
-			$config = Config::fromFile(Paths::settingsFile());
-			$this->config->mergeValues($config->getValues());
-
-			// in case the DB instance is already captured in services, we re-inject its settings.
-			$this->services->db->resetConnections(DbConfig::fromElggConfig($this->config));
-		} catch (\Exception $e) {
-			$msg = elgg_echo('InstallationException:CannotLoadSettings');
-			throw new InstallationException($msg, 0, $e);
-		}
-	}
-
-	/**
-	 * Action handling methods
-	 */
-
-	/**
-	 * If form is reshown, remember previously submitted variables
-	 *
-	 * @param array $formVars       Vars int he form
-	 * @param array $submissionVars Submitted vars
-	 *
-	 * @return array
-	 */
-	protected function makeFormSticky($formVars, $submissionVars) {
-		foreach ($submissionVars as $field => $value) {
-			$formVars[$field]['value'] = $value;
-		}
-		return $formVars;
-	}
-
-	/* Requirement checks support methods */
-
-	/**
-	 * Indicates whether the webserver can add settings.php on its own or not.
-	 *
-	 * @param array $report The requirements report object
-	 *
-	 * @return bool
-	 */
-	protected function isInstallDirWritable(&$report) {
-		if (!is_writable(Paths::projectConfig())) {
-			$msg = elgg_echo('install:check:installdir', [Paths::PATH_TO_CONFIG]);
-			$report['settings'] = [
-				[
-					'severity' => 'failure',
-					'message' => $msg,
-				]
-			];
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check that the settings file exists
-	 *
-	 * @param array $report The requirements report array
-	 *
-	 * @return bool
-	 */
-	protected function checkSettingsFile(&$report = []) {
-		if (!is_file(Paths::settingsFile())) {
-			return false;
-		}
-
-		if (!is_readable(Paths::settingsFile())) {
-			$report['settings'] = [
-				[
-					'severity' => 'failure',
-					'message' => elgg_echo('install:check:readsettings'),
-				]
-			];
-		}
+        echo elgg_view_page(
+                $title,
+                $body,
+                'default',
+                [
+                    'step' => $step,
+                    'steps' => $this->getSteps(),
+                    ]
+                );
+        exit;
+    }
+
+    /**
+     * Step controllers
+     */
+
+    /**
+     * Welcome controller
+     *
+     * @param array $vars Not used
+     *
+     * @return void
+     */
+    protected function runWelcome($vars) {
+        $this->render('welcome');
+    }
+
+    /**
+     * Requirements controller
+     *
+     * Checks version of php, libraries, permissions, and rewrite rules
+     *
+     * @param array $vars Vars
+     *
+     * @return void
+     */
+    protected function runRequirements($vars) {
+
+        $report = [];
+
+        // check PHP parameters and libraries
+        $this->checkPHP($report);
+
+        // check URL rewriting
+        $this->checkRewriteRules($report);
+
+        // check for existence of settings file
+        if ($this->checkSettingsFile($report) != true) {
+            // no file, so check permissions on engine directory
+            $this->isInstallDirWritable($report);
+        }
+
+        // check the database later
+        $report['database'] = [[
+            'severity' => 'info',
+            'message' => elgg_echo('install:check:database')
+        ]];
+
+        // any failures?
+        $numFailures = $this->countNumConditions($report, 'failure');
+
+        // any warnings
+        $numWarnings = $this->countNumConditions($report, 'warning');
+
+
+        $params = [
+            'report' => $report,
+            'num_failures' => $numFailures,
+            'num_warnings' => $numWarnings,
+        ];
+
+        $this->render('requirements', $params);
+    }
+
+    /**
+     * Database set up controller
+     *
+     * Creates the settings.php file and creates the database tables
+     *
+     * @param array $submissionVars Submitted form variables
+     *
+     * @return void
+     */
+    protected function runDatabase($submissionVars) {
+
+        $formVars = [
+            'dbuser' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+                ],
+            'dbpassword' => [
+                'type' => 'password',
+                'value' => '',
+                'required' => false,
+                ],
+            'dbname' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+                ],
+            'dbhost' => [
+                'type' => 'text',
+                'value' => 'localhost',
+                'required' => true,
+                ],
+            'dbprefix' => [
+                'type' => 'text',
+                'value' => 'elgg_',
+                'required' => true,
+                ],
+            'dataroot' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+            ],
+            'wwwroot' => [
+                'type' => 'url',
+                'value' => _elgg_services()->config->wwwroot,
+                'required' => true,
+            ],
+            'timezone' => [
+                'type' => 'dropdown',
+                'value' => 'UTC',
+                'options' => \DateTimeZone::listIdentifiers(),
+                'required' => true
+            ]
+        ];
+
+        if ($this->checkSettingsFile()) {
+            // user manually created settings file so we fake out action test
+            $this->is_action = true;
+        }
+
+        if ($this->is_action) {
+            call_user_func(function () use ($submissionVars, $formVars) {
+                // only create settings file if it doesn't exist
+                if (!$this->checkSettingsFile()) {
+                    if (!$this->validateDatabaseVars($submissionVars, $formVars)) {
+                        // error so we break out of action and serve same page
+                        return;
+                    }
+
+                    if (!$this->createSettingsFile($submissionVars)) {
+                        return;
+                    }
+                }
+
+                // check db version and connect
+                if (!$this->connectToDatabase()) {
+                    return;
+                }
+
+                if (!$this->installDatabase()) {
+                    return;
+                }
+
+                system_message(elgg_echo('install:success:database'));
+
+                $this->continueToNextStep('database');
+            });
+        }
+
+        $formVars = $this->makeFormSticky($formVars, $submissionVars);
+
+        $params = ['variables' => $formVars,];
+
+        if ($this->checkSettingsFile()) {
+            // settings file exists and we're here so failed to create database
+            $params['failure'] = true;
+        }
+
+        $this->render('database', $params);
+    }
+
+    /**
+     * Site settings controller
+     *
+     * Sets the site name, URL, data directory, etc.
+     *
+     * @param array $submissionVars Submitted vars
+     *
+     * @return void
+     */
+    protected function runSettings($submissionVars) {
+        $formVars = [
+            'sitename' => [
+                'type' => 'text',
+                'value' => 'My New Community',
+                'required' => true,
+                ],
+            'siteemail' => [
+                'type' => 'email',
+                'value' => '',
+                'required' => false,
+                ],
+            'siteaccess' => [
+                'type' => 'access',
+                'value' => ACCESS_PUBLIC,
+                'required' => true,
+                ],
+        ];
+
+        if ($this->is_action) {
+            call_user_func(function () use ($submissionVars, $formVars) {
+                if (!$this->validateSettingsVars($submissionVars, $formVars)) {
+                    return;
+                }
+
+                if (!$this->saveSiteSettings($submissionVars)) {
+                    return;
+                }
+
+                system_message(elgg_echo('install:success:settings'));
+
+                $this->continueToNextStep('settings');
+            });
+        }
+
+        $formVars = $this->makeFormSticky($formVars, $submissionVars);
+
+        $this->render('settings', ['variables' => $formVars]);
+    }
+
+    /**
+     * Admin account controller
+     *
+     * Creates an admin user account
+     *
+     * @param array $submissionVars Submitted vars
+     *
+     * @return void
+     */
+    protected function runAdmin($submissionVars) {
+        $formVars = [
+            'displayname' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+                ],
+            'email' => [
+                'type' => 'email',
+                'value' => '',
+                'required' => true,
+                ],
+            'username' => [
+                'type' => 'text',
+                'value' => '',
+                'required' => true,
+                ],
+            'password1' => [
+                'type' => 'password',
+                'value' => '',
+                'required' => true,
+                'pattern' => '.{6,}',
+                ],
+            'password2' => [
+                'type' => 'password',
+                'value' => '',
+                'required' => true,
+                ],
+        ];
+
+        if ($this->is_action) {
+            call_user_func(function () use ($submissionVars, $formVars) {
+                if (!$this->validateAdminVars($submissionVars, $formVars)) {
+                    return;
+                }
+
+                if (!$this->createAdminAccount($submissionVars, $this->autoLogin)) {
+                    return;
+                }
+
+                system_message(elgg_echo('install:success:admin'));
+
+                $this->continueToNextStep('admin');
+            });
+        }
+
+        // Bit of a hack to get the password help to show right number of characters
+        // We burn the value into the stored translation.
+        $lang = $this->services->translator->getCurrentLanguage();
+        $translations = $this->services->translator->getLoadedTranslations();
+        $this->services->translator->addTranslation($lang, [
+            'install:admin:help:password1' => sprintf(
+                $translations[$lang]['install:admin:help:password1'],
+                $this->config->min_password_length
+            ),
+        ]);
+
+        $formVars = $this->makeFormSticky($formVars, $submissionVars);
+
+        $this->render('admin', ['variables' => $formVars]);
+    }
+
+    /**
+     * Controller for last step
+     *
+     * @return void
+     */
+    protected function runComplete() {
+
+        // nudge to check out settings
+        $link = elgg_format_element([
+            '#tag_name' => 'a',
+            '#text' => elgg_echo('install:complete:admin_notice:link_text'),
+            'href' => elgg_normalize_url('admin/settings/basic'),
+        ]);
+        $notice = elgg_echo('install:complete:admin_notice', [$link]);
+        elgg_add_admin_notice('fresh_install', $notice);
+
+        $this->render('complete');
+    }
+
+    /**
+     * Step management
+     */
+
+    /**
+     * Get an array of steps
+     *
+     * @return array
+     */
+    protected function getSteps() {
+        return $this->steps;
+    }
+
+    /**
+     * Forwards the browser to the next step
+     *
+     * @param string $currentStep Current installation step
+     *
+     * @return void
+     */
+    protected function continueToNextStep($currentStep) {
+        $this->is_action = false;
+        forward($this->getNextStepUrl($currentStep));
+    }
+
+    /**
+     * Get the next step as a string
+     *
+     * @param string $currentStep Current installation step
+     *
+     * @return string
+     */
+    protected function getNextStep($currentStep) {
+        $index = 1 + array_search($currentStep, $this->steps);
+        if (isset($this->steps[$index])) {
+            return $this->steps[$index];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get the URL of the next step
+     *
+     * @param string $currentStep Current installation step
+     *
+     * @return string
+     */
+    protected function getNextStepUrl($currentStep) {
+        $nextStep = $this->getNextStep($currentStep);
+        return $this->config->wwwroot . "install.php?step=$nextStep";
+    }
+
+    /**
+     * Updates $this->has_completed according to the current installation
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    protected function determineInstallStatus() {
+        $path = Paths::settingsFile();
+        if (!is_file($path) || !is_readable($path)) {
+            return;
+        }
+
+        $this->loadSettingsFile();
+
+        $this->has_completed['config'] = true;
+
+        // must be able to connect to database to jump install steps
+        $dbSettingsPass = $this->checkDatabaseSettings(
+            $this->config->dbuser,
+            $this->config->dbpass,
+            $this->config->dbname,
+            $this->config->dbhost
+        );
+
+        if (!$dbSettingsPass) {
+            return;
+        }
+
+        $db = $this->services->db;
+
+        // check that the config table has been created
+        $result = $db->getData("SHOW TABLES");
+        if ($result) {
+            foreach ($result as $table) {
+                $table = (array) $table;
+                if (in_array("{$db->prefix}config", $table)) {
+                    $this->has_completed['database'] = true;
+                }
+            }
+            if ($this->has_completed['database'] == false) {
+                return;
+            }
+        } else {
+            // no tables
+            return;
+        }
+
+        // check that the config table has entries
+        $query = "SELECT COUNT(*) AS total FROM {$db->prefix}config";
+        $result = $db->getData($query);
+        if ($result && $result[0]->total > 0) {
+            $this->has_completed['settings'] = true;
+        } else {
+            return;
+        }
+
+        // check that the users entity table has an entry
+        $query = "SELECT COUNT(*) AS total FROM {$db->prefix}users_entity";
+        $result = $db->getData($query);
+        if ($result && $result[0]->total > 0) {
+            $this->has_completed['admin'] = true;
+        } else {
+            return;
+        }
+    }
+
+    /**
+     * Security check to ensure the installer cannot be run after installation
+     * has finished. If this is detected, the viewer is sent to the front page.
+     *
+     * @param string $step Installation step to check against
+     *
+     * @return void
+     */
+    protected function checkInstallCompletion($step) {
+        if ($step != 'complete') {
+            if (!in_array(false, $this->has_completed)) {
+                // install complete but someone is trying to view an install page
+                forward();
+            }
+        }
+    }
+
+    /**
+     * Check if this is a case of a install being resumed and figure
+     * out where to continue from. Returns the best guess on the step.
+     *
+     * @param string $step Installation step to resume from
+     *
+     * @return string
+     */
+    protected function resumeInstall($step) {
+        // only do a resume from the first step
+        if ($step !== 'welcome') {
+            return;
+        }
+
+        if ($this->has_completed['database'] == false) {
+            return;
+        }
+
+        if ($this->has_completed['settings'] == false) {
+            forward("install.php?step=settings");
+        }
+
+        if ($this->has_completed['admin'] == false) {
+            forward("install.php?step=admin");
+        }
+
+        // everything appears to be set up
+        forward("install.php?step=complete");
+    }
+
+    /**
+     * Bootstrapping
+     */
+
+    /**
+     * Load remaining engine libraries and complete bootstrapping
+     *
+     * @param string $step Which step to boot strap for. Required because
+     *                     boot strapping is different until the DB is populated.
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    protected function finishBootstrapping($step) {
+
+        $index_db = array_search('database', $this->getSteps());
+        $index_settings = array_search('settings', $this->getSteps());
+        $index_admin = array_search('admin', $this->getSteps());
+        $index_complete = array_search('complete', $this->getSteps());
+        $index_step = array_search($step, $this->getSteps());
+
+        // To log in the user, we need to use the Elgg core session handling.
+        // Otherwise, use default php session handling
+        $use_elgg_session = ($index_step == $index_admin && $this->is_action) || ($index_step == $index_complete);
+        if (!$use_elgg_session) {
+            $session = ElggSession::fromFiles($this->config);
+            $session->setName('Elgg_install');
+            $this->services->setValue('session', $session);
+        }
+
+        if ($index_step > $index_db) {
+            // once the database has been created, load rest of engine
+
+            // dummy site needed to boot
+            $this->config->site = new ElggSite();
+
+            $this->app->bootCore();
+        }
+    }
+
+    /**
+     * Load settings
+     *
+     * @return void
+     * @throws InstallationException
+     */
+    protected function loadSettingsFile() {
+        try {
+            $config = Config::fromFile(Paths::settingsFile());
+            $this->config->mergeValues($config->getValues());
+
+            // in case the DB instance is already captured in services, we re-inject its settings.
+            $this->services->db->resetConnections(DbConfig::fromElggConfig($this->config));
+        } catch (\Exception $e) {
+            $msg = elgg_echo('InstallationException:CannotLoadSettings');
+            throw new InstallationException($msg, 0, $e);
+        }
+    }
+
+    /**
+     * Action handling methods
+     */
+
+    /**
+     * If form is reshown, remember previously submitted variables
+     *
+     * @param array $formVars       Vars int he form
+     * @param array $submissionVars Submitted vars
+     *
+     * @return array
+     */
+    protected function makeFormSticky($formVars, $submissionVars) {
+        foreach ($submissionVars as $field => $value) {
+            $formVars[$field]['value'] = $value;
+        }
+        return $formVars;
+    }
+
+    /* Requirement checks support methods */
+
+    /**
+     * Indicates whether the webserver can add settings.php on its own or not.
+     *
+     * @param array $report The requirements report object
+     *
+     * @return bool
+     */
+    protected function isInstallDirWritable(&$report) {
+        if (!is_writable(Paths::projectConfig())) {
+            $msg = elgg_echo('install:check:installdir', [Paths::PATH_TO_CONFIG]);
+            $report['settings'] = [
+                [
+                    'severity' => 'failure',
+                    'message' => $msg,
+                ]
+            ];
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check that the settings file exists
+     *
+     * @param array $report The requirements report array
+     *
+     * @return bool
+     */
+    protected function checkSettingsFile(&$report = []) {
+        if (!is_file(Paths::settingsFile())) {
+            return false;
+        }
+
+        if (!is_readable(Paths::settingsFile())) {
+            $report['settings'] = [
+                [
+                    'severity' => 'failure',
+                    'message' => elgg_echo('install:check:readsettings'),
+                ]
+            ];
+        }
 		
-		return true;
-	}
+        return true;
+    }
 	
-	/**
-	 * Check version of PHP, extensions, and variables
-	 *
-	 * @param array $report The requirements report array
-	 *
-	 * @return void
-	 */
-	protected function checkPHP(&$report) {
-		$phpReport = [];
-
-		$min_php_version = '5.6.0';
-		if (version_compare(PHP_VERSION, $min_php_version, '<')) {
-			$phpReport[] = [
-				'severity' => 'failure',
-				'message' => elgg_echo('install:check:php:version', [$min_php_version, PHP_VERSION])
-			];
-		}
-
-		$this->checkPhpExtensions($phpReport);
-
-		$this->checkPhpDirectives($phpReport);
-
-		if (count($phpReport) == 0) {
-			$phpReport[] = [
-				'severity' => 'pass',
-				'message' => elgg_echo('install:check:php:success')
-			];
-		}
-
-		$report['php'] = $phpReport;
-	}
-
-	/**
-	 * Check the server's PHP extensions
-	 *
-	 * @param array $phpReport The PHP requirements report array
-	 *
-	 * @return void
-	 */
-	protected function checkPhpExtensions(&$phpReport) {
-		$extensions = get_loaded_extensions();
-		$requiredExtensions = [
-			'pdo_mysql',
-			'json',
-			'xml',
-			'gd',
-		];
-		foreach ($requiredExtensions as $extension) {
-			if (!in_array($extension, $extensions)) {
-				$phpReport[] = [
-					'severity' => 'failure',
-					'message' => elgg_echo('install:check:php:extension', [$extension])
-				];
-			}
-		}
-
-		$recommendedExtensions = [
-			'mbstring',
-		];
-		foreach ($recommendedExtensions as $extension) {
-			if (!in_array($extension, $extensions)) {
-				$phpReport[] = [
-					'severity' => 'warning',
-					'message' => elgg_echo('install:check:php:extension:recommend', [$extension])
-				];
-			}
-		}
-	}
-
-	/**
-	 * Check PHP parameters
-	 *
-	 * @param array $phpReport The PHP requirements report array
-	 *
-	 * @return void
-	 */
-	protected function checkPhpDirectives(&$phpReport) {
-		if (ini_get('open_basedir')) {
-			$phpReport[] = [
-				'severity' => 'warning',
-				'message' => elgg_echo("install:check:php:open_basedir")
-			];
-		}
-
-		if (ini_get('safe_mode')) {
-			$phpReport[] = [
-				'severity' => 'warning',
-				'message' => elgg_echo("install:check:php:safe_mode")
-			];
-		}
-
-		if (ini_get('arg_separator.output') !== '&') {
-			$separator = htmlspecialchars(ini_get('arg_separator.output'));
-			$msg = elgg_echo("install:check:php:arg_separator", [$separator]);
-			$phpReport[] = [
-				'severity' => 'failure',
-				'message' => $msg,
-			];
-		}
-
-		if (ini_get('register_globals')) {
-			$phpReport[] = [
-				'severity' => 'failure',
-				'message' => elgg_echo("install:check:php:register_globals")
-			];
-		}
-
-		if (ini_get('session.auto_start')) {
-			$phpReport[] = [
-				'severity' => 'failure',
-				'message' => elgg_echo("install:check:php:session.auto_start")
-			];
-		}
-	}
-
-	/**
-	 * Confirm that the rewrite rules are firing
-	 *
-	 * @param array $report The requirements report array
-	 *
-	 * @return void
-	 */
-	protected function checkRewriteRules(&$report) {
-		$tester = new ElggRewriteTester();
-		$url = $this->config->wwwroot;
-		$url .= Request::REWRITE_TEST_TOKEN . '?' . http_build_query([
-				Request::REWRITE_TEST_TOKEN => '1',
-		]);
-		$report['rewrite'] = [$tester->run($url, Paths::project())];
-	}
-
-	/**
-	 * Count the number of failures in the requirements report
-	 *
-	 * @param array  $report    The requirements report array
-	 * @param string $condition 'failure' or 'warning'
-	 *
-	 * @return int
-	 */
-	protected function countNumConditions($report, $condition) {
-		$count = 0;
-		foreach ($report as $category => $checks) {
-			foreach ($checks as $check) {
-				if ($check['severity'] === $condition) {
-					$count++;
-				}
-			}
-		}
-
-		return $count;
-	}
-
-
-	/**
-	 * Database support methods
-	 */
-
-	/**
-	 * Validate the variables for the database step
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param array $formVars       Vars in the form
-	 *
-	 * @return bool
-	 */
-	protected function validateDatabaseVars($submissionVars, $formVars) {
-
-		foreach ($formVars as $field => $info) {
-			if ($info['required'] == true && !$submissionVars[$field]) {
-				$name = elgg_echo("install:database:label:$field");
-				register_error(elgg_echo('install:error:requiredfield', [$name]));
-				return false;
-			}
-		}
-
-		// check that data root is absolute path
-		if (stripos(PHP_OS, 'win') === 0) {
-			if (strpos($submissionVars['dataroot'], ':') !== 1) {
-				$msg = elgg_echo('install:error:relative_path', [$submissionVars['dataroot']]);
-				register_error($msg);
-				return false;
-			}
-		} else {
-			if (strpos($submissionVars['dataroot'], '/') !== 0) {
-				$msg = elgg_echo('install:error:relative_path', [$submissionVars['dataroot']]);
-				register_error($msg);
-				return false;
-			}
-		}
-
-		// check that data root exists
-		if (!is_dir($submissionVars['dataroot'])) {
-			$msg = elgg_echo('install:error:datadirectoryexists', [$submissionVars['dataroot']]);
-			register_error($msg);
-			return false;
-		}
-
-		// check that data root is writable
-		if (!is_writable($submissionVars['dataroot'])) {
-			$msg = elgg_echo('install:error:writedatadirectory', [$submissionVars['dataroot']]);
-			register_error($msg);
-			return false;
-		}
-
-		if (!$this->config->data_dir_override) {
-			// check that data root is not subdirectory of Elgg root
-			if (stripos($submissionVars['dataroot'], $this->config->path) === 0) {
-				$msg = elgg_echo('install:error:locationdatadirectory', [$submissionVars['dataroot']]);
-				register_error($msg);
-				return false;
-			}
-		}
-
-		// according to postgres documentation: SQL identifiers and key words must
-		// begin with a letter (a-z, but also letters with diacritical marks and
-		// non-Latin letters) or an underscore (_). Subsequent characters in an
-		// identifier or key word can be letters, underscores, digits (0-9), or dollar signs ($).
-		// Refs #4994
-		if (!preg_match("/^[a-zA-Z_][\w]*$/", $submissionVars['dbprefix'])) {
-			register_error(elgg_echo('install:error:database_prefix'));
-			return false;
-		}
-
-		return $this->checkDatabaseSettings(
-			$submissionVars['dbuser'],
-			$submissionVars['dbpassword'],
-			$submissionVars['dbname'],
-			$submissionVars['dbhost']
-		);
-	}
-
-	/**
-	 * Confirm the settings for the database
-	 *
-	 * @param string $user     Username
-	 * @param string $password Password
-	 * @param string $dbname   Database name
-	 * @param string $host     Host
-	 *
-	 * @return bool
-	 */
-	protected function checkDatabaseSettings($user, $password, $dbname, $host) {
-		$config = new DbConfig((object) [
-			'dbhost' => $host,
-			'dbuser' => $user,
-			'dbpass' => $password,
-			'dbname' => $dbname,
-			'dbencoding' => 'utf8mb4',
-		]);
-		$db = new \Elgg\Database($config);
-
-		try {
-			$db->getDataRow("SELECT 1");
-		} catch (DatabaseException $e) {
-			if (0 === strpos($e->getMessage(), "Elgg couldn't connect")) {
-				register_error(elgg_echo('install:error:databasesettings'));
-			} else {
-				register_error(elgg_echo('install:error:nodatabase', [$dbname]));
-			}
-			return false;
-		}
-
-		// check MySQL version
-		$version = $db->getServerVersion(DbConfig::READ_WRITE);
-		if (version_compare($version, '5.5.3', '<')) {
-			register_error(elgg_echo('install:error:oldmysql2', [$version]));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Writes the settings file to the engine directory
-	 *
-	 * @param array $params Array of inputted params from the user
-	 *
-	 * @return bool
-	 */
-	protected function createSettingsFile($params) {
-		$template = Application::elggDir()->getContents("elgg-config/settings.example.php");
-		if (!$template) {
-			register_error(elgg_echo('install:error:readsettingsphp'));
-			return false;
-		}
-
-		foreach ($params as $k => $v) {
-			$template = str_replace("{{" . $k . "}}", $v, $template);
-		}
-
-		$result = file_put_contents(Paths::settingsFile(), $template);
-		if ($result === false) {
-			register_error(elgg_echo('install:error:writesettingphp'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Bootstrap database connection before entire engine is available
-	 *
-	 * @return bool
-	 */
-	protected function connectToDatabase() {
-		try {
-			$this->services->db->setupConnections();
-		} catch (DatabaseException $e) {
-			register_error($e->getMessage());
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Create the database tables
-	 *
-	 * @return bool
-	 */
-	protected function installDatabase() {
-		$ret = \Elgg\Application::migrate();
-		if ($ret) {
-			init_site_secret();
-		}
-		return $ret;
-	}
-
-	/**
-	 * Site settings support methods
-	 */
-
-	/**
-	 * Create the data directory if requested
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param array $formVars       Variables in the form
-	 *
-	 * @return bool
-	 */
-	protected function createDataDirectory(&$submissionVars, $formVars) {
-		// did the user have option of Elgg creating the data directory
-		if ($formVars['dataroot']['type'] != 'combo') {
-			return true;
-		}
-
-		// did the user select the option
-		if ($submissionVars['dataroot'] != 'dataroot-checkbox') {
-			return true;
-		}
-
-		$dir = sanitise_filepath($submissionVars['path']) . 'data';
-		if (file_exists($dir) || mkdir($dir, 0700)) {
-			$submissionVars['dataroot'] = $dir;
-			if (!file_exists("$dir/.htaccess")) {
-				$htaccess = "Order Deny,Allow\nDeny from All\n";
-				if (!file_put_contents("$dir/.htaccess", $htaccess)) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Validate the site settings form variables
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param array $formVars       Vars in the form
-	 *
-	 * @return bool
-	 */
-	protected function validateSettingsVars($submissionVars, $formVars) {
-		foreach ($formVars as $field => $info) {
-			$submissionVars[$field] = trim($submissionVars[$field]);
-			if ($info['required'] == true && $submissionVars[$field] === '') {
-				$name = elgg_echo("install:settings:label:$field");
-				register_error(elgg_echo('install:error:requiredfield', [$name]));
-				return false;
-			}
-		}
-
-		// check that email address is email address
-		if ($submissionVars['siteemail'] && !is_email_address($submissionVars['siteemail'])) {
-			$msg = elgg_echo('install:error:emailaddress', [$submissionVars['siteemail']]);
-			register_error($msg);
-			return false;
-		}
-
-		// @todo check that url is a url
-		// @note filter_var cannot be used because it doesn't work on international urls
-
-		return true;
-	}
-
-	/**
-	 * Initialize the site including site entity, plugins, and configuration
-	 *
-	 * @param array $submissionVars Submitted vars
-	 *
-	 * @return bool
-	 */
-	protected function saveSiteSettings($submissionVars) {
-		$site = new ElggSite();
-		$site->name = strip_tags($submissionVars['sitename']);
-		$site->access_id = ACCESS_PUBLIC;
-		$site->email = $submissionVars['siteemail'];
-
-		$guid = $site->save();
-		if ($guid !== 1) {
-			register_error(elgg_echo('install:error:createsite'));
-			return false;
-		}
-
-		$this->config->site = $site;
-
-		// new installations have run all the upgrades
-		$upgrades = elgg_get_upgrade_files(Paths::elgg() . "engine/lib/upgrades/");
-
-		$sets = [
-			'installed' => time(),
-			'version' => elgg_get_version(),
-			'simplecache_enabled' => 1,
-			'system_cache_enabled' => 1,
-			'simplecache_lastupdate' => time(),
-			'processed_upgrades' => $upgrades,
-			'language' => 'en',
-			'default_access' => $submissionVars['siteaccess'],
-			'allow_registration' => false,
-			'walled_garden' => false,
-			'allow_user_default_access' => '',
-			'default_limit' => 10,
-			'security_protect_upgrade' => true,
-			'security_notify_admins' => true,
-			'security_notify_user_password' => true,
-			'security_email_require_password' => true,
-		];
-		foreach ($sets as $key => $value) {
-			elgg_save_config($key, $value);
-		}
-
-		// Enable a set of default plugins
-		_elgg_generate_plugin_entities();
-
-		foreach (elgg_get_plugins('any') as $plugin) {
-			if ($plugin->getManifest()) {
-				if ($plugin->getManifest()->getActivateOnInstall()) {
-					$plugin->activate();
-				}
-				if (in_array('theme', $plugin->getManifest()->getCategories())) {
-					$plugin->setPriority('last');
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Admin account support methods
-	 */
-
-	/**
-	 * Validate account form variables
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param array $formVars       Form vars
-	 *
-	 * @return bool
-	 */
-	protected function validateAdminVars($submissionVars, $formVars) {
-
-		foreach ($formVars as $field => $info) {
-			if ($info['required'] == true && !$submissionVars[$field]) {
-				$name = elgg_echo("install:admin:label:$field");
-				register_error(elgg_echo('install:error:requiredfield', [$name]));
-				return false;
-			}
-		}
-
-		if ($submissionVars['password1'] !== $submissionVars['password2']) {
-			register_error(elgg_echo('install:admin:password:mismatch'));
-			return false;
-		}
-
-		if (trim($submissionVars['password1']) == "") {
-			register_error(elgg_echo('install:admin:password:empty'));
-			return false;
-		}
-
-		$minLength = $this->services->configTable->get('min_password_length');
-		if (strlen($submissionVars['password1']) < $minLength) {
-			register_error(elgg_echo('install:admin:password:tooshort'));
-			return false;
-		}
-
-		// check that email address is email address
-		if ($submissionVars['email'] && !is_email_address($submissionVars['email'])) {
-			$msg = elgg_echo('install:error:emailaddress', [$submissionVars['email']]);
-			register_error($msg);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Create a user account for the admin
-	 *
-	 * @param array $submissionVars Submitted vars
-	 * @param bool  $login          Login in the admin user?
-	 *
-	 * @return bool
-	 */
-	protected function createAdminAccount($submissionVars, $login = false) {
-		try {
-			$guid = register_user(
-				$submissionVars['username'],
-				$submissionVars['password1'],
-				$submissionVars['displayname'],
-				$submissionVars['email']
-			);
-		} catch (Exception $e) {
-			register_error($e->getMessage());
-			return false;
-		}
-
-		if (!$guid) {
-			register_error(elgg_echo('install:admin:cannot_create'));
-			return false;
-		}
-
-		$user = get_entity($guid);
-		if (!$user instanceof ElggUser) {
-			register_error(elgg_echo('install:error:loadadmin'));
-			return false;
-		}
-
-		$ia = elgg_set_ignore_access(true);
-		if ($user->makeAdmin() == false) {
-			register_error(elgg_echo('install:error:adminaccess'));
-		} else {
-			$this->services->configTable->set('admin_registered', 1);
-		}
-		elgg_set_ignore_access($ia);
-
-		// add validation data to satisfy user validation plugins
-		$user->validated = 1;
-		$user->validated_method = 'admin_user';
-
-		if (!$login) {
-			return true;
-		}
-
-		$session = ElggSession::fromDatabase($this->config, $this->services->db);
-		$session->start();
-		$this->services->setValue('session', $session);
-		if (login($user) == false) {
-			register_error(elgg_echo('install:error:adminlogin'));
-		}
-
-		return true;
-	}
+    /**
+     * Check version of PHP, extensions, and variables
+     *
+     * @param array $report The requirements report array
+     *
+     * @return void
+     */
+    protected function checkPHP(&$report) {
+        $phpReport = [];
+
+        $min_php_version = '5.6.0';
+        if (version_compare(PHP_VERSION, $min_php_version, '<')) {
+            $phpReport[] = [
+                'severity' => 'failure',
+                'message' => elgg_echo('install:check:php:version', [$min_php_version, PHP_VERSION])
+            ];
+        }
+
+        $this->checkPhpExtensions($phpReport);
+
+        $this->checkPhpDirectives($phpReport);
+
+        if (count($phpReport) == 0) {
+            $phpReport[] = [
+                'severity' => 'pass',
+                'message' => elgg_echo('install:check:php:success')
+            ];
+        }
+
+        $report['php'] = $phpReport;
+    }
+
+    /**
+     * Check the server's PHP extensions
+     *
+     * @param array $phpReport The PHP requirements report array
+     *
+     * @return void
+     */
+    protected function checkPhpExtensions(&$phpReport) {
+        $extensions = get_loaded_extensions();
+        $requiredExtensions = [
+            'pdo_mysql',
+            'json',
+            'xml',
+            'gd',
+        ];
+        foreach ($requiredExtensions as $extension) {
+            if (!in_array($extension, $extensions)) {
+                $phpReport[] = [
+                    'severity' => 'failure',
+                    'message' => elgg_echo('install:check:php:extension', [$extension])
+                ];
+            }
+        }
+
+        $recommendedExtensions = [
+            'mbstring',
+        ];
+        foreach ($recommendedExtensions as $extension) {
+            if (!in_array($extension, $extensions)) {
+                $phpReport[] = [
+                    'severity' => 'warning',
+                    'message' => elgg_echo('install:check:php:extension:recommend', [$extension])
+                ];
+            }
+        }
+    }
+
+    /**
+     * Check PHP parameters
+     *
+     * @param array $phpReport The PHP requirements report array
+     *
+     * @return void
+     */
+    protected function checkPhpDirectives(&$phpReport) {
+        if (ini_get('open_basedir')) {
+            $phpReport[] = [
+                'severity' => 'warning',
+                'message' => elgg_echo("install:check:php:open_basedir")
+            ];
+        }
+
+        if (ini_get('safe_mode')) {
+            $phpReport[] = [
+                'severity' => 'warning',
+                'message' => elgg_echo("install:check:php:safe_mode")
+            ];
+        }
+
+        if (ini_get('arg_separator.output') !== '&') {
+            $separator = htmlspecialchars(ini_get('arg_separator.output'));
+            $msg = elgg_echo("install:check:php:arg_separator", [$separator]);
+            $phpReport[] = [
+                'severity' => 'failure',
+                'message' => $msg,
+            ];
+        }
+
+        if (ini_get('register_globals')) {
+            $phpReport[] = [
+                'severity' => 'failure',
+                'message' => elgg_echo("install:check:php:register_globals")
+            ];
+        }
+
+        if (ini_get('session.auto_start')) {
+            $phpReport[] = [
+                'severity' => 'failure',
+                'message' => elgg_echo("install:check:php:session.auto_start")
+            ];
+        }
+    }
+
+    /**
+     * Confirm that the rewrite rules are firing
+     *
+     * @param array $report The requirements report array
+     *
+     * @return void
+     */
+    protected function checkRewriteRules(&$report) {
+        $tester = new ElggRewriteTester();
+        $url = $this->config->wwwroot;
+        $url .= Request::REWRITE_TEST_TOKEN . '?' . http_build_query([
+                Request::REWRITE_TEST_TOKEN => '1',
+        ]);
+        $report['rewrite'] = [$tester->run($url, Paths::project())];
+    }
+
+    /**
+     * Count the number of failures in the requirements report
+     *
+     * @param array  $report    The requirements report array
+     * @param string $condition 'failure' or 'warning'
+     *
+     * @return int
+     */
+    protected function countNumConditions($report, $condition) {
+        $count = 0;
+        foreach ($report as $category => $checks) {
+            foreach ($checks as $check) {
+                if ($check['severity'] === $condition) {
+                    $count++;
+                }
+            }
+        }
+
+        return $count;
+    }
+
+
+    /**
+     * Database support methods
+     */
+
+    /**
+     * Validate the variables for the database step
+     *
+     * @param array $submissionVars Submitted vars
+     * @param array $formVars       Vars in the form
+     *
+     * @return bool
+     */
+    protected function validateDatabaseVars($submissionVars, $formVars) {
+
+        foreach ($formVars as $field => $info) {
+            if ($info['required'] == true && !$submissionVars[$field]) {
+                $name = elgg_echo("install:database:label:$field");
+                register_error(elgg_echo('install:error:requiredfield', [$name]));
+                return false;
+            }
+        }
+
+        // check that data root is absolute path
+        if (stripos(PHP_OS, 'win') === 0) {
+            if (strpos($submissionVars['dataroot'], ':') !== 1) {
+                $msg = elgg_echo('install:error:relative_path', [$submissionVars['dataroot']]);
+                register_error($msg);
+                return false;
+            }
+        } else {
+            if (strpos($submissionVars['dataroot'], '/') !== 0) {
+                $msg = elgg_echo('install:error:relative_path', [$submissionVars['dataroot']]);
+                register_error($msg);
+                return false;
+            }
+        }
+
+        // check that data root exists
+        if (!is_dir($submissionVars['dataroot'])) {
+            $msg = elgg_echo('install:error:datadirectoryexists', [$submissionVars['dataroot']]);
+            register_error($msg);
+            return false;
+        }
+
+        // check that data root is writable
+        if (!is_writable($submissionVars['dataroot'])) {
+            $msg = elgg_echo('install:error:writedatadirectory', [$submissionVars['dataroot']]);
+            register_error($msg);
+            return false;
+        }
+
+        if (!$this->config->data_dir_override) {
+            // check that data root is not subdirectory of Elgg root
+            if (stripos($submissionVars['dataroot'], $this->config->path) === 0) {
+                $msg = elgg_echo('install:error:locationdatadirectory', [$submissionVars['dataroot']]);
+                register_error($msg);
+                return false;
+            }
+        }
+
+        // according to postgres documentation: SQL identifiers and key words must
+        // begin with a letter (a-z, but also letters with diacritical marks and
+        // non-Latin letters) or an underscore (_). Subsequent characters in an
+        // identifier or key word can be letters, underscores, digits (0-9), or dollar signs ($).
+        // Refs #4994
+        if (!preg_match("/^[a-zA-Z_][\w]*$/", $submissionVars['dbprefix'])) {
+            register_error(elgg_echo('install:error:database_prefix'));
+            return false;
+        }
+
+        return $this->checkDatabaseSettings(
+            $submissionVars['dbuser'],
+            $submissionVars['dbpassword'],
+            $submissionVars['dbname'],
+            $submissionVars['dbhost']
+        );
+    }
+
+    /**
+     * Confirm the settings for the database
+     *
+     * @param string $user     Username
+     * @param string $password Password
+     * @param string $dbname   Database name
+     * @param string $host     Host
+     *
+     * @return bool
+     */
+    protected function checkDatabaseSettings($user, $password, $dbname, $host) {
+        $config = new DbConfig((object) [
+            'dbhost' => $host,
+            'dbuser' => $user,
+            'dbpass' => $password,
+            'dbname' => $dbname,
+            'dbencoding' => 'utf8mb4',
+        ]);
+        $db = new \Elgg\Database($config);
+
+        try {
+            $db->getDataRow("SELECT 1");
+        } catch (DatabaseException $e) {
+            if (0 === strpos($e->getMessage(), "Elgg couldn't connect")) {
+                register_error(elgg_echo('install:error:databasesettings'));
+            } else {
+                register_error(elgg_echo('install:error:nodatabase', [$dbname]));
+            }
+            return false;
+        }
+
+        // check MySQL version
+        $version = $db->getServerVersion(DbConfig::READ_WRITE);
+        if (version_compare($version, '5.5.3', '<')) {
+            register_error(elgg_echo('install:error:oldmysql2', [$version]));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Writes the settings file to the engine directory
+     *
+     * @param array $params Array of inputted params from the user
+     *
+     * @return bool
+     */
+    protected function createSettingsFile($params) {
+        $template = Application::elggDir()->getContents("elgg-config/settings.example.php");
+        if (!$template) {
+            register_error(elgg_echo('install:error:readsettingsphp'));
+            return false;
+        }
+
+        foreach ($params as $k => $v) {
+            $template = str_replace("{{" . $k . "}}", $v, $template);
+        }
+
+        $result = file_put_contents(Paths::settingsFile(), $template);
+        if ($result === false) {
+            register_error(elgg_echo('install:error:writesettingphp'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Bootstrap database connection before entire engine is available
+     *
+     * @return bool
+     */
+    protected function connectToDatabase() {
+        try {
+            $this->services->db->setupConnections();
+        } catch (DatabaseException $e) {
+            register_error($e->getMessage());
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Create the database tables
+     *
+     * @return bool
+     */
+    protected function installDatabase() {
+        $ret = \Elgg\Application::migrate();
+        if ($ret) {
+            init_site_secret();
+        }
+        return $ret;
+    }
+
+    /**
+     * Site settings support methods
+     */
+
+    /**
+     * Create the data directory if requested
+     *
+     * @param array $submissionVars Submitted vars
+     * @param array $formVars       Variables in the form
+     *
+     * @return bool
+     */
+    protected function createDataDirectory(&$submissionVars, $formVars) {
+        // did the user have option of Elgg creating the data directory
+        if ($formVars['dataroot']['type'] != 'combo') {
+            return true;
+        }
+
+        // did the user select the option
+        if ($submissionVars['dataroot'] != 'dataroot-checkbox') {
+            return true;
+        }
+
+        $dir = sanitise_filepath($submissionVars['path']) . 'data';
+        if (file_exists($dir) || mkdir($dir, 0700)) {
+            $submissionVars['dataroot'] = $dir;
+            if (!file_exists("$dir/.htaccess")) {
+                $htaccess = "Order Deny,Allow\nDeny from All\n";
+                if (!file_put_contents("$dir/.htaccess", $htaccess)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Validate the site settings form variables
+     *
+     * @param array $submissionVars Submitted vars
+     * @param array $formVars       Vars in the form
+     *
+     * @return bool
+     */
+    protected function validateSettingsVars($submissionVars, $formVars) {
+        foreach ($formVars as $field => $info) {
+            $submissionVars[$field] = trim($submissionVars[$field]);
+            if ($info['required'] == true && $submissionVars[$field] === '') {
+                $name = elgg_echo("install:settings:label:$field");
+                register_error(elgg_echo('install:error:requiredfield', [$name]));
+                return false;
+            }
+        }
+
+        // check that email address is email address
+        if ($submissionVars['siteemail'] && !is_email_address($submissionVars['siteemail'])) {
+            $msg = elgg_echo('install:error:emailaddress', [$submissionVars['siteemail']]);
+            register_error($msg);
+            return false;
+        }
+
+        // @todo check that url is a url
+        // @note filter_var cannot be used because it doesn't work on international urls
+
+        return true;
+    }
+
+    /**
+     * Initialize the site including site entity, plugins, and configuration
+     *
+     * @param array $submissionVars Submitted vars
+     *
+     * @return bool
+     */
+    protected function saveSiteSettings($submissionVars) {
+        $site = new ElggSite();
+        $site->name = strip_tags($submissionVars['sitename']);
+        $site->access_id = ACCESS_PUBLIC;
+        $site->email = $submissionVars['siteemail'];
+
+        $guid = $site->save();
+        if ($guid !== 1) {
+            register_error(elgg_echo('install:error:createsite'));
+            return false;
+        }
+
+        $this->config->site = $site;
+
+        // new installations have run all the upgrades
+        $upgrades = elgg_get_upgrade_files(Paths::elgg() . "engine/lib/upgrades/");
+
+        $sets = [
+            'installed' => time(),
+            'version' => elgg_get_version(),
+            'simplecache_enabled' => 1,
+            'system_cache_enabled' => 1,
+            'simplecache_lastupdate' => time(),
+            'processed_upgrades' => $upgrades,
+            'language' => 'en',
+            'default_access' => $submissionVars['siteaccess'],
+            'allow_registration' => false,
+            'walled_garden' => false,
+            'allow_user_default_access' => '',
+            'default_limit' => 10,
+            'security_protect_upgrade' => true,
+            'security_notify_admins' => true,
+            'security_notify_user_password' => true,
+            'security_email_require_password' => true,
+        ];
+        foreach ($sets as $key => $value) {
+            elgg_save_config($key, $value);
+        }
+
+        // Enable a set of default plugins
+        _elgg_generate_plugin_entities();
+
+        foreach (elgg_get_plugins('any') as $plugin) {
+            if ($plugin->getManifest()) {
+                if ($plugin->getManifest()->getActivateOnInstall()) {
+                    $plugin->activate();
+                }
+                if (in_array('theme', $plugin->getManifest()->getCategories())) {
+                    $plugin->setPriority('last');
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Admin account support methods
+     */
+
+    /**
+     * Validate account form variables
+     *
+     * @param array $submissionVars Submitted vars
+     * @param array $formVars       Form vars
+     *
+     * @return bool
+     */
+    protected function validateAdminVars($submissionVars, $formVars) {
+
+        foreach ($formVars as $field => $info) {
+            if ($info['required'] == true && !$submissionVars[$field]) {
+                $name = elgg_echo("install:admin:label:$field");
+                register_error(elgg_echo('install:error:requiredfield', [$name]));
+                return false;
+            }
+        }
+
+        if ($submissionVars['password1'] !== $submissionVars['password2']) {
+            register_error(elgg_echo('install:admin:password:mismatch'));
+            return false;
+        }
+
+        if (trim($submissionVars['password1']) == "") {
+            register_error(elgg_echo('install:admin:password:empty'));
+            return false;
+        }
+
+        $minLength = $this->services->configTable->get('min_password_length');
+        if (strlen($submissionVars['password1']) < $minLength) {
+            register_error(elgg_echo('install:admin:password:tooshort'));
+            return false;
+        }
+
+        // check that email address is email address
+        if ($submissionVars['email'] && !is_email_address($submissionVars['email'])) {
+            $msg = elgg_echo('install:error:emailaddress', [$submissionVars['email']]);
+            register_error($msg);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Create a user account for the admin
+     *
+     * @param array $submissionVars Submitted vars
+     * @param bool  $login          Login in the admin user?
+     *
+     * @return bool
+     */
+    protected function createAdminAccount($submissionVars, $login = false) {
+        try {
+            $guid = register_user(
+                $submissionVars['username'],
+                $submissionVars['password1'],
+                $submissionVars['displayname'],
+                $submissionVars['email']
+            );
+        } catch (Exception $e) {
+            register_error($e->getMessage());
+            return false;
+        }
+
+        if (!$guid) {
+            register_error(elgg_echo('install:admin:cannot_create'));
+            return false;
+        }
+
+        $user = get_entity($guid);
+        if (!$user instanceof ElggUser) {
+            register_error(elgg_echo('install:error:loadadmin'));
+            return false;
+        }
+
+        $ia = elgg_set_ignore_access(true);
+        if ($user->makeAdmin() == false) {
+            register_error(elgg_echo('install:error:adminaccess'));
+        } else {
+            $this->services->configTable->set('admin_registered', 1);
+        }
+        elgg_set_ignore_access($ia);
+
+        // add validation data to satisfy user validation plugins
+        $user->validated = 1;
+        $user->validated_method = 'admin_user';
+
+        if (!$login) {
+            return true;
+        }
+
+        $session = ElggSession::fromDatabase($this->config, $this->services->db);
+        $session->start();
+        $this->services->setValue('session', $session);
+        if (login($user) == false) {
+            register_error(elgg_echo('install:error:adminlogin'));
+        }
+
+        return true;
+    }
 }

engine/classes/Elgg/Cli/InstallCommand.php

Spacing +3 added lines, -3 removed lines

@@ -76,9 +76,9 @@
 		$version = elgg_get_version(true);
 
 		$this->write("Elgg $version install successful");
-		$this->write("wwwroot: " . elgg_get_config('wwwroot'));
-		$this->write("dataroot: " . elgg_get_config('dataroot'));
-		$this->write("cacheroot: " . elgg_get_config('cacheroot'));
+		$this->write("wwwroot: ".elgg_get_config('wwwroot'));
+		$this->write("dataroot: ".elgg_get_config('dataroot'));
+		$this->write("cacheroot: ".elgg_get_config('cacheroot'));
 
 	}
 

Indentation +60 added lines, -60 removed lines

@@ -12,75 +12,75 @@
  */
 class InstallCommand extends \Symfony\Component\Console\Command\Command {
 
-	use ConsoleInteractions;
+    use ConsoleInteractions;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function configure() {
-		$this->setName('install')
-			->setDescription('Install Elgg using a configuration file or interactive questions')
-			->addOption('config', 'c', InputOption::VALUE_OPTIONAL, 'Path to php file that returns an array with installation configuration');
-	}
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure() {
+        $this->setName('install')
+            ->setDescription('Install Elgg using a configuration file or interactive questions')
+            ->addOption('config', 'c', InputOption::VALUE_OPTIONAL, 'Path to php file that returns an array with installation configuration');
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
 
-		$this->input = $input;
-		$this->output = $output;
+        $this->input = $input;
+        $this->output = $output;
 
-		$config = $this->option('config');
-		if ($config && file_exists(realpath($config))) {
-			$params = include $config;
-		} else {
-			$params = [
-				/**
-				 * Admin account
-				 */
-				'displayname' => 'Administrator',
-				'username' => $this->ask('Enter admin username: ', 'admin'),
-				'password' => $this->ask('Enter admin password: ', null, true),
-				'email' => $email = $this->ask('Enter admin email: '),
-				/**
-				 * Database parameters
-				 */
-				'dbuser' => $this->ask('Enter database username: '),
-				'dbpassword' => $this->ask('Enter database password: ', null, true),
-				'dbname' => $this->ask('Enter database name: '),
-				'dbprefix' => $this->ask('Enter database prefix [elgg_]: ', 'elgg_'),
-				/**
-				 * Site settings
-				 */
-				'sitename' => $this->ask('Enter site name: '),
-				'siteemail' => $this->ask("Enter site email [$email]: ", $email),
-				'wwwroot' => $this->ask('Enter site URL: '),
-				'dataroot' => $this->ask('Enter data directory path: '),
-				'timezone' => 'UTC'
-			];
-		}
+        $config = $this->option('config');
+        if ($config && file_exists(realpath($config))) {
+            $params = include $config;
+        } else {
+            $params = [
+                /**
+                 * Admin account
+                 */
+                'displayname' => 'Administrator',
+                'username' => $this->ask('Enter admin username: ', 'admin'),
+                'password' => $this->ask('Enter admin password: ', null, true),
+                'email' => $email = $this->ask('Enter admin email: '),
+                /**
+                 * Database parameters
+                 */
+                'dbuser' => $this->ask('Enter database username: '),
+                'dbpassword' => $this->ask('Enter database password: ', null, true),
+                'dbname' => $this->ask('Enter database name: '),
+                'dbprefix' => $this->ask('Enter database prefix [elgg_]: ', 'elgg_'),
+                /**
+                 * Site settings
+                 */
+                'sitename' => $this->ask('Enter site name: '),
+                'siteemail' => $this->ask("Enter site email [$email]: ", $email),
+                'wwwroot' => $this->ask('Enter site URL: '),
+                'dataroot' => $this->ask('Enter data directory path: '),
+                'timezone' => 'UTC'
+            ];
+        }
 
-		try {
-			$installer = new ElggInstaller();
-			$htaccess = !is_file(\Elgg\Application::projectDir()->getPath('.htaccess'));
-			$installer->batchInstall($params, $htaccess);
-		} catch (\InstallationException $ex) {
-			$this->dumpRegisters();
-			$this->write(elgg_format_element('error', [], $ex->getMessage()));
+        try {
+            $installer = new ElggInstaller();
+            $htaccess = !is_file(\Elgg\Application::projectDir()->getPath('.htaccess'));
+            $installer->batchInstall($params, $htaccess);
+        } catch (\InstallationException $ex) {
+            $this->dumpRegisters();
+            $this->write(elgg_format_element('error', [], $ex->getMessage()));
 
-			return 1;
-		}
+            return 1;
+        }
 
-		\Elgg\Application::start();
+        \Elgg\Application::start();
 
-		$version = elgg_get_version(true);
+        $version = elgg_get_version(true);
 
-		$this->write("Elgg $version install successful");
-		$this->write("wwwroot: " . elgg_get_config('wwwroot'));
-		$this->write("dataroot: " . elgg_get_config('dataroot'));
-		$this->write("cacheroot: " . elgg_get_config('cacheroot'));
+        $this->write("Elgg $version install successful");
+        $this->write("wwwroot: " . elgg_get_config('wwwroot'));
+        $this->write("dataroot: " . elgg_get_config('dataroot'));
+        $this->write("cacheroot: " . elgg_get_config('cacheroot'));
 
-	}
+    }
 
 }

engine/classes/Elgg/Cli.php

Indentation +42 added lines, -42 removed lines

@@ -10,47 +10,47 @@
  */
 class Cli {
 
-	/**
-	 * @var ConsoleApplication
-	 */
-	protected $console;
-
-	/**
-	 * @var HooksRegistrationService
-	 */
-	protected $hooks;
-
-	/**
-	 * Constructor
-	 *
-	 * @param ConsoleApplication       $console Console application instance
-	 * @param HooksRegistrationService $hooks   Hooks registration service
-	 */
-	public function __construct(ConsoleApplication $console, HooksRegistrationService $hooks) {
-		$this->console = $console;
-		$this->hooks = $hooks;
-	}
-
-	/**
-	 * Add CLI tools to the console application
-	 * @return void
-	 */
-	protected function bootstrap() {
-		$commands = $this->hooks->trigger('commands', 'cli', null, []);
-		foreach ($commands as $command) {
-			if (class_exists($command) && is_subclass_of($command, Command::class)) {
-				$this->console->add(new $command());
-			}
-		}
-	}
-
-	/**
-	 * Bootstrap and run console application
-	 * @return void
-	 */
-	public function run() {
-		$this->bootstrap();
-		$this->console->run();
-	}
+    /**
+     * @var ConsoleApplication
+     */
+    protected $console;
+
+    /**
+     * @var HooksRegistrationService
+     */
+    protected $hooks;
+
+    /**
+     * Constructor
+     *
+     * @param ConsoleApplication       $console Console application instance
+     * @param HooksRegistrationService $hooks   Hooks registration service
+     */
+    public function __construct(ConsoleApplication $console, HooksRegistrationService $hooks) {
+        $this->console = $console;
+        $this->hooks = $hooks;
+    }
+
+    /**
+     * Add CLI tools to the console application
+     * @return void
+     */
+    protected function bootstrap() {
+        $commands = $this->hooks->trigger('commands', 'cli', null, []);
+        foreach ($commands as $command) {
+            if (class_exists($command) && is_subclass_of($command, Command::class)) {
+                $this->console->add(new $command());
+            }
+        }
+    }
+
+    /**
+     * Bootstrap and run console application
+     * @return void
+     */
+    public function run() {
+        $this->bootstrap();
+        $this->console->run();
+    }
 
 }

engine/classes/Elgg/Cli/ConsoleInteractions.php

Indentation +106 added lines, -106 removed lines

@@ -9,110 +9,110 @@
 
 trait ConsoleInteractions {
 
-	/**
-	 * @var InputInterface
-	 */
-	protected $input;
-
-	/**
-	 * @var OutputInterface
-	 */
-	protected $output;
-
-	/**
-	 * Ask a question
-	 *
-	 * @param string $question Question to ask
-	 * @param mixed  $default  Default value
-	 * @param bool   $hidden   Hide response
-	 * @param bool   $required User input is required
-	 *
-	 * @return mixed
-	 */
-	public function ask($question, $default = null, $hidden = false, $required = true) {
-
-		$helper = $this->getHelper('question');
-
-		$q = new Question($question, $default);
-
-		if ($hidden) {
-			$q->setHidden(true);
-			$q->setHiddenFallback(false);
-		}
-
-		if ($required) {
-			$q->setValidator([
-				$this,
-				'assertNotEmpty'
-			]);
-			$q->setMaxAttempts(2);
-		}
-
-		return $helper->ask($this->input, $this->output, $q);
-	}
-
-	/**
-	 * Write messages to output buffer
-	 *
-	 * @param string|array $messages Messages
-	 *
-	 * @return void
-	 */
-	public function write($messages) {
-		$this->output->writeln($messages);
-	}
-
-	/**
-	 * Returns option value
-	 *
-	 * @param string $name Option name
-	 *
-	 * @return mixed
-	 */
-	public function option($name) {
-		return $this->input->getOption($name);
-	}
-
-	/**
-	 * Returns argument value
-	 *
-	 * @param string $name Argument name
-	 *
-	 * @return string
-	 */
-	public function argument($name) {
-		return $this->input->getArgument($name);
-	}
-
-	/**
-	 * Question validator for required user response
-	 *
-	 * @param mixed $answer User answer
-	 *
-	 * @return bool
-	 */
-	public function assertNotEmpty($answer) {
-		if (empty($answer)) {
-			throw new \RuntimeException('Please enter a required answer');
-		}
-
-		return $answer;
-	}
-
-	/**
-	 * Dump and output system and error messages
-	 * @return void
-	 */
-	protected function dumpRegisters() {
-		$registers = _elgg_services()->systemMessages->loadRegisters();
-
-		foreach ($registers as $prop => $values) {
-			if (!empty($values)) {
-				foreach ($values as $msg) {
-					$tag = $prop == 'error' ? 'error' : 'info';
-					$this->write(elgg_format_element($tag, [], $msg));
-				}
-			}
-		}
-	}
+    /**
+     * @var InputInterface
+     */
+    protected $input;
+
+    /**
+     * @var OutputInterface
+     */
+    protected $output;
+
+    /**
+     * Ask a question
+     *
+     * @param string $question Question to ask
+     * @param mixed  $default  Default value
+     * @param bool   $hidden   Hide response
+     * @param bool   $required User input is required
+     *
+     * @return mixed
+     */
+    public function ask($question, $default = null, $hidden = false, $required = true) {
+
+        $helper = $this->getHelper('question');
+
+        $q = new Question($question, $default);
+
+        if ($hidden) {
+            $q->setHidden(true);
+            $q->setHiddenFallback(false);
+        }
+
+        if ($required) {
+            $q->setValidator([
+                $this,
+                'assertNotEmpty'
+            ]);
+            $q->setMaxAttempts(2);
+        }
+
+        return $helper->ask($this->input, $this->output, $q);
+    }
+
+    /**
+     * Write messages to output buffer
+     *
+     * @param string|array $messages Messages
+     *
+     * @return void
+     */
+    public function write($messages) {
+        $this->output->writeln($messages);
+    }
+
+    /**
+     * Returns option value
+     *
+     * @param string $name Option name
+     *
+     * @return mixed
+     */
+    public function option($name) {
+        return $this->input->getOption($name);
+    }
+
+    /**
+     * Returns argument value
+     *
+     * @param string $name Argument name
+     *
+     * @return string
+     */
+    public function argument($name) {
+        return $this->input->getArgument($name);
+    }
+
+    /**
+     * Question validator for required user response
+     *
+     * @param mixed $answer User answer
+     *
+     * @return bool
+     */
+    public function assertNotEmpty($answer) {
+        if (empty($answer)) {
+            throw new \RuntimeException('Please enter a required answer');
+        }
+
+        return $answer;
+    }
+
+    /**
+     * Dump and output system and error messages
+     * @return void
+     */
+    protected function dumpRegisters() {
+        $registers = _elgg_services()->systemMessages->loadRegisters();
+
+        foreach ($registers as $prop => $values) {
+            if (!empty($values)) {
+                foreach ($values as $msg) {
+                    $tag = $prop == 'error' ? 'error' : 'info';
+                    $this->write(elgg_format_element($tag, [], $msg));
+                }
+            }
+        }
+    }
 }
\ No newline at end of file

engine/classes/Elgg/Cli/SimpletestCommand.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Elgg\Cli;
 
 use Elgg\Application;
-use Elgg\Config;
 use Exception;
 use RuntimeException;
 use Symfony\Component\Console\Input\InputOption;

Indentation +125 added lines, -125 removed lines

@@ -15,130 +15,130 @@
  */
 class SimpletestCommand extends Command {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function configure() {
-		$this->setName('simpletest')
-			->setDescription('Run simpletest test suite')
-			->addOption('config', 'c', InputOption::VALUE_OPTIONAL,
-				'Path to settings file that the Elgg Application should be bootstrapped with'
-			)
-			->addOption('plugins', 'p', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL,
-				'A list of plugins to enable for testing or "all" to enable all plugins'
-			);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function command() {
-
-		if (!class_exists('ElggCoreUnitTest')) {
-			elgg_log('You must install your Elgg application using "composer install --dev"', 'ERROR');
-
-			return 1;
-		}
-
-		// Disable maximum execution time.
-		// Tests take a while...
-		set_time_limit(0);
-
-		ob_start();
-
-		$error = 0;
-
-		try {
-			$settings_path = $this->option('config');
-			if ($settings_path) {
-				$sp = _elgg_services();
-				$app = Application::factory([
-					'settings_path' => $settings_path,
-					'service_provider' => $sp,
-				]);
-				Application::setInstance($app);
-			}
-
-			// turn off system log
-			_elgg_services()->hooks->unregisterHandler('all', 'all', 'system_log_listener');
-			_elgg_services()->hooks->unregisterHandler('log', 'systemlog', 'system_log_default_logger');
-
-			$admin = array_shift(elgg_get_admins(['limit' => 1]));
-			if (!login($admin)) {
-				throw new RuntimeException("Failed to login as administrator.");
-			}
-
-			// disable emails
-			elgg_set_email_transport(new \Zend\Mail\Transport\InMemory());
-
-			$plugins = $this->option('plugins');
-			if (in_array('all', $plugins)) {
-				$plugins = [];
-				$plugin_entities = elgg_get_plugins('inactive');
-				foreach ($plugin_entities as $plugin_entity) {
-					$plugins[] = $plugin_entity->getID();
-				}
-			} else if (empty($plugins)) {
-				// plugins that contain unit tests
-				$plugins = [
-					'groups',
-					'thewire',
-					'web_services'
-				];
-			}
-
-			$activated_plugins = [];
-
-			// activate plugins that are not activated on install
-			foreach ($plugins as $key => $id) {
-				$plugin = elgg_get_plugin_from_id($id);
-				if (!$plugin || $plugin->isActive()) {
-					unset($plugins[$key]);
-					continue;
-				}
-				if ($plugin->activate()) {
-					$activated_plugins[] = $id;
-				}
-			}
-
-			$suite = new TestSuite('Elgg Core Unit Tests');
-
-			$test_cases = _elgg_services()->hooks->trigger('unit_test', 'system', null, []);
-			foreach ($test_cases as $file) {
-				if (substr($file, -4, 4) === '.php') {
-					$suite->addFile($file);
-				} else if (class_exists($file)) {
-					$suite->add($file);
-				}
-			}
-
-			$start_time = microtime(true);
-
-			$reporter = new TextReporter();
-			$result = $suite->Run($reporter);
-
-			// deactivate plugins that were activated for test suite
-			foreach ($activated_plugins as $key => $id) {
-				$plugin = elgg_get_plugin_from_id($id);
-				$plugin->deactivate();
-			}
-
-			echo PHP_EOL . sprintf("Time: %.2f seconds, Memory: %.2fMb\n",
-					microtime(true) - $start_time,
-					memory_get_peak_usage() / 1048576.0 // in megabytes
-				) . PHP_EOL;
-
-			if (!$result) {
-				throw new RuntimeException('One or more tests have failed');
-			}
-		} catch (Exception $e) {
-			$error = $e->getCode() ? : 1;
-			elgg_log("Test suite has failed with " . get_class($e) . ': ' . $e->getMessage(), 'ERROR');
-		}
-
-		$this->write(ob_get_clean());
-
-		return $error;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure() {
+        $this->setName('simpletest')
+            ->setDescription('Run simpletest test suite')
+            ->addOption('config', 'c', InputOption::VALUE_OPTIONAL,
+                'Path to settings file that the Elgg Application should be bootstrapped with'
+            )
+            ->addOption('plugins', 'p', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL,
+                'A list of plugins to enable for testing or "all" to enable all plugins'
+            );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function command() {
+
+        if (!class_exists('ElggCoreUnitTest')) {
+            elgg_log('You must install your Elgg application using "composer install --dev"', 'ERROR');
+
+            return 1;
+        }
+
+        // Disable maximum execution time.
+        // Tests take a while...
+        set_time_limit(0);
+
+        ob_start();
+
+        $error = 0;
+
+        try {
+            $settings_path = $this->option('config');
+            if ($settings_path) {
+                $sp = _elgg_services();
+                $app = Application::factory([
+                    'settings_path' => $settings_path,
+                    'service_provider' => $sp,
+                ]);
+                Application::setInstance($app);
+            }
+
+            // turn off system log
+            _elgg_services()->hooks->unregisterHandler('all', 'all', 'system_log_listener');
+            _elgg_services()->hooks->unregisterHandler('log', 'systemlog', 'system_log_default_logger');
+
+            $admin = array_shift(elgg_get_admins(['limit' => 1]));
+            if (!login($admin)) {
+                throw new RuntimeException("Failed to login as administrator.");
+            }
+
+            // disable emails
+            elgg_set_email_transport(new \Zend\Mail\Transport\InMemory());
+
+            $plugins = $this->option('plugins');
+            if (in_array('all', $plugins)) {
+                $plugins = [];
+                $plugin_entities = elgg_get_plugins('inactive');
+                foreach ($plugin_entities as $plugin_entity) {
+                    $plugins[] = $plugin_entity->getID();
+                }
+            } else if (empty($plugins)) {
+                // plugins that contain unit tests
+                $plugins = [
+                    'groups',
+                    'thewire',
+                    'web_services'
+                ];
+            }
+
+            $activated_plugins = [];
+
+            // activate plugins that are not activated on install
+            foreach ($plugins as $key => $id) {
+                $plugin = elgg_get_plugin_from_id($id);
+                if (!$plugin || $plugin->isActive()) {
+                    unset($plugins[$key]);
+                    continue;
+                }
+                if ($plugin->activate()) {
+                    $activated_plugins[] = $id;
+                }
+            }
+
+            $suite = new TestSuite('Elgg Core Unit Tests');
+
+            $test_cases = _elgg_services()->hooks->trigger('unit_test', 'system', null, []);
+            foreach ($test_cases as $file) {
+                if (substr($file, -4, 4) === '.php') {
+                    $suite->addFile($file);
+                } else if (class_exists($file)) {
+                    $suite->add($file);
+                }
+            }
+
+            $start_time = microtime(true);
+
+            $reporter = new TextReporter();
+            $result = $suite->Run($reporter);
+
+            // deactivate plugins that were activated for test suite
+            foreach ($activated_plugins as $key => $id) {
+                $plugin = elgg_get_plugin_from_id($id);
+                $plugin->deactivate();
+            }
+
+            echo PHP_EOL . sprintf("Time: %.2f seconds, Memory: %.2fMb\n",
+                    microtime(true) - $start_time,
+                    memory_get_peak_usage() / 1048576.0 // in megabytes
+                ) . PHP_EOL;
+
+            if (!$result) {
+                throw new RuntimeException('One or more tests have failed');
+            }
+        } catch (Exception $e) {
+            $error = $e->getCode() ? : 1;
+            elgg_log("Test suite has failed with " . get_class($e) . ': ' . $e->getMessage(), 'ERROR');
+        }
+
+        $this->write(ob_get_clean());
+
+        return $error;
+    }
 
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -123,17 +123,17 @@
 				$plugin->deactivate();
 			}
 
-			echo PHP_EOL . sprintf("Time: %.2f seconds, Memory: %.2fMb\n",
+			echo PHP_EOL.sprintf("Time: %.2f seconds, Memory: %.2fMb\n",
 					microtime(true) - $start_time,
 					memory_get_peak_usage() / 1048576.0 // in megabytes
-				) . PHP_EOL;
+				).PHP_EOL;
 
 			if (!$result) {
 				throw new RuntimeException('One or more tests have failed');
 			}
 		} catch (Exception $e) {
-			$error = $e->getCode() ? : 1;
-			elgg_log("Test suite has failed with " . get_class($e) . ': ' . $e->getMessage(), 'ERROR');
+			$error = $e->getCode() ?: 1;
+			elgg_log("Test suite has failed with ".get_class($e).': '.$e->getMessage(), 'ERROR');
 		}
 
 		$this->write(ob_get_clean());

engine/lib/input.php

Doc Comments +1 added lines, -1 removed lines

@@ -546,7 +546,7 @@
  * @param string[] $value  Test files
  * @param array    $params Hook params
  *
- * @return array
+ * @return string[]
  */
 function _elgg_htmlawed_test($hook, $type, $value, $params) {
 	$value[] = Paths::elgg() . 'engine/tests/simpletest/ElggHtmLawedTest.php';

Indentation +312 added lines, -312 removed lines

@@ -27,7 +27,7 @@ 
  * @return mixed
  */
 function get_input($variable, $default = null, $filter_result = true) {
-	return _elgg_services()->input->get($variable, $default, $filter_result);
+    return _elgg_services()->input->get($variable, $default, $filter_result);
 }
 
 /**
@@ -41,7 +41,7 @@ 
  * @return void
  */
 function set_input($variable, $value) {
-	_elgg_services()->input->set($variable, $value);
+    _elgg_services()->input->set($variable, $value);
 }
 
 /**
@@ -54,8 +54,8 @@ 
  * @since 3.0
  */
 function elgg_get_title_input($variable = 'title', $default = '') {
-	$raw_input = get_input($variable, $default, false);
-	return htmlspecialchars($raw_input, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    $raw_input = get_input($variable, $default, false);
+    return htmlspecialchars($raw_input, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
 }
 
 /**
@@ -67,7 +67,7 @@ 
  * @return mixed The filtered result - everything will be strings
  */
 function filter_tags($var) {
-	return elgg_trigger_plugin_hook('validate', 'input', null, $var);
+    return elgg_trigger_plugin_hook('validate', 'input', null, $var);
 }
 
 /**
@@ -79,19 +79,19 @@ 
  * @return string The current page URL.
  */
 function current_page_url() {
-	$url = parse_url(elgg_get_site_url());
+    $url = parse_url(elgg_get_site_url());
 
-	$page = $url['scheme'] . "://" . $url['host'];
+    $page = $url['scheme'] . "://" . $url['host'];
 
-	if (isset($url['port']) && $url['port']) {
-		$page .= ":" . $url['port'];
-	}
+    if (isset($url['port']) && $url['port']) {
+        $page .= ":" . $url['port'];
+    }
 
-	$page = trim($page, "/");
+    $page = trim($page, "/");
 
-	$page .= _elgg_services()->request->getRequestUri();
+    $page .= _elgg_services()->request->getRequestUri();
 
-	return $page;
+    return $page;
 }
 
 /**
@@ -102,7 +102,7 @@ 
  * @return bool
  */
 function is_email_address($address) {
-	return filter_var($address, FILTER_VALIDATE_EMAIL) === $address;
+    return filter_var($address, FILTER_VALIDATE_EMAIL) === $address;
 }
 
 /**
@@ -117,7 +117,7 @@ 
  * @since 1.8.0
  */
 function elgg_make_sticky_form($form_name) {
-	_elgg_services()->stickyForms->makeStickyForm($form_name);
+    _elgg_services()->stickyForms->makeStickyForm($form_name);
 }
 
 /**
@@ -133,7 +133,7 @@ 
  * @since 1.8.0
  */
 function elgg_clear_sticky_form($form_name) {
-	_elgg_services()->stickyForms->clearStickyForm($form_name);
+    _elgg_services()->stickyForms->clearStickyForm($form_name);
 }
 
 /**
@@ -145,7 +145,7 @@ 
  * @since 1.8.0
  */
 function elgg_is_sticky_form($form_name) {
-	return _elgg_services()->stickyForms->isStickyForm($form_name);
+    return _elgg_services()->stickyForms->isStickyForm($form_name);
 }
 
 /**
@@ -162,7 +162,7 @@ 
  * @since 1.8.0
  */
 function elgg_get_sticky_value($form_name, $variable = '', $default = null, $filter_result = true) {
-	return _elgg_services()->stickyForms->getStickyValue($form_name, $variable, $default, $filter_result);
+    return _elgg_services()->stickyForms->getStickyValue($form_name, $variable, $default, $filter_result);
 }
 
 /**
@@ -175,7 +175,7 @@ 
  * @since 1.8.0
  */
 function elgg_get_sticky_values($form_name, $filter_result = true) {
-	return _elgg_services()->stickyForms->getStickyValues($form_name, $filter_result);
+    return _elgg_services()->stickyForms->getStickyValues($form_name, $filter_result);
 }
 
 /**
@@ -188,7 +188,7 @@ 
  * @since 1.8.0
  */
 function elgg_clear_sticky_value($form_name, $variable) {
-	_elgg_services()->stickyForms->clearStickyValue($form_name, $variable);
+    _elgg_services()->stickyForms->clearStickyValue($form_name, $variable);
 }
 
 /**
@@ -209,201 +209,201 @@ 
  * @access private
  */
 function input_livesearch_page_handler($page) {
-	$dbprefix = _elgg_config()->dbprefix;
-
-	// only return results to logged in users.
-	if (!$user = elgg_get_logged_in_user_entity()) {
-		exit;
-	}
-
-	if (!$q = get_input('term', get_input('q'))) {
-		exit;
-	}
-
-	$input_name = get_input('name', 'members');
-
-	$q = sanitise_string($q);
-
-	// replace mysql vars with escaped strings
-	$q = str_replace(['_', '%'], ['\_', '\%'], $q);
-
-	$match_on = get_input('match_on', 'all');
-
-	if (!is_array($match_on)) {
-		$match_on = [$match_on];
-	}
-
-	// all = users and groups
-	if (in_array('all', $match_on)) {
-		$match_on = ['users', 'groups'];
-	}
-
-	$owner_guid = ELGG_ENTITIES_ANY_VALUE;
-	if (get_input('match_owner', false)) {
-		$owner_guid = $user->getGUID();
-	}
-
-	$limit = sanitise_int(get_input('limit', _elgg_config()->default_limit));
-
-	// grab a list of entities and send them in json.
-	$results = [];
-	foreach ($match_on as $match_type) {
-		switch ($match_type) {
-			case 'users':
-				$options = [
-					'type' => 'user',
-					'limit' => $limit,
-					'joins' => ["JOIN {$dbprefix}users_entity ue ON e.guid = ue.guid"],
-					'wheres' => [
-						"ue.banned = 'no'",
-						"(ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')"
-					]
-				];
+    $dbprefix = _elgg_config()->dbprefix;
+
+    // only return results to logged in users.
+    if (!$user = elgg_get_logged_in_user_entity()) {
+        exit;
+    }
+
+    if (!$q = get_input('term', get_input('q'))) {
+        exit;
+    }
+
+    $input_name = get_input('name', 'members');
+
+    $q = sanitise_string($q);
+
+    // replace mysql vars with escaped strings
+    $q = str_replace(['_', '%'], ['\_', '\%'], $q);
+
+    $match_on = get_input('match_on', 'all');
+
+    if (!is_array($match_on)) {
+        $match_on = [$match_on];
+    }
+
+    // all = users and groups
+    if (in_array('all', $match_on)) {
+        $match_on = ['users', 'groups'];
+    }
+
+    $owner_guid = ELGG_ENTITIES_ANY_VALUE;
+    if (get_input('match_owner', false)) {
+        $owner_guid = $user->getGUID();
+    }
+
+    $limit = sanitise_int(get_input('limit', _elgg_config()->default_limit));
+
+    // grab a list of entities and send them in json.
+    $results = [];
+    foreach ($match_on as $match_type) {
+        switch ($match_type) {
+            case 'users':
+                $options = [
+                    'type' => 'user',
+                    'limit' => $limit,
+                    'joins' => ["JOIN {$dbprefix}users_entity ue ON e.guid = ue.guid"],
+                    'wheres' => [
+                        "ue.banned = 'no'",
+                        "(ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')"
+                    ]
+                ];
 				
-				$entities = elgg_get_entities($options);
-				if (!empty($entities)) {
-					foreach ($entities as $entity) {
-						if (in_array('groups', $match_on)) {
-							$value = $entity->guid;
-						} else {
-							$value = $entity->username;
-						}
-
-						$output = elgg_view_list_item($entity, [
-							'use_hover' => false,
-							'use_link' => false,
-							'class' => 'elgg-autocomplete-item',
-							'title' => $entity->name, // Default title would be a link
-						]);
-
-						$icon = elgg_view_entity_icon($entity, 'tiny', [
-							'use_hover' => false,
-						]);
-
-						$result = [
-							'type' => 'user',
-							'name' => $entity->name,
-							'desc' => $entity->username,
-							'guid' => $entity->guid,
-							'label' => $output,
-							'value' => $value,
-							'icon' => $icon,
-							'url' => $entity->getURL(),
-							'html' => elgg_view('input/userpicker/item', [
-								'entity' => $entity,
-								'input_name' => $input_name,
-							]),
-						];
-						$results[$entity->name . rand(1, 100)] = $result;
-					}
-				}
-				break;
-
-			case 'groups':
-				// don't return results if groups aren't enabled.
-				if (!elgg_is_active_plugin('groups')) {
-					continue;
-				}
+                $entities = elgg_get_entities($options);
+                if (!empty($entities)) {
+                    foreach ($entities as $entity) {
+                        if (in_array('groups', $match_on)) {
+                            $value = $entity->guid;
+                        } else {
+                            $value = $entity->username;
+                        }
+
+                        $output = elgg_view_list_item($entity, [
+                            'use_hover' => false,
+                            'use_link' => false,
+                            'class' => 'elgg-autocomplete-item',
+                            'title' => $entity->name, // Default title would be a link
+                        ]);
+
+                        $icon = elgg_view_entity_icon($entity, 'tiny', [
+                            'use_hover' => false,
+                        ]);
+
+                        $result = [
+                            'type' => 'user',
+                            'name' => $entity->name,
+                            'desc' => $entity->username,
+                            'guid' => $entity->guid,
+                            'label' => $output,
+                            'value' => $value,
+                            'icon' => $icon,
+                            'url' => $entity->getURL(),
+                            'html' => elgg_view('input/userpicker/item', [
+                                'entity' => $entity,
+                                'input_name' => $input_name,
+                            ]),
+                        ];
+                        $results[$entity->name . rand(1, 100)] = $result;
+                    }
+                }
+                break;
+
+            case 'groups':
+                // don't return results if groups aren't enabled.
+                if (!elgg_is_active_plugin('groups')) {
+                    continue;
+                }
 				
-				$options = [
-					'type' => 'group',
-					'limit' => $limit,
-					'owner_guid' => $owner_guid,
-					'joins' => ["JOIN {$dbprefix}groups_entity ge ON e.guid = ge.guid"],
-					'wheres' => [
-						"(ge.name LIKE '$q%' OR ge.name LIKE '% $q%' OR ge.description LIKE '% $q%')"
-					]
-				];
+                $options = [
+                    'type' => 'group',
+                    'limit' => $limit,
+                    'owner_guid' => $owner_guid,
+                    'joins' => ["JOIN {$dbprefix}groups_entity ge ON e.guid = ge.guid"],
+                    'wheres' => [
+                        "(ge.name LIKE '$q%' OR ge.name LIKE '% $q%' OR ge.description LIKE '% $q%')"
+                    ]
+                ];
 				
-				$entities = elgg_get_entities($options);
-				if (!empty($entities)) {
-					foreach ($entities as $entity) {
-						$output = elgg_view_list_item($entity, [
-							'use_hover' => false,
-							'class' => 'elgg-autocomplete-item',
-							'full_view' => false,
-							'href' => false,
-							'title' => $entity->name, // Default title would be a link
-						]);
-
-						$icon = elgg_view_entity_icon($entity, 'tiny', [
-							'use_hover' => false,
-						]);
-
-						$result = [
-							'type' => 'group',
-							'name' => $entity->name,
-							'desc' => strip_tags($entity->description),
-							'guid' => $entity->guid,
-							'label' => $output,
-							'value' => $entity->guid,
-							'icon' => $icon,
-							'url' => $entity->getURL(),
-						];
-
-						$results[$entity->name . rand(1, 100)] = $result;
-					}
-				}
-				break;
-
-			case 'friends':
-				$options = [
-					'type' => 'user',
-					'limit' => $limit,
-					'relationship' => 'friend',
-					'relationship_guid' => $user->getGUID(),
-					'joins' => ["JOIN {$dbprefix}users_entity ue ON e.guid = ue.guid"],
-					'wheres' => [
-						"ue.banned = 'no'",
-						"(ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')"
-					]
-				];
+                $entities = elgg_get_entities($options);
+                if (!empty($entities)) {
+                    foreach ($entities as $entity) {
+                        $output = elgg_view_list_item($entity, [
+                            'use_hover' => false,
+                            'class' => 'elgg-autocomplete-item',
+                            'full_view' => false,
+                            'href' => false,
+                            'title' => $entity->name, // Default title would be a link
+                        ]);
+
+                        $icon = elgg_view_entity_icon($entity, 'tiny', [
+                            'use_hover' => false,
+                        ]);
+
+                        $result = [
+                            'type' => 'group',
+                            'name' => $entity->name,
+                            'desc' => strip_tags($entity->description),
+                            'guid' => $entity->guid,
+                            'label' => $output,
+                            'value' => $entity->guid,
+                            'icon' => $icon,
+                            'url' => $entity->getURL(),
+                        ];
+
+                        $results[$entity->name . rand(1, 100)] = $result;
+                    }
+                }
+                break;
+
+            case 'friends':
+                $options = [
+                    'type' => 'user',
+                    'limit' => $limit,
+                    'relationship' => 'friend',
+                    'relationship_guid' => $user->getGUID(),
+                    'joins' => ["JOIN {$dbprefix}users_entity ue ON e.guid = ue.guid"],
+                    'wheres' => [
+                        "ue.banned = 'no'",
+                        "(ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')"
+                    ]
+                ];
 				
-				$entities = elgg_get_entities_from_relationship($options);
-				if (!empty($entities)) {
-					foreach ($entities as $entity) {
-						$output = elgg_view_list_item($entity, [
-							'use_hover' => false,
-							'use_link' => false,
-							'class' => 'elgg-autocomplete-item',
-							'title' => $entity->name, // Default title would be a link
-						]);
-
-						$icon = elgg_view_entity_icon($entity, 'tiny', [
-							'use_hover' => false,
-						]);
-
-						$result = [
-							'type' => 'user',
-							'name' => $entity->name,
-							'desc' => $entity->username,
-							'guid' => $entity->guid,
-							'label' => $output,
-							'value' => $entity->username,
-							'icon' => $icon,
-							'url' => $entity->getURL(),
-							'html' => elgg_view('input/userpicker/item', [
-								'entity' => $entity,
-								'input_name' => $input_name,
-							]),
-						];
-						$results[$entity->name . rand(1, 100)] = $result;
-					}
-				}
-				break;
-
-			default:
-				header("HTTP/1.0 400 Bad Request", true);
-				echo "livesearch: unknown match_on of $match_type";
-				exit;
-				break;
-		}
-	}
-
-	ksort($results);
-	header("Content-Type: application/json;charset=utf-8");
-	echo json_encode(array_values($results));
-	exit;
+                $entities = elgg_get_entities_from_relationship($options);
+                if (!empty($entities)) {
+                    foreach ($entities as $entity) {
+                        $output = elgg_view_list_item($entity, [
+                            'use_hover' => false,
+                            'use_link' => false,
+                            'class' => 'elgg-autocomplete-item',
+                            'title' => $entity->name, // Default title would be a link
+                        ]);
+
+                        $icon = elgg_view_entity_icon($entity, 'tiny', [
+                            'use_hover' => false,
+                        ]);
+
+                        $result = [
+                            'type' => 'user',
+                            'name' => $entity->name,
+                            'desc' => $entity->username,
+                            'guid' => $entity->guid,
+                            'label' => $output,
+                            'value' => $entity->username,
+                            'icon' => $icon,
+                            'url' => $entity->getURL(),
+                            'html' => elgg_view('input/userpicker/item', [
+                                'entity' => $entity,
+                                'input_name' => $input_name,
+                            ]),
+                        ];
+                        $results[$entity->name . rand(1, 100)] = $result;
+                    }
+                }
+                break;
+
+            default:
+                header("HTTP/1.0 400 Bad Request", true);
+                echo "livesearch: unknown match_on of $match_type";
+                exit;
+                break;
+        }
+    }
+
+    ksort($results);
+    header("Content-Type: application/json;charset=utf-8");
+    echo json_encode(array_values($results));
+    exit;
 }
 
 /**
@@ -425,38 +425,38 @@ 
  * @return mixed
  */
 function _elgg_htmlawed_filter_tags($hook, $type, $result, $params = null) {
-	$var = $result;
-
-	$config = [
-		// seems to handle about everything we need.
-		'safe' => true,
-
-		// remove comments/CDATA instead of converting to text
-		'comment' => 1,
-		'cdata' => 1,
-
-		'deny_attribute' => 'class, on*',
-		'hook_tag' => '_elgg_htmlawed_tag_post_processor',
-
-		'schemes' => '*:http,https,ftp,news,mailto,rtsp,teamspeak,gopher,mms,callto',
-		// apparent this doesn't work.
-		// 'style:color,cursor,text-align,font-size,font-weight,font-style,border,margin,padding,float'
-	];
-
-	// add nofollow to all links on output
-	if (!elgg_in_context('input')) {
-		$config['anti_link_spam'] = ['/./', ''];
-	}
-
-	$config = elgg_trigger_plugin_hook('config', 'htmlawed', null, $config);
-	$spec = elgg_trigger_plugin_hook('spec', 'htmlawed', null, '');
-
-	if (!is_array($var)) {
-		return Htmlawed::filter($var, $config, $spec);
-	} else {
-		array_walk_recursive($var, '_elgg_htmLawedArray', [$config, $spec]);
-		return $var;
-	}
+    $var = $result;
+
+    $config = [
+        // seems to handle about everything we need.
+        'safe' => true,
+
+        // remove comments/CDATA instead of converting to text
+        'comment' => 1,
+        'cdata' => 1,
+
+        'deny_attribute' => 'class, on*',
+        'hook_tag' => '_elgg_htmlawed_tag_post_processor',
+
+        'schemes' => '*:http,https,ftp,news,mailto,rtsp,teamspeak,gopher,mms,callto',
+        // apparent this doesn't work.
+        // 'style:color,cursor,text-align,font-size,font-weight,font-style,border,margin,padding,float'
+    ];
+
+    // add nofollow to all links on output
+    if (!elgg_in_context('input')) {
+        $config['anti_link_spam'] = ['/./', ''];
+    }
+
+    $config = elgg_trigger_plugin_hook('config', 'htmlawed', null, $config);
+    $spec = elgg_trigger_plugin_hook('spec', 'htmlawed', null, '');
+
+    if (!is_array($var)) {
+        return Htmlawed::filter($var, $config, $spec);
+    } else {
+        array_walk_recursive($var, '_elgg_htmLawedArray', [$config, $spec]);
+        return $var;
+    }
 }
 
 // @codingStandardsIgnoreStart
@@ -464,8 +464,8 @@ 
  * wrapper function for htmlawed for handling arrays
  */
 function _elgg_htmLawedArray(&$v, $k, $config_spec) {
-	list ($config, $spec) = $config_spec;
-	$v = Htmlawed::filter($v, $config, $spec);
+    list ($config, $spec) = $config_spec;
+    $v = Htmlawed::filter($v, $config, $spec);
 }
 // @codingStandardsIgnoreEnd
 
@@ -482,60 +482,60 @@ 
  * @return string
  */
 function _elgg_htmlawed_tag_post_processor($element, $attributes = false) {
-	if ($attributes === false) {
-		// This is a closing tag. Prevent further processing to avoid inserting a duplicate tag
-		return "</${element}>";
-	}
-
-	// this list should be coordinated with the WYSIWYG editor used (tinymce, ckeditor, etc.)
-	$allowed_styles = [
-		'color', 'cursor', 'text-align', 'vertical-align', 'font-size',
-		'font-weight', 'font-style', 'border', 'border-top', 'background-color',
-		'border-bottom', 'border-left', 'border-right',
-		'margin', 'margin-top', 'margin-bottom', 'margin-left',
-		'margin-right',	'padding', 'float', 'text-decoration'
-	];
-
-	$params = ['tag' => $element];
-	$allowed_styles = elgg_trigger_plugin_hook('allowed_styles', 'htmlawed', $params, $allowed_styles);
-
-	// must return something.
-	$string = '';
-
-	foreach ($attributes as $attr => $value) {
-		if ($attr == 'style') {
-			$styles = explode(';', $value);
-
-			$style_str = '';
-			foreach ($styles as $style) {
-				if (!trim($style)) {
-					continue;
-				}
-				list($style_attr, $style_value) = explode(':', trim($style));
-				$style_attr = trim($style_attr);
-				$style_value = trim($style_value);
-
-				if (in_array($style_attr, $allowed_styles)) {
-					$style_str .= "$style_attr: $style_value; ";
-				}
-			}
-
-			if ($style_str) {
-				$style_str = trim($style_str);
-				$string .= " style=\"$style_str\"";
-			}
-		} else {
-			$string .= " $attr=\"$value\"";
-		}
-	}
-
-	// Some WYSIWYG editors do not like tags like <p > so only add a space if needed.
-	if ($string = trim($string)) {
-		$string = " $string";
-	}
-
-	$r = "<$element$string>";
-	return $r;
+    if ($attributes === false) {
+        // This is a closing tag. Prevent further processing to avoid inserting a duplicate tag
+        return "</${element}>";
+    }
+
+    // this list should be coordinated with the WYSIWYG editor used (tinymce, ckeditor, etc.)
+    $allowed_styles = [
+        'color', 'cursor', 'text-align', 'vertical-align', 'font-size',
+        'font-weight', 'font-style', 'border', 'border-top', 'background-color',
+        'border-bottom', 'border-left', 'border-right',
+        'margin', 'margin-top', 'margin-bottom', 'margin-left',
+        'margin-right',	'padding', 'float', 'text-decoration'
+    ];
+
+    $params = ['tag' => $element];
+    $allowed_styles = elgg_trigger_plugin_hook('allowed_styles', 'htmlawed', $params, $allowed_styles);
+
+    // must return something.
+    $string = '';
+
+    foreach ($attributes as $attr => $value) {
+        if ($attr == 'style') {
+            $styles = explode(';', $value);
+
+            $style_str = '';
+            foreach ($styles as $style) {
+                if (!trim($style)) {
+                    continue;
+                }
+                list($style_attr, $style_value) = explode(':', trim($style));
+                $style_attr = trim($style_attr);
+                $style_value = trim($style_value);
+
+                if (in_array($style_attr, $allowed_styles)) {
+                    $style_str .= "$style_attr: $style_value; ";
+                }
+            }
+
+            if ($style_str) {
+                $style_str = trim($style_str);
+                $string .= " style=\"$style_str\"";
+            }
+        } else {
+            $string .= " $attr=\"$value\"";
+        }
+    }
+
+    // Some WYSIWYG editors do not like tags like <p > so only add a space if needed.
+    if ($string = trim($string)) {
+        $string = " $string";
+    }
+
+    $r = "<$element$string>";
+    return $r;
 }
 
 /**
@@ -549,8 +549,8 @@ 
  * @return array
  */
 function _elgg_htmlawed_test($hook, $type, $value, $params) {
-	$value[] = Paths::elgg() . 'engine/tests/simpletest/ElggHtmLawedTest.php';
-	return $value;
+    $value[] = Paths::elgg() . 'engine/tests/simpletest/ElggHtmLawedTest.php';
+    return $value;
 }
 
 /**
@@ -565,13 +565,13 @@ 
  */
 function _elgg_disable_password_autocomplete($hook, $type, $return_value, $params) {
 	
-	if (!_elgg_config()->security_disable_password_autocomplete) {
-		return;
-	}
+    if (!_elgg_config()->security_disable_password_autocomplete) {
+        return;
+    }
 	
-	$return_value['autocomplete'] = 'off';
+    $return_value['autocomplete'] = 'off';
 	
-	return $return_value;
+    return $return_value;
 }
 
 /**
@@ -581,19 +581,19 @@ 
  * @access private
  */
 function _elgg_input_init() {
-	// register an endpoint for live search / autocomplete.
-	elgg_register_page_handler('livesearch', 'input_livesearch_page_handler');
+    // register an endpoint for live search / autocomplete.
+    elgg_register_page_handler('livesearch', 'input_livesearch_page_handler');
 
-	elgg_register_plugin_hook_handler('validate', 'input', '_elgg_htmlawed_filter_tags', 1);
+    elgg_register_plugin_hook_handler('validate', 'input', '_elgg_htmlawed_filter_tags', 1);
 
-	elgg_register_plugin_hook_handler('unit_test', 'system', '_elgg_htmlawed_test');
+    elgg_register_plugin_hook_handler('unit_test', 'system', '_elgg_htmlawed_test');
 	
-	elgg_register_plugin_hook_handler('view_vars', 'input/password', '_elgg_disable_password_autocomplete');
+    elgg_register_plugin_hook_handler('view_vars', 'input/password', '_elgg_disable_password_autocomplete');
 }
 
 /**
  * @see \Elgg\Application::loadCore Do not do work here. Just register for events.
  */
 return function(\Elgg\EventsService $events, \Elgg\HooksRegistrationService $hooks) {
-	$events->registerHandler('init', 'system', '_elgg_input_init');
+    $events->registerHandler('init', 'system', '_elgg_input_init');
 };

Spacing +7 added lines, -7 removed lines

@@ -81,10 +81,10 @@ 
 function current_page_url() {
 	$url = parse_url(elgg_get_site_url());
 
-	$page = $url['scheme'] . "://" . $url['host'];
+	$page = $url['scheme']."://".$url['host'];
 
 	if (isset($url['port']) && $url['port']) {
-		$page .= ":" . $url['port'];
+		$page .= ":".$url['port'];
 	}
 
 	$page = trim($page, "/");
@@ -294,7 +294,7 @@ 
 								'input_name' => $input_name,
 							]),
 						];
-						$results[$entity->name . rand(1, 100)] = $result;
+						$results[$entity->name.rand(1, 100)] = $result;
 					}
 				}
 				break;
@@ -341,7 +341,7 @@ 
 							'url' => $entity->getURL(),
 						];
 
-						$results[$entity->name . rand(1, 100)] = $result;
+						$results[$entity->name.rand(1, 100)] = $result;
 					}
 				}
 				break;
@@ -387,7 +387,7 @@ 
 								'input_name' => $input_name,
 							]),
 						];
-						$results[$entity->name . rand(1, 100)] = $result;
+						$results[$entity->name.rand(1, 100)] = $result;
 					}
 				}
 				break;
@@ -493,7 +493,7 @@ 
 		'font-weight', 'font-style', 'border', 'border-top', 'background-color',
 		'border-bottom', 'border-left', 'border-right',
 		'margin', 'margin-top', 'margin-bottom', 'margin-left',
-		'margin-right',	'padding', 'float', 'text-decoration'
+		'margin-right', 'padding', 'float', 'text-decoration'
 	];
 
 	$params = ['tag' => $element];
@@ -549,7 +549,7 @@ 
  * @return array
  */
 function _elgg_htmlawed_test($hook, $type, $value, $params) {
-	$value[] = Paths::elgg() . 'engine/tests/simpletest/ElggHtmLawedTest.php';
+	$value[] = Paths::elgg().'engine/tests/simpletest/ElggHtmLawedTest.php';
 	return $value;
 }
 

engine/lib/access.php

Indentation +85 added lines, -85 removed lines

@@ -44,7 +44,7 @@ 
  * @see elgg_get_ignore_access()
  */
 function elgg_set_ignore_access($ignore = true) {
-	return _elgg_services()->session->setIgnoreAccess($ignore);
+    return _elgg_services()->session->setIgnoreAccess($ignore);
 }
 
 /**
@@ -55,7 +55,7 @@ 
  * @see elgg_set_ignore_access()
  */
 function elgg_get_ignore_access() {
-	return _elgg_services()->session->getIgnoreAccess();
+    return _elgg_services()->session->getIgnoreAccess();
 }
 
 /**
@@ -74,7 +74,7 @@ 
  * @access private
  */
 function get_access_list($user_guid = 0, $ignored = 0, $flush = false) {
-	return _elgg_services()->accessCollections->getAccessList($user_guid, $flush);
+    return _elgg_services()->accessCollections->getAccessList($user_guid, $flush);
 }
 
 /**
@@ -103,7 +103,7 @@ 
  * @return array An array of access collections ids
  */
 function get_access_array($user_guid = 0, $ignored = 0, $flush = false) {
-	return _elgg_services()->accessCollections->getAccessArray($user_guid, $flush);
+    return _elgg_services()->accessCollections->getAccessArray($user_guid, $flush);
 }
 
 /**
@@ -119,26 +119,26 @@ 
  * @return int default access id (see ACCESS defines in elgglib.php)
  */
 function get_default_access(ElggUser $user = null, array $input_params = []) {
-	// site default access
-	$default_access = _elgg_config()->default_access;
-
-	// user default access if enabled
-	if (_elgg_config()->allow_user_default_access) {
-		$user = $user ? $user : _elgg_services()->session->getLoggedInUser();
-		if ($user) {
-			$user_access = $user->getPrivateSetting('elgg_default_access');
-			if ($user_access !== null) {
-				$default_access = $user_access;
-			}
-		}
-	}
-
-	$params = [
-		'user' => $user,
-		'default_access' => $default_access,
-		'input_params' => $input_params,
-	];
-	return _elgg_services()->hooks->trigger('default', 'access', $params, $default_access);
+    // site default access
+    $default_access = _elgg_config()->default_access;
+
+    // user default access if enabled
+    if (_elgg_config()->allow_user_default_access) {
+        $user = $user ? $user : _elgg_services()->session->getLoggedInUser();
+        if ($user) {
+            $user_access = $user->getPrivateSetting('elgg_default_access');
+            if ($user_access !== null) {
+                $default_access = $user_access;
+            }
+        }
+    }
+
+    $params = [
+        'user' => $user,
+        'default_access' => $default_access,
+        'input_params' => $input_params,
+    ];
+    return _elgg_services()->hooks->trigger('default', 'access', $params, $default_access);
 }
 
 /**
@@ -157,10 +157,10 @@ 
  * @return bool
  */
 function access_show_hidden_entities($show_hidden) {
-	global $ENTITY_SHOW_HIDDEN_OVERRIDE;
-	$current_value = $ENTITY_SHOW_HIDDEN_OVERRIDE;
-	$ENTITY_SHOW_HIDDEN_OVERRIDE = $show_hidden;
-	return $current_value;
+    global $ENTITY_SHOW_HIDDEN_OVERRIDE;
+    $current_value = $ENTITY_SHOW_HIDDEN_OVERRIDE;
+    $ENTITY_SHOW_HIDDEN_OVERRIDE = $show_hidden;
+    return $current_value;
 }
 
 /**
@@ -169,8 +169,8 @@ 
  * @return bool
  */
 function access_get_show_hidden_status() {
-	global $ENTITY_SHOW_HIDDEN_OVERRIDE;
-	return $ENTITY_SHOW_HIDDEN_OVERRIDE;
+    global $ENTITY_SHOW_HIDDEN_OVERRIDE;
+    return $ENTITY_SHOW_HIDDEN_OVERRIDE;
 }
 
 /**
@@ -213,7 +213,7 @@ 
  * @access private
  */
 function _elgg_get_access_where_sql(array $options = []) {
-	return _elgg_services()->accessCollections->getWhereSql($options);
+    return _elgg_services()->accessCollections->getWhereSql($options);
 }
 
 /**
@@ -236,7 +236,7 @@ 
  * @return bool
  */
 function has_access_to_entity($entity, $user = null) {
-	return _elgg_services()->accessCollections->hasAccessToEntity($entity, $user);
+    return _elgg_services()->accessCollections->hasAccessToEntity($entity, $user);
 }
 
 /**
@@ -266,7 +266,7 @@ 
  * @return array List of access permissions
  */
 function get_write_access_array($user_guid = 0, $ignored = 0, $flush = false, array $input_params = []) {
-	return _elgg_services()->accessCollections->getWriteAccessArray($user_guid, $flush, $input_params);
+    return _elgg_services()->accessCollections->getWriteAccessArray($user_guid, $flush, $input_params);
 }
 
 /**
@@ -284,7 +284,7 @@ 
  * @return bool
  */
 function can_edit_access_collection($collection_id, $user_guid = null) {
-	return _elgg_services()->accessCollections->canEdit($collection_id, $user_guid);
+    return _elgg_services()->accessCollections->canEdit($collection_id, $user_guid);
 }
 
 /**
@@ -306,7 +306,7 @@ 
  * @see delete_access_collection()
  */
 function create_access_collection($name, $owner_guid = 0) {
-	return _elgg_services()->accessCollections->create($name, $owner_guid);
+    return _elgg_services()->accessCollections->create($name, $owner_guid);
 }
 
 /**
@@ -326,7 +326,7 @@ 
  * @see remove_user_from_access_collection()
  */
 function update_access_collection($collection_id, $members) {
-	return _elgg_services()->accessCollections->update($collection_id, $members);
+    return _elgg_services()->accessCollections->update($collection_id, $members);
 }
 
 /**
@@ -339,7 +339,7 @@ 
  * @see update_access_collection()
  */
 function delete_access_collection($collection_id) {
-	return _elgg_services()->accessCollections->delete($collection_id);
+    return _elgg_services()->accessCollections->delete($collection_id);
 }
 
 /**
@@ -355,7 +355,7 @@ 
  * @return ElggAccessCollection|false
  */
 function get_access_collection($collection_id) {
-	return _elgg_services()->accessCollections->get($collection_id);
+    return _elgg_services()->accessCollections->get($collection_id);
 }
 
 /**
@@ -371,7 +371,7 @@ 
  * @see remove_user_from_access_collection()
  */
 function add_user_to_access_collection($user_guid, $collection_id) {
-	return _elgg_services()->accessCollections->addUser($user_guid, $collection_id);
+    return _elgg_services()->accessCollections->addUser($user_guid, $collection_id);
 }
 
 /**
@@ -387,7 +387,7 @@ 
  * @see remove_user_from_access_collection()
  */
 function remove_user_from_access_collection($user_guid, $collection_id) {
-	return _elgg_services()->accessCollections->removeUser($user_guid, $collection_id);
+    return _elgg_services()->accessCollections->removeUser($user_guid, $collection_id);
 }
 
 /**
@@ -400,7 +400,7 @@ 
  * @return \ElggAccessCollection[]|false
  */
 function get_user_access_collections($owner_guid) {
-	return _elgg_services()->accessCollections->getEntityCollections($owner_guid);
+    return _elgg_services()->accessCollections->getEntityCollections($owner_guid);
 }
 
 /**
@@ -414,21 +414,21 @@ 
  * @see add_user_to_access_collection()
  */
 function get_members_of_access_collection($collection_id, $guids_only = false, array $options = []) {
-	if (!isset($options['limit'])) {
-		$options['limit'] = 0;
-	}
-
-	if (!$guids_only) {
-		return _elgg_services()->accessCollections->getMembers($collection_id, $options);
-	}
-
-	$guids = [];
-	$options['callback'] = false;
-	$rows = _elgg_services()->accessCollections->getMembers($collection_id, $options);
-	foreach ($rows as $row) {
-		$guids[] = $row->guid;
-	}
-	return $guids;
+    if (!isset($options['limit'])) {
+        $options['limit'] = 0;
+    }
+
+    if (!$guids_only) {
+        return _elgg_services()->accessCollections->getMembers($collection_id, $options);
+    }
+
+    $guids = [];
+    $options['callback'] = false;
+    $rows = _elgg_services()->accessCollections->getMembers($collection_id, $options);
+    foreach ($rows as $row) {
+        $guids[] = $row->guid;
+    }
+    return $guids;
 }
 
 /**
@@ -444,25 +444,25 @@ 
  * @since 1.7.0
  */
 function elgg_get_entities_from_access_id(array $options = []) {
-	// restrict the resultset to access collection provided
-	if (!isset($options['access_id'])) {
-		return false;
-	}
-
-	// @todo add support for an array of collection_ids
-	$where = "e.access_id = '{$options['access_id']}'";
-	if (isset($options['wheres'])) {
-		if (is_array($options['wheres'])) {
-			$options['wheres'][] = $where;
-		} else {
-			$options['wheres'] = [$options['wheres'], $where];
-		}
-	} else {
-		$options['wheres'] = [$where];
-	}
-
-	// return entities with the desired options
-	return _elgg_services()->entityTable->getEntities($options);
+    // restrict the resultset to access collection provided
+    if (!isset($options['access_id'])) {
+        return false;
+    }
+
+    // @todo add support for an array of collection_ids
+    $where = "e.access_id = '{$options['access_id']}'";
+    if (isset($options['wheres'])) {
+        if (is_array($options['wheres'])) {
+            $options['wheres'][] = $where;
+        } else {
+            $options['wheres'] = [$options['wheres'], $where];
+        }
+    } else {
+        $options['wheres'] = [$where];
+    }
+
+    // return entities with the desired options
+    return _elgg_services()->entityTable->getEntities($options);
 }
 
 /**
@@ -476,7 +476,7 @@ 
  * @return string
  */
 function elgg_list_entities_from_access_id(array $options = []) {
-	return elgg_list_entities($options, 'elgg_get_entities_from_access_id');
+    return elgg_list_entities($options, 'elgg_get_entities_from_access_id');
 }
 
 /**
@@ -496,7 +496,7 @@ 
  * @since 1.7.0
  */
 function get_readable_access_level($entity_access_id) {
-	return _elgg_services()->accessCollections->getReadableAccessLevel($entity_access_id);
+    return _elgg_services()->accessCollections->getReadableAccessLevel($entity_access_id);
 }
 
 /**
@@ -507,7 +507,7 @@ 
  * @return void
  */
 function access_init() {
-	_elgg_services()->accessCollections->markInitComplete();
+    _elgg_services()->accessCollections->markInitComplete();
 }
 
 /**
@@ -522,18 +522,18 @@ 
  * @access private
  */
 function access_test($hook, $type, $value, $params) {
-	$value[] = Paths::elgg() . 'engine/tests/simpletest/ElggCoreAccessCollectionsTest.php';
-	$value[] = Paths::elgg() . 'engine/tests/simpletest/ElggCoreAccessSQLTest.php';
-	return $value;
+    $value[] = Paths::elgg() . 'engine/tests/simpletest/ElggCoreAccessCollectionsTest.php';
+    $value[] = Paths::elgg() . 'engine/tests/simpletest/ElggCoreAccessSQLTest.php';
+    return $value;
 }
 
 /**
  * @see \Elgg\Application::loadCore Do not do work here. Just register for events.
  */
 return function(\Elgg\EventsService $events, \Elgg\HooksRegistrationService $hooks) {
-	// Tell the access functions the system has booted, plugins are loaded,
-	// and the user is logged in so it can start caching
-	$events->registerHandler('ready', 'system', 'access_init');
+    // Tell the access functions the system has booted, plugins are loaded,
+    // and the user is logged in so it can start caching
+    $events->registerHandler('ready', 'system', 'access_init');
 
-	$hooks->registerHandler('unit_test', 'system', 'access_test');
+    $hooks->registerHandler('unit_test', 'system', 'access_test');
 };

Spacing +2 added lines, -2 removed lines

@@ -522,8 +522,8 @@
  * @access private
  */
 function access_test($hook, $type, $value, $params) {
-	$value[] = Paths::elgg() . 'engine/tests/simpletest/ElggCoreAccessCollectionsTest.php';
-	$value[] = Paths::elgg() . 'engine/tests/simpletest/ElggCoreAccessSQLTest.php';
+	$value[] = Paths::elgg().'engine/tests/simpletest/ElggCoreAccessCollectionsTest.php';
+	$value[] = Paths::elgg().'engine/tests/simpletest/ElggCoreAccessSQLTest.php';
 	return $value;
 }
 

engine/lib/relationships.php

Indentation +18 added lines, -18 removed lines

@@ -16,7 +16,7 @@ 
  * @return \ElggRelationship|false False if not found
  */
 function get_relationship($id) {
-	return _elgg_services()->relationshipsTable->get($id);
+    return _elgg_services()->relationshipsTable->get($id);
 }
 
 /**
@@ -27,7 +27,7 @@ 
  * @return bool
  */
 function delete_relationship($id) {
-	return _elgg_services()->relationshipsTable->delete($id);
+    return _elgg_services()->relationshipsTable->delete($id);
 
 }
 
@@ -45,7 +45,7 @@ 
  * @throws InvalidArgumentException
  */
 function add_entity_relationship($guid_one, $relationship, $guid_two) {
-	return _elgg_services()->relationshipsTable->add($guid_one, $relationship, $guid_two);
+    return _elgg_services()->relationshipsTable->add($guid_one, $relationship, $guid_two);
 }
 
 /**
@@ -60,7 +60,7 @@ 
  * @return \ElggRelationship|false Depending on success
  */
 function check_entity_relationship($guid_one, $relationship, $guid_two) {
-	return _elgg_services()->relationshipsTable->check($guid_one, $relationship, $guid_two);
+    return _elgg_services()->relationshipsTable->check($guid_one, $relationship, $guid_two);
 }
 
 /**
@@ -75,7 +75,7 @@ 
  * @return bool
  */
 function remove_entity_relationship($guid_one, $relationship, $guid_two) {
-	return _elgg_services()->relationshipsTable->remove($guid_one, $relationship, $guid_two);
+    return _elgg_services()->relationshipsTable->remove($guid_one, $relationship, $guid_two);
 }
 
 /**
@@ -90,7 +90,7 @@ 
  * @return true
  */
 function remove_entity_relationships($guid, $relationship = "", $inverse_relationship = false, $type = '') {
-	return _elgg_services()->relationshipsTable->removeAll($guid, $relationship, $inverse_relationship, $type);
+    return _elgg_services()->relationshipsTable->removeAll($guid, $relationship, $inverse_relationship, $type);
 }
 
 /**
@@ -103,7 +103,7 @@ 
  * @return \ElggRelationship[]
  */
 function get_entity_relationships($guid, $inverse_relationship = false) {
-	return _elgg_services()->relationshipsTable->getAll($guid, $inverse_relationship);
+    return _elgg_services()->relationshipsTable->getAll($guid, $inverse_relationship);
 }
 
 /**
@@ -188,7 +188,7 @@ 
  * @since 1.7.0
  */
 function elgg_get_entities_from_relationship($options) {
-	return _elgg_services()->relationshipsTable->getEntities($options);
+    return _elgg_services()->relationshipsTable->getEntities($options);
 }
 
 /**
@@ -207,9 +207,9 @@ 
  * @access private
  */
 function elgg_get_entity_relationship_where_sql($column, $relationship = null,
-		$relationship_guid = null, $inverse_relationship = false) {
-	return _elgg_services()->relationshipsTable->getEntityRelationshipWhereSql(
-		$column, $relationship, $relationship_guid, $inverse_relationship);
+        $relationship_guid = null, $inverse_relationship = false) {
+    return _elgg_services()->relationshipsTable->getEntityRelationshipWhereSql(
+        $column, $relationship, $relationship_guid, $inverse_relationship);
 }
 
 /**
@@ -223,7 +223,7 @@ 
  * @return string The viewable list of entities
  */
 function elgg_list_entities_from_relationship(array $options = []) {
-	return elgg_list_entities($options, 'elgg_get_entities_from_relationship');
+    return elgg_list_entities($options, 'elgg_get_entities_from_relationship');
 }
 
 /**
@@ -237,7 +237,7 @@ 
  * @since 1.8.0
  */
 function elgg_get_entities_from_relationship_count(array $options = []) {
-	return _elgg_services()->relationshipsTable->getEntitiesFromCount($options);
+    return _elgg_services()->relationshipsTable->getEntitiesFromCount($options);
 }
 
 /**
@@ -251,7 +251,7 @@ 
  * @since 1.8.0
  */
 function elgg_list_entities_from_relationship_count($options) {
-	return elgg_list_entities($options, 'elgg_get_entities_from_relationship_count');
+    return elgg_list_entities($options, 'elgg_get_entities_from_relationship_count');
 }
 
 /**
@@ -264,8 +264,8 @@ 
  * @access private
  */
 function _elgg_relationships_test($hook, $type, $tests) {
-	$tests[] = Paths::elgg() . 'engine/tests/simpletest/ElggRelationshipTest.php';
-	return $tests;
+    $tests[] = Paths::elgg() . 'engine/tests/simpletest/ElggRelationshipTest.php';
+    return $tests;
 }
 
 
@@ -274,12 +274,12 @@ 
  * @access private
  */
 function _elgg_relationship_init() {
-	elgg_register_plugin_hook_handler('unit_test', 'system', '_elgg_relationships_test');
+    elgg_register_plugin_hook_handler('unit_test', 'system', '_elgg_relationships_test');
 }
 
 /**
  * @see \Elgg\Application::loadCore Do not do work here. Just register for events.
  */
 return function(\Elgg\EventsService $events, \Elgg\HooksRegistrationService $hooks) {
-	$events->registerHandler('init', 'system', '_elgg_relationship_init');
+    $events->registerHandler('init', 'system', '_elgg_relationship_init');
 };

Spacing +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
  * @access private
  */
 function _elgg_relationships_test($hook, $type, $tests) {
-	$tests[] = Paths::elgg() . 'engine/tests/simpletest/ElggRelationshipTest.php';
+	$tests[] = Paths::elgg().'engine/tests/simpletest/ElggRelationshipTest.php';
 	return $tests;
 }