summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-01-20 12:24:13 +0100
committerLukas Reschke <lukas@owncloud.com>2015-01-20 12:24:13 +0100
commite25a0303f4eeda88fd7d8b76ee3d41a6081dfb74 (patch)
tree4b9f56705c5a73f5868287d5f9f8e3a77f5a8ea2 /apps/files
parent2ac015256fda60f684952131f220cd3db5a616ba (diff)
downloadnextcloud-server-e25a0303f4eeda88fd7d8b76ee3d41a6081dfb74.tar.gz
nextcloud-server-e25a0303f4eeda88fd7d8b76ee3d41a6081dfb74.zip
Streamline CSRF and login check
Let's make this consistent with other pieces of the code to make it easier to auditable.
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/ajax/newfile.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 0eb144aca56..159a8b5d7a3 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -3,9 +3,8 @@
// Init owncloud
global $eventSource;
-if(!OC_User::isLoggedIn()) {
- exit;
-}
+\OCP\JSON::checkLoggedIn();
+\OCP\JSON::callCheck();
\OC::$server->getSession()->close();
@@ -17,8 +16,6 @@ $source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : '';
if($source) {
$eventSource = \OC::$server->createEventSource();
-} else {
- OC_JSON::callCheck();
}
function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
@@ -138,7 +135,7 @@ if($source) {
}
}
}
- $result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream);
+ $result = \OC\Files\Filesystem::file_put_contents($target, $sourceStream);
}
if($result) {
$meta = \OC\Files\Filesystem::getFileInfo($target);