From 02807730ee27b319f56d43391cb95511295bd9ff Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 7 Oct 2017 14:36:16 +0200
Subject: [PATCH] We don't have to test for the php-zip extension anymore.
 Instead, we test for "Phar" (which seems to be there by default on most
 systems)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/php/teleporter.php | 2 +-
 settings.php                       | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/pi-hole/php/teleporter.php b/scripts/pi-hole/php/teleporter.php
index f81f287f..34e3ab67 100644
--- a/scripts/pi-hole/php/teleporter.php
+++ b/scripts/pi-hole/php/teleporter.php
@@ -110,7 +110,7 @@ if(isset($_POST["action"]))
 			die("The file you are trying to upload is not a .tar.gz file (filename: ".htmlentities($filename).", type: ".htmlentities($type)."). Please try again.");
 		}
 
-		$fullfilename = sys_get_temp_dir().$filename;
+		$fullfilename = sys_get_temp_dir()."/".$filename;
 		if(!move_uploaded_file($source, $fullfilename))
 		{
 			die("Failed moving ".htmlentities($source)." to ".htmlentities($fullfilename));
diff --git a/settings.php b/settings.php
index 9bfcae55..2ef1de67 100644
--- a/settings.php
+++ b/settings.php
@@ -898,11 +898,11 @@ if($FTL)
 				<div class="box-tools pull-right"><button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i></button></div>
 			</div>
 			<div class="box-body">
-			<?php if (extension_loaded('zip')) { ?>
+			<?php if (extension_loaded('Phar')) { ?>
 				<form role="form" method="post" id="takeoutform" action="scripts/pi-hole/php/teleporter.php" target="_blank"  enctype="multipart/form-data">
 					<input type="hidden" name="token" value="<?php echo $token ?>">
 					<div class="col-lg-12">
-						<p>Export your Pi-hole lists as downloadable ZIP file</p>
+						<p>Export your Pi-hole lists as downloadable archive</p>
 						<button type="submit" class="btn btn-default">Export</button>
 					<hr>
 					</div>
@@ -930,9 +930,8 @@ if($FTL)
 					</div>
 				</form>
 			<?php } else { ?>
-				<p>The PHP extension <code>zip</code> is not loaded. Please ensure it is installed and loaded if you want to use the Pi-hole teleporter.</p>
-				<?php if(command_exist("apt-get") && command_exist("sudo")) { ?><p>Try:</p><pre>sudo apt-get install php-zip</pre><?php }
-			} ?>
+				<p>The PHP extension <code>Phar</code> is not loaded. Please ensure it is installed and loaded if you want to use the Pi-hole teleporter.
+			<?php } ?>
 			</div>
 		</div>
 	</div>