Merge pull request #214 from iMattPro/develop

Update for version 1.6.5

Author: iMattPro

CHANGELOG.md

@@ -1,5 +1,12 @@
 # QuickInstall Changelog
 
+## Version 1.6.5
+- [Feature] Added support for browser interface theme-color, currently used in Safari 15.
+- [Fix] Fixed an issue where refreshing the Settings, Docs or PHP info pages would result in the sidebar not correctly highlighting the current section being viewed.
+- [Fix] Fixed an issue to ensure new versions of QI will load the newest JS and CSS instead of older cached files.
+- [Change] Updated the date-time format for new boards to use phpBB's default format instead of a custom format.
+- [Change] Updated Bootstrap to 5.1.1 and other internal dependencies.
+
 ## Version 1.6.4
 - [Fix] Switched AJAX from `onload` to `loadend` to _hopefully_ prevent potential hangs when creating a board.
 - [Change] Redesigned appearance of the navigation bar for a more streamlined look.
@@ -166,7 +173,7 @@
 - [Fix] Issue #38 Subsilver2 was not installed for 3.1.x boards.
 - [Fix] The "boards" tab was not hidden when there were errors in submitting first/only config.
 - [Fix] QI tried to write to the `settings` folder even if it was not writable.
-- [Fix] The explanation text for the Boards tab was not up to date.
+- [Fix] The explanation text for the Boards tab was not up-to-date.
 - [Fix] Issue #42 the installation note box got more or less unreadable in some screen resolutions.
 - [Fix] "schema.json" was removed in phpBB 3.1.3. QI used it to create the 3.1 DB. Now install of 3.1.x works again.
 - [Fix] Ticket #44 QI removed uppercase letters from directory names due to a missing Hyphen "-".

README.md

@@ -42,12 +42,12 @@ phpBB boards require a web server running PHP and one of the following database
 
 | phpBB          | PHP           | MySQL  | MariaDB | PostgreSQL | SQLite         | MS SQL       |
 | -------------- | ------------- |------- |-------- |----------- |--------------- |------------- |
-| 3.0.x          | 5.4.7 - 5.6.x | 3.23+  | -       | 7.x        | SQLite 2       | Server 2000  |
-| 3.1.x          | 5.4.7 - 5.6.x | 3.23+  | 5.1+    | 8.3+       | SQLite 2 or 3  | Server 2000+ |
-| 3.2.0 - 3.2.1  | 5.4.7 - 7.1.x | 3.23+  | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
-| 3.2.2 - 3.2.x  | 5.4.7 - 7.2.x | 3.23+  | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
-| 3.3.x          | 7.1.3 - 8.x   | 4.1.3+ | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
 | 4.0.x (alpha)  | 7.3.0 - 8.x   | 4.1.3+ | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
