thedevstack/httpupload
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

php end tags added, rawurlencode optimized

Browse source
This commit is contained in:
steckbrief 2016-02-05 14:13:19 +01:00
commit 7f77bd3087
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
storage-backend/index.php
View file

@ -44,7 +44,7 @@ switch ($method) {
// parse post parameters
// check if all parameters are present - return 400 (bad request) if a parameter is missing / empty
$xmppServerKey = getMandatoryPostParameter('xmpp_server_key');
$filename = getMandatoryPostParameter('filename');
$filename = rawurlencode(getMandatoryPostParameter('filename'));
$filesize = getMandatoryPostParameter('size');
$type = getOptionalPostParameter('content_type');
$userJid = getMandatoryPostParameter('user_jid');
@ -128,13 +128,13 @@ function checkXmppServerKey($validXmppServerKeys, $xmppServerKey) {
}
function checkFilenameParameter($filename, $slotParameters) {
$filename = rawurldecode($filename); // the filename is a http get parameter and therefore encoded
$filename = $filename; // the filename is a http get parameter and therefore encoded
return $slotParameters['filename'] == $filename;
}
function loadSlotParameters($slotUUID, $config) {
$slotParameters = require(getSlotFilePath($slotUUID, $config));
$slotParameters['filename'] = rawurldecode($slotParameters['filename']);
$slotParameters['filename'] = $slotParameters['filename'];
return $slotParameters;
}
@ -180,8 +180,8 @@ function getFilenameFromUri($uri) {
function registerSlot($slotUUID, $filename, $filesize, $contentType, $userJid, $config) {
$contents = "<?php\n/*\n * This is an autogenerated file - do not edit\n */\n\n";
$contents .= 'return [\'filename\' => \''.rawurlencode($filename).'\', \'filesize\' => \''.$filesize.'\', ';
$contents .= '\'content_type\' => \''.$contentType.'\', \'user_jid\' => \''.$userJid.'\'];';
$contents .= 'return [\'filename\' => \''.$filename.'\', \'filesize\' => \''.$filesize.'\', ';
$contents .= '\'content_type\' => \''.$contentType.'\', \'user_jid\' => \''.$userJid.'\'];\n?>';
if (!file_put_contents(getSlotFilePath($slotUUID, $config), $contents)) {
sendHttpReturnCodeAndMessage(500, "Could not create slot registry entry.");
}
@ -250,3 +250,4 @@ function generate_uuid() {
mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
);
}
?>