Skip to content

removing % sign when present in image name #30

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

Open
dtan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

removing % sign when present in image name #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20b53c1
removing % sign when present in image name
dtan Jun 2, 2013
42cd5d7
added "&" to the regexp list
dtan Jun 2, 2013
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
11 changes: 9 additions & 2 deletions content/content.upload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,14 @@ public function moveUploadedFiles()

foreach ($data['file'] as $i => $file) {

if (!$valid = $this->validateUploadedFile($file['tmp_name'], $file['name'], intval($file['error']))) {
// the /[%|&]/ list can be added to as seen fit
// this is done so that image srcs will not choke when trying to be displayed
// since a % sign is a special character for uris.
// just using a urlencode will convert % => %25 which has the same affect as above
// the urlencode will then at least handle spaces and replacing them with a + sign
$encoded_name = urlencode(preg_replace('/[%|&]/', '', $file['name']));

if (!$valid = $this->validateUploadedFile($file['tmp_name'], $encoded_name, intval($file['error']))) {
return $valid;
}

Expand All @@ -135,7 +142,7 @@ public function moveUploadedFiles()
}

try {
$new_file = $unique ? DirectoryTools::getUniqueName($file['name']) : $file['name'];
$new_file = $unique ? DirectoryTools::getUniqueName($encoded_name) : $encoded_name;
} catch (Exception $e) {
$this->handleGeneralError('fatal error: {$err}', array('err' => $e->getMessage()));
return false;
Expand Down