Event-Federation/wordpress-activitypub
Event-Federation/wordpress-activitypub
7
1
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity Actions

better/simpler accept-header handling

Browse source
This commit is contained in:
Matthias Pfefferle 2019-09-29 18:22:59 +02:00
parent 9fd551f07d
commit 0337b78fef
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
includes/class-activitypub.php
View file

@ -54,17 +54,20 @@ class Activitypub {
return $template; return $template;
} }
// interpret accept header $accept_header = $_SERVER['HTTP_ACCEPT'];
$pos = \stripos( $_SERVER['HTTP_ACCEPT'], ';' );
if ( $pos ) { if (
$accept_header = \substr( $_SERVER['HTTP_ACCEPT'], 0, $pos ); stristr( $accept_header, 'application/activity+json' ) ||
} else { stristr( $accept_header, 'application/ld+json' )
$accept_header = $_SERVER['HTTP_ACCEPT']; ) {
return $template;
} }
// accept header as an array // accept header as an array
$accept = \explode( ',', trim( $accept_header ) ); $accept = \explode( ',', trim( $accept_header ) );
if ( if (
! \in_array( 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', $accept, true ) &&
! \in_array( 'application/activity+json', $accept, true ) && ! \in_array( 'application/activity+json', $accept, true ) &&
! \in_array( 'application/ld+json', $accept, true ) && ! \in_array( 'application/ld+json', $accept, true ) &&
! \in_array( 'application/json', $accept, true ) ! \in_array( 'application/json', $accept, true )