Skip to content

Fix 20.0 Action buttion url autocomplete (button dropdown part04) #31266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eldy merged 6 commits into from
Oct 7, 2024
Merged

Fix 20.0 Action buttion url autocomplete (button dropdown part04) #31266

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d8085a
Fix dol get action buttion url autocomplette
thersane-john Oct 4, 2024
b631646
change mailto
thersane-john Oct 4, 2024
2a9dd94
change mailto
thersane-john Oct 4, 2024
31dc249
Remove anonymous function
thersane-john Oct 7, 2024
dc7f01d
Remove anonymous function
thersane-john Oct 7, 2024
1f64ba4
Update functions.lib.php
eldy Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove anonymous function
  • Loading branch information
@thersane-john
thersane-john committed Oct 7, 2024
commit 31dc249f33ec21a44dd9a7ac976172570b9e7dc7
72 changes: 37 additions & 35 deletions htdocs/core/lib/functions.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12293,39 +12293,6 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =

// If $url is an array, we must build a dropdown button or recursively iterate over each value
if (is_array($url)) {

/**
* An anonymous function to complete dropdown url
* @param string $url
* @return string
*/
$completeUrl = function ($url, $addDolUrlRoot = true) use ($params) {
if (empty($url)) {
return '';
}

$parsedUrl = parse_url($url);
if ((isset($parsedUrl['scheme']) && in_array($parsedUrl['scheme'], ['javascript', 'mailto', 'tel'])) || strpos($url, '#') === 0) {
return $url;
}

if (!empty($parsedUrl['query'])) {
// Use parse_str() function to parse the string passed via URL
parse_str($parsedUrl['query'], $urlQuery);
if (!isset($urlQuery['backtopage']) && isset($params['backtopage'])) {
$url.= '&backtopage='.urlencode($params['backtopage']);
}
}

if (!isset($parsedUrl['scheme']) && $addDolUrlRoot) {
$url = DOL_URL_ROOT.$url;
}

return $url;
};



// Loop on $url array to remove entries of disabled modules
foreach ($url as $key => $subbutton) {
if (isset($subbutton['enabled']) && empty($subbutton['enabled'])) {
Expand Down Expand Up @@ -12366,7 +12333,7 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =
$tmpurl = $subbutton['urlraw']; // Use raw url, no url completion, use only what developer send
} else {
$tmpurl = !empty($subbutton['urlroot']) ? $subbutton['urlroot'] : $subbutton['url'];
$tmpurl = $completeUrl($tmpurl, empty($subbutton['urlroot']));
$tmpurl = dolCompletUrlForDropdownButton($tmpurl, $params, empty($subbutton['urlroot']));
}

$subbuttonparam = array();
Expand All @@ -12389,7 +12356,7 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =
$tmpurl = $subbutton['urlraw']; // Use raw url, no url completion, use only what developer send
} else {
$tmpurl = !empty($subbutton['urlroot']) ? $subbutton['urlroot'] : $subbutton['url'];
$tmpurl = $completeUrl($tmpurl, empty($subbutton['urlroot']));
$tmpurl = dolCompletUrlForDropdownButton($tmpurl, $params, empty($subbutton['urlroot']));
}

$out .= dolGetButtonAction('', $langs->trans($subbutton['label']), 'default', $tmpurl, '', $subbutton['perm'], $params);
Expand Down Expand Up @@ -12524,6 +12491,41 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =
}
}


/**
* An function to complete dropdown url in dolGetButtonAction
* @param string $url the Url to complete
* @param array $params params of dolGetButtonAction function
* @param bool $addDolUrlRoot to add root url
* @return string
*/
function dolCompletUrlForDropdownButton(string $url, array $params, bool $addDolUrlRoot = true)
{
if (empty($url)) {
return '';
}

$parsedUrl = parse_url($url);
if ((isset($parsedUrl['scheme']) && in_array($parsedUrl['scheme'], ['javascript', 'mailto', 'tel'])) || strpos($url, '#') === 0) {
return $url;
}

if (!empty($parsedUrl['query'])) {
// Use parse_str() function to parse the string passed via URL
parse_str($parsedUrl['query'], $urlQuery);
if (!isset($urlQuery['backtopage']) && isset($params['backtopage'])) {
$url.= '&backtopage='.urlencode($params['backtopage']);
}
}

if (!isset($parsedUrl['scheme']) && $addDolUrlRoot) {
$url = DOL_URL_ROOT.$url;
}

return $url;
}


/**
* Add space between dolGetButtonTitle
*
Expand Down