Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-24 18:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor corrections

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2017-10-06 23:42:49 +02:00
parent 6bb6c6d29f
commit 67855df5c5
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/pi-hole/php/teleporter.php
View File

@@ -23,7 +23,6 @@ function archive_add_file($path,$name)
function archive_add_directory($path)
{
global $zip;
if($dir = opendir($path))
{
while(false !== ($entry = readdir($dir)))
@@ -108,16 +107,16 @@ if(isset($_POST["action"]))
$continue = strtolower($name[1]) == 'tar' && strtolower($name[2]) == 'gz' ? true : false;
if(!$continue || !$okay) {
die("The file you are trying to upload is not a .tar.gz file (filename: ".$filename.", type: ".$type."). Please try again.");
die("The file you are trying to upload is not a .tar.gz file (filename: ".htmlspecialchars($filename).", type: ".htmlspecialchars($type)."). Please try again.");
}
$filename = "/tmp/".$filename;
if(!move_uploaded_file($_FILES["zip_file"]["tmp_name"], $filename))
$fullfilename = sys_get_temp_dir().$filename;
if(!move_uploaded_file($_FILES["zip_file"]["tmp_name"], $fullfilename))
{
die("Failed moving ".$_FILES["zip_file"]["tmp_name"]." to ".$filename);
die("Failed moving ".$_FILES["zip_file"]["tmp_name"]." to ".$fullfilename);
}
$archive = new PharData($filename);
$archive = new PharData($fullfilename);
foreach($archive as $file)
{
@@ -153,9 +152,7 @@ else
{
$tarname = "pi-hole-teleporter_".date("Y-m-d_h-i-s").".tar";
$filename = $tarname.".gz";
// $archive_file_name = tempnam("/tmp", "Teleporter");
$archive_file_name = sys_get_temp_dir() ."/". $tarname;
// touch($archive_file_name);
$archive = new PharData($archive_file_name);
if ($archive->isWritable() !== TRUE) {