Merge pull request #179 from iMattPro/develop

Mo Problems, Mo Fixes

Author: iMattPro

CHANGELOG.md

@@ -6,12 +6,13 @@
 - [Change] QI's error handling improved. Only one internal error handler now (using trigger_error).
 - [Change] QI's error page will have the same Navbar as the rest of QI, and will work as expected in responsive views.
 - [Change] QI will no longer pass any error messages to the user via URL parameters. Instead, AJAX will be used to handle certain error messages.
-- [Change] QI will no longer display backtraces in minor error notices. Backtraces will only be shown for serious errors and warnings.
+- [Change] QI will no longer display backtraces in warnings or notices. Backtraces will only be shown for errors.
 - [Change] QI's internal language translation system has been updated to support substitution variables.
 - [Change] Moved QI's NPM development files to the project/repository root.
 - [Change] A small batch of optimisations and code improvements.
 - [Fix] Fixed CSS mapping to source files (for development). Maps are no longer embedded in the minified CSS either.
 - [Fix] Minor alignment tweaks to the icons and phpBB board version number badge in the "My Boards" sidebar.
+- [Fix] Fixed failure to load language files from phpBB 4.0.0-a1.
 
 ## Version 1.6.1
 - [Fix] Fixed problems that prevented phpBB 4.0.0-alpha builds from successfully installing.

includes/class_qi.php

@@ -280,19 +280,45 @@ public static function get_lang_select($lang_path, $config_var, $get_var = '')
 				continue;
 			}
 
-			$file = "$lang_path/$lang/iso.txt";
+			$lang_iso = $lang_path . $lang . DIRECTORY_SEPARATOR . 'iso.txt'; // for phpBB 3.x languages
+			$lang_composer = $lang_path . $lang . DIRECTORY_SEPARATOR . 'composer.json'; // for phpBB 4.0 languages
 
-			if (file_exists($file))
+			if (file_exists($lang_iso))
 			{
-				$rows = file($file, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-
-				// Always show the English language name, except for the "active" language.
-				$lang_options[] = [
-					'name' => ($lang === $user_lang) ? $rows[1] : $rows[0],
-					'value' => $lang,
-					'selected' => $lang === $user_lang,
-				];
+				$rows = file($lang_iso, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+				$english_name = $rows[0];
+				$local_name = $rows[1];
+			}
+			else if (file_exists($lang_composer))
+			{
+				global $phpbb_root_path;
+				$language_helper = new \phpbb\language\language_file_helper($phpbb_root_path);
+
+				try
+				{
+					$lang_pack = $language_helper->get_language_data_from_composer_file($lang_composer);
+				}
+				catch (\DomainException $e)
+				{
+					trigger_error('LANGUAGE_PACK_MISSING', E_USER_WARNING);
+				}
+
+				$english_name = $lang_pack['name'];
+				$local_name = $lang_pack['local_name'];
 			}
+			else
+			{
+				// worst case just use the iso name if nothing above worked
+				$local_name = $english_name = $lang;
+			}
+
+			// Always show the English language name, except for the "active" language.
+			$lang_options[] = [
+				'name' => ($lang === $user_lang) ? $local_name : $english_name,
+				'value' => $lang,
+				'selected' => $lang === $user_lang,
+			];
 		}
 
 		return $lang_options;

includes/default_settings.json

@@ -50,5 +50,9 @@
   "num_replies_max": 50,
   "no_dbpasswd": 0,
   "install_styles": 0,
-  "default_style": ""
+  "default_style": "",
+  "drop_db": "0",
+  "delete_files": "0",
+  "debug": "0",
+  "alt_env": ""
 }

language/en/qi.php

@@ -175,6 +175,7 @@
 
 	'JAVASCRIPT_DISABLED_ALERT'	=> '<strong>Javascript is disabled!</strong> Please enable Javascript for full functionality.',
 
+	'LANGUAGE_PACK_MISSING'	=> 'The source phpBB board does not have a valid language pack. Please download a fresh copy of phpBB and try again.',
 	'LOAD'					=> 'Load',
 	'LOG_INSTALL_INSTALLED_QI'	=> '<strong>Installed by phpBB QuickInstall version %s</strong>',
 	'LOREM_IPSUM'			=> 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',

modules/qi_manage.php

@@ -36,6 +36,14 @@ public function __construct()
 			{
 				$current_item = $settings->get_boards_dir() . $item;
 
+				// First get config-file data for the board
+				$cfg_file = $current_item . '/config.' . $phpEx;
+				$dbhost = $dbport = $dbname = $dbuser = $dbpasswd = $dbms = '';
+				if (file_exists($cfg_file))
+				{
+					include $cfg_file;
+				}
+
 				// Attempt to delete the board from filesystem
 				if (!file_exists($current_item) || !is_dir($current_item))
 				{
@@ -58,13 +66,6 @@ public function __construct()
 				}
 
 				// Attempt to delete the database
-				$cfg_file = $current_item . '/config.' . $phpEx;
-				$dbhost = $dbport = $dbname = $dbuser = $dbpasswd = $dbms = '';
-				if (file_exists($cfg_file))
-				{
-					include $cfg_file;
-				}
-
 				if (!empty($dbname) && !empty($dbhost) && !empty($dbms) && empty($error))
 				{
 					$dbms = (strpos($dbms, '\\') !== false) ? substr(strrchr($dbms, '\\'), 1) : $dbms;

modules/qi_settings.php

@@ -19,7 +19,7 @@ class qi_settings
 {
 	public function __construct()
 	{
-		global $settings, $template, $user, $quickinstall_path, $mode, $alt_env, $alt_env_missing;
+		global $settings, $template, $user, $quickinstall_path, $phpbb_root_path, $mode, $alt_env, $alt_env_missing;
 
 		$saved = false;
 		$config_text = '';
@@ -83,7 +83,7 @@ public function __construct()
 			'ALT_ENV'		=> !empty($alt_env) ? $alt_env : false,
 			'PROFILES'		=> $settings->get_profiles(),
 			'QI_LANG'		=> qi::get_lang_select("{$quickinstall_path}language/", 'qi_lang', 'lang'),
-			'PHPBB_LANG'	=> qi::get_lang_select("{$quickinstall_path}sources/phpBB3/language/", 'default_lang'),
+			'PHPBB_LANG'	=> qi::get_lang_select("{$phpbb_root_path}/language/", 'default_lang'),
 
 			'CONFIG_TEXT'   => htmlspecialchars($config_text),