From 1eb7c19c1e2018e183baa503a873d3a538a31758 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Fri, 26 Jan 2018 23:51:41 -0500 Subject: [PATCH] Move multiple functions move multiple smaller functions --- include/network.php | 36 ------------------------------------ mod/dfrn_request.php | 6 +++--- mod/dirfind.php | 2 +- mod/settings.php | 3 ++- src/Content/OEmbed.php | 2 +- src/Model/Contact.php | 5 +++-- src/Model/Profile.php | 3 ++- src/Model/User.php | 10 +++++----- src/Module/Login.php | 3 ++- src/Network/Probe.php | 4 ++-- src/Util/Network.php | 6 +++--- 11 files changed, 24 insertions(+), 56 deletions(-) diff --git a/include/network.php b/include/network.php index 726eac7570..840991aa52 100644 --- a/include/network.php +++ b/include/network.php @@ -12,42 +12,6 @@ use Friendica\Object\Image; use Friendica\Util\Network; use Friendica\Util\XML; -function validate_url($url) -{ - return Network::validateURL($url); -} - -function validate_email($addr) -{ - return Network::validateEmail($addr); -} - -function allowed_url($url) -{ - return Network::allowedURL($url); -} - -function blocked_url($url) -{ - return Network::blockedURL($url); -} - -function allowed_email($email) -{ - return Network::allowedEmail($email); -} - -function allowed_domain($domain, array $domain_list) -{ - return Network::allowedDomain($domain, $domain_list); -} - -function avatar_img($email) -{ - return Network::avatarImg($email); -} - - function parse_xml_string($s, $strict = true) { return Network::parseXmlString($s, $strict); diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 18a6eefaf2..1d3e4cd8f6 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -332,20 +332,20 @@ function dfrn_request_post(App $a) intval($contact_record['id']) ); } else { - $url = validate_url($url); + $url = Network::validateURL($url); if (!$url) { notice(L10n::t('Invalid profile URL.') . EOL); goaway(System::baseUrl() . '/' . $a->cmd); return; // NOTREACHED } - if (!allowed_url($url)) { + if (!Network::allowedURL($url)) { notice(L10n::t('Disallowed profile URL.') . EOL); goaway(System::baseUrl() . '/' . $a->cmd); return; // NOTREACHED } - if (blocked_url($url)) { + if (Network::blockedURL($url)) { notice(L10n::t('Blocked domain') . EOL); goaway(System::baseUrl() . '/' . $a->cmd); return; // NOTREACHED diff --git a/mod/dirfind.php b/mod/dirfind.php index c010aaac92..f08e723bae 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -46,7 +46,7 @@ function dirfind_content(App $a, $prefix = "") { if (strpos($search,'@') === 0) { $search = substr($search,1); $header = L10n::t('People Search - %s', $search); - if ((valid_email($search) && validate_email($search)) || + if ((valid_email($search) && Network::validateEmail($search)) || (substr(normalise_link($search), 0, 7) == "http://")) { $user_data = Probe::uri($search); $discover_user = (in_array($user_data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])); diff --git a/mod/settings.php b/mod/settings.php index 5b4bd903ec..a6ffd99e99 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -17,6 +17,7 @@ use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\User; use Friendica\Protocol\Email; +use Friendica\Util\Network; function get_theme_config_file($theme) { @@ -535,7 +536,7 @@ function settings_post(App $a) // If openid has changed or if there's an openid but no openidserver, try and discover it. if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) { - if (validate_url($openid)) { + if (Network::validateURL($openid)) { logger('updating openidserver'); require_once 'library/openid.php'; $open_id_obj = new LightOpenID; diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index 80fab8c647..1ddd3e65c6 100644 --- a/src/Content/OEmbed.php +++ b/src/Content/OEmbed.php @@ -312,7 +312,7 @@ class OEmbed $allowed = explode(',', $str_allowed); - return allowed_domain($domain, $allowed); + return Network::allowedDomain($domain, $allowed); } public static function getHTML($url, $title = null) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index acdb4815e6..bda5a925f5 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -20,6 +20,7 @@ use Friendica\Protocol\DFRN; use Friendica\Protocol\OStatus; use Friendica\Protocol\PortableContact; use Friendica\Protocol\Salmon; +use Friendica\Util\Network; use dba; require_once 'boot.php'; @@ -1131,12 +1132,12 @@ class Contact extends BaseObject // remove ajax junk, e.g. Twitter $url = str_replace('/#!/', '/', $url); - if (!allowed_url($url)) { + if (!Network::allowedURL($url)) { $result['message'] = L10n::t('Disallowed profile URL.'); return $result; } - if (blocked_url($url)) { + if (Network::blockedURL($url)) { $result['message'] = L10n::t('Blocked domain'); return $result; } diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 8e32f60aec..c77b6bbe44 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -17,6 +17,7 @@ use Friendica\Core\Worker; use Friendica\Database\DBM; use Friendica\Model\Contact; use Friendica\Protocol\Diaspora; +use Friendica\Util\Network; use dba; require_once 'include/dba.php'; @@ -963,7 +964,7 @@ class Profile public static function zrlInit(App $a) { $my_url = self::getMyURL(); - $my_url = validate_url($my_url); + $my_url = Network::validateURL($my_url); if ($my_url) { // Is it a DDoS attempt? // The check fetches the cached value from gprobe to reduce the load for this system diff --git a/src/Model/User.php b/src/Model/User.php index ecd1040b75..bc14098d40 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -282,7 +282,7 @@ class User if (!x($username) || !x($email) || !x($nickname)) { if ($openid_url) { - if (!validate_url($openid_url)) { + if (!Network::validateURL($openid_url)) { throw new Exception(L10n::t('Invalid OpenID url')); } $_SESSION['register'] = 1; @@ -305,7 +305,7 @@ class User throw new Exception(L10n::t('Please enter the required information.')); } - if (!validate_url($openid_url)) { + if (!Network::validateURL($openid_url)) { $openid_url = ''; } @@ -330,11 +330,11 @@ class User } } - if (!allowed_email($email)) { + if (!Network::allowedEmail($email)) { throw new Exception(L10n::t('Your email domain is not among those allowed on this site.')); } - if (!valid_email($email) || !validate_email($email)) { + if (!valid_email($email) || !Network::validateEmail($email)) { throw new Exception(L10n::t('Not a valid email address.')); } @@ -461,7 +461,7 @@ class User // if we have no OpenID photo try to look up an avatar if (!strlen($photo)) { - $photo = avatar_img($email); + $photo = Network::avatarImg($email); } // unless there is no avatar-addon loaded diff --git a/src/Module/Login.php b/src/Module/Login.php index fdfa6623fe..c6396a4148 100644 --- a/src/Module/Login.php +++ b/src/Module/Login.php @@ -10,6 +10,7 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Database\DBM; use Friendica\Model\User; +use Friendica\Util\Network; use dba; require_once 'boot.php'; @@ -59,7 +60,7 @@ class Login extends BaseModule $openid_url = trim($_POST['openid_url'] ? : $_POST['username']); // if it's an email address or doesn't resolve to a URL, fail. - if ($noid || strpos($openid_url, '@') || !validate_url($openid_url)) { + if ($noid || strpos($openid_url, '@') || !Network::validateURL($openid_url)) { notice(L10n::t('Login failed.') . EOL); goaway(self::getApp()->get_baseurl()); // NOTREACHED diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 94fd929e10..e3130a4d75 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -1510,7 +1510,7 @@ class Probe */ private static function mail($uri, $uid) { - if (!validate_email($uri)) { + if (!Network::validateEmail($uri)) { return false; } @@ -1544,7 +1544,7 @@ class Probe $data["network"] = NETWORK_MAIL; $data["name"] = substr($uri, 0, strpos($uri, '@')); $data["nick"] = $data["name"]; - $data["photo"] = avatar_img($uri); + $data["photo"] = Network::avatarImg($uri); $data["url"] = 'mailto:'.$uri; $data["notify"] = 'smtp '.random_string(); $data["poll"] = 'email '.random_string(); diff --git a/src/Util/Network.php b/src/Util/Network.php index e0400c7f0a..cc796c5f7a 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -79,7 +79,7 @@ class Network $a = get_app(); - if (blocked_url($url)) { + if (self::blockedURL($url)) { logger('z_fetch_url: domain of ' . $url . ' is blocked', LOGGER_DATA); return $ret; } @@ -281,7 +281,7 @@ class Network { $stamp1 = microtime(true); - if (blocked_url($url)) { + if (self::blockedURL($url)) { logger('post_url: domain of ' . $url . ' is blocked', LOGGER_DATA); return false; } @@ -622,7 +622,7 @@ class Network $allowed = explode(',', $str_allowed); - return allowed_domain($domain, $allowed); + return self::allowedDomain($domain, $allowed); } /**