diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-24 15:52:30 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-24 15:52:30 +0200 |
| commit | 5a3d6805a2613c4f55daa971e112cc77f17b060f (patch) | |
| tree | 38e17165b616821ac5c42ae3adb1fb7042b72e4e /apps/files/ajax/delete.php | |
| parent | 7b150dfa963d81889b8d40bf3956795c9a712aec (diff) | |
| download | nextcloud-server-5a3d6805a2613c4f55daa971e112cc77f17b060f.tar.gz nextcloud-server-5a3d6805a2613c4f55daa971e112cc77f17b060f.zip | |
cleanup OC_Files a bit
Diffstat (limited to 'apps/files/ajax/delete.php')
| -rw-r--r-- | apps/files/ajax/delete.php | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index 57c8c15c197..ae6158a05aa 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -12,17 +12,22 @@ $files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_P $files = explode(';', $files); $filesWithError = ''; -$success = true; -//Now delete -foreach($files as $file) { - if( !OC_Files::delete( $dir, $file )) { - $filesWithError .= $file . "\n"; - $success = false; +if (OC_User::isLoggedIn()) { + $success = true; + + //Now delete + foreach ($files as $file) { + if ($dir != '' || $file != 'Shared' && !\OC\Files\Filesystem::unlink($dir . '/' . $file)) { + $filesWithError .= $file . "\n"; + $success = false; + } } +} else { + $success = false; } -if($success) { - OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $files ))); +if ($success) { + OCP\JSON::success(array("data" => array("dir" => $dir, "files" => $files))); } else { - OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError ))); + OCP\JSON::error(array("data" => array("message" => "Could not delete:\n" . $filesWithError))); } |