Just some more centralised functionality
This commit is contained in:
parent
99f0746660
commit
d125939888
|
@ -2532,6 +2532,20 @@ class diaspora {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief Build the post xml
|
||||
*
|
||||
* @param string $type The message type
|
||||
* @param array $message The message data
|
||||
*
|
||||
* @return string The post XML
|
||||
*/
|
||||
public static function build_post_xml($type, $message) {
|
||||
|
||||
$data = array("XML" => array("post" => array($type => $message)));
|
||||
return xml::from_array($data, $xml);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Builds and transmit messages
|
||||
*
|
||||
|
@ -2547,9 +2561,7 @@ class diaspora {
|
|||
*/
|
||||
private function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
|
||||
|
||||
$data = array("XML" => array("post" => array($type => $message)));
|
||||
|
||||
$msg = xml::from_array($data, $xml);
|
||||
$msg = build_post_xml($type, $message);
|
||||
|
||||
logger('message: '.$msg, LOGGER_DATA);
|
||||
logger('send guid '.$guid, LOGGER_DEBUG);
|
||||
|
|
|
@ -35,16 +35,11 @@ function fetch_init($a){
|
|||
$user = $r[0];
|
||||
|
||||
$status = diaspora::build_status($item[0], $user);
|
||||
$data = array("XML" => array("post" => array($status["type"] => $status["message"])));
|
||||
$xml = xml::from_array($data, $xmlobj);
|
||||
$xml = diaspora::build_post_xml($status["type"], $status["message"]);
|
||||
|
||||
// Send the envelope
|
||||
header("Content-Type: application/magic-envelope+xml; charset=utf-8");
|
||||
echo diaspora::build_magic_envelope($xml, $user);
|
||||
|
||||
//header("Content-Type: application/xml; charset=utf-8");
|
||||
//echo $xml;
|
||||
//killme();
|
||||
|
||||
killme();
|
||||
}
|
||||
|
|
|
@ -39,8 +39,7 @@ function p_init($a){
|
|||
$user = $r[0];
|
||||
|
||||
$status = diaspora::build_status($item[0], $user);
|
||||
$data = array("XML" => array("post" => array($status["type"] => $status["message"])));
|
||||
$xml = xml::from_array($data, $xmlobj);
|
||||
$xml = diaspora::build_post_xml($status["type"], $status["message"]);
|
||||
|
||||
header("Content-Type: application/xml; charset=utf-8");
|
||||
echo $xml;
|
||||
|
|
Loading…
Reference in a new issue