oldkid/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Move Temporal::convert() to DateTimeFormat::convert()

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-26 21:39:02 -05:00
parent 13fb4a312d
commit 1900da6c42
15 changed files with 77 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dav/common/calendar.fnk.php
View file

@ -1,6 +1,6 @@
<?php <?php
use Friendica\Util\Temporal; use Friendica\Util\DateTimeFormat;
define("DAV_ACL_READ", "{DAV:}read"); define("DAV_ACL_READ", "{DAV:}read");
define("DAV_ACL_WRITE", "{DAV:}write"); define("DAV_ACL_WRITE", "{DAV:}write");
@ -151,7 +151,7 @@ function vcard_source_compile($vcardsource)
*/ */
function wdcal_php2MySqlTime($phpDate) function wdcal_php2MySqlTime($phpDate)
{ {
return date(Temporal::MYSQL, $phpDate); return date(DateTimeFormat::MYSQL, $phpDate);
} }
/** /**
@ -160,7 +160,7 @@ function wdcal_php2MySqlTime($phpDate)
*/ */
function wdcal_mySql2PhpTime($sqlDate) function wdcal_mySql2PhpTime($sqlDate)
{ {
$ts = DateTime::createFromFormat(Temporal::MYSQL, $sqlDate); $ts = DateTime::createFromFormat(DateTimeFormat::MYSQL, $sqlDate);
return $ts->format("U"); return $ts->format("U");
} }

8
dav/common/calendar_rendering.fnk.php
View file

