Merge pull request #264 from iMattPro/updates

Fix mysqli error in PHP 8.1 Plus other updates

Author: iMattPro

CHANGELOG.md

@@ -32,7 +32,7 @@
 ## Version 1.6.3
 - [Fix] Fixed a problem where boards would not populate when using PHP 8.
 - [Fix] Clarified how the option to install additional styles should be used.
-- [Fix] Fixed an issue where “Additional board config settings“ would be ignored if they tried to set a config to a value of 0, false or an empty string.
+- [Fix] Fixed an issue where “Additional board config settings” would be ignored if they tried to set a config to a value of 0, false or an empty string.
 - [Fix] Fixed a few more issues in the code base which could pose problems with future versions of PHP and phpBB.
 - [Change] Small internal change to QI's SCSS file, moved away from using division to avoid issues with SASS 1.33.
 
@@ -64,8 +64,8 @@
 - [Change] Populated users will now have a last active date.
 - [Change] Enforce email domain requirement for populated users.
 - [Change] QI’s TWIG templates can now support language substitution variables.
-- [Change] Moved “Install additional styles” option on main page to the “Install options” sub-section.
-- [Change] Show the admin name and password in their respective fields in the “Install options” sub-section.  
+- [Change] Moved “Install additional styles” option on main page to the “Install options” subsection.
+- [Change] Show the admin name and password in their respective fields in the “Install options” subsection.  
 - [Fix] Fixed potential PHP 8 issues (Issues #157, #160, #162).
 - [Fix] Fixed invalid HTML issues.
 
@@ -285,7 +285,7 @@
 - [Fix] Ticket #63305 `$language` was null when sent as default to request_var.
 - [Fix] Ticket #63306 QI needs to correctly handle an empty qi_config.cfg.
 - [Change] Added checking for functions_mods.php. It will be moved in AutoMOD in the future.
-- [Change] Include functions_admin.php for postgres' benefit.
+- [Change] Include functions_admin.php for postgres benefit.
 - [Change] Use `get_cache_dir()` in sqlite dbal.
 - [Change] Delay database connection until it is necessary.
 - [Change] Cleaned up the JS in the main html file.

README.md

@@ -40,14 +40,14 @@ QuickInstall is designed to run on all modern browsers. Please don't use old stu
 ##### phpBB Requirements
 phpBB boards require a web server running PHP and one of the following database management systems.
 
-| phpBB          | PHP           | MySQL  | MariaDB | PostgreSQL | SQLite         | MS SQL       |
-| -------------- | ------------- |------- |-------- |----------- |--------------- |------------- |
-| 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  |
+| phpBB         | PHP           | MySQL  | MariaDB | PostgreSQL | SQLite         | MS SQL       |
+|---------------|---------------|--------|---------|------------|----------------|--------------|
+| 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.

includes/db/mysqli.php

@@ -26,6 +26,16 @@ class dbal_mysqli_qi extends \phpbb\db\driver\mysqli
 	*/
 	public function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false)
 	{
+		/*
+		 * As of PHP 8.1 MySQLi default error mode is set to MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT
+		 * See https://wiki.php.net/rfc/mysqli_default_errmode
+		 * Since phpBB implements own SQL errors handling, explicitly set it back to MYSQLI_REPORT_OFF
+		 */
+		if (PHP_VERSION_ID >= 80100)
+		{
+			@mysqli_report(MYSQLI_REPORT_OFF);
+		}
+
 		$this->persistency = $persistency;
 		$this->user = $sqluser;
 		$this->server = $sqlserver;
@@ -34,7 +44,7 @@ public function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port
 
 		$this->sql_layer = 'mysql_41';
 
-		// Persistant connections not supported by the mysqli extension?
+		// Persistent connections not supported by the mysqli extension?
 		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, null, $port);
 
 		if ($this->db_connect_id)

includes/qi_populate.php

@@ -649,7 +649,6 @@ private function save_users()
 		$newly_registered_group = (int) array_search('NEWLY_REGISTERED', $user_groups, true);
 
 		$s_chunks = $this->num_users > $this->user_chunks;
-		$end = $this->num_users + 1;
 		$chunk_cnt = 0;
 		$sql_ary = array();
 
@@ -745,6 +744,7 @@ private function save_users()
 
 			$skip--;
 
+			$chunk_cnt++;
 			if ($s_chunks && $chunk_cnt >= $this->user_chunks)
 			{
 				// throw the array to the users table
@@ -754,7 +754,11 @@ private function save_users()
 				$chunk_cnt = 0;
 			}
 		}
-		$db->sql_multi_insert(USER_GROUP_TABLE, $sql_ary);
+		// If there are any remaining users we need to throw them in too.
+		if (!empty($sql_ary))
+		{
+			$db->sql_multi_insert(USER_GROUP_TABLE, $sql_ary);
+		}
 
 		// Get the last user
 		$user = end($this->user_arr);