HiPoweredDev
/
CheeseCake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into prod

This commit is contained in:
Brandon Shipley 2025-03-29 03:05:34 -07:00
parent e868cfeaf4 4dcdf2b1cf
commit d2b733bd0e
Signed by: bmfs
GPG Key ID: 14E38571D8BB0DE4
1 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/View/Helper/ActiveLinkHelper.php
View File

@ -47,35 +47,35 @@ class ActiveLinkHelper extends Helper
$target = $options['target'];
unset($options['target']);
if (is_string($target)) {
if (Router::normalize($currentUrl) == Router::normalize($target)) {
$options['class'] = $this->_addClass($options);
return $this->Html->link($title, $url, $options);
}
return $this->_linkFromStringTarget($currentUrl, $target, $title, $url, $options);
}
if (is_array($target)) {
if (!array_key_exists('plugin', $currentUrl)) {
$currentUrl['plugin'] = false;
}
if (!array_key_exists('prefix', $currentUrl)) {
$currentUrl['prefix'] = false;
}
foreach ($target as $targetKey => $targetValue) {
if (is_array($targetValue)) {
if (!in_array($currentUrl[$targetKey], $targetValue)) {
return $this->Html->link($title, $url, $options);
}
if (!is_array($target)) {
return $this->Html->link($title, $url, $options);
}
if (!array_key_exists('plugin', $currentUrl)) {
$currentUrl['plugin'] = false;
}
if (!array_key_exists('prefix', $currentUrl)) {
$currentUrl['prefix'] = false;
}
if (isset($target['or']) && $target['or']) {
foreach ($target['or'] as $singleTargetToMatch) {
if ($this->_matchesUrlFromArrayTarget($currentUrl, $singleTargetToMatch)) {
$options['class'] = $this->_addClass($options);
return $this->Html->link($title, $url, $options);
}
if (!array_key_exists($targetKey, $currentUrl) || $targetValue != $currentUrl[$targetKey]) {
return $this->Html->link($title, $url, $options);
}
}
$options['class'] = $this->_addClass($options);
return $this->Html->link($title, $url, $options);
}
if (!$this->_matchesUrlFromArrayTarget($currentUrl, $target)) {
return $this->Html->link($title, $url, $options);
}
$options['class'] = $this->_addClass($options);
return $this->Html->link($title, $url, $options);
}
@ -90,4 +90,33 @@ class ActiveLinkHelper extends Helper
return array_key_exists('class', $providedOptions) ? $providedOptions['class'] . ' ' . $activeClass : $activeClass;
}
protected function _linkFromStringTarget(array $current, string $targetString, string $title, array|string|null $url, array $options)
{
if (Router::normalize($current) == Router::normalize($targetString)) {
$options['class'] = $this->_addClass($options);
return $this->Html->link($title, $url, $options);
}
return $this->Html->link($title, $url, $options);
}
protected function _matchesUrlFromArrayTarget(array $current, array $targetUrl)
{
foreach ($targetUrl as $targetKey => $targetValue) {
if (is_array($targetValue)) {
if (!in_array($current[$targetKey], $targetValue)) {
return false;
}
continue;
}
if (!array_key_exists($targetKey, $current) || $targetValue != $current[$targetKey]) {
return false;
}
}
return true;
}
}