@ -1,6 +1,6 @@
<?php <?php
use Friendica\Util\Temporal; use Friendica\Util\DateTimeFormat;
/** /**
@ -110,15 +110,15 @@ function renderCalDavEntry_data(&$calendar, &$calendarobject)
q("INSERT INTO %s%sjqcalendar (`calendar_id`, `calendarobject_id`, `Summary`, `StartTime`, `EndTime`, `IsEditable`, `IsAllDayEvent`, `IsRecurring`, `Color`) VALUES q("INSERT INTO %s%sjqcalendar (`calendar_id`, `calendarobject_id`, `Summary`, `StartTime`, `EndTime`, `IsEditable`, `IsAllDayEvent`, `IsRecurring`, `Color`) VALUES
(%d, %d, '%s', CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), %d, %d, %d, '%s')", (%d, %d, '%s', CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), %d, %d, %d, '%s')",
CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), dbesc($event["summary"]), date(Temporal::MYSQL, $start), CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), dbesc($event["summary"]), date(DateTimeFormat::MYSQL, $start),
date(Temporal::MYSQL, $last_end), 1, $allday, $recurring, dbesc(substr($event["color"], 1)) date(DateTimeFormat::MYSQL, $last_end), 1, $allday, $recurring, dbesc(substr($event["color"], 1))
); );
foreach ($alarms as $alarm) { foreach ($alarms as $alarm) {
$alarm = renderCalDavEntry_calcalarm($alarm, $component); $alarm = renderCalDavEntry_calcalarm($alarm, $component);
$notified = ($alarm->getTimestamp() < time() ? 1 : 0); $notified = ($alarm->getTimestamp() < time() ? 1 : 0);
q("INSERT INTO %s%snotifications (`calendar_id`, `calendarobject_id`, `alert_date`, `notified`) VALUES (%d, %d, CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), %d)", q("INSERT INTO %s%snotifications (`calendar_id`, `calendarobject_id`, `alert_date`, `notified`) VALUES (%d, %d, CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), %d)",
CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), $alarm->format(Temporal::MYSQL), $notified CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), $alarm->format(DateTimeFormat::MYSQL), $notified
); );
} }

10
dav/common/wdcal_backend.inc.php
View file

@ -1,7 +1,7 @@
<?php <?php
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Util\Temporal; use Friendica\Util\DateTimeFormat;
/** /**
* @param mixed $obj * @param mixed $obj
@ -101,9 +101,9 @@ function wdcal_print_feed($base_path = "")
else $type = Sabre\VObject\Property\DateTime::LOCALTZ; else $type = Sabre\VObject\Property\DateTime::LOCALTZ;
$datetime_start = new Sabre\VObject\Property\DateTime("DTSTART"); $datetime_start = new Sabre\VObject\Property\DateTime("DTSTART");
$datetime_start->setDateTime(new DateTime(date(Temporal::MYSQL, IntVal($_REQUEST["CalendarStartTime"]))), $type); $datetime_start->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, IntVal($_REQUEST["CalendarStartTime"]))), $type);
$datetime_end = new Sabre\VObject\Property\DateTime("DTEND"); $datetime_end = new Sabre\VObject\Property\DateTime("DTEND");
$datetime_end->setDateTime(new DateTime(date(Temporal::MYSQL, IntVal($_REQUEST["CalendarEndTime"]))), $type); $datetime_end->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, IntVal($_REQUEST["CalendarEndTime"]))), $type);
$component->add($datetime_start); $component->add($datetime_start);
$component->add($datetime_end); $component->add($datetime_end);
@ -183,9 +183,9 @@ function wdcal_print_feed($base_path = "")
else $type = Sabre\VObject\Property\DateTime::LOCALTZ; else $type = Sabre\VObject\Property\DateTime::LOCALTZ;
$datetime_start = new Sabre\VObject\Property\DateTime("DTSTART"); $datetime_start = new Sabre\VObject\Property\DateTime("DTSTART");
$datetime_start->setDateTime(new DateTime(date(Temporal::MYSQL, IntVal($_REQUEST["CalendarStartTime"]))), $type); $datetime_start->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, IntVal($_REQUEST["CalendarStartTime"]))), $type);
$datetime_end = new Sabre\VObject\Property\DateTime("DTEND"); $datetime_end = new Sabre\VObject\Property\DateTime("DTEND");
$datetime_end->setDateTime(new DateTime(date(Temporal::MYSQL, IntVal($_REQUEST["CalendarEndTime"]))), $type); $datetime_end->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, IntVal($_REQUEST["CalendarEndTime"]))), $type);
$component->__unset("DTSTART"); $component->__unset("DTSTART");
$component->__unset("DTEND"); $component->__unset("DTEND");

10
dav/common/wdcal_edit.inc.php
View file

@ -1,7 +1,7 @@
<?php <?php
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Util\Temporal; use Friendica\Util\DateTimeFormat;
/** /**
* @param wdcal_local $localization * @param wdcal_local $localization
@ -521,9 +521,9 @@ function wdcal_set_component_date(&$component, &$localization)
$type = Sabre\VObject\Property\DateTime::LOCALTZ; $type = Sabre\VObject\Property\DateTime::LOCALTZ;
} }
$datetime_start = new Sabre\VObject\Property\DateTime("DTSTART"); $datetime_start = new Sabre\VObject\Property\DateTime("DTSTART");
$datetime_start->setDateTime(new DateTime(date(Temporal::MYSQL, $ts_start)), $type); $datetime_start->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $ts_start)), $type);
$datetime_end = new Sabre\VObject\Property\DateTime("DTEND"); $datetime_end = new Sabre\VObject\Property\DateTime("DTEND");
$datetime_end->setDateTime(new DateTime(date(Temporal::MYSQL, $ts_end)), $type); $datetime_end->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $ts_end)), $type);
$component->__unset("DTSTART"); $component->__unset("DTSTART");
$component->__unset("DTEND"); $component->__unset("DTEND");
@ -599,7 +599,7 @@ function wdcal_set_component_recurrence(&$component, &$localization)
$date = $localization->date_local2timestamp($_REQUEST["rec_until_date"]); $date = $localization->date_local2timestamp($_REQUEST["rec_until_date"]);
$part_until = ";UNTIL=" . date("Ymd", $date); $part_until = ";UNTIL=" . date("Ymd", $date);
$datetime_until = new Sabre\VObject\Property\DateTime("UNTIL"); $datetime_until = new Sabre\VObject\Property\DateTime("UNTIL");
$datetime_until->setDateTime(new DateTime(date(Temporal::MYSQL, $date)), Sabre\VObject\Property\DateTime::DATE); $datetime_until->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $date)), Sabre\VObject\Property\DateTime::DATE);
break; break;
case "count": case "count":
$part_until = ";COUNT=" . IntVal($_REQUEST["rec_until_count"]); $part_until = ";COUNT=" . IntVal($_REQUEST["rec_until_count"]);
@ -646,7 +646,7 @@ function wdcal_set_component_recurrence(&$component, &$localization)
if (isset($_REQUEST["rec_exceptions"])) { if (isset($_REQUEST["rec_exceptions"])) {
$arr = array(); $arr = array();
foreach ($_REQUEST["rec_exceptions"] as $except) { foreach ($_REQUEST["rec_exceptions"] as $except) {
$arr[] = new DateTime(date(Temporal::MYSQL, $except)); $arr[] = new DateTime(date(DateTimeFormat::MYSQL, $except));
} }
/** @var Sabre\VObject\Property\MultiDateTime $prop */ /** @var Sabre\VObject\Property\MultiDateTime $prop */
$prop = Sabre\VObject\Property::create("EXDATE"); $prop = Sabre\VObject\Property::create("EXDATE");

