GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Handle exception from Magic Envelope toXML function

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-06-23 23:27:18 +02:00
parent 6dcb293ba0
commit a4051945fd
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/Diaspora/DiasporaPlugin.php
View File

@ -225,7 +225,12 @@ class DiasporaPlugin extends Plugin
public function onSalmonSlap($endpoint_uri, MagicEnvelope $magic_env, Profile $target=null)
{
$envxml = $magic_env->toXML($target, 'diaspora');
try {
$envxml = $magic_env->toXML($target, 'diaspora');
} catch (Exception $e) {
common_log(LOG_ERR, sprintf('Could not generate Magic Envelope XML (diaspora flavour) for profile id=='.$target->getID().': '.$e->getMessage()));
return false;
}
// Diaspora wants another POST format (base64url-encoded POST variable 'xml')
$headers = array('Content-Type: application/x-www-form-urlencoded');

7
plugins/OStatus/OStatusPlugin.php
View File

@ -1407,7 +1407,12 @@ class OStatusPlugin extends Plugin
public function onSalmonSlap($endpoint_uri, MagicEnvelope $magic_env, Profile $target=null)
{
$envxml = $magic_env->toXML($target);
try {
$envxml = $magic_env->toXML($target);
} catch (Exception $e) {
common_log(LOG_ERR, sprintf('Could not generate Magic Envelope XML for profile id=='.$target->getID().': '.$e->getMessage()));
return false;
}
$headers = array('Content-Type: application/magic-envelope+xml');