Merge pull request #274 from iMattPro/updates

Update phpbb4 issues

Author: iMattPro

README.md

@@ -40,14 +40,15 @@ 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.0 (alpha)  | 8.1+          | 4.1.3+ | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
+| 3.3.11 - 3.3.x | 7.2.0 - 8.x   | 4.1.3+ | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
+| 3.3.0 - 3.3.10 | 7.1.3 - 8.x   | 4.1.3+ | 5.1+    | 8.3+       | SQLite 3.6.15+ | Server 2000+ |
+| 3.2.2 - 3.2.11 | 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/qi_file.php

@@ -51,12 +51,9 @@ public static function copy_dir($src_dir, $dst_dir)
 		self::append_slash($src_dir);
 		self::append_slash($dst_dir);
 
-		if (!is_dir($dst_dir))
+		if (!is_dir($dst_dir) && !mkdir($dst_dir) && !is_dir($dst_dir))
 		{
-			if (!mkdir($dst_dir) && !is_dir($dst_dir))
-			{
-				throw new \RuntimeException('COPY_DIR_ERROR');
-			}
+			throw new RuntimeException('COPY_DIR_ERROR');
 		}
 
 		foreach (scandir($src_dir) as $file)

includes/qi_functions.php

@@ -278,14 +278,20 @@ function legacy_request_var($var_name, $default, $multibyte = false, $cookie = f
 	}
 	else
 	{
-		list($key_type, $type) = each($default);
+		// Get first key and value
+		$key_type = key($default);
+		$type = current($default);
 		$type = gettype($type);
 		$key_type = gettype($key_type);
+
 		if ($type === 'array')
 		{
 			reset($default);
 			$default = current($default);
-			list($sub_key_type, $sub_type) = each($default);
+
+			// Get first key and value of the nested array
+			$sub_key_type = key($default);
+			$sub_type = current($default);
 			$sub_type = gettype($sub_type);
 			$sub_type = ($sub_type === 'array') ? 'NULL' : $sub_type;
 			$sub_key_type = gettype($sub_key_type);

modules/qi_create.php

@@ -855,7 +855,12 @@ public function run()
 
 		// add log entry :D
 		$user->ip = &$user_ip;
-		if (defined('PHPBB_31'))
+		if (defined('PHPBB_40'))
+		{
+			global $phpbb_log;
+			$phpbb_log->add('admin', 2, $user->ip, qi::lang('LOG_INSTALL_INSTALLED_QI', qi::current_version()));
+		}
+		else if (defined('PHPBB_31'))
 		{
 			add_log('admin', qi::lang('LOG_INSTALL_INSTALLED_QI', qi::current_version()));
 		}