clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #284 from fabrixxm/master 

validate_url() and validate_email() validate also IP address.
This commit is contained in:
friendica 2012-05-03 16:45:30 -07:00
parent 6a5e5096db 52915c6e68
commit ff75dc4e40
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/network.php
View File

@ -583,7 +583,7 @@ function fetch_xrd_links($url) {
// Take a URL from the wild, prepend http:// if necessary // Take a URL from the wild, prepend http:// if necessary
// and check DNS to see if it's real // and check DNS to see if it's real (or check if is a valid IP address)
// return true if it's OK, false if something is wrong with it // return true if it's OK, false if something is wrong with it
if(! function_exists('validate_url')) { if(! function_exists('validate_url')) {
@ -596,7 +596,7 @@ function validate_url(&$url) {
$url = 'http://' . $url; $url = 'http://' . $url;
$h = @parse_url($url); $h = @parse_url($url);
if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) { if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
return true; return true;
} }
return false; return false;
@ -611,7 +611,7 @@ function validate_email($addr) {
return false; return false;
$h = substr($addr,strpos($addr,'@') + 1); $h = substr($addr,strpos($addr,'@') + 1);
if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX))) { if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
return true; return true;
} }
return false; return false;