mirror of
https://github.com/friendica/friendica
synced 2025-05-03 11:44:09 +02:00
Merge remote-tracking branch 'upstream/develop' into http-417
This commit is contained in:
Michael
commit
36ba7fa79c
316 changed files with 39229 additions and 36498 deletions
|
|
@ -57,7 +57,7 @@ class Emailer
|
|||
.rand(10000, 99999);
|
||||
|
||||
// generate a multipart/alternative message header
|
||||
$messageHeader = defaults($params, 'additionalMailHeader', '') .
|
||||
$messageHeader = ($params['additionalMailHeader'] ?? '') .
|
||||
"From: $fromName <{$params['fromEmail']}>\n" .
|
||||
"Reply-To: $fromName <{$params['replyTo']}>\n" .
|
||||
"MIME-Version: 1.0\n" .
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ class SyslogLogger extends AbstractLogger
|
|||
}
|
||||
|
||||
/**
|
||||
* Maps the LogLevel (@see LogLevel ) to a SysLog priority (@see http://php.net/manual/en/function.syslog.php#refsect1-function.syslog-parameters )
|
||||
* Maps the LogLevel (@see LogLevel) to a SysLog priority (@see http://php.net/manual/en/function.syslog.php#refsect1-function.syslog-parameters)
|
||||
*
|
||||
* @param string $level A LogLevel
|
||||
*
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ class Network
|
|||
|
||||
$parts2 = [];
|
||||
$parts = parse_url($url);
|
||||
$path_parts = explode('/', defaults($parts, 'path', ''));
|
||||
$path_parts = explode('/', $parts['path'] ?? '');
|
||||
foreach ($path_parts as $part) {
|
||||
if (strlen($part) <> mb_strlen($part)) {
|
||||
$parts2[] = rawurlencode($part);
|
||||
|
|
@ -395,7 +395,7 @@ Logger::info('Blubb', ['code' => $curlResponse->getReturnCode()]);
|
|||
/// @TODO Really suppress function outcomes? Why not find them + debug them?
|
||||
$h = @parse_url($url);
|
||||
|
||||
if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
|
||||
if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP))) {
|
||||
return $url;
|
||||
}
|
||||
|
||||
|
|
@ -421,7 +421,7 @@ Logger::info('Blubb', ['code' => $curlResponse->getReturnCode()]);
|
|||
$h = substr($addr, strpos($addr, '@') + 1);
|
||||
|
||||
// Concerning the @ see here: https://stackoverflow.com/questions/36280957/dns-get-record-a-temporary-server-error-occurred
|
||||
if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
|
||||
if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP))) {
|
||||
return true;
|
||||
}
|
||||
if ($h && @dns_get_record($h, DNS_CNAME + DNS_MX)) {
|
||||
|
|
@ -816,8 +816,8 @@ Logger::info('Blubb', ['code' => $curlResponse->getReturnCode()]);
|
|||
$i = 0;
|
||||
$path = "";
|
||||
do {
|
||||
$path1 = defaults($pathparts1, $i, '');
|
||||
$path2 = defaults($pathparts2, $i, '');
|
||||
$path1 = $pathparts1[$i] ?? '';
|
||||
$path2 = $pathparts2[$i] ?? '';
|
||||
|
||||
if ($path1 == $path2) {
|
||||
$path .= $path1."/";
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ class ParseUrl
|
|||
}
|
||||
|
||||
// If the file is too large then exit
|
||||
if (defaults($curlResult->getInfo(), 'download_content_length', 0) > 1000000) {
|
||||
if (($curlResult->getInfo()['download_content_length'] ?? 0) > 1000000) {
|
||||
return $siteinfo;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ use Psr\Log\LoggerInterface;
|
|||
* A class to store profiling data
|
||||
* It can handle different logging data for specific functions or global performance measures
|
||||
*
|
||||
* It stores the data as log entries (@see LoggerInterface )
|
||||
* It stores the data as log entries (@see LoggerInterface)
|
||||
*/
|
||||
class Profiler implements ContainerInterface
|
||||
{
|
||||
|
|
@ -79,7 +79,7 @@ class Profiler implements ContainerInterface
|
|||
return;
|
||||
}
|
||||
|
||||
$duration = (float) (microtime(true) - $timestamp);
|
||||
$duration = floatval(microtime(true) - $timestamp);
|
||||
|
||||
if (!isset($this->performance[$value])) {
|
||||
// Prevent ugly E_NOTICE
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ use Friendica\Database\DBA;
|
|||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Group;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Core\Session;
|
||||
|
||||
/**
|
||||
* Secures that User is allow to do requests
|
||||
|
|
@ -20,7 +21,7 @@ class Security extends BaseObject
|
|||
{
|
||||
static $verified = 0;
|
||||
|
||||
if (!local_user() && !remote_user()) {
|
||||
if (!Session::isAuthenticated()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -33,7 +34,7 @@ class Security extends BaseObject
|
|||
return true;
|
||||
}
|
||||
|
||||
if (remote_user()) {
|
||||
if (!empty(Session::getRemoteContactID($owner))) {
|
||||
// use remembered decision and avoid a DB lookup for each and every display item
|
||||
// DO NOT use this function if there are going to be multiple owners
|
||||
// We have a contact-id for an authenticated remote user, this block determines if the contact
|
||||
|
|
@ -44,24 +45,14 @@ class Security extends BaseObject
|
|||
} elseif ($verified === 1) {
|
||||
return false;
|
||||
} else {
|
||||
$cid = 0;
|
||||
|
||||
if (!empty($_SESSION['remote'])) {
|
||||
foreach ($_SESSION['remote'] as $visitor) {
|
||||
if ($visitor['uid'] == $owner) {
|
||||
$cid = $visitor['cid'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$cid = Session::getRemoteContactID($owner);
|
||||
if (!$cid) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `user`.`uid` = `contact`.`uid`
|
||||
WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||
AND `user`.`blockwall` = 0 AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
|
||||
AND `user`.`blockwall` = 0 AND `readonly` = 0 AND (`contact`.`rel` IN (%d , %d) OR `user`.`page-flags` = %d) LIMIT 1",
|
||||
intval($owner),
|
||||
intval($cid),
|
||||
intval(Contact::SHARING),
|
||||
|
|
@ -81,11 +72,10 @@ class Security extends BaseObject
|
|||
return false;
|
||||
}
|
||||
|
||||
/// @TODO $groups should be array
|
||||
public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null)
|
||||
public static function getPermissionsSQLByUserId($owner_id)
|
||||
{
|
||||
$local_user = local_user();
|
||||
$remote_user = remote_user();
|
||||
$remote_contact = Session::getRemoteContactID($owner_id);
|
||||
|
||||
/*
|
||||
* Construct permissions
|
||||
|
|
@ -93,10 +83,9 @@ class Security extends BaseObject
|
|||
* default permissions - anonymous user
|
||||
*/
|
||||
$sql = " AND allow_cid = ''
|
||||
AND allow_gid = ''
|
||||
AND deny_cid = ''
|
||||
AND deny_gid = ''
|
||||
";
|
||||
AND allow_gid = ''
|
||||
AND deny_cid = ''
|
||||
AND deny_gid = '' ";
|
||||
|
||||
/*
|
||||
* Profile owner - everything is visible
|
||||
|
|
@ -104,59 +93,28 @@ class Security extends BaseObject
|
|||
if ($local_user && $local_user == $owner_id) {
|
||||
$sql = '';
|
||||
/*
|
||||
* Authenticated visitor. Unless pre-verified,
|
||||
* check that the contact belongs to this $owner_id
|
||||
* and load the groups the visitor belongs to.
|
||||
* If pre-verified, the caller is expected to have already
|
||||
* done this and passed the groups into this function.
|
||||
* Authenticated visitor. Load the groups the visitor belongs to.
|
||||
*/
|
||||
} elseif ($remote_user) {
|
||||
/*
|
||||
* Authenticated visitor. Unless pre-verified,
|
||||
* check that the contact belongs to this $owner_id
|
||||
* and load the groups the visitor belongs to.
|
||||
* If pre-verified, the caller is expected to have already
|
||||
* done this and passed the groups into this function.
|
||||
*/
|
||||
} elseif ($remote_contact) {
|
||||
$gs = '<<>>'; // should be impossible to match
|
||||
|
||||
if (!$remote_verified) {
|
||||
$cid = 0;
|
||||
$groups = Group::getIdsByContactId($remote_contact);
|
||||
|
||||
foreach (\Friendica\Core\Session::get('remote', []) as $visitor) {
|
||||
if ($visitor['uid'] == $owner_id) {
|
||||
$cid = $visitor['cid'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ($cid && DBA::exists('contact', ['id' => $cid, 'uid' => $owner_id, 'blocked' => false])) {
|
||||
$remote_verified = true;
|
||||
$groups = Group::getIdsByContactId($cid);
|
||||
if (is_array($groups)) {
|
||||
foreach ($groups as $g) {
|
||||
$gs .= '|<' . intval($g) . '>';
|
||||
}
|
||||
}
|
||||
|
||||
if ($remote_verified) {
|
||||
$gs = '<<>>'; // should be impossible to match
|
||||
|
||||
if (is_array($groups)) {
|
||||
foreach ($groups as $g) {
|
||||
$gs .= '|<' . intval($g) . '>';
|
||||
}
|
||||
}
|
||||
|
||||
$sql = sprintf(
|
||||
" AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s')
|
||||
AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') )
|
||||
)
|
||||
",
|
||||
intval($cid),
|
||||
DBA::escape($gs),
|
||||
intval($cid),
|
||||
DBA::escape($gs)
|
||||
);
|
||||
}
|
||||
$sql = sprintf(
|
||||
" AND (NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s')
|
||||
AND (allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR (allow_cid = '' AND allow_gid = ''))) ",
|
||||
intval($remote_contact),
|
||||
DBA::escape($gs),
|
||||
intval($remote_contact),
|
||||
DBA::escape($gs)
|
||||
);
|
||||
}
|
||||
return $sql;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file src/Util/Strings.php
|
||||
*/
|
||||
|
|
@ -20,16 +21,16 @@ class Strings
|
|||
* @return string
|
||||
* @throws \Exception
|
||||
*/
|
||||
public static function getRandomHex($size = 64)
|
||||
{
|
||||
$byte_size = ceil($size / 2);
|
||||
public static function getRandomHex($size = 64)
|
||||
{
|
||||
$byte_size = ceil($size / 2);
|
||||
|
||||
$bytes = random_bytes($byte_size);
|
||||
$bytes = random_bytes($byte_size);
|
||||
|
||||
$return = substr(bin2hex($bytes), 0, $size);
|
||||
$return = substr(bin2hex($bytes), 0, $size);
|
||||
|
||||
return $return;
|
||||
}
|
||||
return $return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks, if the given string is a valid hexadecimal code
|
||||
|
|
@ -38,296 +39,298 @@ class Strings
|
|||
*
|
||||
* @return bool
|
||||
*/
|
||||
public static function isHex($hexCode)
|
||||
{
|
||||
return !empty($hexCode) ? @preg_match("/^[a-f0-9]{2,}$/i", $hexCode) && !(strlen($hexCode) & 1) : false;
|
||||
}
|
||||
public static function isHex($hexCode)
|
||||
{
|
||||
return !empty($hexCode) ? @preg_match("/^[a-f0-9]{2,}$/i", $hexCode) && !(strlen($hexCode) & 1) : false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This is our primary input filter.
|
||||
*
|
||||
* Use this on any text input where angle chars are not valid or permitted
|
||||
* They will be replaced with safer brackets. This may be filtered further
|
||||
* if these are not allowed either.
|
||||
*
|
||||
* @param string $string Input string
|
||||
* @return string Filtered string
|
||||
*/
|
||||
public static function escapeTags($string)
|
||||
{
|
||||
return str_replace(["<", ">"], ['[', ']'], $string);
|
||||
}
|
||||
/**
|
||||
* @brief This is our primary input filter.
|
||||
*
|
||||
* Use this on any text input where angle chars are not valid or permitted
|
||||
* They will be replaced with safer brackets. This may be filtered further
|
||||
* if these are not allowed either.
|
||||
*
|
||||
* @param string $string Input string
|
||||
* @return string Filtered string
|
||||
*/
|
||||
public static function escapeTags($string)
|
||||
{
|
||||
return str_replace(["<", ">"], ['[', ']'], $string);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Use this on "body" or "content" input where angle chars shouldn't be removed,
|
||||
* and allow them to be safely displayed.
|
||||
* @param string $string
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function escapeHtml($string)
|
||||
{
|
||||
return htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false);
|
||||
}
|
||||
/**
|
||||
* @brief Use this on "body" or "content" input where angle chars shouldn't be removed,
|
||||
* and allow them to be safely displayed.
|
||||
* @param string $string
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function escapeHtml($string)
|
||||
{
|
||||
return htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Generate a string that's random, but usually pronounceable. Used to generate initial passwords
|
||||
*
|
||||
* @param int $len length
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getRandomName($len)
|
||||
{
|
||||
if ($len <= 0) {
|
||||
return '';
|
||||
}
|
||||
/**
|
||||
* @brief Generate a string that's random, but usually pronounceable. Used to generate initial passwords
|
||||
*
|
||||
* @param int $len length
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getRandomName($len)
|
||||
{
|
||||
if ($len <= 0) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$vowels = ['a', 'a', 'ai', 'au', 'e', 'e', 'e', 'ee', 'ea', 'i', 'ie', 'o', 'ou', 'u'];
|
||||
$vowels = ['a', 'a', 'ai', 'au', 'e', 'e', 'e', 'ee', 'ea', 'i', 'ie', 'o', 'ou', 'u'];
|
||||
|
||||
if (mt_rand(0, 5) == 4) {
|
||||
$vowels[] = 'y';
|
||||
}
|
||||
if (mt_rand(0, 5) == 4) {
|
||||
$vowels[] = 'y';
|
||||
}
|
||||
|
||||
$cons = [
|
||||
'b', 'bl', 'br',
|
||||
'c', 'ch', 'cl', 'cr',
|
||||
'd', 'dr',
|
||||
'f', 'fl', 'fr',
|
||||
'g', 'gh', 'gl', 'gr',
|
||||
'h',
|
||||
'j',
|
||||
'k', 'kh', 'kl', 'kr',
|
||||
'l',
|
||||
'm',
|
||||
'n',
|
||||
'p', 'ph', 'pl', 'pr',
|
||||
'qu',
|
||||
'r', 'rh',
|
||||
's' ,'sc', 'sh', 'sm', 'sp', 'st',
|
||||
't', 'th', 'tr',
|
||||
'v',
|
||||
'w', 'wh',
|
||||
'x',
|
||||
'z', 'zh'
|
||||
];
|
||||
$cons = [
|
||||
'b', 'bl', 'br',
|
||||
'c', 'ch', 'cl', 'cr',
|
||||
'd', 'dr',
|
||||
'f', 'fl', 'fr',
|
||||
'g', 'gh', 'gl', 'gr',
|
||||
'h',
|
||||
'j',
|
||||
'k', 'kh', 'kl', 'kr',
|
||||
'l',
|
||||
'm',
|
||||
'n',
|
||||
'p', 'ph', 'pl', 'pr',
|
||||
'qu',
|
||||
'r', 'rh',
|
||||
's', 'sc', 'sh', 'sm', 'sp', 'st',
|
||||
't', 'th', 'tr',
|
||||
'v',
|
||||
'w', 'wh',
|
||||
'x',
|
||||
'z', 'zh'
|
||||
];
|
||||
|
||||
$midcons = ['ck', 'ct', 'gn', 'ld', 'lf', 'lm', 'lt', 'mb', 'mm', 'mn', 'mp',
|
||||
'nd', 'ng', 'nk', 'nt', 'rn', 'rp', 'rt'];
|
||||
$midcons = [
|
||||
'ck', 'ct', 'gn', 'ld', 'lf', 'lm', 'lt', 'mb', 'mm', 'mn', 'mp',
|
||||
'nd', 'ng', 'nk', 'nt', 'rn', 'rp', 'rt'
|
||||
];
|
||||
|
||||
$noend = ['bl', 'br', 'cl', 'cr', 'dr', 'fl', 'fr', 'gl', 'gr',
|
||||
'kh', 'kl', 'kr', 'mn', 'pl', 'pr', 'rh', 'tr', 'qu', 'wh', 'q'];
|
||||
$noend = [
|
||||
'bl', 'br', 'cl', 'cr', 'dr', 'fl', 'fr', 'gl', 'gr',
|
||||
'kh', 'kl', 'kr', 'mn', 'pl', 'pr', 'rh', 'tr', 'qu', 'wh', 'q'
|
||||
];
|
||||
|
||||
$start = mt_rand(0, 2);
|
||||
if ($start == 0) {
|
||||
$table = $vowels;
|
||||
} else {
|
||||
$table = $cons;
|
||||
}
|
||||
$start = mt_rand(0, 2);
|
||||
if ($start == 0) {
|
||||
$table = $vowels;
|
||||
} else {
|
||||
$table = $cons;
|
||||
}
|
||||
|
||||
$word = '';
|
||||
$word = '';
|
||||
|
||||
for ($x = 0; $x < $len; $x ++) {
|
||||
$r = mt_rand(0, count($table) - 1);
|
||||
$word .= $table[$r];
|
||||
for ($x = 0; $x < $len; $x++) {
|
||||
$r = mt_rand(0, count($table) - 1);
|
||||
$word .= $table[$r];
|
||||
|
||||
if ($table == $vowels) {
|
||||
$table = array_merge($cons, $midcons);
|
||||
} else {
|
||||
$table = $vowels;
|
||||
}
|
||||
if ($table == $vowels) {
|
||||
$table = array_merge($cons, $midcons);
|
||||
} else {
|
||||
$table = $vowels;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
$word = substr($word, 0, $len);
|
||||
|
||||
$word = substr($word, 0, $len);
|
||||
foreach ($noend as $noe) {
|
||||
$noelen = strlen($noe);
|
||||
if ((strlen($word) > $noelen) && (substr($word, -$noelen) == $noe)) {
|
||||
$word = self::getRandomName($len);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($noend as $noe) {
|
||||
$noelen = strlen($noe);
|
||||
if ((strlen($word) > $noelen) && (substr($word, -$noelen) == $noe)) {
|
||||
$word = self::getRandomName($len);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return $word;
|
||||
}
|
||||
return $word;
|
||||
}
|
||||
|
||||
/**
|
||||
* Translate and format the network name of a contact
|
||||
*
|
||||
* @param string $network Network name of the contact (e.g. dfrn, rss and so on)
|
||||
* @param string $url The contact url
|
||||
* @param string $url The contact url
|
||||
*
|
||||
* @return string Formatted network name
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public static function formatNetworkName($network, $url = '')
|
||||
{
|
||||
if ($network != '') {
|
||||
if ($url != '') {
|
||||
$network_name = '<a href="' . $url .'">' . ContactSelector::networkToName($network, $url) . '</a>';
|
||||
} else {
|
||||
$network_name = ContactSelector::networkToName($network);
|
||||
}
|
||||
public static function formatNetworkName($network, $url = '')
|
||||
{
|
||||
if ($network != '') {
|
||||
if ($url != '') {
|
||||
$network_name = '<a href="' . $url . '">' . ContactSelector::networkToName($network, $url) . '</a>';
|
||||
} else {
|
||||
$network_name = ContactSelector::networkToName($network);
|
||||
}
|
||||
|
||||
return $network_name;
|
||||
}
|
||||
}
|
||||
return $network_name;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Remove indentation from a text
|
||||
*
|
||||
* @param string $text String to be transformed.
|
||||
* @param string $chr Optional. Indentation tag. Default tab (\t).
|
||||
* @param int $count Optional. Default null.
|
||||
*
|
||||
* @return string Transformed string.
|
||||
*/
|
||||
public static function deindent($text, $chr = "[\t ]", $count = NULL)
|
||||
{
|
||||
$lines = explode("\n", $text);
|
||||
/**
|
||||
* @brief Remove indentation from a text
|
||||
*
|
||||
* @param string $text String to be transformed.
|
||||
* @param string $chr Optional. Indentation tag. Default tab (\t).
|
||||
* @param int $count Optional. Default null.
|
||||
*
|
||||
* @return string Transformed string.
|
||||
*/
|
||||
public static function deindent($text, $chr = "[\t ]", $count = NULL)
|
||||
{
|
||||
$lines = explode("\n", $text);
|
||||
|
||||
if (is_null($count)) {
|
||||
$m = [];
|
||||
$k = 0;
|
||||
while ($k < count($lines) && strlen($lines[$k]) == 0) {
|
||||
$k++;
|
||||
}
|
||||
preg_match("|^" . $chr . "*|", $lines[$k], $m);
|
||||
$count = strlen($m[0]);
|
||||
}
|
||||
if (is_null($count)) {
|
||||
$m = [];
|
||||
$k = 0;
|
||||
while ($k < count($lines) && strlen($lines[$k]) == 0) {
|
||||
$k++;
|
||||
}
|
||||
preg_match("|^" . $chr . "*|", $lines[$k], $m);
|
||||
$count = strlen($m[0]);
|
||||
}
|
||||
|
||||
for ($k = 0; $k < count($lines); $k++) {
|
||||
$lines[$k] = preg_replace("|^" . $chr . "{" . $count . "}|", "", $lines[$k]);
|
||||
}
|
||||
for ($k = 0; $k < count($lines); $k++) {
|
||||
$lines[$k] = preg_replace("|^" . $chr . "{" . $count . "}|", "", $lines[$k]);
|
||||
}
|
||||
|
||||
return implode("\n", $lines);
|
||||
}
|
||||
return implode("\n", $lines);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get byte size returned in a Data Measurement (KB, MB, GB)
|
||||
*
|
||||
* @param int $bytes The number of bytes to be measured
|
||||
* @param int $precision Optional. Default 2.
|
||||
*
|
||||
* @return string Size with measured units.
|
||||
*/
|
||||
public static function formatBytes($bytes, $precision = 2)
|
||||
{
|
||||
$units = ['B', 'KB', 'MB', 'GB', 'TB'];
|
||||
$bytes = max($bytes, 0);
|
||||
$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
|
||||
$pow = min($pow, count($units) - 1);
|
||||
$bytes /= pow(1024, $pow);
|
||||
/**
|
||||
* @brief Get byte size returned in a Data Measurement (KB, MB, GB)
|
||||
*
|
||||
* @param int $bytes The number of bytes to be measured
|
||||
* @param int $precision Optional. Default 2.
|
||||
*
|
||||
* @return string Size with measured units.
|
||||
*/
|
||||
public static function formatBytes($bytes, $precision = 2)
|
||||
{
|
||||
$units = ['B', 'KB', 'MB', 'GB', 'TB'];
|
||||
$bytes = max($bytes, 0);
|
||||
$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
|
||||
$pow = min($pow, count($units) - 1);
|
||||
$bytes /= pow(1024, $pow);
|
||||
|
||||
return round($bytes, $precision) . ' ' . $units[$pow];
|
||||
}
|
||||
return round($bytes, $precision) . ' ' . $units[$pow];
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Protect percent characters in sprintf calls
|
||||
*
|
||||
* @param string $s String to transform.
|
||||
*
|
||||
* @return string Transformed string.
|
||||
*/
|
||||
public static function protectSprintf($s)
|
||||
{
|
||||
return str_replace('%', '%%', $s);
|
||||
}
|
||||
/**
|
||||
* @brief Protect percent characters in sprintf calls
|
||||
*
|
||||
* @param string $s String to transform.
|
||||
*
|
||||
* @return string Transformed string.
|
||||
*/
|
||||
public static function protectSprintf($s)
|
||||
{
|
||||
return str_replace('%', '%%', $s);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Base64 Encode URL and translate +/ to -_ Optionally strip padding.
|
||||
*
|
||||
* @param string $s URL to encode
|
||||
* @param boolean $strip_padding Optional. Default false
|
||||
*
|
||||
* @return string Encoded URL
|
||||
*/
|
||||
public static function base64UrlEncode($s, $strip_padding = false)
|
||||
{
|
||||
$s = strtr(base64_encode($s), '+/', '-_');
|
||||
/**
|
||||
* @brief Base64 Encode URL and translate +/ to -_ Optionally strip padding.
|
||||
*
|
||||
* @param string $s URL to encode
|
||||
* @param boolean $strip_padding Optional. Default false
|
||||
*
|
||||
* @return string Encoded URL
|
||||
*/
|
||||
public static function base64UrlEncode($s, $strip_padding = false)
|
||||
{
|
||||
$s = strtr(base64_encode($s), '+/', '-_');
|
||||
|
||||
if ($strip_padding) {
|
||||
$s = str_replace('=', '', $s);
|
||||
}
|
||||
if ($strip_padding) {
|
||||
$s = str_replace('=', '', $s);
|
||||
}
|
||||
|
||||
return $s;
|
||||
}
|
||||
return $s;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Decode Base64 Encoded URL and translate -_ to +/
|
||||
* @param string $s URL to decode
|
||||
*
|
||||
* @return string Decoded URL
|
||||
* @return string Decoded URL
|
||||
* @throws \Exception
|
||||
*/
|
||||
public static function base64UrlDecode($s)
|
||||
{
|
||||
if (is_array($s)) {
|
||||
Logger::log('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true));
|
||||
return $s;
|
||||
}
|
||||
public static function base64UrlDecode($s)
|
||||
{
|
||||
if (is_array($s)) {
|
||||
Logger::log('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true));
|
||||
return $s;
|
||||
}
|
||||
|
||||
/*
|
||||
* // Placeholder for new rev of salmon which strips base64 padding.
|
||||
* // PHP base64_decode handles the un-padded input without requiring this step
|
||||
* // Uncomment if you find you need it.
|
||||
*
|
||||
* $l = strlen($s);
|
||||
* if (!strpos($s,'=')) {
|
||||
* $m = $l % 4;
|
||||
* if ($m == 2)
|
||||
* $s .= '==';
|
||||
* if ($m == 3)
|
||||
* $s .= '=';
|
||||
* }
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* // Placeholder for new rev of salmon which strips base64 padding.
|
||||
* // PHP base64_decode handles the un-padded input without requiring this step
|
||||
* // Uncomment if you find you need it.
|
||||
*
|
||||
* $l = strlen($s);
|
||||
* if (!strpos($s,'=')) {
|
||||
* $m = $l % 4;
|
||||
* if ($m == 2)
|
||||
* $s .= '==';
|
||||
* if ($m == 3)
|
||||
* $s .= '=';
|
||||
* }
|
||||
*
|
||||
*/
|
||||
|
||||
return base64_decode(strtr($s, '-_', '+/'));
|
||||
}
|
||||
return base64_decode(strtr($s, '-_', '+/'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Normalize url
|
||||
*
|
||||
* @param string $url URL to be normalized.
|
||||
*
|
||||
* @return string Normalized URL.
|
||||
*/
|
||||
public static function normaliseLink($url)
|
||||
{
|
||||
$ret = str_replace(['https:', '//www.'], ['http:', '//'], $url);
|
||||
return rtrim($ret, '/');
|
||||
}
|
||||
/**
|
||||
* @brief Normalize url
|
||||
*
|
||||
* @param string $url URL to be normalized.
|
||||
*
|
||||
* @return string Normalized URL.
|
||||
*/
|
||||
public static function normaliseLink($url)
|
||||
{
|
||||
$ret = str_replace(['https:', '//www.'], ['http:', '//'], $url);
|
||||
return rtrim($ret, '/');
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Normalize OpenID identity
|
||||
*
|
||||
* @param string $s OpenID Identity
|
||||
*
|
||||
* @return string normalized OpenId Identity
|
||||
*/
|
||||
public static function normaliseOpenID($s)
|
||||
{
|
||||
return trim(str_replace(['http://', 'https://'], ['', ''], $s), '/');
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Compare two URLs to see if they are the same, but ignore
|
||||
* slight but hopefully insignificant differences such as if one
|
||||
* is https and the other isn't, or if one is www.something and
|
||||
* the other isn't - and also ignore case differences.
|
||||
*
|
||||
* @param string $a first url
|
||||
* @param string $b second url
|
||||
* @return boolean True if the URLs match, otherwise False
|
||||
*
|
||||
*/
|
||||
public static function compareLink($a, $b)
|
||||
{
|
||||
return (strcasecmp(self::normaliseLink($a), self::normaliseLink($b)) === 0);
|
||||
}
|
||||
/**
|
||||
* @brief Normalize OpenID identity
|
||||
*
|
||||
* @param string $s OpenID Identity
|
||||
*
|
||||
* @return string normalized OpenId Identity
|
||||
*/
|
||||
public static function normaliseOpenID($s)
|
||||
{
|
||||
return trim(str_replace(['http://', 'https://'], ['', ''], $s), '/');
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Compare two URLs to see if they are the same, but ignore
|
||||
* slight but hopefully insignificant differences such as if one
|
||||
* is https and the other isn't, or if one is www.something and
|
||||
* the other isn't - and also ignore case differences.
|
||||
*
|
||||
* @param string $a first url
|
||||
* @param string $b second url
|
||||
* @return boolean True if the URLs match, otherwise False
|
||||
*
|
||||
*/
|
||||
public static function compareLink($a, $b)
|
||||
{
|
||||
return (strcasecmp(self::normaliseLink($a), self::normaliseLink($b)) === 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensures the provided URI has its query string punctuation in order.
|
||||
|
|
@ -344,12 +347,11 @@ class Strings
|
|||
return $uri;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Check if the trimmed provided string is starting with one of the provided characters
|
||||
*
|
||||
* @param string $string
|
||||
* @param array $chars
|
||||
* @param array $chars
|
||||
* @return bool
|
||||
*/
|
||||
public static function startsWith($string, array $chars)
|
||||
|
|
@ -368,22 +370,22 @@ class Strings
|
|||
public static function autoLinkRegEx()
|
||||
{
|
||||
return '@
|
||||
(?<![=\'\]"/]) # Not preceded by [, =, \', ], ", /
|
||||
(?<![=\'\]"/]) # Not preceded by [, =, \', ], ", /
|
||||
\b
|
||||
( # Capture 1: entire matched URL
|
||||
https?:// # http or https protocol
|
||||
( # Capture 1: entire matched URL
|
||||
https?:// # http or https protocol
|
||||
(?:
|
||||
[^/\s\xA0`!()\[\]{};:\'",<>?«»“”‘’.] # Domain can\'t start with a .
|
||||
[^/\s\xA0`!()\[\]{};:\'",<>?«»“”‘’]+ # Domain can\'t end with a .
|
||||
\.
|
||||
[^/\s\xA0`!()\[\]{};:\'".,<>?«»“”‘’]+/? # Followed by a slash
|
||||
[^/\s\xA0`!()\[\]{};:\'",<>?«»“”‘’.] # Domain can\'t start with a .
|
||||
[^/\s\xA0`!()\[\]{};:\'",<>?«»“”‘’]+ # Domain can\'t end with a .
|
||||
\.
|
||||
[^/\s\xA0`!()\[\]{};:\'".,<>?«»“”‘’]+/? # Followed by a slash
|
||||
)
|
||||
(?: # One or more:
|
||||
[^\s\xA0()<>]+ # Run of non-space, non-()<>
|
||||
| # or
|
||||
\(([^\s\xA0()<>]+|(\([^\s()<>]+\)))*\) # balanced parens, up to 2 levels
|
||||
| # or
|
||||
[^\s\xA0`!()\[\]{};:\'".,<>?«»“”‘’] # not a space or one of these punct chars
|
||||
(?: # One or more:
|
||||
[^\s\xA0()<>]+ # Run of non-space, non-()<>
|
||||
| # or
|
||||
\(([^\s\xA0()<>]+|(\([^\s()<>]+\)))*\) # balanced parens, up to 2 levels
|
||||
| # or
|
||||
[^\s\xA0`!()\[\]{};:\'".,<>?«»“”‘’] # not a space or one of these punct chars
|
||||
)*
|
||||
)@xiu';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,13 +122,12 @@ class Temporal
|
|||
* @brief Wrapper for date selector, tailored for use in birthday fields.
|
||||
*
|
||||
* @param string $dob Date of Birth
|
||||
* @param string $timezone
|
||||
* @return string Formatted HTML
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
* @throws \Exception
|
||||
*/
|
||||
public static function getDateofBirthField($dob)
|
||||
public static function getDateofBirthField(string $dob, string $timezone = 'UTC')
|
||||
{
|
||||
$a = \get_app();
|
||||
|
||||
list($year, $month, $day) = sscanf($dob, '%4d-%2d-%2d');
|
||||
|
||||
if ($dob < '0000-01-01') {
|
||||
|
|
@ -137,7 +136,7 @@ class Temporal
|
|||
$value = DateTimeFormat::utc(($year > 1000) ? $dob : '1000-' . $month . '-' . $day, 'Y-m-d');
|
||||
}
|
||||
|
||||
$age = (intval($value) ? self::getAgeByTimezone($value, $a->user["timezone"], $a->user["timezone"]) : "");
|
||||
$age = (intval($value) ? self::getAgeByTimezone($value, $timezone, $timezone) : "");
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate("field_input.tpl");
|
||||
$o = Renderer::replaceMacros($tpl,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue