' . "\n";
$html .= $this->show_page_tabs();
$html .= $this->show_tab_before_settings( $tab );
$html .= $this->show_tab_settings( $tab );
@@ -805,10 +808,18 @@ protected function show_tab_after_settings( $tab ) {
$disable_save_button_on_tabs = array( 'extensions', 'import' );
if ( ! in_array( $tab, $disable_save_button_on_tabs ) ) {
+ $button_text = isset( $this->settings[$tab]['button_text'] ) ?
+ $this->settings[$tab]['button_text'] :
+ __( 'Save Settings', 'seriously-simple-podcasting' );
+ $button_class = 'button-primary ssp-settings-submit';
+ $button_class .= isset( $this->settings[$tab]['button_class'] ) ?
+ ' ' . $this->settings[$tab]['button_class'] : '';
+
// Submit button
$html .= '
' :
- '
';
+ $img = ' . 'castos-plugin-settings-banner.jpg)
';
- return $this->renderer->fetch( 'settings-sidebar', compact( 'img', 'is_connected' ) );
+ return $this->renderer->fetch( 'settings-sidebar', compact( 'img' ) );
}
public function render_seriously_simple_extensions() {
diff --git a/php/classes/entities/class-abstract-entity.php b/php/classes/entities/class-abstract-entity.php
index 02f528f8..6dbd76eb 100644
--- a/php/classes/entities/class-abstract-entity.php
+++ b/php/classes/entities/class-abstract-entity.php
@@ -26,7 +26,7 @@ abstract class Abstract_Entity {
*
* @param array $properties Array of message properties.
*/
- public function __construct( $properties ) {
+ public function __construct( $properties = array() ) {
foreach ( get_object_vars( $this ) as $k => $v ) {
if ( is_array( $properties ) ) {
$this->fill_with_array( $properties, $k );
diff --git a/php/classes/entities/class-castos-response-episode.php b/php/classes/entities/class-castos-response-episode.php
new file mode 100644
index 00000000..c41bacca
--- /dev/null
+++ b/php/classes/entities/class-castos-response-episode.php
@@ -0,0 +1,23 @@
+body && isset( $this->body['episode']['id'] ) ){
+ $this->castos_episode_id = $this->body['episode']['id'];
+ }
+ }
+}
diff --git a/php/classes/entities/class-castos-response.php b/php/classes/entities/class-castos-response.php
new file mode 100644
index 00000000..938e5a51
--- /dev/null
+++ b/php/classes/entities/class-castos-response.php
@@ -0,0 +1,53 @@
+code = wp_remote_retrieve_response_code( $raw_response );
+ $this->body = json_decode( wp_remote_retrieve_body( $raw_response ), true );
+ $this->message = isset( $this->body['message'] ) ? $this->translate( $this->body['message'] ) : '';
+ $this->success = 200 === $this->code ? true : $this->success;
+ $this->status = 200 === $this->code ? 'success' : $this->status;
+ }
+
+ public function translate( $text ) {
+ try {
+ $translations = array (
+ wp_hash( 'Authentication failed! Invalid or missing Access Token!' ) => __( 'Authentication failed! Invalid or missing Access Token!' ),
+ wp_hash( 'Seriously Simple Podcasting has successfully connected to your Castos account.' ) => __( 'Seriously Simple Podcasting has successfully connected to your Castos account.' ),
+ );
+ $msg_key = wp_hash( $text );
+ if ( ! array_key_exists( $msg_key, $translations ) ) {
+ throw new \Exception( 'Text is not translatable' );
+ }
+
+ return $translations[ $msg_key ];
+
+ } catch ( \Exception $e ) {
+ return $text;
+ }
+ }
+}
diff --git a/php/classes/handlers/class-admin-notifications-handler.php b/php/classes/handlers/class-admin-notifications-handler.php
index cfc8de79..c7b85444 100644
--- a/php/classes/handlers/class-admin-notifications-handler.php
+++ b/php/classes/handlers/class-admin-notifications-handler.php
@@ -45,21 +45,13 @@ class Admin_Notifications_Handler implements Service {
const ERROR = 'error';
const SUCCESS = 'success';
- /**
- * @var Castos_Handler $castos_handler
- * */
- protected $castos_handler;
/**
* Admin_Notifications_Handler constructor.
- *
- * @param Castos_Handler $castos_handler
- */
- public function __construct( $castos_handler ) {
+ **/
+ public function __construct() {
$this->init_useful_variables();
- $this->castos_handler = $castos_handler;
-
return $this;
}
diff --git a/php/classes/handlers/class-ajax-handler.php b/php/classes/handlers/class-ajax-handler.php
index 310af068..49699d52 100644
--- a/php/classes/handlers/class-ajax-handler.php
+++ b/php/classes/handlers/class-ajax-handler.php
@@ -14,13 +14,20 @@ class Ajax_Handler {
* */
protected $castos_handler;
+ /**
+ * @var Admin_Notifications_Handler $admin_notices_handler
+ * */
+ protected $admin_notices_handler;
+
/**
* Ajax_Handler constructor.
*
* @param Castos_Handler $castos_handler
+ * @param Admin_Notifications_Handler $admin_notices_handler
*/
- public function __construct( $castos_handler ) {
+ public function __construct( $castos_handler, $admin_notices_handler ) {
$this->castos_handler = $castos_handler;
+ $this->admin_notices_handler = $admin_notices_handler;
$this->bootstrap();
}
@@ -32,8 +39,9 @@ public function bootstrap() {
// Add ajax action for plugin rating
add_action( 'wp_ajax_ssp_rated', array( $this, 'rated' ) );
- // Add ajax action for plugin rating.
- add_action( 'wp_ajax_validate_castos_credentials', array( $this, 'validate_podmotor_api_credentials' ) );
+ add_action( 'wp_ajax_connect_castos', array( $this, 'connect_castos' ) );
+
+ add_action( 'wp_ajax_disconnect_castos', array( $this, 'disconnect_castos' ) );
// Add ajax action for customising episode embed code
add_action( 'wp_ajax_update_episode_embed_code', array( $this, 'update_episode_embed_code' ) );
@@ -168,30 +176,50 @@ protected function get_podcast_name( $podcast_id ) {
return __( 'Error', 'seriously-simple-podcasting' );
}
+ public function disconnect_castos() {
+ $this->castos_handler->remove_api_credentials();
+ $this->admin_notices_handler->add_flash_notice(
+ __( 'Castos account successfully disconnected.', 'seriously-simple-podcasting' )
+ );
+ wp_send_json_success();
+ }
+
/**
* Validate the Seriously Simple Hosting api credentials
*/
- public function validate_podmotor_api_credentials() {
+ public function connect_castos() {
try {
$this->nonce_check('ss_podcasting_castos-hosting');
$this->user_capability_check();
- if ( ! isset( $_GET['api_token'] ) || ! isset( $_GET['email'] ) ) {
+ if ( ! isset( $_GET['api_token'] ) ) {
throw new \Exception( __('Castos arguments not set', 'seriously-simple-podcasting') );
}
$account_api_token = sanitize_text_field( $_GET['api_token'] );
- $account_email = sanitize_text_field( $_GET['email'] );
- $response = $this->castos_handler->validate_api_credentials( $account_api_token, $account_email );
- wp_send_json( $response );
+ $response = $this->castos_handler->connect( $account_api_token );
+ if ( ! $response->success ) {
+ throw new \Exception( $response->message );
+ }
+
+ $this->castos_handler->set_token( $account_api_token );
+
+ $this->admin_notices_handler->add_flash_notice( $response->message, Admin_Notifications_Handler::SUCCESS );
+
+ wp_send_json( [
+ 'status' => $response->status,
+ 'message' => $response->message,
+ ] );
} catch ( \Exception $e ) {
+ usleep( 500000 ); // Add a 0.5s delay to ensure smoother transitions on the frontend.
+ $this->castos_handler->remove_api_credentials();
$this->send_json_error( $e->getMessage() );
}
}
/**
- * Update the epiaode embed code via ajax
+ * Update the episode embed code via ajax
* @return void
*/
public function update_episode_embed_code() {
diff --git a/php/classes/handlers/class-castos-handler.php b/php/classes/handlers/class-castos-handler.php
index 1bf41868..f2698bbd 100644
--- a/php/classes/handlers/class-castos-handler.php
+++ b/php/classes/handlers/class-castos-handler.php
@@ -6,6 +6,8 @@
use Exception;
use SeriouslySimplePodcasting\Entities\API_File_Data;
use SeriouslySimplePodcasting\Entities\API_Podcast;
+use SeriouslySimplePodcasting\Entities\Castos_Response;
+use SeriouslySimplePodcasting\Entities\Castos_Response_Episode;
use SeriouslySimplePodcasting\Entities\Sync_Status;
use SeriouslySimplePodcasting\Entities\Episode_File_Data;
use SeriouslySimplePodcasting\Helpers\Log_Helper;
@@ -135,10 +137,55 @@ protected function update_response( $key, $value ) {
}
public function remove_api_credentials() {
- delete_option( self::API_EMAIL_OPTION );
+ delete_option( self::API_EMAIL_OPTION ); // Not used since 3.5.0
delete_option( self::API_TOKEN_OPTION );
}
+ /**
+ * Connect to Castos API and validate API credentials
+ *
+ * @param string $account_api_token
+ *
+ * @return Castos_Response
+ */
+ public function connect( $account_api_token ) {
+
+ $response = new Castos_Response();
+
+ if ( empty( $account_api_token ) ) {
+ $response->message = 'Invalid API Token.';
+
+ return $response;
+ }
+
+ $api_url = SSP_CASTOS_APP_URL . 'api/v2/ssp/connect';
+
+ $this->logger->log( 'Connecting to Castos : API URL', $api_url );
+
+ $args = array(
+ 'timeout' => 45,
+ 'body' => array(
+ 'website' => get_home_url(),
+ ),
+ 'headers' => array(
+ 'Authorization' => 'Bearer ' . $account_api_token,
+ ),
+ );
+
+ $app_response = wp_remote_post( $api_url, $args );
+
+ $this->logger->log( 'Connect to Castos: App Response', $app_response );
+
+ $response->update( $app_response );
+
+ return $response;
+ }
+
+ public function set_token( $token ) {
+ update_option( self::API_TOKEN_OPTION, $token );
+ }
+
+
/**
* Connect to Castos API and validate API credentials
*
@@ -260,115 +307,89 @@ public function trigger_podcast_import() {
*
* @param \WP_Post $post
*
- * @return array
+ * @return Castos_Response_Episode
*/
public function upload_episode_to_castos( $post ) {
- $this->setup_default_response();
-
- if ( empty( $post ) || empty( $post->ID ) || empty( $post->post_title ) ) {
- $this->update_response( 'message', 'Invalid Podcast data' );
- $this->logger->log( 'Invalid Podcast data when uploading podcast data' );
-
- return $this->response;
- }
-
- /**
- * Don't trigger this unless we have a valid PodcastMotor file id
- */
- $podmotor_file_id = get_post_meta( $post->ID, 'podmotor_file_id', true );
- if ( empty( $podmotor_file_id ) ) {
- $this->update_response( 'message', 'Invalid Podcast file data' );
- $this->logger->log( 'Invalid Podcast file data when uploading podcast data' );
+ $response = new Castos_Response_Episode();
- return $this->response;
- }
-
- $api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/create';
- $podmotor_episode_id = get_post_meta( $post->ID, 'podmotor_episode_id', true );
- if ( $podmotor_episode_id ) {
- $api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/update';
- }
-
- $series_id = ssp_get_episode_series_id( $post->ID );
-
- $post_body = array(
- 'token' => $this->api_token(),
- 'post_id' => $post->ID,
- 'post_title' => $post->post_title,
- 'post_content' => $this->get_episode_content( $post->ID, $series_id ),
- 'keywords' => get_keywords_for_episode( $post->ID ),
- 'series_number' => get_post_meta( $post->ID, 'itunes_season_number', true ),
- 'episode_number' => get_post_meta( $post->ID, 'itunes_episode_number', true ),
- 'episode_type' => get_post_meta( $post->ID, 'itunes_episode_type', true ),
- 'post_date' => $post->post_date,
- 'post_date_gmt' => $post->post_date_gmt,
- 'file_id' => $podmotor_file_id,
- 'series_id' => $series_id,
- );
-
- if ( ! empty( $podmotor_episode_id ) ) {
- $post_body['id'] = $podmotor_episode_id;
- }
+ try {
+ if ( empty( $post ) || empty( $post->ID ) || empty( $post->post_title ) ) {
+ throw new \Exception( __( 'Invalid episode data when uploading to Castos', 'seriously-simple-podcasting' ) );
+ }
- $this->logger->log( 'API URL', $api_url );
+ $api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/create';
- $episode_image_url = $this->get_episode_image_url( $post );
- if ( ! empty( $episode_image_url ) ) {
- // Todo: change 'featured_image_url' to 'cover_image_url' after API update
- $post_body['featured_image_url'] = $episode_image_url;
- }
+ /**
+ * Don't trigger this unless we have a valid file id
+ */
+ $podmotor_file_id = get_post_meta( $post->ID, 'podmotor_file_id', true );
+ if ( empty( $podmotor_file_id ) ) {
+ throw new \Exception(__( 'Invalid file data when uploading the episode to Castos', 'seriously-simple-podcasting') );
+ }
- $this->logger->log( 'Parameter post_body Contents', $post_body );
+ /**
+ * Don't trigger this unless we have a valid file id
+ */
+ $podmotor_episode_id = get_post_meta( $post->ID, 'podmotor_episode_id', true );
+ if ( $podmotor_episode_id ) {
+ $api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/update';
+ }
- /**
- * Convert to JSON so that we send it with the Content-Type of application/json
- * On some WordPress installs the Content-Type defaults to text/html
- * Just setting the Content-Type to application/json was not enough, so the post_body has to be converted
- * to JSON as well.
- */
- $post_body = wp_json_encode( $post_body );
+ $series_id = ssp_get_episode_series_id( $post->ID );
+
+ $post_body = array(
+ 'token' => $this->api_token(),
+ 'post_id' => $post->ID,
+ 'post_title' => $post->post_title,
+ 'post_content' => $this->get_episode_content( $post->ID, $series_id ),
+ 'keywords' => get_keywords_for_episode( $post->ID ),
+ 'series_number' => get_post_meta( $post->ID, 'itunes_season_number', true ),
+ 'episode_number' => get_post_meta( $post->ID, 'itunes_episode_number', true ),
+ 'episode_type' => get_post_meta( $post->ID, 'itunes_episode_type', true ),
+ 'post_date' => $post->post_date,
+ 'post_date_gmt' => $post->post_date_gmt,
+ 'file_id' => $podmotor_file_id,
+ 'series_id' => $series_id,
+ );
- $options = array(
- 'body' => $post_body,
- 'headers' => array(
- 'Content-Type' => 'application/json',
- ),
- 'timeout' => 60,
- );
+ if ( ! empty( $podmotor_episode_id ) ) {
+ $post_body['id'] = $podmotor_episode_id;
+ }
- $app_response = wp_remote_post( $api_url, $options );
+ $this->logger->log( 'API URL', $api_url );
- if ( is_wp_error( $app_response ) ) {
- $this->logger->log( 'An unknown error occurred sending podcast data to castos: ' . $app_response->get_error_message() );
- $this->update_response( 'message', 'An unknown error occurred: ' . $app_response->get_error_message() );
+ $episode_image_url = $this->get_episode_image_url( $post );
+ if ( ! empty( $episode_image_url ) ) {
+ $post_body['featured_image_url'] = $episode_image_url;
+ }
- return $this->response;
- }
+ $this->logger->log( 'Post body', $post_body );
- if ( isset( $app_response['response']['code'] ) ) {
- $this->update_response( 'code', intval( $app_response['response']['code'] ) );
- }
+ $options = array(
+ 'body' => wp_json_encode( $post_body ),
+ 'headers' => array(
+ 'Content-Type' => 'application/json',
+ ),
+ 'timeout' => 60,
+ );
- $this->logger->log( 'Upload Podcast app_response', $app_response );
+ $app_response = wp_remote_post( $api_url, $options );
- $response_object = json_decode( wp_remote_retrieve_body( $app_response ) );
+ $this->logger->log( 'Upload episode app_response', $app_response );
- $this->logger->log( 'Upload Podcast Response', $response_object );
+ if ( is_wp_error( $app_response ) ) {
+ throw new \Exception( $app_response->get_error_message() );
+ }
- if ( ! isset( $response_object->status ) || ! $response_object->status || empty( $response_object->success ) ) {
- $this->logger->log( 'An error occurred uploading the episode data to Castos', $response_object );
- $this->update_response( 'message', 'An error occurred uploading the episode data to Castos' );
+ $response->update( $app_response );
- return $this->response;
+ return $response;
+ } catch(\Exception $e) {
+ $this->logger->log( __METHOD__ . ': ' . $e->getMessage() . '; $post:' . serialize( $post ) );
+ $response->message = $e->getMessage();
+ return $response;
}
-
- $this->logger->log( 'Podcast episode successfully uploaded to Castos with episode id ' . $response_object->episode->id );
- $this->update_response( 'status', 'success' );
- $this->update_response( 'message', 'Podcast episode successfully uploaded to Castos' );
- $this->update_response( 'episode_id', $response_object->episode->id );
-
- return $this->response;
}
diff --git a/php/classes/integrations/blocks/class-castos-blocks.php b/php/classes/integrations/blocks/class-castos-blocks.php
index 0638b332..eb87f355 100644
--- a/php/classes/integrations/blocks/class-castos-blocks.php
+++ b/php/classes/integrations/blocks/class-castos-blocks.php
@@ -273,7 +273,7 @@ public function register_castos_blocks() {
),
),
'render_callback' => function ( $args ) {
- return ssp_frontend_controller()->players_controller->render_html_player( $args['episodeId'] );
+ return ssp_frontend_controller()->players_controller->render_html_player( $args['episodeId'], true, 'block', $args );
}
) );
@@ -449,6 +449,10 @@ protected function register_playlist_player() {
$args['order'] = $attributes['order'];
}
+ if ( ! empty( $attributes['className'] ) ) {
+ $args['class'] = $attributes['className'];
+ }
+
$podcast_playlist = new Podcast_Playlist();
return $podcast_playlist->shortcode( $args );
diff --git a/php/classes/repositories/class-episode-repository.php b/php/classes/repositories/class-episode-repository.php
index 13683add..9848d50e 100644
--- a/php/classes/repositories/class-episode-repository.php
+++ b/php/classes/repositories/class-episode-repository.php
@@ -26,6 +26,7 @@ class Episode_Repository implements Service {
use Useful_Variables;
const META_SYNC_STATUS = 'sync_status';
+
const META_SYNC_ERROR = 'ssp_sync_episode_error';
/**
@@ -477,6 +478,7 @@ public function update_episode_sync_status( $episode_id, $status ) {
return update_post_meta( $episode_id, self::META_SYNC_STATUS, $status );
}
+
/**
* @param int $episode_id
*
@@ -630,6 +632,7 @@ public function get_player_data( $id, $current_post = null, $skip_empty_audio =
'excerpt' => ssp_get_episode_excerpt( $episode->ID ),
'player_id' => wp_rand(),
'add_empty_warning' => false,
+ 'class' => '',
);
return apply_filters( 'ssp_html_player_data', $template_data );
diff --git a/php/classes/rest/class-rest-api-controller.php b/php/classes/rest/class-rest-api-controller.php
index 4c15bec2..1fd93e0c 100644
--- a/php/classes/rest/class-rest-api-controller.php
+++ b/php/classes/rest/class-rest-api-controller.php
@@ -2,6 +2,7 @@
namespace SeriouslySimplePodcasting\Rest;
+use SeriouslySimplePodcasting\Entities\Sync_Status;
use SeriouslySimplePodcasting\Handlers\Options_Handler;
use SeriouslySimplePodcasting\Handlers\Series_Handler;
use SeriouslySimplePodcasting\Repositories\Episode_Repository;
@@ -520,13 +521,22 @@ public function get_rest_audio_player( $object, $field_name, $request ) {
*/
public function get_episode_player_data( $object, $field_name, $request ) {
if ( ! empty( $object['id'] ) ) {
- $options_handler = new Options_Handler();
- $episode_id = $object['id'];
- $player_data = array(
+ $options_handler = new Options_Handler();
+ $episode_id = $object['id'];
+ $sync_status = ssp_episode_sync_status( $episode_id );
+
+ $player_data = array(
'playerMode' => get_option( 'ss_podcasting_player_mode', 'dark' ),
'subscribeUrls' => $options_handler->get_subscribe_urls( $episode_id, 'rest_api' ),
'rssFeedUrl' => $this->episode_repository->get_feed_url( $episode_id ),
'embedCode' => preg_replace( '/(\r?\n){2,}/', '\n\n', get_post_embed_html( 500, 350, $episode_id ) ),
+ 'syncStatus' => array(
+ 'isSynced' => Sync_Status::SYNC_STATUS_SYNCED === $sync_status->status,
+ 'status' => $sync_status->status,
+ 'error' => $sync_status->error,
+ 'message' => $sync_status->message,
+ 'title' => $sync_status->title,
+ ),
);
return $player_data;
diff --git a/php/classes/shortcodes/class-podcast-playlist.php b/php/classes/shortcodes/class-podcast-playlist.php
index 5d94b1fd..e51d75cc 100644
--- a/php/classes/shortcodes/class-podcast-playlist.php
+++ b/php/classes/shortcodes/class-podcast-playlist.php
@@ -49,7 +49,7 @@ public function shortcode( $params ) {
$this->prepare_properties();
$atts = $this->prepare_atts( $params );
- $episodes = $this->ss_podcasting->players_controller->get_playlist_episodes( $atts );
+ $episodes = $this->ss_podcasting->episode_repository->get_episodes( $atts );
if ( empty ( $episodes ) ) {
return '';
@@ -111,13 +111,14 @@ protected function prepare_atts( $params ) {
'orderby' => 'menu_order ID',
'include' => '',
'exclude' => '',
- 'style' => 'light',
+ 'style' => get_option( 'ss_podcasting_player_mode', 'light' ),
'player_style' => 'standard',
'tracklist' => true,
'tracknumbers' => true,
'images' => true,
'limit' => 10,
'page' => 1,
+ 'class' => '',
),
$params,
'podcast_playlist'
diff --git a/php/config/settings/hosting.php b/php/config/settings/hosting.php
index 3d77049d..1f054c5a 100644
--- a/php/config/settings/hosting.php
+++ b/php/config/settings/hosting.php
@@ -4,37 +4,26 @@
* */
return array(
'title' => __( 'Hosting', 'seriously-simple-podcasting' ),
+ 'button_text' => __( 'Connect', 'seriously-simple-podcasting' ),
+ 'button_class' => 'castos-connect disabled hidden',
'sections' => array(
'credentials' => array(
+ 'condition_callback' => function () {
+ return ! ssp_is_connected_to_castos();
+ },
'title' => __( 'Podcast Hosting', 'seriously-simple-podcasting' ),
'description' => sprintf( __( 'Connect your WordPress site to your %s account.', 'seriously-simple-podcasting' ), 'Castos' ),
'fields' => array(
- array(
- 'id' => 'podmotor_account_email',
- 'type' => 'text',
- 'label' => __( 'Your email', 'seriously-simple-podcasting' ),
- 'description' => __( 'The email address you used to register your Castos account.', 'seriously-simple-podcasting' ),
- 'default' => '',
- 'placeholder' => __( 'email@domain.com', 'seriously-simple-podcasting' ),
- 'callback' => 'esc_email',
- 'class' => 'regular-text',
- ),
array(
'id' => 'podmotor_account_api_token',
'type' => 'text',
- 'label' => __( 'Castos API key', 'seriously-simple-podcasting' ),
- 'description' => __( 'Your Castos API key. Available from your Castos account dashboard.', 'seriously-simple-podcasting' ),
+ 'label' => __( 'Castos API token', 'seriously-simple-podcasting' ),
+ 'description' => __( 'Your Castos API token. Available from your Castos account dashboard.', 'seriously-simple-podcasting' ),
'default' => '',
'placeholder' => __( 'Enter your api key', 'seriously-simple-podcasting' ),
'callback' => 'sanitize_text_field',
'class' => 'regular-text',
),
- array(
- 'id' => 'validate_api_credentials',
- 'type' => 'button',
- 'label' => esc_attr( __( 'Verify Credentials', 'seriously-simple-podcasting' ) ),
- 'class' => 'button-primary',
- ),
),
),
'sync' => array(
@@ -67,13 +56,13 @@
'no_store' => true,
'fields' => array(
array(
- 'id' => 'podmotor_disconnect',
- 'label' => __( 'Disconnect Castos', 'seriously-simple-podcasting' ),
+ 'id' => 'disconnect_castos',
+ 'label' => __( 'Disconnect', 'seriously-simple-podcasting' ),
'description' => __( 'Select this if you wish to disconnect your Castos account.', 'seriously-simple-podcasting' ),
- 'type' => 'checkbox',
+ 'type' => 'button',
'default' => '',
'callback' => 'wp_strip_all_tags',
- 'class' => 'disconnect-castos',
+ 'class' => 'disconnect-castos button',
),
),
),
diff --git a/php/includes/ssp-functions.php b/php/includes/ssp-functions.php
index f8a50e1b..62636cfa 100644
--- a/php/includes/ssp-functions.php
+++ b/php/includes/ssp-functions.php
@@ -7,8 +7,10 @@
use SeriouslySimplePodcasting\Handlers\Castos_Handler;
use SeriouslySimplePodcasting\Handlers\CPT_Podcast_Handler;
use SeriouslySimplePodcasting\Handlers\Images_Handler;
+use SeriouslySimplePodcasting\Helpers\Log_Helper;
use SeriouslySimplePodcasting\Interfaces\Service;
use SeriouslySimplePodcasting\Renderers\Renderer;
+use SeriouslySimplePodcasting\Repositories\Episode_Repository;
use SeriouslySimplePodcasting\Repositories\Series_Repository;
// Exit if accessed directly.
@@ -668,33 +670,39 @@ function ssp_get_feed_category_output( $level, $series_id ) {
* @since 1.0.0
*/
function ssp_readfile_chunked( $file, $retbytes = true ) {
+ try {
+ $chunksize = 1 * ( 1024 * 1024 );
+ $cnt = 0;
- $chunksize = 1 * ( 1024 * 1024 );
- $cnt = 0;
+ $handle = fopen( $file, 'r' );
+ if ( false === $handle ) {
+ return false;
+ }
- $handle = fopen( $file, 'r' );
- if ( false === $handle ) {
- return false;
- }
+ while ( ! feof( $handle ) ) {
+ $buffer = fread( $handle, $chunksize );
+ echo $buffer;
+ ob_flush();
+ flush();
- while ( ! feof( $handle ) ) {
- $buffer = fread( $handle, $chunksize );
- echo $buffer;
- ob_flush();
- flush();
+ if ( $retbytes ) {
+ $cnt += strlen( $buffer );
+ }
+ }
- if ( $retbytes ) {
- $cnt += strlen( $buffer );
+ $status = fclose( $handle );
+
+ if ( $retbytes && $status ) {
+ return $cnt;
}
- }
- $status = fclose( $handle );
+ return $status;
+ } catch ( \Throwable $e ) {
+ $logger = new Log_Helper();
+ $logger->log( 'Error in ' . __FUNCTION__ . ': ' . $e->getMessage(), 'File: ' . $file );
- if ( $retbytes && $status ) {
- return $cnt;
+ return false;
}
-
- return $status;
}
}
@@ -742,9 +750,8 @@ function ssp_is_connected_to_castos() {
if ( $cache = wp_cache_get( $cache_key ) ) {
return $cache;
}
- $podmotor_email = get_option( 'ss_podcasting_podmotor_account_email', '' );
$podmotor_api_token = get_option( 'ss_podcasting_podmotor_account_api_token', '' );
- if ( ! empty( $podmotor_email ) && ! empty( $podmotor_api_token ) ) {
+ if ( ! empty( $podmotor_api_token ) ) {
$is_connected = true;
}
@@ -1308,7 +1315,8 @@ function ssp_get_the_feed_item_content( $post = null ) {
$content = preg_replace( '/
' . "\n"; $html .= '' . "\n"; - $html .= '' . "\n"; + $html .= '' . "\n"; $html .= '
' . "\n"; } @@ -953,14 +964,13 @@ public function maybe_disconnect_from_castos( $new_value ) { * @return string */ public function render_seriously_simple_sidebar() { + if(ssp_is_connected_to_castos()){ + return ''; + } $image_dir = $this->assets_url . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR; - $link = 'https://castos.com/1ksubs?utm_source=WordPress&utm_medium=Settings&utm_campaign=Banner'; - $is_connected = ssp_is_connected_to_castos(); - $img = $is_connected ? - '' :
- '';
+ $img = '';
- return $this->renderer->fetch( 'settings-sidebar', compact( 'img', 'is_connected' ) );
+ return $this->renderer->fetch( 'settings-sidebar', compact( 'img' ) );
}
public function render_seriously_simple_extensions() {
diff --git a/php/classes/entities/class-abstract-entity.php b/php/classes/entities/class-abstract-entity.php
index 02f528f8..6dbd76eb 100644
--- a/php/classes/entities/class-abstract-entity.php
+++ b/php/classes/entities/class-abstract-entity.php
@@ -26,7 +26,7 @@ abstract class Abstract_Entity {
*
* @param array $properties Array of message properties.
*/
- public function __construct( $properties ) {
+ public function __construct( $properties = array() ) {
foreach ( get_object_vars( $this ) as $k => $v ) {
if ( is_array( $properties ) ) {
$this->fill_with_array( $properties, $k );
diff --git a/php/classes/entities/class-castos-response-episode.php b/php/classes/entities/class-castos-response-episode.php
new file mode 100644
index 00000000..c41bacca
--- /dev/null
+++ b/php/classes/entities/class-castos-response-episode.php
@@ -0,0 +1,23 @@
+body && isset( $this->body['episode']['id'] ) ){
+ $this->castos_episode_id = $this->body['episode']['id'];
+ }
+ }
+}
diff --git a/php/classes/entities/class-castos-response.php b/php/classes/entities/class-castos-response.php
new file mode 100644
index 00000000..938e5a51
--- /dev/null
+++ b/php/classes/entities/class-castos-response.php
@@ -0,0 +1,53 @@
+code = wp_remote_retrieve_response_code( $raw_response );
+ $this->body = json_decode( wp_remote_retrieve_body( $raw_response ), true );
+ $this->message = isset( $this->body['message'] ) ? $this->translate( $this->body['message'] ) : '';
+ $this->success = 200 === $this->code ? true : $this->success;
+ $this->status = 200 === $this->code ? 'success' : $this->status;
+ }
+
+ public function translate( $text ) {
+ try {
+ $translations = array (
+ wp_hash( 'Authentication failed! Invalid or missing Access Token!' ) => __( 'Authentication failed! Invalid or missing Access Token!' ),
+ wp_hash( 'Seriously Simple Podcasting has successfully connected to your Castos account.' ) => __( 'Seriously Simple Podcasting has successfully connected to your Castos account.' ),
+ );
+ $msg_key = wp_hash( $text );
+ if ( ! array_key_exists( $msg_key, $translations ) ) {
+ throw new \Exception( 'Text is not translatable' );
+ }
+
+ return $translations[ $msg_key ];
+
+ } catch ( \Exception $e ) {
+ return $text;
+ }
+ }
+}
diff --git a/php/classes/handlers/class-admin-notifications-handler.php b/php/classes/handlers/class-admin-notifications-handler.php
index cfc8de79..c7b85444 100644
--- a/php/classes/handlers/class-admin-notifications-handler.php
+++ b/php/classes/handlers/class-admin-notifications-handler.php
@@ -45,21 +45,13 @@ class Admin_Notifications_Handler implements Service {
const ERROR = 'error';
const SUCCESS = 'success';
- /**
- * @var Castos_Handler $castos_handler
- * */
- protected $castos_handler;
/**
* Admin_Notifications_Handler constructor.
- *
- * @param Castos_Handler $castos_handler
- */
- public function __construct( $castos_handler ) {
+ **/
+ public function __construct() {
$this->init_useful_variables();
- $this->castos_handler = $castos_handler;
-
return $this;
}
diff --git a/php/classes/handlers/class-ajax-handler.php b/php/classes/handlers/class-ajax-handler.php
index 310af068..49699d52 100644
--- a/php/classes/handlers/class-ajax-handler.php
+++ b/php/classes/handlers/class-ajax-handler.php
@@ -14,13 +14,20 @@ class Ajax_Handler {
* */
protected $castos_handler;
+ /**
+ * @var Admin_Notifications_Handler $admin_notices_handler
+ * */
+ protected $admin_notices_handler;
+
/**
* Ajax_Handler constructor.
*
* @param Castos_Handler $castos_handler
+ * @param Admin_Notifications_Handler $admin_notices_handler
*/
- public function __construct( $castos_handler ) {
+ public function __construct( $castos_handler, $admin_notices_handler ) {
$this->castos_handler = $castos_handler;
+ $this->admin_notices_handler = $admin_notices_handler;
$this->bootstrap();
}
@@ -32,8 +39,9 @@ public function bootstrap() {
// Add ajax action for plugin rating
add_action( 'wp_ajax_ssp_rated', array( $this, 'rated' ) );
- // Add ajax action for plugin rating.
- add_action( 'wp_ajax_validate_castos_credentials', array( $this, 'validate_podmotor_api_credentials' ) );
+ add_action( 'wp_ajax_connect_castos', array( $this, 'connect_castos' ) );
+
+ add_action( 'wp_ajax_disconnect_castos', array( $this, 'disconnect_castos' ) );
// Add ajax action for customising episode embed code
add_action( 'wp_ajax_update_episode_embed_code', array( $this, 'update_episode_embed_code' ) );
@@ -168,30 +176,50 @@ protected function get_podcast_name( $podcast_id ) {
return __( 'Error', 'seriously-simple-podcasting' );
}
+ public function disconnect_castos() {
+ $this->castos_handler->remove_api_credentials();
+ $this->admin_notices_handler->add_flash_notice(
+ __( 'Castos account successfully disconnected.', 'seriously-simple-podcasting' )
+ );
+ wp_send_json_success();
+ }
+
/**
* Validate the Seriously Simple Hosting api credentials
*/
- public function validate_podmotor_api_credentials() {
+ public function connect_castos() {
try {
$this->nonce_check('ss_podcasting_castos-hosting');
$this->user_capability_check();
- if ( ! isset( $_GET['api_token'] ) || ! isset( $_GET['email'] ) ) {
+ if ( ! isset( $_GET['api_token'] ) ) {
throw new \Exception( __('Castos arguments not set', 'seriously-simple-podcasting') );
}
$account_api_token = sanitize_text_field( $_GET['api_token'] );
- $account_email = sanitize_text_field( $_GET['email'] );
- $response = $this->castos_handler->validate_api_credentials( $account_api_token, $account_email );
- wp_send_json( $response );
+ $response = $this->castos_handler->connect( $account_api_token );
+ if ( ! $response->success ) {
+ throw new \Exception( $response->message );
+ }
+
+ $this->castos_handler->set_token( $account_api_token );
+
+ $this->admin_notices_handler->add_flash_notice( $response->message, Admin_Notifications_Handler::SUCCESS );
+
+ wp_send_json( [
+ 'status' => $response->status,
+ 'message' => $response->message,
+ ] );
} catch ( \Exception $e ) {
+ usleep( 500000 ); // Add a 0.5s delay to ensure smoother transitions on the frontend.
+ $this->castos_handler->remove_api_credentials();
$this->send_json_error( $e->getMessage() );
}
}
/**
- * Update the epiaode embed code via ajax
+ * Update the episode embed code via ajax
* @return void
*/
public function update_episode_embed_code() {
diff --git a/php/classes/handlers/class-castos-handler.php b/php/classes/handlers/class-castos-handler.php
index 1bf41868..f2698bbd 100644
--- a/php/classes/handlers/class-castos-handler.php
+++ b/php/classes/handlers/class-castos-handler.php
@@ -6,6 +6,8 @@
use Exception;
use SeriouslySimplePodcasting\Entities\API_File_Data;
use SeriouslySimplePodcasting\Entities\API_Podcast;
+use SeriouslySimplePodcasting\Entities\Castos_Response;
+use SeriouslySimplePodcasting\Entities\Castos_Response_Episode;
use SeriouslySimplePodcasting\Entities\Sync_Status;
use SeriouslySimplePodcasting\Entities\Episode_File_Data;
use SeriouslySimplePodcasting\Helpers\Log_Helper;
@@ -135,10 +137,55 @@ protected function update_response( $key, $value ) {
}
public function remove_api_credentials() {
- delete_option( self::API_EMAIL_OPTION );
+ delete_option( self::API_EMAIL_OPTION ); // Not used since 3.5.0
delete_option( self::API_TOKEN_OPTION );
}
+ /**
+ * Connect to Castos API and validate API credentials
+ *
+ * @param string $account_api_token
+ *
+ * @return Castos_Response
+ */
+ public function connect( $account_api_token ) {
+
+ $response = new Castos_Response();
+
+ if ( empty( $account_api_token ) ) {
+ $response->message = 'Invalid API Token.';
+
+ return $response;
+ }
+
+ $api_url = SSP_CASTOS_APP_URL . 'api/v2/ssp/connect';
+
+ $this->logger->log( 'Connecting to Castos : API URL', $api_url );
+
+ $args = array(
+ 'timeout' => 45,
+ 'body' => array(
+ 'website' => get_home_url(),
+ ),
+ 'headers' => array(
+ 'Authorization' => 'Bearer ' . $account_api_token,
+ ),
+ );
+
+ $app_response = wp_remote_post( $api_url, $args );
+
+ $this->logger->log( 'Connect to Castos: App Response', $app_response );
+
+ $response->update( $app_response );
+
+ return $response;
+ }
+
+ public function set_token( $token ) {
+ update_option( self::API_TOKEN_OPTION, $token );
+ }
+
+
/**
* Connect to Castos API and validate API credentials
*
@@ -260,115 +307,89 @@ public function trigger_podcast_import() {
*
* @param \WP_Post $post
*
- * @return array
+ * @return Castos_Response_Episode
*/
public function upload_episode_to_castos( $post ) {
- $this->setup_default_response();
-
- if ( empty( $post ) || empty( $post->ID ) || empty( $post->post_title ) ) {
- $this->update_response( 'message', 'Invalid Podcast data' );
- $this->logger->log( 'Invalid Podcast data when uploading podcast data' );
-
- return $this->response;
- }
-
- /**
- * Don't trigger this unless we have a valid PodcastMotor file id
- */
- $podmotor_file_id = get_post_meta( $post->ID, 'podmotor_file_id', true );
- if ( empty( $podmotor_file_id ) ) {
- $this->update_response( 'message', 'Invalid Podcast file data' );
- $this->logger->log( 'Invalid Podcast file data when uploading podcast data' );
+ $response = new Castos_Response_Episode();
- return $this->response;
- }
-
- $api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/create';
- $podmotor_episode_id = get_post_meta( $post->ID, 'podmotor_episode_id', true );
- if ( $podmotor_episode_id ) {
- $api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/update';
- }
-
- $series_id = ssp_get_episode_series_id( $post->ID );
-
- $post_body = array(
- 'token' => $this->api_token(),
- 'post_id' => $post->ID,
- 'post_title' => $post->post_title,
- 'post_content' => $this->get_episode_content( $post->ID, $series_id ),
- 'keywords' => get_keywords_for_episode( $post->ID ),
- 'series_number' => get_post_meta( $post->ID, 'itunes_season_number', true ),
- 'episode_number' => get_post_meta( $post->ID, 'itunes_episode_number', true ),
- 'episode_type' => get_post_meta( $post->ID, 'itunes_episode_type', true ),
- 'post_date' => $post->post_date,
- 'post_date_gmt' => $post->post_date_gmt,
- 'file_id' => $podmotor_file_id,
- 'series_id' => $series_id,
- );
-
- if ( ! empty( $podmotor_episode_id ) ) {
- $post_body['id'] = $podmotor_episode_id;
- }
+ try {
+ if ( empty( $post ) || empty( $post->ID ) || empty( $post->post_title ) ) {
+ throw new \Exception( __( 'Invalid episode data when uploading to Castos', 'seriously-simple-podcasting' ) );
+ }
- $this->logger->log( 'API URL', $api_url );
+ $api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/create';
- $episode_image_url = $this->get_episode_image_url( $post );
- if ( ! empty( $episode_image_url ) ) {
- // Todo: change 'featured_image_url' to 'cover_image_url' after API update
- $post_body['featured_image_url'] = $episode_image_url;
- }
+ /**
+ * Don't trigger this unless we have a valid file id
+ */
+ $podmotor_file_id = get_post_meta( $post->ID, 'podmotor_file_id', true );
+ if ( empty( $podmotor_file_id ) ) {
+ throw new \Exception(__( 'Invalid file data when uploading the episode to Castos', 'seriously-simple-podcasting') );
+ }
- $this->logger->log( 'Parameter post_body Contents', $post_body );
+ /**
+ * Don't trigger this unless we have a valid file id
+ */
+ $podmotor_episode_id = get_post_meta( $post->ID, 'podmotor_episode_id', true );
+ if ( $podmotor_episode_id ) {
+ $api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/update';
+ }
- /**
- * Convert to JSON so that we send it with the Content-Type of application/json
- * On some WordPress installs the Content-Type defaults to text/html
- * Just setting the Content-Type to application/json was not enough, so the post_body has to be converted
- * to JSON as well.
- */
- $post_body = wp_json_encode( $post_body );
+ $series_id = ssp_get_episode_series_id( $post->ID );
+
+ $post_body = array(
+ 'token' => $this->api_token(),
+ 'post_id' => $post->ID,
+ 'post_title' => $post->post_title,
+ 'post_content' => $this->get_episode_content( $post->ID, $series_id ),
+ 'keywords' => get_keywords_for_episode( $post->ID ),
+ 'series_number' => get_post_meta( $post->ID, 'itunes_season_number', true ),
+ 'episode_number' => get_post_meta( $post->ID, 'itunes_episode_number', true ),
+ 'episode_type' => get_post_meta( $post->ID, 'itunes_episode_type', true ),
+ 'post_date' => $post->post_date,
+ 'post_date_gmt' => $post->post_date_gmt,
+ 'file_id' => $podmotor_file_id,
+ 'series_id' => $series_id,
+ );
- $options = array(
- 'body' => $post_body,
- 'headers' => array(
- 'Content-Type' => 'application/json',
- ),
- 'timeout' => 60,
- );
+ if ( ! empty( $podmotor_episode_id ) ) {
+ $post_body['id'] = $podmotor_episode_id;
+ }
- $app_response = wp_remote_post( $api_url, $options );
+ $this->logger->log( 'API URL', $api_url );
- if ( is_wp_error( $app_response ) ) {
- $this->logger->log( 'An unknown error occurred sending podcast data to castos: ' . $app_response->get_error_message() );
- $this->update_response( 'message', 'An unknown error occurred: ' . $app_response->get_error_message() );
+ $episode_image_url = $this->get_episode_image_url( $post );
+ if ( ! empty( $episode_image_url ) ) {
+ $post_body['featured_image_url'] = $episode_image_url;
+ }
- return $this->response;
- }
+ $this->logger->log( 'Post body', $post_body );
- if ( isset( $app_response['response']['code'] ) ) {
- $this->update_response( 'code', intval( $app_response['response']['code'] ) );
- }
+ $options = array(
+ 'body' => wp_json_encode( $post_body ),
+ 'headers' => array(
+ 'Content-Type' => 'application/json',
+ ),
+ 'timeout' => 60,
+ );
- $this->logger->log( 'Upload Podcast app_response', $app_response );
+ $app_response = wp_remote_post( $api_url, $options );
- $response_object = json_decode( wp_remote_retrieve_body( $app_response ) );
+ $this->logger->log( 'Upload episode app_response', $app_response );
- $this->logger->log( 'Upload Podcast Response', $response_object );
+ if ( is_wp_error( $app_response ) ) {
+ throw new \Exception( $app_response->get_error_message() );
+ }
- if ( ! isset( $response_object->status ) || ! $response_object->status || empty( $response_object->success ) ) {
- $this->logger->log( 'An error occurred uploading the episode data to Castos', $response_object );
- $this->update_response( 'message', 'An error occurred uploading the episode data to Castos' );
+ $response->update( $app_response );
- return $this->response;
+ return $response;
+ } catch(\Exception $e) {
+ $this->logger->log( __METHOD__ . ': ' . $e->getMessage() . '; $post:' . serialize( $post ) );
+ $response->message = $e->getMessage();
+ return $response;
}
-
- $this->logger->log( 'Podcast episode successfully uploaded to Castos with episode id ' . $response_object->episode->id );
- $this->update_response( 'status', 'success' );
- $this->update_response( 'message', 'Podcast episode successfully uploaded to Castos' );
- $this->update_response( 'episode_id', $response_object->episode->id );
-
- return $this->response;
}
diff --git a/php/classes/integrations/blocks/class-castos-blocks.php b/php/classes/integrations/blocks/class-castos-blocks.php
index 0638b332..eb87f355 100644
--- a/php/classes/integrations/blocks/class-castos-blocks.php
+++ b/php/classes/integrations/blocks/class-castos-blocks.php
@@ -273,7 +273,7 @@ public function register_castos_blocks() {
),
),
'render_callback' => function ( $args ) {
- return ssp_frontend_controller()->players_controller->render_html_player( $args['episodeId'] );
+ return ssp_frontend_controller()->players_controller->render_html_player( $args['episodeId'], true, 'block', $args );
}
) );
@@ -449,6 +449,10 @@ protected function register_playlist_player() {
$args['order'] = $attributes['order'];
}
+ if ( ! empty( $attributes['className'] ) ) {
+ $args['class'] = $attributes['className'];
+ }
+
$podcast_playlist = new Podcast_Playlist();
return $podcast_playlist->shortcode( $args );
diff --git a/php/classes/repositories/class-episode-repository.php b/php/classes/repositories/class-episode-repository.php
index 13683add..9848d50e 100644
--- a/php/classes/repositories/class-episode-repository.php
+++ b/php/classes/repositories/class-episode-repository.php
@@ -26,6 +26,7 @@ class Episode_Repository implements Service {
use Useful_Variables;
const META_SYNC_STATUS = 'sync_status';
+
const META_SYNC_ERROR = 'ssp_sync_episode_error';
/**
@@ -477,6 +478,7 @@ public function update_episode_sync_status( $episode_id, $status ) {
return update_post_meta( $episode_id, self::META_SYNC_STATUS, $status );
}
+
/**
* @param int $episode_id
*
@@ -630,6 +632,7 @@ public function get_player_data( $id, $current_post = null, $skip_empty_audio =
'excerpt' => ssp_get_episode_excerpt( $episode->ID ),
'player_id' => wp_rand(),
'add_empty_warning' => false,
+ 'class' => '',
);
return apply_filters( 'ssp_html_player_data', $template_data );
diff --git a/php/classes/rest/class-rest-api-controller.php b/php/classes/rest/class-rest-api-controller.php
index 4c15bec2..1fd93e0c 100644
--- a/php/classes/rest/class-rest-api-controller.php
+++ b/php/classes/rest/class-rest-api-controller.php
@@ -2,6 +2,7 @@
namespace SeriouslySimplePodcasting\Rest;
+use SeriouslySimplePodcasting\Entities\Sync_Status;
use SeriouslySimplePodcasting\Handlers\Options_Handler;
use SeriouslySimplePodcasting\Handlers\Series_Handler;
use SeriouslySimplePodcasting\Repositories\Episode_Repository;
@@ -520,13 +521,22 @@ public function get_rest_audio_player( $object, $field_name, $request ) {
*/
public function get_episode_player_data( $object, $field_name, $request ) {
if ( ! empty( $object['id'] ) ) {
- $options_handler = new Options_Handler();
- $episode_id = $object['id'];
- $player_data = array(
+ $options_handler = new Options_Handler();
+ $episode_id = $object['id'];
+ $sync_status = ssp_episode_sync_status( $episode_id );
+
+ $player_data = array(
'playerMode' => get_option( 'ss_podcasting_player_mode', 'dark' ),
'subscribeUrls' => $options_handler->get_subscribe_urls( $episode_id, 'rest_api' ),
'rssFeedUrl' => $this->episode_repository->get_feed_url( $episode_id ),
'embedCode' => preg_replace( '/(\r?\n){2,}/', '\n\n', get_post_embed_html( 500, 350, $episode_id ) ),
+ 'syncStatus' => array(
+ 'isSynced' => Sync_Status::SYNC_STATUS_SYNCED === $sync_status->status,
+ 'status' => $sync_status->status,
+ 'error' => $sync_status->error,
+ 'message' => $sync_status->message,
+ 'title' => $sync_status->title,
+ ),
);
return $player_data;
diff --git a/php/classes/shortcodes/class-podcast-playlist.php b/php/classes/shortcodes/class-podcast-playlist.php
index 5d94b1fd..e51d75cc 100644
--- a/php/classes/shortcodes/class-podcast-playlist.php
+++ b/php/classes/shortcodes/class-podcast-playlist.php
@@ -49,7 +49,7 @@ public function shortcode( $params ) {
$this->prepare_properties();
$atts = $this->prepare_atts( $params );
- $episodes = $this->ss_podcasting->players_controller->get_playlist_episodes( $atts );
+ $episodes = $this->ss_podcasting->episode_repository->get_episodes( $atts );
if ( empty ( $episodes ) ) {
return '';
@@ -111,13 +111,14 @@ protected function prepare_atts( $params ) {
'orderby' => 'menu_order ID',
'include' => '',
'exclude' => '',
- 'style' => 'light',
+ 'style' => get_option( 'ss_podcasting_player_mode', 'light' ),
'player_style' => 'standard',
'tracklist' => true,
'tracknumbers' => true,
'images' => true,
'limit' => 10,
'page' => 1,
+ 'class' => '',
),
$params,
'podcast_playlist'
diff --git a/php/config/settings/hosting.php b/php/config/settings/hosting.php
index 3d77049d..1f054c5a 100644
--- a/php/config/settings/hosting.php
+++ b/php/config/settings/hosting.php
@@ -4,37 +4,26 @@
* */
return array(
'title' => __( 'Hosting', 'seriously-simple-podcasting' ),
+ 'button_text' => __( 'Connect', 'seriously-simple-podcasting' ),
+ 'button_class' => 'castos-connect disabled hidden',
'sections' => array(
'credentials' => array(
+ 'condition_callback' => function () {
+ return ! ssp_is_connected_to_castos();
+ },
'title' => __( 'Podcast Hosting', 'seriously-simple-podcasting' ),
'description' => sprintf( __( 'Connect your WordPress site to your %s account.', 'seriously-simple-podcasting' ), 'Castos' ),
'fields' => array(
- array(
- 'id' => 'podmotor_account_email',
- 'type' => 'text',
- 'label' => __( 'Your email', 'seriously-simple-podcasting' ),
- 'description' => __( 'The email address you used to register your Castos account.', 'seriously-simple-podcasting' ),
- 'default' => '',
- 'placeholder' => __( 'email@domain.com', 'seriously-simple-podcasting' ),
- 'callback' => 'esc_email',
- 'class' => 'regular-text',
- ),
array(
'id' => 'podmotor_account_api_token',
'type' => 'text',
- 'label' => __( 'Castos API key', 'seriously-simple-podcasting' ),
- 'description' => __( 'Your Castos API key. Available from your Castos account dashboard.', 'seriously-simple-podcasting' ),
+ 'label' => __( 'Castos API token', 'seriously-simple-podcasting' ),
+ 'description' => __( 'Your Castos API token. Available from your Castos account dashboard.', 'seriously-simple-podcasting' ),
'default' => '',
'placeholder' => __( 'Enter your api key', 'seriously-simple-podcasting' ),
'callback' => 'sanitize_text_field',
'class' => 'regular-text',
),
- array(
- 'id' => 'validate_api_credentials',
- 'type' => 'button',
- 'label' => esc_attr( __( 'Verify Credentials', 'seriously-simple-podcasting' ) ),
- 'class' => 'button-primary',
- ),
),
),
'sync' => array(
@@ -67,13 +56,13 @@
'no_store' => true,
'fields' => array(
array(
- 'id' => 'podmotor_disconnect',
- 'label' => __( 'Disconnect Castos', 'seriously-simple-podcasting' ),
+ 'id' => 'disconnect_castos',
+ 'label' => __( 'Disconnect', 'seriously-simple-podcasting' ),
'description' => __( 'Select this if you wish to disconnect your Castos account.', 'seriously-simple-podcasting' ),
- 'type' => 'checkbox',
+ 'type' => 'button',
'default' => '',
'callback' => 'wp_strip_all_tags',
- 'class' => 'disconnect-castos',
+ 'class' => 'disconnect-castos button',
),
),
),
diff --git a/php/includes/ssp-functions.php b/php/includes/ssp-functions.php
index f8a50e1b..62636cfa 100644
--- a/php/includes/ssp-functions.php
+++ b/php/includes/ssp-functions.php
@@ -7,8 +7,10 @@
use SeriouslySimplePodcasting\Handlers\Castos_Handler;
use SeriouslySimplePodcasting\Handlers\CPT_Podcast_Handler;
use SeriouslySimplePodcasting\Handlers\Images_Handler;
+use SeriouslySimplePodcasting\Helpers\Log_Helper;
use SeriouslySimplePodcasting\Interfaces\Service;
use SeriouslySimplePodcasting\Renderers\Renderer;
+use SeriouslySimplePodcasting\Repositories\Episode_Repository;
use SeriouslySimplePodcasting\Repositories\Series_Repository;
// Exit if accessed directly.
@@ -668,33 +670,39 @@ function ssp_get_feed_category_output( $level, $series_id ) {
* @since 1.0.0
*/
function ssp_readfile_chunked( $file, $retbytes = true ) {
+ try {
+ $chunksize = 1 * ( 1024 * 1024 );
+ $cnt = 0;
- $chunksize = 1 * ( 1024 * 1024 );
- $cnt = 0;
+ $handle = fopen( $file, 'r' );
+ if ( false === $handle ) {
+ return false;
+ }
- $handle = fopen( $file, 'r' );
- if ( false === $handle ) {
- return false;
- }
+ while ( ! feof( $handle ) ) {
+ $buffer = fread( $handle, $chunksize );
+ echo $buffer;
+ ob_flush();
+ flush();
- while ( ! feof( $handle ) ) {
- $buffer = fread( $handle, $chunksize );
- echo $buffer;
- ob_flush();
- flush();
+ if ( $retbytes ) {
+ $cnt += strlen( $buffer );
+ }
+ }
- if ( $retbytes ) {
- $cnt += strlen( $buffer );
+ $status = fclose( $handle );
+
+ if ( $retbytes && $status ) {
+ return $cnt;
}
- }
- $status = fclose( $handle );
+ return $status;
+ } catch ( \Throwable $e ) {
+ $logger = new Log_Helper();
+ $logger->log( 'Error in ' . __FUNCTION__ . ': ' . $e->getMessage(), 'File: ' . $file );
- if ( $retbytes && $status ) {
- return $cnt;
+ return false;
}
-
- return $status;
}
}
@@ -742,9 +750,8 @@ function ssp_is_connected_to_castos() {
if ( $cache = wp_cache_get( $cache_key ) ) {
return $cache;
}
- $podmotor_email = get_option( 'ss_podcasting_podmotor_account_email', '' );
$podmotor_api_token = get_option( 'ss_podcasting_podmotor_account_api_token', '' );
- if ( ! empty( $podmotor_email ) && ! empty( $podmotor_api_token ) ) {
+ if ( ! empty( $podmotor_api_token ) ) {
$is_connected = true;
}
@@ -1308,7 +1315,8 @@ function ssp_get_the_feed_item_content( $post = null ) {
$content = preg_replace( '/