]> git.mxchange.org Git - friendica.git/commitdiff
Move Temporal::convert() to DateTimeFormat::convert()
authorHypolite Petovan <mrpetovan@gmail.com>
Sat, 27 Jan 2018 02:38:34 +0000 (21:38 -0500)
committerHypolite Petovan <mrpetovan@gmail.com>
Sat, 3 Feb 2018 13:56:55 +0000 (08:56 -0500)
64 files changed:
boot.php
include/api.php
include/bb2diaspora.php
include/conversation.php
include/dba.php
include/enotify.php
include/event.php
include/items.php
include/security.php
include/text.php
mod/admin.php
mod/cal.php
mod/contacts.php
mod/dfrn_confirm.php
mod/dfrn_request.php
mod/events.php
mod/fsuggest.php
mod/invite.php
mod/item.php
mod/localtime.php
mod/lostpass.php
mod/message.php
mod/network.php
mod/photos.php
mod/ping.php
mod/poco.php
mod/profile.php
mod/profile_photo.php
mod/profiles.php
mod/proxy.php
mod/pubsubhubbub.php
mod/register.php
mod/settings.php
mod/videos.php
mod/wall_attach.php
src/Content/OEmbed.php
src/Core/Cache.php
src/Core/NotificationsManager.php
src/Core/Worker.php
src/Database/DBM.php
src/Model/Contact.php
src/Model/GContact.php
src/Model/Item.php
src/Model/Mail.php
src/Model/Photo.php
src/Model/Process.php
src/Model/Profile.php
src/Model/Queue.php
src/Model/User.php
src/Module/Login.php
src/Network/FKOAuth1.php
src/Object/Post.php
src/Protocol/DFRN.php
src/Protocol/Diaspora.php
src/Protocol/OStatus.php
src/Protocol/PortableContact.php
src/Util/DateTimeFormat.php [new file with mode: 0644]
src/Util/ParseUrl.php
src/Util/Temporal.php
src/Worker/Cron.php
src/Worker/CronHooks.php
src/Worker/DiscoverPoCo.php
src/Worker/OnePoll.php
src/Worker/UpdateGContact.php

index 66e4645e5c67b8b1ca1e6c4a7b06b1ba0202507c..59ab525522d1f00d31b7a3e06a6560d9ef2ca0d0 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -28,7 +28,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Contact;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use Friendida\Core\L10n;
 
 require_once 'include/text.php';
@@ -1142,14 +1142,14 @@ function feed_birthday($uid, $tz)
        if (DBM::is_result($p)) {
                $tmp_dob = substr($p[0]['dob'], 5);
                if (intval($tmp_dob)) {
-                       $y = Temporal::timezoneNow($tz, 'Y');
+                       $y = DateTimeFormat::timezoneNow($tz, 'Y');
                        $bd = $y . '-' . $tmp_dob . ' 00:00';
                        $t_dob = strtotime($bd);
-                       $now = strtotime(Temporal::timezoneNow($tz));
+                       $now = strtotime(DateTimeFormat::timezoneNow($tz));
                        if ($t_dob < $now) {
                                $bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
                        }
-                       $birthday = Temporal::convert($bd, 'UTC', $tz, Temporal::ATOM);
+                       $birthday = DateTimeFormat::convert($bd, 'UTC', $tz, DateTimeFormat::ATOM);
                }
        }
 
index c383c55650d1030ce04673b075a4bd815f7cd748..96a935614dbf44aab6b1ba3f7b4f5cabad2c93f1 100644 (file)
@@ -36,8 +36,8 @@ use Friendica\Network\HTTPException\TooManyRequestsException;
 use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
 require_once 'include/bbcode.php';
@@ -111,7 +111,7 @@ function api_source()
 function api_date($str)
 {
        // Wed May 23 06:01:13 +0000 2007
-       return Temporal::utc($str, "D M d H:i:s +0000 Y");
+       return DateTimeFormat::utc($str, "D M d H:i:s +0000 Y");
 }
 
 /**
@@ -460,7 +460,7 @@ function api_rss_extra(App $a, $arr, $user_info)
                'self'         => System::baseUrl() . "/" . $a->query_string,
                'base'         => System::baseUrl(),
                'updated'      => api_date(null),
-               'atom_updated' => Temporal::utcNow(Temporal::ATOM),
+               'atom_updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
                'language'     => $user_info['language'],
                'logo'         => System::baseUrl() . "/images/friendica-32.png",
        ];
@@ -1162,7 +1162,7 @@ function api_statuses_update($type)
                // Check for throttling (maximum posts per day, week and month)
                $throttle_day = Config::get('system', 'throttle_limit_day');
                if ($throttle_day > 0) {
-                       $datefrom = date(Temporal::MYSQL, time() - 24*60*60);
+                       $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
 
                        $r = q(
                                "SELECT COUNT(*) AS `posts_day` FROM `item` WHERE `uid`=%d AND `wall`
@@ -1186,7 +1186,7 @@ function api_statuses_update($type)
 
                $throttle_week = Config::get('system', 'throttle_limit_week');
                if ($throttle_week > 0) {
-                       $datefrom = date(Temporal::MYSQL, time() - 24*60*60*7);
+                       $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
 
                        $r = q(
                                "SELECT COUNT(*) AS `posts_week` FROM `item` WHERE `uid`=%d AND `wall`
@@ -1210,7 +1210,7 @@ function api_statuses_update($type)
 
                $throttle_month = Config::get('system', 'throttle_limit_month');
                if ($throttle_month > 0) {
-                       $datefrom = date(Temporal::MYSQL, time() - 24*60*60*30);
+                       $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
 
                        $r = q(
                                "SELECT COUNT(*) AS `posts_month` FROM `item` WHERE `uid`=%d AND `wall`
@@ -3207,7 +3207,7 @@ function api_account_rate_limit_status($type)
                                '@attributes' => ["type" => "integer"],
                                'hourly-limit' => '150',
                                '@attributes2' => ["type" => "integer"],
-                               'reset-time' => Temporal::utc('now + 1 hour', Temporal::ATOM),
+                               'reset-time' => DateTimeFormat::utc('now + 1 hour', DateTimeFormat::ATOM),
                                '@attributes3' => ["type" => "datetime"],
                                'reset_time_in_seconds' => strtotime('now + 1 hour'),
                                '@attributes4' => ["type" => "integer"],
@@ -3217,7 +3217,7 @@ function api_account_rate_limit_status($type)
                                'reset_time_in_seconds' => strtotime('now + 1 hour'),
                                'remaining_hits' => '150',
                                'hourly_limit' => '150',
-                               'reset_time' => api_date(Temporal::utc('now + 1 hour', Temporal::ATOM)),
+                               'reset_time' => api_date(DateTimeFormat::utc('now + 1 hour', DateTimeFormat::ATOM)),
                        ];
        }
 
@@ -4216,7 +4216,7 @@ function api_fr_photo_create_update($type)
                        $result = q(
                                "UPDATE `photo` SET %s, `edited`='%s' WHERE `uid` = %d AND `resource-id` = '%s' AND `album` = '%s'",
                                $sql_extra,
-                               Temporal::utcNow(),   // update edited timestamp
+                               DateTimeFormat::utcNow(),   // update edited timestamp
                                intval(api_user()),
                                dbesc($photo_id),
                                dbesc($album)
@@ -4420,7 +4420,7 @@ function api_account_update_profile_image($type)
 
        q(
                "UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
-               dbesc(Temporal::utcNow()),
+               dbesc(DateTimeFormat::utcNow()),
                intval(local_user())
        );
 
index a7ebc4e0f96d65df788ab15c6391dffc03b75f22..0cb50e95ee125a0443f3267ef50ecafa2c9b3155 100644 (file)
@@ -7,7 +7,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Network\Probe;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use League\HTMLToMarkdown\HtmlConverter;
 
 require_once 'include/event.php';
@@ -245,15 +245,15 @@ function format_event_diaspora($ev) {
 
        // @todo What. Is. Going. On. With. This. Useless. Ternary. Operator? - mrpetovan
        $o .= L10n::t('Starts:') . ' ' . '[' . day_translate(
-                       $ev['adjust'] ? Temporal::utc($ev['start'], $bd_format) : Temporal::utc($ev['start'], $bd_format)
+                       $ev['adjust'] ? DateTimeFormat::utc($ev['start'], $bd_format) : DateTimeFormat::utc($ev['start'], $bd_format)
                )
-               .  '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(Temporal::utc($ev['start'])) . ")\n";
+               .  '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(DateTimeFormat::utc($ev['start'])) . ")\n";
 
        if (! $ev['nofinish']) {
                $o .= L10n::t('Finishes:') . ' ' . '[' . day_translate(
-                               $ev['adjust'] ? Temporal::utc($ev['finish'], $bd_format) : Temporal::utc($ev['finish'], $bd_format)
+                               $ev['adjust'] ? DateTimeFormat::utc($ev['finish'], $bd_format) : DateTimeFormat::utc($ev['finish'], $bd_format)
                        )
-                       . '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(Temporal::utc($ev['finish'])) . ")\n";
+                       . '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(DateTimeFormat::utc($ev['finish'])) . ")\n";
        }
 
        if (strlen($ev['location'])) {
index 98cb1773b17bab23c3f869434a154bf9b34f802d..d312c2d9e24886c05f6a78d2f1850af505d00597 100644 (file)
@@ -17,7 +17,7 @@ use Friendica\Model\Profile;
 use Friendica\Object\Post;
 use Friendica\Util\XML;
 use Friendica\Object\Thread;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once "include/bbcode.php";
 require_once "include/acl_selectors.php";
@@ -790,7 +790,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                                        'categories' => $categories,
                                        'folders' => $folders,
                                        'text' => strip_tags($body_e),
-                                       'localtime' => Temporal::local($item['created'], 'r'),
+                                       'localtime' => DateTimeFormat::local($item['created'], 'r'),
                                        'ago' => (($item['app']) ? L10n::t('%s from %s', relative_date($item['created']),$item['app']) : relative_date($item['created'])),
                                        'location' => $location_e,
                                        'indent' => '',
index 180748db961b77ceed972bcc1a8e2bc746e2885b..f6bab9e3c58e0eb85a6ebae86495da91652dd9cd 100644 (file)
@@ -4,7 +4,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once('include/datetime.php');
 
@@ -190,7 +190,7 @@ class dba {
 
                        if ($log) {
                                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                               @file_put_contents($a->config["system"]["db_log_index"], Temporal::utcNow()."\t".
+                               @file_put_contents($a->config["system"]["db_log_index"], DateTimeFormat::utcNow()."\t".
                                                $row['key']."\t".$row['rows']."\t".$row['Extra']."\t".
                                                basename($backtrace[1]["file"])."\t".
                                                $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
@@ -495,7 +495,7 @@ class dba {
                                $duration = round($duration, 3);
                                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-                               @file_put_contents($a->config["system"]["db_log"], Temporal::utcNow()."\t".$duration."\t".
+                               @file_put_contents($a->config["system"]["db_log"], DateTimeFormat::utcNow()."\t".$duration."\t".
                                                basename($backtrace[1]["file"])."\t".
                                                $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
                                                substr(self::replace_parameters($sql, $args), 0, 2000)."\n", FILE_APPEND);
index cf219676ecf4220b9bcb9079c6a837260847fda7..2b8c36e257d9c58929337feb927f3dd7c1093ae1 100644 (file)
@@ -8,8 +8,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
-use Friendica\Util\Temporal;
 
 require_once 'include/bbcode.php';
 require_once 'include/html2bbcode.php';
@@ -451,7 +451,7 @@ function notification($params)
                $datarray['name_cache'] = strip_tags(bbcode($params['source_name']));
                $datarray['url']   = $params['source_link'];
                $datarray['photo'] = $params['source_photo'];
-               $datarray['date']  = Temporal::utcNow();
+               $datarray['date']  = DateTimeFormat::utcNow();
                $datarray['uid']   = $params['uid'];
                $datarray['link']  = $itemlink;
                $datarray['iid']   = $item_id;
index 95be09cd7973904ab19d1092b9742a9332a18ed0..647697e5a0f66c1762b80775ca119aca58ee29c7 100644 (file)
@@ -12,8 +12,8 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
-use Friendica\Util\Temporal;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -28,14 +28,14 @@ function format_event_html($ev, $simple = false) {
 
        $event_start = day_translate(
                $ev['adjust'] ?
-                       Temporal::local($ev['start'], $bd_format)
-                       : Temporal::utc($ev['start'], $bd_format)
+                       DateTimeFormat::local($ev['start'], $bd_format)
+                       : DateTimeFormat::utc($ev['start'], $bd_format)
        );
 
        $event_end = day_translate(
                $ev['adjust'] ?
-                       Temporal::local($ev['finish'], $bd_format)
-                       : Temporal::utc($ev['finish'], $bd_format)
+                       DateTimeFormat::local($ev['finish'], $bd_format)
+                       : DateTimeFormat::utc($ev['finish'], $bd_format)
        );
 
        if ($simple) {
@@ -61,13 +61,13 @@ function format_event_html($ev, $simple = false) {
        $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="'
-               . Temporal::utc($ev['start'], (($ev['adjust']) ? Temporal::ATOM : 'Y-m-d\TH:i:s' ))
+               . DateTimeFormat::utc($ev['start'], (($ev['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s' ))
                . '" >'.$event_start
                . '</span></div>' . "\r\n";
 
        if (! $ev['nofinish']) {
                $o .= '<div class="event-end" ><span class="event-label">' . L10n::t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
-                       . Temporal::utc($ev['finish'], (($ev['adjust']) ? Temporal::ATOM : 'Y-m-d\TH:i:s' ))
+                       . DateTimeFormat::utc($ev['finish'], (($ev['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s' ))
                        . '" >'.$event_end
                        . '</span></div>' . "\r\n";
        }
@@ -200,8 +200,8 @@ function sort_by_date($a) {
 
 function ev_compare($a,$b) {
 
-       $date_a = (($a['adjust']) ? Temporal::local($a['start']) : $a['start']);
-       $date_b = (($b['adjust']) ? Temporal::local($b['start']) : $b['start']);
+       $date_a = (($a['adjust']) ? DateTimeFormat::local($a['start']) : $a['start']);
+       $date_b = (($b['adjust']) ? DateTimeFormat::local($b['start']) : $b['start']);
 
        if ($date_a === $date_b) {
                return strcasecmp($a['desc'], $b['desc']);
@@ -244,8 +244,8 @@ function event_store($arr) {
 
        $a = get_app();
 
-       $arr['created'] = (($arr['created'])     ? $arr['created']         : Temporal::utcNow());
-       $arr['edited']  = (($arr['edited'])      ? $arr['edited']          : Temporal::utcNow());
+       $arr['created'] = (($arr['created'])     ? $arr['created']         : DateTimeFormat::utcNow());
+       $arr['edited']  = (($arr['edited'])      ? $arr['edited']          : DateTimeFormat::utcNow());
        $arr['type']    = (($arr['type'])        ? $arr['type']            : 'event' );
        $arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid'])     : 0);
        $arr['uri']     = (x($arr, 'uri')        ? $arr['uri']             : item_new_uri($a->get_hostname(), $arr['uid']));
@@ -595,15 +595,15 @@ function process_events($arr) {
        $fmt = L10n::t('l, F j');
        if (count($arr)) {
                foreach ($arr as $rr) {
-                       $j = (($rr['adjust']) ? Temporal::local($rr['start'], 'j') : Temporal::utc($rr['start'], 'j'));
-                       $d = (($rr['adjust']) ? Temporal::local($rr['start'], $fmt) : Temporal::utc($rr['start'], $fmt));
+                       $j = (($rr['adjust']) ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j'));
+                       $d = (($rr['adjust']) ? DateTimeFormat::local($rr['start'], $fmt) : DateTimeFormat::utc($rr['start'], $fmt));
                        $d = day_translate($d);
 
-                       $start = (($rr['adjust']) ? Temporal::local($rr['start'], 'c') : Temporal::utc($rr['start'], 'c'));
+                       $start = (($rr['adjust']) ? DateTimeFormat::local($rr['start'], 'c') : DateTimeFormat::utc($rr['start'], 'c'));
                        if ($rr['nofinish']) {
                                $end = null;
                        } else {
-                               $end = (($rr['adjust']) ? Temporal::local($rr['finish'], 'c') : Temporal::utc($rr['finish'], 'c'));
+                               $end = (($rr['adjust']) ? DateTimeFormat::local($rr['finish'], 'c') : DateTimeFormat::utc($rr['finish'], 'c'));
                        }
 
                        $is_first = ($d !== $last_date);
@@ -930,27 +930,27 @@ function format_event_item($item) {
        // Convert the time to different formats.
        $dtstart_dt = day_translate(
                $item['event-adjust'] ?
-                       Temporal::local($item['event-start'], $dformat)
-                       : Temporal::utc($item['event-start'], $dformat)
+                       DateTimeFormat::local($item['event-start'], $dformat)
+                       : DateTimeFormat::utc($item['event-start'], $dformat)
        );
-       $dtstart_title = Temporal::utc($item['event-start'], $item['event-adjust'] ? Temporal::ATOM : 'Y-m-d\TH:i:s');
+       $dtstart_title = DateTimeFormat::utc($item['event-start'], $item['event-adjust'] ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s');
        // Format: Jan till Dec.
        $month_short = day_short_translate(
                $item['event-adjust'] ?
-                       Temporal::local($item['event-start'], 'M')
-                       : Temporal::utc($item['event-start'], 'M')
+                       DateTimeFormat::local($item['event-start'], 'M')
+                       : DateTimeFormat::utc($item['event-start'], 'M')
        );
        // Format: 1 till 31.
        $date_short = $item['event-adjust'] ?
-               Temporal::local($item['event-start'], 'j')
-               : Temporal::utc($item['event-start'], 'j');
+               DateTimeFormat::local($item['event-start'], 'j')
+               : DateTimeFormat::utc($item['event-start'], 'j');
        $start_time = $item['event-adjust'] ?
-               Temporal::local($item['event-start'], $tformat)
-               : Temporal::utc($item['event-start'], $tformat);
+               DateTimeFormat::local($item['event-start'], $tformat)
+               : DateTimeFormat::utc($item['event-start'], $tformat);
        $start_short = day_short_translate(
                $item['event-adjust'] ?
-                       Temporal::local($item['event-start'], $dformat_short)
-                       : Temporal::utc($item['event-start'], $dformat_short)
+                       DateTimeFormat::local($item['event-start'], $dformat_short)
+                       : DateTimeFormat::utc($item['event-start'], $dformat_short)
        );
 
        // If the option 'nofinisch' isn't set, we need to format the finish date/time.
@@ -958,18 +958,18 @@ function format_event_item($item) {
                $finish = true;
                $dtend_dt  = day_translate(
                        $item['event-adjust'] ?
-                               Temporal::local($item['event-finish'], $dformat)
-                               : Temporal::utc($item['event-finish'], $dformat)
+                               DateTimeFormat::local($item['event-finish'], $dformat)
+                               : DateTimeFormat::utc($item['event-finish'], $dformat)
                );
-               $dtend_title = Temporal::utc($item['event-finish'], $item['event-adjust']   ? Temporal::ATOM : 'Y-m-d\TH:i:s');
+               $dtend_title = DateTimeFormat::utc($item['event-finish'], $item['event-adjust'] ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s');
                $end_short = day_short_translate(
                        $item['event-adjust'] ?
-                               Temporal::local($item['event-finish'], $dformat_short)
-                               : Temporal::utc($item['event-finish'], $dformat_short)
+                               DateTimeFormat::local($item['event-finish'], $dformat_short)
+                               : DateTimeFormat::utc($item['event-finish'], $dformat_short)
                );
                $end_time = $item['event-adjust'] ?
-                       Temporal::local($item['event-finish'], $tformat)
-                       : Temporal::utc($item['event-finish'], $tformat);
+                       DateTimeFormat::local($item['event-finish'], $tformat)
+                       : DateTimeFormat::utc($item['event-finish'], $tformat);
                // Check if start and finish time is at the same day.
                if (substr($dtstart_title, 0, 10) === substr($dtend_title, 0, 10)) {
                        $same_date = true;
index e5a04b120074cf3b8e5a2691921013bd4215aff8..f1c895f90fece19a2aac720a9d5fa1835c8b4b0b 100644 (file)
@@ -9,22 +9,14 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
-use Friendica\Model\GContact;
-use Friendica\Model\Group;
 use Friendica\Model\Item;
-use Friendica\Model\Term;
-use Friendica\Model\User;
-use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Feed;
-use Friendica\Util\Network;
 use Friendica\Protocol\OStatus;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
-use Friendica\Util\Temporal;
 
 require_once 'include/bbcode.php';
 require_once 'include/tags.php';
@@ -416,7 +408,7 @@ function drop_item($id) {
 
 /* arrange the list in years */
 function list_post_dates($uid, $wall) {
-       $dnow = Temporal::localNow('Y-m-d');
+       $dnow = DateTimeFormat::localNow('Y-m-d');
 
        $dthen = Item::firstPostDate($uid, $wall);
        if (!$dthen) {
@@ -437,14 +429,14 @@ function list_post_dates($uid, $wall) {
                $dyear = intval(substr($dnow, 0, 4));
                $dstart = substr($dnow, 0, 8) . '01';
                $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5)));
