mirror of
https://github.com/friendica/friendica
synced 2025-04-26 01:10:15 +00:00
Move xml to namespace
Relocate xml from include to src Related to #3878
This commit is contained in:
Adam Magness
parent
037d6ac17b
commit
f245bc8359
12 changed files with 5394 additions and 5137 deletions
|
|
@ -8,8 +8,7 @@ use Friendica\App;
|
|||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
require_once("include/xml.php");
|
||||
use Friendica\Util\Xml;
|
||||
|
||||
/**
|
||||
* @brief Curl wrapper
|
||||
|
|
@ -18,18 +17,18 @@ require_once("include/xml.php");
|
|||
* Set the cookiejar argument to a string (e.g. "/tmp/friendica-cookies.txt")
|
||||
* to preserve cookies from one request to the next.
|
||||
*
|
||||
* @param string $url URL to fetch
|
||||
* @param boolean $binary default false
|
||||
* TRUE if asked to return binary results (file download)
|
||||
* @param integer $redirects The recursion counter for internal use - default 0
|
||||
* @param integer $timeout Timeout in seconds, default system config value or 60 seconds
|
||||
* @param string $accept_content supply Accept: header with 'accept_content' as the value
|
||||
* @param string $cookiejar Path to cookie jar file
|
||||
* @param string $url URL to fetch
|
||||
* @param boolean $binary default false
|
||||
* TRUE if asked to return binary results (file download)
|
||||
* @param integer $redirects The recursion counter for internal use - default 0
|
||||
* @param integer $timeout Timeout in seconds, default system config value or 60 seconds
|
||||
* @param string $accept_content supply Accept: header with 'accept_content' as the value
|
||||
* @param string $cookiejar Path to cookie jar file
|
||||
*
|
||||
* @return string The fetched content
|
||||
*/
|
||||
function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_content=Null, $cookiejar = 0) {
|
||||
|
||||
function fetch_url($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = 0)
|
||||
{
|
||||
$ret = z_fetch_url(
|
||||
$url,
|
||||
$binary,
|
||||
|
|
@ -37,7 +36,8 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
|
|||
array('timeout'=>$timeout,
|
||||
'accept_content'=>$accept_content,
|
||||
'cookiejar'=>$cookiejar
|
||||
));
|
||||
)
|
||||
);
|
||||
|
||||
return($ret['body']);
|
||||
}
|
||||
|
|
@ -45,17 +45,17 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
|
|||
/**
|
||||
* @brief fetches an URL.
|
||||
*
|
||||
* @param string $url URL to fetch
|
||||
* @param boolean $binary default false
|
||||
* TRUE if asked to return binary results (file download)
|
||||
* @param int $redirects The recursion counter for internal use - default 0
|
||||
* @param array $opts (optional parameters) assoziative array with:
|
||||
* 'accept_content' => supply Accept: header with 'accept_content' as the value
|
||||
* 'timeout' => int Timeout in seconds, default system config value or 60 seconds
|
||||
* 'http_auth' => username:password
|
||||
* 'novalidate' => do not validate SSL certs, default is to validate using our CA list
|
||||
* 'nobody' => only return the header
|
||||
* 'cookiejar' => path to cookie jar file
|
||||
* @param string $url URL to fetch
|
||||
* @param boolean $binary default false
|
||||
* TRUE if asked to return binary results (file download)
|
||||
* @param int $redirects The recursion counter for internal use - default 0
|
||||
* @param array $opts (optional parameters) assoziative array with:
|
||||
* 'accept_content' => supply Accept: header with 'accept_content' as the value
|
||||
* 'timeout' => int Timeout in seconds, default system config value or 60 seconds
|
||||
* 'http_auth' => username:password
|
||||
* 'novalidate' => do not validate SSL certs, default is to validate using our CA list
|
||||
* 'nobody' => only return the header
|
||||
* 'cookiejar' => path to cookie jar file
|
||||
*
|
||||
* @return array an assoziative array with:
|
||||
* int 'return_code' => HTTP return code or 0 if timeout or failure
|
||||
|
|
@ -64,7 +64,8 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
|
|||
* string 'header' => HTTP headers
|
||||
* string 'body' => fetched content
|
||||
*/
|
||||
function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
|
||||
function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array())
|
||||
{
|
||||
$ret = array('return_code' => 0, 'success' => false, 'header' => '', 'info' => '', 'body' => '');
|
||||
|
||||
$stamp1 = microtime(true);
|
||||
|
|
@ -89,14 +90,16 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
|
|||
curl_setopt($ch, CURLOPT_COOKIEFILE, $opts["cookiejar"]);
|
||||
}
|
||||
|
||||
// These settings aren't needed. We're following the location already.
|
||||
// @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
|
||||
// @curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
|
||||
// These settings aren't needed. We're following the location already.
|
||||
// @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
|
||||
// @curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
|
||||
|
||||
if (x($opts, 'accept_content')) {
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, array(
|
||||
'Accept: ' . $opts['accept_content']
|
||||
));
|
||||
curl_setopt(
|
||||
$ch,
|
||||
CURLOPT_HTTPHEADER,
|
||||
array('Accept: ' . $opts['accept_content'])
|
||||
);
|
||||
}
|
||||
|
||||
@curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
|
|
@ -192,7 +195,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
|
|||
// allow for HTTP/2.x without fixing code
|
||||
|
||||
while (preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/', $base)) {
|
||||
$chunk = substr($base, 0, strpos($base,"\r\n\r\n") + 4);
|
||||
$chunk = substr($base, 0, strpos($base, "\r\n\r\n") + 4);
|
||||
$header .= $chunk;
|
||||
$base = substr($base, strlen($chunk));
|
||||
}
|
||||
|
|
@ -216,7 +219,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
|
|||
if (preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches)) {
|
||||
$newurl = trim(array_pop($matches));
|
||||
}
|
||||
if (strpos($newurl,'/') === 0) {
|
||||
if (strpos($newurl, '/') === 0) {
|
||||
$newurl = $old_location_info["scheme"]."://".$old_location_info["host"].$newurl;
|
||||
}
|
||||
|
||||
|
|
@ -261,15 +264,16 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
|
|||
/**
|
||||
* @brief Send POST request to $url
|
||||
*
|
||||
* @param string $url URL to post
|
||||
* @param mixed $params array of POST variables
|
||||
* @param string $headers HTTP headers
|
||||
* @param string $url URL to post
|
||||
* @param mixed $params array of POST variables
|
||||
* @param string $headers HTTP headers
|
||||
* @param integer $redirects Recursion counter for internal use - default = 0
|
||||
* @param integer $timeout The timeout in seconds, default system config value or 60 seconds
|
||||
* @param integer $timeout The timeout in seconds, default system config value or 60 seconds
|
||||
*
|
||||
* @return string The content
|
||||
*/
|
||||
function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0) {
|
||||
function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
|
||||
{
|
||||
$stamp1 = microtime(true);
|
||||
|
||||
if (blocked_url($url)) {
|
||||
|
|
@ -394,8 +398,8 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
|
|||
// Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
|
||||
// of $st and an optional text <message> of $message and terminates the current process.
|
||||
|
||||
function xml_status($st, $message = '') {
|
||||
|
||||
function xml_status($st, $message = '')
|
||||
{
|
||||
$result = array('status' => $st);
|
||||
|
||||
if ($message != '') {
|
||||
|
|
@ -410,7 +414,7 @@ function xml_status($st, $message = '') {
|
|||
|
||||
$xmldata = array("result" => $result);
|
||||
|
||||
echo xml::from_array($xmldata, $xml);
|
||||
echo Xml::from_array($xmldata, $xml);
|
||||
|
||||
killme();
|
||||
}
|
||||
|
|
@ -427,17 +431,19 @@ function xml_status($st, $message = '') {
|
|||
/**
|
||||
* @brief Send HTTP status header and exit.
|
||||
*
|
||||
* @param integer $val HTTP status result value
|
||||
* @param array $description optional message
|
||||
* 'title' => header title
|
||||
* 'description' => optional message
|
||||
* @param integer $val HTTP status result value
|
||||
* @param array $description optional message
|
||||
* 'title' => header title
|
||||
* 'description' => optional message
|
||||
*/
|
||||
function http_status_exit($val, $description = array()) {
|
||||
function http_status_exit($val, $description = array())
|
||||
{
|
||||
$err = '';
|
||||
if ($val >= 400) {
|
||||
$err = 'Error';
|
||||
if (!isset($description["title"]))
|
||||
if (!isset($description["title"])) {
|
||||
$description["title"] = $err." ".$val;
|
||||
}
|
||||
}
|
||||
if ($val >= 200 && $val < 300)
|
||||
$err = 'OK';
|
||||
|
|
@ -447,12 +453,15 @@ function http_status_exit($val, $description = array()) {
|
|||
|
||||
if (isset($description["title"])) {
|
||||
$tpl = get_markup_template('http_status.tpl');
|
||||
echo replace_macros($tpl, array('$title' => $description["title"],
|
||||
'$description' => $description["description"]));
|
||||
echo replace_macros(
|
||||
$tpl,
|
||||
array(
|
||||
'$title' => $description["title"],
|
||||
'$description' => $description["description"])
|
||||
);
|
||||
}
|
||||
|
||||
killme();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -464,15 +473,17 @@ function http_status_exit($val, $description = array()) {
|
|||
* @param string $url The URL to be validated
|
||||
* @return boolean True if it's a valid URL, fals if something wrong with it
|
||||
*/
|
||||
function validate_url(&$url) {
|
||||
if (Config::get('system','disable_url_validation'))
|
||||
function validate_url(&$url)
|
||||
{
|
||||
if (Config::get('system', 'disable_url_validation')) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// no naked subdomains (allow localhost for tests)
|
||||
if (strpos($url,'.') === false && strpos($url,'/localhost/') === false)
|
||||
if (strpos($url, '.') === false && strpos($url, '/localhost/') === false)
|
||||
return false;
|
||||
|
||||
if (substr($url,0,4) != 'http')
|
||||
if (substr($url, 0, 4) != 'http')
|
||||
$url = 'http://' . $url;
|
||||
|
||||
/// @TODO Really supress function outcomes? Why not find them + debug them?
|
||||
|
|
@ -491,14 +502,17 @@ function validate_url(&$url) {
|
|||
* @param string $addr The email address
|
||||
* @return boolean True if it's a valid email address, false if it's not
|
||||
*/
|
||||
function validate_email($addr) {
|
||||
|
||||
if (Config::get('system','disable_email_validation'))
|
||||
function validate_email($addr)
|
||||
{
|
||||
if (Config::get('system', 'disable_email_validation')) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (! strpos($addr,'@'))
|
||||
if (! strpos($addr, '@')) {
|
||||
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) || filter_var($h, FILTER_VALIDATE_IP) )) {
|
||||
return true;
|
||||
|
|
@ -515,8 +529,8 @@ function validate_email($addr) {
|
|||
* @param string $url URL which get tested
|
||||
* @return boolean True if url is allowed otherwise return false
|
||||
*/
|
||||
function allowed_url($url) {
|
||||
|
||||
function allowed_url($url)
|
||||
{
|
||||
$h = @parse_url($url);
|
||||
|
||||
if (! $h) {
|
||||
|
|
@ -556,10 +570,11 @@ function allowed_url($url) {
|
|||
* Checks if the provided url domain is on the domain blocklist.
|
||||
* Returns true if it is or malformed URL, false if not.
|
||||
*
|
||||
* @param string $url The url to check the domain from
|
||||
* @param string $url The url to check the domain from
|
||||
* @return boolean
|
||||
*/
|
||||
function blocked_url($url) {
|
||||
function blocked_url($url)
|
||||
{
|
||||
$h = @parse_url($url);
|
||||
|
||||
if (! $h) {
|
||||
|
|
@ -587,18 +602,18 @@ function blocked_url($url) {
|
|||
*
|
||||
* Compare against our list (wildcards allowed).
|
||||
*
|
||||
* @param type $email
|
||||
* @param string $email email address
|
||||
* @return boolean False if not allowed, true if allowed
|
||||
* or if allowed list is not configured
|
||||
*/
|
||||
function allowed_email($email) {
|
||||
|
||||
$domain = strtolower(substr($email,strpos($email,'@') + 1));
|
||||
function allowed_email($email)
|
||||
{
|
||||
$domain = strtolower(substr($email, strpos($email, '@') + 1));
|
||||
if (! $domain) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$str_allowed = Config::get('system','allowed_email');
|
||||
$str_allowed = Config::get('system', 'allowed_email');
|
||||
if (! $str_allowed) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -606,12 +621,12 @@ function allowed_email($email) {
|
|||
$found = false;
|
||||
|
||||
$fnmatch = function_exists('fnmatch');
|
||||
$allowed = explode(',',$str_allowed);
|
||||
$allowed = explode(',', $str_allowed);
|
||||
|
||||
if (count($allowed)) {
|
||||
foreach ($allowed as $a) {
|
||||
$pat = strtolower(trim($a));
|
||||
if (($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
|
||||
if (($fnmatch && fnmatch($pat, $domain)) || ($pat == $domain)) {
|
||||
$found = true;
|
||||
break;
|
||||
}
|
||||
|
|
@ -620,8 +635,8 @@ function allowed_email($email) {
|
|||
return $found;
|
||||
}
|
||||
|
||||
function avatar_img($email) {
|
||||
|
||||
function avatar_img($email)
|
||||
{
|
||||
$avatar['size'] = 175;
|
||||
$avatar['email'] = $email;
|
||||
$avatar['url'] = '';
|
||||
|
|
@ -638,7 +653,8 @@ function avatar_img($email) {
|
|||
}
|
||||
|
||||
|
||||
function parse_xml_string($s, $strict = true) {
|
||||
function parse_xml_string($s, $strict = true)
|
||||
{
|
||||
// the "strict" parameter is deactivated
|
||||
|
||||
/// @todo Move this function to the xml class
|
||||
|
|
@ -655,10 +671,10 @@ function parse_xml_string($s, $strict = true) {
|
|||
return $x;
|
||||
}
|
||||
|
||||
function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
|
||||
|
||||
function scale_external_images($srctext, $include_link = true, $scale_replace = false)
|
||||
{
|
||||
// Suppress "view full size"
|
||||
if (intval(Config::get('system','no_view_full_size'))) {
|
||||
if (intval(Config::get('system', 'no_view_full_size'))) {
|
||||
$include_link = false;
|
||||
}
|
||||
|
||||
|
|
@ -668,14 +684,14 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
|
|||
$s = htmlspecialchars_decode($srctext);
|
||||
|
||||
$matches = null;
|
||||
$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
|
||||
$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER);
|
||||
if ($c) {
|
||||
require_once('include/Photo.php');
|
||||
require_once 'include/Photo.php';
|
||||
foreach ($matches as $mtch) {
|
||||
logger('scale_external_image: ' . $mtch[1]);
|
||||
|
||||
$hostname = str_replace('www.','',substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3));
|
||||
if (stristr($mtch[1],$hostname)) {
|
||||
$hostname = str_replace('www.', '', substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3));
|
||||
if (stristr($mtch[1], $hostname)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -695,7 +711,7 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
|
|||
}
|
||||
|
||||
// guess mimetype from headers or filename
|
||||
$type = guess_image_type($mtch[1],true);
|
||||
$type = guess_image_type($mtch[1], true);
|
||||
|
||||
if ($i) {
|
||||
$ph = new Photo($i, $type);
|
||||
|
|
@ -704,15 +720,18 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
|
|||
$orig_height = $ph->getHeight();
|
||||
|
||||
if ($orig_width > 640 || $orig_height > 640) {
|
||||
|
||||
$ph->scaleImage(640);
|
||||
$new_width = $ph->getWidth();
|
||||
$new_height = $ph->getHeight();
|
||||
logger('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], LOGGER_DEBUG);
|
||||
$s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $scaled . '[/img]'
|
||||
$s = str_replace(
|
||||
$mtch[0],
|
||||
'[img=' . $new_width . 'x' . $new_height. ']' . $scaled . '[/img]'
|
||||
. "\n" . (($include_link)
|
||||
? '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n"
|
||||
: ''),$s);
|
||||
: ''),
|
||||
$s
|
||||
);
|
||||
logger('scale_external_images: new string: ' . $s, LOGGER_DEBUG);
|
||||
}
|
||||
}
|
||||
|
|
@ -721,32 +740,32 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
|
|||
}
|
||||
|
||||
// replace the special char encoding
|
||||
$s = htmlspecialchars($s,ENT_NOQUOTES,'UTF-8');
|
||||
$s = htmlspecialchars($s, ENT_NOQUOTES, 'UTF-8');
|
||||
return $s;
|
||||
}
|
||||
|
||||
|
||||
function fix_contact_ssl_policy(&$contact,$new_policy) {
|
||||
|
||||
function fix_contact_ssl_policy(&$contact, $new_policy)
|
||||
{
|
||||
$ssl_changed = false;
|
||||
if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'],'https:')) {
|
||||
if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
|
||||
$ssl_changed = true;
|
||||
$contact['url'] = str_replace('https:','http:',$contact['url']);
|
||||
$contact['request'] = str_replace('https:','http:',$contact['request']);
|
||||
$contact['notify'] = str_replace('https:','http:',$contact['notify']);
|
||||
$contact['poll'] = str_replace('https:','http:',$contact['poll']);
|
||||
$contact['confirm'] = str_replace('https:','http:',$contact['confirm']);
|
||||
$contact['poco'] = str_replace('https:','http:',$contact['poco']);
|
||||
$contact['url'] = str_replace('https:', 'http:', $contact['url']);
|
||||
$contact['request'] = str_replace('https:', 'http:', $contact['request']);
|
||||
$contact['notify'] = str_replace('https:', 'http:', $contact['notify']);
|
||||
$contact['poll'] = str_replace('https:', 'http:', $contact['poll']);
|
||||
$contact['confirm'] = str_replace('https:', 'http:', $contact['confirm']);
|
||||
$contact['poco'] = str_replace('https:', 'http:', $contact['poco']);
|
||||
}
|
||||
|
||||
if ((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'],'http:')) {
|
||||
if ((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'], 'http:')) {
|
||||
$ssl_changed = true;
|
||||
$contact['url'] = str_replace('http:','https:',$contact['url']);
|
||||
$contact['request'] = str_replace('http:','https:',$contact['request']);
|
||||
$contact['notify'] = str_replace('http:','https:',$contact['notify']);
|
||||
$contact['poll'] = str_replace('http:','https:',$contact['poll']);
|
||||
$contact['confirm'] = str_replace('http:','https:',$contact['confirm']);
|
||||
$contact['poco'] = str_replace('http:','https:',$contact['poco']);
|
||||
$contact['url'] = str_replace('http:', 'https:', $contact['url']);
|
||||
$contact['request'] = str_replace('http:', 'https:', $contact['request']);
|
||||
$contact['notify'] = str_replace('http:', 'https:', $contact['notify']);
|
||||
$contact['poll'] = str_replace('http:', 'https:', $contact['poll']);
|
||||
$contact['confirm'] = str_replace('http:', 'https:', $contact['confirm']);
|
||||
$contact['poco'] = str_replace('http:', 'https:', $contact['poco']);
|
||||
}
|
||||
|
||||
if ($ssl_changed) {
|
||||
|
|
@ -771,13 +790,17 @@ function strip_tracking_query_params($url)
|
|||
parse_str($query, $querydata);
|
||||
|
||||
if (is_array($querydata)) {
|
||||
foreach ($querydata AS $param => $value) {
|
||||
if (in_array($param, array("utm_source", "utm_medium", "utm_term", "utm_content", "utm_campaign",
|
||||
"wt_mc", "pk_campaign", "pk_kwd", "mc_cid", "mc_eid",
|
||||
"fb_action_ids", "fb_action_types", "fb_ref",
|
||||
"awesm", "wtrid",
|
||||
"woo_campaign", "woo_source", "woo_medium", "woo_content", "woo_term"))) {
|
||||
|
||||
foreach ($querydata as $param => $value) {
|
||||
if (in_array(
|
||||
$param,
|
||||
array(
|
||||
"utm_source", "utm_medium", "utm_term", "utm_content", "utm_campaign",
|
||||
"wt_mc", "pk_campaign", "pk_kwd", "mc_cid", "mc_eid",
|
||||
"fb_action_ids", "fb_action_types", "fb_ref",
|
||||
"awesm", "wtrid",
|
||||
"woo_campaign", "woo_source", "woo_medium", "woo_content", "woo_term")
|
||||
)
|
||||
) {
|
||||
$pair = $param . "=" . urlencode($value);
|
||||
$url = str_replace($pair, "", $url);
|
||||
|
||||
|
|
@ -812,18 +835,20 @@ function strip_tracking_query_params($url)
|
|||
*
|
||||
* @see ParseUrl::getSiteinfo
|
||||
*
|
||||
* @param string $url A user-submitted URL
|
||||
* @param int $depth The current redirection recursion level (internal)
|
||||
* @param bool $fetchbody Wether to fetch the body or not after the HEAD requests
|
||||
* @param string $url A user-submitted URL
|
||||
* @param int $depth The current redirection recursion level (internal)
|
||||
* @param bool $fetchbody Wether to fetch the body or not after the HEAD requests
|
||||
* @return string A canonical URL
|
||||
*/
|
||||
function original_url($url, $depth = 1, $fetchbody = false) {
|
||||
function original_url($url, $depth = 1, $fetchbody = false)
|
||||
{
|
||||
$a = get_app();
|
||||
|
||||
$url = strip_tracking_query_params($url);
|
||||
|
||||
if ($depth > 10)
|
||||
if ($depth > 10) {
|
||||
return($url);
|
||||
}
|
||||
|
||||
$url = trim($url, "'");
|
||||
|
||||
|
|
@ -849,24 +874,29 @@ function original_url($url, $depth = 1, $fetchbody = false) {
|
|||
return($url);
|
||||
|
||||
if ((($curl_info['http_code'] == "301") || ($curl_info['http_code'] == "302"))
|
||||
&& (($curl_info['redirect_url'] != "") || ($curl_info['location'] != ""))) {
|
||||
if ($curl_info['redirect_url'] != "")
|
||||
&& (($curl_info['redirect_url'] != "") || ($curl_info['location'] != ""))
|
||||
) {
|
||||
if ($curl_info['redirect_url'] != "") {
|
||||
return(original_url($curl_info['redirect_url'], ++$depth, $fetchbody));
|
||||
else
|
||||
} else {
|
||||
return(original_url($curl_info['location'], ++$depth, $fetchbody));
|
||||
}
|
||||
}
|
||||
|
||||
// Check for redirects in the meta elements of the body if there are no redirects in the header.
|
||||
if (!$fetchbody)
|
||||
if (!$fetchbody) {
|
||||
return(original_url($url, ++$depth, true));
|
||||
}
|
||||
|
||||
// if the file is too large then exit
|
||||
if ($curl_info["download_content_length"] > 1000000)
|
||||
if ($curl_info["download_content_length"] > 1000000) {
|
||||
return($url);
|
||||
}
|
||||
|
||||
// if it isn't a HTML file then exit
|
||||
if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]),"html"))
|
||||
if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]), "html")) {
|
||||
return($url);
|
||||
}
|
||||
|
||||
$stamp1 = microtime(true);
|
||||
|
||||
|
|
@ -883,8 +913,9 @@ function original_url($url, $depth = 1, $fetchbody = false) {
|
|||
|
||||
$a->save_timestamp($stamp1, "network");
|
||||
|
||||
if (trim($body) == "")
|
||||
if (trim($body) == "") {
|
||||
return($url);
|
||||
}
|
||||
|
||||
// Check for redirect in meta elements
|
||||
$doc = new DOMDocument();
|
||||
|
|
@ -895,29 +926,34 @@ function original_url($url, $depth = 1, $fetchbody = false) {
|
|||
$list = $xpath->query("//meta[@content]");
|
||||
foreach ($list as $node) {
|
||||
$attr = array();
|
||||
if ($node->attributes->length)
|
||||
foreach ($node->attributes as $attribute)
|
||||
if ($node->attributes->length) {
|
||||
foreach ($node->attributes as $attribute) {
|
||||
$attr[$attribute->name] = $attribute->value;
|
||||
}
|
||||
}
|
||||
|
||||
if (@$attr["http-equiv"] == 'refresh') {
|
||||
$path = $attr["content"];
|
||||
$pathinfo = explode(";", $path);
|
||||
$content = "";
|
||||
foreach ($pathinfo AS $value)
|
||||
if (substr(strtolower($value), 0, 4) == "url=")
|
||||
foreach ($pathinfo as $value) {
|
||||
if (substr(strtolower($value), 0, 4) == "url=") {
|
||||
return(original_url(substr($value, 4), ++$depth));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return($url);
|
||||
}
|
||||
|
||||
function short_link($url) {
|
||||
require_once('library/slinky.php');
|
||||
function short_link($url)
|
||||
{
|
||||
require_once 'library/slinky.php';
|
||||
$slinky = new Slinky($url);
|
||||
$yourls_url = Config::get('yourls','url1');
|
||||
$yourls_url = Config::get('yourls', 'url1');
|
||||
if ($yourls_url) {
|
||||
$yourls_username = Config::get('yourls','username1');
|
||||
$yourls_username = Config::get('yourls', 'username1');
|
||||
$yourls_password = Config::get('yourls', 'password1');
|
||||
$yourls_ssl = Config::get('yourls', 'ssl1');
|
||||
$yourls = new Slinky_YourLS();
|
||||
|
|
@ -944,7 +980,8 @@ function short_link($url) {
|
|||
*
|
||||
* @param array $x The input content
|
||||
*/
|
||||
function json_return_and_die($x) {
|
||||
function json_return_and_die($x)
|
||||
{
|
||||
header("content-type: application/json");
|
||||
echo json_encode($x);
|
||||
killme();
|
||||
|
|
@ -957,10 +994,11 @@ function json_return_and_die($x) {
|
|||
* @param string $url2
|
||||
* @return string The matching part
|
||||
*/
|
||||
function matching_url($url1, $url2) {
|
||||
|
||||
if (($url1 == "") || ($url2 == ""))
|
||||
function matching_url($url1, $url2)
|
||||
{
|
||||
if (($url1 == "") || ($url2 == "")) {
|
||||
return "";
|
||||
}
|
||||
|
||||
$url1 = normalise_link($url1);
|
||||
$url2 = normalise_link($url2);
|
||||
|
|
@ -968,22 +1006,27 @@ function matching_url($url1, $url2) {
|
|||
$parts1 = parse_url($url1);
|
||||
$parts2 = parse_url($url2);
|
||||
|
||||
if (!isset($parts1["host"]) || !isset($parts2["host"]))
|
||||
if (!isset($parts1["host"]) || !isset($parts2["host"])) {
|
||||
return "";
|
||||
}
|
||||
|
||||
if ($parts1["scheme"] != $parts2["scheme"])
|
||||
if ($parts1["scheme"] != $parts2["scheme"]) {
|
||||
return "";
|
||||
}
|
||||
|
||||
if ($parts1["host"] != $parts2["host"])
|
||||
if ($parts1["host"] != $parts2["host"]) {
|
||||
return "";
|
||||
}
|
||||
|
||||
if ($parts1["port"] != $parts2["port"])
|
||||
if ($parts1["port"] != $parts2["port"]) {
|
||||
return "";
|
||||
}
|
||||
|
||||
$match = $parts1["scheme"]."://".$parts1["host"];
|
||||
|
||||
if ($parts1["port"])
|
||||
if ($parts1["port"]) {
|
||||
$match .= ":".$parts1["port"];
|
||||
}
|
||||
|
||||
$pathparts1 = explode("/", $parts1["path"]);
|
||||
$pathparts2 = explode("/", $parts2["path"]);
|
||||
|
|
@ -994,9 +1037,9 @@ function matching_url($url1, $url2) {
|
|||
$path1 = $pathparts1[$i];
|
||||
$path2 = $pathparts2[$i];
|
||||
|
||||
if ($path1 == $path2)
|
||||
if ($path1 == $path2) {
|
||||
$path .= $path1."/";
|
||||
|
||||
}
|
||||
} while (($path1 == $path2) && ($i++ <= count($pathparts1)));
|
||||
|
||||
$match .= $path;
|
||||
|
|
@ -1011,7 +1054,8 @@ function matching_url($url1, $url2) {
|
|||
*
|
||||
* @return string The glued URL
|
||||
*/
|
||||
function unParseUrl($parsed) {
|
||||
function unParseUrl($parsed)
|
||||
{
|
||||
$get = function ($key) use ($parsed) {
|
||||
return isset($parsed[$key]) ? $parsed[$key] : null;
|
||||
};
|
||||
|
|
@ -1023,10 +1067,9 @@ function unParseUrl($parsed) {
|
|||
$scheme = $get('scheme');
|
||||
$query = $get('query');
|
||||
$fragment = $get('fragment');
|
||||
$authority =
|
||||
($userinfo !== null ? $userinfo."@" : '') .
|
||||
$get('host') .
|
||||
($port ? ":$port" : '');
|
||||
$authority = ($userinfo !== null ? $userinfo."@" : '') .
|
||||
$get('host') .
|
||||
($port ? ":$port" : '');
|
||||
|
||||
return (strlen($scheme) ? $scheme.":" : '') .
|
||||
(strlen($authority) ? "//".$authority : '') .
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue