From b3b73deef4b53a7b9f51b84077bf99c01d1655eb Mon Sep 17 00:00:00 2001
From: Harald Wolff-Thobaben <harald@l--n.de>
Date: Wed, 17 Nov 2021 13:21:22 +0100
Subject: [PATCH] Fix menu link targets

---
 html/mod_menu/collapse-default.php |  6 ++++--
 html/mod_menu/item-heading.php     |  2 +-
 html/mod_menu/item-url.php         |  8 +++++++-
 html/mod_menu/item.php             | 25 +++++++++++++++++++++----
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/html/mod_menu/collapse-default.php b/html/mod_menu/collapse-default.php
index 9a36a24..c7c4f58 100644
--- a/html/mod_menu/collapse-default.php
+++ b/html/mod_menu/collapse-default.php
@@ -14,13 +14,15 @@ use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
 
+
 $id = '';
 if ($tagId = $params->get('tag_id', ''))
 {
     $id = ' id="' . $tagId . '"';
 }
 
-?><nav class="navbar navbar-expand-lg">
+?>
+<nav class="navbar navbar-expand-lg">
     <div class="container-fluid float-end float-sm-none">
         <button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbar<?php echo $module->id; ?>" aria-controls="navbar<?php echo $module->id; ?>" aria-expanded="false" aria-label="<?php echo Text::_('MOD_MENU_TOGGLE'); ?>">
             <span class="bi-list fs-2" aria-hidden="true"></span>
@@ -29,7 +31,7 @@ if ($tagId = $params->get('tag_id', ''))
             <ul<?php echo $id; ?> class="navbar-nav me-auto <?php echo $class_sfx; ?>">
                 <?php foreach ($list as $i => &$item)
                 {
-                    if (count($item->tree) == 1) {
+                    if ($item->level == $params['startLevel']) {
                         require ModuleHelper::getLayoutPath('mod_menu', 'item');
                     }
                 }
diff --git a/html/mod_menu/item-heading.php b/html/mod_menu/item-heading.php
index 9e0407f..79c0b45 100644
--- a/html/mod_menu/item-heading.php
+++ b/html/mod_menu/item-heading.php
@@ -1 +1 @@
-<a id="mi-<?=$item->id;?>" class="<?=$mi_class;?>" <?=$aattributes;?> data-bs-toggle="dropdown" aria-expanded="false"><?=$item->title;?></a>
\ No newline at end of file
+<a id="mi-<?=$item->id;?>" class="<?=$mi_class;?>" <?=$aattributes;?><?php if ($hasChildren): ?> data-bs-toggle="dropdown" aria-expanded="false"<?php endif; ?>><?=$item->title;?></a>
\ No newline at end of file
diff --git a/html/mod_menu/item-url.php b/html/mod_menu/item-url.php
index 75820cf..56b1cd4 100644
--- a/html/mod_menu/item-url.php
+++ b/html/mod_menu/item-url.php
@@ -1 +1,7 @@
-<?php if ($hasChildren): ?><span id="mi-<?=$item->id;?>" class="<?=$mi_class;?>" <?=$aattributes;?> data-bs-toggle="dropdown" aria-expanded="false"><?php endif; ?><a class="nav-link d-inline" href="<?=$item->flink;?>"><?=$item->title;?></a><?php if ($hasChildren): ?></span><?php endif; ?>
\ No newline at end of file
+<?php if ($hasChildren): ?><span id="mi-<?=$item->id;?>" class="<?=$mi_class;?>" data-bs-toggle="dropdown" aria-expanded="false"><?php endif;?>
+    <a class="nav-link" href="<?=$item->flink;?>"<?php
+    foreach ($attributes as $name => &$value){
+        echo ' ' . $name . '="' . $value. '"';
+    }
+    ?>><?=$item->title;?></a>
+<?php if ($hasChildren): ?></span><?php endif; ?>
\ No newline at end of file
diff --git a/html/mod_menu/item.php b/html/mod_menu/item.php
index d16194f..5442d70 100644
--- a/html/mod_menu/item.php
+++ b/html/mod_menu/item.php
@@ -2,13 +2,13 @@
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 
-    $hasChildren = $item->hasChildren();
+    $hasChildren = $item->hasChildren() && ($item->level < $params['endLevel']);
     $hasParent   = $item->hasParent();
 
     $itemParams = $item->getParams();
     $class      = 'item-' . $item->id;
     $mi_class     = 'nav-link';
-    $aattributes = '';
+    $attributes = array();
 
     if ($hasParent)
     {
@@ -22,7 +22,7 @@ use Joomla\CMS\HTML\HTMLHelper;
     {
         $class .= " dropdown";
         $mi_class .= " dropdown-toggle";
-        $aattributes .= ' role="button"';
+        $attributes["role"] = 'button';
     }
     if ($item->type === 'separator')
     {
@@ -38,6 +38,23 @@ use Joomla\CMS\HTML\HTMLHelper;
         $class .= ' current';
     }
 
+    if ($item->browserNav == 1)
+    {
+        $attributes['target'] = '_blank';
+        $attributes['rel'] = 'noopener noreferrer';
+
+        if ($item->anchor_rel == 'nofollow')
+        {
+            $attributes['rel'] .= ' nofollow';
+        }
+    }
+    elseif ($item->browserNav == 2)
+    {
+        $options = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,' . $params->get('window_open');
+
+        $attributes['onclick'] = "window.open(this.href, 'targetWindow', '" . $options . "'); return false;";
+    }
+
     echo '<li class="' . $class . '">';
 
     switch ($item->type) :
@@ -55,7 +72,7 @@ use Joomla\CMS\HTML\HTMLHelper;
             break;
     endswitch;
 
-    if ($item->hasChildren())
+    if ($hasChildren)
     {
         echo '<ul class="dropdown-menu" aria-labelledby="mi-'.$item->id.'">';