chore: improved menu item links to admin sections

Author: jeabakker

classes/ColdTrick/OpenSearch/Menus/AdminHeader.php

@@ -21,10 +21,6 @@ public static function register(\Elgg\Event $event): ?MenuItems {
 			return null;
 		}
 
-		$current_path = parse_url(elgg_get_current_url(), PHP_URL_PATH);
-		$site_path = parse_url(elgg_get_site_url(), PHP_URL_PATH);
-		$parsed_path = substr($current_path, strlen($site_path));
-		
 		/* @var $returnvalue MenuItems */
 		$returnvalue = $event->getValue();
 
@@ -39,40 +35,42 @@ public static function register(\Elgg\Event $event): ?MenuItems {
 		$returnvalue[] = \ElggMenuItem::factory([
 			'name' => 'opensearch:stats',
 			'text' => elgg_echo('admin:opensearch:statistics'),
-			'href' => 'admin/opensearch/statistics',
-			'selected' => stristr($parsed_path, 'admin/opensearch/statistics') !== false,
+			'href' => elgg_generate_url('admin', ['segments' => 'opensearch/statistics']),
 			'parent_name' => 'opensearch',
 		]);
 
 		$returnvalue[] = \ElggMenuItem::factory([
 			'name' => 'opensearch:indices',
 			'text' => elgg_echo('admin:opensearch:indices'),
-			'href' => 'admin/opensearch/indices',
-			'selected' => stristr($parsed_path, 'admin/opensearch/indices') !== false,
+			'href' => elgg_generate_url('admin', ['segments' => 'opensearch/indices']),
 			'parent_name' => 'opensearch',
 		]);
 
 		$returnvalue[] = \ElggMenuItem::factory([
 			'name' => 'opensearch:search',
 			'text' => elgg_echo('admin:opensearch:search'),
-			'href' => 'admin/opensearch/search',
-			'selected' => stristr($parsed_path, 'admin/opensearch/search') !== false,
+			'href' => elgg_generate_url('admin', ['segments' => 'opensearch/search']),
 			'parent_name' => 'opensearch',
 		]);
 
 		$returnvalue[] = \ElggMenuItem::factory([
 			'name' => 'opensearch:settings',
 			'text' => elgg_echo('settings'),
-			'href' => 'admin/plugin_settings/opensearch',
-			'selected' => stristr($parsed_path, 'admin/plugin_settings/opensearch') !== false,
+			'href' => elgg_generate_url('admin:plugin_settings', [
+				'plugin_id' => 'opensearch',
+			]),
 			'parent_name' => 'opensearch',
 		]);
 
 		$returnvalue[] = \ElggMenuItem::factory([
 			'name' => 'opensearch:inspect',
 			'text' => elgg_echo('admin:opensearch:inspect'),
-			'href' => 'admin/opensearch/inspect',
-			'selected' => stristr($parsed_path, 'admin/opensearch/inspect') !== false,
+			'href' => elgg_generate_url('admin', ['segments' => 'opensearch/inspect']),
+			'selected' => elgg_http_url_is_identical(
+				elgg_get_current_url(),
+				elgg_generate_url('admin', ['segments' => 'opensearch/inspect']),
+				['guid']
+			),
 			'parent_name' => 'opensearch',
 		]);
 

classes/ColdTrick/OpenSearch/Menus/Entity.php

@@ -33,7 +33,8 @@ public static function inspect(\Elgg\Event $event): ?MenuItems {
 			'name' => 'opensearch_inspect',
 			'icon' => 'search',
 			'text' => elgg_echo('opensearch:menu:entity:inspect'),
-			'href' => elgg_http_add_url_query_elements('admin/opensearch/inspect', [
+			'href' => elgg_generate_url('admin', [
+				'segments' => 'opensearch/inspect',
 				'guid' => $entity->guid,
 			]),
 		]);

classes/ColdTrick/OpenSearch/Menus/EntityExplorer.php

@@ -29,7 +29,8 @@ public static function inspect(\Elgg\Event $event): ?MenuItems {
 			'name' => 'opensearch_inspect',
 			'icon' => 'search',
 			'text' => elgg_echo('opensearch:menu:entity:inspect'),
-			'href' => elgg_http_add_url_query_elements('admin/opensearch/inspect', [
+			'href' => elgg_generate_url('admin', [
+				'segments' => 'opensearch/inspect',
 				'guid' => $entity->guid,
 			]),
 			'link_class' => ['elgg-button', 'elgg-button-action'],