-               $start_month = Temporal::utc($dstart, 'Y-m-d');
-               $end_month = Temporal::utc($dend, 'Y-m-d');
-               $str = day_translate(Temporal::utc($dnow, 'F'));
+               $start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
+               $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
+               $str = day_translate(DateTimeFormat::utc($dnow, 'F'));
                if (!$ret[$dyear]) {
                        $ret[$dyear] = [];
                }
                $ret[$dyear][] = [$str, $end_month, $start_month];
-               $dnow = Temporal::utc($dnow . ' -1 month', 'Y-m-d');
+               $dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
        }
        return $ret;
 }
@@ -474,7 +466,7 @@ function posted_date_widget($url, $uid, $wall) {
                return $o;
        }
 
-       $cutoff_year = intval(Temporal::localNow('Y')) - $visible_years;
+       $cutoff_year = intval(DateTimeFormat::localNow('Y')) - $visible_years;
        $cutoff = ((array_key_exists($cutoff_year, $ret))? true : false);
 
        $o = replace_macros(get_markup_template('posted_date_widget.tpl'),[
index e370e9340c30e4ebc7a50de3fc7c3fbf49cd6ba6..45f8d86b10f4808238059e97515cd5fc3eeffb1f 100644 (file)
@@ -10,7 +10,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Group;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 /**
  * @brief Calculate the hash that is needed for the "Friendica" cookie
@@ -142,10 +142,10 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] . '"');
 
        if ($login_initial || $login_refresh) {
-               dba::update('user', ['login_date' => Temporal::utcNow()], ['uid' => $_SESSION['uid']]);
+               dba::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
 
                // Set the login date for all identities of the user
-               dba::update('user', ['login_date' => Temporal::utcNow()],
+               dba::update('user', ['login_date' => DateTimeFormat::utcNow()],
                        ['password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false]);
        }
 
index 6a48d7ef835bf0f100b56faad45851793415f87b..73792e53ce5874785317fb27d783c494b406dda3 100644 (file)
@@ -15,8 +15,8 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Profile;
 use Friendica\Model\Term;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
-use Friendica\Util\Temporal;
 
 require_once "mod/proxy.php";
 require_once "include/conversation.php";
@@ -723,7 +723,7 @@ function logger($msg, $level = 0) {
 
        $callers = debug_backtrace();
        $logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
-                       Temporal::utcNow(Temporal::ATOM),
+                       DateTimeFormat::utcNow(DateTimeFormat::ATOM),
                        $process_id,
                        $LOGGER_LEVELS[$level],
                        basename($callers[0]['file']),
@@ -789,7 +789,7 @@ function dlogger($msg, $level = 0) {
 
        $callers = debug_backtrace();
        $logline = sprintf("%s@\t%s:\t%s:\t%s\t%s\t%s\n",
-                       Temporal::utcNow(),
+                       DateTimeFormat::utcNow(),
                        $process_id,
                        basename($callers[0]['file']),
                        $callers[0]['line'],
index 9bd94cd03da8bd3c439714b5a11522325b3f059e..5d6a8fbafdd29f2b95b7426b5fb911880c8d6532 100644 (file)
@@ -20,7 +20,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Module\Login;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -740,7 +740,7 @@ function admin_page_summary(App $a)
        if (!$last_worker_call) {
                $showwarning = true;
                $warningtext[] = L10n::t('The worker was never executed. Please check your database structure!');
-       } elseif ((strtotime(Temporal::utcNow()) - strtotime($last_worker_call)) > 60 * 60) {
+       } elseif ((strtotime(DateTimeFormat::utcNow()) - strtotime($last_worker_call)) > 60 * 60) {
                $showwarning = true;
                $warningtext[] = L10n::t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.', $last_worker_call);
        }
index 22005c06aeea349459c99b317a0ff51a1cc3a9d0..cafef3e300beede45824bccdb0f33eb44480831a 100644 (file)
@@ -17,7 +17,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/event.php';
 
@@ -152,8 +152,8 @@ function cal_content(App $a)
 
        // The view mode part is similiar to /mod/events.php
        if ($mode == 'view') {
-               $thisyear = Temporal::localNow('Y');
-               $thismonth = Temporal::localNow('m');
+               $thisyear = DateTimeFormat::localNow('Y');
+               $thismonth = DateTimeFormat::localNow('m');
                if (!$y) {
                        $y = intval($thisyear);
                }
@@ -203,11 +203,11 @@ function cal_content(App $a)
                        }
                }
 
-               $start = Temporal::utc($start);
-               $finish = Temporal::utc($finish);
+               $start = DateTimeFormat::utc($start);
+               $finish = DateTimeFormat::utc($finish);
 
-               $adjust_start = Temporal::local($start);
-               $adjust_finish = Temporal::local($finish);
+               $adjust_start = DateTimeFormat::local($start);
+               $adjust_finish = DateTimeFormat::local($finish);
 
                // put the event parametes in an array so we can better transmit them
                $event_params = [
@@ -231,7 +231,7 @@ function cal_content(App $a)
                if (DBM::is_result($r)) {
                        $r = sort_by_date($r);
                        foreach ($r as $rr) {
-                               $j = $rr['adjust'] ? Temporal::local($rr['start'], 'j') : Temporal::utc($rr['start'], 'j');
+                               $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
                                if (!x($links, $j)) {
                                        $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
                                }
index 81f1a6cafdef6ea8b95b8a535a2fe1451eb68f17..c37c4f3d5076ba2a8e40cee4309ea34b6a769524 100644 (file)
@@ -17,7 +17,7 @@ use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'mod/proxy.php';
 
@@ -540,7 +540,7 @@ function contacts_content(App $a)
 
                $insecure = L10n::t('Private communications are not available for this contact.');
 
-               $last_update = (($contact['last-update'] <= NULL_DATE) ? L10n::t('Never') : Temporal::local($contact['last-update'], 'D, j M Y, g:i A'));
+               $last_update = (($contact['last-update'] <= NULL_DATE) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
 
                if ($contact['last-update'] > NULL_DATE) {
                        $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t("\x28Update was successful\x29") : L10n::t("\x28Update was not successful\x29"));
@@ -554,7 +554,7 @@ function contacts_content(App $a)
                // tabs
                $tab_str = contacts_tab($a, $contact_id, 2);
 
-               $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < Temporal::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
+               $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
 
                $fetch_further_information = null;
                if ($contact['network'] == NETWORK_FEED) {
index 9a46d463b7f85a1efb9c6e17d946b0aa019de482..d5264aa056e7954b02ccdf97842aeca414084a88 100644 (file)
@@ -31,8 +31,8 @@ use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
 require_once 'include/enotify.php';
@@ -327,8 +327,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                `network` = '%s' WHERE `id` = %d
                        ",
                                intval($new_relation),
-                               dbesc(Temporal::utcNow()),
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval($duplex),
                                intval($hidden),
                                dbesc(NETWORK_DFRN),
@@ -378,8 +378,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                `rel` = %d
                                WHERE `id` = %d
                        ",
-                               dbesc(Temporal::utcNow()),
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                dbesc($addr),
                                dbesc($notify),
                                dbesc($poll),
@@ -619,8 +619,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                        `network` = '%s' WHERE `id` = %d
                ",
                        intval($new_relation),
-                       dbesc(Temporal::utcNow()),
-                       dbesc(Temporal::utcNow()),
+                       dbesc(DateTimeFormat::utcNow()),
+                       dbesc(DateTimeFormat::utcNow()),
                        intval($duplex),
                        intval($forum),
                        intval($prv),
index 6db198dcd21573efc81a3b89ae1ca43ef19bbce7..34cc9cf258032308ef7cb88ff241f23d407492f0 100644 (file)
@@ -24,8 +24,8 @@ use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Module\Login;
 use Friendica\Network\Probe;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
 require_once 'include/enotify.php';
 
@@ -137,7 +137,7 @@ function dfrn_request_post(App $a)
                                                `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
                                                VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
                                                intval(local_user()),
-                                               Temporal::utcNow(),
+                                               DateTimeFormat::utcNow(),
                                                dbesc($dfrn_url),
                                                dbesc(normalise_link($dfrn_url)),
                                                $parms['addr'],
@@ -241,7 +241,7 @@ function dfrn_request_post(App $a)
                // Block friend request spam
                if ($maxreq) {
                        $r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
-                               dbesc(Temporal::utc('now - 24 hours')),
+                               dbesc(DateTimeFormat::utc('now - 24 hours')),
                                intval($uid)
                        );
                        if (DBM::is_result($r) && count($r) > $maxreq) {
@@ -382,7 +382,7 @@ function dfrn_request_post(App $a)
                                        `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
                                        VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
                                        intval($uid),
-                                       dbesc(Temporal::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        $parms['url'],
                                        dbesc(normalise_link($url)),
                                        $parms['addr'],
@@ -430,7 +430,7 @@ function dfrn_request_post(App $a)
                                        ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
                                        dbesc(notags(trim($_POST['dfrn-request-message']))),
                                        dbesc($hash),
-                                       dbesc(Temporal::utcNow())
+                                       dbesc(DateTimeFormat::utcNow())
                                );
                        }
 
index 1d61dfcc33860a9ea1bdbdc17ec4387b806f8670..7637486f8e0387ff8e5a4c2915c910c1e808887b 100644 (file)
@@ -12,7 +12,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -76,14 +76,14 @@ function events_post(App $a) {
        }
 
        if ($adjust) {
-               $start = Temporal::convert($start, 'UTC', date_default_timezone_get());
+               $start = DateTimeFormat::convert($start, 'UTC', date_default_timezone_get());
                if (! $nofinish) {
-                       $finish = Temporal::convert($finish, 'UTC', date_default_timezone_get());
+                       $finish = DateTimeFormat::convert($finish, 'UTC', date_default_timezone_get());
                }
        } else {
-               $start = Temporal::utc($start);
+               $start = DateTimeFormat::utc($start);
                if (! $nofinish) {
-                       $finish = Temporal::utc($finish);
+                       $finish = DateTimeFormat::utc($finish);
                }
        }
 
@@ -276,8 +276,8 @@ function events_content(App $a) {
        // The view mode part is similiar to /mod/cal.php
        if ($mode == 'view') {
 
-               $thisyear  = Temporal::localNow('Y');
-               $thismonth = Temporal::localNow('m');
+               $thisyear  = DateTimeFormat::localNow('Y');
+               $thismonth = DateTimeFormat::localNow('m');
                if (! $y) {
                        $y = intval($thisyear);
                }
@@ -323,11 +323,11 @@ function events_content(App $a) {
                        }
                }
 
-               $start  = Temporal::utc($start);
-               $finish = Temporal::utc($finish);
+               $start  = DateTimeFormat::utc($start);
+               $finish = DateTimeFormat::utc($finish);
 
-               $adjust_start  = Temporal::local($start);
-               $adjust_finish = Temporal::local($finish);
+               $adjust_start  = DateTimeFormat::local($start);
+               $adjust_finish = DateTimeFormat::local($finish);
 
                // put the event parametes in an array so we can better transmit them
                $event_params = [
@@ -351,7 +351,7 @@ function events_content(App $a) {
                if (DBM::is_result($r)) {
                        $r = sort_by_date($r);
                        foreach ($r as $rr) {
-                               $j = $rr['adjust'] ? Temporal::local($rr['start'], 'j') : Temporal::utc($rr['start'], 'j');
+                               $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
                                if (! x($links,$j)) {
                                        $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
                                }
@@ -465,19 +465,19 @@ function events_content(App $a) {
                        $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
                }
 
-               $syear  = Temporal::convert($sdt, $tz, 'UTC', 'Y');
-               $smonth = Temporal::convert($sdt, $tz, 'UTC', 'm');
-               $sday   = Temporal::convert($sdt, $tz, 'UTC', 'd');
+               $syear  = DateTimeFormat::convert($sdt, $tz, 'UTC', 'Y');
+               $smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm');
+               $sday   = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd');
 
-               $shour   = ((x($orig_event)) ? Temporal::convert($sdt, $tz, 'UTC', 'H') : 0);
-               $sminute = ((x($orig_event)) ? Temporal::convert($sdt, $tz, 'UTC', 'i') : 0);
+               $shour   = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : 0);
+               $sminute = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : 0);
 
-               $fyear  = Temporal::convert($fdt, $tz, 'UTC', 'Y');
-               $fmonth = Temporal::convert($fdt, $tz, 'UTC', 'm');
-               $fday   = Temporal::convert($fdt, $tz, 'UTC', 'd');
+               $fyear  = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y');
+               $fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm');
+               $fday   = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd');
 
-               $fhour   = ((x($orig_event)) ? Temporal::convert($fdt, $tz, 'UTC', 'H') : 0);
-               $fminute = ((x($orig_event)) ? Temporal::convert($fdt, $tz, 'UTC', 'i') : 0);
+               $fhour   = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : 0);
+               $fminute = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : 0);
 
                require_once 'include/acl_selectors.php' ;
 
index ccd38217d2ae095c113698a00752f37216d8a9ac..86878a5295c0463af912ac405a45fbdbb6f11158 100644 (file)
@@ -7,7 +7,7 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 function fsuggest_post(App $a)
 {
@@ -52,7 +52,7 @@ function fsuggest_post(App $a)
                                dbesc($r[0]['request']),
                                dbesc($r[0]['photo']),
                                dbesc($hash),
-                               dbesc(Temporal::utcNow())
+                               dbesc(DateTimeFormat::utcNow())
                        );
                        $r = q("SELECT `id` FROM `fsuggest` WHERE `note` = '%s' AND `uid` = %d LIMIT 1",
                                dbesc($hash),
index 8ecbbe6cd828a330fded2df2501209efb1667b4b..d638b860b4236dcc79e9de7e75c45646872672f9 100644 (file)
@@ -12,7 +12,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Protocol\Email;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 function invite_post(App $a)
 {
@@ -62,7 +62,7 @@ function invite_post(App $a)
 
                        $r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
                                dbesc($code),
-                               dbesc(Temporal::utcNow())
+                               dbesc(DateTimeFormat::utcNow())
                        );
 
                        if (! is_site_admin()) {
index 1b0010281695049a11c30f8069fa12cac1faaf4c..ccf98667c8793ee99cfc7208905cda10e32b57a0 100644 (file)
@@ -28,8 +28,8 @@ use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
-use Friendica\Util\Temporal;
 
 require_once 'include/enotify.php';
 require_once 'include/tags.php';
@@ -601,11 +601,11 @@ function item_post(App $a) {
        $datarray['author-link']   = $author['url'];
        $datarray['author-avatar'] = $author['thumb'];
        $datarray['author-id']     = Contact::getIdForURL($datarray['author-link'], 0);
-       $datarray['created']       = Temporal::utcNow();
-       $datarray['edited']        = Temporal::utcNow();
-       $datarray['commented']     = Temporal::utcNow();
-       $datarray['received']      = Temporal::utcNow();
-       $datarray['changed']       = Temporal::utcNow();
+       $datarray['created']       = DateTimeFormat::utcNow();
+       $datarray['edited']        = DateTimeFormat::utcNow();
+       $datarray['commented']     = DateTimeFormat::utcNow();
+       $datarray['received']      = DateTimeFormat::utcNow();
+       $datarray['changed']       = DateTimeFormat::utcNow();
        $datarray['extid']         = $extid;
        $datarray['guid']          = $guid;
        $datarray['uri']           = $uri;
@@ -709,8 +709,8 @@ function item_post(App $a) {
                        'file' => $datarray['file'],
                        'rendered-html' => $datarray['rendered-html'],
                        'rendered-hash' => $datarray['rendered-hash'],
-                       'edited' => Temporal::utcNow(),
-                       'changed' => Temporal::utcNow()];
+                       'edited' => DateTimeFormat::utcNow(),
+                       'changed' => DateTimeFormat::utcNow()];
 
                Item::update($fields, ['id' => $post_id]);
 
index 29402b34eb4c040ecd8a107d8de57106f8c72e6d..4920962a7b443d033ea32571f21c26c048654ca0 100644 (file)
@@ -20,7 +20,7 @@ function localtime_post(App $a)
        $bd_format = L10n::t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
        if ($_POST['timezone']) {
-               $a->data['mod-localtime'] = Temporal::convert($t, $_POST['timezone'], 'UTC', $bd_format);
+               $a->data['mod-localtime'] = DateTimeFormat::convert($t, $_POST['timezone'], 'UTC', $bd_format);
        }
 }
 
index e3bea9db2e167d7d013297943e9fa1029a477675..75d29731be71d7daba16b4c022af40ca00980f5b 100644 (file)
@@ -8,7 +8,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\User;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'boot.php';
 require_once 'include/datetime.php';
@@ -33,7 +33,7 @@ function lostpass_post(App $a)
 
        $fields = [
                'pwdreset' => $pwdreset_token,
-               'pwdreset_time' => Temporal::utcNow()
+               'pwdreset_time' => DateTimeFormat::utcNow()
        ];
        $result = dba::update('user', $fields, ['uid' => $user['uid']]);
        if ($result) {
@@ -92,7 +92,7 @@ function lostpass_content(App $a)
                }
 
                // Password reset requests expire in 60 minutes
-               if ($user['pwdreset_time'] < Temporal::utc('now - 1 hour')) {
+               if ($user['pwdreset_time'] < DateTimeFormat::utc('now - 1 hour')) {
                        $fields = [
                                'pwdreset' => null,
                                'pwdreset_time' => null
index 5f1efe5ba327ff9643b20c4ea41ca439e4d70b04..ec5669937370a8d7709cc350869044b6c0276062 100644 (file)
@@ -11,7 +11,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/acl_selectors.php';
 require_once 'include/conversation.php';
@@ -397,7 +397,7 @@ function message_content(App $a)
                                'body' => $body_e,
                                'delete' => L10n::t('Delete message'),
                                'to_name' => $to_name_e,
-                               'date' => Temporal::local($message['created'], 'D, d M Y - g:i A'),
+                               'date' => DateTimeFormat::local($message['created'], 'D, d M Y - g:i A'),
                                'ago' => relative_date($message['created']),
                        ];
 
@@ -498,7 +498,7 @@ function render_messages(array $msg, $t)
                        '$delete' => L10n::t('Delete conversation'),
                        '$body' => $body_e,
                        '$to_name' => $to_name_e,
-                       '$date' => Temporal::local($rr['mailcreated'], L10n::t('D, d M Y - g:i A')),
+                       '$date' => DateTimeFormat::local($rr['mailcreated'], L10n::t('D, d M Y - g:i A')),
                        '$ago' => relative_date($rr['mailcreated']),
                        '$seen' => $rr['mailseen'],
                        '$count' => L10n::tt('%d message', '%d messages', $rr['count']),
index 01b6413e6aa4d3aa793f531a0bfedd1dcedb0a57..c2f05fd8e7e22a14a17a4b9b06c306eb28dc4fa8 100644 (file)
@@ -19,7 +19,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Module\Login;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/conversation.php';
 require_once 'include/items.php';
@@ -681,11 +681,11 @@ function networkThreadedView(App $a, $update = 0)
 
        if ($datequery) {
                $sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created <= '%s' ",
-                               dbesc(Temporal::convert($datequery, 'UTC', date_default_timezone_get()))));
+                               dbesc(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
        }
        if ($datequery2) {
                $sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created >= '%s' ",
-                               dbesc(Temporal::convert($datequery2, 'UTC', date_default_timezone_get()))));
+                               dbesc(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
        }
 
        $sql_order = '';
@@ -790,8 +790,8 @@ function networkThreadedView(App $a, $update = 0)
                        $top_limit = current($r)['order_date'];
                        $bottom_limit = end($r)['order_date'];
                } else {
-                       $top_limit = Temporal::utcNow();
-                       $bottom_limit = Temporal::utcNow();
+                       $top_limit = DateTimeFormat::utcNow();
+                       $bottom_limit = DateTimeFormat::utcNow();
                }
 
                // When checking for updates we need to fetch from the newest date to the newest date before
@@ -804,7 +804,7 @@ function networkThreadedView(App $a, $update = 0)
                        $top_limit = $last_date;
                } elseif ($a->pager['page'] == 1) {
                        // Highest possible top limit when we are on the first page
-                       $top_limit = Temporal::utcNow();
+                       $top_limit = DateTimeFormat::utcNow();
                }
 
                $items = dba::p("SELECT `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid` FROM `item`
index 49b68a345daa0f923d6610611117dbff19bc4858..8b3dbdc759ae4294fda0bbeab81438e99d210cd4 100644 (file)
@@ -20,8 +20,8 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
-use Friendica\Util\Temporal;
 
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
@@ -291,7 +291,7 @@ function photos_post(App $a)
                        if (DBM::is_result($r)) {
                                foreach ($r as $rr) {
                                        q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
-                                               dbesc(Temporal::utcNow()),
+                                               dbesc(DateTimeFormat::utcNow()),
                                                dbesc($rr['parent-uri']),
                                                intval($page_owner_uid)
                                        );
@@ -364,8 +364,8 @@ function photos_post(App $a)
                        );
                        if (DBM::is_result($i)) {
                                q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
-                                       dbesc(Temporal::utcNow()),
-                                       dbesc(Temporal::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        dbesc($i[0]['uri']),
                                        intval($page_owner_uid)
                                );
@@ -402,7 +402,7 @@ function photos_post(App $a)
                $resource_id = $a->argv[2];
 
                if (!strlen($albname)) {
-                       $albname = Temporal::localNow('Y');
+                       $albname = DateTimeFormat::localNow('Y');
                }
 
                if (x($_POST,'rotate') !== false &&
@@ -649,8 +649,8 @@ function photos_post(App $a)
                        $r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
                                dbesc($newtag),
                                dbesc($newinform),
-                               dbesc(Temporal::utcNow()),
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval($item_id),
                                intval($page_owner_uid)
                        );
@@ -738,7 +738,7 @@ function photos_post(App $a)
                if (strlen($newalbum)) {
                        $album = $newalbum;
                } else {
-                       $album = Temporal::localNow('Y');
+                       $album = DateTimeFormat::localNow('Y');
                }
        }
 
@@ -1361,7 +1361,7 @@ function photos_content(App $a)
                $photo = [
                        'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
                        'title'=> L10n::t('View Full Size'),
-                       'src'  => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . Temporal::utcNow('ymdhis'),
+                       'src'  => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . DateTimeFormat::utcNow('ymdhis'),
                        'height' => $hires['height'],
                        'width' => $hires['width'],
                        'album' => $hires['album'],
index 56d5fe290d14479514556adabd8cc8ea1d69281b..3249624fbeb3c87388f3b64a02df584cbcf83266 100644 (file)
@@ -14,7 +14,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\XML;
 
 require_once 'include/datetime.php';
@@ -225,8 +225,8 @@ function ping_init(App $a)
                                WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
                                ORDER BY `start` ASC ",
                                intval(local_user()),
-                               dbesc(Temporal::utc('now + 7 days')),
-                               dbesc(Temporal::utcNow())
+                               dbesc(DateTimeFormat::utc('now + 7 days')),
+                               dbesc(DateTimeFormat::utcNow())
                        );
                        if (DBM::is_result($ev)) {
                                Cache::set($cachekey, $ev, CACHE_HOUR);
@@ -237,7 +237,7 @@ function ping_init(App $a)
                        $all_events = count($ev);
 
                        if ($all_events) {
-                               $str_now = Temporal::timezoneNow($a->timezone, 'Y-m-d');
+                               $str_now = DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d');
                                foreach ($ev as $x) {
                                        $bd = false;
                                        if ($x['type'] === 'birthday') {
@@ -246,7 +246,7 @@ function ping_init(App $a)
                                        } else {
                                                $events ++;
                                        }
-                                       if (Temporal::convert($x['start'], ((intval($x['adjust'])) ? $a->timezone : 'UTC'), 'UTC', 'Y-m-d') === $str_now) {
+                                       if (DateTimeFormat::convert($x['start'], ((intval($x['adjust'])) ? $a->timezone : 'UTC'), 'UTC', 'Y-m-d') === $str_now) {
                                                $all_events_today ++;
                                                if ($bd) {
                                                        $birthdays_today ++;
@@ -362,7 +362,7 @@ function ping_init(App $a)
                                        $notif['photo'] = proxy_url($notif['photo'], false, PROXY_SIZE_MICRO);
                                }
 
-                               $local_time = Temporal::local($notif['date']);
+                               $local_time = DateTimeFormat::local($notif['date']);
 
                                $notifications[] = [
                                        'id'        => $notif['id'],
index 1415ee9aa6b5923f9547ab978a710b5fb910ba40..639ab8469c0f085eb949f6e960e8b71805eb9103 100644 (file)
@@ -3,13 +3,14 @@
 // See here for a documentation for portable contacts:
 // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
 
+
 use Friendica\App;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Protocol\PortableContact;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 function poco_init(App $a) {
        $system_mode = false;
@@ -44,7 +45,7 @@ function poco_init(App $a) {
        if ($a->argc > 1 && $a->argv[1] === '@global') {
                // List of all profiles that this server recently had data from
                $global = true;
-               $update_limit = date(Temporal::MYSQL, time() - 30 * 86400);
+               $update_limit = date(DateTimeFormat::MYSQL, time() - 30 * 86400);
        }
        if ($a->argc > 2 && $a->argv[2] === '@me') {
                $justme = true;
@@ -81,7 +82,7 @@ function poco_init(App $a) {
                $sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid));
        }
        if (x($_GET, 'updatedSince')) {
-               $update_limit = date(Temporal::MYSQL, strtotime($_GET['updatedSince']));
+               $update_limit = date(DateTimeFormat::MYSQL, strtotime($_GET['updatedSince']));
        }
        if ($global) {
                $contacts = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
index a10c22e9485a356ccd183ffeeb2e9c8c58b24e6d..a2fff27e0712607588c95b6fb293e094c34903d5 100644 (file)
@@ -16,7 +16,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Module\Login;
 use Friendica\Protocol\DFRN;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 function profile_init(App $a)
 {
@@ -236,7 +236,7 @@ function profile_content(App $a, $update = 0)
                if ($is_owner || !$last_updated) {
                        $sql_extra4 = " AND `item`.`unseen`";
                } else {
-                       $gmupdate = gmdate(Temporal::MYSQL, $last_updated);
+                       $gmupdate = gmdate(DateTimeFormat::MYSQL, $last_updated);
                        $sql_extra4 = " AND `item`.`received` > '" . $gmupdate . "'";
                }
 
@@ -272,10 +272,10 @@ function profile_content(App $a, $update = 0)
                }
 
                if ($datequery) {
-                       $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(Temporal::convert($datequery, 'UTC', date_default_timezone_get()))));
+                       $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
                }
                if ($datequery2) {
-                       $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", dbesc(Temporal::convert($datequery2, 'UTC', date_default_timezone_get()))));
+                       $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", dbesc(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
                }
 
                // Belongs the profile page to a forum?
index 82050e962e07a011c4773f583081a03b3adc3907..370e19ce5e840d5ce55637c1379c9386cc61a219 100644 (file)
@@ -12,7 +12,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 function profile_photo_init(App $a)
 {
@@ -130,7 +130,7 @@ function profile_photo_post(App $a) {
                                // so that browsers will do a cache update unconditionally
 
                                $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
-                                       dbesc(Temporal::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        intval(local_user())
                                );
 
@@ -230,7 +230,7 @@ function profile_photo_content(App $a) {
                                );
 
                        $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval(local_user())
                        );
 
index 25ce15ce8b1b62276f6920ae7fc37b409b96aa9c..bde24764ff64d54f5eb9796d0a1298563c3d662c 100644 (file)
@@ -18,7 +18,7 @@ use Friendica\Model\GContact;
 use Friendica\Model\Profile;
 use Friendica\Model\Item;
 use Friendica\Network\Probe;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 function profiles_init(App $a) {
 
@@ -220,9 +220,9 @@ function profiles_post(App $a) {
                        }
 
                        if ($ignore_year) {
-                               $dob = '0000-' . Temporal::utc('1900-' . $dob, 'm-d');
+                               $dob = '0000-' . DateTimeFormat::utc('1900-' . $dob, 'm-d');
                        } else {
-                               $dob = Temporal::utc($dob, 'Y-m-d');
+                               $dob = DateTimeFormat::utc($dob, 'Y-m-d');
                        }
                }
 
@@ -253,7 +253,7 @@ function profiles_post(App $a) {
                if (! strlen($howlong)) {
                        $howlong = NULL_DATE;
                } else {
-                       $howlong = Temporal::convert($howlong, 'UTC', date_default_timezone_get());
+                       $howlong = DateTimeFormat::convert($howlong, 'UTC', date_default_timezone_get());
                }
                // linkify the relationship target if applicable
 
@@ -488,7 +488,7 @@ function profiles_post(App $a) {
                if ($namechanged && $is_default) {
                        $r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
                                dbesc($name),
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval(local_user())
                        );
                        $r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
@@ -725,7 +725,7 @@ function profiles_content(App $a) {
                        '$gender' => ContactSelector::gender($r[0]['gender']),
                        '$marital' => ContactSelector::maritalStatus($r[0]['marital']),
                        '$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')],
-                       '$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : Temporal::local($r[0]['howlong']))],
+                       '$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : DateTimeFormat::local($r[0]['howlong']))],
                        '$sexual' => ContactSelector::sexualPreference($r[0]['sexual']),
                        '$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']],
                        '$xmpp' => ['xmpp', L10n::t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")],
index 332b5bd1b05e0512e8be26960f73c8dcac10d67b..0b84233e5f356088916aca39b59b0762438af06c 100644 (file)
@@ -10,8 +10,8 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
 define('PROXY_DEFAULT_TIME', 86400); // 1 Day
 
@@ -188,7 +188,7 @@ function proxy_init(App $a) {
                                die();
                        }
 
-                       $fields = ['uid' => 0, 'contact-id' => 0, 'guid' => get_guid(), 'resource-id' => $urlhash, 'created' => Temporal::utcNow(), 'edited' => Temporal::utcNow(),
+                       $fields = ['uid' => 0, 'contact-id' => 0, 'guid' => get_guid(), 'resource-id' => $urlhash, 'created' => DateTimeFormat::utcNow(), 'edited' => DateTimeFormat::utcNow(),
                                'filename' => basename($_REQUEST['url']), 'type' => '', 'album' => '', 'height' => imagesy($image), 'width' => imagesx($image),
                                'datasize' => 0, 'data' => $img_str, 'scale' => 100, 'profile' => 0,
                                'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'desc' => $mime];
index 4dc163cbade2a2ba01edaf425ba83e4a8b99a3a1..051ae2e84264d74e6678869f02f0620aaef26902 100644 (file)
@@ -4,8 +4,8 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
 function post_var($name) {
        return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
@@ -139,7 +139,7 @@ function pubsubhubbub_init(App $a) {
                  dbesc($hub_callback));
 
                if ($subscribe) {
-                       $last_update = Temporal::utcNow();
+                       $last_update = DateTimeFormat::utcNow();
                        $push_flag = 0;
 
                        // if we are just updating an old subscription, keep the
index 07a20e318de76d13e733675089cb141227d855b5..bf87c9259fba559efd358dfae169508012c8a303 100644 (file)
@@ -11,7 +11,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Model\User;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/enotify.php';
 require_once 'include/bbcode.php';
@@ -118,7 +118,7 @@ function register_post(App $a)
                $hash = random_string();
                $r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language`, `note` ) VALUES ( '%s', '%s', %d, '%s', '%s', '%s' ) ",
                        dbesc($hash),
-                       dbesc(Temporal::utcNow()),
+                       dbesc(DateTimeFormat::utcNow()),
                        intval($user['uid']),
                        dbesc($result['password']),
                        dbesc($lang),
index 5c220cb35ac08f091c7913f24c33328a22e3ab26..9aa2c0b5b1c452fd701e8b7d4b3cf4e362a1bc38 100644 (file)
@@ -17,6 +17,7 @@ use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
 use Friendica\Protocol\Email;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Temporal;
 
@@ -631,7 +632,7 @@ function settings_post(App $a)
        if ($name_change) {
                q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self`",
                        dbesc($username),
-                       dbesc(Temporal::utcNow()),
+                       dbesc(DateTimeFormat::utcNow()),
                        intval(local_user())
                );
        }
index 66ca2979fc28991474290635b236e1a2aa9a0691..69adf1091f085d87a0ca9edb8159c0dfff68d845 100644 (file)
@@ -14,7 +14,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
@@ -170,8 +170,8 @@ function videos_post(App $a) {
                        //echo "<pre>"; var_dump($i); killme();
                        if (DBM::is_result($i)) {
                                q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
-                                       dbesc(Temporal::utcNow()),
-                                       dbesc(Temporal::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        dbesc($i[0]['uri']),
                                        intval(local_user())
                                );
index 8cdee398e82f3e7499ab0d1d1df01c7c1a7ec3bd..30bc9641f7893b89fcbf21a65d68ce1257f64de4 100644 (file)
@@ -7,8 +7,8 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;
-use Friendica\Util\Temporal;
 
 require_once 'include/datetime.php';
 
@@ -124,7 +124,7 @@ function wall_attach_post(App $a) {
        $filedata = @file_get_contents($src);
        $mimetype = Mimetype::getContentType($filename);
        $hash = get_guid(64);
-       $created = Temporal::utcNow();
+       $created = DateTimeFormat::utcNow();
 
        $fields = ['uid' => $page_owner_uid, 'hash' => $hash, 'filename' => $filename, 'filetype' => $mimetype,
                'filesize' => $filesize, 'data' => $filedata, 'created' => $created, 'edited' => $created,
index 2a9db64882a2fa902948517bf808e99de2507bb1..b09fd2249535a2914548bf3ef99020b279335aa8 100644 (file)
@@ -11,9 +11,9 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
-use Friendica\Util\Temporal;
 use dba;
 use DOMDocument;
 use DOMNode;
@@ -113,7 +113,7 @@ class OEmbed
                                                'url' => normalise_link($embedurl),
                                                'maxwidth' => $a->videowidth,
                                                'content' => $txt,
-                                               'created' => Temporal::utcNow()
+                                               'created' => DateTimeFormat::utcNow()
                                        ], true);
                                }
 
index d6eeb4822b5684ebc924f03197afd1290b46caca..36db52b0e054170a73480ddf31825e2db53db680 100644 (file)
@@ -6,7 +6,7 @@ namespace Friendica\Core;
 
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use dba;
 use Memcache;
 
@@ -147,7 +147,7 @@ class Cache
                        $memcache->set(get_app()->get_hostname().":".$key, serialize($value), MEMCACHE_COMPRESSED, self::duration($duration));
                        return;
                }
-               $fields = ['v' => serialize($value), 'expire_mode' => $duration, 'updated' => Temporal::utcNow()];
+               $fields = ['v' => serialize($value), 'expire_mode' => $duration, 'updated' => DateTimeFormat::utcNow()];
                $condition = ['k' => $key];
                dba::update('cache', $fields, $condition, true);
        }
@@ -165,21 +165,21 @@ class Cache
                if (Config::get("system", "cache_cleared_day") < time() - self::duration(CACHE_DAY)) {
                        if ($max_level == CACHE_MONTH) {
                                $condition = ["`updated` < ? AND `expire_mode` = ?",
-                                               Temporal::utc("now - 30 days"),
+                                               DateTimeFormat::utc("now - 30 days"),
                                                CACHE_MONTH];
                                dba::delete('cache', $condition);
                        }
 
                        if ($max_level <= CACHE_WEEK) {
                                $condition = ["`updated` < ? AND `expire_mode` = ?",
-                                               Temporal::utc("now - 7 days"),
+                                               DateTimeFormat::utc("now - 7 days"),
                                                CACHE_WEEK];
                                dba::delete('cache', $condition);
                        }
 
                        if ($max_level <= CACHE_DAY) {
                                $condition = ["`updated` < ? AND `expire_mode` = ?",
-                                               Temporal::utc("now - 1 days"),
+                                               DateTimeFormat::utc("now - 1 days"),
                                                CACHE_DAY];
                                dba::delete('cache', $condition);
                        }
@@ -188,7 +188,7 @@ class Cache
 
                if (($max_level <= CACHE_HOUR) && (Config::get("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) {
                        $condition = ["`updated` < ? AND `expire_mode` = ?",
-                                       Temporal::utc("now - 1 hours"),
+                                       DateTimeFormat::utc("now - 1 hours"),
                                        CACHE_HOUR];
                        dba::delete('cache', $condition);
 
@@ -197,7 +197,7 @@ class Cache
 
                if (($max_level <= CACHE_HALF_HOUR) && (Config::get("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) {
                        $condition = ["`updated` < ? AND `expire_mode` = ?",
-                                       Temporal::utc("now - 30 minutes"),
+                                       DateTimeFormat::utc("now - 30 minutes"),
                                        CACHE_HALF_HOUR];
                        dba::delete('cache', $condition);
 
@@ -206,7 +206,7 @@ class Cache
 
                if (($max_level <= CACHE_QUARTER_HOUR) && (Config::get("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
                        $condition = ["`updated` < ? AND `expire_mode` = ?",
-                                       Temporal::utc("now - 15 minutes"),
+                                       DateTimeFormat::utc("now - 15 minutes"),
                                        CACHE_QUARTER_HOUR];
                        dba::delete('cache', $condition);
 
@@ -215,7 +215,7 @@ class Cache
 
                if (($max_level <= CACHE_FIVE_MINUTES) && (Config::get("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) {
                        $condition = ["`updated` < ? AND `expire_mode` = ?",
-                                       Temporal::utc("now - 5 minutes"),
+                                       DateTimeFormat::utc("now - 5 minutes"),
                                        CACHE_FIVE_MINUTES];
                        dba::delete('cache', $condition);
 
@@ -224,7 +224,7 @@ class Cache
 
                if (($max_level <= CACHE_MINUTE) && (Config::get("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) {
                        $condition = ["`updated` < ? AND `expire_mode` = ?",
-                                       Temporal::utc("now - 1 minutes"),
+                                       DateTimeFormat::utc("now - 1 minutes"),
                                        CACHE_MINUTE];
                        dba::delete('cache', $condition);
 
index a28dfbb064cc5cfc5eb736261ec832ab5a36bbf0..356ed4a472e57aad7145077ecf23f3f01468199d 100644 (file)
@@ -13,8 +13,8 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\XML;
-use Friendica\Util\Temporal;
 
 require_once 'include/dba.php';
 require_once 'include/html2plain.php';
@@ -43,7 +43,7 @@ class NotificationsManager extends BaseObject
        {
                $rets = [];
                foreach ($notes as $n) {
-                       $local_time = Temporal::local($n['date']);
+                       $local_time = DateTimeFormat::local($n['date']);
                        $n['timestamp'] = strtotime($local_time);
                        $n['date_rel'] = relative_date($n['date']);
                        $n['msg_html'] = bbcode($n['msg'], false, false, false, false);
@@ -244,7 +244,7 @@ class NotificationsManager extends BaseObject
                                                $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
                                                $default_item_url = $it['url'];
                                                $default_item_text = strip_tags(bbcode($it['msg']));
-                                               $default_item_when = Temporal::local($it['date'], 'r');
+                                               $default_item_when = DateTimeFormat::local($it['date'], 'r');
                                                $default_item_ago = relative_date($it['date']);
                                                break;
 
@@ -254,7 +254,7 @@ class NotificationsManager extends BaseObject
                                                $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
                                                $default_item_url = $it['author-link'];
                                                $default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']);
-                                               $default_item_when = Temporal::local($it['created'], 'r');
+                                               $default_item_when = DateTimeFormat::local($it['created'], 'r');
                                                $default_item_ago = relative_date($it['created']);
                                                break;
 
@@ -266,7 +266,7 @@ class NotificationsManager extends BaseObject
                                                $default_item_text = (($it['id'] == $it['parent'])
                                                                        ? L10n::t("%s created a new post", $it['author-name'])
                                                                        : L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']));
-                                               $default_item_when = Temporal::local($it['created'], 'r');
+                                               $default_item_when = DateTimeFormat::local($it['created'], 'r');
                                                $default_item_ago = relative_date($it['created']);
                                }
 
index 8ea41c2ef92d432672390fd4b3e4fba7dd3edfe5..fd5a0bf4c3a3db97dae2c1aff4926df552b355f7 100644 (file)
@@ -9,10 +9,9 @@ use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Process;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Lock;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
-
 use dba;
 
 require_once 'include/dba.php';
@@ -235,7 +234,7 @@ class Worker
 
                        if ($age > 1) {
                                $stamp = (float)microtime(true);
-                               dba::update('workerqueue', ['executed' => Temporal::utcNow()], ['pid' => $mypid, 'done' => false]);
+                               dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
                                self::$db_duration += (microtime(true) - $stamp);
                        }
 
@@ -245,7 +244,7 @@ class Worker
 
                        $stamp = (float)microtime(true);
                        if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
-                               Config::set('system', 'last_poller_execution', Temporal::utcNow());
+                               Config::set('system', 'last_poller_execution', DateTimeFormat::utcNow());
                        }
                        self::$db_duration = (microtime(true) - $stamp);
 
@@ -278,7 +277,7 @@ class Worker
 
                        if ($age > 1) {
                                $stamp = (float)microtime(true);
-                               dba::update('workerqueue', ['executed' => Temporal::utcNow()], ['pid' => $mypid, 'done' => false]);
+                               dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
                                self::$db_duration += (microtime(true) - $stamp);
                        }
 
@@ -286,7 +285,7 @@ class Worker
 
                        $stamp = (float)microtime(true);
                        if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
-                               Config::set('system', 'last_poller_execution', Temporal::utcNow());
+                               Config::set('system', 'last_poller_execution', DateTimeFormat::utcNow());
                        }
                        self::$db_duration = (microtime(true) - $stamp);
                } else {
@@ -574,7 +573,7 @@ class Worker
                                        }
                                        dba::update(
                                                'workerqueue',
-                                               ['executed' => NULL_DATE, 'created' => Temporal::utcNow(), 'priority' => $new_priority, 'pid' => 0],
+                                               ['executed' => NULL_DATE, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
                                                ['id' => $entry["id"]]
                                        );
                                } else {
@@ -825,7 +824,7 @@ class Worker
                if ($found) {
                        $condition = "`id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`";
                        array_unshift($ids, $condition);
-                       dba::update('workerqueue', ['executed' => Temporal::utcNow(), 'pid' => $mypid], $ids);
+                       dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow(), 'pid' => $mypid], $ids);
                }
 
                return $found;
@@ -953,7 +952,7 @@ class Worker
 
                /// @todo We should clean up the corresponding workerqueue entries as well
                $condition = ["`created` < ? AND `command` = 'worker.php'",
-                               Temporal::utc("now - ".$timeout." minutes")];
+                               DateTimeFormat::utc("now - ".$timeout." minutes")];
                dba::delete('process', $condition);
        }
 
@@ -1040,7 +1039,7 @@ class Worker
 
                $priority = PRIORITY_MEDIUM;
                $dont_fork = Config::get("system", "worker_dont_fork");
-               $created = Temporal::utcNow();
+               $created = DateTimeFormat::utcNow();
 
                if (is_int($run_parameter)) {
                        $priority = $run_parameter;
index 463d3a3253fdda155237ed8643484d523721474e..6f14c12b8c51af9d878597f51a0e3d4228926851 100644 (file)
@@ -5,7 +5,7 @@
 namespace Friendica\Database;
 
 use dba;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/dba.php';
 
@@ -127,6 +127,6 @@ class DBM
                        $timestamp = -62135596800;
                }
 
-               return date(Temporal::MYSQL, (int)$timestamp);
+               return date(DateTimeFormat::MYSQL, (int)$timestamp);
        }
 }
index 212da3334c95e990f0b0cfa3526c6e19bf2584f4..e57bcd99d42a02ede71350f2bad9cff6734e38f9 100644 (file)
@@ -20,8 +20,8 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 
 require_once 'boot.php';
@@ -112,7 +112,7 @@ class Contact extends BaseObject
 
                $return = dba::insert('contact', [
                        'uid'         => $user['uid'],
-                       'created'     => Temporal::utcNow(),
+                       'created'     => DateTimeFormat::utcNow(),
                        'self'        => 1,
                        'name'        => $user['username'],
                        'nick'        => $user['nickname'],
@@ -129,9 +129,9 @@ class Contact extends BaseObject
                        'poll'        => System::baseUrl() . '/dfrn_poll/'    . $user['nickname'],
                        'confirm'     => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
                        'poco'        => System::baseUrl() . '/poco/'         . $user['nickname'],
-                       'name-date'   => Temporal::utcNow(),
-                       'uri-date'    => Temporal::utcNow(),
-                       'avatar-date' => Temporal::utcNow(),
+                       'name-date'   => DateTimeFormat::utcNow(),
+                       'uri-date'    => DateTimeFormat::utcNow(),
+                       'avatar-date' => DateTimeFormat::utcNow(),
                        'closeness'   => 0
                ]);
 
@@ -210,10 +210,10 @@ class Contact extends BaseObject
                }
 
                if ($contact['term-date'] <= NULL_DATE) {
-                       dba::update('contact', ['term-date' => Temporal::utcNow()], ['id' => $contact['id']]);
+                       dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 
                        if ($contact['url'] != '') {
-                               dba::update('contact', ['term-date' => Temporal::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
+                               dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
                        }
                } else {
                        /* @todo
@@ -224,7 +224,7 @@ class Contact extends BaseObject
 
                        /// @todo Check for contact vitality via probing
                        $expiry = $contact['term-date'] . ' + 32 days ';
-                       if (Temporal::utcNow() > Temporal::utc($expiry)) {
+                       if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) {
                                /* Relationship is really truly dead. archive them rather than
                                 * delete, though if the owner tries to unarchive them we'll start
                                 * the whole process over again.
@@ -688,7 +688,7 @@ class Contact extends BaseObject
                        $contact_id = $contact["id"];
 
                        // Update the contact every 7 days
-                       $update_contact = ($contact['avatar-date'] < Temporal::utc('now -7 days'));
+                       $update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days'));
 
                        // We force the update if the avatar is empty
                        if (!x($contact, 'avatar')) {
@@ -728,7 +728,7 @@ class Contact extends BaseObject
                if (!$contact_id) {
                        dba::insert('contact', [
                                'uid'       => $uid,
-                               'created'   => Temporal::utcNow(),
+                               'created'   => DateTimeFormat::utcNow(),
                                'url'       => $data["url"],
                                'nurl'      => normalise_link($data["url"]),
                                'addr'      => $data["addr"],
@@ -749,9 +749,9 @@ class Contact extends BaseObject
                                'request'   => $data["request"],
                                'confirm'   => $data["confirm"],
                                'poco'      => $data["poco"],
-                               'name-date' => Temporal::utcNow(),
-                               'uri-date'  => Temporal::utcNow(),
-                               'avatar-date' => Temporal::utcNow(),
+                               'name-date' => DateTimeFormat::utcNow(),
+                               'uri-date'  => DateTimeFormat::utcNow(),
+                               'avatar-date' => DateTimeFormat::utcNow(),
                                'writable'  => 1,
                                'blocked'   => 0,
                                'readonly'  => 0,
@@ -823,13 +823,13 @@ class Contact extends BaseObject
                }
 
                if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) {
-                       $updated['uri-date'] = Temporal::utcNow();
+                       $updated['uri-date'] = DateTimeFormat::utcNow();
                }
                if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
-                       $updated['name-date'] = Temporal::utcNow();
+                       $updated['name-date'] = DateTimeFormat::utcNow();
                }
 
-               $updated['avatar-date'] = Temporal::utcNow();
+               $updated['avatar-date'] = DateTimeFormat::utcNow();
 
                dba::update('contact', $updated, ['id' => $contact_id], $contact);
 
@@ -1026,7 +1026,7 @@ class Contact extends BaseObject
                        if ($photos) {
                                dba::update(
                                        'contact',
-                                       ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => Temporal::utcNow()],
+                                       ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()],
                                        ['id' => $cid]
                                );
 
@@ -1261,7 +1261,7 @@ class Contact extends BaseObject
                        // create contact record
                        dba::insert('contact', [
                                'uid'     => $uid,
-                               'created' => Temporal::utcNow(),
+                               'created' => DateTimeFormat::utcNow(),
                                'url'     => $ret['url'],
                                'nurl'    => normalise_link($ret['url']),
                                'addr'    => $ret['addr'],
@@ -1485,7 +1485,7 @@ class Contact extends BaseObject
                        foreach ($r as $rr) {
                                logger('update_contact_birthday: ' . $rr['bd']);
 
-                               $nextbd = Temporal::utcNow('Y') . substr($rr['bd'], 4);
+                               $nextbd = DateTimeFormat::utcNow('Y') . substr($rr['bd'], 4);
 
                                /*
                                 * Add new birthday event for this person
@@ -1497,7 +1497,7 @@ class Contact extends BaseObject
 
                                // Check for duplicates
                                $s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
-                                       intval($rr['uid']), intval($rr['id']), dbesc(Temporal::utc($nextbd)), dbesc('birthday'));
+                                       intval($rr['uid']), intval($rr['id']), dbesc(DateTimeFormat::utc($nextbd)), dbesc('birthday'));
 
                                if (DBM::is_result($s)) {
                                        continue;
@@ -1508,8 +1508,8 @@ class Contact extends BaseObject
 
                                q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
                                VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']),
-                                       dbesc(Temporal::utcNow()), dbesc(Temporal::utcNow()), dbesc(Temporal::utc($nextbd)),
-                                       dbesc(Temporal::utc($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('birthday'),
+                                       dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utc($nextbd)),
+                                       dbesc(DateTimeFormat::utc($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('birthday'),
                                        intval(0)
                                );
 
index f588ec62b2daec6248320fb3c1f243b66f7ca915..5e75ba5a54faca6607a8d0a0dadb371486477a31 100644 (file)
@@ -14,8 +14,8 @@ use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 use Exception;
 
@@ -120,12 +120,12 @@ class GContact
                                intval($uid),
                                intval($gcid),
                                intval($zcid),
-                               dbesc(Temporal::utcNow())
+                               dbesc(DateTimeFormat::utcNow())
                        );
                } else {
                        q(
                                "UPDATE `glink` SET `updated` = '%s' WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d",
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval($cid),
                                intval($uid),
                                intval($gcid),
@@ -717,8 +717,8 @@ class GContact
                                dbesc($contact["url"]),
                                dbesc(normalise_link($contact["url"])),
                                dbesc($contact["photo"]),
-                               dbesc(Temporal::utcNow()),
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                dbesc($contact["location"]),
                                dbesc($contact["about"]),
                                intval($contact["hide"]),
@@ -1050,7 +1050,7 @@ class GContact
 
                foreach ($r as $server) {
                        self::fetchGsUsers($server["url"]);
-                       q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(Temporal::utcNow()), dbesc($server["nurl"]));
+                       q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(DateTimeFormat::utcNow()), dbesc($server["nurl"]));
                }
        }
 
index 62f19aeb5abfb90e3ae0f2a177b167458a906aec..818c4085f715e904ea88ce8411623a0aeec97ef2 100644 (file)
@@ -22,6 +22,7 @@ use Friendica\Model\Term;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 use dba;
 use Text_LanguageDetect;
@@ -149,7 +150,7 @@ class Item extends BaseObject
 
                // Set the item to "deleted"
                dba::update('item', ['deleted' => true, 'title' => '', 'body' => '',
-                                       'edited' => Temporal::utcNow(), 'changed' => Temporal::utcNow()],
+                                       'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()],
                                ['id' => $item['id']]);
 
                create_tags_from_item($item['id']);
index 41981fe9e2042bc804004a1f70deac0b3a338d84..f9b4c4d6dbddba324d2b4c84d9a47160ca28b4b7 100644 (file)
@@ -10,7 +10,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
@@ -82,7 +82,7 @@ class Mail
                        $handles = $recip_handle . ';' . $sender_handle;
 
                        $fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle,
-                               'created' => Temporal::utcNow(), 'updated' => Temporal::utcNow(),
+                               'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
                                'subject' => $subject, 'recips' => $handles];
                        if (dba::insert('conv', $fields)) {
                                $convid = dba::lastInsertId();
@@ -116,7 +116,7 @@ class Mail
                                'replied' => 0,
                                'uri' => $uri,
                                'parent-uri' => $replyto,
-                               'created' => Temporal::utcNow()
+                               'created' => DateTimeFormat::utcNow()
                        ]
                );
 
@@ -196,7 +196,7 @@ class Mail
 
                $convid = null;
                $fields = ['uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle,
-                       'created' => Temporal::utcNow(), 'updated' => Temporal::utcNow(),
+                       'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
                        'subject' => $subject, 'recips' => $handles];
                if (dba::insert('conv', $fields)) {
                        $convid = dba::lastInsertId();
@@ -224,7 +224,7 @@ class Mail
                                'replied' => 0,
                                'uri' => $uri,
                                'parent-uri' => $replyto,
-                               'created' => Temporal::utcNow(),
+                               'created' => DateTimeFormat::utcNow(),
                                'unknown' => 1
                        ]
                );
index a736c3638611c9f9bbf0d3795bf9535bedb6abf1..cf31849c8d23c1e2a7971c4cd3d2ffc9104a724c 100644 (file)
@@ -12,8 +12,8 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -55,8 +55,8 @@ class Photo
                        'contact-id' => $cid,
                        'guid' => $guid,
                        'resource-id' => $rid,
-                       'created' => Temporal::utcNow(),
-                       'edited' => Temporal::utcNow(),
+                       'created' => DateTimeFormat::utcNow(),
+                       'edited' => DateTimeFormat::utcNow(),
                        'filename' => basename($filename),
                        'type' => $Image->getType(),
                        'album' => $album,
index 5cb3369c66261e9dd4343dedb773157233158e4f..c360a13d09b638a6934b762070ac7eef3c7a4c81 100644 (file)
@@ -5,7 +5,7 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
@@ -34,7 +34,7 @@ class Process extends BaseObject
                dba::transaction();
 
                if (!dba::exists('process', ['pid' => $pid])) {
-                       $return = dba::insert('process', ['pid' => $pid, 'command' => $command, 'created' => Temporal::utcNow()]);
+                       $return = dba::insert('process', ['pid' => $pid, 'command' => $command, 'created' => DateTimeFormat::utcNow()]);
                }
 
                dba::commit();
index aeb7155f1930a1905c3592bb870606f33f77fb1b..0dce1c08c67e4bffa272947380a62a0fcdb69d9b 100644 (file)
@@ -17,8 +17,8 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -556,8 +556,8 @@ class Profile
                                WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
                                ORDER BY `start` ASC ",
                                local_user(),
-                               Temporal::utc('now + 6 days'),
-                               Temporal::utcNow()
+                               DateTimeFormat::utc('now + 6 days'),
+                               DateTimeFormat::utcNow()
                        );
                        if (DBM::is_result($s)) {
                                $r = dba::inArray($s);
@@ -600,7 +600,7 @@ class Profile
 
                                        $rr['link'] = $url;
                                        $rr['title'] = $rr['name'];
-                                       $rr['date'] = day_translate(Temporal::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
+                                       $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
                                        $rr['startime'] = null;
                                        $rr['today'] = $today;
                                }
@@ -644,8 +644,8 @@ class Profile
                        WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
                        ORDER BY `start` ASC ",
                        local_user(),
-                       Temporal::utc('now + 7 days'),
-                       Temporal::utc('now - 1 days')
+                       DateTimeFormat::utc('now + 7 days'),
+                       DateTimeFormat::utc('now - 1 days')
                );
 
                $r = [];
@@ -658,8 +658,8 @@ class Profile
                                        $total ++;
                                }
 
-                               $strt = Temporal::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
-                               if ($strt === Temporal::timezoneNow($a->timezone, 'Y-m-d')) {
+                               $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
+                               if ($strt === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
                                        $istoday = true;
                                }
 
@@ -674,17 +674,17 @@ class Profile
                                        $description = L10n::t('[No description]');
                                }
 
-                               $strt = Temporal::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC');
+                               $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC');
 
-                               if (substr($strt, 0, 10) < Temporal::timezoneNow($a->timezone, 'Y-m-d')) {
+                               if (substr($strt, 0, 10) < DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
                                        continue;
                                }
 
-                               $today = ((substr($strt, 0, 10) === Temporal::timezoneNow($a->timezone, 'Y-m-d')) ? true : false);
+                               $today = ((substr($strt, 0, 10) === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) ? true : false);
 
                                $rr['title'] = $title;
                                $rr['description'] = $description;
-                               $rr['date'] = day_translate(Temporal::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
+                               $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
                                $rr['startime'] = $strt;
                                $rr['today'] = $today;
 
@@ -731,8 +731,8 @@ class Profile
 
                                $val = day_translate(
                                        intval($a->profile['dob']) ?
-                                               Temporal::utc($a->profile['dob'] . ' 00:00 +00:00', $year_bd_format)
-                                               : Temporal::utc('2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)
+                                               DateTimeFormat::utc($a->profile['dob'] . ' 00:00 +00:00', $year_bd_format)
+                                               : DateTimeFormat::utc('2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)
                                );
 
                                $profile['birthday'] = [L10n::t('Birthday:'), $val];
index 6c49ff4d1a31bf6a02d396b7263558fbdcfe07dd..da7a8b3e58c126740cc73cf21dfe022715c5bec7 100644 (file)
@@ -6,7 +6,7 @@ namespace Friendica\Model;
 
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
@@ -20,7 +20,7 @@ class Queue
        public static function updateTime($id)
        {
                logger('queue: requeue item ' . $id);
-               dba::update('queue', ['last' => Temporal::utcNow()], ['id' => $id]);
+               dba::update('queue', ['last' => DateTimeFormat::utcNow()], ['id' => $id]);
        }
 
        /**
@@ -95,6 +95,13 @@ class Queue
                        }
                }
 
-               dba::insert('queue', ['cid' => $cid, 'network' => $network, 'created' => Temporal::utcNow(), 'last' => Temporal::utcNow(), 'content' => $msg, 'batch' =>($batch) ? 1 : 0]);
+               dba::insert('queue', [
+                       'cid'     => $cid,
+                       'network' => $network,
+                       'created' => DateTimeFormat::utcNow(),
+                       'last'    => DateTimeFormat::utcNow(),
+                       'content' => $msg,
+                       'batch'   =>($batch) ? 1 : 0
+               ]);
        }
 }
index 3ef2a45955125b6a69c7f80fba8d41a8ab3abc21..7cf7fea2e6562b96f4041326726796750ac98a6f 100644 (file)
@@ -17,8 +17,8 @@ use Friendica\Model\Group;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 use Exception;
 use LightOpenID;
@@ -396,7 +396,7 @@ class User
                        'verified' => $verified,
                        'blocked'  => $blocked,
                        'timezone' => 'UTC',
-                       'register_date' => Temporal::utcNow(),
+                       'register_date' => DateTimeFormat::utcNow(),
                        'default-location' => ''
                ]);
 
@@ -613,7 +613,7 @@ class User
                dba::insert('userd', ['username' => $user['nickname']]);
 
                // The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
-               dba::update('user', ['account_removed' => true, 'account_expires_on' => Temporal::utcNow()], ['uid' => $uid]);
+               dba::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utcNow()], ['uid' => $uid]);
                Worker::add(PRIORITY_HIGH, "Notifier", "removeme", $uid);
 
                // Send an update to the directory
index 0a48392f8815e19f31304d3b46c9fcd62b13a672..53ab57585f5d6a6261ea91922f66331dae73c6ce 100644 (file)
@@ -10,8 +10,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Database\DBM;
 use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 use Exception;
 use LightOpenID;
@@ -121,7 +121,7 @@ class Login extends BaseModule
 
                        // if we haven't failed up this point, log them in.
                        $_SESSION['remember'] = $_POST['remember'];
-                       $_SESSION['last_login_date'] = Temporal::utcNow();
+                       $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
                        authenticate_success($record, true, true);
 
                        if (x($_SESSION, 'return_url')) {
@@ -220,10 +220,10 @@ class Login extends BaseModule
                                // stays logged in for a long time, e.g. with "Remember Me"
                                $login_refresh = false;
                                if (!x($_SESSION['last_login_date'])) {
-                                       $_SESSION['last_login_date'] = Temporal::utcNow();
+                                       $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
                                }
-                               if (strcmp(Temporal::utc('now - 12 hours'), $_SESSION['last_login_date']) > 0) {
-                                       $_SESSION['last_login_date'] = Temporal::utcNow();
+                               if (strcmp(DateTimeFormat::utc('now - 12 hours'), $_SESSION['last_login_date']) > 0) {
+                                       $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
                                        $login_refresh = true;
                                }
                                authenticate_success($user, false, false, $login_refresh);
index f7f8f164173803456730e82323b80f07f97b9f90..8af267be3de557ab082220e14aeed30403b972c8 100644 (file)
@@ -9,7 +9,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Network\FKOAuthDataStore;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use dba;
 use OAuthServer;
 use OAuthSignatureMethod_HMAC_SHA1;
@@ -68,7 +68,7 @@ class FKOAuth1 extends OAuthServer
                        $_SESSION['cid'] = $a->cid;
                }
 
-               dba::update('user', ['login_date' => Temporal::utcNow()], ['uid' => $_SESSION['uid']]);
+               dba::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
 
                Addon::callHooks('logged_in', $a->user);
        }
index 4e83d2ff9754f60674d7dab9ed40d3eb70a68de7..198ca658061a203c9b23f7d49c13abea20f37811 100644 (file)
@@ -13,7 +13,7 @@ use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
@@ -124,7 +124,7 @@ class Post extends BaseObject
                if (strtotime($item['edited']) - strtotime($item['created']) > 1) {
                        $edited = [
                                'label'    => L10n::t('This entry was edited'),
-                               'date'     => Temporal::local($item['edited'], 'r'),
+                               'date'     => DateTimeFormat::local($item['edited'], 'r'),
                                'relative' => relative_date($item['edited'])
                        ];
                }
@@ -301,7 +301,7 @@ class Post extends BaseObject
 
                $comment = $this->getCommentBox($indent);
 
-               if (strcmp(Temporal::utc($item['created']), Temporal::utc('now - 12 hours')) > 0) {
+               if (strcmp(DateTimeFormat::utc($item['created']), DateTimeFormat::utc('now - 12 hours')) > 0) {
                        $shiny = 'shiny';
                }
 
@@ -364,7 +364,7 @@ class Post extends BaseObject
                        'osparkle'        => $osparkle,
                        'sparkle'         => $sparkle,
                        'title'           => $title_e,
-                       'localtime'       => Temporal::local($item['created'], 'r'),
+                       'localtime'       => DateTimeFormat::local($item['created'], 'r'),
                        'ago'             => $item['app'] ? L10n::t('%s from %s', relative_date($item['created']), $item['app']) : relative_date($item['created']),
                        'app'             => $item['app'],
                        'created'         => relative_date($item['created']),
index 9eb226689f80e3fbca72335c2a2af5dfad311523..2269bffcfdc49db18de53961044f2f88a9dbe701 100644 (file)
@@ -26,8 +26,8 @@ use Friendica\Model\User;
 use Friendica\Object\Image;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 use Friendica\Content\Text\BBCode;
 
@@ -229,7 +229,7 @@ class DFRN
                        }
                }
 
-               $check_date = Temporal::utc($last_update);
+               $check_date = DateTimeFormat::utc($last_update);
 
                $r = q(
                        "SELECT `item`.*, `item`.`id` AS `item_id`,
@@ -421,7 +421,7 @@ class DFRN
 
                XML::addElement($doc, $mail, "dfrn:id", $item['uri']);
                XML::addElement($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
-               XML::addElement($doc, $mail, "dfrn:sentdate", Temporal::utc($item['created'] . '+00:00', Temporal::ATOM));
+               XML::addElement($doc, $mail, "dfrn:sentdate", DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM));
                XML::addElement($doc, $mail, "dfrn:subject", $item['title']);
                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"
 
-               XML::addElement($doc, $root, "updated", Temporal::utcNow(Temporal::ATOM));
+               XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
                $author = self::addAuthor($doc, $owner, $authorelement, $public);
                $root->appendChild($author);
@@ -622,9 +622,9 @@ class DFRN
 
                $author = $doc->createElement($authorelement);
 
-               $namdate = Temporal::utc($owner['name-date'].'+00:00', Temporal::ATOM);
-               $uridate = Temporal::utc($owner['uri-date'].'+00:00', Temporal::ATOM);
-               $picdate = Temporal::utc($owner['avatar-date'].'+00:00', Temporal::ATOM);
+               $namdate = DateTimeFormat::utc($owner['name-date'].'+00:00', DateTimeFormat::ATOM);
+               $uridate = DateTimeFormat::utc($owner['uri-date'].'+00:00', DateTimeFormat::ATOM);
+               $picdate = DateTimeFormat::utc($owner['avatar-date'].'+00:00', DateTimeFormat::ATOM);
 
                $attributes = [];
 
@@ -903,7 +903,7 @@ class DFRN
                }
 
                if ($item['deleted']) {
-                       $attributes = ["ref" => $item['uri'], "when" => Temporal::utc($item['edited'] . '+00:00', Temporal::ATOM)];
+                       $attributes = ["ref" => $item['uri'], "when" => DateTimeFormat::utc($item['edited'] . '+00:00', DateTimeFormat::ATOM)];
                        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, "title", $item["title"]);
 
-               XML::addElement($doc, $entry, "published", Temporal::utc($item["created"] . "+00:00", Temporal::ATOM));
-               XML::addElement($doc, $entry, "updated", Temporal::utc($item["edited"] . "+00:00", Temporal::ATOM));
+               XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"] . "+00:00", DateTimeFormat::ATOM));
+               XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"] . "+00:00", DateTimeFormat::ATOM));
 
                // "dfrn:env" is used to read the content
                XML::addElement($doc, $entry, "dfrn:env", base64url_encode($body, true));
@@ -1388,7 +1388,7 @@ class DFRN
                        "SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
                        intval($contact["uid"]),
                        intval($contact["id"]),
-                       dbesc(Temporal::utc($birthday)),
+                       dbesc(DateTimeFormat::utc($birthday)),
                        dbesc("birthday")
                );
 
@@ -1406,10 +1406,10 @@ class DFRN
                        VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
                        intval($contact["uid"]),
                        intval($contact["id"]),
-                       dbesc(Temporal::utcNow()),
-                       dbesc(Temporal::utcNow()),
-                       dbesc(Temporal::utc($birthday)),
-                       dbesc(Temporal::utc($birthday . " + 1 day ")),
+                       dbesc(DateTimeFormat::utcNow()),
+                       dbesc(DateTimeFormat::utcNow()),
+                       dbesc(DateTimeFormat::utc($birthday)),
+                       dbesc(DateTimeFormat::utc($birthday . " + 1 day ")),
                        dbesc($bdtext),
                        dbesc($bdtext2),
                        dbesc("birthday")
@@ -1889,7 +1889,7 @@ class DFRN
                        intval($suggest["cid"]),
                        dbesc($suggest["body"]),
                        dbesc($hash),
-                       dbesc(Temporal::utcNow()),
+                       dbesc(DateTimeFormat::utcNow()),
                        intval(0)
                );
 
@@ -2081,13 +2081,13 @@ class DFRN
 
                if (self::isEditedTimestampNewer($current, $item)) {
                        // do not accept (ignore) an earlier edit than one we currently have.
-                       if (Temporal::utc($item["edited"]) < $current["edited"]) {
+                       if (DateTimeFormat::utc($item["edited"]) < $current["edited"]) {
                                return false;
                        }
 
                        $fields = ['title' => $item["title"], 'body' => $item["body"],
-                                       'tag' => $item["tag"], 'changed' => Temporal::utcNow(),
-                                       'edited' => Temporal::utc($item["edited"])];
+                                       'tag' => $item["tag"], 'changed' => DateTimeFormat::utcNow(),
+                                       'edited' => DateTimeFormat::utc($item["edited"])];
 
                        $condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
                        dba::update('item', $fields, $condition);
@@ -2422,7 +2422,7 @@ class DFRN
 
                // Is there an existing item?
                if (DBM::is_result($current) && self::isEditedTimestampNewer($current[0], $item)
-                       && (Temporal::utc($item["edited"]) < $current[0]["edited"])
+                       && (DateTimeFormat::utc($item["edited"]) < $current[0]["edited"])
                ) {
                        logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
                        return;
@@ -2753,9 +2753,9 @@ class DFRN
                        }
                }
                if ($when) {
-                       $when = Temporal::utc($when);
+                       $when = DateTimeFormat::utc($when);
                } else {
-                       $when = Temporal::utcNow();
+                       $when = DateTimeFormat::utcNow();
                }
 
                if (!$uri || !$importer["id"]) {
@@ -2836,7 +2836,7 @@ class DFRN
                                                `body` = '', `title` = ''
                                        WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
                                        dbesc($when),
-                                       dbesc(Temporal::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        dbesc($uri),
                                        intval($importer["uid"])
                                );
@@ -2849,7 +2849,7 @@ class DFRN
                                                `body` = '', `title` = ''
                                        WHERE `uri` = '%s' AND `uid` IN (0, %d)",
                                        dbesc($when),
-                                       dbesc(Temporal::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        dbesc($uri),
                                        intval($importer["uid"])
                                );
@@ -3157,8 +3157,8 @@ class DFRN
                        return false;
                }
 
-               $existing_edited = Temporal::utc($existing['edited']);
-               $update_edited = Temporal::utc($update['edited']);
+               $existing_edited = DateTimeFormat::utc($existing['edited']);
+               $update_edited = DateTimeFormat::utc($update['edited']);
 
                return (strcmp($existing_edited, $update_edited) < 0);
        }
index 077c93c292e615496e6a690e6193e84f66e4cda0..1e5c5345f6da0525a1d0e30e386d088bb0997153 100644 (file)
@@ -9,12 +9,11 @@
  */
 namespace Friendica\Protocol;
 
-use Friendica\App;
-use Friendica\Core\System;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
@@ -26,8 +25,8 @@ use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 use dba;
 use SimpleXMLElement;
@@ -77,7 +76,7 @@ class Diaspora
                                $r = q(
                                        "INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
                                        VALUES (0, '%s', '%s', 'relay', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, '%s', '%s', '%s')",
-                                       Temporal::utcNow(),
+                                       DateTimeFormat::utcNow(),
                                        dbesc($addr),
                                        dbesc($addr),
                                        dbesc($server),
@@ -85,9 +84,9 @@ class Diaspora
                                        dbesc($batch),
                                        dbesc(NETWORK_DIASPORA),
                                        intval(CONTACT_IS_FOLLOWER),
-                                       dbesc(Temporal::utcNow()),
-                                       dbesc(Temporal::utcNow()),
-                                       dbesc(Temporal::utcNow())
+                                       dbesc(DateTimeFormat::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow()),
+                                       dbesc(DateTimeFormat::utcNow())
                                );
 
                                $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
@@ -871,7 +870,7 @@ class Diaspora
                                dbesc($arr["confirm"]),
                                dbesc($arr["alias"]),
                                dbesc($arr["pubkey"]),
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                dbesc($arr["url"]),
                                dbesc($arr["network"])
                        );
@@ -894,7 +893,7 @@ class Diaspora
                                dbesc($arr["network"]),
                                dbesc($arr["alias"]),
                                dbesc($arr["pubkey"]),
-                               dbesc(Temporal::utcNow())
+                               dbesc(DateTimeFormat::utcNow())
                        );
                }
 