+| 3.3.x          | 7.1.3 - 8.x   | 4.1.3+ | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
+| 3.2.2 - 3.2.x  | 5.4.7 - 7.2.x | 3.23+  | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
+| 3.2.0 - 3.2.1  | 5.4.7 - 7.1.x | 3.23+  | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
+| 3.1.x          | 5.4.7 - 5.6.x | 3.23+  | 5.1+    | 8.3+       | SQLite 2 or 3  | Server 2000+ |
+| 3.0.x          | 5.4.7 - 5.6.x | 3.23+  | -       | 7.x        | SQLite 2       | Server 2000  |
 
 ## 🐞 Support
 You can receive support at the [phpBB3 QuickInstall Discussion/Support](https://www.phpbb.com/customise/db/official_tool/phpbb3_quickinstall/support) forum.

composer.json

@@ -2,7 +2,7 @@
   "name": "phpbb/quickinstall",
   "description": "QuickInstall is a developer tool used to create multiple phpBB3 installations.",
   "homepage": "https://www.phpbb.com/customise/db/official_tool/phpbb3_quickinstall",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "license": "GPL-2.0-only",
   "authors": [
     {

composer.lock

@@ -115,7 +115,7 @@ public function force_stability($stability)
 	 * @param string $version2		Second version number
 	 * @param string $operator		Comparison operator (optional)
 	 *
-	 * @return mixed				Boolean (true, false) if comparison operator is specified.
+	 * @return bool|int				Boolean (true, false) if comparison operator is specified.
 	 *								Integer (-1, 0, 1) otherwise.
 	 */
 	public function compare($version1, $version2, $operator = null)

includes/qi_version_helper.php

@@ -131,7 +131,7 @@ public function validate()
 
 		$validation_errors = [];
 
-		// Lets check simple required string settings...
+		// Let's check simple required string settings...
 		foreach (['cache_dir', 'boards_dir', 'boards_url', 'dbms', 'dbhost', 'table_prefix', 'qi_lang', 'qi_tz', 'db_prefix', 'admin_email', 'email_domain', 'site_name', 'server_name', 'server_port', 'board_email', 'default_lang'] as $setting)
 		{
 			if ($this->settings[$setting] === '')
@@ -422,7 +422,7 @@ public function set_settings($data)
 	}
 
 	/**
-	 * Get the boards directory path
+	 * Get the board's directory path
 	 *
 	 * @return string Board directory path from settings, otherwise QI's default
 	 */
@@ -458,7 +458,7 @@ public function get_cache_dir()
 	 */
 	public function get_server_protocol()
 	{
-		//There is no setting for server_protocol ATM, but there might be in the future so let's keep this for now.
+		// There is no setting for server_protocol ATM, but there might be in the future so let's keep this for now.
 		return empty($this->settings['server_protocol']) ? 'http://' : $this->settings['server_protocol'];
 	}
 

includes/settings.php

@@ -87,7 +87,7 @@ public function display($templateFile, $templateExt = 'twig')
 	/**
 	 * Assign a single scalar value to a single key.
 	 *
-	 * Value can be a string, an integer or a boolean.
+	 * Value can be a string, an integer or boolean.
 	 *
 	 * @param string $varname Variable name
 	 * @param string $varval Value to assign to variable

includes/twig.php

@@ -82,7 +82,7 @@
 
 	// The default dateformat which will be used on new installs in this language
 	// Translators should change this if a the usual date format is different
-	'default_dateformat'	=> 'M jS, ’y, H:i', // Mon Jan 01, 2007 1:37 pm
+	'default_dateformat'	=> 'D M d, Y g:i a', // Mon Jan 01, 2007 1:37 pm
 
 	// From phpBB 3.1.2 language/en/common.php
 	// Timezones can be translated. We use this for the Etc/GMT timezones here,

language/en/phpbb.php

@@ -1,6 +1,6 @@
 {
   "name": "quickinstall",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "license": "GPL-2.0-only",
   "dependencies": {
     "autoprefixer": "^10.3.4",
@@ -19,7 +19,7 @@
     "css-compile": "sass scss/qi_bootstrap.scss scss/qi_bootstrap.css",
     "css-prefix": "postcss --use autoprefixer --replace scss/qi_bootstrap.css",
     "css-minify": "cleancss -O1 --format breakWith=lf --with-rebase --source-map --source-map-inline-sources --output scss/qi_bootstrap.min.css scss/qi_bootstrap.css",
-    "copy": "npm-run-all copy-bs-css copy-bs-js copy-bs-icons copy-bs-dark",
+    "copy": "npm-run-all --parallel copy-*",
     "copy-bs-css": "copyfiles --flat scss/qi_bootstrap.min.css scss/qi_bootstrap.min.css.map style/assets/css",
     "copy-bs-js": "copyfiles --flat node_modules/bootstrap/dist/js/bootstrap.min.js node_modules/bootstrap/dist/js/bootstrap.min.js.map style/assets/js",
     "copy-bs-icons": "copyfiles --flat node_modules/bootstrap-icons/bootstrap-icons.svg style/assets/img",