Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 16:35:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Mike Macgirvin 2022-10-22 11:28:02 +11:00
parent da39caa103
commit 7ca937819b
5 changed files with 56 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
include/event.php
View file

@ -124,23 +124,23 @@ function format_event_obj($jobject)
$dtend = ((array_key_exists('endTime', $object)) ? $object['endTime'] : NULL_DATE);
$title = ((isset($object['summary']) && $object['summary']) ? zidify_links(smilies(bbcode($object['summary']))) : $object['name']);
$event['header'] = replace_macros(Theme::get_template('event_item_header.tpl'), array(
$event['header'] = replace_macros(Theme::get_template('event_item_header.tpl'), [
'$title' => $title,
'$dtstart_label' => t('Starts:'),
'$dtstart_title' => datetime_convert('UTC', 'UTC', $object['startTime'], ((strpos($object['startTime'], 'Z')) ? ATOM_TIME : 'Y-m-d\TH:i:s' )),
'$dtstart_dt' => ((strpos($object['startTime'], 'Z')) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $object['startTime'], $bd_format)) : day_translate(datetime_convert('UTC', 'UTC', $object['startTime'], $bd_format))),
'$finish' => ((array_key_exists('endTime', $object)) ? true : false),
'$finish' => array_key_exists('endTime', $object),
'$dtend_label' => t('Finishes:'),
'$dtend_title' => datetime_convert('UTC', 'UTC', $dtend, ((strpos($object['startTime'], 'Z')) ? ATOM_TIME : 'Y-m-d\TH:i:s' )),
'$dtend_dt' => ((strpos($object['startTime'], 'Z')) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $dtend, $bd_format)) : day_translate(datetime_convert('UTC', 'UTC', $dtend, $bd_format)))
));
]);
$event['content'] = replace_macros(Theme::get_template('event_item_content.tpl'), array(
$event['content'] = replace_macros(Theme::get_template('event_item_content.tpl'), [
'$description' => $object['content'],
'$location_label' => t('Location:'),
'$location' => ((array_path_exists('location/content', $object)) ? zidify_links(smilies(bbcode($object['location']['content']))) : EMPTY_STR)
));
]);
}
return $event;
@ -176,9 +176,7 @@ function format_event_ical($ev)
return format_todo_ical($ev);
}
$o = '';
$o .= "\r\nBEGIN:VEVENT";
$o = "\r\nBEGIN:VEVENT";
$o .= "\r\nCREATED:" . datetime_convert('UTC', 'UTC', $ev['created'], 'Ymd\\THis\\Z');
$o .= "\r\nLAST-MODIFIED:" . datetime_convert('UTC', 'UTC', $ev['edited'], 'Ymd\\THis\\Z');
@ -583,14 +581,15 @@ function event_store_event($arr)
if (array_key_exists('external_id', $arr)) {
$hash = $arr['external_id'];
} elseif (array_key_exists('event_hash', $arr)) {
$hash = $arr['event_hash'];
} else {
try {
$hash = (string) Uuid::v4();
} catch (UnsatisfiedDependencyException $e) {
$hash = random_string(48);
}
elseif (array_key_exists('event_hash', $arr)) {
$hash = $arr['event_hash'];
}
else {
$hash = (string) Uuid::v4();
}
if (!$hash) {
$hash = random_string(48);
}
$r = q(
@ -702,7 +701,7 @@ function event_addtocal($item_id, $uid)
$item['resource_id'] = $event['event_hash'];
$item['resource_type'] = 'event';
$i = array($item);
$i = [$item];
xchan_query($i);
$sync_item = fetch_post_tags($i);
$z = q(
@ -711,7 +710,7 @@ function event_addtocal($item_id, $uid)
intval($channel['channel_id'])
);
if ($z) {
Libsync::build_sync_packet($channel['channel_id'], array('event_item' => array(encode_item($sync_item[0], true)),'event' => $z));
Libsync::build_sync_packet($channel['channel_id'], ['event_item' => [encode_item($sync_item[0], true)],'event' => $z]);
}
return true;
}
@ -770,7 +769,7 @@ function parse_vobject($ical, $type)
$ev['dtstart'] = datetime_convert(
(($ev['adjust']) ? 'UTC' : date_default_timezone_get()),
'UTC',
$dtstart->format(DateTime::W3C)
$dtstart->format(DateTimeInterface::W3C)
);
@ -779,14 +778,14 @@ function parse_vobject($ical, $type)
$ev['dtend'] = datetime_convert(
(($ev['adjust']) ? 'UTC' : date_default_timezone_get()),
'UTC',
$dtend->format(DateTime::W3C)
$dtend->format(DateTimeInterface::W3C)
);
} elseif (isset($ical->DTEND)) {
$dtend = $ical->DTEND->getDateTime();
$ev['dtend'] = datetime_convert(
(($ev['adjust']) ? 'UTC' : date_default_timezone_get()),
'UTC',
$dtend->format(DateTime::W3C)
$dtend->format(DateTimeInterface::W3C)
);
} else {
$ev['nofinish'] = 1;
@ -799,16 +798,16 @@ function parse_vobject($ical, $type)
if (isset($ical->CREATED)) {
$created = $ical->CREATED->getDateTime();
$ev['created'] = datetime_convert('UTC', 'UTC', $created->format(DateTime::W3C));
$ev['created'] = datetime_convert('UTC', 'UTC', $created->format(DateTimeInterface::W3C));
}
if (isset($ical->{'DTSTAMP'})) {
$edited = $ical->{'DTSTAMP'}->getDateTime();
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTime::W3C));
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTimeInterface::W3C));
}
if (isset($ical->{'LAST-MODIFIED'})) {
$edited = $ical->{'LAST-MODIFIED'}->getDateTime();
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTime::W3C));
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTimeInterface::W3C));
}
if (isset($ical->{'X-ZOT-LOCATION'})) {
@ -848,7 +847,7 @@ function parse_vobject($ical, $type)
if (isset($ical->{'COMPLETED'})) {
$completed = $ical->{'COMPLETED'}->getDateTime();
$ev['event_status_date'] = datetime_convert('UTC', 'UTC', $completed->format(DateTime::W3C));
$ev['event_status_date'] = datetime_convert('UTC', 'UTC', $completed->format(DateTimeInterface::W3C));
}
if (isset($ical->{'PERCENT-COMPLETE'})) {
@ -921,7 +920,7 @@ function event_import_ical($ical, $uid)
$ev['dtstart'] = datetime_convert(
(($ev['adjust']) ? 'UTC' : date_default_timezone_get()),
'UTC',
$dtstart->format(DateTime::W3C)
$dtstart->format(DateTimeInterface::W3C)
);
if (isset($ical->DTEND)) {
@ -929,7 +928,7 @@ function event_import_ical($ical, $uid)
$ev['dtend'] = datetime_convert(
(($ev['adjust']) ? 'UTC' : date_default_timezone_get()),
'UTC',
$dtend->format(DateTime::W3C)
$dtend->format(DateTimeInterface::W3C)
);
} else {
$ev['nofinish'] = 1;
@ -941,12 +940,12 @@ function event_import_ical($ical, $uid)
if (isset($ical->CREATED)) {
$created = $ical->CREATED->getDateTime();
$ev['created'] = datetime_convert('UTC', 'UTC', $created->format(DateTime::W3C));
$ev['created'] = datetime_convert('UTC', 'UTC', $created->format(DateTimeInterface::W3C));
}
if (isset($ical->{'LAST-MODIFIED'})) {
$edited = $ical->{'LAST-MODIFIED'}->getDateTime();
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTime::W3C));
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTimeInterface::W3C));
}
if (isset($ical->{'X-ZOT-LOCATION'})) {
@ -1038,7 +1037,7 @@ function event_import_ical_task($ical, $uid)
$ev['dtstart'] = datetime_convert(
(($ev['adjust']) ? 'UTC' : date_default_timezone_get()),
'UTC',
$dtstart->format(DateTime::W3C)
$dtstart->format(DateTimeInterface::W3C)
);
@ -1047,7 +1046,7 @@ function event_import_ical_task($ical, $uid)
$ev['dtend'] = datetime_convert(
(($ev['adjust']) ? 'UTC' : date_default_timezone_get()),
'UTC',
$dtend->format(DateTime::W3C)
$dtend->format(DateTimeInterface::W3C)
);
} else {
$ev['nofinish'] = 1;
@ -1060,17 +1059,17 @@ function event_import_ical_task($ical, $uid)
if (isset($ical->CREATED)) {
$created = $ical->CREATED->getDateTime();
$ev['created'] = datetime_convert('UTC', 'UTC', $created->format(DateTime::W3C));
$ev['created'] = datetime_convert('UTC', 'UTC', $created->format(DateTimeInterface::W3C));
}
if (isset($ical->{'DTSTAMP'})) {
$edited = $ical->{'DTSTAMP'}->getDateTime();
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTime::W3C));
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTimeInterface::W3C));
}
if (isset($ical->{'LAST-MODIFIED'})) {
$edited = $ical->{'LAST-MODIFIED'}->getDateTime();
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTime::W3C));
$ev['edited'] = datetime_convert('UTC', 'UTC', $edited->format(DateTimeInterface::W3C));
}
if (isset($ical->{'X-ZOT-LOCATION'})) {
@ -1129,7 +1128,7 @@ function event_import_ical_task($ical, $uid)
if (isset($ical->{'COMPLETED'})) {
$completed = $ical->{'COMPLETED'}->getDateTime();
$ev['event_status_date'] = datetime_convert('UTC', 'UTC', $completed->format(DateTime::W3C));
$ev['event_status_date'] = datetime_convert('UTC', 'UTC', $completed->format(DateTimeInterface::W3C));
}
if (isset($ical->{'PERCENT-COMPLETE'})) {
@ -1418,13 +1417,13 @@ function event_store_item($arr, $event)
function todo_stat()
{
return array(
return [
'' => t('Not specified'),
'NEEDS-ACTION' => t('Needs Action'),
'COMPLETED' => t('Completed'),
'IN-PROCESS' => t('In Process'),
'CANCELLED' => t('Cancelled')
);
];
}

2
include/feedutils.php
View file

@ -328,7 +328,7 @@ function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0, $
}
if (($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) {
$parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']);
$parent_item = (($item['thr_parent']) ?: $item['parent_mid']);
$o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n";
}

13
include/help.php
View file

@ -1,6 +1,5 @@
<?php
use Michelf\MarkdownExtra;
use Code\Lib\IConfig;
use Code\Lib\Channel;
@ -8,7 +7,7 @@ use Code\Lib\Channel;
* @brief
*
* @param string $path
* @return string|unknown
* @return string
*/
function get_help_fullpath($path, $suffix = null)
@ -42,7 +41,7 @@ function find_docfile($name, $language)
* @brief
*
* @param string $tocpath
* @return string|unknown
* @return string
*/
function get_help_content($tocpath = false)
{
@ -70,7 +69,7 @@ function get_help_content($tocpath = false)
/**
* @brief
*
* @return bool|array
* @return array
*/
function determine_help_language()
{
@ -93,7 +92,7 @@ function determine_help_language()
$from_url = false;
}
return array('language' => $lang, 'from_url' => $from_url);
return ['language' => $lang, 'from_url' => $from_url];
}
function load_doc_file($s)
@ -118,7 +117,7 @@ function find_doc_file($s)
* @brief
*
* @param string $s
* @return number|mixed|unknown|bool
* @return number|mixed|bool
*/
function search_doc_files($s)
{
@ -217,7 +216,7 @@ function load_context_help()
* @brief
*
* @param string $s
* @return void|bool|number[]|string[]|unknown[]
* @return void|bool|number[]|string[]
*/
function store_doc_file($s)
{

1
include/html2bbcode.php
View file

@ -2,6 +2,7 @@
use Code\Extend\Hook;
use Code\Lib\SvgSanitizer;
/** @file */
/*

27
include/html2plain.php
View file

@ -93,15 +93,15 @@ function collecturls($message)
$ignore = false;
foreach ($result as $treffer) {
// A list of some links that should be ignored
$list = array("/user/", "/tag/", "/group/", "/profile/", "/channel/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
"//facebook.com/profile.php?id=", "//plus.google.com/");
$list = ["/user/", "/tag/", "/group/", "/profile/", "/channel/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
"//facebook.com/profile.php?id=", "//plus.google.com/"];
foreach ($list as $listitem) {
if (strpos($treffer[1], $listitem) !== false) {
if (str_contains($treffer[1], $listitem)) {
$ignore = true;
}
}
if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false)) {
if ((str_contains($treffer[1], "//plus.google.com/")) and (str_contains($treffer[1], "/posts"))) {
$ignore = false;
}
@ -126,7 +126,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
$tmp_message = mb_convert_encoding($message, 'HTML-ENTITIES', "UTF-8");
if ($tmp_message === false) {
logger('mb_convert_encoding failed: ' . $tmp_message);
logger('mb_convert_encoding failed: ' . $message);
return EMPTY_STR;
}
@ -139,8 +139,8 @@ function html2plain($html, $wraplength = 75, $compact = false)
}
$message = $doc->saveHTML();
$message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "<br>", " ", ""), $message);
$message = preg_replace('= [\s]*=i', " ", $message);
$message = str_replace(["\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"], ["<", ">", "<br>", " ", ""], $message);
$message = preg_replace('= \s*=i', " ", $message);
// Collecting all links
$urls = collecturls($message);
@ -193,17 +193,17 @@ function html2plain($html, $wraplength = 75, $compact = false)
// Problem: there is no reliable way to detect if it is a link to a tag or profile
//node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', '', true);
node2bbcode($doc, 'a', array('href' => '/(.+)/', 'rel' => 'oembed'), ' $1 ', '', true);
node2bbcode($doc, 'a', ['href' => '/(.+)/', 'rel' => 'oembed'], ' $1 ', '');
//node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', '');
//node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', '');
//node2bbcode($doc, 'img', [], '', '');
if (!$compact) {
node2bbcode($doc, 'img', array('src' => '/(.+)/'), '[img]$1', '[/img]');
node2bbcode($doc, 'img', ['src' => '/(.+)/'], '[img]$1', '[/img]');
} else {
node2bbcode($doc, 'img', array('src' => '/(.+)/'), '', '');
node2bbcode($doc, 'img', ['src' => '/(.+)/'], '', '');
}
node2bbcode($doc, 'iframe', array('src' => '/(.+)/'), ' $1 ', '', true);
node2bbcode($doc, 'iframe', ['src' => '/(.+)/'], ' $1 ', '');
$message = $doc->saveHTML();
@ -227,13 +227,12 @@ function html2plain($html, $wraplength = 75, $compact = false)
$message = html_entity_decode($message, ENT_QUOTES, 'UTF-8');
if (!$compact) {
$counter = 1;
/** @noinspection PhpUnusedLocalVariableInspection */
foreach ($urls as $id => $url) {
if ($url && strpos($message, $url) === false) {
if ($url && !str_contains($message, $url)) {
$message .= "\n" . $url . " ";
}
}
//$message .= "\n[".($counter++)."] ".$url;
}
do {