Skip to content

Commit

Permalink
fix phpcs errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@timiwahalahti @renintw
timiwahalahti authored and renintw committed May 20, 2024
1 parent 4e031bb commit 2e93c1c
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 88 deletions.
140 changes: 70 additions & 70 deletions public_html/wp-content/plugins/wcpt/wcpt-meetup/class-wp-rest-meetups-controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,85 +6,85 @@
* @see WP_REST_Posts_Controller
*/
class WordCamp_REST_Meetups_Controller extends WP_REST_Posts_Controller {
/**
* Retrieves the Meetup post's schema, conforming to JSON Schema.
*
* Meetup-specific modifications to the standard post schema.
*
* @access public
*
* @return array Item schema data.
*/
public function get_item_schema() {
$schema = parent::get_item_schema();
/**
* Retrieves the Meetup post's schema, conforming to JSON Schema.
*
* Meetup-specific modifications to the standard post schema.
*
* @access public
*
* @return array Item schema data.
*/
public function get_item_schema() {
$schema = parent::get_item_schema();

// Since there is more than one public post status, show it in REST response
if ( false === array_search( 'view', $schema['properties']['status']['context'] ) ) {
$schema['properties']['status']['context'][] = 'view';
}
// Since there is more than one public post status, show it in REST response.
if ( false === array_search( 'view', $schema['properties']['status']['context'] ) ) {
$schema['properties']['status']['context'][] = 'view';
}

return $this->add_additional_fields_schema( $schema );
}
return $this->add_additional_fields_schema( $schema );
}

/**
* Sanitizes and validates the list of post statuses, including whether the
* user can query private statuses.
*
* Based on the method in WP_REST_Posts_Controller, but takes into account that
* there are multiple public statuses for the Meetup CPT.
*
* @access public
*
* @param string|array $statuses One or more post statuses.
* @param WP_REST_Request $request Full details about the request.
* @param string $parameter Additional parameter to pass to validation.
* @return array|WP_Error A list of valid statuses, otherwise WP_Error object.
*/
public function sanitize_post_statuses( $statuses, $request, $parameter ) {
$statuses = wp_parse_slug_list( $statuses );
/**
* Sanitizes and validates the list of post statuses, including whether the
* user can query private statuses.
*
* Based on the method in WP_REST_Posts_Controller, but takes into account that
* there are multiple public statuses for the Meetup CPT.
*
* @access public
*
* @param string|array $statuses One or more post statuses.
* @param WP_REST_Request $request Full details about the request.
* @param string $parameter Additional parameter to pass to validation.
* @return array|WP_Error A list of valid statuses, otherwise WP_Error object.
*/
public function sanitize_post_statuses( $statuses, $request, $parameter ) {
$statuses = wp_parse_slug_list( $statuses );

$public_statuses = Meetup_Loader::get_public_post_statuses();
$public_statuses = Meetup_Loader::get_public_post_statuses();

foreach ( $statuses as $status ) {
if ( in_array( $status, $public_statuses ) ) {
continue;
}
foreach ( $statuses as $status ) {
if ( in_array( $status, $public_statuses ) ) {
continue;
}

$post_type_obj = get_post_type_object( $this->post_type );
$post_type_obj = get_post_type_object( $this->post_type );

if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
$result = rest_validate_request_arg( $status, $request, $parameter );
if ( is_wp_error( $result ) ) {
return $result;
}
} else {
return new WP_Error( 'rest_forbidden_status', __( 'Status is forbidden.' ), array( 'status' => rest_authorization_required_code() ) );
}
}
if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
$result = rest_validate_request_arg( $status, $request, $parameter );
if ( is_wp_error( $result ) ) {
return $result;
}
} else {
return new WP_Error( 'rest_forbidden_status', __( 'Status is forbidden.' ), array( 'status' => rest_authorization_required_code() ) );
}
}

return $statuses;
}
return $statuses;
}