@@ -1654,9 +1653,9 @@ class Diaspora
                $text = unxmlify($data->text);
 
                if (isset($data->created_at)) {
-                       $created_at = Temporal::utc(notags(unxmlify($data->created_at)));
+                       $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
                } else {
-                       $created_at = Temporal::utcNow();
+                       $created_at = DateTimeFormat::utcNow();
                }
 
                if (isset($data->thread_parent_guid)) {
@@ -1786,7 +1785,7 @@ class Diaspora
                $msg_guid = notags(unxmlify($mesg->guid));
                $msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
                $msg_text = unxmlify($mesg->text);
-               $msg_created_at = Temporal::utc(notags(unxmlify($mesg->created_at)));
+               $msg_created_at = DateTimeFormat::utc(notags(unxmlify($mesg->created_at)));
 
                if ($msg_conversation_guid != $guid) {
                        logger("message conversation guid does not belong to the current conversation.");
@@ -1831,7 +1830,7 @@ class Diaspora
 
                dba::unlock();
 
-               dba::update('conv', ['updated' => Temporal::utcNow()], ['id' => $conversation["id"]]);
+               dba::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
 
                notification(
                        [
@@ -1865,7 +1864,7 @@ class Diaspora
                $author = notags(unxmlify($data->author));
                $guid = notags(unxmlify($data->guid));
                $subject = notags(unxmlify($data->subject));
-               $created_at = Temporal::utc(notags(unxmlify($data->created_at)));
+               $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
                $participants = notags(unxmlify($data->participants));
 
                $messages = $data->message;
@@ -1897,7 +1896,7 @@ class Diaspora
                                dbesc($guid),
                                dbesc($author),
                                dbesc($created_at),
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                dbesc($subject),
                                dbesc($participants)
                        );
@@ -2098,7 +2097,7 @@ class Diaspora
                $guid = notags(unxmlify($data->guid));
                $conversation_guid = notags(unxmlify($data->conversation_guid));
                $text = unxmlify($data->text);
-               $created_at = Temporal::utc(notags(unxmlify($data->created_at)));
+               $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
 
                $contact = self::allowedContactByHandle($importer, $author, true);
                if (!$contact) {
@@ -2164,7 +2163,7 @@ class Diaspora
 
                dba::unlock();
 
-               dba::update('conv', ['updated' => Temporal::utcNow()], ['id' => $conversation["id"]]);
+               dba::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
                return true;
        }
 
@@ -2315,7 +2314,7 @@ class Diaspora
                $birthday = str_replace("1000", "1901", $birthday);
 
                if ($birthday != "") {
-                       $birthday = Temporal::utc($birthday, "Y-m-d");
+                       $birthday = DateTimeFormat::utc($birthday, "Y-m-d");
                }
 
                // this is to prevent multiple birthday notifications in a single year
@@ -2331,7 +2330,7 @@ class Diaspora
                        dbesc($name),
                        dbesc($nick),
                        dbesc($author),
-                       dbesc(Temporal::utcNow()),
+                       dbesc(DateTimeFormat::utcNow()),
                        dbesc($birthday),
                        dbesc($location),
                        dbesc($about),
@@ -2537,7 +2536,7 @@ class Diaspora
                        intval($importer["uid"]),
                        dbesc($ret["network"]),
                        dbesc($ret["addr"]),
-                       Temporal::utcNow(),
+                       DateTimeFormat::utcNow(),
                        dbesc($ret["url"]),
                        dbesc(normalise_link($ret["url"])),
                        dbesc($batch),
@@ -2580,7 +2579,7 @@ class Diaspora
                                0,
                                dbesc(L10n::t("Sharing notification from Diaspora network")),
                                dbesc($hash),
-                               dbesc(Temporal::utcNow())
+                               dbesc(DateTimeFormat::utcNow())
                        );
                } else {
                        // automatic friend approval
@@ -2611,8 +2610,8 @@ class Diaspora
                                WHERE `id` = %d
                                ",
                                intval($new_relation),
-                               dbesc(Temporal::utcNow()),
-                               dbesc(Temporal::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval($contact_record["id"])
                        );
 
@@ -2716,7 +2715,7 @@ class Diaspora
        {
                $author = notags(unxmlify($data->author));
                $guid = notags(unxmlify($data->guid));
-               $created_at = Temporal::utc(notags(unxmlify($data->created_at)));
+               $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
                $root_author = notags(unxmlify($data->root_author));
                $root_guid = notags(unxmlify($data->root_guid));
                /// @todo handle unprocessed property "provider_display_name"
@@ -2852,8 +2851,8 @@ class Diaspora
                                        'deleted' => true,
                                        'title' => '',
                                        'body' => '',
-                                       'edited' => Temporal::utcNow(),
-                                       'changed' => Temporal::utcNow()],
+                                       'edited' => DateTimeFormat::utcNow(),
+                                       'changed' => DateTimeFormat::utcNow()],
                                ['id' => $item["id"]]
                        );
 
