Browse Source

Remove old file

remove network.php and all require_once statements
pull/4339/head
Adam Magness 4 years ago
parent
commit
0f1be37279
  1. 1
      boot.php
  2. 4
      include/bbcode.php
  3. 58
      include/network.php
  4. 1
      src/Content/Text/BBCode.php
  5. 1
      src/Model/GContact.php
  6. 1
      src/Model/User.php
  7. 2
      src/Network/Probe.php
  8. 1
      src/Protocol/PortableContact.php
  9. 1
      src/Util/ParseUrl.php

1
boot.php

@ -32,7 +32,6 @@ use Friendica\Model\Contact;
use Friendica\Database\DBStructure;
use Friendica\Module\Login;
require_once 'include/network.php';
require_once 'include/text.php';
require_once 'include/datetime.php';

4
include/bbcode.php

@ -748,8 +748,6 @@ 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
require_once("include/network.php");
$body = Network::fetchURL($match[1]);
$doc = new DOMDocument();
@ -805,8 +803,6 @@ 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
require_once("include/network.php");
$body = Network::fetchURL($match[1]);
$doc = new DOMDocument();

58
include/network.php

@ -1,58 +0,0 @@
<?php
/**
* @file include/network.php
*/
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Util\Network;
use Friendica\Util\XML;
function parse_xml_string($s, $strict = true)
{
return Network::parseXmlString($s, $strict);
}
function scale_external_images($srctext, $include_link = true, $scale_replace = false)
{
return Network::scaleExternalImages($srctext, $include_link, $scale_replace);
}
function fix_contact_ssl_policy(&$contact, $new_policy)
{
Network::fixContactSslPolicy($contact, $new_policy);
}
function strip_tracking_query_params($url)
{
return Network::stripTrackingQueryParams($url);
}
function original_url($url, $depth = 1, $fetchbody = false)
{
return Network::originalURL($url, $depth, $fetchbody);
}
function short_link($url)
{
return Network::shortLink($url);
}
function json_return_and_die($x)
{
Network::jsonReturnAndDie($x);
}
function matching_url($url1, $url2)
{
return Network::matchingURL($url1, $url2);
}
function unParseUrl($parsed)
{
return Network::unParseURL($parsed);
}

1
src/Content/Text/BBCode.php

@ -12,7 +12,6 @@ use Friendica\Util\ParseUrl;
require_once "include/bbcode.php";
require_once "include/html2plain.php";
require_once "include/network.php";
class BBCode
{

1
src/Model/GContact.php

@ -19,7 +19,6 @@ use Exception;
require_once 'include/datetime.php';
require_once 'include/dba.php';
require_once 'include/network.php';
require_once 'include/html2bbcode.php';
/**

1
src/Model/User.php

@ -24,7 +24,6 @@ use Exception;
require_once 'boot.php';
require_once 'include/dba.php';
require_once 'include/enotify.php';
require_once 'include/network.php';
require_once 'library/openid.php';
require_once 'include/text.php';
/**

2
src/Network/Probe.php

@ -209,7 +209,7 @@ class Probe
/**
* @brief Check an URI for LRDD data
*
* this is a replacement for the "lrdd" function in include/network.php.
* this is a replacement for the "lrdd" function.
* It isn't used in this class and has some redundancies in the code.
* When time comes we can check the existing calls for "lrdd" if we can rework them.
*

1
src/Protocol/PortableContact.php

@ -23,7 +23,6 @@ use Exception;
require_once 'include/dba.php';
require_once 'include/datetime.php';
require_once 'include/network.php';
require_once 'include/html2bbcode.php';
class PortableContact

1
src/Util/ParseUrl.php

@ -16,7 +16,6 @@ use DOMXPath;
use DOMDocument;
require_once 'include/dba.php';
require_once "include/network.php";
/**
* @brief Class with methods for extracting certain content from an url

Loading…
Cancel
Save