]> source.dussan.org Git - nextcloud-server.git/commitdiff
use more accurate error codes
authorBjoern Schiessle <schiessle@owncloud.com>
Tue, 28 Jan 2014 10:25:12 +0000 (11:25 +0100)
committerBjoern Schiessle <schiessle@owncloud.com>
Tue, 28 Jan 2014 15:47:33 +0000 (16:47 +0100)
apps/files_sharing/lib/api.php

index 1bd0003ce075cc260af2ae058b8b600d03527c75..b3016749564594ad60229777ccd11ef9831324fd 100644 (file)
@@ -162,7 +162,7 @@ class Api {
                $view = new \OC\Files\View('/'.\OCP\User::getUser().'/files');
 
                if(!$view->is_dir($path)) {
-                       return new \OC_OCS_Result(null, 404, "not a directory");
+                       return new \OC_OCS_Result(null, 400, "not a directory");
                }
 
                $content = $view->getDirectoryContent($path);
@@ -223,7 +223,7 @@ class Api {
                                $encryptionEnabled = \OC_App::isEnabled('files_encryption');
                                if(isset($_POST['publicUpload']) &&
                                                ($encryptionEnabled || $publicUploadEnabled !== 'yes')) {
-                                       return new \OC_OCS_Result(null, 404, "public upload disabled by the administrator");
+                                       return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator");
                                }
                                $publicUpload = isset($_POST['publicUpload']) ? $_POST['publicUpload'] : 'false';
                                // read, create, update (7) if public upload is enabled or
@@ -231,7 +231,7 @@ class Api {
                                $permissions = $publicUpload === 'true' ? 7 : 1;
                                break;
                        default:
-                               return new \OC_OCS_Result(null, 404, "unknown share type");
+                               return new \OC_OCS_Result(null, 400, "unknown share type");
                }
 
                try     {
@@ -243,7 +243,7 @@ class Api {
                                        $permissions
                                        );
                } catch (\Exception $e) {
-                       return new \OC_OCS_Result(null, 404, $e->getMessage());
+                       return new \OC_OCS_Result(null, 403, $e->getMessage());
                }
 
                if ($token) {
@@ -365,7 +365,7 @@ class Api {
                $publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
                $encryptionEnabled = \OC_App::isEnabled('files_encryption');
                if($encryptionEnabled || $publicUploadEnabled !== 'yes') {
-                       return new \OC_OCS_Result(null, 404, "public upload disabled by the administrator");
+                       return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator");
                }
 
                if ($share['item_type'] !== 'folder' ||