@@ -2930,7 +2929,7 @@ class Diaspora
        {
                $author = notags(unxmlify($data->author));
                $guid = notags(unxmlify($data->guid));
-               $created_at = Temporal::utc(notags(unxmlify($data->created_at)));
+               $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
                $public = notags(unxmlify($data->public));
                $text = unxmlify($data->text);
                $provider_display_name = notags(unxmlify($data->provider_display_name));
@@ -3593,7 +3592,7 @@ class Diaspora
                        $eventdata['guid'] = $event['guid'];
                }
 
-               $mask = Temporal::ATOM;
+               $mask = DateTimeFormat::ATOM;
 
                /// @todo - establish "all day" events in Friendica
                $eventdata["all_day"] = "false";
@@ -3607,10 +3606,10 @@ class Diaspora
                }
 
                if ($event['start']) {
-                       $eventdata['start'] = Temporal::convert($event['start'], "UTC", $eventdata['timezone'], $mask);
+                       $eventdata['start'] = DateTimeFormat::convert($event['start'], "UTC", $eventdata['timezone'], $mask);
                }
                if ($event['finish'] && !$event['nofinish']) {
-                       $eventdata['end'] = Temporal::convert($event['finish'], "UTC", $eventdata['timezone'], $mask);
+                       $eventdata['end'] = DateTimeFormat::convert($event['finish'], "UTC", $eventdata['timezone'], $mask);
                }
                if ($event['summary']) {
                        $eventdata['summary'] = html_entity_decode(bb2diaspora($event['summary']));
@@ -3652,7 +3651,7 @@ class Diaspora
 
                $public = (($item["private"]) ? "false" : "true");
 
-               $created = Temporal::utc($item["created"], Temporal::ATOM);
+               $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
 
                // Detect a share element and do a reshare
                if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
@@ -3855,7 +3854,7 @@ class Diaspora
                $parent = $p[0];
 
                $text = html_entity_decode(bb2diaspora($item["body"]));
-               $created = Temporal::utc($item["created"], Temporal::ATOM);
+               $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
 
                $comment = ["author" => self::myHandle($owner),
                                "guid" => $item["guid"],
@@ -4086,12 +4085,12 @@ class Diaspora
                        "author" => $cnv["creator"],
                        "guid" => $cnv["guid"],
                        "subject" => $cnv["subject"],
-                       "created_at" => Temporal::utc($cnv['created'], Temporal::ATOM),
+                       "created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
                        "participants" => $cnv["recips"]
                ];
 
                $body = bb2diaspora($item["body"]);
-               $created = Temporal::utc($item["created"], Temporal::ATOM);
+               $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
 
                $msg = [
                        "author" => $myaddr,
@@ -4109,7 +4108,7 @@ class Diaspora
                                        "author" => $cnv["creator"],
                                        "guid" => $cnv["guid"],
                                        "subject" => $cnv["subject"],
-                                       "created_at" => Temporal::utc($cnv['created'], Temporal::ATOM),
+                                       "created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
                                        "participants" => $cnv["recips"],
                                        "message" => $msg];
 
@@ -4217,7 +4216,7 @@ class Diaspora
                                if ($year < 1004) {
                                        $year = 1004;
                                }
-                               $dob = Temporal::utc($year . '-' . $month . '-'. $day, 'Y-m-d');
+                               $dob = DateTimeFormat::utc($year . '-' . $month . '-'. $day, 'Y-m-d');
                        }
 
                        $about = $profile['about'];
