Review update
Rename function, move others
This commit is contained in:
parent
0f1be37279
commit
f04d40a37e
55 changed files with 331 additions and 326 deletions
|
@ -734,7 +734,7 @@ function navbar_complete(App $a) {
|
|||
if (! $localsearch) {
|
||||
$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
|
||||
|
||||
$x = Network::zFetchURL(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search));
|
||||
$x = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search));
|
||||
if ($x['success']) {
|
||||
$j = json_decode($x['body'],true);
|
||||
if ($j && isset($j['results'])) {
|
||||
|
|
|
@ -5074,7 +5074,7 @@ function api_get_nick($profile)
|
|||
if ($StatusnetHost != $profile) {
|
||||
$StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
|
||||
if ($StatusnetUser != $profile) {
|
||||
$UserData = Network::fetchURL("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
|
||||
$UserData = Network::fetchUrl("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
|
||||
$user = json_decode($UserData);
|
||||
if ($user) {
|
||||
$nick = $user->screen_name;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
use Friendica\Content\Text\BBCode;
|
||||
use Friendica\Content\Text\Markdown;
|
||||
use Friendica\Core\Addon;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Util\Network;
|
||||
use League\HTMLToMarkdown\HtmlConverter;
|
||||
|
||||
require_once 'include/event.php';
|
||||
|
@ -83,7 +83,7 @@ function diaspora2bb($s) {
|
|||
$s = preg_replace('/(\[code\])+(.*?)(\[\/code\])+/ism', '[code]$2[/code]', $s);
|
||||
|
||||
// Don't show link to full picture (until it is fixed)
|
||||
$s = Network::scaleExternalImages($s, false);
|
||||
$s = BBCode::scaleExternalImages($s, false);
|
||||
|
||||
return $s;
|
||||
}
|
||||
|
|
|
@ -689,7 +689,7 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
|
|||
$StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
|
||||
if ($StatusnetUser != $profile) {
|
||||
/// @TODO Some hosts run on https, not just http and sometimes http is disabled, let's support both here
|
||||
$UserData = Network::fetchURL("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
|
||||
$UserData = Network::fetchUrl("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
|
||||
$user = json_decode($UserData);
|
||||
if ($user) {
|
||||
if ($getnetwork) {
|
||||
|
@ -748,7 +748,7 @@ function bb_RemovePictureLinks($match) {
|
|||
$text = "[url=".$match[2]."]".$match[2]."[/url]";
|
||||
|
||||
// if its not a picture then look if its a page that contains a picture link
|
||||
$body = Network::fetchURL($match[1]);
|
||||
$body = Network::fetchUrl($match[1]);
|
||||
|
||||
$doc = new DOMDocument();
|
||||
@$doc->loadHTML($body);
|
||||
|
@ -803,7 +803,7 @@ function bb_CleanPictureLinksSub($match) {
|
|||
$text = "[img]".$match[2]."[/img]";
|
||||
|
||||
// if its not a picture then look if its a page that contains a picture link
|
||||
$body = Network::fetchURL($match[1]);
|
||||
$body = Network::fetchUrl($match[1]);
|
||||
|
||||
$doc = new DOMDocument();
|
||||
@$doc->loadHTML($body);
|
||||
|
|
|
@ -15,7 +15,7 @@ use Friendica\Model\Contact;
|
|||
use Friendica\Model\Profile;
|
||||
use Friendica\Object\Thread;
|
||||
use Friendica\Object\Post;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Util\XML;
|
||||
|
||||
require_once "include/bbcode.php";
|
||||
require_once "include/acl_selectors.php";
|
||||
|
@ -185,8 +185,8 @@ function localize_item(&$item) {
|
|||
|
||||
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
||||
|
||||
$obj = Network::parseXmlString($xmlhead.$item['object']);
|
||||
$links = Network::parseXmlString($xmlhead."<links>".unxmlify($obj->link)."</links>");
|
||||
$obj = XML::parseString($xmlhead.$item['object']);
|
||||
$links = XML::parseString($xmlhead."<links>".unxmlify($obj->link)."</links>");
|
||||
|
||||
$Bname = $obj->title;
|
||||
$Blink = ""; $Bphoto = "";
|
||||
|
@ -221,8 +221,8 @@ function localize_item(&$item) {
|
|||
|
||||
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
|
||||
|
||||
$obj = Network::parseXmlString($xmlhead.$item['object']);
|
||||
$links = Network::parseXmlString($xmlhead."<links>".unxmlify($obj->link)."</links>");
|
||||
$obj = XML::parseString($xmlhead.$item['object']);
|
||||
$links = XML::parseString($xmlhead."<links>".unxmlify($obj->link)."</links>");
|
||||
|
||||
$Bname = $obj->title;
|
||||
$Blink = "";
|
||||
|
@ -296,7 +296,7 @@ function localize_item(&$item) {
|
|||
}
|
||||
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
|
||||
|
||||
$parsedobj = Network::parseXmlString($xmlhead.$item['object']);
|
||||
$parsedobj = XML::parseString($xmlhead.$item['object']);
|
||||
|
||||
$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
|
||||
$item['body'] = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag );
|
||||
|
@ -313,7 +313,7 @@ function localize_item(&$item) {
|
|||
|
||||
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
|
||||
|
||||
$obj = Network::parseXmlString($xmlhead.$item['object']);
|
||||
$obj = XML::parseString($xmlhead.$item['object']);
|
||||
if (strlen($obj->id)) {
|
||||
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc($obj->id),
|
||||
|
|
|
@ -363,7 +363,7 @@ function addHostnameSub($matches, $basepath)
|
|||
$url = $matches[1];
|
||||
|
||||
$parts = array_merge($base, parse_url($url));
|
||||
$url2 = Network::unParseURL($parts);
|
||||
$url2 = Network::unparseURL($parts);
|
||||
|
||||
return str_replace($url, $url2, $link);
|
||||
}
|
||||
|
|
|
@ -1481,7 +1481,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
|
|||
dba::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
|
||||
}
|
||||
|
||||
Network::postURL($url, $params);
|
||||
Network::post($url, $params);
|
||||
|
||||
logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG);
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@ use Friendica\Network\Probe;
|
|||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Util\Crypto;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Util\XML;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
require_once 'include/items.php';
|
||||
|
@ -221,7 +222,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
*
|
||||
*/
|
||||
|
||||
$res = Network::postURL($dfrn_confirm, $params, null, $redirects, 120);
|
||||
$res = Network::post($dfrn_confirm, $params, null, $redirects, 120);
|
||||
|
||||
logger(' Confirm: received data: ' . $res, LOGGER_DATA);
|
||||
|
||||
|
@ -252,7 +253,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
return;
|
||||
}
|
||||
|
||||
$xml = Network::parseXmlString($res);
|
||||
$xml = XML::parseString($res);
|
||||
$status = (int) $xml->status;
|
||||
$message = unxmlify($xml->message); // human readable text of what may have gone wrong.
|
||||
switch ($status) {
|
||||
|
@ -493,7 +494,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
$user = dba::selectFirst('user', [], ['nickname' => $node]);
|
||||
if (!DBM::is_result($user)) {
|
||||
$message = L10n::t('No user record found for \'%s\' ', $node);
|
||||
Network::xmlStatus(3, $message); // failure
|
||||
Network::xmlExit(3, $message); // failure
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -503,7 +504,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
|
||||
if (!strstr($my_prvkey, 'PRIVATE KEY')) {
|
||||
$message = L10n::t('Our site encryption key is apparently messed up.');
|
||||
Network::xmlStatus(3, $message);
|
||||
Network::xmlExit(3, $message);
|
||||
}
|
||||
|
||||
// verify everything
|
||||
|
@ -514,7 +515,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
|
||||
if (!strlen($decrypted_source_url)) {
|
||||
$message = L10n::t('Empty site URL was provided or URL could not be decrypted by us.');
|
||||
Network::xmlStatus(3, $message);
|
||||
Network::xmlExit(3, $message);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -530,7 +531,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
if (!DBM::is_result($contact)) {
|
||||
// this is either a bogus confirmation (?) or we deleted the original introduction.
|
||||
$message = L10n::t('Contact record was not found for you on our site.');
|
||||
Network::xmlStatus(3, $message);
|
||||
Network::xmlExit(3, $message);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
}
|
||||
|
@ -544,7 +545,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
|
||||
if (!$foreign_pubkey) {
|
||||
$message = L10n::t('Site public key not available in contact record for URL %s.', $decrypted_source_url);
|
||||
Network::xmlStatus(3, $message);
|
||||
Network::xmlExit(3, $message);
|
||||
}
|
||||
|
||||
$decrypted_dfrn_id = "";
|
||||
|
@ -560,7 +561,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
|
||||
if (dba::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
|
||||
$message = L10n::t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
|
||||
Network::xmlStatus(1, $message); // Birthday paradox - duplicate dfrn-id
|
||||
Network::xmlExit(1, $message); // Birthday paradox - duplicate dfrn-id
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -571,7 +572,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
);
|
||||
if (!DBM::is_result($r)) {
|
||||
$message = L10n::t('Unable to set your contact credentials on our system.');
|
||||
Network::xmlStatus(3, $message);
|
||||
Network::xmlExit(3, $message);
|
||||
}
|
||||
|
||||
// It's possible that the other person also requested friendship.
|
||||
|
@ -626,7 +627,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
);
|
||||
if (!DBM::is_result($r)) { // indicates schema is messed up or total db failure
|
||||
$message = L10n::t('Unable to update your contact profile details on our system');
|
||||
Network::xmlStatus(3, $message);
|
||||
Network::xmlExit(3, $message);
|
||||
}
|
||||
|
||||
// Otherwise everything seems to have worked and we are almost done. Yay!
|
||||
|
@ -707,7 +708,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
}
|
||||
}
|
||||
}
|
||||
Network::xmlStatus(0); // Success
|
||||
Network::xmlExit(0); // Success
|
||||
return; // NOTREACHED
|
||||
////////////////////// End of this scenario ///////////////////////////////////////////////
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ function dfrn_notify_post(App $a) {
|
|||
);
|
||||
if (! DBM::is_result($r)) {
|
||||
logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
|
||||
Network::xmlStatus(3, 'Could not match challenge');
|
||||
Network::xmlExit(3, 'Could not match challenge');
|
||||
}
|
||||
|
||||
$r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s'",
|
||||
|
@ -71,7 +71,7 @@ function dfrn_notify_post(App $a) {
|
|||
$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
|
||||
break;
|
||||
default:
|
||||
Network::xmlStatus(3, 'Invalid direction');
|
||||
Network::xmlExit(3, 'Invalid direction');
|
||||
break; // NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -97,7 +97,7 @@ function dfrn_notify_post(App $a) {
|
|||
|
||||
if (! DBM::is_result($r)) {
|
||||
logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id);
|
||||
Network::xmlStatus(3, 'Contact not found');
|
||||
Network::xmlExit(3, 'Contact not found');
|
||||
//NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -123,7 +123,7 @@ function dfrn_notify_post(App $a) {
|
|||
|
||||
// if contact's ssl policy changed, update our links
|
||||
|
||||
Network::fixContactSslPolicy($importer, $ssl_policy);
|
||||
$importer = Contact::updateSslPolicy($importer, $ssl_policy);
|
||||
|
||||
logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
|
||||
logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
|
||||
|
@ -132,7 +132,7 @@ function dfrn_notify_post(App $a) {
|
|||
// Relationship is dissolved permanently
|
||||
Contact::remove($importer['id']);
|
||||
logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
|
||||
Network::xmlStatus(0, 'relationship dissolved');
|
||||
Network::xmlExit(0, 'relationship dissolved');
|
||||
}
|
||||
|
||||
$rino = Config::get('system', 'rino_encrypt');
|
||||
|
@ -146,7 +146,7 @@ function dfrn_notify_post(App $a) {
|
|||
// but only for $remote_rino > 1, because old code did't send rino version
|
||||
if ($rino_remote > 1 && $rino < $rino_remote) {
|
||||
logger("rino version '$rino_remote' is lower than supported '$rino'");
|
||||
Network::xmlStatus(0, "rino version '$rino_remote' is lower than supported '$rino'");
|
||||
Network::xmlExit(0, "rino version '$rino_remote' is lower than supported '$rino'");
|
||||
}
|
||||
|
||||
$rawkey = hex2bin(trim($key));
|
||||
|
@ -176,14 +176,14 @@ function dfrn_notify_post(App $a) {
|
|||
break;
|
||||
default:
|
||||
logger("rino: invalid sent version '$rino_remote'");
|
||||
Network::xmlStatus(0, "Invalid sent version '$rino_remote'");
|
||||
Network::xmlExit(0, "Invalid sent version '$rino_remote'");
|
||||
}
|
||||
|
||||
logger('rino: decrypted data: ' . $data, LOGGER_DATA);
|
||||
}
|
||||
|
||||
$ret = DFRN::import($data, $importer);
|
||||
Network::xmlStatus($ret, 'Processed');
|
||||
Network::xmlExit($ret, 'Processed');
|
||||
|
||||
// NOTREACHED
|
||||
}
|
||||
|
|
|
@ -12,6 +12,7 @@ use Friendica\Module\Login;
|
|||
use Friendica\Protocol\DFRN;
|
||||
use Friendica\Protocol\OStatus;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Util\XML;
|
||||
|
||||
require_once 'include/items.php';
|
||||
|
||||
|
@ -99,12 +100,12 @@ function dfrn_poll_init(App $a)
|
|||
);
|
||||
|
||||
if (DBM::is_result($r)) {
|
||||
$s = Network::fetchURL($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
|
||||
$s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
|
||||
|
||||
logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
|
||||
|
||||
if (strlen($s)) {
|
||||
$xml = Network::parseXmlString($s);
|
||||
$xml = XML::parseString($s);
|
||||
|
||||
if ((int) $xml->status === 1) {
|
||||
$_SESSION['authenticated'] = 1;
|
||||
|
@ -144,7 +145,7 @@ function dfrn_poll_init(App $a)
|
|||
dbesc($sec)
|
||||
);
|
||||
if (!DBM::is_result($r)) {
|
||||
Network::xmlStatus(3, 'No ticket');
|
||||
Network::xmlExit(3, 'No ticket');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -157,7 +158,7 @@ function dfrn_poll_init(App $a)
|
|||
intval($r[0]['cid'])
|
||||
);
|
||||
if (!DBM::is_result($c)) {
|
||||
Network::xmlStatus(3, 'No profile');
|
||||
Network::xmlExit(3, 'No profile');
|
||||
}
|
||||
|
||||
$contact = $c[0];
|
||||
|
@ -184,7 +185,7 @@ function dfrn_poll_init(App $a)
|
|||
if ($final_dfrn_id != $orig_id) {
|
||||
logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
|
||||
// did not decode properly - cannot trust this site
|
||||
Network::xmlStatus(3, 'Bad decryption');
|
||||
Network::xmlExit(3, 'Bad decryption');
|
||||
}
|
||||
|
||||
header("Content-type: text/xml");
|
||||
|
@ -208,10 +209,10 @@ function dfrn_poll_init(App $a)
|
|||
$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
|
||||
dbesc($dfrn_id));
|
||||
if (DBM::is_result($r)) {
|
||||
Network::xmlStatus(1);
|
||||
Network::xmlExit(1);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
Network::xmlStatus(0);
|
||||
Network::xmlExit(0);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
}
|
||||
|
@ -236,7 +237,7 @@ function dfrn_poll_post(App $a)
|
|||
dbesc($sec)
|
||||
);
|
||||
if (!DBM::is_result($r)) {
|
||||
Network::xmlStatus(3, 'No ticket');
|
||||
Network::xmlExit(3, 'No ticket');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -249,7 +250,7 @@ function dfrn_poll_post(App $a)
|
|||
intval($r[0]['cid'])
|
||||
);
|
||||
if (!DBM::is_result($c)) {
|
||||
Network::xmlStatus(3, 'No profile');
|
||||
Network::xmlExit(3, 'No profile');
|
||||
}
|
||||
|
||||
$contact = $c[0];
|
||||
|
@ -276,7 +277,7 @@ function dfrn_poll_post(App $a)
|
|||
if ($final_dfrn_id != $orig_id) {
|
||||
logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
|
||||
// did not decode properly - cannot trust this site
|
||||
Network::xmlStatus(3, 'Bad decryption');
|
||||
Network::xmlExit(3, 'Bad decryption');
|
||||
}
|
||||
|
||||
header("Content-type: text/xml");
|
||||
|
@ -482,7 +483,7 @@ function dfrn_poll_content(App $a)
|
|||
if (($type === 'profile') && (strlen($sec))) {
|
||||
// URL reply
|
||||
if ($dfrn_version < 2.2) {
|
||||
$s = Network::fetchURL($r[0]['poll']
|
||||
$s = Network::fetchUrl($r[0]['poll']
|
||||
. '?dfrn_id=' . $encrypted_id
|
||||
. '&type=profile-check'
|
||||
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
|
||||
|
@ -490,7 +491,7 @@ function dfrn_poll_content(App $a)
|
|||
. '&sec=' . $sec
|
||||
);
|
||||
} else {
|
||||
$s = Network::postURL($r[0]['poll'], [
|
||||
$s = Network::post($r[0]['poll'], [
|
||||
'dfrn_id' => $encrypted_id,
|
||||
'type' => 'profile-check',
|
||||
'dfrn_version' => DFRN_PROTOCOL_VERSION,
|
||||
|
@ -521,7 +522,7 @@ function dfrn_poll_content(App $a)
|
|||
logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
|
||||
|
||||
if (strlen($s) && strstr($s, '<?xml')) {
|
||||
$xml = Network::parseXmlString($s);
|
||||
$xml = XML::parseString($s);
|
||||
|
||||
logger('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), LOGGER_DATA);
|
||||
|
||||
|
|
|
@ -183,7 +183,7 @@ function dfrn_request_post(App $a)
|
|||
}
|
||||
|
||||
if (strlen($dfrn_request) && strlen($confirm_key)) {
|
||||
$s = Network::fetchURL($dfrn_request . '?confirm_key=' . $confirm_key);
|
||||
$s = Network::fetchUrl($dfrn_request . '?confirm_key=' . $confirm_key);
|
||||
}
|
||||
|
||||
// (ignore reply, nothing we can do it failed)
|
||||
|
@ -332,20 +332,20 @@ function dfrn_request_post(App $a)
|
|||
intval($contact_record['id'])
|
||||
);
|
||||
} else {
|
||||
$url = Network::validateURL($url);
|
||||
$url = Network::isUrlValid($url);
|
||||
if (!$url) {
|
||||
notice(L10n::t('Invalid profile URL.') . EOL);
|
||||
goaway(System::baseUrl() . '/' . $a->cmd);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
if (!Network::allowedURL($url)) {
|
||||
if (!Network::isUrlAllowed($url)) {
|
||||
notice(L10n::t('Disallowed profile URL.') . EOL);
|
||||
goaway(System::baseUrl() . '/' . $a->cmd);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
if (Network::blockedURL($url)) {
|
||||
if (Network::isUrlBlocked($url)) {
|
||||
notice(L10n::t('Blocked domain') . EOL);
|
||||
goaway(System::baseUrl() . '/' . $a->cmd);
|
||||
return; // NOTREACHED
|
||||
|
|
|
@ -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) && Network::validateEmail($search)) ||
|
||||
if ((valid_email($search) && Network::isEmailDomainValid($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]));
|
||||
|
@ -178,7 +178,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
|
||||
|
||||
if(strlen(Config::get('system','directory')))
|
||||
$x = Network::fetchURL(get_server().'/lsearch?f=' . $p . '&search=' . urlencode($search));
|
||||
$x = Network::fetchUrl(get_server().'/lsearch?f=' . $p . '&search=' . urlencode($search));
|
||||
|
||||
$j = json_decode($x);
|
||||
}
|
||||
|
|
|
@ -91,7 +91,7 @@ function hovercard_content()
|
|||
|
||||
return $o;
|
||||
} else {
|
||||
Network::jsonReturnAndDie($profile);
|
||||
Network::jsonExit($profile);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -483,10 +483,10 @@ function check_htaccess(&$checks) {
|
|||
$status = true;
|
||||
$help = "";
|
||||
if (function_exists('curl_init')) {
|
||||
$test = Network::fetchURL(System::baseUrl()."/install/testrewrite");
|
||||
$test = Network::fetchUrl(System::baseUrl()."/install/testrewrite");
|
||||
|
||||
if ($test != "ok") {
|
||||
$test = Network::fetchURL(normalise_link(System::baseUrl()."/install/testrewrite"));
|
||||
$test = Network::fetchUrl(normalise_link(System::baseUrl()."/install/testrewrite"));
|
||||
}
|
||||
|
||||
if ($test != "ok") {
|
||||
|
|
|
@ -29,7 +29,6 @@ use Friendica\Network\Probe;
|
|||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Protocol\Email;
|
||||
use Friendica\Util\Emailer;
|
||||
use Friendica\Util\Network;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
require_once 'include/tags.php';
|
||||
|
@ -520,7 +519,7 @@ function item_post(App $a) {
|
|||
// Fold multi-line [code] sequences
|
||||
$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
|
||||
|
||||
$body = Network::scaleExternalImages($body, false);
|
||||
$body = BBCode::scaleExternalImages($body, false);
|
||||