Remove duplicated code

htdocs/artefact/file/download.php

@@ -53,26 +53,20 @@ if ($viewid && $fileid) {
     if (!($file instanceof ArtefactTypeFile)) {
         throw new NotFoundException();
     }
-    $path = $file->get_path(array('size' => $size));
-    $title = $file->download_title();
-    if ($contenttype = $file->override_content_type()) {
-        $options['overridecontenttype'] = $contenttype;
-    }
-    serve_file($path, $title, $options);
 }
-
-// We just have a file ID
-$file = artefact_instance_from_id($fileid);
-if (!($file instanceof ArtefactTypeFile)) {
+else {
+    // We just have a file ID
+    $file = artefact_instance_from_id($fileid);
+    if (!($file instanceof ArtefactTypeFile)) {
         throw new NotFoundException();
-}
+    }
 
-// If the file is in the public directory, it's fine to serve
-$fileispublic = $file->get('parent') == ArtefactTypeFolder::admin_public_folder_id();
-$fileispublic &= $file->get('adminfiles');
-$fileispublic &= record_exists('site_menu', 'file', $fileid, 'public', 1);
+    // If the file is in the public directory, it's fine to serve
+    $fileispublic = $file->get('parent') == ArtefactTypeFolder::admin_public_folder_id();
+    $fileispublic &= $file->get('adminfiles');
+    $fileispublic &= record_exists('site_menu', 'file', $fileid, 'public', 1);
 
-if (!$fileispublic) {
+    if (!$fileispublic) {
         // If the file is in the logged in menu and the user is logged in then
         // they can view it
         $fileinloggedinmenu = $file->get('adminfiles');
@@ -88,6 +82,7 @@ if (!$fileispublic) {
                 throw new AccessDeniedException();
             }
         }
+    }
 }
 
 $path  = $file->get_path(array('size' => $size));