1
0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00

Resolve merge conflict

This commit is contained in:
billz 2021-12-29 12:41:35 +00:00
parent 2ca5f25dff
commit c2665ae528

View File

@ -757,11 +757,6 @@ function qr_encode($str)
return preg_replace('/(?<!\\\)([\":;,])/', '\\\\\1', $str); return preg_replace('/(?<!\\\)([\":;,])/', '\\\\\1', $str);
} }
// Validates a host or FQDN
function validate_host($host) {
return preg_match('/^([a-z\d](-*[a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i', $host);
}
function evalHexSequence($string) { function evalHexSequence($string) {
$evaluator = function ($input) { $evaluator = function ($input) {
return hex2bin($input[1]); return hex2bin($input[1]);