From d99ec696b48ef3f6f93e8514f14abb0c87ab0cae Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 10 Apr 2020 12:21:53 -0400
Subject: [PATCH] reorganize to reduce code depth

---
 web/views/archive.php | 56 +++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/web/views/archive.php b/web/views/archive.php
index 6f5ff966d..352849ee9 100644
--- a/web/views/archive.php
+++ b/web/views/archive.php
@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder file view file, $Date: 2008-09-29 14:15:13 +0100 (Mon, 29 Sep 2008) $, $Revision: 2640 $
+// ZoneMinder file view file
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -23,11 +23,13 @@ if ( !canView('Events') ) {
   return;
 }
 
-$archivetype = $_REQUEST['type'];
-$connkey = isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'';
+$archivetype = isset($_REQUEST['type']) ? $_REQUEST['type'] : '';
+if ( !$archivetype ) {
+  ZM\Error('No archive type given to archive.php. Please specify a tar or zip archive.');
+  return;
+}
 
-if ( $archivetype ) {
-  switch ($archivetype) {
+switch ($archivetype) {
   case 'tar.gz':
     $mimetype = 'gzip';
     $file_ext = 'tar.gz';
@@ -43,31 +45,29 @@ if ( $archivetype ) {
   default:
     $mimetype = NULL;
     $file_ext = NULL;
-  }
+}
 
-  if ( $mimetype ) {
-    $filename = "zmExport_$connkey.$file_ext";
-    $filename_path = ZM_DIR_EXPORTS.'/'.$filename;
-    ZM\Logger::Debug("downloading archive from $filename_path");
-    if ( is_readable($filename_path) ) {
-      while (ob_get_level()) {
-        ZM\Logger::Debug('Clearing ob');
-        ob_end_clean();
-      }
-      header("Content-type: application/$mimetype" );
-      header("Content-Disposition: inline; filename=$filename");
-      header('Content-Length: '.filesize($filename_path));
-      set_time_limit(0);
-      if ( ! @readfile($filename_path) ) {
-        ZM\Error("Error sending $filename_path");
-      }
-    } else {
-      ZM\Error("$filename_path does not exist or is not readable.");
-    }
-  } else {
-    ZM\Error('Unsupported archive type specified. Supported archives are tar and zip');
+if ( !$mimetype ) {
+  ZM\Error('Unsupported archive type specified. Supported archives are tar and zip');
+  return;
+}
+
+$connkey = isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'';
+$filename = "zmExport_$connkey.$file_ext";
+$filename_path = ZM_DIR_EXPORTS.'/'.$filename;
+ZM\Logger::Debug("downloading archive from $filename_path");
+if ( is_readable($filename_path) ) {
+  while (ob_get_level()) {
+    ob_end_clean();
+  }
+  header("Content-type: application/$mimetype");
+  header("Content-Disposition: inline; filename=$filename");
+  header('Content-Length: '.filesize($filename_path));
+  set_time_limit(0);
+  if ( !@readfile($filename_path) ) {
+    ZM\Error("Error sending $filename_path");
   }
 } else {
-  ZM\Error('No archive type given to archive.php. Please specify a tar or zip archive.');
+  ZM\Error($filename_path.' does not exist or is not readable.');
 }
 ?>