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

fix download url generation, if request already contains a "?" #3

Merged
merged 1 commit into from
Mar 14, 2013
Merged

fix download url generation, if request already contains a "?" #3

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
10 changes: 8 additions & 2 deletions src/system/modules/metamodelsattribute_file/MetaModelAttributeFile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ protected function parseMetaFile($strPath)
}
$this->arrProcessed[] = $strPath;
}

public function getDownloadLink($strFile) {
$strRequest = Environment::getInstance()->request;
$strRequest .= strpos($strRequest, '?') === false ? '?' : '&';
$strRequest .= 'file=' . urlencode($strFile);
return $strRequest;
}

protected function renderFile($strFile, $objSettings, $strId)
{
Expand Down Expand Up @@ -131,8 +138,7 @@ protected function renderFile($strFile, $objSettings, $strId)
'icon' => $strIcon,
'size' => $objFile->filesize,
'sizetext' => sprintf('(%s)', MetaModelController::getReadableSize($objFile->filesize, 2)),
'url' => Environment::getInstance()->request . (($GLOBALS['TL_CONFIG']['disableAlias'] || !$GLOBALS['TL_CONFIG']['rewriteURL']
&& count($_GET) || strlen($_GET['page'])) ? '&' : '?'). 'file=' . MetaModelController::urlEncode($strFile)
'url' => specialchars($this->getDownloadLink($strFile))
);

// images
Expand Down