Implement FTPConnectionFailed exception

mantisbt · Aug 20, 2011 · ed3dfef · ed3dfef
1 parent a84bc07
commit ed3dfef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/application/MantisBT/Exception/Attachment/FTPConnectionFailed.php b/application/MantisBT/Exception/Attachment/FTPConnectionFailed.php
@@ -0,0 +1,13 @@
+<?php
+namespace MantisBT\Exception\Attachment;
+use MantisBT\Exception\ExceptionAbstract;
+
+require_api('lang_api.php');
+
+class FTPConnectionFailed extends ExceptionAbstract {
+	public function __construct() {
+		$errorMessage = lang_get(ERROR_FTP_CONNECT_ERROR, null, false);
+		parent::__construct(ERROR_FTP_CONNECT_ERROR, $errorMessage, null);
+		$this->responseCode = 500;
+	}
+}
diff --git a/application/core/file_api.php b/application/core/file_api.php
@@ -42,6 +42,7 @@
 use MantisBT\Exception\Attachment\AttachmentOversized;
 use MantisBT\Exception\Attachment\AttachmentsPathInvalid;
 use MantisBT\Exception\Attachment\EmptyAttachment;
+use MantisBT\Exception\Attachment\FTPConnectionFailed;
 
 require_api( 'access_api.php' );
 require_api( 'authentication_api.php' );
@@ -434,7 +435,7 @@ function file_ftp_connect() {
 	$login_result = ftp_login( $conn_id, config_get( 'file_upload_ftp_user' ), config_get( 'file_upload_ftp_pass' ) );
 
 	if(( !$conn_id ) || ( !$login_result ) ) {
-		trigger_error( ERROR_FTP_CONNECT_ERROR, ERROR );
+		throw new FTPConnectionFailed();
 	}
 
 	return $conn_id;