18
dav/friendica/dav_caldav_backend_virtual_friendica.inc.php
View file

@ -1,7 +1,7 @@
<?php <?php
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Util\Temporal; use Friendica\Util\DateTimeFormat;
class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
{ {
@ -68,8 +68,8 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
$component = dav_get_eventComponent($vevent); $component = dav_get_eventComponent($vevent);
if ($row["adjust"]) { if ($row["adjust"]) {
$start = Temporal::local($row["start"]); $start = DateTimeFormat::local($row["start"]);
$finish = Temporal::local($row["finish"]); $finish = DateTimeFormat::local($row["finish"]);
} else { } else {
$start = $row["start"]; $start = $row["start"];
$finish = $row["finish"]; $finish = $row["finish"];
@ -88,9 +88,9 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
$type = ($allday ? Sabre\VObject\Property\DateTime::DATE : Sabre\VObject\Property\DateTime::LOCALTZ); $type = ($allday ? Sabre\VObject\Property\DateTime::DATE : Sabre\VObject\Property\DateTime::LOCALTZ);
$datetime_start = new Sabre\VObject\Property\DateTime("DTSTART"); $datetime_start = new Sabre\VObject\Property\DateTime("DTSTART");
$datetime_start->setDateTime(new DateTime(date(Temporal::MYSQL, $ts_start)), $type); $datetime_start->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $ts_start)), $type);
$datetime_end = new Sabre\VObject\Property\DateTime("DTEND"); $datetime_end = new Sabre\VObject\Property\DateTime("DTEND");
$datetime_end->setDateTime(new DateTime(date(Temporal::MYSQL, $ts_end)), $type); $datetime_end->setDateTime(new DateTime(date(DateTimeFormat::MYSQL, $ts_end)), $type);
$component->add($datetime_start); $component->add($datetime_start);
$component->add($datetime_end); $component->add($datetime_end);
@ -116,8 +116,8 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
private function jqcal2wdcal($row, $calendar, $base_path) private function jqcal2wdcal($row, $calendar, $base_path)
{ {
if ($row["adjust"]) { if ($row["adjust"]) {
$start = Temporal::local($row["start"]); $start = DateTimeFormat::local($row["start"]);
$finish = Temporal::local($row["finish"]); $finish = DateTimeFormat::local($row["finish"]);
} else { } else {
$start = $row["start"]; $start = $row["start"];
$finish = $row["finish"]; $finish = $row["finish"];
@ -175,11 +175,11 @@ class Sabre_CalDAV_Backend_Friendica extends Sabre_CalDAV_Backend_Virtual
} }
if ($date_from != "") { if ($date_from != "") {
if (is_numeric($date_from)) $sql_where .= " AND `finish` >= '" . date(Temporal::MYSQL, $date_from) . "'"; if (is_numeric($date_from)) $sql_where .= " AND `finish` >= '" . date(DateTimeFormat::MYSQL, $date_from) . "'";
else $sql_where .= " AND `finish` >= '" . dbesc($date_from) . "'"; else $sql_where .= " AND `finish` >= '" . dbesc($date_from) . "'";
} }
if ($date_to != "") { if ($date_to != "") {
if (is_numeric($date_to)) $sql_where .= " AND `start` <= '" . date(Temporal::MYSQL, $date_to) . "'"; if (is_numeric($date_to)) $sql_where .= " AND `start` <= '" . date(DateTimeFormat::MYSQL, $date_to) . "'";
else $sql_where .= " AND `start` <= '" . dbesc($date_to) . "'"; else $sql_where .= " AND `start` <= '" . dbesc($date_to) . "'";
} }
$ret = []; $ret = [];

2
dwpost/dwpost.php
View file

@ -187,7 +187,7 @@ function dwpost_send(&$a,&$b) {
$post = xmlify($post); $post = xmlify($post);
$tags = dwpost_get_tags($b['tag']); $tags = dwpost_get_tags($b['tag']);
$date = Temporal::convert($b['created'], $tz); $date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4)); $year = intval(substr($date,0,4));
$mon = intval(substr($date,5,2)); $mon = intval(substr($date,5,2));
$day = intval(substr($date,8,2)); $day = intval(substr($date,8,2));

6
fromgplus/fromgplus.php
View file

@ -14,8 +14,8 @@ use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Temporal;
require_once 'mod/share.php'; require_once 'mod/share.php';
require_once 'mod/parse_url.php'; require_once 'mod/parse_url.php';
@ -520,12 +520,12 @@ function fromgplus_fetch($a, $uid) {
if (function_exists("share_header")) if (function_exists("share_header"))
$post .= share_header($item->object->actor->displayName, $item->object->actor->url, $post .= share_header($item->object->actor->displayName, $item->object->actor->url,
$item->object->actor->image->url, "", $item->object->actor->image->url, "",
Temporal::utc($item->object->published),$item->object->url); DateTimeFormat::utc($item->object->published),$item->object->url);
else else
$post .= "[share author='".str_replace("'", "&#039;",$item->object->actor->displayName). $post .= "[share author='".str_replace("'", "&#039;",$item->object->actor->displayName).
"' profile='".$item->object->actor->url. "' profile='".$item->object->actor->url.
"' avatar='".$item->object->actor->image->url. "' avatar='".$item->object->actor->image->url.
"' posted='".Temporal::utc($item->object->published). "' posted='".DateTimeFormat::utc($item->object->published).
"' link='".$item->object->url."']"; "' link='".$item->object->url."']";
$post .= fromgplus_html2bbcode($item->object->content); $post .= fromgplus_html2bbcode($item->object->content);

2
ijpost/ijpost.php
View file

@ -186,7 +186,7 @@ function ijpost_send(&$a,&$b) {
$post = xmlify($post); $post = xmlify($post);
$tags = ijpost_get_tags($b['tag']); $tags = ijpost_get_tags($b['tag']);
$date = Temporal::convert($b['created'], $tz); $date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4)); $year = intval(substr($date,0,4));
$mon = intval(substr($date,5,2)); $mon = intval(substr($date,5,2));
$day = intval(substr($date,8,2)); $day = intval(substr($date,8,2));

2
ljpost/ljpost.php
View file

@ -187,7 +187,7 @@ function ljpost_send(&$a,&$b) {
$post = xmlify($post); $post = xmlify($post);
$tags = ljpost_get_tags($b['tag']); $tags = ljpost_get_tags($b['tag']);
$date = Temporal::convert($b['created'], $tz); $date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4)); $year = intval(substr($date,0,4));
$mon = intval(substr($date,5,2)); $mon = intval(substr($date,5,2));
$day = intval(substr($date,8,2)); $day = intval(substr($date,8,2));

6
membersince/membersince.php
View file

@ -9,7 +9,7 @@
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Util\Temporal; use Friendica\Util\DateTimeFormat;
require_once 'include/datetime.php'; require_once 'include/datetime.php';
@ -26,8 +26,8 @@ function membersince_uninstall()
function membersince_display(&$a, &$b) function membersince_display(&$a, &$b)
{ {
// Works in Vier // Works in Vier
$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . L10n::t('Member since:') . "</dt>\n<dd>" . Temporal::local($a->profile['register_date']) . "</dd>\n</dl>", $b, 1); $b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . L10n::t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local($a->profile['register_date']) . "</dd>\n</dl>", $b, 1);
// Trying for Frio // Trying for Frio
//$b = preg_replace('/<\/div>/', "<div id=\"aprofile-membersince\" class=\"aprofile\"><hr class=\"profile-separator\"><div class=\"profile-label-name\">" . L10n::t('Member since:') . "</div><div class=\"profile-entry\">" . Temporal::local($a->profile['register_date']) . "</div></div>", $b, 1); //$b = preg_replace('/<\/div>/', "<div id=\"aprofile-membersince\" class=\"aprofile\"><hr class=\"profile-separator\"><div class=\"profile-label-name\">" . L10n::t('Member since:') . "</div><div class=\"profile-entry\">" . DateTimeFormat::local($a->profile['register_date']) . "</div></div>", $b, 1);
} }

