if ($value != "")
$contact["location"] = $value;
- q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d",
+ q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
- dbesc(datetime_convert()), intval($contact["id"]));
+ dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"],
"", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]);
$photos = import_profile_photo($author["author-avatar"], $importer["uid"], $contact["id"]);
- q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
+ q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),
- dbesc(datetime_convert()), intval($contact["id"]));
+ dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
}
}
break;
}
+ if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) {
+ $photodata = get_photo_info($siteinfo["image"]);
+
+ $attributes = array("rel" => "preview", "href" => $siteinfo["image"], "media:width" => $photodata[0], "media:height" => $photodata[1]);
+ xml_add_element($doc, $root, "link", "", $attributes);
+ }
+
+
$arr = explode('[/attach],',$item['attach']);
if(count($arr)) {
foreach($arr as $r) {
$author = $doc->createElement("author");
xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
xml_add_element($doc, $author, "uri", $owner["url"]);
- xml_add_element($doc, $author, "name", $owner["nick"]);
+ xml_add_element($doc, $author, "name", $profile["name"]);
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]);
xml_add_element($doc, $author, "link", "", $attributes);
return $author;
}
+/*
+To-Do: Picture attachments should look like this:
+
+<a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
+class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
+
+*/
+
function ostatus_entry($doc, $item, $owner, $toplevel = false) {
$a = get_app();
if ($item['title'] != "")
$body = "[b]".$item['title']."[/b]\n\n".$body;
+ //$body = bb_remove_share_information($body);
$body = bbcode($body, false, false, 7);
xml_add_element($doc, $entry, "content", $body, array("type" => "html"));
// To-Do:
// The API call has yet to be implemented
- $attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
- "rel" => "self", "type" => "application/atom+xml");
- xml_add_element($doc, $entry, "link", "", $attributes);
+ //$attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
+ // "rel" => "self", "type" => "application/atom+xml");
+ //xml_add_element($doc, $entry, "link", "", $attributes);
- $attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
- "rel" => "edit", "type" => "application/atom+xml");
- xml_add_element($doc, $entry, "link", "", $attributes);
+ //$attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
+ // "rel" => "edit", "type" => "application/atom+xml");
+ //xml_add_element($doc, $entry, "link", "", $attributes);
$app = $item["app"];
if ($app == "")
$root->appendChild($entry);
}
- return($doc->saveXML());
+ return(trim($doc->saveXML()));
}
function ostatus_salmon($item,$owner) {
$doc->appendChild($entry);
- return($doc->saveXML());
+ return(trim($doc->saveXML()));
}
?>