diff options
Diffstat (limited to 'lib/filesystem/StandardFolder.php')
| -rw-r--r-- | lib/filesystem/StandardFolder.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/filesystem/StandardFolder.php b/lib/filesystem/StandardFolder.php index a34ca4a..c387bb9 100644 --- a/lib/filesystem/StandardFolder.php +++ b/lib/filesystem/StandardFolder.php @@ -186,7 +186,7 @@ class StandardFolder implements FolderType } /** - * @return string|Flexi_Template + * @return string|Flexi\Template */ public function getDescriptionTemplate() { @@ -194,7 +194,7 @@ class StandardFolder implements FolderType } /** - * @return string|Flexi_Template + * @return string|Flexi\Template */ public function getEditTemplate() { @@ -224,14 +224,13 @@ class StandardFolder implements FolderType } /** - * @param FileType $newfile - * @param string $user_id + * @param string $user_id * @return string */ - public function validateUpload(FileType $newfile, $user_id) + public function validateUpload(FileType $file, $user_id) { $upload_type = FileManager::getUploadTypeConfig($this->range_id, $user_id); - return $this->getValidationMessages($upload_type, $newfile); + return $this->getValidationMessages($upload_type, $file); } protected function getValidationMessages($upload_type, $newfile) @@ -256,6 +255,8 @@ class StandardFolder implements FolderType if (in_array($ext, $types) && $upload_type['type'] === 'allow') { return sprintf(_('Sie dürfen den Dateityp %s nicht hochladen!'), $ext); } + + return null; } /** @@ -509,9 +510,11 @@ class StandardFolder implements FolderType /** * Returns the content for that additional column, if it exists. You can return null a string - * or a Flexi_Template as the content. + * or a Flexi\Template as the content. + * * @param string $column_index - * @return null|string|Flexi_Template + * + * @return null|string|Flexi\Template */ public function getContentForAdditionalColumn($column_index) { |