Fix/phpcs #286
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,60 @@ | ||
| <?php | ||
| /** | ||
| * BC_Admin_Media_API class file. | ||
| * | ||
| * @package Brightcove_Video_Connect | ||
| */ | ||
|
|
||
| /** | ||
| * BC_Admin_Media_API class. | ||
| */ | ||
| class BC_Admin_Media_API { | ||
|
|
||
| /** | ||
| * BC_CMS_API object | ||
| * | ||
| * @var BC_CMS_API | ||
| */ | ||
| protected $cms_api; | ||
|
|
||
| /** | ||
| * BC_Player_Management_API object | ||
| * | ||
| * @var BC_Player_Management_API | ||
| */ | ||
| protected $player_api; | ||
|
|
||
| /** | ||
| * BC_Experiences_API object | ||
| * | ||
| * @var BC_Experiences_API | ||
| */ | ||
| protected $experiences_api; | ||
|
|
||
| /** | ||
| * BC_Playlists object | ||
| * | ||
| * @var BC_Playlists | ||
| */ | ||
| protected $playlists; | ||
|
|
||
| /** | ||
| * BC_Video_Upload object | ||
| * | ||
| * @var BC_Video_Upload | ||
| */ | ||
| protected $video_upload; | ||
|
|
||
| /** | ||
| * BC_Videos Object | ||
| * | ||
| * @var BC_Videos | ||
| */ | ||
| protected $videos; | ||
|
|
||
| /** | ||
| * Constructor method | ||
| */ | ||
| public function __construct() { | ||
|
|
||
| global $bc_accounts; | ||
|
|
@@ -62,6 +85,9 @@ public function __construct() { | |
| add_action( 'wp_ajax_bc_resolve_shortcode', array( $this, 'resolve_shortcode' ) ); | ||
| } | ||
|
|
||
| /** | ||
| * Sends shortcode over. | ||
| */ | ||
| public function resolve_shortcode() { | ||
|
|
||
| $video_id = ( ! empty( $_POST['video_id'] ) ) ? sanitize_text_field( wp_unslash( $_POST['video_id'] ) ) : 0; | ||
|
|
@@ -75,6 +101,9 @@ public function resolve_shortcode() { | |
| wp_send_json_success( do_shortcode( $shortcode ) ); | ||
| } | ||
|
|
||
| /** | ||
| * Helper function for validating Ajax requests | ||
| */ | ||
| protected function bc_helper_check_ajax() { | ||
|
|
||
| if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || ! isset( $_POST['nonce'] ) ) { | ||
|
|
@@ -167,7 +196,7 @@ public function bc_ajax_update_video_or_playlist() { | |
| $fields = $this->cms_api->video_fields(); | ||
| $use_history = false; | ||
| foreach ( $fields['custom_fields'] as $item ) { | ||
| if ( '_change_history' === $item['id'] ) { | ||
| $use_history = true; | ||
| break; | ||
| } | ||
|
|
@@ -187,10 +216,10 @@ public function bc_ajax_update_video_or_playlist() { | |
| $user = wp_get_current_user(); | ||
| $history[] = array( | ||
| 'user' => $user->user_login, | ||
| 'time' => gmdate( 'Y-m-d H:i:s', time() ), | ||
| ); | ||
|
|
||
| $custom['_change_history'] = wp_json_encode( $history ); | ||
| } | ||
|
|
||
| $updated_data['custom_fields'] = $custom; | ||
|
|
@@ -200,7 +229,7 @@ public function bc_ajax_update_video_or_playlist() { | |
|
|
||
| $status = false; | ||
|
|
||
| if ( ! in_array( $_POST['type'], array( 'playlists', 'videos' ), true ) ) { | ||
| wp_send_json_error( __( 'Type is not specified', 'brightcove' ) ); | ||
| } | ||
|
|
||
|
|
@@ -225,11 +254,11 @@ public function bc_ajax_update_video_or_playlist() { | |
| } else { | ||
| $status = $this->videos->update_bc_video( $updated_data ); | ||
|
|
||
| if ( isset( $_POST['folder_id'] ) && isset( $_POST['oldfolder_id'] ) ) { | ||
| $folder_id = sanitize_text_field( $_POST['folder_id'] ); | ||
| $old_folder_id = sanitize_text_field( $_POST['oldfolder_id'] ); | ||
|
There was a problem hiding this comment. @oscarssanchez I am probably missing it but did you also change the place where There was a problem hiding this comment. You are right @felipeelia , I've fixed it here: 552364b |
||
|
|
||
| $this->cms_api->add_folder_to_video( $old_folder_id, $folder_id, $updated_data['video_id'] ); | ||
| } | ||
|
|
||
| // Maybe update poster | ||
|
|
@@ -302,7 +331,7 @@ public function bc_ajax_delete_video_or_playlist() { | |
| $id = BC_Utility::sanitize_id( $_POST['id'] ); | ||
|
|
||
| // Get type brightcove-playlist or brightcove-video. | ||
| if ( ! in_array( $type, array( 'playlists', 'videos' ), true ) ) { | ||
| wp_send_json_error( esc_html__( 'Type is not specified!', 'brightcove' ) ); | ||
| } | ||
|
|
||
|
|
@@ -458,7 +487,9 @@ public function fetch_all( $type, $posts_per_page = 100, $page = 1, $query_strin | |
|
|
||
| $account_ids = array_unique( $account_ids ); | ||
|
|
||
| $count_results = count( $results ); | ||
|
|
||
| while ( $count_results <= ( $page * $posts_per_page ) ) { | ||
|
There was a problem hiding this comment. As There was a problem hiding this comment. This code is actually not used anymore, so I just removed the whole method db94cfc |
||
|
|
||
| if ( 0 === count( $account_ids ) ) { | ||
|
|
||
|
|
@@ -548,7 +579,7 @@ public function brightcove_media_query() { | |
| $query = ( isset( $_POST['search'] ) && '' !== $_POST['search'] ) ? sanitize_text_field( $_POST['search'] ) : false; | ||
| $tag_name = ( isset( $_POST['tagName'] ) && '' !== $_POST['tagName'] ) ? sanitize_text_field( $_POST['tagName'] ) : false; | ||
| $dates = ( isset( $_POST['dates'] ) && 'all' !== $_POST['dates'] ) ? BC_Utility::sanitize_date( $_POST['dates'] ) : false; | ||
| $folder_id = ( isset( $_POST['folder_id'] ) && '' !== $_POST['folder_id'] ) ? sanitize_text_field( $_POST['folder_id'] ) : false; | ||
|
Comment on lines
-551
to
+503
There was a problem hiding this comment. Same as before: did we also change the place where that POST field is sent? |
||
| $label = ( isset( $_POST['labelPath'] ) && '' !== $_POST['labelPath'] ) ? sanitize_text_field( $_POST['labelPath'] ) : false; | ||
| $state = ( isset( $_POST['state'] ) && '' !== $_POST['state'] ) ? sanitize_text_field( $_POST['state'] ) : apply_filters( 'brightcove_state_filter', false ); | ||
|
|
||
|
|
@@ -565,7 +596,7 @@ public function brightcove_media_query() { | |
|
|
||
| $type = isset( $_POST['type'] ) ? sanitize_key( $_POST['type'] ) : false; | ||
|
|
||
| if ( ! $type || ! in_array( $type, array( 'videos', 'playlists', 'videoexperience', 'playlistexperience', 'inpageexperiences' ), true ) ) { | ||
|
|
||
| wp_send_json_error( esc_html__( 'Invalid Search Type', 'brightcove' ) ); | ||
| exit; // Type can only be videos or playlists. | ||
|
|
@@ -742,7 +773,7 @@ public function brightcove_media_query() { | |
| if ( isset( $result['custom_fields'] ) ) { | ||
| foreach ( $result['custom_fields'] as $id => $value ) { | ||
| // Extract the change tracking item explicitly | ||
| if ( '_change_history' === $id ) { | ||
| $result['history'] = $value; | ||
| continue; | ||
| } | ||
|
|
@@ -846,11 +877,11 @@ public function ajax_players() { | |
| * | ||
| * @global BC_Accounts $bc_accounts | ||
| * | ||
| * @param string $account_hash The account hash for the account. | ||
| * @param int $video_id The ID of the video to associate the image with. | ||
| * @param string $url The URL of the image to upload. | ||
| * @param int $width The width of the image. | ||
| * @param int $height The height of the image. | ||
|
There was a problem hiding this comment. Can we align these descriptions? :) There was a problem hiding this comment. Fixed here 1069e77 |
||
| */ | ||
| public function ajax_poster_upload( $account_hash, $video_id, $url, $width, $height ) { | ||
| global $bc_accounts; | ||
|
|
@@ -887,11 +918,11 @@ public function ajax_poster_upload( $account_hash, $video_id, $url, $width, $hei | |
| * | ||
| * @global BC_Accounts $bc_accounts | ||
| * | ||
| * @param string $account_hash The account hash for the account. | ||
| * @param int $video_id The video ID. | ||
| * @param string $url The URL of the thumbnail attachment. | ||
| * @param int $width The width of the thumbnail. | ||
| * @param int $height The height of the thumbnail. | ||
|
There was a problem hiding this comment. Same here. It is possible that GitHub preview is showing it wrong but it seems some spaces are lacking to make them all start in the same column. |
||
| */ | ||
| public function ajax_thumb_upload( $account_hash, $video_id, $url, $width, $height ) { | ||
| global $bc_accounts; | ||
|
|
@@ -928,8 +959,8 @@ public function ajax_thumb_upload( $account_hash, $video_id, $url, $width, $heig | |
| * | ||
| * @global BC_Accounts $bc_accounts | ||
| * | ||
| * @param string $account_hash The account hash to which the video belongs. | ||
| * @param int $video_id The ID of the video from which to delete captions. | ||
| */ | ||
| public function ajax_caption_delete( $account_hash, $video_id ) { | ||
| global $bc_accounts; | ||
|
|
@@ -953,9 +984,9 @@ public function ajax_caption_delete( $account_hash, $video_id ) { | |
| * | ||
| * @global BC_Accounts $bc_accounts | ||
| * | ||
| * @param string $account_hash The account hash for the account. | ||
| * @param int $video_id The video ID | ||
| * @param array $raw_captions The raw captions data. | ||
| */ | ||
| public function ajax_caption_upload( $account_hash, $video_id, $raw_captions ) { | ||
| global $bc_accounts; | ||
|
|
@@ -986,7 +1017,7 @@ public function ajax_caption_upload( $account_hash, $video_id, $raw_captions ) { | |
| $label = isset( $caption['label'] ) ? sanitize_text_field( $caption['label'] ) : ''; | ||
| $default = ( isset( $caption['default'] ) && 'checked' === $caption['default'] ); | ||
|
|
||
| $source = wp_parse_url( $caption['source'] ); | ||
| if ( 0 === strpos( $source['host'], 'brightcove' ) ) { | ||
| // If the hostname starts with "brightcove," assume this media has already been ingested and add to old captions. | ||
| $old_captions[] = new BC_Text_Track( $url, $lang, 'captions', $label, $default ); | ||
|
|
@@ -1014,8 +1045,8 @@ public function ajax_caption_upload( $account_hash, $video_id, $raw_captions ) { | |
| /** | ||
| * Return a set of the most recent videos for the specified account. | ||
| * | ||
| * @param string $account_id The account ID to retrieve videos for. | ||
| * @param int $count The number of videos to return. | ||
|
There was a problem hiding this comment. Same comment about alignment here too. |
||
| * | ||
| * @global BC_Accounts $bc_accounts | ||
| * | ||
|
|
@@ -1058,7 +1089,7 @@ protected function fetch_videos( $account_id, $count = 10 ) { | |
|
|
||
| foreach ( $result['custom_fields'] as $id => $value ) { | ||
| // Extract the change tracking item explicitly | ||
| if ( '_change_history' === $id ) { | ||
| $result['history'] = $value; | ||
| continue; | ||
| } | ||
|
|
@@ -1098,8 +1129,8 @@ protected function fetch_videos( $account_id, $count = 10 ) { | |
| /** | ||
| * When a WP heartbeat is received with an account hash, respond with the most recent 10 videos available. | ||
| * | ||
| * @param array $response WP heartbeat response. | ||
| * @param array $data Data received from heartbeat | ||
| * | ||
| * @return array | ||
| */ | ||
|
|
@@ -1127,7 +1158,7 @@ public function add_in_process_videos( $videos ) { | |
|
|
||
| foreach ( $video_post_ids as $video_post_id ) { | ||
| $in_process_video_id = BC_Utility::get_sanitized_video_id( $video_post_id ); | ||
| if ( in_array( $in_process_video_id, $video_ids, true ) ) { | ||
| wp_delete_post( $video_post_id, true ); | ||
| } else { | ||
| $videos[] = get_post_meta( $video_post_id, '_brightcove_video_object', true ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@oscarssanchez I imagine you are not using the default PHP 8.1 because it is still incompatible with the codebase. Can we bump this to PHP 7.4 at least?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bumped here: db2d1d9