Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-23 02:09:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for international domain names. Note that this relies on php-intl to be installed

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-01-12 13:33:05 +01:00
parent 5eadd346b9
commit 65be9d89ef
4 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/pi-hole/php/groups.php
View File

@@ -346,6 +346,13 @@ if ($_POST['action'] == 'get_groups') {
array_push($groups, $gres['group_id']);
}
$res['groups'] = $groups;
$utf8_domain = idn_to_utf8($res['domain']);
// Convert domain name to international form
// if applicable
if($res['domain'] !== $utf8_domain)
{
$res['domain'] = $utf8_domain.' ('.$res['domain'].')';
}
array_push($data, $res);
}
@@ -364,7 +371,8 @@ if ($_POST['action'] == 'get_groups') {
$type = intval($_POST['type']);
$domain = $_POST['domain'];
// Convert domain name to IDNA ASCII form for international domains
$domain = idn_to_ascii($_POST['domain']);
if($type === ListType::whitelist || $type === ListType::blacklist)
{
// If adding to the exact lists, we convert the domain lower case and check whether it is valid