index 0583e0ceef0443a7222f322035368123445b9070..e4894cf5476f1c5ec50b8a730b0ce5f84f1b9f76 100644 (file)
@@ -16,9 +16,9 @@ use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Lock;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 use dba;
 use DOMDocument;
@@ -199,7 +199,7 @@ class OStatus
                                $contact["location"] = $value;
                        }
 
-                       $contact['name-date'] = Temporal::utcNow();
+                       $contact['name-date'] = DateTimeFormat::utcNow();
 
                        dba::update('contact', $contact, ['id' => $contact["id"]], $current);
 
@@ -220,7 +220,7 @@ class OStatus
                                                'nurl' => normalise_link($author["author-link"]),
                                                'nick' => $contact["nick"], 'alias' => $contact["alias"],
                                                'about' => $contact["about"], 'location' => $contact["location"],
-                                               'success_update' => Temporal::utcNow(), 'last-update' => Temporal::utcNow()];
+                                               'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
 
                                dba::update('contact', $fields, ['id' => $cid], $old_contact);
 
@@ -558,7 +558,7 @@ class OStatus
                dba::update(
                        'item',
                        ['deleted' => true, 'title' => '', 'body' => '',
-                                       'edited' => Temporal::utcNow(), 'changed' => Temporal::utcNow()],
+                                       'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()],
                        ['id' => $deleted["id"]]
                );
 
