pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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)

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2017-10-07 14:36:16 +02:00
parent 5b47e9caa5
commit 02807730ee
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/php/teleporter.php
+1 -1
View File
@@ -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));
settings.php
+4 -5
View File
@@ -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>