diff options
author | Olivier Mehani <shtrom@ssji.net> | 2016-09-29 21:51:07 +1000 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2016-10-24 11:27:27 +0200 |
commit | 19ad058d0676819536953074091d915dfec8e39f (patch) | |
tree | 6e999b5d9217be06b67961d3f62d6fe3adde9582 /lib/private/Files/Node | |
parent | f054adb4291c83b05777688360780146af5f7d94 (diff) | |
download | nextcloud-server-19ad058d0676819536953074091d915dfec8e39f.tar.gz nextcloud-server-19ad058d0676819536953074091d915dfec8e39f.zip |
Add message to NotSquareException thrown from Avatar
This prevents cryptic messages such as the following, from `user_ldap`:
Could not set avatar for uid=user,ou=People,dc=example,dc=net, because:
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
Add message to NotPermittedException thrown from Files\Nodes\Folder
Ditto.
Don't use translation macros here as this seems to be pretty low-level
errors that generally get caught and prettified, and I don't want to
unduly clog down the lower layers.
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
fixup! Add message to NotPermittedException thrown from Files\Nodes\Folder
Diffstat (limited to 'lib/private/Files/Node')
-rw-r--r-- | lib/private/Files/Node/Folder.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index 353b89068cb..a6165fa9636 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -42,7 +42,7 @@ class Folder extends Node implements \OCP\Files\Folder { */ public function getFullPath($path) { if (!$this->isValidPath($path)) { - throw new NotPermittedException(); + throw new NotPermittedException('Invalid path: ' . $path); } return $this->path . $this->normalizePath($path); } @@ -152,7 +152,7 @@ class Folder extends Node implements \OCP\Files\Folder { $this->root->emit('\OC\Files', 'postCreate', array($node)); return $node; } else { - throw new NotPermittedException(); + throw new NotPermittedException('No create permission for folder ' . $this->getFullPath($path)); } } @@ -173,7 +173,7 @@ class Folder extends Node implements \OCP\Files\Folder { $this->root->emit('\OC\Files', 'postCreate', array($node)); return $node; } else { - throw new NotPermittedException(); + throw new NotPermittedException('No create permission for path ' . $this->getFullPath($path)); } } @@ -321,7 +321,7 @@ class Folder extends Node implements \OCP\Files\Folder { $this->root->emit('\OC\Files', 'postDelete', array($nonExisting)); $this->exists = false; } else { - throw new NotPermittedException(); + throw new NotPermittedException('No delete permission for path ' . $this->getFullPath($this->path)); } } @@ -343,7 +343,7 @@ class Folder extends Node implements \OCP\Files\Folder { $this->root->emit('\OC\Files', 'postWrite', array($targetNode)); return $targetNode; } else { - throw new NotPermittedException(); + throw new NotPermittedException('No permission to copy to path ' . $targetPath); } } @@ -366,7 +366,7 @@ class Folder extends Node implements \OCP\Files\Folder { $this->path = $targetPath; return $targetNode; } else { - throw new NotPermittedException(); + throw new NotPermittedException('No permission to move to path ' . $targetPath); } } |