Check if extension list is empty

ajnyga · Feb 24, 2018 · 37bfbc7 · 37bfbc7
1 parent 0939eaa
commit 37bfbc7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/AllowedUploadsPlugin.inc.php b/AllowedUploadsPlugin.inc.php
@@ -120,10 +120,15 @@ function checkUpload($hookName, $params) {
 		$extension = array_pop(explode('.',$fileName));
 
 		$allowedExtensions = $this->getSetting($context->getId(), 'allowedExtensions');
-		$allowedExtensionsArray = array_filter(array_map('trim', explode(';', $allowedExtensions )), 'strlen');
 
-		if (!in_array($extension, $allowedExtensionsArray)){
-			$form->addError('fileType', __('plugins.generic.allowedUploads.error', array('allowedExtensions' => $allowedExtensions)));
+		if ($allowedExtensions){
+
+			$allowedExtensionsArray = array_filter(array_map('trim', explode(';', $allowedExtensions )), 'strlen');
+
+			if (!in_array($extension, $allowedExtensionsArray)){
+				$form->addError('fileType', __('plugins.generic.allowedUploads.error', array('allowedExtensions' => $allowedExtensions)));
+			}
+
 		}
 
 		return false;

diff --git a/README.md b/README.md
@@ -6,3 +6,8 @@ For OJS 3.1.0.1 or higher
 The plugin enables the editor to choose which file extensions are allowed in their journal. NOTE! This is *not* a security plugin. Make sure that your files directory is not a subdirectory of your OJS installation. For more details read the OJS installation instructions.
 
 Copy the plugin folder to plugins/generic/ and enable it. Edit the plugin settings and add a list semicolon separated list of allowed filetypes, for example 'doc; docx; pdf; gif; jpg;'.
+
+
+TODO
+- Add checks and validation when saving the allowed file extensions list
+