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

Add only files that exist (no empty files if the source is not there, e.g. no blacklist.txt) and don't backup adlists.default

Browse Source
This commit is contained in:
DL6ER
2017-01-20 15:23:42 +01:00
parent cd12288625
commit 21a5b2af69
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/pi-hole/php/takeout.php
View File

@@ -20,9 +20,6 @@ function add_to_zip($path,$name)
global $zip;
if(file_exists($path.$name))
$zip->addFile($path.$name,$name);
else
// Add empty file with thios filename
$zip->addFromString($name, "");
}
function getWildcardListContent() {
@@ -96,12 +93,11 @@ else
$res = $zip->open($archive_file_name, ZipArchive::CREATE | ZipArchive::OVERWRITE);
if ($res !== TRUE) {
exit("cannot open/create $archive_file_name<br>Error: ".$zip->getStatusString()."<br>PHP user: ".exec('whoami')."\n");
exit("cannot open/create $archive_file_name<br>Error: ".$zip->getStatusString()."<br>PHP user: ".exec('whoami')."\n");
}
add_to_zip("/etc/pihole/","whitelist.txt");
add_to_zip("/etc/pihole/","blacklist.txt");
add_to_zip("/etc/pihole/","adlists.default");
add_to_zip("/etc/pihole/","adlists.list");
add_to_zip("/etc/pihole/","setupVars.conf");