remove PEAR download for liberty download_file.php

1 files changed, 19 insertions, 17 deletions

diff --git a/download_file.php b/download_file.php
index 6fda549..817a3a3 100644
--- a/download_file.php
+++ b/download_file.php
@@ -22,26 +22,28 @@ if( @!BitBase::verifyId( $_REQUEST['attachment_id'] ) || !( $attachment = Libert
 $gBitSmarty->assign( 'attachment', $attachment );
 
 // first we need to check the permissions of the content the attachment belongs to since they inherit them
-$gContent = LibertyBase::getLibertyObject( $attachment['content_id'] );
-$gContent->verifyViewPermission();
-$gBitSmarty->assign( 'gContent', $gContent );
+if( $gContent = LibertyBase::getLibertyObject( $attachment['content_id'] ) ) {
+	$gContent->verifyViewPermission();
+	$gBitSmarty->assign( 'gContent', $gContent );
 
-if( $download_function = $gLibertySystem->getPluginFunction( $attachment['attachment_plugin_guid'], 'download_function', 'mime' )) {
-	if( $download_function( $attachment )) {
-		LibertyMime::addDownloadHit( $attachment['attachment_id'] );
-		die;
-	} else {
-		if( !empty( $attachment['errors'] )) {
-			$msg = '';
-			foreach( $attachment['errors'] as $error ) {
-				$msg .= $error.'<br />';
-			}
-			$gBitSystem->fatalError( tra( $msg ));
+	if( $download_function = $gLibertySystem->getPluginFunction( $attachment['attachment_plugin_guid'], 'download_function', 'mime' )) {
+		if( $download_function( $attachment )) {
+			LibertyMime::addDownloadHit( $attachment['attachment_id'] );
+			die;
 		} else {
-			$gBitSystem->fatalError( tra( 'There was an undetermined problem trying to prepare the file for download.' ));
+			if( !empty( $attachment['errors'] )) {
+				$msg = '';
+				foreach( $attachment['errors'] as $error ) {
+					$msg .= $error.'<br />';
+				}
+				$gBitSystem->fatalError( tra( $msg ));
+			} else {
+				$gBitSystem->fatalError( tra( 'There was an undetermined problem trying to prepare the file for download.' ));
+			}
 		}
+	} else {
+		$gBitSystem->fatalError( tra( "No suitable download function found." ));
 	}
 } else {
-	$gBitSystem->fatalError( tra( "No suitable download function found." ));
+	$gBitSystem->fatalError( tra( "Object not found." ), NULL, NULL, 404 );
 }
-?>