jdormit/pterotype
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17 from scottandrewlepera/php5

Browse Source 
Replace function array dereferencing with PHP 5.x-friendly syntax.
This commit is contained in:
Jeremy Dormitzer 2019-01-07 09:36:06 -05:00 committed by GitHub
commit 63f6159e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/admin/settings.php
View File

@ -113,7 +113,8 @@ function get_blog_icon_value() {
return $icon;
}
if ( \has_custom_logo() ) {
return \wp_get_attachment_image_src( \get_theme_mod( 'custom_logo' ) )[0];
$theme_mod = \wp_get_attachment_image_src( \get_theme_mod( 'custom_logo' ) );
return $theme_mod[0];
}
return null;
}

6
includes/server/activities/delete.php
View File

@ -70,8 +70,10 @@ function delete_linked_comment( $object ) {
function check_authorization( $activity ) {
$object = $activity['object'];
$activity_origin = parse_url( $activity['id'] )['host'];
$object_origin = parse_url( $object['id'] )['host'];
$parsed_activity_id = parse_url( $activity['id'] );
$activity_origin = $parsed_activity_id['host'];
$parsed_object_id = parse_url( $object['id'] );
$object_origin = $parsed_object_id['host'];
if ( ( !$activity_origin || !$object_origin ) || $activity_origin !== $object_origin ) {
return new \WP_Error(
'unauthorized',

6
includes/server/activities/update.php
View File

@ -85,8 +85,10 @@ function handle_inbox( $actor_slug, $activity ) {
function check_authorization( $activity ) {
$object = $activity['object'];
$activity_origin = parse_url( $activity['id'] )['host'];
$object_origin = parse_url( $object['id'] )['host'];
$parsed_activity_id = parse_url( $activity['id'] );
$activity_origin = $parsed_activity_id['host'];
$parsed_object_id = parse_url( $object['id'] );
$object_origin = $parsed_object_id['host'];
if ( ( !$activity_origin || !$object_origin ) || $activity_origin !== $object_origin ) {
return new \WP_Error(
'unauthorized',

3
includes/server/actors.php
View File

@ -221,7 +221,8 @@ function get_user_actor( $user ) {
}
function make_icon_array( $icon_url ) {
$mime_type = wp_check_filetype( $icon_url )['type'];
$filetype = wp_check_filetype( $icon_url );
$mime_type = $filetype['type'];
return array(
'url' => $icon_url,
'type' => 'Image',

27
includes/server/api.php
View File

@ -9,13 +9,18 @@ require_once plugin_dir_path( __FILE__ ) . 'following.php';
require_once plugin_dir_path( __FILE__ ) . 'likes.php';
require_once plugin_dir_path( __FILE__ ) . 'shares.php';
function get_url_param( $request, $param ) {
$params = $request->get_url_params();
return $params[$param];
}
function get_actor( $request ) {
$actor = $request->get_url_params()['actor'];
$actor = get_url_param($request, 'actor');
return \pterotype\actors\get_actor_by_slug( $actor );
}
function post_to_outbox( $request ) {
$actor_slug = $request->get_url_params()['actor'];
$actor_slug = get_url_param($request, 'actor');
$body = $request->get_body();
$activity = $body;
if ( is_string( $body ) ) {
@ -25,12 +30,12 @@ function post_to_outbox( $request ) {
}
function get_outbox( $request ) {
$actor_slug = $request->get_url_params()['actor'];
$actor_slug = get_url_param($request, 'actor');
return \pterotype\outbox\get_outbox( $actor_slug );
}
function post_to_inbox( $request ) {
$actor_slug = $request->get_url_params()['actor'];
$actor_slug = get_url_param($request, 'actor');
$body = $request->get_body();
$activity = $body;
if ( is_string( $body ) ) {
@ -40,37 +45,37 @@ function post_to_inbox( $request ) {
}
function get_inbox( $request ) {
$actor_slug = $request->get_url_params()['actor'];
$actor_slug = get_url_param($request, 'actor');
return \pterotype\inbox\get_inbox( $actor_slug );
}
function get_object( $request ) {
$id = $request->get_url_params()['id'];
$id = get_url_param($request, 'id');
return \pterotype\objects\get_object( $id );
}
function get_following( $request ) {
$actor_slug = $request->get_url_params()['actor'];
$actor_slug = get_url_param($request, 'actor');
return \pterotype\following\get_following_collection( $actor_slug );
}
function get_followers( $request ) {
$actor_slug = $request->get_url_params()['actor'];
$actor_slug = get_url_param($request, 'actor');
return \pterotype\followers\get_followers_collection( $actor_slug );
}
function get_likes( $request ) {
$object_id = $request->get_url_params()['object'];
$object_id = get_url_param($request, 'object');
return \pterotype\likes\get_likes_collection( $object_id );
}
function get_shares( $request ) {
$object_id = $request->get_url_params()['object'];
$object_id = get_url_param($request, 'object');
return \pterotype\shares\get_shares_collection( $object_id );
}
function user_can_post_to_outbox( $request ) {
$actor_slug = $request->get_url_params()['actor'];
$actor_slug = get_url_param($request, 'actor');
$actor_row = \pterotype\actors\get_actor_row_by_slug( $actor_slug );
if ( ! $actor_row || is_wp_error( $actor_row ) ) {
return false;

3
includes/util.php
View File

@ -82,7 +82,8 @@ function retrieve_local_object( $url ) {
function is_local_url( $url ) {
$parsed = parse_url( $url );
if ( $parsed ) {
$site_host = parse_url( get_site_url() )['host'];
$parsed_site_url = parse_url( get_site_url() );
$site_host = $parsed_site_url['host'];
return $parsed['host'] === $site_host;
}
return false;