From: Jerome Jutteau <mojo@couak.net>
Date: Fri, 13 Mar 2015 17:15:15 +0000 (+0100)
Subject: Fixes #21 repair file downloading in admin interface
X-Git-Tag: 1.1~146
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/d1ee60f610d6208a6acba1548bd18de774c7de79?ds=sidebyside

Fixes #21 repair file downloading in admin interface

Thanks to @tbleiker who found the bug :)
---

diff --git a/admin.php b/admin.php
index 837686e..cad427c 100644
--- a/admin.php
+++ b/admin.php
@@ -123,12 +123,12 @@ if (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
 /* Remove errors. */
 @error_reporting(0);
 
-/* Admin interface. */
-require (JIRAFEAU_ROOT . 'lib/template/header.php');
-?><h2><?php echo t('Admin interface'); ?></h2><?php
-
-/* Show admin interface. */
+/* Show admin interface if not downloading a file. */
+if (!(isset ($_POST['action']) && strcmp ($_POST['action'], 'download') == 0))
 {
+        require (JIRAFEAU_ROOT . 'lib/template/header.php');
+        ?><h2><?php echo t('Admin interface'); ?></h2><?php
+
         ?><div id = "install">
         <fieldset><legend><?php echo t('Actions');?></legend>
         <table>
@@ -277,6 +277,7 @@ if (isset ($_POST['action']))
                 $l['file_name'] . '"');
         if (file_exists(VAR_FILES . $p . $l['md5']))
             readfile (VAR_FILES . $p . $l['md5']);
+        exit;
     }
 }