Skip to content
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

Do not append "?" or "&" if no params. #53

Closed
wants to merge 1 commit into from
Closed

Do not append "?" or "&" if no params. #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 30 additions & 7 deletions core/toxidcurl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,12 +368,7 @@ protected function _getRemoteContent($sUrl)
$aResult = array();
$curl_handle = curl_init();

$params = http_build_query($this->additionalUrlParams);
if (false === strpos($sUrl, '?')) {
$sUrl .= "?{$params}";
} else {
$sUrl = rtrim($sUrl, '&') . "&{$params}";
}
$sUrl = $this->_appendAdditionalUrlParams($sUrl);

curl_setopt($curl_handle, CURLOPT_URL, $sUrl);
curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, 1);
Expand All @@ -394,6 +389,30 @@ protected function _getRemoteContent($sUrl)

return $aResult;
}

/**
* Returns the given $sUrl with the appended parameters, if any.
*
* @param $sUrl
*
* @return string
*/
protected function _appendAdditionalUrlParams($sUrl)
{
if (!$this->additionalUrlParams) {
return $sUrl;
}

$params = http_build_query($this->additionalUrlParams);

if (false === strpos($sUrl, '?')) {
$sUrl .= "?{$params}";
} else {
$sUrl = rtrim($sUrl, '&') . "&{$params}";
}

return $sUrl;
}

/**
* rewrites given string URL's, which belongs to typo3 and configured in aToxidCurlSource
Expand Down Expand Up @@ -506,8 +525,12 @@ protected function _getToxidLangUrlParam($iLangId = null, $blReset = false)
if ($iLangId === null) {
$iLangId = oxRegistry::getLang()->getBaseLanguage();
}

if ($param = $this->_aToxidLangUrlParam[$iLangId]) {
return '?' . ltrim($param, '?');
}

return '?' . ltrim($this->_aToxidLangUrlParam[$iLangId], '?');
return '';
}

/**
Expand Down