*/
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;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\XML;
use dba;
require_once 'include/dba.php';
require_once 'include/items.php';
require_once 'include/bb2diaspora.php';
-require_once 'include/datetime.php';
/**
* @brief This class contain functions to create and send Diaspora XML files
$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::convert(),
+ DateTimeFormat::utcNow(),
dbesc($addr),
dbesc($addr),
dbesc($server),
dbesc($batch),
dbesc(NETWORK_DIASPORA),
intval(CONTACT_IS_FOLLOWER),
- dbesc(Temporal::convert()),
- dbesc(Temporal::convert()),
- dbesc(Temporal::convert())
+ 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));
dbesc($arr["confirm"]),
dbesc($arr["alias"]),
dbesc($arr["pubkey"]),
- dbesc(Temporal::convert()),
+ dbesc(DateTimeFormat::utcNow()),
dbesc($arr["url"]),
dbesc($arr["network"])
);
dbesc($arr["network"]),
dbesc($arr["alias"]),
dbesc($arr["pubkey"]),
- dbesc(Temporal::convert())
+ dbesc(DateTimeFormat::utcNow())
);
}
$text = unxmlify($data->text);
if (isset($data->created_at)) {
- $created_at = Temporal::convert(notags(unxmlify($data->created_at)));
+ $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
} else {
- $created_at = Temporal::convert();
+ $created_at = DateTimeFormat::utcNow();
}
if (isset($data->thread_parent_guid)) {
$msg_guid = notags(unxmlify($mesg->guid));
$msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
$msg_text = unxmlify($mesg->text);
- $msg_created_at = Temporal::convert(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.");
dba::unlock();
- dba::update('conv', ['updated' => Temporal::convert()], ['id' => $conversation["id"]]);
+ dba::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
notification(
[
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject));
- $created_at = Temporal::convert(notags(unxmlify($data->created_at)));
+ $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
$participants = notags(unxmlify($data->participants));
$messages = $data->message;
dbesc($guid),
dbesc($author),
dbesc($created_at),
- dbesc(Temporal::convert()),
+ dbesc(DateTimeFormat::utcNow()),
dbesc($subject),
dbesc($participants)
);
$guid = notags(unxmlify($data->guid));
$conversation_guid = notags(unxmlify($data->conversation_guid));
$text = unxmlify($data->text);
- $created_at = Temporal::convert(notags(unxmlify($data->created_at)));
+ $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
$contact = self::allowedContactByHandle($importer, $author, true);
if (!$contact) {
dba::unlock();
- dba::update('conv', ['updated' => Temporal::convert()], ['id' => $conversation["id"]]);
+ dba::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
return true;
}
$birthday = str_replace("1000", "1901", $birthday);
if ($birthday != "") {
- $birthday = Temporal::convert($birthday, "UTC", "UTC", "Y-m-d");
+ $birthday = DateTimeFormat::utc($birthday, "Y-m-d");
}
// this is to prevent multiple birthday notifications in a single year
dbesc($name),
dbesc($nick),
dbesc($author),
- dbesc(Temporal::convert()),
+ dbesc(DateTimeFormat::utcNow()),
dbesc($birthday),
dbesc($location),
dbesc($about),
intval($importer["uid"]),
dbesc($ret["network"]),
dbesc($ret["addr"]),
- Temporal::convert(),
+ DateTimeFormat::utcNow(),
dbesc($ret["url"]),
dbesc(normalise_link($ret["url"])),
dbesc($batch),
0,
dbesc(L10n::t("Sharing notification from Diaspora network")),
dbesc($hash),
- dbesc(Temporal::convert())
+ dbesc(DateTimeFormat::utcNow())
);
} else {
// automatic friend approval
WHERE `id` = %d
",
intval($new_relation),
- dbesc(Temporal::convert()),
- dbesc(Temporal::convert()),
+ dbesc(DateTimeFormat::utcNow()),
+ dbesc(DateTimeFormat::utcNow()),
intval($contact_record["id"])
);
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
- $created_at = Temporal::convert(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"
'deleted' => true,
'title' => '',
'body' => '',
- 'edited' => Temporal::convert(),
- 'changed' => Temporal::convert()],
+ 'edited' => DateTimeFormat::utcNow(),
+ 'changed' => DateTimeFormat::utcNow()],
['id' => $item["id"]]
);
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
- $created_at = Temporal::convert(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));
$eventdata['guid'] = $event['guid'];
}
- $mask = 'Y-m-d\TH:i:s\Z';
+ $mask = DateTimeFormat::ATOM;
/// @todo - establish "all day" events in Friendica
$eventdata["all_day"] = "false";
}
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']));
$public = (($item["private"]) ? "false" : "true");
- $created = Temporal::convert($item["created"], "UTC", "UTC", 'Y-m-d\TH:i:s\Z');
+ $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
// Detect a share element and do a reshare
if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
$parent = $p[0];
$text = html_entity_decode(bb2diaspora($item["body"]));
- $created = Temporal::convert($item["created"], "UTC", "UTC", 'Y-m-d\TH:i:s\Z');
+ $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
$comment = ["author" => self::myHandle($owner),
"guid" => $item["guid"],
"author" => $cnv["creator"],
"guid" => $cnv["guid"],
"subject" => $cnv["subject"],
- "created_at" => Temporal::convert($cnv['created'], "UTC", "UTC", 'Y-m-d\TH:i:s\Z'),
+ "created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
"participants" => $cnv["recips"]
];
$body = bb2diaspora($item["body"]);
- $created = Temporal::convert($item["created"], "UTC", "UTC", 'Y-m-d\TH:i:s\Z');
+ $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
$msg = [
"author" => $myaddr,
"author" => $cnv["creator"],
"guid" => $cnv["guid"],
"subject" => $cnv["subject"],
- "created_at" => Temporal::convert($cnv['created'], "UTC", "UTC", 'Y-m-d\TH:i:s\Z'),
+ "created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
"participants" => $cnv["recips"],
"message" => $msg];
if ($year < 1004) {
$year = 1004;
}
- $dob = Temporal::convert($year . '-' . $month . '-'. $day, 'UTC', 'UTC', 'Y-m-d');
+ $dob = DateTimeFormat::utc($year . '-' . $month . '-'. $day, 'Y-m-d');
}
$about = $profile['about'];
projects / friendica.git / blobdiff