12
public_server/public_server.php
View file

@ -10,7 +10,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Util\Temporal; use Friendica\Util\DateTimeFormat;
function public_server_install() { function public_server_install() {
@ -39,7 +39,7 @@ function public_server_register_account($a,$b) {
return; return;
$r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d", $r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d",
dbesc(Temporal::utc('now +' . $days . ' days')), dbesc(DateTimeFormat::utc('now +' . $days . ' days')),
intval($days_posts), intval($days_posts),
intval($uid) intval($uid)
); );
@ -69,7 +69,7 @@ function public_server_cron($a,$b) {
]); ]);
q("update user set expire_notification_sent = '%s' where uid = %d", q("update user set expire_notification_sent = '%s' where uid = %d",
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
intval($rr['uid']) intval($rr['uid'])
); );
} }
@ -87,7 +87,7 @@ function public_server_cron($a,$b) {
if(count($r)) { if(count($r)) {
foreach($r as $rr) foreach($r as $rr)
q("update user set account_expires_on = '%s' where uid = %d", q("update user set account_expires_on = '%s' where uid = %d",
dbesc(Temporal::utc('now +' . '6 days')), dbesc(DateTimeFormat::utc('now +' . '6 days')),
intval($rr['uid']) intval($rr['uid'])
); );
} }
@ -100,7 +100,7 @@ function public_server_cron($a,$b) {
if(count($r)) { if(count($r)) {
foreach($r as $rr) foreach($r as $rr)
q("update user set account_expires_on = '%s' where uid = %d", q("update user set account_expires_on = '%s' where uid = %d",
dbesc(Temporal::utc('now +' . '6 days')), dbesc(DateTimeFormat::utc('now +' . '6 days')),
intval($rr['uid']) intval($rr['uid'])
); );
} }
@ -138,7 +138,7 @@ function public_server_login($a,$b) {
if(! $days) if(! $days)
return; return;
$r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00'", $r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00'",
dbesc(Temporal::utc('now +' . $days . ' days')), dbesc(DateTimeFormat::utc('now +' . $days . ' days')),
local_user() local_user()
); );
} }

