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) {
$title = sprintf("New comment by %s", $owner["nick"]);
}
- xml_add_element($doc, $entry, "activity:object-type", $item["object-type"]);
- xml_add_element($doc, $entry, "id", $item["uri"]); //<id>tag:fresh.federati.net,2015-11-22:noticeId=324796:objectType=note</id>
+ // To use the object-type "bookmark" we have to implement these elements:
+ //
+ // <activity:object-type>http://activitystrea.ms/schema/1.0/bookmark</activity:object-type>
+ // <title>Historic Rocket Landing</title>
+ // <summary>Nur ein Testbeitrag.</summary>
+ // <link rel="related" href="https://www.youtube.com/watch?v=9pillaOxGCo"/>
+ // <link rel="preview" href="https://pirati.cc/file/thumb-4526-450x338-b48c8055f0c2fed0c3f67adc234c4b99484a90c42ed3cac73dc1081a4d0a7bc1.jpg.jpg" media:width="450" media:height="338"/>
+ //
+ // But: it seems as if it doesn't federate well between the GS servers
+ // So we just set it to "note" to be sure that it reaches their target systems
+
+ xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+ xml_add_element($doc, $entry, "id", $item["uri"]);
xml_add_element($doc, $entry, "title", $title);
if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
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()));
}
?>