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

Merge pull request #1130 from pi-hole/new/intl_domains

Browse Source 
Add support for international domain names
This commit is contained in:
DL6ER
2020-02-04 21:07:28 +01:00
committed by GitHub
parent 2c12b0d2d2 89cf4b279b
commit 2860ce3fc8
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