18
pumpio/pumpio.php
View file

@ -18,7 +18,7 @@ use Friendica\Model\Item;
use Friendica\Model\Queue; use Friendica\Model\Queue;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Util\Temporal; use Friendica\Util\DateTimeFormat;
require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/http.php';
require 'addon/pumpio/oauth/oauth_client.php'; require 'addon/pumpio/oauth/oauth_client.php';
@ -672,7 +672,7 @@ function pumpio_sync(&$a) {
if ($abandon_days < 1) if ($abandon_days < 1)
$abandon_days = 0; $abandon_days = 0;
$abandon_limit = date(Temporal::MYSQL, time() - $abandon_days * 86400); $abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'import' AND `v` = '1' ORDER BY RAND() "); $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'import' AND `v` = '1' ORDER BY RAND() ");
if(count($r)) { if(count($r)) {
@ -871,7 +871,7 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
} }
$r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'", $r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'",
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc(ACTIVITY_LIKE), dbesc(ACTIVITY_LIKE),
intval($uid), intval($uid),
intval($contactid), intval($contactid),
@ -1002,7 +1002,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) {
`location`, `about`, `writable`, `blocked`, `readonly`, `pending` ) `location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)", VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
intval($uid), intval($uid),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc($contact->url), dbesc($contact->url),
dbesc(normalise_link($contact->url)), dbesc(normalise_link($contact->url)),
dbesc(str_replace("acct:", "", $contact->id)), dbesc(str_replace("acct:", "", $contact->id)),
@ -1211,11 +1211,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
if ($post->object->displayName != "") if ($post->object->displayName != "")
$postarray['title'] = $post->object->displayName; $postarray['title'] = $post->object->displayName;
$postarray['created'] = Temporal::utc($post->published); $postarray['created'] = DateTimeFormat::utc($post->published);
if (isset($post->updated)) if (isset($post->updated))
$postarray['edited'] = Temporal::utc($post->updated); $postarray['edited'] = DateTimeFormat::utc($post->updated);
elseif (isset($post->received)) elseif (isset($post->received))
$postarray['edited'] = Temporal::utc($post->received); $postarray['edited'] = DateTimeFormat::utc($post->received);
else else
$postarray['edited'] = $postarray['created']; $postarray['edited'] = $postarray['created'];
@ -1230,7 +1230,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
$postarray['body'] = share_header($share_author, $post->object->author->url, $postarray['body'] = share_header($share_author, $post->object->author->url,
$post->object->author->image->url, "", $post->object->author->image->url, "",
Temporal::utc($post->object->created), DateTimeFormat::utc($post->object->created),
$post->links->self->href). $post->links->self->href).
$postarray['body']."[/share]"; $postarray['body']."[/share]";
@ -1238,7 +1238,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
$postarray['body'] = "[share author='".$share_author. $postarray['body'] = "[share author='".$share_author.
"' profile='".$post->object->author->url. "' profile='".$post->object->author->url.
"' avatar='".$post->object->author->image->url. "' avatar='".$post->object->author->image->url.
"' posted='".Temporal::convert($post->object->created, 'UTC', 'UTC', ). "' posted='".DateTimeFormat::convert($post->object->created, 'UTC', 'UTC', ).
"' link='".$post->links->self->href."']".$postarray['body']."[/share]"; "' link='".$post->links->self->href."']".$postarray['body']."[/share]";
*/ */
} else { } else {

22
statusnet/statusnet.php
View file

@ -53,8 +53,8 @@ use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Temporal;
function statusnet_install() function statusnet_install()
{ {
@ -760,7 +760,7 @@ function statusnet_cron(App $a, $b)
$abandon_days = 0; $abandon_days = 0;
} }
$abandon_limit = date(Temporal::MYSQL, time() - $abandon_days * 86400); $abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()"); $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()");
if (count($r)) { if (count($r)) {
@ -936,7 +936,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
`location`, `about`, `writable`, `blocked`, `readonly`, `pending` ) `location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ", VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ",
intval($uid), intval($uid),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc($contact->statusnet_profile_url), dbesc($contact->statusnet_profile_url),
dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(normalise_link($contact->statusnet_profile_url)),
dbesc(statusnet_address($contact)), dbesc(statusnet_address($contact)),
@ -977,13 +977,13 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
dbesc($photos[2]), dbesc($photos[2]),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
intval($contact_id) intval($contact_id)
); );
} else { } else {
// update profile photos once every two weeks as we have no notification of when they change. // update profile photos once every two weeks as we have no notification of when they change.
//$update_photo = (($r[0]['avatar-date'] < Temporal::convert('now -2 days', '', '', )) ? true : false); //$update_photo = (($r[0]['avatar-date'] < DateTimeFormat::convert('now -2 days', '', '', )) ? true : false);
$update_photo = ($r[0]['avatar-date'] < Temporal::utc('now -12 hours')); $update_photo = ($r[0]['avatar-date'] < DateTimeFormat::utc('now -12 hours'));
// check that we have all the photos, this has been known to fail on occasion // check that we have all the photos, this has been known to fail on occasion
if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) { if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
@ -1008,9 +1008,9 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
dbesc($photos[2]), dbesc($photos[2]),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc($contact->statusnet_profile_url), dbesc($contact->statusnet_profile_url),
dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(normalise_link($contact->statusnet_profile_url)),
dbesc(statusnet_address($contact)), dbesc(statusnet_address($contact)),
@ -1197,8 +1197,8 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
$postarray['body'] = $converted["body"]; $postarray['body'] = $converted["body"];
$postarray['tag'] = $converted["tags"]; $postarray['tag'] = $converted["tags"];
$postarray['created'] = Temporal::utc($content->created_at); $postarray['created'] = DateTimeFormat::utc($content->created_at);
$postarray['edited'] = Temporal::utc($content->created_at); $postarray['edited'] = DateTimeFormat::utc($content->created_at);
if (is_string($content->place->name)) { if (is_string($content->place->name)) {
$postarray["location"] = $content->place->name; $postarray["location"] = $content->place->name;

6
testdrive/testdrive.php
View file

@ -10,7 +10,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Util\Temporal; use Friendica\Util\DateTimeFormat;
function testdrive_install() { function testdrive_install() {
@ -44,7 +44,7 @@ function testdrive_register_account($a,$b) {
return; return;
$r = q("UPDATE user set account_expires_on = '%s' where uid = %d", $r = q("UPDATE user set account_expires_on = '%s' where uid = %d",
dbesc(Temporal::convert('now +' . $days . ' days')), dbesc(DateTimeFormat::convert('now +' . $days . ' days')),
intval($uid) intval($uid)
); );
@ -72,7 +72,7 @@ function testdrive_cron($a,$b) {
]); ]);
q("update user set expire_notification_sent = '%s' where uid = %d", q("update user set expire_notification_sent = '%s' where uid = %d",
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
intval($rr['uid']) intval($rr['uid'])
); );

26
twitter/twitter.php
View file

@ -77,8 +77,8 @@ use Friendica\Model\Photo;
use Friendica\Model\Queue; use Friendica\Model\Queue;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Temporal;
require_once 'boot.php'; require_once 'boot.php';
require_once 'include/dba.php'; require_once 'include/dba.php';
@ -682,7 +682,7 @@ function twitter_cron(App $a, $b)
$abandon_days = 0; $abandon_days = 0;
} }
$abandon_limit = date(Temporal::MYSQL, time() - $abandon_days * 86400); $abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1'"); $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1'");
if (count($r)) { if (count($r)) {
@ -1017,7 +1017,7 @@ function twitter_fetch_contact($uid, $contact, $create_user)
`location`, `about`, `writable`, `blocked`, `readonly`, `pending`) `location`, `about`, `writable`, `blocked`, `readonly`, `pending`)
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)", VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
intval($uid), intval($uid),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc("https://twitter.com/" . $contact->screen_name), dbesc("https://twitter.com/" . $contact->screen_name),
dbesc(normalise_link("https://twitter.com/" . $contact->screen_name)), dbesc(normalise_link("https://twitter.com/" . $contact->screen_name)),
dbesc($contact->screen_name."@twitter.com"), dbesc($contact->screen_name."@twitter.com"),
@ -1061,16 +1061,16 @@ function twitter_fetch_contact($uid, $contact, $create_user)
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
dbesc($photos[2]), dbesc($photos[2]),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
intval($contact_id) intval($contact_id)
); );
} }
} else { } else {
// update profile photos once every two weeks as we have no notification of when they change. // update profile photos once every two weeks as we have no notification of when they change.
//$update_photo = (($r[0]['avatar-date'] < Temporal::convert('now -2 days', '', '', )) ? true : false); //$update_photo = (($r[0]['avatar-date'] < DateTimeFormat::convert('now -2 days', '', '', )) ? true : false);
$update_photo = ($r[0]['avatar-date'] < Temporal::utc('now -12 hours')); $update_photo = ($r[0]['avatar-date'] < DateTimeFormat::utc('now -12 hours'));
// check that we have all the photos, this has been known to fail on occasion // check that we have all the photos, this has been known to fail on occasion
if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) { if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
@ -1096,9 +1096,9 @@ function twitter_fetch_contact($uid, $contact, $create_user)
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
dbesc($photos[2]), dbesc($photos[2]),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc(Temporal::utcNow()), dbesc(DateTimeFormat::utcNow()),
dbesc("https://twitter.com/".$contact->screen_name), dbesc("https://twitter.com/".$contact->screen_name),
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)), dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
dbesc($contact->screen_name."@twitter.com"), dbesc($contact->screen_name."@twitter.com"),
@ -1490,8 +1490,8 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture); $converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
$postarray['body'] = $converted["body"]; $postarray['body'] = $converted["body"];
$postarray['tag'] = $converted["tags"]; $postarray['tag'] = $converted["tags"];
$postarray['created'] = Temporal::utc($post->created_at); $postarray['created'] = DateTimeFormat::utc($post->created_at);
$postarray['edited'] = Temporal::utc($post->created_at); $postarray['edited'] = DateTimeFormat::utc($post->created_at);
$statustext = $converted["plain"]; $statustext = $converted["plain"];