* This implementation here interprets the old and the new protocol and sends the new one.
* In the future we will remove most stuff from "validPosting" and interpret only the new protocol.
*/
+
namespace Friendica\Protocol;
-use Friendica\App;
-use Friendica\Core\System;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Markdown;
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\GContact;
use Friendica\Model\Group;
+use Friendica\Model\Item;
use Friendica\Model\Profile;
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\XML;
-
use dba;
use SimpleXMLElement;
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')",
- datetime_convert(),
+ DateTimeFormat::utcNow(),
dbesc($addr),
dbesc($addr),
dbesc($server),
dbesc($batch),
dbesc(NETWORK_DIASPORA),
intval(CONTACT_IS_FOLLOWER),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(datetime_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));
*/
private static function verifyMagicEnvelope($envelope)
{
- $basedom = parse_xml_string($envelope);
+ $basedom = XML::parseString($envelope);
if (!is_object($basedom)) {
logger("Envelope is no XML file");
if (!is_object($j_outer_key_bundle)) {
logger('Outer Salmon did not verify. Discarding.');
- http_status_exit(400);
+ System::httpExit(400);
}
$outer_iv = base64_decode($j_outer_key_bundle->iv);
$xml = $raw;
}
- $basedom = parse_xml_string($xml);
+ $basedom = XML::parseString($xml);
if (!is_object($basedom)) {
logger('Received data does not seem to be an XML. Discarding. '.$xml);
- http_status_exit(400);
+ System::httpExit(400);
}
$base = $basedom->children(NAMESPACE_SALMON_ME);
$verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
logger('Message did not verify. Discarding.');
- http_status_exit(400);
+ System::httpExit(400);
}
return ['message' => (string)base64url_decode($base->data),
public static function decode($importer, $xml)
{
$public = false;
- $basedom = parse_xml_string($xml);
+ $basedom = XML::parseString($xml);
if (!is_object($basedom)) {
logger("XML is not parseable.");
}
$children = $basedom->children('https://joindiaspora.com/protocol');
+ $inner_aes_key = null;
+ $inner_iv = null;
+
if ($children->header) {
$public = true;
$author_link = str_replace('acct:', '', $children->header->author_id);
$decrypted = self::aesDecrypt($outer_key, $outer_iv, $ciphertext);
logger('decrypted: '.$decrypted, LOGGER_DEBUG);
- $idom = parse_xml_string($decrypted);
+ $idom = XML::parseString($decrypted);
$inner_iv = base64_decode($idom->iv);
$inner_aes_key = base64_decode($idom->aes_key);
// figure out where in the DOM tree our data is hiding
+ $base = null;
if ($dom->provenance->data) {
$base = $dom->provenance;
} elseif ($dom->env->data) {
if (!$base) {
logger('unable to locate salmon data in xml');
- http_status_exit(400);
+ System::httpExit(400);
}
if (!$author_link) {
logger('Could not retrieve author URI.');
- http_status_exit(400);
+ System::httpExit(400);
}
// Once we have the author URI, go to the web and try to find their public key
// (first this will look it up locally if it is in the fcontact cache)
if (!$key) {
logger('Could not retrieve author key.');
- http_status_exit(400);
+ System::httpExit(400);
}
$verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
logger('Message did not verify. Discarding.');
- http_status_exit(400);
+ System::httpExit(400);
}
logger('Message verified.');
*/
private static function validPosting($msg)
{
- $data = parse_xml_string($msg["message"]);
+ $data = XML::parseString($msg["message"]);
if (!is_object($data)) {
logger("No valid XML ".$msg["message"], LOGGER_DEBUG);
return false;
}
- $first_child = $data->getName();
-
// Is this the new or the old version?
if ($data->getName() == "XML") {
$oldXML = true;
$fields = new SimpleXMLElement("<".$type."/>");
$signed_data = "";
+ $author_signature = null;
+ $parent_author_signature = null;
foreach ($element->children() as $fieldname => $entry) {
if ($oldXML) {
*/
public static function personByHandle($handle)
{
- $r = q(
- "SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
- dbesc(NETWORK_DIASPORA),
- dbesc($handle)
- );
- if ($r) {
- $person = $r[0];
- logger("In cache " . print_r($r, true), LOGGER_DEBUG);
+ $update = false;
+
+ $person = dba::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
+ if (DBM::is_result($person)) {
+ logger("In cache " . print_r($person, true), LOGGER_DEBUG);
// update record occasionally so it doesn't get stale
$d = strtotime($person["updated"]." +00:00");
}
}
- if (!$person || $update) {
+ if (!DBM::is_result($person) || $update) {
logger("create or refresh", LOGGER_DEBUG);
$r = Probe::uri($handle, NETWORK_DIASPORA);
// if Diaspora connectivity is enabled on their server
if ($r && ($r["network"] === NETWORK_DIASPORA)) {
self::addFContact($r, $update);
- $person = $r;
+
+ // Fetch the updated or added contact
+ $person = dba::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
+ if (!DBM::is_result($person)) {
+ $person = $r;
+ }
}
}
+
return $person;
}
dbesc($arr["confirm"]),
dbesc($arr["alias"]),
dbesc($arr["pubkey"]),
- dbesc(datetime_convert()),
+ dbesc(DateTimeFormat::utcNow()),
dbesc($arr["url"]),
dbesc($arr["network"])
);
dbesc($arr["network"]),
dbesc($arr["alias"]),
dbesc($arr["pubkey"]),
- dbesc(datetime_convert())
+ dbesc(DateTimeFormat::utcNow())
);
}
}
/**
- * @brief get a handle (user@domain.tld) from a given contact id or gcontact id
+ * @brief get a handle (user@domain.tld) from a given contact id
*
* @param int $contact_id The id in the contact table
- * @param int $gcontact_id The id in the gcontact table
+ * @param int $pcontact_id The id in the contact table (Used for the public contact)
*
* @return string the handle
*/
- public static function handleFromContact($contact_id, $gcontact_id = 0)
+ private static function handleFromContact($contact_id, $pcontact_id = 0)
{
$handle = false;
- logger("contact id is ".$contact_id." - gcontact id is ".$gcontact_id, LOGGER_DEBUG);
+ logger("contact id is ".$contact_id." - pcontact id is ".$pcontact_id, LOGGER_DEBUG);
- if ($gcontact_id != 0) {
+ if ($pcontact_id != 0) {
$r = q(
- "SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
- intval($gcontact_id)
+ "SELECT `addr` FROM `contact` WHERE `id` = %d AND `addr` != ''",
+ intval($pcontact_id)
);
if (DBM::is_result($r)) {
//}
// We don't seem to like that person
- if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
+ if ($contact["blocked"] || $contact["readonly"]) {
// Maybe blocked, don't accept.
return false;
// We are following this person?
logger("Fetch post from ".$source_url, LOGGER_DEBUG);
- $envelope = fetch_url($source_url);
+ $envelope = Network::fetchUrl($source_url);
if ($envelope) {
logger("Envelope was fetched.", LOGGER_DEBUG);
$x = self::verifyMagicEnvelope($envelope);
$source_url = $server."/p/".urlencode($guid).".xml";
logger("Fetch post from ".$source_url, LOGGER_DEBUG);
- $x = fetch_url($source_url);
+ $x = Network::fetchUrl($source_url);
if (!$x) {
return false;
}
}
- $source_xml = parse_xml_string($x);
+ $source_xml = XML::parseString($x);
if (!is_object($source_xml)) {
return false;
/**
* @brief returns contact details
*
- * @param array $contact The default contact if the person isn't found
- * @param array $person The record of the person
- * @param int $uid The user id
+ * @param array $def_contact The default contact if the person isn't found
+ * @param array $person The record of the person
+ * @param int $uid The user id
*
* @return array
* 'cid' => contact id
* 'network' => network type
*/
- private static function authorContactByUrl($contact, $person, $uid)
+ private static function authorContactByUrl($def_contact, $person, $uid)
{
- $r = q(
- "SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
- dbesc(normalise_link($person["url"])),
- intval($uid)
- );
- if ($r) {
- $cid = $r[0]["id"];
- $network = $r[0]["network"];
- } else {
+ $condition = ['nurl' => normalise_link($person["url"]), 'uid' => $uid];
+ $contact = dba::selectFirst('contact', ['id', 'network'], $condition);
+ if (DBM::is_result($contact)) {
$cid = $contact["id"];
+ $network = $contact["network"];
+ } else {
+ $cid = $def_contact["id"];
$network = NETWORK_DIASPORA;
}
$text = unxmlify($data->text);
if (isset($data->created_at)) {
- $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
+ $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
} else {
- $created_at = datetime_convert();
+ $created_at = DateTimeFormat::utcNow();
}
if (isset($data->thread_parent_guid)) {
$datarray["plink"] = self::plink($author, $guid, $parent_item['guid']);
- $body = diaspora2bb($text);
+ $body = Markdown::toBBCode($text);
$datarray["body"] = self::replacePeopleGuid($body, $person["url"]);
self::fetchGuid($datarray);
- $message_id = item_store($datarray);
+ $message_id = Item::insert($datarray);
if ($message_id <= 0) {
return false;
$msg_guid = notags(unxmlify($mesg->guid));
$msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
$msg_text = unxmlify($mesg->text);
- $msg_created_at = datetime_convert("UTC", "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.");
return false;
}
- $body = diaspora2bb($msg_text);
+ $body = Markdown::toBBCode($msg_text);
$message_uri = $msg_author.":".$msg_guid;
$person = self::personByHandle($msg_author);
dba::unlock();
- dba::update('conv', ['updated' => datetime_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 = datetime_convert("UTC", "UTC", 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(datetime_convert()),
+ dbesc(DateTimeFormat::utcNow()),
dbesc($subject),
dbesc($participants)
);
$datarray["body"] = self::constructLikeBody($contact, $parent_item, $guid);
- $message_id = item_store($datarray);
+ $message_id = Item::insert($datarray);
if ($message_id <= 0) {
return false;
$guid = notags(unxmlify($data->guid));
$conversation_guid = notags(unxmlify($data->conversation_guid));
$text = unxmlify($data->text);
- $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
+ $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
$contact = self::allowedContactByHandle($importer, $author, true);
if (!$contact) {
return false;
}
- $body = diaspora2bb($text);
+ $body = Markdown::toBBCode($text);
$body = self::replacePeopleGuid($body, $person["url"]);
dba::unlock();
- dba::update('conv', ['updated' => datetime_convert()], ['id' => $conversation["id"]]);
+ dba::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
return true;
}
$image_url = unxmlify($data->image_url);
$birthday = unxmlify($data->birthday);
$gender = unxmlify($data->gender);
- $about = diaspora2bb(unxmlify($data->bio));
- $location = diaspora2bb(unxmlify($data->location));
+ $about = Markdown::toBBCode(unxmlify($data->bio));
+ $location = Markdown::toBBCode(unxmlify($data->location));
$searchable = (unxmlify($data->searchable) == "true");
$nsfw = (unxmlify($data->nsfw) == "true");
$tags = unxmlify($data->tag_string);
$birthday = str_replace("1000", "1901", $birthday);
if ($birthday != "") {
- $birthday = datetime_convert("UTC", "UTC", $birthday, "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(datetime_convert()),
+ dbesc(DateTimeFormat::utcNow()),
dbesc($birthday),
dbesc($location),
dbesc($about),
$A = "[url=".$self[0]["url"]."]".$self[0]["name"]."[/url]";
$B = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
$BPhoto = "[url=".$contact["url"]."][img]".$contact["thumb"]."[/img][/url]";
- $arr["body"] = sprintf(L10n::t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto;
+ $arr["body"] = L10n::t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$BPhoto;
$arr["object"] = self::constructNewFriendObject($contact);
$arr["deny_cid"] = $user["deny_cid"];
$arr["deny_gid"] = $user["deny_gid"];
- $i = item_store($arr);
+ $i = Item::insert($arr);
if ($i) {
Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
}
return true;
} else {
logger("Author ".$author." doesn't want to follow us anymore.", LOGGER_DEBUG);
- lose_follower($importer, $contact);
+ Contact::removeFollower($importer, $contact);
return true;
}
}
intval($importer["uid"]),
dbesc($ret["network"]),
dbesc($ret["addr"]),
- datetime_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(datetime_convert())
+ dbesc(DateTimeFormat::utcNow())
);
} else {
// automatic friend approval
WHERE `id` = %d
",
intval($new_relation),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
+ dbesc(DateTimeFormat::utcNow()),
+ dbesc(DateTimeFormat::utcNow()),
intval($contact_record["id"])
);
if (self::isReshare($r[0]["body"], true)) {
$r = [];
} elseif (self::isReshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) {
- $r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
+ $r[0]["body"] = Markdown::toBBCode(BBCode::toMarkdown($r[0]["body"]));
$r[0]["body"] = self::replacePeopleGuid($r[0]["body"], $r[0]["author-link"]);
if (DBM::is_result($r)) {
// If it is a reshared post from another network then reformat to avoid display problems with two share elements
if (self::isReshare($r[0]["body"], false)) {
- $r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
+ $r[0]["body"] = Markdown::toBBCode(BBCode::toMarkdown($r[0]["body"]));
$r[0]["body"] = self::replacePeopleGuid($r[0]["body"], $r[0]["author-link"]);
}
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
- $created_at = datetime_convert("UTC", "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"
$datarray["object-type"] = $original_item["object-type"];
self::fetchGuid($datarray);
- $message_id = item_store($datarray);
+ $message_id = Item::insert($datarray);
self::sendParticipation($contact, $datarray);
continue;
}
- // Currently we don't have a central deletion function that we could use in this case.
- // The function "item_drop" doesn't work for that case
- dba::update(
- 'item',
- [
- 'deleted' => true,
- 'title' => '',
- 'body' => '',
- 'edited' => datetime_convert(),
- 'changed' => datetime_convert()],
- ['id' => $item["id"]]
- );
-
- // Delete the thread - if it is a starting post and not a comment
- if ($target_type != 'Comment') {
- delete_thread($item["id"], $item["parent-uri"]);
- }
+ Item::deleteById($item["id"]);
logger("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], LOGGER_DEBUG);
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
- $created_at = datetime_convert("UTC", "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));
}
}
- $body = diaspora2bb($text);
+ $body = Markdown::toBBCode($text);
$datarray = [];
}
self::fetchGuid($datarray);
- $message_id = item_store($datarray);
+ $message_id = Item::insert($datarray);
self::sendParticipation($contact, $datarray);
*
* @return int Result of the transmission
*/
- public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run = false, $guid = "")
+ public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
{
$a = get_app();
if (!intval(Config::get("system", "diaspora_test"))) {
$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
- post_url($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
+ Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
$return_code = $a->get_curl_code();
} else {
logger("test_mode");
logger("transmit: ".$logid."-".$guid." returns: ".$return_code);
if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
- logger("queue message");
-
- $r = q(
- "SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
- intval($contact["id"]),
- dbesc(NETWORK_DIASPORA),
- dbesc($envelope),
- intval($public_batch)
- );
- if ($r) {
- logger("add_to_queue ignored - identical item already in queue");
- } else {
+ if (!$no_queue) {
+ logger("queue message");
// queue message for redelivery
- Queue::add($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch);
-
- // The message could not be delivered. We mark the contact as "dead"
- Contact::markForArchival($contact);
+ Queue::add($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch, $guid);
}
+
+ // The message could not be delivered. We mark the contact as "dead"
+ Contact::markForArchival($contact);
} elseif (($return_code >= 200) && ($return_code <= 299)) {
// We successfully delivered a message, the contact is alive
Contact::unmarkForArchival($contact);
}
- return(($return_code) ? $return_code : (-1));
+ return $return_code ? $return_code : -1;
}
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
if ($spool) {
- Queue::add($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch);
+ Queue::add($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch, $guid);
return true;
} else {
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
$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'] = datetime_convert($eventdata['timezone'], "UTC", $event['start'], $mask);
+ $eventdata['start'] = DateTimeFormat::convert($event['start'], "UTC", $eventdata['timezone'], $mask);
}
if ($event['finish'] && !$event['nofinish']) {
- $eventdata['end'] = datetime_convert($eventdata['timezone'], "UTC", $event['finish'], $mask);
+ $eventdata['end'] = DateTimeFormat::convert($event['finish'], "UTC", $eventdata['timezone'], $mask);
}
if ($event['summary']) {
- $eventdata['summary'] = html_entity_decode(bb2diaspora($event['summary']));
+ $eventdata['summary'] = html_entity_decode(BBCode::toMarkdown($event['summary']));
}
if ($event['desc']) {
- $eventdata['description'] = html_entity_decode(bb2diaspora($event['desc']));
+ $eventdata['description'] = html_entity_decode(BBCode::toMarkdown($event['desc']));
}
if ($event['location']) {
$location = [];
- $location["address"] = html_entity_decode(bb2diaspora($event['location']));
+ $location["address"] = html_entity_decode(BBCode::toMarkdown($event['location']));
$location["lat"] = 0;
$location["lng"] = 0;
$eventdata['location'] = $location;
$public = (($item["private"]) ? "false" : "true");
- $created = datetime_convert("UTC", "UTC", $item["created"], '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"]))) {
$body = $item["body"];
// convert to markdown
- $body = html_entity_decode(bb2diaspora($body));
+ $body = html_entity_decode(BBCode::toMarkdown($body));
// Adding the title
if (strlen($title)) {
$parent = $p[0];
$target_type = ($parent["uri"] === $parent["parent-uri"] ? "Post" : "Comment");
+ $positive = null;
if ($item['verb'] === ACTIVITY_LIKE) {
$positive = "true";
} elseif ($item['verb'] === ACTIVITY_DISLIKE) {
$parent = $p[0];
- $text = html_entity_decode(bb2diaspora($item["body"]));
- $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
+ $text = html_entity_decode(BBCode::toMarkdown($item["body"]));
+ $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
$comment = ["author" => self::myHandle($owner),
"guid" => $item["guid"],
*/
public static function sendRetraction($item, $owner, $contact, $public_batch = false, $relay = false)
{
- $itemaddr = self::handleFromContact($item["contact-id"], $item["gcontact-id"]);
+ $itemaddr = self::handleFromContact($item["contact-id"], $item["author-id"]);
$msg_type = "retraction";
"author" => $cnv["creator"],
"guid" => $cnv["guid"],
"subject" => $cnv["subject"],
- "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
+ "created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
"participants" => $cnv["recips"]
];
- $body = bb2diaspora($item["body"]);
- $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
+ $body = BBCode::toMarkdown($item["body"]);
+ $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
$msg = [
"author" => $myaddr,
"author" => $cnv["creator"],
"guid" => $cnv["guid"],
"subject" => $cnv["subject"],
- "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
+ "created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
"participants" => $cnv["recips"],
"message" => $msg];
$small = System::baseUrl().'/photo/custom/50/' .$profile['uid'].'.jpg';
$searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false');
+ $dob = null;
+ $about = null;
+ $location = null;
+ $tags = null;
if ($searchable === 'true') {
- $dob = '1000-00-00';
+ $dob = '';
- if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) {
- $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC', 'UTC', $profile['dob'],'m-d');
+ if ($profile['dob'] && ($profile['dob'] > '0000-00-00')) {
+ list($year, $month, $day) = sscanf($profile['dob'], '%4d-%2d-%2d');
+ if ($year < 1004) {
+ $year = 1004;
+ }
+ $dob = DateTimeFormat::utc($year . '-' . $month . '-'. $day, 'Y-m-d');
}
$about = $profile['about'];
- $about = strip_tags(bbcode($about));
+ $about = strip_tags(BBCode::convert($about));
$location = Profile::formatLocation($profile);
$tags = '';
foreach ($recips as $recip) {
logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);
- self::buildAndTransmit($owner, $recip, "profile", $message, false, "", true);
+ self::buildAndTransmit($owner, $recip, "profile", $message, false, "", false);
}
}
projects / friendica.git / blobdiff