MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move ATOM_TIME to Temporal::ATOM

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-25 21:33:43 -05:00
parent c0e2ee95c5
commit b854905150
9 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
boot.php
View file

@ -56,7 +56,6 @@ const DB_UPDATE_FAILED = 2; // Database check failed
* This can be used in HTML and JavaScript where needed a line break. * This can be used in HTML and JavaScript where needed a line break.
*/ */
define('EOL', "<br />\r\n"); define('EOL', "<br />\r\n");
define('ATOM_TIME', 'Y-m-d\TH:i:s\Z');
/** /**
* @brief Image storage quality. * @brief Image storage quality.
@ -1150,7 +1149,7 @@ function feed_birthday($uid, $tz)
if ($t_dob < $now) { if ($t_dob < $now) {
$bd = $y + 1 . '-' . $tmp_dob . ' 00:00'; $bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
} }
$birthday = Temporal::convert($bd, 'UTC', $tz, ATOM_TIME); $birthday = Temporal::convert($bd, 'UTC', $tz, Temporal::ATOM);
} }
} }

6
include/api.php
View file

@ -460,7 +460,7 @@ function api_rss_extra(App $a, $arr, $user_info)
'self' => System::baseUrl() . "/" . $a->query_string, 'self' => System::baseUrl() . "/" . $a->query_string,
'base' => System::baseUrl(), 'base' => System::baseUrl(),
'updated' => api_date(null), 'updated' => api_date(null),
'atom_updated' => Temporal::convert('now', 'UTC', 'UTC', ATOM_TIME), 'atom_updated' => Temporal::convert('now', 'UTC', 'UTC', Temporal::ATOM),
'language' => $user_info['language'], 'language' => $user_info['language'],
'logo' => System::baseUrl() . "/images/friendica-32.png", 'logo' => System::baseUrl() . "/images/friendica-32.png",
]; ];
@ -3207,7 +3207,7 @@ function api_account_rate_limit_status($type)
'@attributes' => ["type" => "integer"], '@attributes' => ["type" => "integer"],
'hourly-limit' => '150', 'hourly-limit' => '150',
'@attributes2' => ["type" => "integer"], '@attributes2' => ["type" => "integer"],
'reset-time' => Temporal::convert('now + 1 hour', 'UTC', 'UTC', ATOM_TIME), 'reset-time' => Temporal::convert('now + 1 hour', 'UTC', 'UTC', Temporal::ATOM),
'@attributes3' => ["type" => "datetime"], '@attributes3' => ["type" => "datetime"],
'reset_time_in_seconds' => strtotime('now + 1 hour'), 'reset_time_in_seconds' => strtotime('now + 1 hour'),
'@attributes4' => ["type" => "integer"], '@attributes4' => ["type" => "integer"],
@ -3217,7 +3217,7 @@ function api_account_rate_limit_status($type)
'reset_time_in_seconds' => strtotime('now + 1 hour'), 'reset_time_in_seconds' => strtotime('now + 1 hour'),
'remaining_hits' => '150', 'remaining_hits' => '150',
'hourly_limit' => '150', 'hourly_limit' => '150',
'reset_time' => api_date(Temporal::convert('now + 1 hour', 'UTC', 'UTC', ATOM_TIME)), 'reset_time' => api_date(Temporal::convert('now + 1 hour', 'UTC', 'UTC', Temporal::ATOM)),
]; ];
} }

8
include/event.php
View file

@ -57,13 +57,13 @@ function format_event_html($ev, $simple = false) {
$o .= '<div class="summary event-summary">' . bbcode($ev['summary']) . '</div>' . "\r\n"; $o .= '<div class="summary event-summary">' . bbcode($ev['summary']) . '</div>' . "\r\n";
$o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="' $o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
. Temporal::convert($ev['start'], 'UTC', 'UTC', (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )) . Temporal::convert($ev['start'], 'UTC', 'UTC', (($ev['adjust']) ? Temporal::ATOM : 'Y-m-d\TH:i:s' ))
. '" >'.$event_start . '" >'.$event_start
. '</span></div>' . "\r\n"; . '</span></div>' . "\r\n";
if (! $ev['nofinish']) { if (! $ev['nofinish']) {
$o .= '<div class="event-end" ><span class="event-label">' . L10n::t('Finishes:') . '</span>&nbsp;<span class="dtend" title="' $o .= '<div class="event-end" ><span class="event-label">' . L10n::t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
. Temporal::convert($ev['finish'], 'UTC', 'UTC', (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )) . Temporal::convert($ev['finish'], 'UTC', 'UTC', (($ev['adjust']) ? Temporal::ATOM : 'Y-m-d\TH:i:s' ))
. '" >'.$event_end . '" >'.$event_end
. '</span></div>' . "\r\n"; . '</span></div>' . "\r\n";
} }
@ -925,7 +925,7 @@ function format_event_item($item) {
// Convert the time to different formats. // Convert the time to different formats.
$dtstart_dt = (($item['event-adjust']) ? day_translate(Temporal::convert($item['event-start'], date_default_timezone_get(), 'UTC', $dformat)) : day_translate(Temporal::convert($item['event-start'], 'UTC', 'UTC', $dformat))); $dtstart_dt = (($item['event-adjust']) ? day_translate(Temporal::convert($item['event-start'], date_default_timezone_get(), 'UTC', $dformat)) : day_translate(Temporal::convert($item['event-start'], 'UTC', 'UTC', $dformat)));
$dtstart_title = Temporal::convert($item['event-start'], 'UTC', 'UTC', (($item['event-adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s')); $dtstart_title = Temporal::convert($item['event-start'], 'UTC', 'UTC', (($item['event-adjust']) ? Temporal::ATOM : 'Y-m-d\TH:i:s'));
// Format: Jan till Dec. // Format: Jan till Dec.
$month_short = (($item['event-adjust']) ? day_short_translate(Temporal::convert($item['event-start'], date_default_timezone_get(), 'UTC', 'M')) : day_short_translate(Temporal::convert($item['event-start'], 'UTC', 'UTC', 'M'))); $month_short = (($item['event-adjust']) ? day_short_translate(Temporal::convert($item['event-start'], date_default_timezone_get(), 'UTC', 'M')) : day_short_translate(Temporal::convert($item['event-start'], 'UTC', 'UTC', 'M')));
// Format: 1 till 31. // Format: 1 till 31.
@ -937,7 +937,7 @@ function format_event_item($item) {
if (!$item['event-nofinish']) { if (!$item['event-nofinish']) {
$finish = true; $finish = true;
$dtend_dt = (($item['event-adjust']) ? day_translate(Temporal::convert($item['event-finish'], date_default_timezone_get(), 'UTC', $dformat)) : day_translate(Temporal::convert($item['event-finish'], 'UTC', 'UTC', $dformat))); $dtend_dt = (($item['event-adjust']) ? day_translate(Temporal::convert($item['event-finish'], date_default_timezone_get(), 'UTC', $dformat)) : day_translate(Temporal::convert($item['event-finish'], 'UTC', 'UTC', $dformat)));
$dtend_title = Temporal::convert($item['event-finish'], 'UTC', 'UTC', (($item['event-adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s')); $dtend_title = Temporal::convert($item['event-finish'], 'UTC', 'UTC', (($item['event-adjust']) ? Temporal::ATOM : 'Y-m-d\TH:i:s'));
$end_short = (($item['event-adjust']) ? day_short_translate(Temporal::convert($item['event-finish'], date_default_timezone_get(), 'UTC', $dformat_short)) : day_short_translate(Temporal::convert($item['event-finish'], 'UTC', 'UTC', $dformat_short))); $end_short = (($item['event-adjust']) ? day_short_translate(Temporal::convert($item['event-finish'], date_default_timezone_get(), 'UTC', $dformat_short)) : day_short_translate(Temporal::convert($item['event-finish'], 'UTC', 'UTC', $dformat_short)));
$end_time = (($item['event-adjust']) ? Temporal::convert($item['event-finish'], date_default_timezone_get(), 'UTC', $tformat) : Temporal::convert($item['event-finish'], 'UTC', 'UTC', $tformat)); $end_time = (($item['event-adjust']) ? Temporal::convert($item['event-finish'], date_default_timezone_get(), 'UTC', $tformat) : Temporal::convert($item['event-finish'], 'UTC', 'UTC', $tformat));
// Check if start and finish time is at the same day. // Check if start and finish time is at the same day.

2
include/text.php
View file

@ -723,7 +723,7 @@ function logger($msg, $level = 0) {
$callers = debug_backtrace(); $callers = debug_backtrace();
$logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n", $logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
Temporal::convert('now', 'UTC', 'UTC', 'Y-m-d\TH:i:s\Z'), Temporal::convert('now', 'UTC', 'UTC', Temporal::ATOM),
$process_id, $process_id,
$LOGGER_LEVELS[$level], $LOGGER_LEVELS[$level],
basename($callers[0]['file']), basename($callers[0]['file']),

16
src/Protocol/DFRN.php
View file

@ -421,7 +421,7 @@ class DFRN
XML::addElement($doc, $mail, "dfrn:id", $item['uri']); XML::addElement($doc, $mail, "dfrn:id", $item['uri']);
XML::addElement($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']); XML::addElement($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
XML::addElement($doc, $mail, "dfrn:sentdate", Temporal::convert($item['created'] . '+00:00', 'UTC', 'UTC', ATOM_TIME)); XML::addElement($doc, $mail, "dfrn:sentdate", Temporal::convert($item['created'] . '+00:00', 'UTC', 'UTC', Temporal::ATOM));
XML::addElement($doc, $mail, "dfrn:subject", $item['title']); XML::addElement($doc, $mail, "dfrn:subject", $item['title']);
XML::addElement($doc, $mail, "dfrn:content", $item['body']); XML::addElement($doc, $mail, "dfrn:content", $item['body']);
@ -587,7 +587,7 @@ class DFRN
/// @todo We need a way to transmit the different page flags like "PAGE_PRVGROUP" /// @todo We need a way to transmit the different page flags like "PAGE_PRVGROUP"
XML::addElement($doc, $root, "updated", Temporal::convert("now", "UTC", "UTC", ATOM_TIME)); XML::addElement($doc, $root, "updated", Temporal::convert("now", "UTC", "UTC", Temporal::ATOM));
$author = self::addAuthor($doc, $owner, $authorelement, $public); $author = self::addAuthor($doc, $owner, $authorelement, $public);
$root->appendChild($author); $root->appendChild($author);
@ -622,9 +622,9 @@ class DFRN
$author = $doc->createElement($authorelement); $author = $doc->createElement($authorelement);
$namdate = Temporal::convert($owner['name-date'].'+00:00', 'UTC', 'UTC', ATOM_TIME); $namdate = Temporal::convert($owner['name-date'].'+00:00', 'UTC', 'UTC', Temporal::ATOM);
$uridate = Temporal::convert($owner['uri-date'].'+00:00', 'UTC', 'UTC', ATOM_TIME); $uridate = Temporal::convert($owner['uri-date'].'+00:00', 'UTC', 'UTC', Temporal::ATOM);
$picdate = Temporal::convert($owner['avatar-date'].'+00:00', 'UTC', 'UTC', ATOM_TIME); $picdate = Temporal::convert($owner['avatar-date'].'+00:00', 'UTC', 'UTC', Temporal::ATOM);
$attributes = []; $attributes = [];
@ -903,7 +903,7 @@ class DFRN
} }
if ($item['deleted']) { if ($item['deleted']) {
$attributes = ["ref" => $item['uri'], "when" => Temporal::convert($item['edited'] . '+00:00', 'UTC', 'UTC', ATOM_TIME)]; $attributes = ["ref" => $item['uri'], "when" => Temporal::convert($item['edited'] . '+00:00', 'UTC', 'UTC', Temporal::ATOM)];
return XML::createElement($doc, "at:deleted-entry", "", $attributes); return XML::createElement($doc, "at:deleted-entry", "", $attributes);
} }
@ -983,8 +983,8 @@ class DFRN
XML::addElement($doc, $entry, "id", $item["uri"]); XML::addElement($doc, $entry, "id", $item["uri"]);
XML::addElement($doc, $entry, "title", $item["title"]); XML::addElement($doc, $entry, "title", $item["title"]);
XML::addElement($doc, $entry, "published", Temporal::convert($item["created"] . "+00:00", "UTC", "UTC", ATOM_TIME)); XML::addElement($doc, $entry, "published", Temporal::convert($item["created"] . "+00:00", "UTC", "UTC", Temporal::ATOM));
XML::addElement($doc, $entry, "updated", Temporal::convert($item["edited"] . "+00:00", "UTC", "UTC", ATOM_TIME)); XML::addElement($doc, $entry, "updated", Temporal::convert($item["edited"] . "+00:00", "UTC", "UTC", Temporal::ATOM));
// "dfrn:env" is used to read the content // "dfrn:env" is used to read the content
XML::addElement($doc, $entry, "dfrn:env", base64url_encode($body, true)); XML::addElement($doc, $entry, "dfrn:env", base64url_encode($body, true));

12
src/Protocol/Diaspora.php
View file

@ -3593,7 +3593,7 @@ class Diaspora
$eventdata['guid'] = $event['guid']; $eventdata['guid'] = $event['guid'];
} }
$mask = 'Y-m-d\TH:i:s\Z'; $mask = Temporal::ATOM;
/// @todo - establish "all day" events in Friendica /// @todo - establish "all day" events in Friendica
$eventdata["all_day"] = "false"; $eventdata["all_day"] = "false";
@ -3652,7 +3652,7 @@ class Diaspora
$public = (($item["private"]) ? "false" : "true"); $public = (($item["private"]) ? "false" : "true");
$created = Temporal::convert($item["created"], "UTC", "UTC", 'Y-m-d\TH:i:s\Z'); $created = Temporal::convert($item["created"], "UTC", "UTC", Temporal::ATOM);
// Detect a share element and do a reshare // Detect a share element and do a reshare
if (!$item['private'] && ($ret = self::isReshare($item["body"]))) { if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
@ -3855,7 +3855,7 @@ class Diaspora
$parent = $p[0]; $parent = $p[0];
$text = html_entity_decode(bb2diaspora($item["body"])); $text = html_entity_decode(bb2diaspora($item["body"]));
$created = Temporal::convert($item["created"], "UTC", "UTC", 'Y-m-d\TH:i:s\Z'); $created = Temporal::convert($item["created"], "UTC", "UTC", Temporal::ATOM);
$comment = ["author" => self::myHandle($owner), $comment = ["author" => self::myHandle($owner),
"guid" => $item["guid"], "guid" => $item["guid"],
@ -4086,12 +4086,12 @@ class Diaspora
"author" => $cnv["creator"], "author" => $cnv["creator"],
"guid" => $cnv["guid"], "guid" => $cnv["guid"],
"subject" => $cnv["subject"], "subject" => $cnv["subject"],
"created_at" => Temporal::convert($cnv['created'], "UTC", "UTC", 'Y-m-d\TH:i:s\Z'), "created_at" => Temporal::convert($cnv['created'], "UTC", "UTC", Temporal::ATOM),
"participants" => $cnv["recips"] "participants" => $cnv["recips"]
]; ];
$body = bb2diaspora($item["body"]); $body = bb2diaspora($item["body"]);
$created = Temporal::convert($item["created"], "UTC", "UTC", 'Y-m-d\TH:i:s\Z'); $created = Temporal::convert($item["created"], "UTC", "UTC", Temporal::ATOM);
$msg = [ $msg = [
"author" => $myaddr, "author" => $myaddr,
@ -4109,7 +4109,7 @@ class Diaspora
"author" => $cnv["creator"], "author" => $cnv["creator"],
"guid" => $cnv["guid"], "guid" => $cnv["guid"],
"subject" => $cnv["subject"], "subject" => $cnv["subject"],
"created_at" => Temporal::convert($cnv['created'], "UTC", "UTC", 'Y-m-d\TH:i:s\Z'), "created_at" => Temporal::convert($cnv['created'], "UTC", "UTC", Temporal::ATOM),
"participants" => $cnv["recips"], "participants" => $cnv["recips"],
"message" => $msg]; "message" => $msg];

8
src/Protocol/OStatus.php
View file

@ -1273,7 +1273,7 @@ class OStatus
XML::addElement($doc, $root, "title", $title); XML::addElement($doc, $root, "title", $title);
XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"])); XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"]));
XML::addElement($doc, $root, "logo", $owner["photo"]); XML::addElement($doc, $root, "logo", $owner["photo"]);
XML::addElement($doc, $root, "updated", Temporal::convert("now", "UTC", "UTC", ATOM_TIME)); XML::addElement($doc, $root, "updated", Temporal::convert("now", "UTC", "UTC", Temporal::ATOM));
$author = self::addAuthor($doc, $owner); $author = self::addAuthor($doc, $owner);
$root->appendChild($author); $root->appendChild($author);
@ -1539,7 +1539,7 @@ class OStatus
XML::addElement($doc, $source, "link", "", ["rel" => "alternate", "type" => "text/html", "href" => $contact["alias"]]); XML::addElement($doc, $source, "link", "", ["rel" => "alternate", "type" => "text/html", "href" => $contact["alias"]]);
XML::addElement($doc, $source, "link", "", ["rel" => "self", "type" => "application/atom+xml", "href" => $contact["poll"]]); XML::addElement($doc, $source, "link", "", ["rel" => "self", "type" => "application/atom+xml", "href" => $contact["poll"]]);
XML::addElement($doc, $source, "icon", $contact["photo"]); XML::addElement($doc, $source, "icon", $contact["photo"]);
XML::addElement($doc, $source, "updated", Temporal::convert($contact["success_update"]."+00:00", "UTC", "UTC", ATOM_TIME)); XML::addElement($doc, $source, "updated", Temporal::convert($contact["success_update"]."+00:00", "UTC", "UTC", Temporal::ATOM));
return $source; return $source;
} }
@ -1923,8 +1923,8 @@ class OStatus
XML::addElement($doc, $entry, "activity:verb", $verb); XML::addElement($doc, $entry, "activity:verb", $verb);
XML::addElement($doc, $entry, "published", Temporal::convert($item["created"]."+00:00", "UTC", "UTC", ATOM_TIME)); XML::addElement($doc, $entry, "published", Temporal::convert($item["created"]."+00:00", "UTC", "UTC", Temporal::ATOM));
XML::addElement($doc, $entry, "updated", Temporal::convert($item["edited"]."+00:00", "UTC", "UTC", ATOM_TIME)); XML::addElement($doc, $entry, "updated", Temporal::convert($item["edited"]."+00:00", "UTC", "UTC", Temporal::ATOM));
} }
/** /**

1
src/Util/Temporal.php
View file

@ -21,6 +21,7 @@ require_once 'include/text.php';
*/ */
class Temporal class Temporal
{ {
const ATOM = 'Y-m-d\TH:i:s\Z';
/** /**
* @brief Two-level sort for timezones. * @brief Two-level sort for timezones.

4
src/Worker/OnePoll.php
View file

@ -107,8 +107,8 @@ class OnePoll
} }
$last_update = (($contact['last-update'] <= NULL_DATE) $last_update = (($contact['last-update'] <= NULL_DATE)
? Temporal::convert('now - 7 days', 'UTC', 'UTC', ATOM_TIME) ? Temporal::convert('now - 7 days', 'UTC', 'UTC', Temporal::ATOM)
: Temporal::convert($contact['last-update'], 'UTC', 'UTC', ATOM_TIME) : Temporal::convert($contact['last-update'], 'UTC', 'UTC', Temporal::ATOM)
); );
// Update the contact entry // Update the contact entry