/**
* Checks if user can read the Meetup post.
*
* First make our custom check against public Meetup statuses and
* after that fallback to default WP_REST_Posts_Controller for assurance.
*
* @access public
*
* @param object $post Post object.
* @return bool Whether the post can be read.
*/
public function check_read_permission( $post ) {
$public_statuses = Meetup_Loader::get_public_post_statuses();
/**
* Checks if user can read the Meetup post.
*
* First make our custom check against public Meetup statuses and
* after that fallback to default WP_REST_Posts_Controller for assurance.
*
* @access public
*
* @param object $post Post object.
* @return bool Whether the post can be read.
*/
public function check_read_permission( $post ) {
$public_statuses = Meetup_Loader::get_public_post_statuses();

// If post status is not listed as public, it cannot be read
if ( ! in_array( $post->post_status, $public_statuses ) ) {
return false;
}
// If post status is not listed as public, it cannot be read.
if ( ! in_array( $post->post_status, $public_statuses ) ) {
return false;
}

// Fallback to default read permission check
return WP_REST_Posts_Controller::check_read_permission( $post );
}
// Fallback to default read permission check.
return WP_REST_Posts_Controller::check_read_permission( $post );
}
}
42 changes: 24 additions & 18 deletions public_html/wp-content/plugins/wcpt/wcpt-meetup/meetup-loader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,19 @@ public function log_meetup_tags( $event_id, $terms, $tt_ids, $taxonomy, $append,
'object_ids' => $event_id,
'term_taxonomy_id' => $tt_added_ids,
'fields' => 'names',
)
);
) );

$added_terms = $added_terms_query->get_terms();

add_post_meta( $event_id, '_tags_log', array(
'timestamp' => time(),
'user_id' => get_current_user_id(),
'message' => 'Tags added: ' . join( ', ', $added_terms ),
) );
add_post_meta(
$event_id,
'_tags_log',
array(
'timestamp' => time(),
'user_id' => get_current_user_id(),
'message' => 'Tags added: ' . join( ', ', $added_terms ),
)
);
}

if ( count( $tt_removed_ids ) > 0 ) {
Expand All @@ -72,14 +75,17 @@ public function log_meetup_tags( $event_id, $terms, $tt_ids, $taxonomy, $append,
'term_taxonomy_id' => $tt_removed_ids,
'fields' => 'names',
'hide_empty' => false,
)
) )->get_terms();

add_post_meta( $event_id, '_tags_log', array(
'timestamp' => time(),
'user_id' => get_current_user_id(),
'message' => 'Tags removed: ' . join( ', ', $removed_terms ),
) );
) ) )->get_terms();

add_post_meta(
$event_id,
'_tags_log',
array(
'timestamp' => time(),
'user_id' => get_current_user_id(),
'message' => 'Tags removed: ' . join( ', ', $removed_terms ),
)
);
}

}
Expand Down Expand Up @@ -112,14 +118,14 @@ public function register_meetup_taxonomy() {
* Include files specific for meetup event
*/
public function includes() {
require_once ( WCPT_DIR . 'wcpt-meetup/class-wp-rest-meetups-controller.php' );
require_once WCPT_DIR . 'wcpt-meetup/class-wp-rest-meetups-controller.php';
}

/**
* Register meetup custom post type
*/
public function register_post_types() {
// Meetup post type labels
// Meetup post type labels.
$wcpt_labels = array(
'name' => __( 'Meetups', 'wordcamporg' ),
'singular_name' => __( 'Meetup', 'wordcamporg' ),
Expand Down Expand Up @@ -214,7 +220,7 @@ public static function get_public_post_statuses() {
*/
public function set_rest_post_status_default( $query_params ) {
if ( isset( $query_params['status'] ) ) {
$query_params['status']['default'] = Meetup_Loader::get_public_post_statuses();
$query_params['status']['default'] = self::get_public_post_statuses();
}

return $query_params;
Expand Down

0 comments on commit 2e93c1c

Please sign in to comment.