Merge pull request #175 from iMattPro/develop

Strengthen version acquisition + more fixes

Author: iMattPro

includes/qi_functions.php

@@ -469,7 +469,7 @@ function get_alternative_env($selected_option = '')
  */
 function get_installed_boards()
 {
-	global $settings, $template, $phpEx;
+	global $settings, $template;
 
 	// list of boards
 	$boards_dir = $settings->get_boards_dir();
@@ -483,32 +483,45 @@ function get_installed_boards()
 			continue;
 		}
 
-		$version = '';
-		// Try to find out phpBB version.
-		if (file_exists("{$boards_dir}$board/includes/constants.$phpEx"))
-		{
-			$rows = file("{$boards_dir}$board/includes/constants.$phpEx", FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-
-			foreach ($rows as $row)
-			{
-				if (($pos = strpos($row, "'PHPBB_VERSION', '")) !== false)
-				{
-					$pos += 18;
-					$version = substr($row, $pos, -3);
-					break;
-				}
-			}
-			unset($rows);
-		}
-
 		$template->assign_block_vars('board_row', array(
 			'BOARD_NAME'	=> htmlspecialchars($board),
 			'BOARD_URL'		=> $settings->get_boards_url() . urlencode($board),
-			'VERSION'		=> $version,
+			'VERSION'		=> get_phpbb_version($boards_dir . $board),
 		));
 	}
 }
 
+/**
+ * Returns the version of a phpBB board (acquired from its constant.php file)
+ *
+ * @param string $board_path Path to a phpbb board root directory
+ * @return string A phpbb version, e.g.: '3.3.0'
+ */
+function get_phpbb_version($board_path)
+{
+	global $phpEx;
+
+	$version = '';
+	// Try to find out phpBB version.
+	if (file_exists("$board_path/includes/constants.$phpEx"))
+	{
+		$rows = file("$board_path/includes/constants.$phpEx", FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
+
+		foreach ($rows as $row)
+		{
+			if (strpos($row, 'PHPBB_VERSION') !== false)
+			{
+				preg_match("/'PHPBB_VERSION', '(.*)'/", $row, $matches);
+				$version = isset($matches[1]) ? $matches[1] : '';
+				break;
+			}
+		}
+		unset($rows);
+	}
+
+	return $version;
+}
+
 function db_connect($db_data = '')
 {
 	global $phpbb_root_path, $phpEx, $sql_db, $db, $quickinstall_path, $settings;

index.php

@@ -115,6 +115,8 @@
 	}
 }
 
+$phpbb_version = get_phpbb_version($phpbb_root_path);
+
 if (file_exists($phpbb_root_path . 'phpbb/class_loader.' . $phpEx))
 {
 	define('PHPBB_31', true);
@@ -126,20 +128,20 @@
 	require($phpbb_root_path . 'vendor/autoload.' . $phpEx);
 }
 
-if (!file_exists($phpbb_root_path . 'includes/functions_install.' . $phpEx))
+if (!file_exists($phpbb_root_path . 'includes/functions_install.' . $phpEx) || version_compare($phpbb_version, '3.2', '>='))
 {
 	define('PHPBB_32', true);
 }
 
-if (file_exists($phpbb_root_path . 'vendor-ext'))
+if (file_exists($phpbb_root_path . 'vendor-ext') || version_compare($phpbb_version, '4.0', '>='))
 {
 	define('PHPBB_40', true);
 }
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
-if (!function_exists('phpbb_email_hash'))
+if (!function_exists('phpbb_email_hash') || version_compare($phpbb_version, '3.3', '>='))
 {
 	define('PHPBB_33', true);
 }

style/sidebar_boards.twig

@@ -6,7 +6,7 @@
 				<form id="del_board" method="post" action="{{ U_MANAGE }}">
 		{% endif %}
 				<div class="list-group-item py-2 px-0 bg-transparent border-end-0 border-start-0">
-					<div class="d-flex w-100 align-items-center justify-content-between">
+					<div class="d-flex w-100 justify-content-between">
 						<div class="form-check form-switch m-1 overflow-hidden">
 							<input type="checkbox" class="form-check-input" data-qi-mark id="del_board_{{ loop.index }}" name="select[]" value="{{ board.BOARD_NAME }}" title="{{ lang('MARK_FOR_DELETION') }}">
 							<label class="form-check-label fw-strong" for="del_board_{{ loop.index }}"><a href="{{ board.BOARD_URL }}" title="{{ lang('GOTO_BOARD', board.BOARD_NAME) }}">{{ board.BOARD_NAME }}</a></label>