Use SubmissionFile::validate

ajnyga · Feb 7, 2021 · 295608e · 295608e
1 parent da33221
commit 295608e
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/AllowedUploadsPlugin.inc.php b/AllowedUploadsPlugin.inc.php
@@ -27,7 +27,7 @@ function register($category, $path, $mainContextId = null) {
 		if (!Config::getVar('general', 'installed') || defined('RUNNING_UPGRADE')) return true;
 		if ($success && $this->getEnabled()) {
 
-			HookRegistry::register('submissionfilesuploadform::validate', array($this, 'checkUpload'));
+			HookRegistry::register('SubmissionFile::validate', array($this, 'checkUpload'));
 
 		}
 		return $success;
@@ -103,28 +103,25 @@ function manage($args, $request) {
 	/**
 	 * Check the uploaded file
 	 */
-	function checkUpload($hookName, $params) {	
-		$form = $params[0];
+	function checkUpload($hookName, $params) {
+		$errors =& $params[0];
+		$props = $params[2];
+		$locale = $params[4];
 		$request = Application::getRequest();
 		$context = $request->getContext();
 
-		$userVars = $request->getUserVars();
-		$fileName = $userVars['name'];
+		$fileName = $props['name'][$locale];
 		$tmp = explode('.',$fileName);
 		$extension = strtolower(end($tmp));
 
 		$allowedExtensions = $this->getSetting($context->getId(), '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)));
+				$errors['allowedExtensions'][$locale] = __('plugins.generic.allowedUploads.error', array('allowedExtensions' => $allowedExtensions));
 			}
-
 		}
-		return false;
 	}
 
 }