@@ -1273,7 +1273,7 @@ class OStatus
                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, "logo", $owner["photo"]);
-               XML::addElement($doc, $root, "updated", Temporal::utcNow(Temporal::ATOM));
+               XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
                $author = self::addAuthor($doc, $owner);
                $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" => "self", "type" => "application/atom+xml", "href" => $contact["poll"]]);
                XML::addElement($doc, $source, "icon", $contact["photo"]);
-               XML::addElement($doc, $source, "updated", Temporal::utc($contact["success_update"]."+00:00", Temporal::ATOM));
+               XML::addElement($doc, $source, "updated", DateTimeFormat::utc($contact["success_update"]."+00:00", DateTimeFormat::ATOM));
 
                return $source;
        }
@@ -1923,8 +1923,8 @@ class OStatus
 
                XML::addElement($doc, $entry, "activity:verb", $verb);
 
-               XML::addElement($doc, $entry, "published", Temporal::utc($item["created"]."+00:00", Temporal::ATOM));
-               XML::addElement($doc, $entry, "updated", Temporal::utc($item["edited"]."+00:00", Temporal::ATOM));
+               XML::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM));
+               XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM));
        }
 
        /**
@@ -2127,7 +2127,7 @@ class OStatus
                        $last_update = 'now -30 days';
                }
 
-               $check_date = Temporal::utc($last_update);
+               $check_date = DateTimeFormat::utc($last_update);
                $authorid = Contact::getIdForURL($owner["url"], 0);
 
                $sql_extra = '';
index aea68eb998e9bd9043e528f0bc516c1fefe8d45c..7f351ed059226f980e01462828753c38e0beed64 100644 (file)
@@ -15,8 +15,8 @@ use Friendica\Database\DBM;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 use dba;
 use DOMDocument;
 use DOMXPath;
@@ -144,7 +144,7 @@ class PortableContact
                        }
 
                        if (isset($entry->updated)) {
-                               $updated = date(Temporal::MYSQL, strtotime($entry->updated));
+                               $updated = date(DateTimeFormat::MYSQL, strtotime($entry->updated));
                        }
 
                        if (isset($entry->network)) {
@@ -315,7 +315,7 @@ class PortableContact
                $contact = ["url" => $profile];
 
                if ($gcontacts[0]["created"] <= NULL_DATE) {
-                       $contact['created'] = Temporal::utcNow();
+                       $contact['created'] = DateTimeFormat::utcNow();
                }
 
                if ($force) {
@@ -338,7 +338,7 @@ class PortableContact
                if ($server_url != "") {
                        if (!self::checkServer($server_url, $gcontacts[0]["network"], $force)) {
                                if ($force) {
-                                       $fields = ['last_failure' => Temporal::utcNow()];
+                                       $fields = ['last_failure' => DateTimeFormat::utcNow()];
                                        dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
                                }
 
@@ -412,14 +412,14 @@ class PortableContact
 
                                                // Set the date of the last contact
                                                /// @todo By now the function "update_gcontact" doesn't work with this field
-                                               //$contact["last_contact"] = Temporal::utcNow();
+                                               //$contact["last_contact"] = DateTimeFormat::utcNow();
 
                                                $contact = array_merge($contact, $noscrape);
 
                                                GContact::update($contact);
 
                                                if (trim($noscrape["updated"]) != "") {
-                                                       $fields = ['last_contact' => Temporal::utcNow()];
+                                                       $fields = ['last_contact' => DateTimeFormat::utcNow()];
                                                        dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
                                                        logger("Profile ".$profile." was last updated at ".$noscrape["updated"]." (noscrape)", LOGGER_DEBUG);
@@ -468,7 +468,7 @@ class PortableContact
                }
 
                if (($data["poll"] == "") || (in_array($data["network"], [NETWORK_FEED, NETWORK_PHANTOM]))) {
-                       $fields = ['last_failure' => Temporal::utcNow()];
+                       $fields = ['last_failure' => DateTimeFormat::utcNow()];
                        dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
                        logger("Profile ".$profile." wasn't reachable (profile)", LOGGER_DEBUG);
@@ -484,7 +484,7 @@ class PortableContact
                $feedret = Network::curl($data["poll"]);
 
                if (!$feedret["success"]) {
-                       $fields = ['last_failure' => Temporal::utcNow()];
+                       $fields = ['last_failure' => DateTimeFormat::utcNow()];
                        dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
                        logger("Profile ".$profile." wasn't reachable (no feed)", LOGGER_DEBUG);
@@ -533,7 +533,7 @@ class PortableContact
 
        public static function updateNeeded($created, $updated, $last_failure, $last_contact)
        {
-               $now = strtotime(Temporal::utcNow());
+               $now = strtotime(DateTimeFormat::utcNow());
 
                if ($updated > $last_contact) {
                        $contact_time = strtotime($updated);
@@ -922,7 +922,7 @@ class PortableContact
                $gserver = dba::selectFirst('gserver', [], ['nurl' => normalise_link($server_url)]);
                if (DBM::is_result($gserver)) {
                        if ($gserver["created"] <= NULL_DATE) {
-                               $fields = ['created' => Temporal::utcNow()];
+                               $fields = ['created' => DateTimeFormat::utcNow()];
                                $condition = ['nurl' => normalise_link($server_url)];
                                dba::update('gserver', $fields, $condition);
                        }
@@ -969,7 +969,7 @@ class PortableContact
                // Mastodon uses the "@" for user profiles.
                // But this can be misunderstood.
                if (parse_url($server_url, PHP_URL_USER) != '') {
-                       dba::update('gserver', ['last_failure' => Temporal::utcNow()], ['nurl' => normalise_link($server_url)]);
+                       dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
                        return false;
                }
 
@@ -985,7 +985,7 @@ class PortableContact
                if (DBM::is_result($gserver) && ($orig_server_url == $server_url) &&
                        ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                        logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
-                       dba::update('gserver', ['last_failure' => Temporal::utcNow()], ['nurl' => normalise_link($server_url)]);
+                       dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
                        return false;
                }
 
@@ -1000,7 +1000,7 @@ class PortableContact
                        // Quit if there is a timeout
                        if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) {
                                logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
-                               dba::update('gserver', ['last_failure' => Temporal::utcNow()], ['nurl' => normalise_link($server_url)]);
+                               dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
                                return false;
                        }
 
@@ -1332,9 +1332,9 @@ class PortableContact
 
                if ($failure) {
                        $last_contact = $orig_last_contact;
-                       $last_failure = Temporal::utcNow();
+                       $last_failure = DateTimeFormat::utcNow();
                } else {
-                       $last_contact = Temporal::utcNow();
+                       $last_contact = DateTimeFormat::utcNow();
                        $last_failure = $orig_last_failure;
                }
 
@@ -1362,7 +1362,7 @@ class PortableContact
                        dba::update('gserver', $fields, ['nurl' => normalise_link($server_url)]);
                } elseif (!$failure) {
                        $fields['nurl'] = normalise_link($server_url);
-                       $fields['created'] = Temporal::utcNow();
+                       $fields['created'] = DateTimeFormat::utcNow();
                        dba::insert('gserver', $fields);
                }
                logger("End discovery for server " . $server_url, LOGGER_DEBUG);
@@ -1507,7 +1507,7 @@ class PortableContact
                                        $timeframe = 30;
                                }
 
-                               $updatedSince = date(Temporal::MYSQL, time() - $timeframe * 86400);
+                               $updatedSince = date(DateTimeFormat::MYSQL, time() - $timeframe * 86400);
 
                                // Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
                                $url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
@@ -1526,7 +1526,7 @@ class PortableContact
                                }
                        }
 
-                       $fields = ['last_poco_query' => Temporal::utcNow()];
+                       $fields = ['last_poco_query' => DateTimeFormat::utcNow()];
                        dba::update('gserver', $fields, ['nurl' => $server["nurl"]]);
 
                        return true;
@@ -1535,7 +1535,7 @@ class PortableContact
                        self::checkServer($server["url"], $server["network"], true);
 
                        // If we couldn't reach the server, we will try it some time later
-                       $fields = ['last_poco_query' => Temporal::utcNow()];
+                       $fields = ['last_poco_query' => DateTimeFormat::utcNow()];
                        dba::update('gserver', $fields, ['nurl' => $server["nurl"]]);
 
                        return false;
@@ -1561,7 +1561,7 @@ class PortableContact
                        foreach ($r as $server) {
                                if (!self::checkServer($server["url"], $server["network"])) {
                                        // The server is not reachable? Okay, then we will try it later
-                                       $fields = ['last_poco_query' => Temporal::utcNow()];
+                                       $fields = ['last_poco_query' => DateTimeFormat::utcNow()];
                                        dba::update('gserver', $fields, ['nurl' => $server["nurl"]]);
                                        continue;
                                }
@@ -1654,7 +1654,7 @@ class PortableContact
                        }
 
                        if (isset($entry->updated)) {
-                               $updated = date(Temporal::MYSQL, strtotime($entry->updated));
+                               $updated = date(DateTimeFormat::MYSQL, strtotime($entry->updated));
                        }
 
                        if (isset($entry->network)) {
diff --git a/src/Util/DateTimeFormat.php b/src/Util/DateTimeFormat.php
new file mode 100644 (file)
index 0000000..10810da
--- /dev/null
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * @file src/Util/DateTimeFormat.php
+ */
+
+namespace Friendica\Util;
+
+use DateTime;
+use DateTimeZone;
+use Exception;
+
+/**
+ * @brief Temporal class
+ */
+class DateTimeFormat
+{
+       const ATOM = 'Y-m-d\TH:i:s\Z';
+       const MYSQL = 'Y-m-d H:i:s';
+
+       /**
+        * convert() shorthand for UTC.
+        *
+        * @param string $time   A date/time string
+        * @param string $format DateTime format string or Temporal constant
+        * @return string
+        */
+       public static function utc($time, $format = self::MYSQL)
+       {
+               return self::convert($time, 'UTC', 'UTC', $format);
+       }
+
+       /**
+        * convert() shorthand for local.
+        *
+        * @param string $time   A date/time string
+        * @param string $format DateTime format string or Temporal constant
+        * @return string
+        */
+       public static function local($time, $format = self::MYSQL)
+       {
+               return self::convert($time, date_default_timezone_get(), 'UTC', $format);
+       }
+
+       /**
+        * convert() shorthand for timezoned now.
+        *
+        * @param string $format DateTime format string or Temporal constant
+        * @return string
+        */
+       public static function timezoneNow($timezone, $format = self::MYSQL)
+       {
+               return self::convert('now', $timezone, 'UTC', $format);
+       }
+
+       /**
+        * convert() shorthand for local now.
+        *
+        * @param string $format DateTime format string or Temporal constant
+        * @return string
+        */
+       public static function localNow($format = self::MYSQL)
+       {
+               return self::local('now', $format);
+       }
+
+       /**
+        * convert() shorthand for UTC now.
+        *
+        * @param string $format DateTime format string or Temporal constant
+        * @return string
+        */
+       public static function utcNow($format = self::MYSQL)
+       {
+               return self::utc('now', $format);
+       }
+
+       /**
+        * @brief General purpose date parse/convert/format function.
+        *
+        * @param string $s       Some parseable date/time string
+        * @param string $tz_to   Destination timezone
+        * @param string $tz_from Source timezone
+        * @param string $format  Output format recognised from php's DateTime class
+        *   http://www.php.net/manual/en/datetime.format.php
+        *
+        * @return string Formatted date according to given format
+        */
+       public static function convert($s = 'now', $tz_to = 'UTC', $tz_from = 'UTC', $format = self::MYSQL)
+       {
+               // Defaults to UTC if nothing is set, but throws an exception if set to empty string.
+               // Provide some sane defaults regardless.
+               if ($from === '') {
+                       $from = 'UTC';
+               }
+
+               if ($to === '') {
+                       $to = 'UTC';
+               }
+
+               if (($s === '') || (!is_string($s))) {
+                       $s = 'now';
+               }
+
+               /*
+                * Slight hackish adjustment so that 'zero' datetime actually returns what is intended
+                * otherwise we end up with -0001-11-30 ...
+                * add 32 days so that we at least get year 00, and then hack around the fact that
+                * months and days always start with 1.
+                */
+               if (substr($s, 0, 10) <= '0001-01-01') {
+                       $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC'));
+                       return str_replace('1', '0', $d->format($format));
+               }
+
+               try {
+                       $from_obj = new DateTimeZone($tz_from);
+               } catch (Exception $e) {
+                       $from_obj = new DateTimeZone('UTC');
+               }
+
+               try {
+                       $d = new DateTime($s, $from_obj);
+               } catch (Exception $e) {
+                       logger('datetime_convert: exception: ' . $e->getMessage());
+                       $d = new DateTime('now', $from_obj);
+               }
+
+               try {
+                       $to_obj = new DateTimeZone($tz_to);
+               } catch (Exception $e) {
+                       $to_obj = new DateTimeZone('UTC');
+               }
+
+               $d->setTimeZone($to_obj);
+
+               return $d->format($format);
+       }
+}
index 3074e74dd6659cd41ef0a5e417607db56c80db36..e8094959d6b348b9c9c51e4bb5c855084d8a12a8 100644 (file)
@@ -73,7 +73,7 @@ class ParseUrl
                        [
                                'url' => normalise_link($url), 'guessing' => !$no_guessing,
                                'oembed' => $do_oembed, 'content' => serialize($data),
-                               'created' => Temporal::utcNow()
+                               'created' => DateTimeFormat::utcNow()
                        ],
                        true
                );
