630cfd6d63
Fix linting error introduced by PHP-CS-Fixer v3.17.0
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-05-24 22:20:02 +02:00
ea916066a0
Tweak teleporter output
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-03-13 09:29:11 +01:00
7373cc2675
Fix multiple restarts while importing with Teleporter
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-02-02 23:37:19 +01:00
d12ef014e5
Use constants in place of class constants
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2022-09-08 23:47:09 -03:00
503fe267eb
fix codespell complains
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-08-17 22:53:44 +02:00
6a39cc3b4a
Disable Yoda style
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-08-12 18:55:27 +02:00
97a76669a2
Explicitly set blank_line_before_statement to exclude include* and require*
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-08-07 20:55:02 +02:00
6ec4b8a529
Run PHP-CS-Fixer on all files
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2022-08-07 12:04:03 +02:00
a3234d1306
Replacing tabs with 4 spaces
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2022-08-01 01:28:30 -03:00
2bc918ad6e
Use 4 spaces to indent PHP files.
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2022-08-01 01:18:26 -03:00
85f765f1e5
Tidy the ends of some php file
...
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com >
2022-07-14 20:24:38 +02:00
0caa8bd02b
Use a random name when creating intermediat archive for teleporter
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-07-03 23:35:03 +02:00
242654e149
Fix some suggestions / ignore others
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-04-22 17:17:59 +01:00
edfcf4521a
Prevent misleading warning being printed to the lighttpd error log when attempting to flush tables that don't actually exist
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-02-12 13:39:57 +00:00
d1e90e273a
Better file extension verification
...
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br >
2022-01-17 02:06:26 -03:00
ab9454a582
Also use variable to disable reload in delteALL functions
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-10-13 20:47:02 +02:00
b80c97f6d3
Do only reload pihole once after Local DNS Records or CNAME have been modified
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-10-12 21:37:06 +02:00
49c84e58dd
Suppress empty lines output during teleporter import ( #1921 )
...
Signed-off-by: Yubiuser <ckoenig@posteo.de >
2021-10-11 09:05:08 +01:00
85121b69b1
Count right during teleporter import ( #1922 )
...
Signed-off-by: Yubiuser <ckoenig@posteo.de >
2021-10-10 22:31:59 +01:00
0d24f25f3c
Modal Dialog for Teleporter-import
...
fixes page reload every time the DHCP tab gets active
Signed-off-by: Th3M3 <the_me@outlook.de >
2021-10-07 00:12:33 +01:00
26f0203137
Trim excess whitespace
...
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com >
2021-09-15 21:23:01 +00:00
48c63c0a0b
Fix spelling
...
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com >
2021-09-15 21:22:59 +00:00
c4691ac672
Merge pull request #1558 from pi-hole/master
...
master -> devel
2020-08-14 22:04:06 +01:00
8672c49b4b
Replace "." by "_" in hostnames to work around a PHP Phar bug.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-07-20 21:43:44 +02:00
b597a0fcbb
Merge branch 'devel' into devel
2020-06-21 12:20:33 +02:00
c949516ee1
make use of utils.escapeHtml on the JS side of things, and html_entity_decode/htmlentities in PHP
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-13 18:50:36 +01:00
ee89ab3131
Include hostname in backup filename. Will add nothing if no hostname detected.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-01 20:49:31 +01:00
212da94228
Added token verification
...
Moved CNAME functions to func.php
Added teleporter support
Fixed CNAME and DNS file declaration (filename was declarated in seperate file, therefore trying to read those files from func.php failed)
Fixed error and success response functions in func.php (calling addCustomDNSEntry and addCustomCNAMEEntry repeatedly from teleporter failed because of error function defined inside of those functions)
Signed-off-by: Matthias Rank <development@m-rank.de >
2020-05-21 14:48:13 +02:00
70d2b62382
Fix teleporter to use the 24-hour format.
...
Split from #1305
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-05-17 16:35:51 +03:00
257f6ce55e
Log number of imported group assignments.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 20:36:00 +02:00
ac3c178ce9
Add import for Local DNS Records.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 20:23:26 +02:00
67b68b4400
Add pihole-FTL.conf ans custom.list (Local DNS Records) to Teleporter Backup
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 20:23:26 +02:00
ad4a10c01e
Add import for missing tables: group, client + the group linking tables.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 20:23:26 +02:00
cb48efff19
Add export for missing tables: group, client + the group linking tables.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 20:23:26 +02:00
39ec67829b
Execute pihole through wrapper
...
All different exec() calls basically just calls sudo pihole,
with various different syntaxes. Using a wrapper function
allows sanitization of arguments for better safety.
Signed-off-by: Samu Voutilainen <smar@smar.fi >
2020-04-17 07:55:16 +03:00
6ad2430f95
Import legacy adlist.list and fix/remove debugging output
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-02-02 19:10:26 +01:00
870ab035fc
Fix teleporter's ability to import v4.x archives.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-01-28 22:26:19 +01:00
c81d690be4
Add /etc/hosts to teleporter export.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-12-28 13:30:57 +00:00
52f5be0c8f
Merge pull request #992 from trimalcione/devel
...
Add DHCP leases export/import from teleporter
2019-12-16 11:22:28 +01:00
258ea04432
Add a class for better readability of list type within the code
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2019-12-08 18:47:30 +00:00
3a0a596b11
Implement necessary changes due to switching from individual to a common domainlist.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-12-08 17:42:01 +00:00
6c04b8cb39
add DHCP static leases import from teleporter
...
Signed-off-by: trimalcione <okchtioui@gmail.com >
2019-12-02 16:21:19 +01:00
61f02236eb
add: dhcp.leases to teleporter exported tar.gz
...
Signed-off-by: corbolais <corbolais@gmail.com >
2019-11-25 16:05:04 +01:00
72af77eef9
Merge branch 'devel' into devel
2019-10-19 01:13:35 +02:00
f3d8f0dfb5
Teleporter expects adlist.json during import, however, the file is called adlists.json during export. Fix this by using singular during export.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-09-18 00:36:03 +02:00
9d32aa6489
Add DHCP leases export/import from teleporter
...
Signed-off-by: trimalcione <okchtioui@gmail.com >
2019-08-20 18:12:16 +02:00
3770556732
Use database.php:add_to_table() in teleporter.php:archive_insert_into_table().
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-07 21:49:51 +02:00
07af532b09
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-07 21:32:49 +02:00
5b9ccecd11
Limit max length for a domain entry to 253 chars when importing from teleoprter archives, skip longer entries without importing them.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-06 20:40:20 +02:00
c53832c9d0
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-08-05 22:06:53 +02:00
Christian König
RD WebDesign
DL6ER
Gontier Julien
Adam Warner
Th3M3
a1346054
marank
Matthias rank
V@no
Samu Voutilainen
DL6ER
trimalcione
corbolais