summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-07-01 15:37:52 +0200
committerRobin Appelman <icewind@owncloud.com>2013-07-01 15:37:52 +0200
commite55ed10b0dc2265d5ee4552c493c0ad619675a9f (patch)
tree26ffd7bbc87ad6b7c868b424a9b25b097c62e7f2 /apps/files
parent8beec2015a43839818f9b6f14283b8980ec185b3 (diff)
downloadnextcloud-server-e55ed10b0dc2265d5ee4552c493c0ad619675a9f.tar.gz
nextcloud-server-e55ed10b0dc2265d5ee4552c493c0ad619675a9f.zip
code style
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/ajax/upload.php68
1 files changed, 34 insertions, 34 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 12db682c1e2..6fdab0e9a9f 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -9,39 +9,39 @@ OCP\JSON::setContentTypeHeader('text/plain');
$l = OC_L10N::get('files');
if (!$_POST['dirToken']) {
- // The standard case, files are uploaded through logged in users :)
- OCP\JSON::checkLoggedIn();
- $dir = isset($_POST['dir']) ? $_POST['dir'] : "";
- if (!$dir || empty($dir) || $dir === false) {
- OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
- die();
- }
+ // The standard case, files are uploaded through logged in users :)
+ OCP\JSON::checkLoggedIn();
+ $dir = isset($_POST['dir']) ? $_POST['dir'] : "";
+ if (!$dir || empty($dir) || $dir === false) {
+ OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
+ die();
+ }
} else {
- $linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
-
- if ($linkItem === false) {
- OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
- die();
- }
-
- if (!($linkItem['permissions'] & OCP\PERMISSION_CREATE)) {
- OCP\JSON::checkLoggedIn();
- } else {
-
- // The token defines the target directory (security reasons)
- $dir = sprintf(
- "/%s/%s",
- $linkItem['file_target'],
- isset($_POST['subdir']) ? $_POST['subdir'] : ''
- );
-
- if (!$dir || empty($dir) || $dir === false) {
- OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
- die();
- }
- // Setup FS with owner
- OC_Util::setupFS($linkItem['uid_owner']);
- }
+ $linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
+
+ if ($linkItem === false) {
+ OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
+ die();
+ }
+
+ if (!($linkItem['permissions'] & OCP\PERMISSION_CREATE)) {
+ OCP\JSON::checkLoggedIn();
+ } else {
+
+ // The token defines the target directory (security reasons)
+ $dir = sprintf(
+ "/%s/%s",
+ $linkItem['file_target'],
+ isset($_POST['subdir']) ? $_POST['subdir'] : ''
+ );
+
+ if (!$dir || empty($dir) || $dir === false) {
+ OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
+ die();
+ }
+ // Setup FS with owner
+ OC_Util::setupFS($linkItem['uid_owner']);
+ }
}
@@ -61,7 +61,7 @@ foreach ($_FILES['files']['error'] as $error) {
$errors = array(
UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'),
UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ')
- . ini_get('upload_max_filesize'),
+ . ini_get('upload_max_filesize'),
UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'),
UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'),
@@ -107,7 +107,7 @@ if (strpos($dir, '..') === false) {
'size' => $meta['size'],
'id' => $meta['fileid'],
'name' => basename($target),
- 'originalname'=>$files['name'][$i],
+ 'originalname' => $files['name'][$i],
'uploadMaxFilesize' => $maxUploadFilesize,
'maxHumanFilesize' => $maxHumanFilesize
);