index 0e8c8f18cf40f5bd88d107106f6656a3952e302d..e04165069b779dd244e0b8fd9f0d98f96e2d0ece 100644 (file)
@@ -8,7 +8,6 @@ namespace Friendica\Util;
 
 use DateTime;
 use DateTimeZone;
-use Exception;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -21,9 +20,6 @@ require_once 'include/text.php';
  */
 class Temporal
 {
-       const ATOM = 'Y-m-d\TH:i:s\Z';
-       const MYSQL = 'Y-m-d H:i:s';
-
        /**
         * @brief Two-level sort for timezones.
         *
@@ -123,125 +119,6 @@ class Temporal
                ]);
        }
 
-       /**
-        * convert() shorthand for UTC.
-        *
-        * @param string $time   A date/time string
-        * @param string $format DateTime format string or Temporal constant
-        * @return string
-        */
-       public static function utc($time, $format = self::MYSQL)
-       {
-               return self::convert($time, 'UTC', 'UTC', $format);
-       }
-
-       /**
-        * convert() shorthand for local.
-        *
-        * @param string $time   A date/time string
-        * @param string $format DateTime format string or Temporal constant
-        * @return string
-        */
-       public static function local($time, $format = self::MYSQL)
-       {
-               return self::convert($time, date_default_timezone_get(), 'UTC', $format);
-       }
-
-       /**
-        * convert() shorthand for timezoned now.
-        *
-        * @param string $format DateTime format string or Temporal constant
-        * @return string
-        */
-       public static function timezoneNow($timezone, $format = self::MYSQL)
-       {
-               return self::convert('now', $timezone, 'UTC', $format);
-       }
-
-       /**
-        * convert() shorthand for local now.
-        *
-        * @param string $format DateTime format string or Temporal constant
-        * @return string
-        */
-       public static function localNow($format = self::MYSQL)
-       {
-               return self::local('now', $format);
-       }
-
-       /**
-        * convert() shorthand for UTC now.
-        *
-        * @param string $format DateTime format string or Temporal constant
-        * @return string
-        */
-       public static function utcNow($format = self::MYSQL)
-       {
-               return self::utc('now', $format);
-       }
-
-       /**
-        * @brief General purpose date parse/convert/format function.
-        *
-        * @param string $s       Some parseable date/time string
-        * @param string $tz_to   Destination timezone
-        * @param string $tz_from Source timezone
-        * @param string $format  Output format recognised from php's DateTime class
-        *   http://www.php.net/manual/en/datetime.format.php
-        *
-        * @return string Formatted date according to given format
-        */
-       public static function convert($s = 'now', $tz_to = 'UTC', $tz_from = 'UTC', $format = self::MYSQL)
-       {
-               // Defaults to UTC if nothing is set, but throws an exception if set to empty string.
-               // Provide some sane defaults regardless.
-               if ($from === '') {
-                       $from = 'UTC';
-               }
-
-               if ($to === '') {
-                       $to = 'UTC';
-               }
-
-               if (($s === '') || (!is_string($s))) {
-                       $s = 'now';
-               }
-
-               /*
-                * Slight hackish adjustment so that 'zero' datetime actually returns what is intended
-                * otherwise we end up with -0001-11-30 ...
-                * add 32 days so that we at least get year 00, and then hack around the fact that
-                * months and days always start with 1.
-                */
-               if (substr($s, 0, 10) <= '0001-01-01') {
-                       $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC'));
-                       return str_replace('1', '0', $d->format($format));
-               }
-
-               try {
-                       $from_obj = new DateTimeZone($tz_from);
-               } catch (Exception $e) {
-                       $from_obj = new DateTimeZone('UTC');
-               }
-
-               try {
-                       $d = new DateTime($s, $from_obj);
-               } catch (Exception $e) {
-                       logger('datetime_convert: exception: ' . $e->getMessage());
-                       $d = new DateTime('now', $from_obj);
-               }
-
-               try {
-                       $to_obj = new DateTimeZone($tz_to);
-               } catch (Exception $e) {
-                       $to_obj = new DateTimeZone('UTC');
-               }
-
-               $d->setTimeZone($to_obj);
-
-               return $d->format($format);
-       }
-
        /**
         * @brief Wrapper for date selector, tailored for use in birthday fields.
         *
index 9c68a7feafcbb26d2ac6f76e0383e53b0b9ca119..7c8e5bc0f4ace03b5ad4fd363e4aba049f36a607 100644 (file)
@@ -8,7 +8,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
@@ -71,7 +71,7 @@ Class Cron {
 
                // once daily run birthday_updates and then expire in background
                $d1 = Config::get('system', 'last_expire_day');
-               $d2 = intval(Temporal::utcNow('d'));
+               $d2 = intval(DateTimeFormat::utcNow('d'));
 
                if ($d2 != intval($d1)) {
 
@@ -142,7 +142,7 @@ Class Cron {
 
                Addon::reload();
 
-               $d = Temporal::utcNow();
+               $d = DateTimeFormat::utcNow();
 
                // Only poll from those with suitable relationships,
                // and which have a polling address and ignore Diaspora since
@@ -218,33 +218,33 @@ Class Cron {
                                 */
                                switch ($contact['priority']) {
                                        case 5:
-                                               if (Temporal::utcNow() > Temporal::utc($t . " + 1 month")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 month")) {
                                                        $update = true;
                                                }
                                                break;
                                        case 4:
-                                               if (Temporal::utcNow() > Temporal::utc($t . " + 1 week")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 week")) {
                                                        $update = true;
                                                }
                                                break;
                                        case 3:
-                                               if (Temporal::utcNow() > Temporal::utc($t . " + 1 day")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) {
                                                        $update = true;
                                                }
                                                break;
                                        case 2:
-                                               if (Temporal::utcNow() > Temporal::utc($t . " + 12 hour")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 12 hour")) {
                                                        $update = true;
                                                }
                                                break;
                                        case 1:
-                                               if (Temporal::utcNow() > Temporal::utc($t . " + 1 hour")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 hour")) {
                                                        $update = true;
                                                }
                                                break;
                                        case 0:
                                        default:
-                                               if (Temporal::utcNow() > Temporal::utc($t . " + ".$min_poll_interval." minute")) {
+                                               if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + ".$min_poll_interval." minute")) {
                                                        $update = true;
                                                }
                                                break;
index d8b97384e6434f1f14d44783cd5d87c9c9e389a4..cf5759e598702af7b41c91adcecb0e48d6729ab8 100644 (file)
@@ -8,7 +8,7 @@ namespace Friendica\Worker;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 Class CronHooks {
        public static function execute($hook = '') {
@@ -45,7 +45,7 @@ Class CronHooks {
 
                logger('cronhooks: start');
 
-               $d = Temporal::utcNow();
+               $d = DateTimeFormat::utcNow();
 
                if (is_array($a->hooks) && array_key_exists("cron", $a->hooks)) {
                        foreach ($a->hooks["cron"] as $hook) {
index 480578c8f9660549adc3068944adb2a89c09c572..b3f4dab78643b1ac74caae316bf9a0da7e953df3 100644 (file)
@@ -11,8 +11,8 @@ use Friendica\Database\DBM;
 use Friendica\Model\GContact;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
 require_once 'include/datetime.php';
 
@@ -198,7 +198,7 @@ class DiscoverPoCo {
                                }
                        } else {
                                q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
-                                       dbesc(Temporal::utcNow()), dbesc(normalise_link($user["url"])));
+                                       dbesc(DateTimeFormat::utcNow()), dbesc(normalise_link($user["url"])));
                        }
 
                        // Quit the loop after 3 minutes
index 0a39aafecbbb311b4c18b78b75d6101c168e45a8..b95f43c382833401b9b95d8ba98a8140b0c90efe 100644 (file)
@@ -15,6 +15,7 @@ use Friendica\Protocol\PortableContact;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
 use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';
@@ -44,7 +45,7 @@ class OnePoll
                        return;
                }
 
-               $d = Temporal::utcNow();
+               $d = DateTimeFormat::utcNow();
 
                $contact = dba::selectFirst('contact', [], ['id' => $contact_id]);
                if (!DBM::is_result($contact)) {
@@ -70,7 +71,7 @@ class OnePoll
                // Diaspora users, archived users and followers are only checked if they still exist.
                if ($contact['archive'] || ($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
                        $last_updated = PortableContact::lastUpdated($contact["url"], true);
-                       $updated = Temporal::utcNow();
+                       $updated = DateTimeFormat::utcNow();
                        if ($last_updated) {
                                logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG);
 
@@ -99,7 +100,7 @@ class OnePoll
                        $contact['priority'] = intval($poll_interval);
                        $hub_update = false;
 
-                       if (Temporal::utcNow() > Temporal::utc($t . " + 1 day")) {
+                       if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) {
                                $hub_update = true;
                        }
                } else {
@@ -107,8 +108,8 @@ class OnePoll
                }
 
                $last_update = (($contact['last-update'] <= NULL_DATE)
-                       ? Temporal::utc('now - 7 days', Temporal::ATOM)
-                       : Temporal::utc($contact['last-update'], Temporal::ATOM)
+                       ? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
+                       : DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
                );
 
                // Update the contact entry
@@ -117,7 +118,7 @@ class OnePoll
                                logger("Skipping probably dead contact ".$contact['url']);
 
                                // set the last-update so we don't keep polling
-                               dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                return;
                        }
 
@@ -126,7 +127,7 @@ class OnePoll
                                logger('Contact is marked dead');
 
                                // set the last-update so we don't keep polling
-                               dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                return;
                        } else {
                                Contact::unmarkForArchival($contact);
@@ -137,7 +138,7 @@ class OnePoll
                        logger('Ignore public contacts');
 
                        // set the last-update so we don't keep polling
-                       dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                       dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                        return;
                }
 
@@ -149,7 +150,7 @@ class OnePoll
                        logger('No self contact for user '.$importer_uid);
 
                        // set the last-update so we don't keep polling
-                       dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                       dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                        return;
                }
 
@@ -185,7 +186,7 @@ class OnePoll
 
                        if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
                                // set the last-update so we don't keep polling
-                               dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                Contact::markForArchival($contact);
                                return;
                        }
@@ -207,7 +208,7 @@ class OnePoll
                                Contact::markForArchival($contact);
 
                                // set the last-update so we don't keep polling
-                               $fields = ['last-update' => Temporal::utcNow(), 'failure_update' => Temporal::utcNow()];
+                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
                                self::updateContact($contact, $fields);
                                return;
                        }
