use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
use Friendica\Util\XML;
require_once 'include/conversation.php';
// Searching for contact URL
if (!is_null($contact_id) && (intval($contact_id) == 0)) {
- $user = DBA::escape(normalise_link($contact_id));
+ $user = DBA::escape(Strings::normaliseLink($contact_id));
$url = $user;
$extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user() !== false) {
}
if (is_null($user) && x($_GET, 'profileurl')) {
- $user = DBA::escape(normalise_link($_GET['profileurl']));
+ $user = DBA::escape(Strings::normaliseLink($_GET['profileurl']));
$extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user() !== false) {
$extra_query .= "AND `contact`.`uid`=".intval(api_user());
throw new BadRequestException("User not found.");
}
- $contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => normalise_link($url)]);
+ $contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
if (DBA::isResult($contact)) {
$network_name = ContactSelector::networkToName($contact['network'], $contact['url']);
//$txt = urldecode(requestdata('status'));
if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
- $txt = html2bb_video($txt);
+ $txt = HTML::toBBCodeVideo($txt);
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);
$purifier = new HTMLPurifier($config);
if (requestdata('htmlstatus')) {
$txt = requestdata('htmlstatus');
if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
- $txt = html2bb_video($txt);
+ $txt = HTML::toBBCodeVideo($txt);
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);
"id" => $start+1,
"id_str" => (string)$start+1,
"indices" => [$start, $start+strlen($url)],
- "media_url" => normalise_link($media_url),
+ "media_url" => Strings::normaliseLink($media_url),
"media_url_https" => $media_url,
"url" => $url,
"display_url" => $display_url,
$retweeted_item = api_share_as_retweet($item);
if ($retweeted_item !== false) {
$retweeted_status = $status;
+ $status['user'] = $status['friendica_owner'];
try {
$retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
} catch (BadRequestException $e) {
$url = $contact["url"];
$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
- $uid, Contact::SHARING, Contact::FRIEND, normalise_link($url),
- normalise_link($url), $url];
+ $uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
+ Strings::normaliseLink($url), $url];
$contact = DBA::selectFirst('contact', [], $condition);
if (!DBA::isResult($contact)) {
foreach ($r as $item) {
if ($box == "inbox" || $item['from-url'] != $profile_url) {
$recipient = $user_info;
- $sender = api_get_user($a, normalise_link($item['contact-url']));
+ $sender = api_get_user($a, Strings::normaliseLink($item['contact-url']));
} elseif ($box == "sentbox" || $item['from-url'] == $profile_url) {
- $recipient = api_get_user($a, normalise_link($item['contact-url']));
+ $recipient = api_get_user($a, Strings::normaliseLink($item['contact-url']));
$sender = $user_info;
}
// check against max upload size within Friendica instance
$maximagesize = Config::get('system', 'maximagesize');
if ($maximagesize && ($filesize > $maximagesize)) {
- $formattedBytes = formatBytes($maximagesize);
+ $formattedBytes = Strings::formatBytes($maximagesize);
throw new InternalServerErrorException("image size exceeds Friendica config setting (uploaded size: $formattedBytes)");
}
throw new BadRequestException("Wrong parameters.");
}
- $c_url = normalise_link($c_url);
+ $c_url = Strings::normaliseLink($c_url);
// traditional DFRN
$dfrn_id = '0:' . $orig_id;
}
- $sec = random_string();
+ $sec = Strings::getRandomHex();
$fields = ['uid' => api_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
'sec' => $sec, 'expire' => time() + 45];
$r = q(
"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
- DBA::escape(normalise_link($profile))
+ DBA::escape(Strings::normaliseLink($profile))
);
if (DBA::isResult($r)) {
if (!$nick == "") {
$r = q(
"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
- DBA::escape(normalise_link($profile))
+ DBA::escape(Strings::normaliseLink($profile))
);
if (DBA::isResult($r)) {
foreach ($r as $item) {
if ($box == "inbox" || $item['from-url'] != $profile_url) {
$recipient = $user_info;
- $sender = api_get_user($a, normalise_link($item['contact-url']));
+ $sender = api_get_user($a, Strings::normaliseLink($item['contact-url']));
} elseif ($box == "sentbox" || $item['from-url'] == $profile_url) {
- $recipient = api_get_user($a, normalise_link($item['contact-url']));
+ $recipient = api_get_user($a, Strings::normaliseLink($item['contact-url']));
$sender = $user_info;
}