@@ -217,7 +218,7 @@ class OnePoll
 
                                Contact::markForArchival($contact);
 
-                               $fields = ['last-update' => Temporal::utcNow(), 'failure_update' => Temporal::utcNow()];
+                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
                                self::updateContact($contact, $fields);
                                return;
                        }
@@ -230,7 +231,7 @@ class OnePoll
 
                                // we may not be friends anymore. Will keep trying for one month.
                                // set the last-update so we don't keep polling
-                               $fields = ['last-update' => Temporal::utcNow(), 'failure_update' => Temporal::utcNow()];
+                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
                                self::updateContact($contact, $fields);
 
                                Contact::markForArchival($contact);
@@ -241,7 +242,7 @@ class OnePoll
 
                        if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
                                // set the last-update so we don't keep polling
-                               dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                return;
                        }
 
@@ -276,7 +277,7 @@ class OnePoll
                                logger('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
 
                                // set the last-update so we don't keep polling
-                               dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                Contact::markForArchival($contact);
                                return;
                        }
@@ -311,7 +312,7 @@ class OnePoll
 
                        if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) {
                                // set the last-update so we don't keep polling
-                               dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                return;
                        }
 
@@ -321,7 +322,7 @@ class OnePoll
 
                        if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
                                // set the last-update so we don't keep polling
-                               dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                Contact::markForArchival($contact);
                                return;
                        }
@@ -335,7 +336,7 @@ class OnePoll
                        $mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1);
                        if ($mail_disabled) {
                                // set the last-update so we don't keep polling
-                               dba::update('contact', ['last-update' => Temporal::utcNow()], ['id' => $contact['id']]);
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                Contact::markForArchival($contact);
                                return;
                        }
@@ -355,7 +356,7 @@ class OnePoll
                                unset($password);
                                logger("Mail: Connect to " . $mailconf['user']);
                                if ($mbox) {
-                                       $fields = ['last_check' => Temporal::utcNow()];
+                                       $fields = ['last_check' => DateTimeFormat::utcNow()];
                                        dba::update('mailacct', $fields, ['id' => $mailconf['id']]);
                                        logger("Mail: Connected to " . $mailconf['user']);
                                } else {
@@ -395,7 +396,7 @@ class OnePoll
                                                                // Only delete when mails aren't automatically moved or deleted
                                                                if (($mailconf['action'] != 1) && ($mailconf['action'] != 3))
                                                                        if ($meta->deleted && ! $item['deleted']) {
-                                                                               $fields = ['deleted' => true, 'changed' => Temporal::utcNow()];
+                                                                               $fields = ['deleted' => true, 'changed' => DateTimeFormat::utcNow()];
                                                                                dba::update('item', $fields, ['id' => $item['id']]);
                                                                        }
 
@@ -459,7 +460,7 @@ class OnePoll
                                                        $datarray['title'] = notags(trim($datarray['title']));
 
                                                        //$datarray['title'] = notags(trim($meta->subject));
-                                                       $datarray['created'] = Temporal::utc($meta->date);
+                                                       $datarray['created'] = DateTimeFormat::utc($meta->date);
 
                                                        // Is it a reply?
                                                        $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") ||
@@ -572,7 +573,7 @@ class OnePoll
                        if (!strstr($xml, '<')) {
                                logger('post_handshake: response from ' . $url . ' did not contain XML.');
 
-                               $fields = ['last-update' => Temporal::utcNow(), 'failure_update' => Temporal::utcNow()];
+                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
                                self::updateContact($contact, $fields);
                                Contact::markForArchival($contact);
                                return;
@@ -616,19 +617,19 @@ class OnePoll
                                }
                        }
 
-                       $updated = Temporal::utcNow();
+                       $updated = DateTimeFormat::utcNow();
 
                        self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]);
                        dba::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]);
                        Contact::unmarkForArchival($contact);
                } elseif (in_array($contact["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED])) {
-                       $updated = Temporal::utcNow();
+                       $updated = DateTimeFormat::utcNow();
 
                        self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
                        dba::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
                        Contact::markForArchival($contact);
                } else {
-                       $updated = Temporal::utcNow();
+                       $updated = DateTimeFormat::utcNow();
                        dba::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
                }
 
index da307b4fafebc16c10b8fc626b5539141ee0c9fc..98a62818e9bed6575155715ee691cb2c7d4197fd 100644 (file)
@@ -9,7 +9,7 @@ namespace Friendica\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 class UpdateGContact
 {
@@ -42,7 +42,7 @@ class UpdateGContact
                        }
 
                        q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `id` = %d",
-                               dbesc(Temporal::utcNow()), intval($contact_id));
+                               dbesc(DateTimeFormat::utcNow()), intval($contact_id));
                        return;
                }