';
printf(
wp_kses(
+ /* translators: %s is the link to the IBM Watson documentation */
__( 'The `watsonplatform.net` endpoint URLs were retired on 26 May 2021. Please update the endpoint url. Check here for details.', 'classifai' ),
[
'a' => [
diff --git a/includes/Classifai/Services/ImageProcessing.php b/includes/Classifai/Services/ImageProcessing.php
index 31ace8b49..39d314178 100644
--- a/includes/Classifai/Services/ImageProcessing.php
+++ b/includes/Classifai/Services/ImageProcessing.php
@@ -51,7 +51,7 @@ public function enqueue_media_scripts() {
true
);
- $provider = find_provider_class( $this->provider_classes ?? [], 'Computer Vision' );
+ $provider = find_provider_class( $this->provider_classes ?? [], 'AI Vision' );
if ( ! is_wp_error( $provider ) ) {
wp_add_inline_script(
'classifai-media-script',
@@ -236,7 +236,7 @@ public function computer_vision_endpoint_callback( $request ) {
}
// Find the right provider class.
- $provider = find_provider_class( $this->provider_classes ?? [], 'Computer Vision' );
+ $provider = find_provider_class( $this->provider_classes ?? [], 'AI Vision' );
// Ensure we have a provider class. Should never happen but :shrug:
if ( is_wp_error( $provider ) ) {
@@ -273,7 +273,7 @@ public function computer_vision_endpoint_permissions_check( WP_REST_Request $req
return false;
}
- $settings = \Classifai\get_plugin_settings( 'image_processing', 'Computer Vision' );
+ $settings = \Classifai\get_plugin_settings( 'image_processing', 'AI Vision' );
// For the image-tags route, ensure the taxonomy is valid and the user has permission to assign terms.
if ( 'image-tags' === $route_to_call ) {
@@ -333,31 +333,24 @@ public function generate_image( WP_REST_Request $request ) {
* @return WP_Error|bool
*/
public function generate_image_permissions_check() {
- // Ensure we have a logged in user that can upload files.
- if ( ! current_user_can( 'upload_files' ) ) {
- return false;
- }
-
+ $provider = find_provider_class( $this->provider_classes ?? [], 'DALL·E' );
$settings = \Classifai\get_plugin_settings( 'image_processing', 'DALL·E' );
+ // Ensure we have a provider class. Should never happen but :shrug:
+ if ( is_wp_error( $provider ) ) {
+ return $provider;
+ }
+
// Check if valid authentication is in place.
if ( empty( $settings ) || ( isset( $settings['authenticated'] ) && false === $settings['authenticated'] ) ) {
return new WP_Error( 'auth', esc_html__( 'Please set up valid authentication with OpenAI.', 'classifai' ) );
}
- // Check if image generation is turned on.
- if ( empty( $settings ) || ( isset( $settings['enable_image_gen'] ) && 'no' === $settings['enable_image_gen'] ) ) {
+ // Ensure the feature is enabled. Also runs a user check.
+ if ( ! $provider->is_feature_enabled() ) {
return new WP_Error( 'not_enabled', esc_html__( 'Image generation not currently enabled.', 'classifai' ) );
}
- // Check if the current user's role is allowed.
- $roles = $settings['roles'] ?? [];
- $user_roles = wp_get_current_user()->roles ?? [];
-
- if ( empty( $roles ) || ! empty( array_diff( $user_roles, $roles ) ) ) {
- return false;
- }
-
return true;
}
diff --git a/includes/Classifai/Services/LanguageProcessing.php b/includes/Classifai/Services/LanguageProcessing.php
index 462815535..0d6537abb 100644
--- a/includes/Classifai/Services/LanguageProcessing.php
+++ b/includes/Classifai/Services/LanguageProcessing.php
@@ -6,7 +6,6 @@
namespace Classifai\Services;
use Classifai\Admin\SavePostHandler;
-use Classifai\Providers\Azure\TextToSpeech;
use function Classifai\find_provider_class;
use WP_REST_Server;
use WP_REST_Request;
@@ -65,19 +64,41 @@ public function register_endpoints() {
register_rest_route(
'classifai/v1/openai',
- 'generate-excerpt/(?P\d+)',
+ 'generate-excerpt(?:/(?P\d+))?',
[
- 'methods' => WP_REST_Server::READABLE,
- 'callback' => [ $this, 'generate_post_excerpt' ],
- 'args' => [
- 'id' => [
- 'required' => true,
- 'type' => 'integer',
- 'sanitize_callback' => 'absint',
- 'description' => esc_html__( 'Post ID to generate excerpt for.', 'classifai' ),
+ [
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => [ $this, 'generate_post_excerpt' ],
+ 'args' => [
+ 'id' => [
+ 'required' => true,
+ 'type' => 'integer',
+ 'sanitize_callback' => 'absint',
+ 'description' => esc_html__( 'Post ID to generate excerpt for.', 'classifai' ),
+ ],
],
+ 'permission_callback' => [ $this, 'generate_post_excerpt_permissions_check' ],
+ ],
+ [
+ 'methods' => WP_REST_Server::CREATABLE,
+ 'callback' => [ $this, 'generate_post_excerpt' ],
+ 'args' => [
+ 'content' => [
+ 'required' => true,
+ 'type' => 'string',
+ 'sanitize_callback' => 'sanitize_text_field',
+ 'validate_callback' => 'rest_validate_request_arg',
+ 'description' => esc_html__( 'Content to summarize into an excerpt.', 'classifai' ),
+ ],
+ 'title' => [
+ 'type' => 'string',
+ 'sanitize_callback' => 'sanitize_text_field',
+ 'validate_callback' => 'rest_validate_request_arg',
+ 'description' => esc_html__( 'Title of content we want a summary for.', 'classifai' ),
+ ],
+ ],
+ 'permission_callback' => [ $this, 'generate_post_excerpt_permissions_check' ],
],
- 'permission_callback' => [ $this, 'generate_post_excerpt_permissions_check' ],
]
);
@@ -119,27 +140,73 @@ public function register_endpoints() {
register_rest_route(
'classifai/v1/openai',
- 'generate-title/(?P\d+)',
+ 'generate-title(?:/(?P\d+))?',
[
- 'methods' => WP_REST_Server::READABLE,
- 'callback' => [ $this, 'generate_post_title' ],
+ [
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => [ $this, 'generate_post_title' ],
+ 'args' => [
+ 'id' => [
+ 'required' => true,
+ 'type' => 'integer',
+ 'sanitize_callback' => 'absint',
+ 'description' => esc_html__( 'Post ID to generate title for.', 'classifai' ),
+ ],
+ 'n' => [
+ 'type' => 'integer',
+ 'minimum' => 1,
+ 'maximum' => 10,
+ 'sanitize_callback' => 'absint',
+ 'validate_callback' => 'rest_validate_request_arg',
+ 'description' => esc_html__( 'Number of titles to generate', 'classifai' ),
+ ],
+ ],
+ 'permission_callback' => [ $this, 'generate_post_title_permissions_check' ],
+ ],
+ [
+ 'methods' => WP_REST_Server::CREATABLE,
+ 'callback' => [ $this, 'generate_post_title' ],
+ 'args' => [
+ 'content' => [
+ 'required' => true,
+ 'type' => 'string',
+ 'sanitize_callback' => 'sanitize_text_field',
+ 'validate_callback' => 'rest_validate_request_arg',
+ 'description' => esc_html__( 'Content to generate a title for', 'classifai' ),
+ ],
+ ],
+ 'permission_callback' => [ $this, 'generate_post_title_permissions_check' ],
+ ],
+ ]
+ );
+
+ register_rest_route(
+ 'classifai/v1/openai',
+ 'resize-content',
+ [
+ 'methods' => WP_REST_Server::CREATABLE,
+ 'callback' => [ $this, 'resize_content' ],
+ 'permission_callback' => [ $this, 'resize_content_permissions_check' ],
'args' => [
- 'id' => [
+ 'id' => [
'required' => true,
'type' => 'integer',
'sanitize_callback' => 'absint',
- 'description' => esc_html__( 'Post ID to generate title for.', 'classifai' ),
+ 'description' => esc_html__( 'Post ID to resize the content for.', 'classifai' ),
],
- 'n' => [
- 'type' => 'integer',
- 'minimum' => 1,
- 'maximum' => 10,
- 'sanitize_callback' => 'absint',
+ 'content' => [
+ 'type' => 'string',
+ 'sanitize_callback' => 'sanitize_text_field',
'validate_callback' => 'rest_validate_request_arg',
- 'description' => esc_html__( 'Number of titles to generate', 'classifai' ),
+ 'description' => esc_html__( 'The content to resize.', 'classifai' ),
+ ],
+ 'resize_type' => [
+ 'type' => 'string',
+ 'sanitize_callback' => 'sanitize_text_field',
+ 'validate_callback' => 'rest_validate_request_arg',
+ 'description' => esc_html__( 'The type of resize operation. "grow" or "shrink".', 'classifai' ),
],
],
- 'permission_callback' => [ $this, 'generate_post_title_permissions_check' ],
]
);
}
@@ -242,6 +309,8 @@ public function generate_post_tags_permissions_check( WP_REST_Request $request )
*/
public function generate_post_excerpt( WP_REST_Request $request ) {
$post_id = $request->get_param( 'id' );
+ $content = $request->get_param( 'content' );
+ $title = $request->get_param( 'title' );
// Find the right provider class.
$provider = find_provider_class( $this->provider_classes ?? [], 'ChatGPT' );
@@ -251,7 +320,16 @@ public function generate_post_excerpt( WP_REST_Request $request ) {
return $provider;
}
- return rest_ensure_response( $provider->rest_endpoint_callback( $post_id, 'excerpt' ) );
+ return rest_ensure_response(
+ $provider->rest_endpoint_callback(
+ $post_id,
+ 'excerpt',
+ [
+ 'content' => $content,
+ 'title' => $title,
+ ]
+ )
+ );
}
/**
@@ -266,7 +344,14 @@ public function generate_post_excerpt( WP_REST_Request $request ) {
* @return WP_Error|bool
*/
public function generate_post_excerpt_permissions_check( WP_REST_Request $request ) {
- $post_id = $request->get_param( 'id' );
+ $post_id = $request->get_param( 'id' );
+ $provider = find_provider_class( $this->provider_classes ?? [], 'ChatGPT' );
+ $settings = \Classifai\get_plugin_settings( 'language_processing', 'ChatGPT' );
+
+ // Ensure we have a provider class. Should never happen but :shrug:
+ if ( is_wp_error( $provider ) ) {
+ return $provider;
+ }
// Ensure we have a logged in user that can edit the item.
if ( empty( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
@@ -281,26 +366,16 @@ public function generate_post_excerpt_permissions_check( WP_REST_Request $reques
return false;
}
- $settings = \Classifai\get_plugin_settings( 'language_processing', 'ChatGPT' );
-
// Check if valid authentication is in place.
if ( empty( $settings ) || ( isset( $settings['authenticated'] ) && false === $settings['authenticated'] ) ) {
return new WP_Error( 'auth', esc_html__( 'Please set up valid authentication with OpenAI.', 'classifai' ) );
}
- // Check if excerpt generation is turned on.
- if ( empty( $settings ) || ( isset( $settings['enable_excerpt'] ) && 'no' === $settings['enable_excerpt'] ) ) {
+ // Ensure the feature is enabled. Also runs a user check.
+ if ( ! $provider->is_feature_enabled( 'enable_excerpt' ) ) {
return new WP_Error( 'not_enabled', esc_html__( 'Excerpt generation not currently enabled.', 'classifai' ) );
}
- // Check if the current user's role is allowed.
- $roles = $settings['roles'] ?? [];
- $user_roles = wp_get_current_user()->roles ?? [];
-
- if ( empty( $roles ) || ! empty( array_diff( $user_roles, $roles ) ) ) {
- return false;
- }
-
return true;
}
@@ -344,7 +419,7 @@ public function speech_synthesis_permissions_check( WP_REST_Request $request ) {
if ( ! empty( $post_id ) && current_user_can( 'edit_post', $post_id ) ) {
$post_type = get_post_type( $post_id );
- $supported = TextToSpeech::get_supported_post_types();
+ $supported = \Classifai\get_tts_supported_post_types();
// Check if processing allowed.
if ( ! in_array( $post_type, $supported, true ) ) {
@@ -456,7 +531,8 @@ public function generate_post_title( WP_REST_Request $request ) {
$post_id,
'title',
[
- 'num' => $request->get_param( 'n' ),
+ 'num' => $request->get_param( 'n' ),
+ 'content' => $request->get_param( 'content' ),
]
)
);
@@ -474,6 +550,77 @@ public function generate_post_title( WP_REST_Request $request ) {
* @return WP_Error|bool
*/
public function generate_post_title_permissions_check( WP_REST_Request $request ) {
+ $post_id = $request->get_param( 'id' );
+ $provider = find_provider_class( $this->provider_classes ?? [], 'ChatGPT' );
+ $settings = \Classifai\get_plugin_settings( 'language_processing', 'ChatGPT' );
+
+ // Ensure we have a logged in user that can edit the item.
+ if ( empty( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
+ return false;
+ }
+
+ $post_type = get_post_type( $post_id );
+ $post_type_obj = get_post_type_object( $post_type );
+
+ // Ensure the post type is allowed in REST endpoints.
+ if ( ! $post_type || empty( $post_type_obj ) || empty( $post_type_obj->show_in_rest ) ) {
+ return false;
+ }
+
+ // Check if valid authentication is in place.
+ if ( empty( $settings ) || ( isset( $settings['authenticated'] ) && false === $settings['authenticated'] ) ) {
+ return new WP_Error( 'auth', esc_html__( 'Please set up valid authentication with OpenAI.', 'classifai' ) );
+ }
+
+ // Ensure the feature is enabled. Also runs a user check.
+ if ( ! $provider->is_feature_enabled( 'enable_titles' ) ) {
+ return new WP_Error( 'not_enabled', esc_html__( 'Excerpt generation not currently enabled.', 'classifai' ) );
+ }
+
+ return true;
+ }
+
+ /**
+ * Handle request to resize content.
+ *
+ * @param WP_REST_Request $request The full request object.
+ * @return \WP_REST_Response|WP_Error
+ */
+ public function resize_content( WP_REST_Request $request ) {
+ $post_id = $request->get_param( 'id' );
+ $provider = '';
+
+ // Find the right provider class.
+ foreach ( $this->provider_classes as $provider_class ) {
+ if ( 'ChatGPT' === $provider_class->provider_service_name ) {
+ $provider = $provider_class;
+ }
+ }
+
+ // Ensure we have a provider class. Should never happen but :shrug:
+ if ( ! $provider ) {
+ return new WP_Error( 'provider_class_required', esc_html__( 'Provider class not found.', 'classifai' ) );
+ }
+
+ return rest_ensure_response(
+ $provider->rest_endpoint_callback(
+ $post_id,
+ 'resize_content',
+ [
+ 'content' => $request->get_param( 'content' ),
+ 'resize_type' => $request->get_param( 'resize_type' ),
+ ]
+ )
+ );
+ }
+
+ /**
+ * Check if a given request has access to resize content.
+ *
+ * @param WP_REST_Request $request Full data about the request.
+ * @return WP_Error|bool
+ */
+ public function resize_content_permissions_check( WP_REST_Request $request ) {
$post_id = $request->get_param( 'id' );
// Ensure we have a logged in user that can edit the item.
@@ -496,13 +643,13 @@ public function generate_post_title_permissions_check( WP_REST_Request $request
return new WP_Error( 'auth', esc_html__( 'Please set up valid authentication with OpenAI.', 'classifai' ) );
}
- // Check if title generation is turned on.
- if ( empty( $settings ) || ( isset( $settings['enable_titles'] ) && 'no' === $settings['enable_titles'] ) ) {
- return new WP_Error( 'not_enabled', esc_html__( 'Title generation not currently enabled.', 'classifai' ) );
+ // Check if resize content feature is turned on.
+ if ( empty( $settings ) || ( isset( $settings['enable_resize_content'] ) && 'no' === $settings['enable_resize_content'] ) ) {
+ return new WP_Error( 'not_enabled', esc_html__( 'Content resizing not currently enabled.', 'classifai' ) );
}
// Check if the current user's role is allowed.
- $roles = $settings['title_roles'] ?? [];
+ $roles = $settings['resize_content_roles'] ?? [];
$user_roles = wp_get_current_user()->roles ?? [];
if ( empty( $roles ) || ! empty( array_diff( $user_roles, $roles ) ) ) {
@@ -511,5 +658,4 @@ public function generate_post_title_permissions_check( WP_REST_Request $request
return true;
}
-
}
diff --git a/includes/Classifai/Services/Personalizer.php b/includes/Classifai/Services/Personalizer.php
index 67e187733..1dde8e015 100644
--- a/includes/Classifai/Services/Personalizer.php
+++ b/includes/Classifai/Services/Personalizer.php
@@ -50,26 +50,26 @@ public function ajax_render_recommended_content() {
}
$attributes = array(
- 'displayLayout' => isset( $_POST['displayLayout'] ) ? sanitize_text_field( $_POST['displayLayout'] ) : 'grid',
- 'contentPostType' => sanitize_text_field( $_POST['contentPostType'] ),
+ 'displayLayout' => isset( $_POST['displayLayout'] ) ? sanitize_text_field( wp_unslash( $_POST['displayLayout'] ) ) : 'grid',
+ 'contentPostType' => sanitize_text_field( wp_unslash( $_POST['contentPostType'] ) ),
'excludeId' => isset( $_POST['excludeId'] ) ? absint( $_POST['excludeId'] ) : 0,
- 'displayPostExcerpt' => isset( $_POST['displayPostExcerpt'] ) ? filter_var( $_POST['displayPostExcerpt'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : false,
- 'displayAuthor' => isset( $_POST['displayAuthor'] ) ? filter_var( $_POST['displayAuthor'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : false,
- 'displayPostDate' => isset( $_POST['displayPostDate'] ) ? filter_var( $_POST['displayPostDate'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : false,
- 'displayFeaturedImage' => isset( $_POST['displayFeaturedImage'] ) ? filter_var( $_POST['displayFeaturedImage'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : true,
- 'addLinkToFeaturedImage' => isset( $_POST['addLinkToFeaturedImage'] ) ? filter_var( $_POST['addLinkToFeaturedImage'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : false,
+ 'displayPostExcerpt' => isset( $_POST['displayPostExcerpt'] ) ? filter_var( wp_unslash( $_POST['displayPostExcerpt'] ), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : false,
+ 'displayAuthor' => isset( $_POST['displayAuthor'] ) ? filter_var( wp_unslash( $_POST['displayAuthor'] ), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : false,
+ 'displayPostDate' => isset( $_POST['displayPostDate'] ) ? filter_var( wp_unslash( $_POST['displayPostDate'] ), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : false,
+ 'displayFeaturedImage' => isset( $_POST['displayFeaturedImage'] ) ? filter_var( wp_unslash( $_POST['displayFeaturedImage'] ), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : true,
+ 'addLinkToFeaturedImage' => isset( $_POST['addLinkToFeaturedImage'] ) ? filter_var( wp_unslash( $_POST['addLinkToFeaturedImage'] ), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : false,
'columns' => isset( $_POST['columns'] ) ? absint( $_POST['columns'] ) : 3,
'numberOfItems' => isset( $_POST['numberOfItems'] ) ? absint( $_POST['numberOfItems'] ) : 3,
);
if ( isset( $_POST['taxQuery'] ) && ! empty( $_POST['taxQuery'] ) ) {
- // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+ // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.ValidatedSanitizedInput.MissingUnslash
foreach ( $_POST['taxQuery'] as $key => $value ) {
$attributes['taxQuery'][ $key ] = array_map( 'absint', $value );
}
}
- $provider = find_provider_class( $this->provider_classes ?? [], 'Personalizer' );
+ $provider = find_provider_class( $this->provider_classes ?? [], 'AI Personalizer' );
if ( ! is_wp_error( $provider ) ) {
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -146,7 +146,7 @@ public function reward_endpoint_callback( WP_REST_Request $request ) {
}
// Find the right provider class.
- $provider = find_provider_class( $this->provider_classes ?? [], 'Personalizer' );
+ $provider = find_provider_class( $this->provider_classes ?? [], 'AI Personalizer' );
// Ensure we have a provider class. Should never happen but :shrug:
if ( is_wp_error( $provider ) ) {
diff --git a/includes/Classifai/Services/Service.php b/includes/Classifai/Services/Service.php
index dfc23902b..9ccfa0f86 100644
--- a/includes/Classifai/Services/Service.php
+++ b/includes/Classifai/Services/Service.php
@@ -108,7 +108,7 @@ public function get_display_name() {
*/
public function render_settings_page() {
$active_tab = $this->provider_classes ? $this->provider_classes[0]->get_settings_section() : '';
- $active_tab = isset( $_GET['provider'] ) ? sanitize_text_field( $_GET['provider'] ) : $active_tab; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ $active_tab = isset( $_GET['provider'] ) ? sanitize_text_field( wp_unslash( $_GET['provider'] ) ) : $active_tab; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
$base_url = add_query_arg(
array(
'page' => 'classifai',
diff --git a/includes/Classifai/Taxonomy/AbstractTaxonomy.php b/includes/Classifai/Taxonomy/AbstractTaxonomy.php
index 69535eb57..a44dcfe34 100644
--- a/includes/Classifai/Taxonomy/AbstractTaxonomy.php
+++ b/includes/Classifai/Taxonomy/AbstractTaxonomy.php
@@ -111,18 +111,66 @@ public function get_labels() {
$labels = array(
'name' => $plural_label, // Already translated via get_plural_label().
'singular_name' => $singular_label, // Already translated via get_singular_label().
- 'search_items' => sprintf( __( 'Search %s', 'classifai' ), $plural_label ),
- 'popular_items' => sprintf( __( 'Popular %s', 'classifai' ), $plural_label ),
- 'all_items' => sprintf( __( 'All %s', 'classifai' ), $plural_label ),
- 'edit_item' => sprintf( __( 'Edit %s', 'classifai' ), $singular_label ),
- 'update_item' => sprintf( __( 'Update %s', 'classifai' ), $singular_label ),
- 'add_new_item' => sprintf( __( 'Add New %s', 'classifai' ), $singular_label ),
- 'new_item_name' => sprintf( __( 'New %s Name', 'classifai' ), $singular_label ),
- 'separate_items_with_commas' => sprintf( __( 'Separate %s with commas', 'classifai' ), strtolower( $plural_label ) ),
- 'add_or_remove_items' => sprintf( __( 'Add or remove %s', 'classifai' ), strtolower( $plural_label ) ),
- 'choose_from_most_used' => sprintf( __( 'Choose from the most used %s', 'classifai' ), strtolower( $plural_label ) ),
- 'not_found' => sprintf( __( 'No %s found.', 'classifai' ), strtolower( $plural_label ) ),
- 'not_found_in_trash' => sprintf( __( 'No %s found in Trash.', 'classifai' ), strtolower( $plural_label ) ),
+ 'search_items' => sprintf(
+ /* translators: %s: Plural taxonomy label */
+ __( 'Search %s', 'classifai' ),
+ $plural_label
+ ),
+ 'popular_items' => sprintf(
+ /* translators: %s: Plural taxonomy label */
+ __( 'Popular %s', 'classifai' ),
+ $plural_label
+ ),
+ 'all_items' => sprintf(
+ /* translators: %s: Plural taxonomy label */
+ __( 'All %s', 'classifai' ),
+ $plural_label
+ ),
+ 'edit_item' => sprintf(
+ /* translators: %s: Singular taxonomy label */
+ __( 'Edit %s', 'classifai' ),
+ $singular_label
+ ),
+ 'update_item' => sprintf(
+ /* translators: %s: Singular taxonomy label */
+ __( 'Update %s', 'classifai' ),
+ $singular_label
+ ),
+ 'add_new_item' => sprintf(
+ /* translators: %s: Singular taxonomy label */
+ __( 'Add New %s', 'classifai' ),
+ $singular_label
+ ),
+ 'new_item_name' => sprintf(
+ /* translators: %s: Singular taxonomy label */
+ __( 'New %s Name', 'classifai' ),
+ $singular_label
+ ),
+ 'separate_items_with_commas' => sprintf(
+ /* translators: %s: Plural taxonomy label */
+ __( 'Separate %s with commas', 'classifai' ),
+ strtolower( $plural_label )
+ ),
+ 'add_or_remove_items' => sprintf(
+ /* translators: %s: Plural taxonomy label */
+ __( 'Add or remove %s', 'classifai' ),
+ strtolower( $plural_label )
+ ),
+ 'choose_from_most_used' => sprintf(
+ /* translators: %s: Plural taxonomy label */
+ __( 'Choose from the most used %s', 'classifai' ),
+ strtolower( $plural_label )
+ ),
+ 'not_found' => sprintf(
+ /* translators: %s: Plural taxonomy label */
+ __( 'No %s found.', 'classifai' ),
+ strtolower( $plural_label )
+ ),
+ 'not_found_in_trash' => sprintf(
+ /* translators: %s: Plural taxonomy label */
+ __( 'No %s found in Trash.', 'classifai' ),
+ strtolower( $plural_label )
+ ),
);
return $labels;
diff --git a/includes/Classifai/Watson/APIRequest.php b/includes/Classifai/Watson/APIRequest.php
index 1528da569..526961149 100644
--- a/includes/Classifai/Watson/APIRequest.php
+++ b/includes/Classifai/Watson/APIRequest.php
@@ -136,7 +136,7 @@ public function get_auth_hash() {
$username = $this->get_username();
$password = $this->get_password();
- return base64_encode( $username . ':' . $password );
+ return base64_encode( $username . ':' . $password ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
}
/**
diff --git a/includes/Classifai/Watson/Classifier.php b/includes/Classifai/Watson/Classifier.php
index 0301aa304..8ca5197f6 100644
--- a/includes/Classifai/Watson/Classifier.php
+++ b/includes/Classifai/Watson/Classifier.php
@@ -44,7 +44,7 @@ public function get_endpoint() {
/**
* Classifies the text specified using IBM Watson NLU API.
*
- * https://www.ibm.com/watson/developercloud/natural-language-understanding/api/v1/#post-analyze
+ * https://cloud.ibm.com/apidocs/natural-language-understanding#analyze
*
* @param string $text The plain text to classify
* @param array $options NLU classification options
diff --git a/includes/Classifai/Watson/Normalizer.php b/includes/Classifai/Watson/Normalizer.php
index a3470deac..b24d84d4a 100644
--- a/includes/Classifai/Watson/Normalizer.php
+++ b/includes/Classifai/Watson/Normalizer.php
@@ -17,12 +17,13 @@ class Normalizer {
* The post title is also included in the content to improve
* accuracy.
*
- * @param int $post_id The post to normalize
+ * @param int $post_id The post to normalize
+ * @param string $post_content The post content to normalize
* @return string
*/
- public function normalize( $post_id ) {
+ public function normalize( $post_id, $post_content = '' ) {
$post = get_post( $post_id );
- $post_content = apply_filters( 'the_content', $post->post_content );
+ $post_content = empty( $post_content ) ? apply_filters( 'the_content', $post->post_content ) : $post_content;
$post_title = apply_filters( 'the_title', $post->post_title );
/* Strip shortcodes but keep internal caption text */
diff --git a/languages/classifai.pot b/languages/classifai.pot
index 1c77c6bac..4727f55e3 100644
--- a/languages/classifai.pot
+++ b/languages/classifai.pot
@@ -2,9 +2,9 @@
# This file is distributed under the GPLv2.
msgid ""
msgstr ""
-"Project-Id-Version: ClassifAI 2.2.3\n"
+"Project-Id-Version: ClassifAI 2.3.0\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/classifai\n"
-"POT-Creation-Date: 2023-07-13 16:08:28+00:00\n"
+"POT-Creation-Date: 2023-09-05 19:07:31+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -25,26 +25,22 @@ msgstr ""
msgid "3"
msgstr ""
-#: classifai.php:31
-#. translators: PHP Update guide URL
+#: classifai.php:48
+#. translators: %s: Minimum required PHP version
msgid ""
-"ClassifAI requires PHP version 7.4. Click here to learn "
-"how to update your PHP version."
+"ClassifAI requires PHP version %s or later. Please upgrade PHP or disable "
+"the plugin."
msgstr ""
-#: classifai.php:38
-msgid "Error Activating"
-msgstr ""
-
-#: classifai.php:95
+#: classifai.php:112
msgid "Fatal Error: Composer not setup in %"
msgstr ""
-#: classifai.php:122
+#: classifai.php:139
msgid "Error: Please run $ composer install in the classifai plugin directory."
msgstr ""
-#: classifai.php:189
+#: classifai.php:206
#. translators: %1$s: CLI install commands, %2$s: classifai url
msgid ""
"You appear to be running a development version of ClassifAI. Certain "
@@ -53,68 +49,69 @@ msgid ""
"install the stable version of ClassifAI instead."
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:157
-#: includes/Classifai/Admin/BulkActions.php:409
+#: includes/Classifai/Admin/BulkActions.php:152
+#: includes/Classifai/Admin/BulkActions.php:404
msgid "Classify"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:164
-#: includes/Classifai/Admin/BulkActions.php:418
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:240
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:434
+#: includes/Classifai/Admin/BulkActions.php:159
+#: includes/Classifai/Admin/BulkActions.php:413
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:269
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:324
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:609
msgid "Generate excerpt"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:171
-#: includes/Classifai/Admin/BulkActions.php:428
+#: includes/Classifai/Admin/BulkActions.php:166
+#: includes/Classifai/Admin/BulkActions.php:423
msgid "Text to speech"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:192
+#: includes/Classifai/Admin/BulkActions.php:187
msgid "Scan image"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:196
+#: includes/Classifai/Admin/BulkActions.php:191
msgid "Smart crop"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:200
+#: includes/Classifai/Admin/BulkActions.php:195
#: includes/Classifai/Providers/OpenAI/Whisper.php:131
msgid "Transcribe audio"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:336
+#: includes/Classifai/Admin/BulkActions.php:331
msgid "Classified"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:340
+#: includes/Classifai/Admin/BulkActions.php:335
msgid "Excerpts generated for"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:344
+#: includes/Classifai/Admin/BulkActions.php:339
msgid "Text to speech conversion done for"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:348
+#: includes/Classifai/Admin/BulkActions.php:343
msgid "Scanned"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:352
+#: includes/Classifai/Admin/BulkActions.php:347
msgid "Cropped"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:356
+#: includes/Classifai/Admin/BulkActions.php:351
msgid "Transcribed"
msgstr ""
-#: includes/Classifai/Admin/BulkActions.php:362
+#: includes/Classifai/Admin/BulkActions.php:357
#. translators: %1$s: action, %2$s: number of posts, %3$s: post type
msgid "%1$s %2$s %3$s."
msgid_plural "%1$s %2$s %3$ss."
msgstr[0] ""
msgstr[1] ""
-#: includes/Classifai/Admin/BulkActions.php:457
+#: includes/Classifai/Admin/BulkActions.php:452
#: includes/Classifai/Providers/OpenAI/Whisper.php:128
#: includes/Classifai/Providers/OpenAI/Whisper.php:178
msgid "Transcribe"
@@ -200,8 +197,8 @@ msgid "Audio creation failed."
msgstr ""
#: includes/Classifai/Admin/SavePostHandler.php:380
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:531
-#: includes/Classifai/Providers/Watson/NLU.php:834
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:639
+#: includes/Classifai/Providers/Watson/NLU.php:841
msgid "Post"
msgstr ""
@@ -211,12 +208,12 @@ msgid "%s classified successfully."
msgstr ""
#: includes/Classifai/Admin/templates/classifai-header.php:27
-#: includes/Classifai/Plugin.php:216
+#: includes/Classifai/Plugin.php:226
msgid "Settings"
msgstr ""
#: includes/Classifai/Admin/templates/classifai-header.php:36
-#: includes/Classifai/Plugin.php:211
+#: includes/Classifai/Plugin.php:221
msgid "Set up"
msgstr ""
@@ -291,13 +288,14 @@ msgstr ""
msgid "Loading..."
msgstr ""
-#: includes/Classifai/Helpers.php:691
-#: includes/Classifai/Services/LanguageProcessing.php:379
-#: includes/Classifai/Services/LanguageProcessing.php:451
+#: includes/Classifai/Helpers.php:714
+#: includes/Classifai/Services/LanguageProcessing.php:454
+#: includes/Classifai/Services/LanguageProcessing.php:526
+#: includes/Classifai/Services/LanguageProcessing.php:602
msgid "Provider class not found."
msgstr ""
-#: includes/Classifai/Helpers.php:737
+#: includes/Classifai/Helpers.php:760
msgid "Pending Review"
msgstr ""
@@ -324,24 +322,24 @@ msgstr ""
#: includes/Classifai/Plugin.php:185
#: includes/Classifai/Providers/Azure/ComputerVision.php:965
#: includes/Classifai/Providers/Azure/Personalizer.php:114
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:171
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:169
#: includes/Classifai/Providers/OpenAI/OpenAI.php:78
-#: includes/Classifai/Providers/Watson/NLU.php:331
+#: includes/Classifai/Providers/Watson/NLU.php:338
msgid "API Key"
msgstr ""
#: includes/Classifai/Plugin.php:186
-#: includes/Classifai/Providers/Watson/NLU.php:350
+#: includes/Classifai/Providers/Watson/NLU.php:357
msgid "Use an API Key instead?"
msgstr ""
#: includes/Classifai/Plugin.php:187
-#: includes/Classifai/Providers/Watson/NLU.php:349
+#: includes/Classifai/Providers/Watson/NLU.php:356
msgid "Use a username/password instead?"
msgstr ""
#: includes/Classifai/Providers/Azure/ComputerVision.php:41
-msgid "Microsoft Azure Computer Vision"
+msgid "Microsoft Azure AI Vision"
msgstr ""
#: includes/Classifai/Providers/Azure/ComputerVision.php:44
@@ -481,7 +479,7 @@ msgstr ""
#: includes/Classifai/Providers/Azure/ComputerVision.php:952
#: includes/Classifai/Providers/Azure/Personalizer.php:89
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:156
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:154
msgid "Endpoint URL"
msgstr ""
@@ -535,7 +533,7 @@ msgstr ""
#: includes/Classifai/Providers/Azure/ComputerVision.php:1055
msgid ""
-"ComputerVision detects and saves the most visually interesting part of your "
+"AI Vision detects and saves the most visually interesting part of your "
"image (i.e., faces, animals, notable text)."
msgstr ""
@@ -562,49 +560,49 @@ msgstr ""
#: includes/Classifai/Providers/Azure/ComputerVision.php:1243
#: includes/Classifai/Providers/Azure/Personalizer.php:718
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:421
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:433
-#: includes/Classifai/Providers/OpenAI/DallE.php:374
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:420
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:608
+#: includes/Classifai/Providers/OpenAI/DallE.php:425
#: includes/Classifai/Providers/OpenAI/Embeddings.php:313
#: includes/Classifai/Providers/OpenAI/Whisper.php:328
msgid "Authenticated"
msgstr ""
#: includes/Classifai/Providers/Azure/ComputerVision.php:1243
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:433
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:434
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:437
-#: includes/Classifai/Providers/OpenAI/DallE.php:374
-#: includes/Classifai/Providers/OpenAI/DallE.php:375
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:608
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:609
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:612
+#: includes/Classifai/Providers/OpenAI/DallE.php:425
+#: includes/Classifai/Providers/OpenAI/DallE.php:426
#: includes/Classifai/Providers/OpenAI/Embeddings.php:313
#: includes/Classifai/Providers/OpenAI/Embeddings.php:314
#: includes/Classifai/Providers/OpenAI/Whisper.php:328
#: includes/Classifai/Providers/OpenAI/Whisper.php:329
-#: includes/Classifai/Providers/Watson/NLU.php:756
+#: includes/Classifai/Providers/Watson/NLU.php:763
#: includes/Classifai/Services/ServicesManager.php:324
msgid "yes"
msgstr ""
#: includes/Classifai/Providers/Azure/ComputerVision.php:1243
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:433
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:434
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:437
-#: includes/Classifai/Providers/OpenAI/DallE.php:374
-#: includes/Classifai/Providers/OpenAI/DallE.php:375
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:608
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:609
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:612
+#: includes/Classifai/Providers/OpenAI/DallE.php:425
+#: includes/Classifai/Providers/OpenAI/DallE.php:426
#: includes/Classifai/Providers/OpenAI/Embeddings.php:313
#: includes/Classifai/Providers/OpenAI/Embeddings.php:314
#: includes/Classifai/Providers/OpenAI/Whisper.php:328
#: includes/Classifai/Providers/OpenAI/Whisper.php:329
-#: includes/Classifai/Providers/Watson/NLU.php:756
+#: includes/Classifai/Providers/Watson/NLU.php:763
#: includes/Classifai/Services/ServicesManager.php:324
msgid "no"
msgstr ""
#: includes/Classifai/Providers/Azure/ComputerVision.php:1244
#: includes/Classifai/Providers/Azure/Personalizer.php:719
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:422
-#: includes/Classifai/Providers/Watson/NLU.php:303
-#: includes/Classifai/Providers/Watson/NLU.php:757
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:421
+#: includes/Classifai/Providers/Watson/NLU.php:310
+#: includes/Classifai/Providers/Watson/NLU.php:764
msgid "API URL"
msgstr ""
@@ -645,7 +643,7 @@ msgid ""
msgstr ""
#: includes/Classifai/Providers/Azure/Personalizer.php:45
-msgid "Microsoft Azure Personalizer"
+msgid "Microsoft Azure AI Personalizer"
msgstr ""
#: includes/Classifai/Providers/Azure/Personalizer.php:48
@@ -655,13 +653,12 @@ msgstr ""
#: includes/Classifai/Providers/Azure/Personalizer.php:100
#. translators: 1 - link to create a Personalizer resource.
msgid ""
-"Azure Cognitive Service Personalizer Endpoint, create a Personalizer resource in the Azure portal to "
-"get your key and endpoint."
+"Azure AI Personalizer Endpoint, create a "
+"Personalizer resource in the Azure portal to get your key and endpoint."
msgstr ""
#: includes/Classifai/Providers/Azure/Personalizer.php:122
-msgid "Azure Cognitive Service Personalizer Key."
+msgid "Azure AI Personalizer Key."
msgstr ""
#: includes/Classifai/Providers/Azure/Personalizer.php:264
@@ -671,7 +668,7 @@ msgid "No results found."
msgstr ""
#: includes/Classifai/Providers/Azure/Personalizer.php:313
-msgid "Failed to contact Azure Cognitive Service Personalizer: "
+msgid "Failed to contact Azure AI Personalizer: "
msgstr ""
#: includes/Classifai/Providers/Azure/Personalizer.php:424
@@ -692,12 +689,12 @@ msgid "Error in send reward to personalizer: "
msgstr ""
#: includes/Classifai/Providers/Azure/Personalizer.php:718
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:421
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:420
msgid "Yes"
msgstr ""
#: includes/Classifai/Providers/Azure/Personalizer.php:718
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:421
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:420
msgid "No"
msgstr ""
@@ -742,11 +739,11 @@ msgstr ""
msgid "The Read operation has failed."
msgstr ""
-#: includes/Classifai/Providers/Azure/Read.php:276
+#: includes/Classifai/Providers/Azure/Read.php:274
msgid "Invalid Read result status."
msgstr ""
-#: includes/Classifai/Providers/Azure/Read.php:291
+#: includes/Classifai/Providers/Azure/Read.php:288
msgid "The Read result is invalid."
msgstr ""
@@ -758,7 +755,7 @@ msgstr ""
msgid "Generate speech for post content"
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:165
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:163
msgid ""
"Text to Speech region endpoint, e.g., "
"https://LOCATION.tts.speech.microsoft.com/. Replace "
@@ -766,54 +763,62 @@ msgid ""
"resource in Azure."
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:185
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:183
msgid "Post Types"
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:200
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:198
msgid "Voice"
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:252
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:253
msgid ""
"One or more credentials required to connect to the Azure Text to Speech "
"service is empty."
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:334
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:333
msgid "Azure Speech to Text: HTTP request failed."
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:348
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:347
msgid "Connection to Azure Text to Speech failed."
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:423
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:422
msgid "Latest response - Voices"
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:510
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:602
msgid "ClassifAI Text to Speech Processing"
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:542
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:649
msgid "Enable audio generation"
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:547
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:654
#. translators: %s Post type label
-msgid "ClassifAI will generate audio for this %s when it is published or updated"
+msgid "ClassifAI will generate audio for this %s when it is published or updated."
+msgstr ""
+
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:662
+msgid "Display audio controls"
+msgstr ""
+
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:666
+msgid "Controls the display of the audio player on the front-end."
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:705
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:831
msgid "Play audio"
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:705
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:831
msgid "Pause audio"
msgstr ""
-#: includes/Classifai/Providers/Azure/TextToSpeech.php:724
+#: includes/Classifai/Providers/Azure/TextToSpeech.php:850
msgid "Listen to this"
msgstr ""
@@ -821,131 +826,176 @@ msgstr ""
msgid "An error occured"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:55
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:53
msgid "OpenAI ChatGPT"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:58
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:56
msgid "Excerpt generation"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:59
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:57
msgid "Title generation"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:86
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:295
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:437
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:58
+msgid "Content resizing"
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:129
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:392
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:612
msgid "Generate titles"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:87
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:130
msgid "Select a title"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:88
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:131
msgid "Select"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:233
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:270
+msgid "Re-generate excerpt"
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:317
msgid "Excerpt settings"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:248
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:332
msgid ""
"A button will be added to the excerpt panel that can be used to generate an "
"excerpt."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:257
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:309
-#: includes/Classifai/Providers/OpenAI/DallE.php:250
-#: includes/Classifai/Providers/OpenAI/DallE.php:376
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:354
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:406
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:460
+#: includes/Classifai/Providers/OpenAI/DallE.php:301
+#: includes/Classifai/Providers/OpenAI/DallE.php:427
#: includes/Classifai/Providers/OpenAI/Whisper.php:249
#: includes/Classifai/Providers/OpenAI/Whisper.php:330
msgid "Allowed roles"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:265
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:362
msgid "Choose which roles are allowed to generate excerpts."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:271
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:436
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:368
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:611
msgid "Excerpt length"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:281
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:378
msgid ""
"How many words should the excerpt be? Note that the final result may not "
"exactly match this. In testing, ChatGPT tended to exceed this number by "
"10-15 words."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:288
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:385
msgid "Title settings"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:303
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:400
msgid ""
"A button will be added to the status panel that can be used to generate "
"titles."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:317
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:414
msgid "Choose which roles are allowed to generate titles."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:323
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:439
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:420
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:614
msgid "Number of titles"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:331
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:428
msgid "Number of titles that will be generated in one request."
msgstr ""
#: includes/Classifai/Providers/OpenAI/ChatGPT.php:435
+msgid "Resizing content settings"
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:442
+msgid "Enable content resizing"
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:450
+msgid ""
+"\"Shrink content\" and \"Grow content\" menu items will be added to the "
+"paragraph block's toolbar menu."
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:468
+msgid "Choose which roles are allowed to resize content."
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:474
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:616
+msgid "Number of suggestions"
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:482
+msgid "Number of suggestions that will be generated in one request."
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:610
msgid "Allowed roles (excerpt)"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:438
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:613
msgid "Allowed roles (titles)"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:440
-#: includes/Classifai/Providers/OpenAI/DallE.php:379
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:615
+msgid "Allowed roles (resize)"
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:617
+#: includes/Classifai/Providers/OpenAI/DallE.php:430
#: includes/Classifai/Providers/OpenAI/Embeddings.php:319
#: includes/Classifai/Providers/OpenAI/Whisper.php:331
-#: includes/Classifai/Providers/Watson/NLU.php:761
+#: includes/Classifai/Providers/Watson/NLU.php:768
msgid "Latest response"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:456
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:482
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:633
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:663
msgid "A valid post ID is required to generate an excerpt."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:490
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:678
msgid ""
"Excerpt generation is disabled or OpenAI authentication failed. Please "
"check your settings."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:569
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:761
msgid "Post ID is required to generate titles."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:583
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:776
msgid ""
"Title generation is disabled or OpenAI authentication failed. Please check "
"your settings."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/ChatGPT.php:644
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:841
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:943
msgid "No choices were returned from OpenAI."
msgstr ""
+#: includes/Classifai/Providers/OpenAI/ChatGPT.php:865
+msgid "Post ID is required to resize content."
+msgstr ""
+
#: includes/Classifai/Providers/OpenAI/DallE.php:46
msgid "OpenAI DALL·E"
msgstr ""
@@ -954,121 +1004,131 @@ msgstr ""
msgid "Image generation"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:121
+#: includes/Classifai/Providers/OpenAI/DallE.php:76
+#: includes/Classifai/Providers/OpenAI/DallE.php:77
+msgid "Generate Images"
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/DallE.php:76
+#: includes/Classifai/Providers/OpenAI/DallE.php:77
+msgid "Generate Image"
+msgstr ""
+
+#: includes/Classifai/Providers/OpenAI/DallE.php:137
#. translators: %1$s is replaced with the OpenAI DALL·E URL
msgid "Image generated by OpenAI's DALL·E"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:131
-#: includes/Classifai/Providers/OpenAI/DallE.php:172
-#: includes/Classifai/Providers/OpenAI/DallE.php:375
+#: includes/Classifai/Providers/OpenAI/DallE.php:147
+#: includes/Classifai/Providers/OpenAI/DallE.php:210
+#: includes/Classifai/Providers/OpenAI/DallE.php:426
msgid "Generate images"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:131
-#: includes/Classifai/Providers/OpenAI/DallE.php:174
+#: includes/Classifai/Providers/OpenAI/DallE.php:147
+#: includes/Classifai/Providers/OpenAI/DallE.php:212
msgid "Generate image"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:132
+#: includes/Classifai/Providers/OpenAI/DallE.php:148
msgid "Something went wrong. No results found"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:133
+#: includes/Classifai/Providers/OpenAI/DallE.php:149
msgid "Select image"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:153
+#: includes/Classifai/Providers/OpenAI/DallE.php:191
msgid "Enter a prompt below to generate images."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:155
+#: includes/Classifai/Providers/OpenAI/DallE.php:193
msgid "Enter a prompt below to generate an image."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:162
+#: includes/Classifai/Providers/OpenAI/DallE.php:200
msgid ""
"Once images are generated, choose one or more of those to import into your "
"Media Library and then choose one image to insert."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:164
+#: includes/Classifai/Providers/OpenAI/DallE.php:202
msgid ""
"Once an image is generated, you can import it into your Media Library and "
"then select to insert."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:168
+#: includes/Classifai/Providers/OpenAI/DallE.php:206
msgid "Enter prompt"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:184
+#: includes/Classifai/Providers/OpenAI/DallE.php:222
msgid "Images generated from prompt:"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:186
+#: includes/Classifai/Providers/OpenAI/DallE.php:224
msgid "Image generated from prompt:"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:203
+#: includes/Classifai/Providers/OpenAI/DallE.php:241
msgid "Import into Media Library"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:204
+#: includes/Classifai/Providers/OpenAI/DallE.php:242
msgid "Import and Insert"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:226
+#: includes/Classifai/Providers/OpenAI/DallE.php:264
msgid "Enable image generation"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:234
+#: includes/Classifai/Providers/OpenAI/DallE.php:272
msgid ""
"When enabled, a new Generate images tab will be shown in the media upload "
"flow, allowing you to generate and import images."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:258
+#: includes/Classifai/Providers/OpenAI/DallE.php:309
msgid ""
"Choose which roles are allowed to generate images. Note that the roles "
"above only include those that have permissions to upload media."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:264
-#: includes/Classifai/Providers/OpenAI/DallE.php:377
+#: includes/Classifai/Providers/OpenAI/DallE.php:315
+#: includes/Classifai/Providers/OpenAI/DallE.php:428
msgid "Number of images"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:272
+#: includes/Classifai/Providers/OpenAI/DallE.php:323
msgid ""
"Number of images that will be generated in one request. Note that each "
"image will incur separate costs."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:278
-#: includes/Classifai/Providers/OpenAI/DallE.php:378
+#: includes/Classifai/Providers/OpenAI/DallE.php:329
+#: includes/Classifai/Providers/OpenAI/DallE.php:429
msgid "Image size"
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:290
+#: includes/Classifai/Providers/OpenAI/DallE.php:341
msgid "Size of generated images."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:392
+#: includes/Classifai/Providers/OpenAI/DallE.php:443
msgid "A prompt is required to generate an image."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:410
+#: includes/Classifai/Providers/OpenAI/DallE.php:461
msgid "Sorry, you are not allowed to do that."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:414
+#: includes/Classifai/Providers/OpenAI/DallE.php:465
msgid ""
"Image generation is disabled or OpenAI authentication failed. Please check "
"your settings."
msgstr ""
-#: includes/Classifai/Providers/OpenAI/DallE.php:431
+#: includes/Classifai/Providers/OpenAI/DallE.php:482
msgid ""
"Your image prompt is too long. Please ensure it doesn't exceed 1000 "
"characters."
@@ -1092,7 +1152,7 @@ msgstr ""
#: includes/Classifai/Providers/OpenAI/Embeddings.php:144
#: includes/Classifai/Providers/OpenAI/Embeddings.php:315
-#: includes/Classifai/Providers/Watson/NLU.php:759
+#: includes/Classifai/Providers/Watson/NLU.php:766
msgid "Post types"
msgstr ""
@@ -1157,12 +1217,12 @@ msgid "No data returned from OpenAI."
msgstr ""
#: includes/Classifai/Providers/OpenAI/Embeddings.php:722
-#: includes/Classifai/Providers/Watson/NLU.php:811
+#: includes/Classifai/Providers/Watson/NLU.php:818
msgid "ClassifAI Language Processing"
msgstr ""
#: includes/Classifai/Providers/OpenAI/Embeddings.php:752
-#: includes/Classifai/Providers/Watson/NLU.php:842
+#: includes/Classifai/Providers/Watson/NLU.php:849
msgid "Process content on update"
msgstr ""
@@ -1202,10 +1262,11 @@ msgid "Generate transcripts from audio files"
msgstr ""
#: includes/Classifai/Providers/OpenAI/Whisper.php:64
-#: includes/Classifai/Services/ImageProcessing.php:345
-#: includes/Classifai/Services/LanguageProcessing.php:288
-#: includes/Classifai/Services/LanguageProcessing.php:413
-#: includes/Classifai/Services/LanguageProcessing.php:496
+#: includes/Classifai/Services/ImageProcessing.php:346
+#: includes/Classifai/Services/LanguageProcessing.php:371
+#: includes/Classifai/Services/LanguageProcessing.php:488
+#: includes/Classifai/Services/LanguageProcessing.php:572
+#: includes/Classifai/Services/LanguageProcessing.php:643
msgid "Please set up valid authentication with OpenAI."
msgstr ""
@@ -1242,85 +1303,87 @@ msgstr ""
msgid "Generate transcripts"
msgstr ""
-#: includes/Classifai/Providers/Provider.php:324
+#: includes/Classifai/Providers/Provider.php:333
msgid "Alt text"
msgstr ""
-#: includes/Classifai/Providers/Provider.php:325
+#: includes/Classifai/Providers/Provider.php:334
msgid "Image caption"
msgstr ""
-#: includes/Classifai/Providers/Provider.php:326
+#: includes/Classifai/Providers/Provider.php:335
msgid "Image description"
msgstr ""
-#: includes/Classifai/Providers/Provider.php:406
-#: includes/Classifai/Providers/Watson/NLU.php:774
+#: includes/Classifai/Providers/Provider.php:415
+#: includes/Classifai/Providers/Watson/NLU.php:781
msgid "N/A"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:45
+#: includes/Classifai/Providers/Watson/NLU.php:50
#: includes/Classifai/Services/Service.php:172
msgid "Category"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:46
+#: includes/Classifai/Providers/Watson/NLU.php:51
msgid "Category Threshold (%)"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:47
+#: includes/Classifai/Providers/Watson/NLU.php:52
msgid "Category Taxonomy"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:52
+#: includes/Classifai/Providers/Watson/NLU.php:57
#: includes/Classifai/Services/Service.php:177
msgid "Keyword"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:53
+#: includes/Classifai/Providers/Watson/NLU.php:58
msgid "Keyword Threshold (%)"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:54
+#: includes/Classifai/Providers/Watson/NLU.php:59
msgid "Keyword Taxonomy"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:59
+#: includes/Classifai/Providers/Watson/NLU.php:64
#: includes/Classifai/Services/Service.php:182
msgid "Entity"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:60
+#: includes/Classifai/Providers/Watson/NLU.php:65
msgid "Entity Threshold (%)"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:61
+#: includes/Classifai/Providers/Watson/NLU.php:66
msgid "Entity Taxonomy"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:66
+#: includes/Classifai/Providers/Watson/NLU.php:71
#: includes/Classifai/Services/Service.php:187
msgid "Concept"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:67
+#: includes/Classifai/Providers/Watson/NLU.php:72
msgid "Concept Threshold (%)"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:68
+#: includes/Classifai/Providers/Watson/NLU.php:73
msgid "Concept Taxonomy"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:76
+#: includes/Classifai/Providers/Watson/NLU.php:81
msgid "IBM Watson NLU"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:84
+#: includes/Classifai/Providers/Watson/NLU.php:89
#. translators: %s is the post type label.
msgid "Automatically tag %s"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:254
+#: includes/Classifai/Providers/Watson/NLU.php:260
+#. translators: %1$s is the link to register for an IBM Cloud account, %2$s is
+#. the link to setup the NLU service
msgid ""
"Don't have an IBM Cloud account yet? Register for one and set up a here for details."
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:316
+#: includes/Classifai/Providers/Watson/NLU.php:323
msgid "API Username"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:379
+#: includes/Classifai/Providers/Watson/NLU.php:386
msgid "Post Types to Classify"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:390
+#: includes/Classifai/Providers/Watson/NLU.php:397
msgid "Post Statuses to Classify"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:541
+#: includes/Classifai/Providers/Watson/NLU.php:548
msgid "Watson Category Settings"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:546
+#: includes/Classifai/Providers/Watson/NLU.php:553
msgid "Enable"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:601
+#: includes/Classifai/Providers/Watson/NLU.php:608
msgid "Please enter your credentials."
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:719
+#: includes/Classifai/Providers/Watson/NLU.php:726
msgid ""
"OpenAI Embeddings classification is turned on. This may conflict with the "
"NLU classification feature. It is possible to run both features but if they "
"use the same taxonomies, one will overwrite the other."
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:756
+#: includes/Classifai/Providers/Watson/NLU.php:763
msgid "Configured"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:758
+#: includes/Classifai/Providers/Watson/NLU.php:765
msgid "API username"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:760
+#: includes/Classifai/Providers/Watson/NLU.php:767
msgid "Features"
msgstr ""
-#: includes/Classifai/Providers/Watson/NLU.php:849
+#: includes/Classifai/Providers/Watson/NLU.php:856
#. translators: %s Post type label
msgid "Classify %s"
msgstr ""
@@ -1420,15 +1484,15 @@ msgstr ""
msgid "Ensure the service settings have been saved."
msgstr ""
-#: includes/Classifai/Services/ImageProcessing.php:350
+#: includes/Classifai/Services/ImageProcessing.php:351
msgid "Image generation not currently enabled."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:22
+#: includes/Classifai/Services/LanguageProcessing.php:21
msgid "Language Processing"
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:59
+#: includes/Classifai/Services/LanguageProcessing.php:58
msgid "Post ID to generate tags."
msgstr ""
@@ -1436,44 +1500,69 @@ msgstr ""
msgid "Post ID to generate excerpt for."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:95
+#: includes/Classifai/Services/LanguageProcessing.php:91
+msgid "Content to summarize into an excerpt."
+msgstr ""
+
+#: includes/Classifai/Services/LanguageProcessing.php:97
+msgid "Title of content we want a summary for."
+msgstr ""
+
+#: includes/Classifai/Services/LanguageProcessing.php:116
msgid "ID of post to run text to speech conversion on."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:113
+#: includes/Classifai/Services/LanguageProcessing.php:134
msgid "Attachment ID to generate transcript for."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:131
+#: includes/Classifai/Services/LanguageProcessing.php:153
msgid "Post ID to generate title for."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:139
+#: includes/Classifai/Services/LanguageProcessing.php:161
msgid "Number of titles to generate"
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:159
+#: includes/Classifai/Services/LanguageProcessing.php:175
+msgid "Content to generate a title for"
+msgstr ""
+
+#: includes/Classifai/Services/LanguageProcessing.php:195
+msgid "Post ID to resize the content for."
+msgstr ""
+
+#: includes/Classifai/Services/LanguageProcessing.php:201
+msgid "The content to resize."
+msgstr ""
+
+#: includes/Classifai/Services/LanguageProcessing.php:207
+msgid "The type of resize operation. \"grow\" or \"shrink\"."
+msgstr ""
+
+#: includes/Classifai/Services/LanguageProcessing.php:226
msgid "Post ID is required to classify post."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:231
+#: includes/Classifai/Services/LanguageProcessing.php:298
msgid "Language Processing not enabled for current post."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:293
+#: includes/Classifai/Services/LanguageProcessing.php:376
+#: includes/Classifai/Services/LanguageProcessing.php:577
msgid "Excerpt generation not currently enabled."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:351
+#: includes/Classifai/Services/LanguageProcessing.php:426
msgid "Azure Speech synthesis is not enabled for current post."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:418
+#: includes/Classifai/Services/LanguageProcessing.php:493
msgid "Transcription is not currently enabled."
msgstr ""
-#: includes/Classifai/Services/LanguageProcessing.php:501
-msgid "Title generation not currently enabled."
+#: includes/Classifai/Services/LanguageProcessing.php:648
+msgid "Content resizing not currently enabled."
msgstr ""
#: includes/Classifai/Services/Personalizer.php:20
@@ -1548,51 +1637,63 @@ msgstr ""
msgid "Email"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:114
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:116
+#. translators: %s: Plural taxonomy label
msgid "Search %s"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:115
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:121
+#. translators: %s: Plural taxonomy label
msgid "Popular %s"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:116
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:126
+#. translators: %s: Plural taxonomy label
msgid "All %s"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:117
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:131
+#. translators: %s: Singular taxonomy label
msgid "Edit %s"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:118
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:136
+#. translators: %s: Singular taxonomy label
msgid "Update %s"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:119
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:141
+#. translators: %s: Singular taxonomy label
msgid "Add New %s"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:120
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:146
+#. translators: %s: Singular taxonomy label
msgid "New %s Name"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:121
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:151
+#. translators: %s: Plural taxonomy label
msgid "Separate %s with commas"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:122
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:156
+#. translators: %s: Plural taxonomy label
msgid "Add or remove %s"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:123
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:161
+#. translators: %s: Plural taxonomy label
msgid "Choose from the most used %s"
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:124
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:166
+#. translators: %s: Plural taxonomy label
msgid "No %s found."
msgstr ""
-#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:125
+#: includes/Classifai/Taxonomy/AbstractTaxonomy.php:171
+#. translators: %s: Plural taxonomy label
msgid "No %s found in Trash."
msgstr ""
diff --git a/readme.txt b/readme.txt
index b960f70a8..33400a0b8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,10 @@
=== ClassifAI ===
Contributors: 10up, jeffpaul, dkotter
Tags: AI, Artifical Intelligence, ML, Machine Learning, Microsoft Azure, IBM Watson, OpenAI, ChatGPT, DALL·E, Content Tagging, Classification, Smart Cropping, Alt Text
-Requires at least: 5.7
-Tested up to: 6.2
+Requires at least: 5.8
+Tested up to: 6.3
Requires PHP: 7.4
-Stable tag: 2.2.3
+Stable tag: 2.3.0
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -20,23 +20,27 @@ Tap into leading cloud-based services like [OpenAI](https://openai.com/), [Micro
* Generate a summary of post content and store it as an excerpt using [OpenAI's ChatGPT API](https://platform.openai.com/docs/guides/chat)
* Generate titles from post content using [OpenAI's ChatGPT API](https://platform.openai.com/docs/guides/chat)
+* Expand or condense text content using [OpenAI's ChatGPT API](https://platform.openai.com/docs/guides/chat)
* Generate new images on demand to use in-content or as a featured image using [OpenAI's DALL·E API](https://platform.openai.com/docs/guides/images)
* Generate transcripts of audio files using [OpenAI's Whisper API](https://platform.openai.com/docs/guides/speech-to-text)
* Convert text content into audio and output a "read-to-me" feature on the front-end to play this audio using [Microsoft Azure's Text to Speech API](https://learn.microsoft.com/en-us/azure/cognitive-services/speech-service/text-to-speech)
* Classify post content using [IBM Watson's Natural Language Understanding API](https://www.ibm.com/watson/services/natural-language-understanding/) and [OpenAI's Embedding API](https://platform.openai.com/docs/guides/embeddings)
-* BETA: Recommend content based on overall site traffic via [Microsoft Azure's Personalizer API](https://azure.microsoft.com/en-us/services/cognitive-services/personalizer/) _(note that we're gathering feedback on this feature and may significantly iterate depending on community input)_
-* Generate image alt text, image tags, and smartly crop images using [Microsoft Azure's Computer Vision API](https://azure.microsoft.com/en-us/services/cognitive-services/computer-vision/)
-* Scan images and PDF files for embedded text and save for use in post meta using [Microsoft Azure's Computer Vision API](https://azure.microsoft.com/en-us/services/cognitive-services/computer-vision/)
+* BETA: Recommend content based on overall site traffic via [Microsoft Azure's AI Personalizer API](https://azure.microsoft.com/en-us/services/cognitive-services/personalizer/) _(note that we're gathering feedback on this feature and may significantly iterate depending on community input)_
+* Generate image alt text, image tags, and smartly crop images using [Microsoft Azure's AI Vision API](https://azure.microsoft.com/en-us/services/cognitive-services/computer-vision/)
+* Scan images and PDF files for embedded text and save for use in post meta using [Microsoft Azure's AI Vision API](https://azure.microsoft.com/en-us/services/cognitive-services/computer-vision/)
* Bulk classify content with [WP-CLI](https://wp-cli.org/)
**Requirements**
* To utilize the NLU Language Processing functionality, you will need an active [IBM Watson](https://cloud.ibm.com/registration) account.
* To utilize the ChatGPT, Embeddings, or Whisper Language Processing functionality or DALL·E Image Processing functionality, you will need an active [OpenAI](https://platform.openai.com/signup) account.
-* To utilize the Computer Vision Image Processing functionality or Text to Speech Language Processing functionality, you will need an active [Microsoft Azure](https://signup.azure.com/signup) account.
+* To utilize the Azure AI Vision Image Processing functionality or Text to Speech Language Processing functionality, you will need an active [Microsoft Azure](https://signup.azure.com/signup) account.
== Upgrade Notice ==
+= 2.3.0 =
+**Note that this release bumps the WordPress minimum from 5.7 to 5.8.**
+
= 2.1.0 =
**Note that this release moves the ClassifAI settings to be nested under Tools instead of it's own menu.**
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 47ee49d0f..b5e755c7f 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -22,4 +22,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit22e9f051b25081da7e8586603613e6ea::getLoader();
+return ComposerAutoloaderInitf98701dcedbd028a2e6420130e5c49ad::getLoader();
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 2180887b3..55f6ff3e7 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -6,7 +6,7 @@
$baseDir = dirname($vendorDir);
return array(
- '7166494aeff09009178f278afd86c83f' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v4p13.php',
+ '9b77ddcfb14408a32f5aaf74e0a11694' => $vendorDir . '/yahnis-elsts/plugin-update-checker/load-v5p1.php',
'd5afeacfe11f422b161ec2bf0bc6940f' => $baseDir . '/includes/Classifai/Helpers.php',
'dd5471419f4d492e4967fd310ef99d1b' => $baseDir . '/includes/Classifai/Blocks.php',
);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index aa3fe5936..61ee335e1 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit22e9f051b25081da7e8586603613e6ea
+class ComposerAutoloaderInitf98701dcedbd028a2e6420130e5c49ad
{
private static $loader;
@@ -24,16 +24,16 @@ public static function getLoader()
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit22e9f051b25081da7e8586603613e6ea', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitf98701dcedbd028a2e6420130e5c49ad', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
- spl_autoload_unregister(array('ComposerAutoloaderInit22e9f051b25081da7e8586603613e6ea', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitf98701dcedbd028a2e6420130e5c49ad', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit22e9f051b25081da7e8586603613e6ea::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInitf98701dcedbd028a2e6420130e5c49ad::getInitializer($loader));
$loader->register(true);
- $filesToLoad = \Composer\Autoload\ComposerStaticInit22e9f051b25081da7e8586603613e6ea::$files;
+ $filesToLoad = \Composer\Autoload\ComposerStaticInitf98701dcedbd028a2e6420130e5c49ad::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index c973d3c91..813da7dab 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,10 +4,10 @@
namespace Composer\Autoload;
-class ComposerStaticInit22e9f051b25081da7e8586603613e6ea
+class ComposerStaticInitf98701dcedbd028a2e6420130e5c49ad
{
public static $files = array (
- '7166494aeff09009178f278afd86c83f' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v4p13.php',
+ '9b77ddcfb14408a32f5aaf74e0a11694' => __DIR__ . '/..' . '/yahnis-elsts/plugin-update-checker/load-v5p1.php',
'd5afeacfe11f422b161ec2bf0bc6940f' => __DIR__ . '/../..' . '/includes/Classifai/Helpers.php',
'dd5471419f4d492e4967fd310ef99d1b' => __DIR__ . '/../..' . '/includes/Classifai/Blocks.php',
);
@@ -46,9 +46,9 @@ class ComposerStaticInit22e9f051b25081da7e8586603613e6ea
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit22e9f051b25081da7e8586603613e6ea::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit22e9f051b25081da7e8586603613e6ea::$prefixDirsPsr4;
- $loader->classMap = ComposerStaticInit22e9f051b25081da7e8586603613e6ea::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInitf98701dcedbd028a2e6420130e5c49ad::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInitf98701dcedbd028a2e6420130e5c49ad::$prefixDirsPsr4;
+ $loader->classMap = ComposerStaticInitf98701dcedbd028a2e6420130e5c49ad::$classMap;
}, null, ClassLoader::class);
}
diff --git a/vendor/composer/ca-bundle/res/cacert.pem b/vendor/composer/ca-bundle/res/cacert.pem
index 0bf312fe5..6b93dc34f 100644
--- a/vendor/composer/ca-bundle/res/cacert.pem
+++ b/vendor/composer/ca-bundle/res/cacert.pem
@@ -1,7 +1,7 @@
##
## Bundle of CA Root Certificates
##
-## Certificate data from Mozilla as of: Tue Oct 26 03:12:05 2021 GMT
+## Certificate data from Mozilla as of: Tue May 30 03:12:04 2023 GMT
##
## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates
@@ -13,8 +13,8 @@
## an Apache+mod_ssl webserver for SSL client authentication.
## Just configure this file as the SSLCACertificateFile.
##
-## Conversion done with mk-ca-bundle.pl version 1.28.
-## SHA256: bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f
+## Conversion done with mk-ca-bundle.pl version 1.29.
+## SHA256: c47475103fb05bb562bbadff0d1e72346b03236154e1448a6ca191b740f83507
##
@@ -39,28 +39,6 @@ hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
-----END CERTIFICATE-----
-GlobalSign Root CA - R2
-=======================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
-ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
-s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
-S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
-TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
-ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
-YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
-BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
-9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
-01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
-9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
-
Entrust.net Premium 2048 Secure Server CA
=========================================
-----BEGIN CERTIFICATE-----
@@ -511,29 +489,6 @@ IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
-----END CERTIFICATE-----
-Network Solutions Certificate Authority
-=======================================
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
-EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
-IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
-MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
-jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
-aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
-crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
-/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
-AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
-bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
-A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
-4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
-GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
-ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
-
COMODO ECC Certification Authority
==================================
-----BEGIN CERTIFICATE-----
@@ -573,28 +528,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
-----END CERTIFICATE-----
-Cybertrust Global Root
-======================
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
-ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
-MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
-ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
-0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
-AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
-89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
-8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
-MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
-A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
-lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
-5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
-hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
-X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
-
ePKI Root Certification Authority
=================================
-----BEGIN CERTIFICATE-----
@@ -670,26 +603,6 @@ NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
-----END CERTIFICATE-----
-Hongkong Post Root CA 1
-=======================
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
-DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
-NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
-IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
-ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
-auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
-qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
-V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
-HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
-h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
-l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
-IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
-T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
-c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
------END CERTIFICATE-----
-
SecureSign RootCA11
===================
-----BEGIN CERTIFICATE-----
@@ -1037,60 +950,6 @@ tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
-----END CERTIFICATE-----
-EC-ACC
-======
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
-BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
-ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
-VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
-CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
-BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
-MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
-SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
-Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
-cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
-w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
-ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
-HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
-E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
-0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
-VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
-Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
-dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
-lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
-Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
-l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
-E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
-5EI=
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2011
-=======================================================
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
-O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
-aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
-AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
-IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
-1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
-71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
-8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
-3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
-MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
-MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
-b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
-XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
-/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
-7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
-
Actalis Authentication Root CA
==============================
-----BEGIN CERTIFICATE-----
@@ -1382,40 +1241,6 @@ Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
-----END CERTIFICATE-----
-E-Tugra Certification Authority
-===============================
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
-DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
-ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
-ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
-NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
-QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
-cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
-DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
-hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
-CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
-ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
-BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
-E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
-rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
-jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
-rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
-dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
-/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
-MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
-kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
-XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
-VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
-a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
-dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
-KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
-Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
-8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
-C7TbO6Orb1wdtn7os4I07QZcJA==
------END CERTIFICATE-----
-
T-TeleSec GlobalRoot Class 2
============================
-----BEGIN CERTIFICATE-----
@@ -1737,20 +1562,6 @@ HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
-----END CERTIFICATE-----
-GlobalSign ECC Root CA - R4
-===========================
------BEGIN CERTIFICATE-----
-MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
-OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
-AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
-MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
-JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
------END CERTIFICATE-----
-
GlobalSign ECC Root CA - R5
===========================
-----BEGIN CERTIFICATE-----
@@ -1766,36 +1577,6 @@ uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
-----END CERTIFICATE-----
-Staat der Nederlanden EV Root CA
-================================
------BEGIN CERTIFICATE-----
-MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
-MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
-cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
-SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
-O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
-0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
-Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
-XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
-08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
-0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
-74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
-fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
-ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
-eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
-c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
-5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
-b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
-f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
-5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
-WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
-DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
-eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
------END CERTIFICATE-----
-
IdenTrust Commercial Root CA 1
==============================
-----BEGIN CERTIFICATE-----
@@ -2247,87 +2028,6 @@ F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
-----END CERTIFICATE-----
-TrustCor RootCert CA-1
-======================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
-MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
-U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
-MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
-YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
-VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
-dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
-jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
-pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
-JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
-gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
-/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
-BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
-mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
-ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
-qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
-3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
------END CERTIFICATE-----
-
-TrustCor RootCert CA-2
-======================
------BEGIN CERTIFICATE-----
-MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
-DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
-eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
-eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
-MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
-bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
-cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
-IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
-ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
-RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
-oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
-XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
-/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
-jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
-eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
-rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
-8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
-2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
-Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
-kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
-2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
-S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
-PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
-DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
-RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
-xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
-RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
------END CERTIFICATE-----
-
-TrustCor ECA-1
-==============
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
-MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
-U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
-N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
-MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
-IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
-MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
-xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
-p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
-fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
-YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
-f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
-AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
-/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
-hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
-J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
-jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
------END CERTIFICATE-----
-
SSL.com Root Certification Authority RSA
========================================
-----BEGIN CERTIFICATE-----
@@ -2472,96 +2172,6 @@ AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
-----END CERTIFICATE-----
-GTS Root R1
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
-9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
-aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
-r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
-LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
-4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
-06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
-wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
-3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
-JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
-BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
-d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
-fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
-ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
-gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
-4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
-tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
-pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
-sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
-CFF1pkgl
------END CERTIFICATE-----
-
-GTS Root R2
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
-k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
-7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
-m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
-dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
-ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
-cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
-Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
-aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
-5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
-BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
-vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
-+YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
-c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
-WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
-n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
-Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
-7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
-gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
-o/DUhgkC
------END CERTIFICATE-----
-
-GTS Root R3
-===========
------BEGIN CERTIFICATE-----
-MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
-Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
-0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
-glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
-KaqW04MjyaR7YbPMAuhd
------END CERTIFICATE-----
-
-GTS Root R4
-===========
------BEGIN CERTIFICATE-----
-MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
-6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
-2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
-N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
-zPKwTdb+mciUqXWi4w==
------END CERTIFICATE-----
-
UCA Global G2 Root
==================
-----BEGIN CERTIFICATE-----
@@ -3230,3 +2840,524 @@ ECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW
rcJRQO9gcS3ujwLEXQNwSaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/Qw
CZ61IygNnxS2PFOiTAZpffpskcYqSUXm7LcT4Tps
-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1Ud
+DgQWBBRlzeurNR4APn7VdMActHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4w
+gZswgZgGBFUdIAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j
+b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABCAG8AbgBhAG4A
+bwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAwADEANzAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9miWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL
+4QjbEwj4KKE1soCzC1HA01aajTNFSa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDb
+LIpgD7dvlAceHabJhfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1il
+I45PVf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZEEAEeiGaP
+cjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV1aUsIC+nmCjuRfzxuIgA
+LI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2tCsvMo2ebKHTEm9caPARYpoKdrcd7b/+A
+lun4jWq9GJAd/0kakFI3ky88Al2CdgtR5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH
+9IBk9W6VULgRfhVwOEqwf9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpf
+NIbnYrX9ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNKGbqE
+ZycPvEJdvSRUDewdcAZfpLz6IHxV
+-----END CERTIFICATE-----
+
+vTrus ECC Root CA
+=================
+-----BEGIN CERTIFICATE-----
+MIICDzCCAZWgAwIBAgIUbmq8WapTvpg5Z6LSa6Q75m0c1towCgYIKoZIzj0EAwMwRzELMAkGA1UE
+BhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBS
+b290IENBMB4XDTE4MDczMTA3MjY0NFoXDTQzMDczMTA3MjY0NFowRzELMAkGA1UEBhMCQ04xHDAa
+BgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBSb290IENBMHYw
+EAYHKoZIzj0CAQYFK4EEACIDYgAEZVBKrox5lkqqHAjDo6LN/llWQXf9JpRCux3NCNtzslt188+c
+ToL0v/hhJoVs1oVbcnDS/dtitN9Ti72xRFhiQgnH+n9bEOf+QP3A2MMrMudwpremIFUde4BdS49n
+TPEQo0IwQDAdBgNVHQ4EFgQUmDnNvtiyjPeyq+GtJK97fKHbH88wDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwMDaAAwZQIwV53dVvHH4+m4SVBrm2nDb+zDfSXkV5UT
+QJtS0zvzQBm8JsctBp61ezaf9SXUY2sAAjEA6dPGnlaaKsyh2j/IZivTWJwghfqrkYpwcBE4YGQL
+YgmRWAD5Tfs0aNoJrSEGGJTO
+-----END CERTIFICATE-----
+
+vTrus Root CA
+=============
+-----BEGIN CERTIFICATE-----
+MIIFVjCCAz6gAwIBAgIUQ+NxE9izWRRdt86M/TX9b7wFjUUwDQYJKoZIhvcNAQELBQAwQzELMAkG
+A1UEBhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xFjAUBgNVBAMTDXZUcnVzIFJv
+b3QgQ0EwHhcNMTgwNzMxMDcyNDA1WhcNNDMwNzMxMDcyNDA1WjBDMQswCQYDVQQGEwJDTjEcMBoG
+A1UEChMTaVRydXNDaGluYSBDby4sTHRkLjEWMBQGA1UEAxMNdlRydXMgUm9vdCBDQTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL1VfGHTuB0EYgWgrmy3cLRB6ksDXhA/kFocizuwZots
+SKYcIrrVQJLuM7IjWcmOvFjai57QGfIvWcaMY1q6n6MLsLOaXLoRuBLpDLvPbmyAhykUAyyNJJrI
+ZIO1aqwTLDPxn9wsYTwaP3BVm60AUn/PBLn+NvqcwBauYv6WTEN+VRS+GrPSbcKvdmaVayqwlHeF
+XgQPYh1jdfdr58tbmnDsPmcF8P4HCIDPKNsFxhQnL4Z98Cfe/+Z+M0jnCx5Y0ScrUw5XSmXX+6KA
+YPxMvDVTAWqXcoKv8R1w6Jz1717CbMdHflqUhSZNO7rrTOiwCcJlwp2dCZtOtZcFrPUGoPc2BX70
+kLJrxLT5ZOrpGgrIDajtJ8nU57O5q4IikCc9Kuh8kO+8T/3iCiSn3mUkpF3qwHYw03dQ+A0Em5Q2
+AXPKBlim0zvc+gRGE1WKyURHuFE5Gi7oNOJ5y1lKCn+8pu8fA2dqWSslYpPZUxlmPCdiKYZNpGvu
+/9ROutW04o5IWgAZCfEF2c6Rsffr6TlP9m8EQ5pV9T4FFL2/s1m02I4zhKOQUqqzApVg+QxMaPnu
+1RcN+HFXtSXkKe5lXa/R7jwXC1pDxaWG6iSe4gUH3DRCEpHWOXSuTEGC2/KmSNGzm/MzqvOmwMVO
+9fSddmPmAsYiS8GVP1BkLFTltvA8Kc9XAgMBAAGjQjBAMB0GA1UdDgQWBBRUYnBj8XWEQ1iO0RYg
+scasGrz2iTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOC
+AgEAKbqSSaet8PFww+SX8J+pJdVrnjT+5hpk9jprUrIQeBqfTNqK2uwcN1LgQkv7bHbKJAs5EhWd
+nxEt/Hlk3ODg9d3gV8mlsnZwUKT+twpw1aA08XXXTUm6EdGz2OyC/+sOxL9kLX1jbhd47F18iMjr
+jld22VkE+rxSH0Ws8HqA7Oxvdq6R2xCOBNyS36D25q5J08FsEhvMKar5CKXiNxTKsbhm7xqC5PD4
+8acWabfbqWE8n/Uxy+QARsIvdLGx14HuqCaVvIivTDUHKgLKeBRtRytAVunLKmChZwOgzoy8sHJn
+xDHO2zTlJQNgJXtxmOTAGytfdELSS8VZCAeHvsXDf+eW2eHcKJfWjwXj9ZtOyh1QRwVTsMo554Wg
+icEFOwE30z9J4nfrI8iIZjs9OXYhRvHsXyO466JmdXTBQPfYaJqT4i2pLr0cox7IdMakLXogqzu4
+sEb9b91fUlV1YvCXoHzXOP0l382gmxDPi7g4Xl7FtKYCNqEeXxzP4padKar9mK5S4fNBUvupLnKW
+nyfjqnN9+BojZns7q2WwMgFLFT49ok8MKzWixtlnEjUwzXYuFrOZnk1PTi07NEPhmg4NpGaXutIc
+SkwsKouLgU9xGqndXHt7CMUADTdA43x7VF8vhV929vensBxXVsFy6K2ir40zSbofitzmdHxghm+H
+l3s=
+-----END CERTIFICATE-----
+
+ISRG Root X2
+============
+-----BEGIN CERTIFICATE-----
+MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQswCQYDVQQGEwJV
+UzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElT
+UkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVT
+MSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNS
+RyBSb290IFgyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0H
+ttwW+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9ItgKbppb
+d9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZIzj0EAwMDaAAwZQIwe3lORlCEwkSHRhtF
+cP9Ymd70/aTSVaYgLXTWNLxBo1BfASdWtL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5
+U6VR5CmD1/iQMVtCnwr1/q4AaOeMSQ+2b1tbFfLn
+-----END CERTIFICATE-----
+
+HiPKI Root CA - G1
+==================
+-----BEGIN CERTIFICATE-----
+MIIFajCCA1KgAwIBAgIQLd2szmKXlKFD6LDNdmpeYDANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xGzAZBgNVBAMMEkhpUEtJ
+IFJvb3QgQ0EgLSBHMTAeFw0xOTAyMjIwOTQ2MDRaFw0zNzEyMzExNTU5NTlaME8xCzAJBgNVBAYT
+AlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEbMBkGA1UEAwwSSGlQS0kg
+Um9vdCBDQSAtIEcxMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9B5/UnMyDHPkvRN0
+o9QwqNCuS9i233VHZvR85zkEHmpwINJaR3JnVfSl6J3VHiGh8Ge6zCFovkRTv4354twvVcg3Px+k
+wJyz5HdcoEb+d/oaoDjq7Zpy3iu9lFc6uux55199QmQ5eiY29yTw1S+6lZgRZq2XNdZ1AYDgr/SE
+YYwNHl98h5ZeQa/rh+r4XfEuiAU+TCK72h8q3VJGZDnzQs7ZngyzsHeXZJzA9KMuH5UHsBffMNsA
+GJZMoYFL3QRtU6M9/Aes1MU3guvklQgZKILSQjqj2FPseYlgSGDIcpJQ3AOPgz+yQlda22rpEZfd
+hSi8MEyr48KxRURHH+CKFgeW0iEPU8DtqX7UTuybCeyvQqww1r/REEXgphaypcXTT3OUM3ECoWqj
+1jOXTyFjHluP2cFeRXF3D4FdXyGarYPM+l7WjSNfGz1BryB1ZlpK9p/7qxj3ccC2HTHsOyDry+K4
+9a6SsvfhhEvyovKTmiKe0xRvNlS9H15ZFblzqMF8b3ti6RZsR1pl8w4Rm0bZ/W3c1pzAtH2lsN0/
+Vm+h+fbkEkj9Bn8SV7apI09bA8PgcSojt/ewsTu8mL3WmKgMa/aOEmem8rJY5AIJEzypuxC00jBF
+8ez3ABHfZfjcK0NVvxaXxA/VLGGEqnKG/uY6fsI/fe78LxQ+5oXdUG+3Se0CAwEAAaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ncX+l6o/vY9cdVouslGDDjYr7AwDgYDVR0PAQH/BAQD
+AgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBQUfB13HAE4/+qddRxosuej6ip0691x1TPOhwEmSKsxBHi
+7zNKpiMdDg1H2DfHb680f0+BazVP6XKlMeJ45/dOlBhbQH3PayFUhuaVevvGyuqcSE5XCV0vrPSl
+tJczWNWseanMX/mF+lLFjfiRFOs6DRfQUsJ748JzjkZ4Bjgs6FzaZsT0pPBWGTMpWmWSBUdGSquE
+wx4noR8RkpkndZMPvDY7l1ePJlsMu5wP1G4wB9TcXzZoZjmDlicmisjEOf6aIW/Vcobpf2Lll07Q
+JNBAsNB1CI69aO4I1258EHBGG3zgiLKecoaZAeO/n0kZtCW+VmWuF2PlHt/o/0elv+EmBYTksMCv
+5wiZqAxeJoBF1PhoL5aPruJKHJwWDBNvOIf2u8g0X5IDUXlwpt/L9ZlNec1OvFefQ05rLisY+Gpz
+jLrFNe85akEez3GoorKGB1s6yeHvP2UEgEcyRHCVTjFnanRbEEV16rCf0OY1/k6fi8wrkkVbbiVg
+hUbN0aqwdmaTd5a+g744tiROJgvM7XpWGuDpWsZkrUx6AEhEL7lAuxM+vhV4nYWBSipX3tUZQ9rb
+yltHhoMLP7YNdnhzeSJesYAfz77RP1YQmCuVh6EfnWQUYDksswBVLuT1sw5XxJFBAJw/6KXf6vb/
+yPCtbVKoF6ubYfwSUTXkJf2vqmqGOQ==
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB3DCCAYOgAwIBAgINAgPlfvU/k/2lCSGypjAKBggqhkjOPQQDAjBQMSQwIgYDVQQLExtHbG9i
+YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTIxMTEzMDAwMDAwWhcNMzgwMTE5MDMxNDA3WjBQMSQwIgYDVQQLExtHbG9i
+YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4xnnTj2wlDp8uORkcA6SumuU5BwkW
+ymOxuYb4ilfBV85C+nOh92VC/x7BALJucw7/xyHlGKSq2XE/qNS5zowdo0IwQDAOBgNVHQ8BAf8E
+BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVLB7rUW44kB/+wpu+74zyTyjhNUwCgYI
+KoZIzj0EAwIDRwAwRAIgIk90crlgr/HmnKAWBVBfw147bmF0774BxL4YSFlhgjICICadVGNA3jdg
+UM/I2O2dgq43mLyjj0xMqTQrbO/7lZsm
+-----END CERTIFICATE-----
+
+GTS Root R1
+===========
+-----BEGIN CERTIFICATE-----
+MIIFVzCCAz+gAwIBAgINAgPlk28xsBNJiGuiFzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx9vaM
+f/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7raKb0
+xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnWr4+w
+B7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqMLnXW
+nOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly4cpk
+9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr06zq
+kUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92wO1A
+K/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om3xPX
+V2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNuJLDW
+cfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEMBQAD
+ggIBAJ+qQibbC5u+/x6Wki4+omVKapi6Ist9wTrYggoGxval3sBOh2Z5ofmmWJyq+bXmYOfg6LEe
+QkEzCzc9zolwFcq1JKjPa7XSQCGYzyI0zzvFIoTgxQ6KfF2I5DUkzps+GlQebtuyh6f88/qBVRRi
+ClmpIgUxPoLW7ttXNLwzldMXG+gnoot7TiYaelpkttGsN/H9oPM47HLwEXWdyzRSjeZ2axfG34ar
+J45JK3VmgRAhpuo+9K4l/3wV3s6MJT/KYnAK9y8JZgfIPxz88NtFMN9iiMG1D53Dn0reWVlHxYci
+NuaCp+0KueIHoI17eko8cdLiA6EfMgfdG+RCzgwARWGAtQsgWSl4vflVy2PFPEz0tv/bal8xa5me
+LMFrUKTX5hgUvYU/Z6tGn6D/Qqc6f1zLXbBwHSs09dR2CQzreExZBfMzQsNhFRAbd03OIozUhfJF
+fbdT6u9AWpQKXCBfTkBdYiJ23//OYb2MI3jSNwLgjt7RETeJ9r/tSQdirpLsQBqvFAnZ0E6yove+
+7u7Y/9waLd64NnHi/Hm3lCXRSHNboTXns5lndcEZOitHTtNCjv0xyBZm2tIMPNuzjsmhDYAPexZ3
+FL//2wmUspO8IFgV6dtxQ/PeEMMA3KgqlbbC1j+Qa3bbbP6MvPJwNQzcmRk13NfIRmPVNnGuV/u3
+gm3c
+-----END CERTIFICATE-----
+
+GTS Root R2
+===========
+-----BEGIN CERTIFICATE-----
+MIIFVzCCAz+gAwIBAgINAgPlrsWNBCUaqxElqjANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTukk3Lv
+CvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo7JUl
+e3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWIm8Wb
+a96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5GmdFrS
++LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbuak7M
+kogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscszcTJG
+r61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RWIr9q
+S34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73VululycslaVNV
+J1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy5okL
+dWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEMBQAD
+ggIBAB/Kzt3HvqGf2SdMC9wXmBFqiN495nFWcrKeGk6c1SuYJF2ba3uwM4IJvd8lRuqYnrYb/oM8
+0mJhwQTtzuDFycgTE1XnqGOtjHsB/ncw4c5omwX4Eu55MaBBRTUoCnGkJE+M3DyCB19m3H0Q/gxh
+swWV7uGugQ+o+MePTagjAiZrHYNSVc61LwDKgEDg4XSsYPWHgJ2uNmSRXbBoGOqKYcl3qJfEycel
+/FVL8/B/uWU9J2jQzGv6U53hkRrJXRqWbTKH7QMgyALOWr7Z6v2yTcQvG99fevX4i8buMTolUVVn
+jWQye+mew4K6Ki3pHrTgSAai/GevHyICc/sgCq+dVEuhzf9gR7A/Xe8bVr2XIZYtCtFenTgCR2y5
+9PYjJbigapordwj6xLEokCZYCDzifqrXPW+6MYgKBesntaFJ7qBFVHvmJ2WZICGoo7z7GJa7Um8M
+7YNRTOlZ4iBgxcJlkoKM8xAfDoqXvneCbT+PHV28SSe9zE8P4c52hgQjxcCMElv924SgJPFI/2R8
+0L5cFtHvma3AH/vLrrw4IgYmZNralw4/KBVEqE8AyvCazM90arQ+POuV7LXTWtiBmelDGDfrs7vR
+WGJB82bSj6p4lVQgw1oudCvV0b4YacCs1aTPObpRhANl6WLAYv7YTVWW4tAR+kg0Eeye7QUd5MjW
+HYbL
+-----END CERTIFICATE-----
+
+GTS Root R3
+===========
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPluILrIPglJ209ZjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
+MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMw
+HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
+R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcqhkjO
+PQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUURout
+736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24CejQjBA
+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP0/Eq
+Er24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEA9uEglRR7VKOQFhG/hMjqb2sXnh5GmCCbn9MN2azT
+L818+FsuVbu/3ZL3pAzcMeGiAjEA/JdmZuVDFhOD3cffL74UOO0BzrEXGhF16b0DjyZ+hOXJYKaV
+11RZt+cRLInUue4X
+-----END CERTIFICATE-----
+
+GTS Root R4
+===========
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPlwGjvYxqccpBQUjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
+MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQw
+HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
+R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcqhkjO
+PQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa6zzu
+hXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqjQjBA
+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV2Py1
+PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/C
+r8deVl5c1RxYIigL9zC2L7F8AjEA8GE8p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh
+4rsUecrNIdSUtUlD
+-----END CERTIFICATE-----
+
+Telia Root CA v2
+================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIPAWdfJ9b+euPkrL4JWwWeMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
+AkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2
+MjAeFw0xODExMjkxMTU1NTRaFw00MzExMjkxMTU1NTRaMEQxCzAJBgNVBAYTAkZJMRowGAYDVQQK
+DBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2MjCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBALLQPwe84nvQa5n44ndp586dpAO8gm2h/oFlH0wnrI4AuhZ7
+6zBqAMCzdGh+sq/H1WKzej9Qyow2RCRj0jbpDIX2Q3bVTKFgcmfiKDOlyzG4OiIjNLh9vVYiQJ3q
+9HsDrWj8soFPmNB06o3lfc1jw6P23pLCWBnglrvFxKk9pXSW/q/5iaq9lRdU2HhE8Qx3FZLgmEKn
+pNaqIJLNwaCzlrI6hEKNfdWV5Nbb6WLEWLN5xYzTNTODn3WhUidhOPFZPY5Q4L15POdslv5e2QJl
+tI5c0BE0312/UqeBAMN/mUWZFdUXyApT7GPzmX3MaRKGwhfwAZ6/hLzRUssbkmbOpFPlob/E2wnW
+5olWK8jjfN7j/4nlNW4o6GwLI1GpJQXrSPjdscr6bAhR77cYbETKJuFzxokGgeWKrLDiKca5JLNr
+RBH0pUPCTEPlcDaMtjNXepUugqD0XBCzYYP2AgWGLnwtbNwDRm41k9V6lS/eINhbfpSQBGq6WT0E
+BXWdN6IOLj3rwaRSg/7Qa9RmjtzG6RJOHSpXqhC8fF6CfaamyfItufUXJ63RDolUK5X6wK0dmBR4
+M0KGCqlztft0DbcbMBnEWg4cJ7faGND/isgFuvGqHKI3t+ZIpEYslOqodmJHixBTB0hXbOKSTbau
+BcvcwUpej6w9GU7C7WB1K9vBykLVAgMBAAGjYzBhMB8GA1UdIwQYMBaAFHKs5DN5qkWH9v2sHZ7W
+xy+G2CQ5MB0GA1UdDgQWBBRyrOQzeapFh/b9rB2e1scvhtgkOTAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAoDtZpwmUPjaE0n4vOaWWl/oRrfxn83EJ
+8rKJhGdEr7nv7ZbsnGTbMjBvZ5qsfl+yqwE2foH65IRe0qw24GtixX1LDoJt0nZi0f6X+J8wfBj5
+tFJ3gh1229MdqfDBmgC9bXXYfef6xzijnHDoRnkDry5023X4blMMA8iZGok1GTzTyVR8qPAs5m4H
+eW9q4ebqkYJpCh3DflminmtGFZhb069GHWLIzoBSSRE/yQQSwxN8PzuKlts8oB4KtItUsiRnDe+C
+y748fdHif64W1lZYudogsYMVoe+KTTJvQS8TUoKU1xrBeKJR3Stwbbca+few4GeXVtt8YVMJAygC
+QMez2P2ccGrGKMOF6eLtGpOg3kuYooQ+BXcBlj37tCAPnHICehIv1aO6UXivKitEZU61/Qrowc15
+h2Er3oBXRb9n8ZuRXqWk7FlIEA04x7D6w0RtBPV4UBySllva9bguulvP5fBqnUsvWHMtTy3EHD70
+sz+rFQ47GUGKpMFXEmZxTPpT41frYpUJnlTd0cI8Vzy9OK2YZLe4A5pTVmBds9hCG1xLEooc6+t9
+xnppxyd/pPiL8uSUZodL6ZQHCRJ5irLrdATczvREWeAWysUsWNc8e89ihmpQfTU2Zqf7N+cox9jQ
+raVplI/owd8k+BsHMYeB2F326CjYSlKArBPuUBQemMc=
+-----END CERTIFICATE-----
+
+D-TRUST BR Root CA 1 2020
+=========================
+-----BEGIN CERTIFICATE-----
+MIIC2zCCAmCgAwIBAgIQfMmPK4TX3+oPyWWa00tNljAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEJSIFJvb3QgQ0EgMSAy
+MDIwMB4XDTIwMDIxMTA5NDUwMFoXDTM1MDIxMTA5NDQ1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
+BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDEgMjAyMDB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABMbLxyjR+4T1mu9CFCDhQ2tuda38KwOE1HaTJddZO0Flax7mNCq7
+dPYSzuht56vkPE4/RAiLzRZxy7+SmfSk1zxQVFKQhYN4lGdnoxwJGT11NIXe7WB9xwy0QVK5buXu
+QqOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHOREKv/VbNafAkl1bK6CKBrqx9t
+MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
+bmV0L2NybC9kLXRydXN0X2JyX3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwQlIlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
+PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
+AwNpADBmAjEAlJAtE/rhY/hhY+ithXhUkZy4kzg+GkHaQBZTQgjKL47xPoFWwKrY7RjEsK70Pvom
+AjEA8yjixtsrmfu3Ubgko6SUeho/5jbiA1czijDLgsfWFBHVdWNbFJWcHwHP2NVypw87
+-----END CERTIFICATE-----
+
+D-TRUST EV Root CA 1 2020
+=========================
+-----BEGIN CERTIFICATE-----
+MIIC2zCCAmCgAwIBAgIQXwJB13qHfEwDo6yWjfv/0DAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEVWIFJvb3QgQ0EgMSAy
+MDIwMB4XDTIwMDIxMTEwMDAwMFoXDTM1MDIxMTA5NTk1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
+BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDEgMjAyMDB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABPEL3YZDIBnfl4XoIkqbz52Yv7QFJsnL46bSj8WeeHsxiamJrSc8
+ZRCC/N/DnU7wMyPE0jL1HLDfMxddxfCxivnvubcUyilKwg+pf3VlSSowZ/Rk99Yad9rDwpdhQntJ
+raOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFH8QARY3OqQo5FD4pPfsazK2/umL
+MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
+bmV0L2NybC9kLXRydXN0X2V2X3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwRVYlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
+PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
+AwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CAy/m0sRtW9XLS/BnR
+AjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJbgfM0agPnIjhQW+0ZT0MW
+-----END CERTIFICATE-----
+
+DigiCert TLS ECC P384 Root G5
+=============================
+-----BEGIN CERTIFICATE-----
+MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURpZ2lDZXJ0IFRMUyBFQ0MgUDM4
+NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQg
+Um9vdCBHNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1Tzvd
+lHJS7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp0zVozptj
+n4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICISB4CIfBFqMA4GA1UdDwEB
+/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gAMGUCMQCJao1H5+z8blUD2Wds
+Jk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQLgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIx
+AJSdYsiJvRmEFOml+wG4DXZDjC5Ty3zfDBeWUA==
+-----END CERTIFICATE-----
+
+DigiCert TLS RSA4096 Root G5
+============================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCPm0eKj6ftpqMzeJ3nzPijANBgkqhkiG9w0BAQwFADBNMQswCQYDVQQG
+EwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0
+MDk2IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcNNDYwMTE0MjM1OTU5WjBNMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0MDk2
+IFJvb3QgRzUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz0PTJeRGd/fxmgefM1eS8
+7IE+ajWOLrfn3q/5B03PMJ3qCQuZvWxX2hhKuHisOjmopkisLnLlvevxGs3npAOpPxG02C+JFvuU
+AT27L/gTBaF4HI4o4EXgg/RZG5Wzrn4DReW+wkL+7vI8toUTmDKdFqgpwgscONyfMXdcvyej/Ces
+tyu9dJsXLfKB2l2w4SMXPohKEiPQ6s+d3gMXsUJKoBZMpG2T6T867jp8nVid9E6P/DsjyG244gXa
+zOvswzH016cpVIDPRFtMbzCe88zdH5RDnU1/cHAN1DrRN/BsnZvAFJNY781BOHW8EwOVfH/jXOnV
+DdXifBBiqmvwPXbzP6PosMH976pXTayGpxi0KcEsDr9kvimM2AItzVwv8n/vFfQMFawKsPHTDU9q
+TXeXAaDxZre3zu/O7Oyldcqs4+Fj97ihBMi8ez9dLRYiVu1ISf6nL3kwJZu6ay0/nTvEF+cdLvvy
+z6b84xQslpghjLSR6Rlgg/IwKwZzUNWYOwbpx4oMYIwo+FKbbuH2TbsGJJvXKyY//SovcfXWJL5/
+MZ4PbeiPT02jP/816t9JXkGPhvnxd3lLG7SjXi/7RgLQZhNeXoVPzthwiHvOAbWWl9fNff2C+MIk
+wcoBOU+NosEUQB+cZtUMCUbW8tDRSHZWOkPLtgoRObqME2wGtZ7P6wIDAQABo0IwQDAdBgNVHQ4E
+FgQUUTMc7TZArxfTJc1paPKvTiM+s0EwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAGCmr1tfV9qJ20tQqcQjNSH/0GEwhJG3PxDPJY7Jv0Y02cEhJhxw
+GXIeo8mH/qlDZJY6yFMECrZBu8RHANmfGBg7sg7zNOok992vIGCukihfNudd5N7HPNtQOa27PShN
+lnx2xlv0wdsUpasZYgcYQF+Xkdycx6u1UQ3maVNVzDl92sURVXLFO4uJ+DQtpBflF+aZfTCIITfN
+MBc9uPK8qHWgQ9w+iUuQrm0D4ByjoJYJu32jtyoQREtGBzRj7TG5BO6jm5qu5jF49OokYTurWGT/
+u4cnYiWB39yhL/btp/96j1EuMPikAdKFOV8BmZZvWltwGUb+hmA+rYAQCd05JS9Yf7vSdPD3Rh9G
+OUrYU9DzLjtxpdRv/PNn5AeP3SYZ4Y1b+qOTEZvpyDrDVWiakuFSdjjo4bq9+0/V77PnSIMx8IIh
+47a+p6tv75/fTM8BuGJqIz3nCU2AG3swpMPdB380vqQmsvZB6Akd4yCYqjdP//fx4ilwMUc/dNAU
+FvohigLVigmUdy7yWSiLfFCSCmZ4OIN1xLVaqBHG5cGdZlXPU8Sv13WFqUITVuwhd4GTWgzqltlJ
+yqEI8pc7bZsEGCREjnwB8twl2F6GmrE52/WRMmrRpnCKovfepEWFJqgejF0pW8hL2JpqA15w8oVP
+bEtoL8pU9ozaMv7Da4M/OMZ+
+-----END CERTIFICATE-----
+
+Certainly Root R1
+=================
+-----BEGIN CERTIFICATE-----
+MIIFRzCCAy+gAwIBAgIRAI4P+UuQcWhlM1T01EQ5t+AwDQYJKoZIhvcNAQELBQAwPTELMAkGA1UE
+BhMCVVMxEjAQBgNVBAoTCUNlcnRhaW5seTEaMBgGA1UEAxMRQ2VydGFpbmx5IFJvb3QgUjEwHhcN
+MjEwNDAxMDAwMDAwWhcNNDYwNDAxMDAwMDAwWjA9MQswCQYDVQQGEwJVUzESMBAGA1UEChMJQ2Vy
+dGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBSMTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBANA21B/q3avk0bbm+yLA3RMNansiExyXPGhjZjKcA7WNpIGD2ngwEc/csiu+kr+O
+5MQTvqRoTNoCaBZ0vrLdBORrKt03H2As2/X3oXyVtwxwhi7xOu9S98zTm/mLvg7fMbedaFySpvXl
+8wo0tf97ouSHocavFwDvA5HtqRxOcT3Si2yJ9HiG5mpJoM610rCrm/b01C7jcvk2xusVtyWMOvwl
+DbMicyF0yEqWYZL1LwsYpfSt4u5BvQF5+paMjRcCMLT5r3gajLQ2EBAHBXDQ9DGQilHFhiZ5shGI
+XsXwClTNSaa/ApzSRKft43jvRl5tcdF5cBxGX1HpyTfcX35pe0HfNEXgO4T0oYoKNp43zGJS4YkN
+KPl6I7ENPT2a/Z2B7yyQwHtETrtJ4A5KVpK8y7XdeReJkd5hiXSSqOMyhb5OhaRLWcsrxXiOcVTQ
+AjeZjOVJ6uBUcqQRBi8LjMFbvrWhsFNunLhgkR9Za/kt9JQKl7XsxXYDVBtlUrpMklZRNaBA2Cnb
+rlJ2Oy0wQJuK0EJWtLeIAaSHO1OWzaMWj/Nmqhexx2DgwUMFDO6bW2BvBlyHWyf5QBGenDPBt+U1
+VwV/J84XIIwc/PH72jEpSe31C4SnT8H2TsIonPru4K8H+zMReiFPCyEQtkA6qyI6BJyLm4SGcprS
+p6XEtHWRqSsjAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBTgqj8ljZ9EXME66C6ud0yEPmcM9DANBgkqhkiG9w0BAQsFAAOCAgEAuVevuBLaV4OPaAsz
+HQNTVfSVcOQrPbA56/qJYv331hgELyE03fFo8NWWWt7CgKPBjcZq91l3rhVkz1t5BXdm6ozTaw3d
+8VkswTOlMIAVRQdFGjEitpIAq5lNOo93r6kiyi9jyhXWx8bwPWz8HA2YEGGeEaIi1wrykXprOQ4v
+MMM2SZ/g6Q8CRFA3lFV96p/2O7qUpUzpvD5RtOjKkjZUbVwlKNrdrRT90+7iIgXr0PK3aBLXWopB
+GsaSpVo7Y0VPv+E6dyIvXL9G+VoDhRNCX8reU9ditaY1BMJH/5n9hN9czulegChB8n3nHpDYT3Y+
+gjwN/KUD+nsa2UUeYNrEjvn8K8l7lcUq/6qJ34IxD3L/DCfXCh5WAFAeDJDBlrXYFIW7pw0WwfgH
+JBu6haEaBQmAupVjyTrsJZ9/nbqkRxWbRHDxakvWOF5D8xh+UG7pWijmZeZ3Gzr9Hb4DJqPb1OG7
+fpYnKx3upPvaJVQTA945xsMfTZDsjxtK0hzthZU4UHlG1sGQUDGpXJpuHfUzVounmdLyyCwzk5Iw
+x06MZTMQZBf9JBeW0Y3COmor6xOLRPIh80oat3df1+2IpHLlOR+Vnb5nwXARPbv0+Em34yaXOp/S
+X3z7wJl8OSngex2/DaeP0ik0biQVy96QXr8axGbqwua6OV+KmalBWQewLK8=
+-----END CERTIFICATE-----
+
+Certainly Root E1
+=================
+-----BEGIN CERTIFICATE-----
+MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBFMTAeFw0yMTA0
+MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlu
+bHkxGjAYBgNVBAMTEUNlcnRhaW5seSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4
+fxzf7flHh4axpMCK+IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9
+YBk2QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4hevIIgcwCgYIKoZIzj0E
+AwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozmut6Dacpps6kFtZaSF4fC0urQe87YQVt8
+rgIwRt7qy12a7DLCZRawTDBcMPPaTnOGBtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
+-----END CERTIFICATE-----
+
+E-Tugra Global Root CA RSA v3
+=============================
+-----BEGIN CERTIFICATE-----
+MIIF8zCCA9ugAwIBAgIUDU3FzRYilZYIfrgLfxUGNPt5EDQwDQYJKoZIhvcNAQELBQAwgYAxCzAJ
+BgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVncmEgRUJHIEEuUy4xHTAb
+BgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYDVQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290
+IENBIFJTQSB2MzAeFw0yMDAzMTgwOTA3MTdaFw00NTAzMTIwOTA3MTdaMIGAMQswCQYDVQQGEwJU
+UjEPMA0GA1UEBxMGQW5rYXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRF
+LVR1Z3JhIFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBSU0Eg
+djMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCiZvCJt3J77gnJY9LTQ91ew6aEOErx
+jYG7FL1H6EAX8z3DeEVypi6Q3po61CBxyryfHUuXCscxuj7X/iWpKo429NEvx7epXTPcMHD4QGxL
+sqYxYdE0PD0xesevxKenhOGXpOhL9hd87jwH7eKKV9y2+/hDJVDqJ4GohryPUkqWOmAalrv9c/SF
+/YP9f4RtNGx/ardLAQO/rWm31zLZ9Vdq6YaCPqVmMbMWPcLzJmAy01IesGykNz709a/r4d+ABs8q
+QedmCeFLl+d3vSFtKbZnwy1+7dZ5ZdHPOrbRsV5WYVB6Ws5OUDGAA5hH5+QYfERaxqSzO8bGwzrw
+bMOLyKSRBfP12baqBqG3q+Sx6iEUXIOk/P+2UNOMEiaZdnDpwA+mdPy70Bt4znKS4iicvObpCdg6
+04nmvi533wEKb5b25Y08TVJ2Glbhc34XrD2tbKNSEhhw5oBOM/J+JjKsBY04pOZ2PJ8QaQ5tndLB
+eSBrW88zjdGUdjXnXVXHt6woq0bM5zshtQoK5EpZ3IE1S0SVEgpnpaH/WwAH0sDM+T/8nzPyAPiM
+bIedBi3x7+PmBvrFZhNb/FAHnnGGstpvdDDPk1Po3CLW3iAfYY2jLqN4MpBs3KwytQXk9TwzDdbg
+h3cXTJ2w2AmoDVf3RIXwyAS+XF1a4xeOVGNpf0l0ZAWMowIDAQABo2MwYTAPBgNVHRMBAf8EBTAD
+AQH/MB8GA1UdIwQYMBaAFLK0ruYt9ybVqnUtdkvAG1Mh0EjvMB0GA1UdDgQWBBSytK7mLfcm1ap1
+LXZLwBtTIdBI7zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBAImocn+M684uGMQQ
+gC0QDP/7FM0E4BQ8Tpr7nym/Ip5XuYJzEmMmtcyQ6dIqKe6cLcwsmb5FJ+Sxce3kOJUxQfJ9emN4
+38o2Fi+CiJ+8EUdPdk3ILY7r3y18Tjvarvbj2l0Upq7ohUSdBm6O++96SmotKygY/r+QLHUWnw/q
+ln0F7psTpURs+APQ3SPh/QMSEgj0GDSz4DcLdxEBSL9htLX4GdnLTeqjjO/98Aa1bZL0SmFQhO3s
+SdPkvmjmLuMxC1QLGpLWgti2omU8ZgT5Vdps+9u1FGZNlIM7zR6mK7L+d0CGq+ffCsn99t2HVhjY
+sCxVYJb6CH5SkPVLpi6HfMsg2wY+oF0Dd32iPBMbKaITVaA9FCKvb7jQmhty3QUBjYZgv6Rn7rWl
+DdF/5horYmbDB7rnoEgcOMPpRfunf/ztAmgayncSd6YAVSgU7NbHEqIbZULpkejLPoeJVF3Zr52X
+nGnnCv8PWniLYypMfUeUP95L6VPQMPHF9p5J3zugkaOj/s1YzOrfr28oO6Bpm4/srK4rVJ2bBLFH
+IK+WEj5jlB0E5y67hscMmoi/dkfv97ALl2bSRM9gUgfh1SxKOidhd8rXj+eHDjD/DLsE4mHDosiX
+YY60MGo8bcIHX0pzLz/5FooBZu+6kcpSV3uu1OYP3Qt6f4ueJiDPO++BcYNZ
+-----END CERTIFICATE-----
+
+E-Tugra Global Root CA ECC v3
+=============================
+-----BEGIN CERTIFICATE-----
+MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMwgYAxCzAJBgNV
+BAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVncmEgRUJHIEEuUy4xHTAbBgNV
+BAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYDVQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENB
+IEVDQyB2MzAeFw0yMDAzMTgwOTQ2NThaFw00NTAzMTIwOTQ2NThaMIGAMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBxMGQW5rYXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1
+Z3JhIFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBFQ0MgdjMw
+djAQBgcqhkjOPQIBBgUrgQQAIgNiAASOmCm/xxAeJ9urA8woLNheSBkQKczLWYHMjLiSF4mDKpL2
+w6QdTGLVn9agRtwcvHbB40fQWxPa56WzZkjnIZpKT4YKfWzqTTKACrJ6CZtpS5iB4i7sAnCWH/31
+Rs7K3IKjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU/4Ixcj75xGZsrTie0bBRiKWQ
+zPUwHQYDVR0OBBYEFP+CMXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO
+PQQDAwNpADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/67W4W
+Aie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFxvmjkI6TZraE3
+-----END CERTIFICATE-----
+
+Security Communication RootCA3
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNVBAYTAkpQMSUw
+IwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQDEx5TZWN1cml0eSBD
+b21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQsw
+CQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UE
+AxMeU2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4rCmDvu20r
+hvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzAlrenfna84xtSGc4RHwsE
+NPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MGTfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2
+/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF79+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGm
+npjKIG58u4iFW/vAEGK78vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtY
+XLVqAvO4g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3weGVPK
+p7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst+3A7caoreyYn8xrC
+3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M0V9hvqG8OmpI6iZVIhZdXw3/JzOf
+GAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQT9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0Vcw
+CBEF/VfR2ccCAwEAAaNCMEAwHQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB
+/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
+YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PAFNr0Y/Dq9HHu
+Tofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd9XbXv8S2gVj/yP9kaWJ5rW4O
+H3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQIUYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASx
+YfQAW0q3nHE3GYV5v4GwxxMOdnE+OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZ
+XSEIx2C/pHF7uNkegr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml
++LLfiAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUVnuiZIesn
+KwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD2NCcnWXL0CsnMQMeNuE9
+dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm
+6Vwdp6POXiUyK+OVrCoHzrQoeIY8LaadTdJ0MN1kURXbg4NR16/9M51NZg==
+-----END CERTIFICATE-----
+
+Security Communication ECC RootCA1
+==================================
+-----BEGIN CERTIFICATE-----
+MIICODCCAb6gAwIBAgIJANZdm7N4gS7rMAoGCCqGSM49BAMDMGExCzAJBgNVBAYTAkpQMSUwIwYD
+VQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYDVQQDEyJTZWN1cml0eSBDb21t
+dW5pY2F0aW9uIEVDQyBSb290Q0ExMB4XDTE2MDYxNjA1MTUyOFoXDTM4MDExODA1MTUyOFowYTEL
+MAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKzApBgNV
+BAMTIlNlY3VyaXR5IENvbW11bmljYXRpb24gRUNDIFJvb3RDQTEwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAASkpW9gAwPDvTH00xecK4R1rOX9PVdu12O/5gSJko6BnOPpR27KkBLIE+CnnfdldB9sELLo
+5OnvbYUymUSxXv3MdhDYW72ixvnWQuRXdtyQwjWpS4g8EkdtXP9JTxpKULGjQjBAMB0GA1UdDgQW
+BBSGHOf+LaVKiwj+KBH6vqNm+GBZLzAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAK
+BggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3L
+snNdo4gIxwwCMQDAqy0Obe0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70e
+N9k=
+-----END CERTIFICATE-----
+
+BJCA Global Root CA1
+====================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQG
+EwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkxHTAbBgNVBAMMFEJK
+Q0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAzMTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkG
+A1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQD
+DBRCSkNBIEdsb2JhbCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFm
+CL3ZxRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZspDyRhyS
+sTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O558dnJCNPYwpj9mZ9S1Wn
+P3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgRat7GGPZHOiJBhyL8xIkoVNiMpTAK+BcW
+yqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRj
+eulumijWML3mG90Vr4TqnMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNn
+MoH1V6XKV0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/pj+b
+OT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZOz2nxbkRs1CTqjSSh
+GL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXnjSXWgXSHRtQpdaJCbPdzied9v3pK
+H9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMB
+AAGjQjBAMB0GA1UdDgQWBBTF7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4
+YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3KliawLwQ8hOnThJ
+dMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u+2D2/VnGKhs/I0qUJDAnyIm8
+60Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuh
+TaRjAv04l5U/BXCga99igUOLtFkNSoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW
+4AB+dAb/OMRyHdOoP2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmp
+GQrI+pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRzznfSxqxx
+4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9eVzYH6Eze9mCUAyTF6ps
+3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4S
+SPfSKcOYKMryMguTjClPPGAyzQWWYezyr/6zcCwupvI=
+-----END CERTIFICATE-----
+
+BJCA Global Root CA2
+====================
+-----BEGIN CERTIFICATE-----
+MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQswCQYDVQQGEwJD
+TjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkxHTAbBgNVBAMMFEJKQ0Eg
+R2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgyMVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UE
+BhMCQ04xJjAkBgNVBAoMHUJFSUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRC
+SkNBIEdsb2JhbCBSb290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jl
+SR9BIgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK++kpRuDCK
+/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJKsVF/BvDRgh9Obl+rg/xI
+1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8
+W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8g
+UXOQwKhbYdDFUDn9hf7B43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w==
+-----END CERTIFICATE-----
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index f14f14938..3e3f99158 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -7,12 +7,12 @@
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
+ "reference": "90d087e988ff194065333d16bc5cf649872d9cdb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
- "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/90d087e988ff194065333d16bc5cf649872d9cdb",
+ "reference": "90d087e988ff194065333d16bc5cf649872d9cdb",
"shasum": ""
},
"require": {
@@ -26,7 +26,7 @@
"symfony/phpunit-bridge": "^4.2 || ^5",
"symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
},
- "time": "2021-10-28T20:44:15+00:00",
+ "time": "2023-06-06T12:02:59+00:00",
"default-branch": true,
"type": "library",
"extra": {
@@ -62,7 +62,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues",
- "source": "https://github.com/composer/ca-bundle/tree/1.3.1"
+ "source": "https://github.com/composer/ca-bundle/tree/1.3.6"
},
"funding": [
{
@@ -149,29 +149,29 @@
},
{
"name": "yahnis-elsts/plugin-update-checker",
- "version": "v4.13",
- "version_normalized": "4.13.0.0",
+ "version": "v5.1",
+ "version_normalized": "5.1.0.0",
"source": {
"type": "git",
"url": "https://github.com/YahnisElsts/plugin-update-checker.git",
- "reference": "6eb27a6911e0e0880d09e5b11f577d3f688f7da7"
+ "reference": "48b03e93c9c2587f9276dce00ce2b6d94c1190d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/6eb27a6911e0e0880d09e5b11f577d3f688f7da7",
- "reference": "6eb27a6911e0e0880d09e5b11f577d3f688f7da7",
+ "url": "https://api.github.com/repos/YahnisElsts/plugin-update-checker/zipball/48b03e93c9c2587f9276dce00ce2b6d94c1190d2",
+ "reference": "48b03e93c9c2587f9276dce00ce2b6d94c1190d2",
"shasum": ""
},
"require": {
"ext-json": "*",
- "php": ">=5.2.0"
+ "php": ">=5.6.20"
},
- "time": "2022-07-29T12:36:25+00:00",
+ "time": "2023-05-20T11:55:43+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
"files": [
- "load-v4p13.php"
+ "load-v5p1.php"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -182,7 +182,7 @@
{
"name": "Yahnis Elsts",
"email": "whiteshadow@w-shadow.com",
- "homepage": "http://w-shadow.com/",
+ "homepage": "https://w-shadow.com/",
"role": "Developer"
}
],
@@ -196,7 +196,7 @@
],
"support": {
"issues": "https://github.com/YahnisElsts/plugin-update-checker/issues",
- "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v4.13"
+ "source": "https://github.com/YahnisElsts/plugin-update-checker/tree/v5.1"
},
"install-path": "../yahnis-elsts/plugin-update-checker"
}
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 72320d7e6..016d0e0ad 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => '10up/classifai',
'pretty_version' => 'dev-trunk',
'version' => 'dev-trunk',
- 'reference' => '2aca3ab901b733038023d65e4f7fcd1cbc262c04',
+ 'reference' => '1742dc0109ff82f708f47633782dca5b179e362c',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -13,7 +13,7 @@
'10up/classifai' => array(
'pretty_version' => 'dev-trunk',
'version' => 'dev-trunk',
- 'reference' => '2aca3ab901b733038023d65e4f7fcd1cbc262c04',
+ 'reference' => '1742dc0109ff82f708f47633782dca5b179e362c',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -22,7 +22,7 @@
'composer/ca-bundle' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b',
+ 'reference' => '90d087e988ff194065333d16bc5cf649872d9cdb',
'type' => 'library',
'install_path' => __DIR__ . '/./ca-bundle',
'aliases' => array(
@@ -42,9 +42,9 @@
'dev_requirement' => false,
),
'yahnis-elsts/plugin-update-checker' => array(
- 'pretty_version' => 'v4.13',
- 'version' => '4.13.0.0',
- 'reference' => '6eb27a6911e0e0880d09e5b11f577d3f688f7da7',
+ 'pretty_version' => 'v5.1',
+ 'version' => '5.1.0.0',
+ 'reference' => '48b03e93c9c2587f9276dce00ce2b6d94c1190d2',
'type' => 'library',
'install_path' => __DIR__ . '/../yahnis-elsts/plugin-update-checker',
'aliases' => array(),
diff --git a/vendor/yahnis-elsts/plugin-update-checker/.gitattributes b/vendor/yahnis-elsts/plugin-update-checker/.gitattributes
new file mode 100644
index 000000000..ba74e7881
--- /dev/null
+++ b/vendor/yahnis-elsts/plugin-update-checker/.gitattributes
@@ -0,0 +1 @@
+/build export-ignore
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4/Factory.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v4/Factory.php
deleted file mode 100644
index 00001d9cd..000000000
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4/Factory.php
+++ /dev/null
@@ -1,6 +0,0 @@
-rootDir = dirname(__FILE__) . '/';
-
- if ( version_compare(PHP_VERSION, '5.3', '>=') && __NAMESPACE__ ) {
- $namespaceWithSlash = __NAMESPACE__ . '\\';
- } else {
- $namespaceWithSlash = '';
- }
-
- $nameParts = explode('_', substr(__CLASS__, strlen($namespaceWithSlash)), 3);
- $this->prefix = $namespaceWithSlash . $nameParts[0] . '_' . $nameParts[1] . '_';
-
- $this->libraryDir = $this->rootDir . '../..';
- if ( !self::isPhar() ) {
- $this->libraryDir = realpath($this->libraryDir);
- }
- $this->libraryDir = $this->libraryDir . '/';
-
- $this->staticMap = array(
- $namespaceWithSlash . 'PucReadmeParser' => 'vendor/PucReadmeParser.php',
- $namespaceWithSlash . 'Parsedown' => 'vendor/Parsedown.php',
- $namespaceWithSlash . 'Puc_v4_Factory' => 'Puc/v4/Factory.php',
- );
-
- spl_autoload_register(array($this, 'autoload'));
- }
-
- /**
- * Determine if this file is running as part of a Phar archive.
- *
- * @return bool
- */
- private static function isPhar() {
- //Check if the current file path starts with "phar://".
- static $pharProtocol = 'phar://';
- return (substr(__FILE__, 0, strlen($pharProtocol)) === $pharProtocol);
- }
-
- public function autoload($className) {
- if ( isset($this->staticMap[$className]) && file_exists($this->libraryDir . $this->staticMap[$className]) ) {
- /** @noinspection PhpIncludeInspection */
- include ($this->libraryDir . $this->staticMap[$className]);
- return;
- }
-
- if (strpos($className, $this->prefix) === 0) {
- $path = substr($className, strlen($this->prefix));
- $path = str_replace('_', '/', $path);
- $path = $this->rootDir . $path . '.php';
-
- if (file_exists($path)) {
- /** @noinspection PhpIncludeInspection */
- include $path;
- }
- }
- }
- }
-
-endif;
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/DebugBar/PluginExtension.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/DebugBar/PluginExtension.php
deleted file mode 100644
index 2514a043a..000000000
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/DebugBar/PluginExtension.php
+++ /dev/null
@@ -1,33 +0,0 @@
-updateChecker->getUniqueName('uid') ) {
- return;
- }
- $this->preAjaxRequest();
- $info = $this->updateChecker->requestInfo();
- if ( $info !== null ) {
- echo 'Successfully retrieved plugin info from the metadata URL:';
- echo '', htmlentities(print_r($info, true)), '
';
- } else {
- echo 'Failed to retrieve plugin info from the metadata URL.';
- }
- exit;
- }
- }
-
-endif;
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v5/PucFactory.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5/PucFactory.php
new file mode 100644
index 000000000..3cda059d9
--- /dev/null
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5/PucFactory.php
@@ -0,0 +1,10 @@
+rootDir = dirname(__FILE__) . '/';
+
+ $namespaceWithSlash = __NAMESPACE__ . '\\';
+ $this->prefix = $namespaceWithSlash;
+
+ $this->libraryDir = $this->rootDir . '../..';
+ if ( !self::isPhar() ) {
+ $this->libraryDir = realpath($this->libraryDir);
+ }
+ $this->libraryDir = $this->libraryDir . '/';
+
+ //Usually, dependencies like Parsedown are in the global namespace,
+ //but if someone adds a custom namespace to the entire library, they
+ //will be in the same namespace as this class.
+ $isCustomNamespace = (
+ substr($namespaceWithSlash, 0, strlen(self::DEFAULT_NS_PREFIX)) !== self::DEFAULT_NS_PREFIX
+ );
+ $libraryPrefix = $isCustomNamespace ? $namespaceWithSlash : '';
+
+ $this->staticMap = array(
+ $libraryPrefix . 'PucReadmeParser' => 'vendor/PucReadmeParser.php',
+ $libraryPrefix . 'Parsedown' => 'vendor/Parsedown.php',
+ );
+
+ //Add the generic, major-version-only factory class to the static map.
+ $versionSeparatorPos = strrpos(__NAMESPACE__, '\\v');
+ if ( $versionSeparatorPos !== false ) {
+ $versionSegment = substr(__NAMESPACE__, $versionSeparatorPos + 1);
+ $pointPos = strpos($versionSegment, 'p');
+ if ( ($pointPos !== false) && ($pointPos > 1) ) {
+ $majorVersionSegment = substr($versionSegment, 0, $pointPos);
+ $majorVersionNs = __NAMESPACE__ . '\\' . $majorVersionSegment;
+ $this->staticMap[$majorVersionNs . '\\PucFactory'] =
+ 'Puc/' . $majorVersionSegment . '/Factory.php';
+ }
+ }
+
+ spl_autoload_register(array($this, 'autoload'));
+ }
+
+ /**
+ * Determine if this file is running as part of a Phar archive.
+ *
+ * @return bool
+ */
+ private static function isPhar() {
+ //Check if the current file path starts with "phar://".
+ static $pharProtocol = 'phar://';
+ return (substr(__FILE__, 0, strlen($pharProtocol)) === $pharProtocol);
+ }
+
+ public function autoload($className) {
+ if ( isset($this->staticMap[$className]) && file_exists($this->libraryDir . $this->staticMap[$className]) ) {
+ include($this->libraryDir . $this->staticMap[$className]);
+ return;
+ }
+
+ if ( strpos($className, $this->prefix) === 0 ) {
+ $path = substr($className, strlen($this->prefix));
+ $path = str_replace(array('_', '\\'), '/', $path);
+ $path = $this->rootDir . $path . '.php';
+
+ if ( file_exists($path) ) {
+ include $path;
+ }
+ }
+ }
+ }
+
+endif;
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/DebugBar/Extension.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/DebugBar/Extension.php
similarity index 73%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/DebugBar/Extension.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/DebugBar/Extension.php
index 4619c0fba..01f43304c 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/DebugBar/Extension.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/DebugBar/Extension.php
@@ -1,12 +1,17 @@
updateChecker = $updateChecker;
@@ -14,14 +19,14 @@ public function __construct($updateChecker, $panelClass = null) {
$this->panelClass = $panelClass;
}
- if ( version_compare(PHP_VERSION, '5.3', '>=') && (strpos($this->panelClass, '\\') === false) ) {
+ if ( (strpos($this->panelClass, '\\') === false) ) {
$this->panelClass = __NAMESPACE__ . '\\' . $this->panelClass;
}
add_filter('debug_bar_panels', array($this, 'addDebugBarPanel'));
add_action('debug_bar_enqueue_scripts', array($this, 'enqueuePanelDependencies'));
- add_action('wp_ajax_puc_v4_debug_check_now', array($this, 'ajaxCheckNow'));
+ add_action('wp_ajax_puc_v5_debug_check_now', array($this, 'ajaxCheckNow'));
}
/**
@@ -42,17 +47,17 @@ public function addDebugBarPanel($panels) {
*/
public function enqueuePanelDependencies() {
wp_enqueue_style(
- 'puc-debug-bar-style-v4',
+ 'puc-debug-bar-style-v5',
$this->getLibraryUrl("/css/puc-debug-bar.css"),
array('debug-bar'),
- '20171124'
+ '20221008'
);
wp_enqueue_script(
- 'puc-debug-bar-js-v4',
+ 'puc-debug-bar-js-v5',
$this->getLibraryUrl("/js/debug-bar.js"),
array('jquery'),
- '20201209'
+ '20221008'
);
}
@@ -61,14 +66,16 @@ public function enqueuePanelDependencies() {
* the update checking process works as expected.
*/
public function ajaxCheckNow() {
- if ( $_POST['uid'] !== $this->updateChecker->getUniqueName('uid') ) {
+ //phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce is checked in preAjaxRequest().
+ if ( !isset($_POST['uid']) || ($_POST['uid'] !== $this->updateChecker->getUniqueName('uid')) ) {
return;
}
$this->preAjaxRequest();
$update = $this->updateChecker->checkForUpdates();
if ( $update !== null ) {
echo "An update is available:";
- echo '', htmlentities(print_r($update, true)), '
';
+ //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r -- For debugging output.
+ echo '', esc_html(print_r($update, true)), '
';
} else {
echo 'No updates found.';
}
@@ -79,8 +86,8 @@ public function ajaxCheckNow() {
foreach (array_values($errors) as $num => $item) {
$wpError = $item['error'];
- /** @var WP_Error $wpError */
- printf('%d) %s
', $num + 1, esc_html($wpError->get_error_message()));
+ /** @var \WP_Error $wpError */
+ printf('%d) %s
', intval($num + 1), esc_html($wpError->get_error_message()));
echo '';
printf('- Error code:
%s- WordPress HTTP API error:
- %s (
%s) ',
esc_html($httpError->get_error_message()),
@@ -102,8 +109,8 @@ public function ajaxCheckNow() {
//Status code.
printf(
'- HTTP status:
%d %s
',
+ '
',
esc_attr($this->updateChecker->getUniqueName('debug-bar-panel')),
esc_attr($this->updateChecker->slug),
esc_attr($this->updateChecker->getUniqueName('uid')),
@@ -119,7 +122,10 @@ private function displayCurrentUpdate() {
$fields = $this->getUpdateFields();
foreach($fields as $field) {
if ( property_exists($update, $field) ) {
- $this->row(ucwords(str_replace('_', ' ', $field)), htmlentities($update->$field));
+ $this->row(
+ ucwords(str_replace('_', ' ', $field)),
+ isset($update->$field) ? htmlentities($update->$field) : null
+ );
}
}
echo '';
@@ -154,11 +160,18 @@ private function formatTimestamp($unixTime) {
public function row($name, $value) {
if ( is_object($value) || is_array($value) ) {
+ //This is specifically for debugging, so print_r() is fine.
+ //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
$value = '
' . htmlentities(print_r($value, true)) . '
';
} else if ($value === null) {
$value = '
null';
}
- printf('
| %1$s | %2$s |
|---|
', $name, $value);
+ printf(
+ '
| %1$s | %2$s |
|---|
',
+ esc_html($name),
+ //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped above.
+ $value
+ );
}
}
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/DebugBar/PluginExtension.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/DebugBar/PluginExtension.php
new file mode 100644
index 000000000..21fbe0b5e
--- /dev/null
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/DebugBar/PluginExtension.php
@@ -0,0 +1,40 @@
+updateChecker->getUniqueName('uid')) ) {
+ return;
+ }
+ $this->preAjaxRequest();
+ $info = $this->updateChecker->requestInfo();
+ if ( $info !== null ) {
+ echo 'Successfully retrieved plugin info from the metadata URL:';
+ //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r -- For debugging output.
+ echo '
', esc_html(print_r($info, true)), '
';
+ } else {
+ echo 'Failed to retrieve plugin info from the metadata URL.';
+ }
+ exit;
+ }
+ }
+
+endif;
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/DebugBar/PluginPanel.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/DebugBar/PluginPanel.php
similarity index 76%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/DebugBar/PluginPanel.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/DebugBar/PluginPanel.php
index d73caa6e8..d741e810e 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/DebugBar/PluginPanel.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/DebugBar/PluginPanel.php
@@ -1,10 +1,13 @@
validateMetadata($apiResponse);
if ( is_wp_error($valid) ){
do_action('puc_api_error', $valid);
- trigger_error($valid->get_error_message(), E_USER_NOTICE);
+ //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error -- For plugin developers.
+ trigger_error(esc_html($valid->get_error_message()), E_USER_NOTICE);
return false;
}
@@ -53,10 +61,10 @@ protected static function createFromJson($json, $target) {
/**
* No validation by default! Subclasses should check that the required fields are present.
*
- * @param StdClass $apiResponse
- * @return bool|WP_Error
+ * @param \StdClass $apiResponse
+ * @return bool|\WP_Error
*/
- protected function validateMetadata(/** @noinspection PhpUnusedParameterInspection */ $apiResponse) {
+ protected function validateMetadata($apiResponse) {
return true;
}
@@ -64,10 +72,10 @@ protected function validateMetadata(/** @noinspection PhpUnusedParameterInspecti
* Create a new instance by copying the necessary fields from another object.
*
* @abstract
- * @param StdClass|self $object The source object.
+ * @param \StdClass|self $object The source object.
* @return self The new copy.
*/
- public static function fromObject(/** @noinspection PhpUnusedParameterInspection */ $object) {
+ public static function fromObject($object) {
throw new LogicException('The ' . __METHOD__ . ' method must be implemented by subclasses');
}
@@ -77,7 +85,7 @@ public static function fromObject(/** @noinspection PhpUnusedParameterInspection
* avoids the "incomplete object" problem if the cached value is loaded
* before this class.
*
- * @return StdClass
+ * @return \StdClass
*/
public function toStdClass() {
$object = new stdClass();
@@ -95,8 +103,8 @@ abstract public function toWpFormat();
/**
* Copy known fields from one object to another.
*
- * @param StdClass|self $from
- * @param StdClass|self $to
+ * @param \StdClass|self $from
+ * @param \StdClass|self $to
*/
protected function copyFields($from, $to) {
$fields = $this->getFieldNames();
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/OAuthSignature.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/OAuthSignature.php
similarity index 87%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/OAuthSignature.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/OAuthSignature.php
index c04fa5ed5..578bc72c8 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/OAuthSignature.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/OAuthSignature.php
@@ -1,11 +1,12 @@
updateChecker->triggerError(
sprintf(
- "Can't to read the Version header for '%s'. The filename is incorrect or is not a plugin.",
+ "Cannot read the Version header for '%s'. The filename is incorrect or is not a plugin.",
$this->updateChecker->pluginFile
),
E_USER_WARNING
@@ -140,7 +145,6 @@ public function getPluginHeader() {
}
if ( !function_exists('get_plugin_data') ) {
- /** @noinspection PhpIncludeInspection */
require_once(ABSPATH . '/wp-admin/includes/plugin.php');
}
return get_plugin_data($this->pluginAbsolutePath, false, false);
@@ -170,8 +174,8 @@ public function isMuPlugin() {
$pluginPath = realpath($this->pluginAbsolutePath);
//If realpath() fails, just normalize the syntax instead.
if (($muPluginDir === false) || ($pluginPath === false)) {
- $muPluginDir = Puc_v4p13_Factory::normalizePath(WPMU_PLUGIN_DIR);
- $pluginPath = Puc_v4p13_Factory::normalizePath($this->pluginAbsolutePath);
+ $muPluginDir = PucFactory::normalizePath(WPMU_PLUGIN_DIR);
+ $pluginPath = PucFactory::normalizePath($this->pluginAbsolutePath);
}
$cachedResult = (strpos($pluginPath, $muPluginDir) === 0);
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Plugin/Info.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Plugin/PluginInfo.php
similarity index 91%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Plugin/Info.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Plugin/PluginInfo.php
index 40941e275..db8e51efa 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Plugin/Info.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Plugin/PluginInfo.php
@@ -1,5 +1,9 @@
name)
|| empty($apiResponse->version)
) {
- return new WP_Error(
+ return new \WP_Error(
'puc-invalid-metadata',
"The plugin metadata file does not contain the required 'name' and/or 'version' keys."
);
@@ -88,7 +92,7 @@ protected function validateMetadata($apiResponse) {
* @return object
*/
public function toWpFormat(){
- $info = new stdClass;
+ $info = new \stdClass;
//The custom update API is built so that many fields have the same name and format
//as those returned by the native WordPress.org API. These can be assigned directly.
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Plugin/Ui.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Plugin/Ui.php
similarity index 89%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Plugin/Ui.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Plugin/Ui.php
index b3ea175a0..1b1fdf6ac 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Plugin/Ui.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Plugin/Ui.php
@@ -1,14 +1,16 @@
updateChecker = $updateChecker;
@@ -172,7 +174,7 @@ public function handleManualCheck() {
foreach ($lastRequestApiErrors as $item) {
$wpError = $item['error'];
- /** @var WP_Error $wpError */
+ /** @var \WP_Error $wpError */
if ( !in_array($wpError->get_error_code(), $questionableErrorCodes) ) {
$foundCriticalErrors = true;
break;
@@ -204,8 +206,9 @@ public function handleManualCheck() {
* You can change the result message by using the "puc_manual_check_message-$slug" filter.
*/
public function displayManualCheckResult() {
+ //phpcs:disable WordPress.Security.NonceVerification.Recommended -- Just displaying a message.
if ( isset($_GET['puc_update_check_result'], $_GET['puc_slug']) && ($_GET['puc_slug'] == $this->updateChecker->slug) ) {
- $status = strval($_GET['puc_update_check_result']);
+ $status = sanitize_key($_GET['puc_update_check_result']);
$title = $this->updateChecker->getInstalledPackage()->getPluginTitle();
$noticeClass = 'updated notice-success';
$details = '';
@@ -221,16 +224,29 @@ public function displayManualCheckResult() {
$details = $this->formatManualCheckErrors(get_site_transient($this->manualCheckErrorTransient));
delete_site_transient($this->manualCheckErrorTransient);
} else {
- $message = sprintf(__('Unknown update checker status "%s"', 'plugin-update-checker'), htmlentities($status));
+ $message = sprintf(__('Unknown update checker status "%s"', 'plugin-update-checker'), $status);
$noticeClass = 'error notice-error';
}
+
+ $message = esc_html($message);
+
+ //Plugins can replace the message with their own, including adding HTML.
+ $message = apply_filters(
+ $this->updateChecker->getUniqueName('manual_check_message'),
+ $message,
+ $status
+ );
+
printf(
'
',
- $noticeClass,
- apply_filters($this->updateChecker->getUniqueName('manual_check_message'), $message, $status),
+ esc_attr($noticeClass),
+ //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Was escaped above, and plugins can add HTML.
+ $message,
+ //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Contains HTML. Content should already be escaped.
$details
);
}
+ //phpcs:enable
}
/**
@@ -254,11 +270,11 @@ protected function formatManualCheckErrors($errors) {
}
foreach ($errors as $item) {
$wpError = $item['error'];
- /** @var WP_Error $wpError */
+ /** @var \WP_Error $wpError */
$output .= sprintf(
$formatString,
- $wpError->get_error_message(),
- $wpError->get_error_code()
+ esc_html($wpError->get_error_message()),
+ esc_html($wpError->get_error_code())
);
}
if ( $showAsList ) {
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Plugin/Update.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Plugin/Update.php
similarity index 85%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Plugin/Update.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Plugin/Update.php
index 9b3c5a031..475e4961c 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Plugin/Update.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Plugin/Update.php
@@ -1,5 +1,9 @@
triggerError(sprintf(
'Plugin slug "%s" is already in use by %s. Slugs must be unique.',
- htmlentities($slug),
- htmlentities($slugUsedBy)
+ $slug,
+ $slugUsedBy
), E_USER_ERROR);
}
add_filter($slugCheckFilter, array($this, 'getAbsolutePath'));
@@ -68,17 +75,17 @@ public function __construct($metadataUrl, $pluginFile, $slug = '', $checkPeriod
//Details: https://github.com/YahnisElsts/plugin-update-checker/issues/138#issuecomment-335590964
add_action('uninstall_' . $this->pluginFile, array($this, 'removeHooks'));
- $this->extraUi = new Puc_v4p13_Plugin_Ui($this);
+ $this->extraUi = new Ui($this);
}
/**
* Create an instance of the scheduler.
*
* @param int $checkPeriod
- * @return Puc_v4p13_Scheduler
+ * @return Scheduler
*/
protected function createScheduler($checkPeriod) {
- $scheduler = new Puc_v4p13_Scheduler($this, $checkPeriod, array('load-plugins.php'));
+ $scheduler = new Scheduler($this, $checkPeriod, array('load-plugins.php'));
register_deactivation_hook($this->pluginFile, array($scheduler, 'removeUpdaterCron'));
return $scheduler;
}
@@ -124,13 +131,17 @@ public function removeHooks() {
* @uses wp_remote_get()
*
* @param array $queryArgs Additional query arguments to append to the request. Optional.
- * @return Puc_v4p13_Plugin_Info
+ * @return PluginInfo
*/
public function requestInfo($queryArgs = array()) {
- list($pluginInfo, $result) = $this->requestMetadata('Puc_v4p13_Plugin_Info', 'request_info', $queryArgs);
+ list($pluginInfo, $result) = $this->requestMetadata(
+ PluginInfo::class,
+ 'request_info',
+ $queryArgs
+ );
if ( $pluginInfo !== null ) {
- /** @var Puc_v4p13_Plugin_Info $pluginInfo */
+ /** @var PluginInfo $pluginInfo */
$pluginInfo->filename = $this->pluginFile;
$pluginInfo->slug = $this->slug;
}
@@ -142,9 +153,9 @@ public function requestInfo($queryArgs = array()) {
/**
* Retrieve the latest update (if any) from the configured API endpoint.
*
- * @uses PluginUpdateChecker::requestInfo()
+ * @uses UpdateChecker::requestInfo()
*
- * @return Puc_v4p13_Update|null An instance of Plugin_Update, or NULL when no updates are available.
+ * @return Update|null An instance of Plugin Update, or NULL when no updates are available.
*/
public function requestUpdate() {
//For the sake of simplicity, this function just calls requestInfo()
@@ -153,7 +164,7 @@ public function requestUpdate() {
if ( $pluginInfo === null ){
return null;
}
- $update = Puc_v4p13_Plugin_Update::fromPluginInfo($pluginInfo);
+ $update = Update::fromPluginInfo($pluginInfo);
$update = $this->filterUpdateResult($update);
@@ -197,9 +208,9 @@ protected function shouldShowUpdates() {
}
/**
- * @param stdClass|null $updates
- * @param stdClass $updateToAdd
- * @return stdClass
+ * @param \stdClass|null $updates
+ * @param \stdClass $updateToAdd
+ * @return \stdClass
*/
protected function addUpdateToList($updates, $updateToAdd) {
if ( $this->package->isMuPlugin() ) {
@@ -211,8 +222,8 @@ protected function addUpdateToList($updates, $updateToAdd) {
}
/**
- * @param stdClass|null $updates
- * @return stdClass|null
+ * @param \stdClass|null $updates
+ * @return \stdClass|null
*/
protected function removeUpdateFromList($updates) {
$updates = parent::removeUpdateFromList($updates);
@@ -246,7 +257,7 @@ protected function getNoUpdateItemFields() {
'banners' => array(),
'banners_rtl' => array(),
'tested' => '',
- 'compatibility' => new stdClass(),
+ 'compatibility' => new \stdClass(),
)
);
}
@@ -255,7 +266,7 @@ protected function getNoUpdateItemFields() {
* Alias for isBeingUpgraded().
*
* @deprecated
- * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+ * @param \WP_Upgrader|null $upgrader The upgrader that's performing the current update.
* @return bool
*/
public function isPluginBeingUpgraded($upgrader = null) {
@@ -265,7 +276,7 @@ public function isPluginBeingUpgraded($upgrader = null) {
/**
* Is there an update being installed for this plugin, right now?
*
- * @param WP_Upgrader|null $upgrader
+ * @param \WP_Upgrader|null $upgrader
* @return bool
*/
public function isBeingUpgraded($upgrader = null) {
@@ -281,12 +292,12 @@ public function isBeingUpgraded($upgrader = null) {
* Uses cached update data. To retrieve update information straight from
* the metadata URL, call requestUpdate() instead.
*
- * @return Puc_v4p13_Plugin_Update|null
+ * @return Update|null
*/
public function getUpdate() {
$update = parent::getUpdate();
if ( isset($update) ) {
- /** @var Puc_v4p13_Plugin_Update $update */
+ /** @var Update $update */
$update->filename = $this->pluginFile;
}
return $update;
@@ -391,20 +402,20 @@ public function addResultFilter($callback) {
}
protected function createDebugBarExtension() {
- return new Puc_v4p13_DebugBar_PluginExtension($this);
+ return new DebugBar\PluginExtension($this);
}
/**
* Create a package instance that represents this plugin or theme.
*
- * @return Puc_v4p13_InstalledPackage
+ * @return InstalledPackage
*/
protected function createInstalledPackage() {
- return new Puc_v4p13_Plugin_Package($this->pluginAbsolutePath, $this);
+ return new Package($this->pluginAbsolutePath, $this);
}
/**
- * @return Puc_v4p13_Plugin_Package
+ * @return Package
*/
public function getInstalledPackage() {
return $this->package;
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Factory.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/PucFactory.php
similarity index 85%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Factory.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/PucFactory.php
index f18b38979..e9cc69155 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Factory.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/PucFactory.php
@@ -1,5 +1,12 @@
=') ) {
- $checkerClass = __NAMESPACE__ . '\\' . $checkerClass;
}
if ( !isset($apiClass) ) {
@@ -123,16 +124,12 @@ public static function buildUpdateChecker($metadataUrl, $fullPath, $slug = '', $
//VCS checker + an API client.
$apiClass = self::getCompatibleClassVersion($apiClass);
if ( $apiClass === null ) {
- trigger_error(sprintf(
+ //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
+ trigger_error(esc_html(sprintf(
'PUC %s does not support %s',
- htmlentities(self::$latestCompatibleVersion),
- htmlentities($service)
- ), E_USER_ERROR);
- return null;
- }
-
- if ( version_compare(PHP_VERSION, '5.3', '>=') && (strpos($apiClass, '\\') === false) ) {
- $apiClass = __NAMESPACE__ . '\\' . $apiClass;
+ self::$latestCompatibleVersion,
+ $service
+ )), E_USER_ERROR);
}
return new $checkerClass(
@@ -150,7 +147,7 @@ public static function buildUpdateChecker($metadataUrl, $fullPath, $slug = '', $
*
* Normalize a filesystem path. Introduced in WP 3.9.
* Copying here allows use of the class on earlier versions.
- * This version adapted from WP 4.8.2 (unchanged since 4.5.0)
+ * This version adapted from WP 4.8.2 (unchanged since 4.5.1)
*
* @param string $path Path to normalize.
* @return string Normalized path.
@@ -241,7 +238,7 @@ private static function getServiceURI($fullPath) {
}
//URI was not found so throw an error.
- throw new RuntimeException(
+ throw new \RuntimeException(
sprintf('Unable to locate URI in header of "%s"', htmlentities($fullPath))
);
}
@@ -256,8 +253,8 @@ private static function getVcsService($metadataUrl) {
$service = null;
//Which hosting service does the URL point to?
- $host = parse_url($metadataUrl, PHP_URL_HOST);
- $path = parse_url($metadataUrl, PHP_URL_PATH);
+ $host = (string)(wp_parse_url($metadataUrl, PHP_URL_HOST));
+ $path = (string)(wp_parse_url($metadataUrl, PHP_URL_PATH));
//Check if the path looks like "/user-name/repository".
//For GitLab.com it can also be "/user/group1/group2/.../repository".
@@ -337,12 +334,8 @@ protected static function compareVersions($a, $b) {
*/
public static function addVersion($generalClass, $versionedClass, $version) {
if ( empty(self::$myMajorVersion) ) {
- $className = (version_compare(PHP_VERSION, '5.3', '>=') && __NAMESPACE__)
- ? substr(__CLASS__, strlen(__NAMESPACE__) + 1)
- : __CLASS__;
-
- $nameParts = explode('_', $className, 3);
- self::$myMajorVersion = substr(ltrim($nameParts[1], 'v'), 0, 1);
+ $lastNamespaceSegment = substr(__NAMESPACE__, strrpos(__NAMESPACE__, '\\') + 1);
+ self::$myMajorVersion = substr(ltrim($lastNamespaceSegment, 'v'), 0, 1);
}
//Store the greatest version number that matches our major version.
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Scheduler.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Scheduler.php
similarity index 89%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Scheduler.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Scheduler.php
index cca04d7b5..b0a9707ba 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Scheduler.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Scheduler.php
@@ -1,11 +1,13 @@
checkPeriod . 'hours';
+ //phpcs:ignore WordPress.WP.CronInterval.ChangeDetected -- WPCS fails to parse the callback.
add_filter('cron_schedules', array($this, '_addCustomSchedule'));
}
if ( !wp_next_scheduled($this->cronHook) && !defined('WP_INSTALLING') ) {
//Randomly offset the schedule to help prevent update server traffic spikes. Without this
//most checks may happen during times of day when people are most likely to install new plugins.
- $firstCheckTime = time() - rand(0, max($this->checkPeriod * 3600 - 15 * 60, 1));
+ $upperLimit = max($this->checkPeriod * 3600 - 15 * 60, 1);
+ if ( function_exists('wp_rand') ) {
+ $randomOffset = wp_rand(0, $upperLimit);
+ } else {
+ //This constructor may be called before wp_rand() is available.
+ //phpcs:ignore WordPress.WP.AlternativeFunctions.rand_rand
+ $randomOffset = rand(0, $upperLimit);
+ }
+ $firstCheckTime = time() - $randomOffset;
$firstCheckTime = apply_filters(
$this->updateChecker->getUniqueName('first_check_time'),
$firstCheckTime
@@ -69,6 +80,7 @@ public function __construct($updateChecker, $checkPeriod, $hourlyHooks = array('
//Like WordPress itself, we check more often on certain pages.
/** @see wp_update_plugins */
add_action('load-update-core.php', array($this, 'maybeCheckForUpdates'));
+ //phpcs:ignore Squiz.PHP.CommentedOutCode.Found -- Not actually code, just file names.
//"load-update.php" and "load-plugins.php" or "load-themes.php".
$this->hourlyCheckHooks = array_merge($this->hourlyCheckHooks, $hourlyHooks);
foreach($this->hourlyCheckHooks as $hook) {
@@ -89,7 +101,7 @@ public function __construct($updateChecker, $checkPeriod, $hourlyHooks = array('
* We look at the parameters to decide whether to call maybeCheckForUpdates() or not.
* We also check if the update checker has been removed by the update.
*
- * @param WP_Upgrader $upgrader WP_Upgrader instance
+ * @param \WP_Upgrader $upgrader WP_Upgrader instance
* @param array $upgradeInfo extra information about the upgrade
*/
public function upgraderProcessComplete(
@@ -116,7 +128,7 @@ public function upgraderProcessComplete(
//Filter out notifications of upgrades that should have no bearing upon whether or not our
//current info is up-to-date.
- if ( is_a($this->updateChecker, 'Puc_v4p13_Theme_UpdateChecker') ) {
+ if ( is_a($this->updateChecker, Theme\UpdateChecker::class) ) {
if ( 'theme' !== $upgradeInfo['type'] || !isset($upgradeInfo['themes']) ) {
return;
}
@@ -130,7 +142,7 @@ public function upgraderProcessComplete(
}
}
- if ( is_a($this->updateChecker, 'Puc_v4p13_Plugin_UpdateChecker') ) {
+ if ( is_a($this->updateChecker, Plugin\UpdateChecker::class) ) {
if ( 'plugin' !== $upgradeInfo['type'] || !isset($upgradeInfo['plugins']) ) {
return;
}
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/StateStore.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/StateStore.php
similarity index 78%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/StateStore.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/StateStore.php
index 8eb381dbd..b6f6cc103 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/StateStore.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/StateStore.php
@@ -1,8 +1,9 @@
lazyLoad();
@@ -73,10 +74,10 @@ public function getUpdate() {
}
/**
- * @param Puc_v4p13_Update|null $update
+ * @param Update|null $update
* @return $this
*/
- public function setUpdate(Puc_v4p13_Update $update = null) {
+ public function setUpdate(Update $update = null) {
$this->lazyLoad();
$this->update = $update;
return $this;
@@ -127,7 +128,7 @@ public function setTranslations($translationUpdates) {
}
public function save() {
- $state = new stdClass();
+ $state = new \stdClass();
$state->lastCheck = $this->lastCheck;
$state->checkedVersion = $this->checkedVersion;
@@ -138,7 +139,7 @@ public function save() {
$updateClass = get_class($this->update);
$state->updateClass = $updateClass;
$prefix = $this->getLibPrefix();
- if ( Puc_v4p13_Utils::startsWith($updateClass, $prefix) ) {
+ if ( Utils::startsWith($updateClass, $prefix) ) {
$state->updateBaseClass = substr($updateClass, strlen($prefix));
}
}
@@ -169,8 +170,8 @@ protected function load() {
return;
}
- $this->lastCheck = intval(Puc_v4p13_Utils::get($state, 'lastCheck', 0));
- $this->checkedVersion = Puc_v4p13_Utils::get($state, 'checkedVersion', '');
+ $this->lastCheck = intval(Utils::get($state, 'lastCheck', 0));
+ $this->checkedVersion = Utils::get($state, 'checkedVersion', '');
$this->update = null;
if ( isset($state->update) ) {
@@ -184,8 +185,9 @@ protected function load() {
$updateClass = $state->updateClass;
}
- if ( ($updateClass !== null) && class_exists($updateClass) ) {
- $this->update = call_user_func(array($updateClass, 'fromObject'), $state->update);
+ $factory = array($updateClass, 'fromObject');
+ if ( ($updateClass !== null) && is_callable($factory) ) {
+ $this->update = call_user_func($factory, $state->update);
}
}
}
@@ -199,17 +201,8 @@ public function delete() {
}
private function getLibPrefix() {
- $lastSlashPos = strrpos(__CLASS__, '\\');
- if ( $lastSlashPos !== false ) {
- $namespacePrefix = substr(__CLASS__, 0, $lastSlashPos + 1);
- $className = substr(__CLASS__, $lastSlashPos + 1);
- } else {
- $namespacePrefix = '';
- $className = __CLASS__;
- }
-
- $parts = explode('_', $className, 3);
- return $namespacePrefix . $parts[0] . '_' . $parts[1] . '_';
+ //This assumes that the current class is at the top of the versioned namespace.
+ return __NAMESPACE__ . '\\';
}
}
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Theme/Package.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Theme/Package.php
similarity index 87%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Theme/Package.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Theme/Package.php
index f38cbfda9..030046ba6 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Theme/Package.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Theme/Package.php
@@ -1,14 +1,18 @@
$key) || empty($apiResponse->$key) ) {
- return new WP_Error(
+ return new \WP_Error(
'tuc-invalid-metadata',
sprintf('The theme metadata is missing the required "%s" key.', $key)
);
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Theme/UpdateChecker.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Theme/UpdateChecker.php
similarity index 79%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Theme/UpdateChecker.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Theme/UpdateChecker.php
index c7de804af..85ca5fbe6 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Theme/UpdateChecker.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Theme/UpdateChecker.php
@@ -1,8 +1,15 @@
requestMetadata('Puc_v4p13_Theme_Update', 'request_update');
+ list($themeUpdate, $result) = $this->requestMetadata(Update::class, 'request_update');
if ( $themeUpdate !== null ) {
- /** @var Puc_v4p13_Theme_Update $themeUpdate */
+ /** @var Update $themeUpdate */
$themeUpdate->slug = $this->slug;
}
@@ -71,16 +78,16 @@ public function userCanInstallUpdates() {
* Create an instance of the scheduler.
*
* @param int $checkPeriod
- * @return Puc_v4p13_Scheduler
+ * @return Scheduler
*/
protected function createScheduler($checkPeriod) {
- return new Puc_v4p13_Scheduler($this, $checkPeriod, array('load-themes.php'));
+ return new Scheduler($this, $checkPeriod, array('load-themes.php'));
}
/**
* Is there an update being installed right now for this theme?
*
- * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+ * @param \WP_Upgrader|null $upgrader The upgrader that's performing the current update.
* @return bool
*/
public function isBeingUpgraded($upgrader = null) {
@@ -88,7 +95,7 @@ public function isBeingUpgraded($upgrader = null) {
}
protected function createDebugBarExtension() {
- return new Puc_v4p13_DebugBar_Extension($this, 'Puc_v4p13_DebugBar_ThemePanel');
+ return new DebugBar\Extension($this, DebugBar\ThemePanel::class);
}
/**
@@ -142,10 +149,10 @@ public function addResultFilter($callback) {
/**
* Create a package instance that represents this plugin or theme.
*
- * @return Puc_v4p13_InstalledPackage
+ * @return InstalledPackage
*/
protected function createInstalledPackage() {
- return new Puc_v4p13_Theme_Package($this->stylesheet, $this);
+ return new Package($this->stylesheet, $this);
}
}
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Update.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Update.php
similarity index 79%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Update.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Update.php
index 62a573925..f43d1ff8f 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Update.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Update.php
@@ -1,5 +1,9 @@
package = $this->createInstalledPackage();
$this->scheduler = $this->createScheduler($checkPeriod);
- $this->upgraderStatus = new Puc_v4p13_UpgraderStatus();
- $this->updateState = new Puc_v4p13_StateStore($this->optionName);
+ $this->upgraderStatus = new UpgraderStatus();
+ $this->updateState = new StateStore($this->optionName);
if ( did_action('init') ) {
$this->loadTextDomain();
@@ -206,7 +210,7 @@ abstract public function userCanInstallUpdates();
*/
public function allowMetadataHost($allow, $host) {
if ( $this->cachedMetadataHost === 0 ) {
- $this->cachedMetadataHost = parse_url($this->metadataUrl, PHP_URL_HOST);
+ $this->cachedMetadataHost = wp_parse_url($this->metadataUrl, PHP_URL_HOST);
}
if ( is_string($this->cachedMetadataHost) && (strtolower($host) === strtolower($this->cachedMetadataHost)) ) {
@@ -218,12 +222,12 @@ public function allowMetadataHost($allow, $host) {
/**
* Create a package instance that represents this plugin or theme.
*
- * @return Puc_v4p13_InstalledPackage
+ * @return InstalledPackage
*/
abstract protected function createInstalledPackage();
/**
- * @return Puc_v4p13_InstalledPackage
+ * @return InstalledPackage
*/
public function getInstalledPackage() {
return $this->package;
@@ -236,14 +240,14 @@ public function getInstalledPackage() {
* and substitute their own scheduler.
*
* @param int $checkPeriod
- * @return Puc_v4p13_Scheduler
+ * @return Scheduler
*/
abstract protected function createScheduler($checkPeriod);
/**
* Check for updates. The results are stored in the DB option specified in $optionName.
*
- * @return Puc_v4p13_Update|null
+ * @return Update|null
*/
public function checkForUpdates() {
$installedVersion = $this->getInstalledVersion();
@@ -277,7 +281,7 @@ public function checkForUpdates() {
/**
* Load the update checker state from the DB.
*
- * @return Puc_v4p13_StateStore
+ * @return StateStore
*/
public function getUpdateState() {
return $this->updateState->lazyLoad();
@@ -302,7 +306,7 @@ public function resetUpdateState() {
* Uses cached update data. To retrieve update information straight from
* the metadata URL, call requestUpdate() instead.
*
- * @return Puc_v4p13_Update|null
+ * @return Update|null
*/
public function getUpdate() {
$update = $this->updateState->getUpdate();
@@ -323,16 +327,17 @@ public function getUpdate() {
*
* Subclasses should run the update through filterUpdateResult before returning it.
*
- * @return Puc_v4p13_Update An instance of Update, or NULL when no updates are available.
+ * @return Update An instance of Update, or NULL when no updates are available.
*/
abstract public function requestUpdate();
/**
* Filter the result of a requestUpdate() call.
*
- * @param Puc_v4p13_Update|null $update
+ * @template T of Update
+ * @param T|null $update
* @param array|WP_Error|null $httpResult The value returned by wp_remote_get(), if any.
- * @return Puc_v4p13_Update
+ * @return T
*/
protected function filterUpdateResult($update, $httpResult = null) {
//Let plugins/themes modify the update.
@@ -355,9 +360,9 @@ protected function filterUpdateResult($update, $httpResult = null) {
* "Compatibility: Unknown".
* The function mimics how wordpress.org API crafts the "tested" field out of "Tested up to".
*
- * @param Puc_v4p13_Metadata|null $update
+ * @param Metadata|null $update
*/
- protected function fixSupportedWordpressVersion(Puc_v4p13_Metadata $update = null) {
+ protected function fixSupportedWordpressVersion(Metadata $update = null) {
if ( !isset($update->tested) || !preg_match('/^\d++\.\d++$/', $update->tested) ) {
return;
}
@@ -427,7 +432,8 @@ public function getAbsoluteDirectoryPath() {
*/
public function triggerError($message, $errorType) {
if ( $this->isDebugModeEnabled() ) {
- trigger_error($message, $errorType);
+ //phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error -- Only happens in debug mode.
+ trigger_error(esc_html($message), $errorType);
}
}
@@ -462,7 +468,7 @@ public function getUniqueName($baseTag) {
* Store API errors that are generated when checking for updates.
*
* @internal
- * @param WP_Error $error
+ * @param \WP_Error $error
* @param array|null $httpResponse
* @param string|null $url
* @param string|null $slug
@@ -515,8 +521,8 @@ public function addFilter($tag, $callback, $priority = 10, $acceptedArgs = 1) {
/**
* Insert the latest update (if any) into the update list maintained by WP.
*
- * @param stdClass $updates Update list.
- * @return stdClass Modified update list.
+ * @param \stdClass $updates Update list.
+ * @return \stdClass Modified update list.
*/
public function injectUpdate($updates) {
//Is there an update to insert?
@@ -543,9 +549,9 @@ public function injectUpdate($updates) {
}
/**
- * @param stdClass|null $updates
- * @param stdClass|array $updateToAdd
- * @return stdClass
+ * @param \stdClass|null $updates
+ * @param \stdClass|array $updateToAdd
+ * @return \stdClass
*/
protected function addUpdateToList($updates, $updateToAdd) {
if ( !is_object($updates) ) {
@@ -558,8 +564,8 @@ protected function addUpdateToList($updates, $updateToAdd) {
}
/**
- * @param stdClass|null $updates
- * @return stdClass|null
+ * @param \stdClass|null $updates
+ * @return \stdClass|null
*/
protected function removeUpdateFromList($updates) {
if ( isset($updates, $updates->response) ) {
@@ -572,8 +578,8 @@ protected function removeUpdateFromList($updates) {
* See this post for more information:
* @link https://make.wordpress.org/core/2020/07/30/recommended-usage-of-the-updates-api-to-support-the-auto-updates-ui-for-plugins-and-themes-in-wordpress-5-5/
*
- * @param stdClass|null $updates
- * @return stdClass
+ * @param \stdClass|null $updates
+ * @return \stdClass
*/
protected function addNoUpdateItem($updates) {
if ( !is_object($updates) ) {
@@ -635,10 +641,10 @@ protected function shouldShowUpdates() {
/**
* Retrieve plugin or theme metadata from the JSON document at $this->metadataUrl.
*
- * @param string $metaClass Parse the JSON as an instance of this class. It must have a static fromJson method.
+ * @param class-string
$metaClass Parse the JSON as an instance of this class. It must have a static fromJson method.
* @param string $filterRoot
* @param array $queryArgs Additional query arguments.
- * @return array [Puc_v4p13_Metadata|null, array|WP_Error] A metadata instance and the value returned by wp_remote_get().
+ * @return array A metadata instance and the value returned by wp_remote_get().
*/
protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()) {
//Query args to append to the URL. Plugins can add their own by using a filter callback (see addQueryArgFilter()).
@@ -654,7 +660,7 @@ protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()
//Various options for the wp_remote_get() call. Plugins can filter these, too.
$options = array(
- 'timeout' => 10, //seconds
+ 'timeout' => wp_doing_cron() ? 10 : 3,
'headers' => array(
'Accept' => 'application/json',
),
@@ -675,7 +681,7 @@ protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()
$status = $this->validateApiResponse($result);
$metadata = null;
if ( !is_wp_error($status) ){
- if ( version_compare(PHP_VERSION, '5.3', '>=') && (strpos($metaClass, '\\') === false) ) {
+ if ( (strpos($metaClass, '\\') === false) ) {
$metaClass = __NAMESPACE__ . '\\' . $metaClass;
}
$metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
@@ -879,12 +885,12 @@ protected function isNotMyTranslation($translation) {
*
* @param string $source The directory to copy to /wp-content/plugins or /wp-content/themes. Usually a subdirectory of $remoteSource.
* @param string $remoteSource WordPress has extracted the update to this directory.
- * @param WP_Upgrader $upgrader
+ * @param \WP_Upgrader $upgrader
* @return string|WP_Error
*/
public function fixDirectoryName($source, $remoteSource, $upgrader) {
global $wp_filesystem;
- /** @var WP_Filesystem_Base $wp_filesystem */
+ /** @var \WP_Filesystem_Base $wp_filesystem */
//Basic sanity checks.
if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
@@ -914,7 +920,7 @@ public function fixDirectoryName($source, $remoteSource, $upgrader) {
);
}
- /** @var WP_Upgrader_Skin $upgrader ->skin */
+ /** @var \WP_Upgrader_Skin $upgrader ->skin */
$upgrader->skin->feedback(sprintf(
'Renaming %s to %s…',
'' . basename($source) . '',
@@ -938,7 +944,7 @@ public function fixDirectoryName($source, $remoteSource, $upgrader) {
/**
* Is there an update being installed right now, for this plugin or theme?
*
- * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+ * @param \WP_Upgrader|null $upgrader The upgrader that's performing the current update.
* @return bool
*/
abstract public function isBeingUpgraded($upgrader = null);
@@ -952,7 +958,7 @@ abstract public function isBeingUpgraded($upgrader = null);
*/
protected function isBadDirectoryStructure($remoteSource) {
global $wp_filesystem;
- /** @var WP_Filesystem_Base $wp_filesystem */
+ /** @var \WP_Filesystem_Base $wp_filesystem */
$sourceFiles = $wp_filesystem->dirlist($remoteSource);
if ( is_array($sourceFiles) ) {
@@ -980,13 +986,13 @@ public function maybeInitDebugBar() {
}
protected function createDebugBarExtension() {
- return new Puc_v4p13_DebugBar_Extension($this);
+ return new DebugBar\Extension($this);
}
/**
* Display additional configuration details in the Debug Bar panel.
*
- * @param Puc_v4p13_DebugBar_Panel $panel
+ * @param DebugBar\Panel $panel
*/
public function onDisplayConfiguration($panel) {
//Do nothing. Subclasses can use this to add additional info to the panel.
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/UpgraderStatus.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/UpgraderStatus.php
similarity index 91%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/UpgraderStatus.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/UpgraderStatus.php
index 9f1232201..2dc67364f 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/UpgraderStatus.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/UpgraderStatus.php
@@ -1,5 +1,7 @@
skin;
- if ( isset($skin->theme_info) && ($skin->theme_info instanceof WP_Theme) ) {
+ if ( isset($skin->theme_info) && ($skin->theme_info instanceof \WP_Theme) ) {
$themeDirectoryName = $skin->theme_info->get_stylesheet();
- } elseif ( $skin instanceof Plugin_Upgrader_Skin ) {
+ } elseif ( $skin instanceof \Plugin_Upgrader_Skin ) {
if ( isset($skin->plugin) && is_string($skin->plugin) && ($skin->plugin !== '') ) {
$pluginFile = $skin->plugin;
}
- } elseif ( $skin instanceof Theme_Upgrader_Skin ) {
+ } elseif ( $skin instanceof \Theme_Upgrader_Skin ) {
if ( isset($skin->theme) && is_string($skin->theme) && ($skin->theme !== '') ) {
$themeDirectoryName = $skin->theme;
}
@@ -122,7 +124,6 @@ private function getThingBeingUpgradedBy($upgrader) {
*/
private function identifyPluginByHeaders($searchHeaders) {
if ( !function_exists('get_plugins') ){
- /** @noinspection PhpIncludeInspection */
require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
}
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Utils.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Utils.php
similarity index 94%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Utils.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Utils.php
index f792ab77c..b664e1a2e 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Utils.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Utils.php
@@ -1,8 +1,9 @@
getUpdateDetectionStrategies($configBranch);
+
+ if ( !empty($this->strategyFilterName) ) {
+ $strategies = apply_filters(
+ $this->strategyFilterName,
+ $strategies,
+ $this->slug
+ );
+ }
+
+ foreach ($strategies as $strategy) {
+ $reference = call_user_func($strategy);
+ if ( !empty($reference) ) {
+ return $reference;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Get an ordered list of strategies that can be used to find the latest version.
+ *
+ * The update checker will try each strategy in order until one of them
+ * returns a valid reference.
+ *
+ * @param string $configBranch
+ * @return array Array of callables that return Vcs_Reference objects.
+ */
+ abstract protected function getUpdateDetectionStrategies($configBranch);
/**
* Get the readme.txt file from the remote repository and parse it
@@ -105,7 +176,7 @@ public function getLocalReadmeName() {
* Get a branch.
*
* @param string $branchName
- * @return Puc_v4p13_Vcs_Reference|null
+ * @return Reference|null
*/
abstract public function getBranch($branchName);
@@ -113,7 +184,7 @@ abstract public function getBranch($branchName);
* Get a specific tag.
*
* @param string $tagName
- * @return Puc_v4p13_Vcs_Reference|null
+ * @return Reference|null
*/
abstract public function getTag($tagName);
@@ -121,7 +192,7 @@ abstract public function getTag($tagName);
* Get the tag that looks like the highest version number.
* (Implementations should skip pre-release versions if possible.)
*
- * @return Puc_v4p13_Vcs_Reference|null
+ * @return Reference|null
*/
abstract public function getLatestTag();
@@ -147,7 +218,7 @@ protected function looksLikeVersion($name) {
/**
* Check if a tag appears to be named like a version number.
*
- * @param stdClass $tag
+ * @param \stdClass $tag
* @return bool
*/
protected function isVersionTag($tag) {
@@ -159,8 +230,8 @@ protected function isVersionTag($tag) {
* Sort a list of tags as if they were version numbers.
* Tags that don't look like version number will be removed.
*
- * @param stdClass[] $tags Array of tag objects.
- * @return stdClass[] Filtered array of tags sorted in descending order.
+ * @param \stdClass[] $tags Array of tag objects.
+ * @return \stdClass[] Filtered array of tags sorted in descending order.
*/
protected function sortTagsByVersion($tags) {
//Keep only those tags that look like version numbers.
@@ -174,8 +245,8 @@ protected function sortTagsByVersion($tags) {
/**
* Compare two tags as if they were version number.
*
- * @param stdClass $tag1 Tag object.
- * @param stdClass $tag2 Another tag object.
+ * @param \stdClass $tag1 Tag object.
+ * @param \stdClass $tag2 Another tag object.
* @return int
*/
protected function compareTagNames($tag1, $tag2) {
@@ -224,7 +295,6 @@ public function getRemoteChangelog($ref, $localDirectory) {
return null;
}
- /** @noinspection PhpUndefinedClassInspection */
return Parsedown::instance()->text($changelog);
}
@@ -280,6 +350,13 @@ public function setHttpFilterName($filterName) {
$this->httpFilterName = $filterName;
}
+ /**
+ * @param string $filterName
+ */
+ public function setStrategyFilterName($filterName) {
+ $this->strategyFilterName = $filterName;
+ }
+
/**
* @param string $directory
*/
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/BaseChecker.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/BaseChecker.php
similarity index 72%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/BaseChecker.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/BaseChecker.php
index f83a43338..74c121503 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/BaseChecker.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/BaseChecker.php
@@ -1,7 +1,9 @@
[^/]+?)/(?P[^/#?&]+?)/?$@', $path, $matches) ) {
$this->username = $matches['username'];
$this->repository = $matches['repository'];
} else {
- throw new InvalidArgumentException('Invalid BitBucket repository URL: "' . $repositoryUrl . '"');
+ throw new \InvalidArgumentException('Invalid BitBucket repository URL: "' . $repositoryUrl . '"');
}
parent::__construct($repositoryUrl, $credentials);
}
- /**
- * Figure out which reference (i.e tag or branch) contains the latest version.
- *
- * @param string $configBranch Start looking in this branch.
- * @return null|Puc_v4p13_Vcs_Reference
- */
- public function chooseReference($configBranch) {
- $updateSource = null;
-
- //Check if there's a "Stable tag: 1.2.3" header that points to a valid tag.
- $updateSource = $this->getStableTag($configBranch);
+ protected function getUpdateDetectionStrategies($configBranch) {
+ $strategies = array(
+ self::STRATEGY_STABLE_TAG => function () use ($configBranch) {
+ return $this->getStableTag($configBranch);
+ },
+ );
- //Look for version-like tags.
- if ( !$updateSource && ($configBranch === 'master' || $configBranch === 'main') ) {
- $updateSource = $this->getLatestTag();
- }
- //If all else fails, use the specified branch itself.
- if ( !$updateSource ) {
- $updateSource = $this->getBranch($configBranch);
+ if ( ($configBranch === 'master' || $configBranch === 'main') ) {
+ $strategies[self::STRATEGY_LATEST_TAG] = array($this, 'getLatestTag');
}
- return $updateSource;
+ $strategies[self::STRATEGY_BRANCH] = function () use ($configBranch) {
+ return $this->getBranch($configBranch);
+ };
+ return $strategies;
}
public function getBranch($branchName) {
@@ -67,7 +66,7 @@ public function getBranch($branchName) {
$ref = $branch->target->hash;
}
- return new Puc_v4p13_Vcs_Reference(array(
+ return new Reference(array(
'name' => $ref,
'updated' => $branch->target->date,
'downloadUrl' => $this->getDownloadUrl($branch->name),
@@ -78,7 +77,7 @@ public function getBranch($branchName) {
* Get a specific tag.
*
* @param string $tagName
- * @return Puc_v4p13_Vcs_Reference|null
+ * @return Reference|null
*/
public function getTag($tagName) {
$tag = $this->api('/refs/tags/' . $tagName);
@@ -86,7 +85,7 @@ public function getTag($tagName) {
return null;
}
- return new Puc_v4p13_Vcs_Reference(array(
+ return new Reference(array(
'name' => $tag->name,
'version' => ltrim($tag->name, 'v'),
'updated' => $tag->target->date,
@@ -97,7 +96,7 @@ public function getTag($tagName) {
/**
* Get the tag that looks like the highest version number.
*
- * @return Puc_v4p13_Vcs_Reference|null
+ * @return Reference|null
*/
public function getLatestTag() {
$tags = $this->api('/refs/tags?sort=-target.date');
@@ -111,7 +110,7 @@ public function getLatestTag() {
//Return the first result.
if ( !empty($versionTags) ) {
$tag = $versionTags[0];
- return new Puc_v4p13_Vcs_Reference(array(
+ return new Reference(array(
'name' => $tag->name,
'version' => ltrim($tag->name, 'v'),
'updated' => $tag->target->date,
@@ -125,7 +124,7 @@ public function getLatestTag() {
* Get the tag/ref specified by the "Stable tag" header in the readme.txt of a given branch.
*
* @param string $branch
- * @return null|Puc_v4p13_Vcs_Reference
+ * @return null|Reference
*/
protected function getStableTag($branch) {
$remoteReadme = $this->getRemoteReadme($branch);
@@ -191,11 +190,11 @@ public function getLatestCommitTime($ref) {
*
* @param string $url
* @param string $version
- * @return mixed|WP_Error
+ * @return mixed|\WP_Error
*/
public function api($url, $version = '2.0') {
$url = ltrim($url, '/');
- $isSrcResource = Puc_v4p13_Utils::startsWith($url, 'src/');
+ $isSrcResource = Utils::startsWith($url, 'src/');
$url = implode('/', array(
'https://api.bitbucket.org',
@@ -211,7 +210,7 @@ public function api($url, $version = '2.0') {
$url = $this->oauth->sign($url,'GET');
}
- $options = array('timeout' => 10);
+ $options = array('timeout' => wp_doing_cron() ? 10 : 3);
if ( !empty($this->httpFilterName) ) {
$options = apply_filters($this->httpFilterName, $options);
}
@@ -234,7 +233,7 @@ public function api($url, $version = '2.0') {
return $document;
}
- $error = new WP_Error(
+ $error = new \WP_Error(
'puc-bitbucket-http-error',
sprintf('BitBucket API error. Base URL: "%s", HTTP status code: %d.', $baseUrl, $code)
);
@@ -250,7 +249,7 @@ public function setAuthentication($credentials) {
parent::setAuthentication($credentials);
if ( !empty($credentials) && !empty($credentials['consumer_key']) ) {
- $this->oauth = new Puc_v4p13_OAuthSignature(
+ $this->oauth = new OAuthSignature(
$credentials['consumer_key'],
$credentials['consumer_secret']
);
@@ -261,7 +260,7 @@ public function setAuthentication($credentials) {
public function signDownloadUrl($url) {
//Add authentication data to download URLs. Since OAuth signatures incorporate
- //timestamps, we have to do this immediately before inserting the update. Otherwise
+ //timestamps, we have to do this immediately before inserting the update. Otherwise,
//authentication could fail due to a stale timestamp.
if ( $this->oauth ) {
$url = $this->oauth->sign($url);
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/GitHubApi.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/GitHubApi.php
similarity index 64%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/GitHubApi.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/GitHubApi.php
index 0fb0b05b3..364584b85 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/GitHubApi.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/GitHubApi.php
@@ -1,8 +1,15 @@
[^/]+?)/(?P[^/#?&]+?)/?$@', $path, $matches) ) {
$this->userName = $matches['username'];
$this->repositoryName = $matches['repository'];
} else {
- throw new InvalidArgumentException('Invalid GitHub repository URL: "' . $repositoryUrl . '"');
+ throw new \InvalidArgumentException('Invalid GitHub repository URL: "' . $repositoryUrl . '"');
}
parent::__construct($repositoryUrl, $accessToken);
@@ -57,59 +49,112 @@ public function __construct($repositoryUrl, $accessToken = null) {
/**
* Get the latest release from GitHub.
*
- * @return Puc_v4p13_Vcs_Reference|null
+ * @return Reference|null
*/
public function getLatestRelease() {
- $release = $this->api('/repos/:user/:repo/releases/latest');
- if ( is_wp_error($release) || !is_object($release) || !isset($release->tag_name) ) {
- return null;
+ //The "latest release" endpoint returns one release and always skips pre-releases,
+ //so we can only use it if that's compatible with the current filter settings.
+ if (
+ $this->shouldSkipPreReleases()
+ && (
+ ($this->releaseFilterMaxReleases === 1) || !$this->hasCustomReleaseFilter()
+ )
+ ) {
+ //Just get the latest release.
+ $release = $this->api('/repos/:user/:repo/releases/latest');
+ if ( is_wp_error($release) || !is_object($release) || !isset($release->tag_name) ) {
+ return null;
+ }
+ $foundReleases = array($release);
+ } else {
+ //Get a list of the most recent releases.
+ $foundReleases = $this->api(
+ '/repos/:user/:repo/releases',
+ array('per_page' => $this->releaseFilterMaxReleases)
+ );
+ if ( is_wp_error($foundReleases) || !is_array($foundReleases) ) {
+ return null;
+ }
}
- $reference = new Puc_v4p13_Vcs_Reference(array(
- 'name' => $release->tag_name,
- 'version' => ltrim($release->tag_name, 'v'), //Remove the "v" prefix from "v1.2.3".
- 'downloadUrl' => $release->zipball_url,
- 'updated' => $release->created_at,
- 'apiResponse' => $release,
- ));
+ foreach ($foundReleases as $release) {
+ //Always skip drafts.
+ if ( isset($release->draft) && !empty($release->draft) ) {
+ continue;
+ }
- if ( isset($release->assets[0]) ) {
- $reference->downloadCount = $release->assets[0]->download_count;
- }
+ //Skip pre-releases unless specifically included.
+ if (
+ $this->shouldSkipPreReleases()
+ && isset($release->prerelease)
+ && !empty($release->prerelease)
+ ) {
+ continue;
+ }
+
+ $versionNumber = ltrim($release->tag_name, 'v'); //Remove the "v" prefix from "v1.2.3".
+
+ //Custom release filtering.
+ if ( !$this->matchesCustomReleaseFilter($versionNumber, $release) ) {
+ continue;
+ }
+
+ $reference = new Reference(array(
+ 'name' => $release->tag_name,
+ 'version' => $versionNumber,
+ 'downloadUrl' => $release->zipball_url,
+ 'updated' => $release->created_at,
+ 'apiResponse' => $release,
+ ));
+
+ if ( isset($release->assets[0]) ) {
+ $reference->downloadCount = $release->assets[0]->download_count;
+ }
- if ( $this->releaseAssetsEnabled && isset($release->assets, $release->assets[0]) ) {
- //Use the first release asset that matches the specified regular expression.
- $matchingAssets = array_filter($release->assets, array($this, 'matchesAssetFilter'));
- if ( !empty($matchingAssets) ) {
- if ( $this->isAuthenticationEnabled() ) {
- /**
- * Keep in mind that we'll need to add an "Accept" header to download this asset.
- *
- * @see setUpdateDownloadHeaders()
- */
- $reference->downloadUrl = $matchingAssets[0]->url;
+ if ( $this->releaseAssetsEnabled ) {
+ //Use the first release asset that matches the specified regular expression.
+ if ( isset($release->assets, $release->assets[0]) ) {
+ $matchingAssets = array_values(array_filter($release->assets, array($this, 'matchesAssetFilter')));
} else {
- //It seems that browser_download_url only works for public repositories.
- //Using an access_token doesn't help. Maybe OAuth would work?
- $reference->downloadUrl = $matchingAssets[0]->browser_download_url;
+ $matchingAssets = array();
}
- $reference->downloadCount = $matchingAssets[0]->download_count;
+ if ( !empty($matchingAssets) ) {
+ if ( $this->isAuthenticationEnabled() ) {
+ /**
+ * Keep in mind that we'll need to add an "Accept" header to download this asset.
+ *
+ * @see setUpdateDownloadHeaders()
+ */
+ $reference->downloadUrl = $matchingAssets[0]->url;
+ } else {
+ //It seems that browser_download_url only works for public repositories.
+ //Using an access_token doesn't help. Maybe OAuth would work?
+ $reference->downloadUrl = $matchingAssets[0]->browser_download_url;
+ }
+
+ $reference->downloadCount = $matchingAssets[0]->download_count;
+ } else if ( $this->releaseAssetPreference === Api::REQUIRE_RELEASE_ASSETS ) {
+ //None of the assets match the filter, and we're not allowed
+ //to fall back to the auto-generated source ZIP.
+ return null;
+ }
}
- }
- if ( !empty($release->body) ) {
- /** @noinspection PhpUndefinedClassInspection */
- $reference->changelog = Parsedown::instance()->text($release->body);
+ if ( !empty($release->body) ) {
+ $reference->changelog = Parsedown::instance()->text($release->body);
+ }
+
+ return $reference;
}
- return $reference;
+ return null;
}
/**
* Get the tag that looks like the highest version number.
*
- * @return Puc_v4p13_Vcs_Reference|null
+ * @return Reference|null
*/
public function getLatestTag() {
$tags = $this->api('/repos/:user/:repo/tags');
@@ -124,7 +169,7 @@ public function getLatestTag() {
}
$tag = $versionTags[0];
- return new Puc_v4p13_Vcs_Reference(array(
+ return new Reference(array(
'name' => $tag->name,
'version' => ltrim($tag->name, 'v'),
'downloadUrl' => $tag->zipball_url,
@@ -136,7 +181,7 @@ public function getLatestTag() {
* Get a branch by name.
*
* @param string $branchName
- * @return null|Puc_v4p13_Vcs_Reference
+ * @return null|Reference
*/
public function getBranch($branchName) {
$branch = $this->api('/repos/:user/:repo/branches/' . $branchName);
@@ -144,7 +189,7 @@ public function getBranch($branchName) {
return null;
}
- $reference = new Puc_v4p13_Vcs_Reference(array(
+ $reference = new Reference(array(
'name' => $branch->name,
'downloadUrl' => $this->buildArchiveDownloadUrl($branch->name),
'apiResponse' => $branch,
@@ -162,7 +207,7 @@ public function getBranch($branchName) {
*
* @param string $filename
* @param string $ref Reference name (e.g. branch or tag).
- * @return StdClass|null
+ * @return \StdClass|null
*/
public function getLatestCommit($filename, $ref = 'master') {
$commits = $this->api(
@@ -197,13 +242,13 @@ public function getLatestCommitTime($ref) {
*
* @param string $url
* @param array $queryParams
- * @return mixed|WP_Error
+ * @return mixed|\WP_Error
*/
protected function api($url, $queryParams = array()) {
$baseUrl = $url;
$url = $this->buildApiUrl($url, $queryParams);
- $options = array('timeout' => 10);
+ $options = array('timeout' => wp_doing_cron() ? 10 : 3);
if ( $this->isAuthenticationEnabled() ) {
$options['headers'] = array('Authorization' => $this->getAuthorizationHeader());
}
@@ -224,7 +269,7 @@ protected function api($url, $queryParams = array()) {
return $document;
}
- $error = new WP_Error(
+ $error = new \WP_Error(
'puc-github-http-error',
sprintf('GitHub API error. Base URL: "%s", HTTP status code: %d.', $baseUrl, $code)
);
@@ -298,7 +343,7 @@ public function buildArchiveDownloadUrl($ref = 'master') {
*/
public function getTag($tagName) {
//The current GitHub update checker doesn't use getTag, so I didn't bother to implement it.
- throw new LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
+ throw new \LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
}
public function setAuthentication($credentials) {
@@ -310,72 +355,52 @@ public function setAuthentication($credentials) {
add_filter('upgrader_pre_download', array($this, 'addHttpRequestFilter'), 10, 1); //WP 3.7+
}
- /**
- * Figure out which reference (i.e tag or branch) contains the latest version.
- *
- * @param string $configBranch Start looking in this branch.
- * @return null|Puc_v4p13_Vcs_Reference
- */
- public function chooseReference($configBranch) {
- $updateSource = null;
+ protected function getUpdateDetectionStrategies($configBranch) {
+ $strategies = array();
- if ( $configBranch === 'master' ) {
+ if ( $configBranch === 'master' || $configBranch === 'main') {
//Use the latest release.
- $updateSource = $this->getLatestRelease();
- if ( $updateSource === null ) {
- //Failing that, use the tag with the highest version number.
- $updateSource = $this->getLatestTag();
- }
+ $strategies[self::STRATEGY_LATEST_RELEASE] = array($this, 'getLatestRelease');
+ //Failing that, use the tag with the highest version number.
+ $strategies[self::STRATEGY_LATEST_TAG] = array($this, 'getLatestTag');
}
+
//Alternatively, just use the branch itself.
- if ( empty($updateSource) ) {
- $updateSource = $this->getBranch($configBranch);
- }
+ $strategies[self::STRATEGY_BRANCH] = function () use ($configBranch) {
+ return $this->getBranch($configBranch);
+ };
- return $updateSource;
+ return $strategies;
}
/**
- * Enable updating via release assets.
+ * Get the unchanging part of a release asset URL. Used to identify download attempts.
*
- * If the latest release contains no usable assets, the update checker
- * will fall back to using the automatically generated ZIP archive.
- *
- * Private repositories will only work with WordPress 3.7 or later.
- *
- * @param string|null $fileNameRegex Optional. Use only those assets where the file name matches this regex.
+ * @return string
*/
- public function enableReleaseAssets($fileNameRegex = null) {
- $this->releaseAssetsEnabled = true;
- $this->assetFilterRegex = $fileNameRegex;
- $this->assetApiBaseUrl = sprintf(
+ protected function getAssetApiBaseUrl() {
+ return sprintf(
'//api.github.com/repos/%1$s/%2$s/releases/assets/',
$this->userName,
$this->repositoryName
);
}
- /**
- * Does this asset match the file name regex?
- *
- * @param stdClass $releaseAsset
- * @return bool
- */
- protected function matchesAssetFilter($releaseAsset) {
- if ( $this->assetFilterRegex === null ) {
- //The default is to accept all assets.
- return true;
+ protected function getFilterableAssetName($releaseAsset) {
+ if ( isset($releaseAsset->name) ) {
+ return $releaseAsset->name;
}
- return isset($releaseAsset->name) && preg_match($this->assetFilterRegex, $releaseAsset->name);
+ return null;
}
/**
- * @internal
* @param bool $result
* @return bool
+ * @internal
*/
public function addHttpRequestFilter($result) {
if ( !$this->downloadFilterAdded && $this->isAuthenticationEnabled() ) {
+ //phpcs:ignore WordPressVIPMinimum.Hooks.RestrictedHooks.http_request_args -- The callback doesn't change the timeout.
add_filter('http_request_args', array($this, 'setUpdateDownloadHeaders'), 10, 2);
add_action('requests-requests.before_redirect', array($this, 'removeAuthHeaderFromRedirects'), 10, 4);
$this->downloadFilterAdded = true;
@@ -387,6 +412,7 @@ public function addHttpRequestFilter($result) {
* Set the HTTP headers that are necessary to download updates from private repositories.
*
* See GitHub docs:
+ *
* @link https://developer.github.com/v3/repos/releases/#get-a-single-release-asset
* @link https://developer.github.com/v3/auth/#basic-authentication
*
@@ -397,7 +423,7 @@ public function addHttpRequestFilter($result) {
*/
public function setUpdateDownloadHeaders($requestArgs, $url = '') {
//Is WordPress trying to download one of our release assets?
- if ( $this->releaseAssetsEnabled && (strpos($url, $this->assetApiBaseUrl) !== false) ) {
+ if ( $this->releaseAssetsEnabled && (strpos($url, $this->getAssetApiBaseUrl()) !== false) ) {
$requestArgs['headers']['Accept'] = 'application/octet-stream';
}
//Use Basic authentication, but only if the download is from our repository.
@@ -413,9 +439,9 @@ public function setUpdateDownloadHeaders($requestArgs, $url = '') {
* the authorization header to other hosts. We don't want that because it breaks
* AWS downloads and can leak authorization information.
*
- * @internal
* @param string $location
* @param array $headers
+ * @internal
*/
public function removeAuthHeaderFromRedirects(&$location, &$headers) {
$repoApiBaseUrl = $this->buildApiUrl('/repos/:user/:repo/', array());
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/GitLabApi.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/GitLabApi.php
similarity index 65%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/GitLabApi.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/GitLabApi.php
index cd90ec2ac..663c2e7ca 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/GitLabApi.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/GitLabApi.php
@@ -1,8 +1,13 @@
repositoryHost = parse_url($repositoryUrl, PHP_URL_HOST) . $port;
+ $this->repositoryHost = wp_parse_url($repositoryUrl, PHP_URL_HOST) . $port;
if ( $this->repositoryHost !== 'gitlab.com' ) {
- $this->repositoryProtocol = parse_url($repositoryUrl, PHP_URL_SCHEME);
+ $this->repositoryProtocol = wp_parse_url($repositoryUrl, PHP_URL_SCHEME);
}
//Find the repository information
- $path = parse_url($repositoryUrl, PHP_URL_PATH);
+ $path = wp_parse_url($repositoryUrl, PHP_URL_PATH);
if ( preg_match('@^/?(?P[^/]+?)/(?P[^/#?&]+?)/?$@', $path, $matches) ) {
$this->userName = $matches['username'];
$this->repositoryName = $matches['repository'];
@@ -59,7 +60,7 @@ public function __construct($repositoryUrl, $accessToken = null, $subgroup = nul
//This is probably a repository in a subgroup, e.g. "/organization/category/repo".
$parts = explode('/', trim($path, '/'));
if ( count($parts) < 3 ) {
- throw new InvalidArgumentException('Invalid GitLab.com repository URL: "' . $repositoryUrl . '"');
+ throw new \InvalidArgumentException('Invalid GitLab.com repository URL: "' . $repositoryUrl . '"');
}
$lastPart = array_pop($parts);
$this->userName = implode('/', $parts);
@@ -76,7 +77,7 @@ public function __construct($repositoryUrl, $accessToken = null, $subgroup = nul
//We need at least /user-name/repository-name/
if ( count($segments) < 2 ) {
- throw new InvalidArgumentException('Invalid GitLab repository URL: "' . $repositoryUrl . '"');
+ throw new \InvalidArgumentException('Invalid GitLab repository URL: "' . $repositoryUrl . '"');
}
//Get the username and repository name.
@@ -101,83 +102,92 @@ public function __construct($repositoryUrl, $accessToken = null, $subgroup = nul
/**
* Get the latest release from GitLab.
*
- * @return Puc_v4p13_Vcs_Reference|null
+ * @return Reference|null
*/
public function getLatestRelease() {
- $releases = $this->api('/:id/releases');
+ $releases = $this->api('/:id/releases', array('per_page' => $this->releaseFilterMaxReleases));
if ( is_wp_error($releases) || empty($releases) || !is_array($releases) ) {
return null;
}
foreach ($releases as $release) {
- if ( true !== $release->upcoming_release ) {
- break 1; //Break the loop on the first release we find that isn't an upcoming release
+ if (
+ //Skip invalid/unsupported releases.
+ !is_object($release)
+ || !isset($release->tag_name)
+ //Skip upcoming releases.
+ || (
+ !empty($release->upcoming_release)
+ && $this->shouldSkipPreReleases()
+ )
+ ) {
+ continue;
}
- }
- if ( is_wp_error($release) || !is_object($release) || !isset($release->tag_name) ) {
- return null;
- }
- $reference = new Puc_v4p13_Vcs_Reference(array(
- 'name' => $release->tag_name,
- 'version' => ltrim($release->tag_name, 'v'), //Remove the "v" prefix from "v1.2.3".
- 'downloadUrl' => '',
- 'updated' => $release->released_at,
- 'apiResponse' => $release,
- ));
- $download_url = false;
-
- if ( $this->releasePackageEnabled && isset($release->assets, $release->assets->links) ) {
- /**
- * Use the first asset LINK that is a zip format file generated by a Gitlab Release Pipeline
- *
- * @link https://gist.github.com/timwiel/9dfd3526c768efad4973254085e065ce
- */
- foreach ($release->assets->links as $link) {
- //TODO: Check the "format" property instead of the URL suffix.
- if ( 'zip' === substr($link->url, -3) ) {
- $download_url = $link->url;
- break 1;
- }
+ $versionNumber = ltrim($release->tag_name, 'v'); //Remove the "v" prefix from "v1.2.3".
+
+ //Apply custom filters.
+ if ( !$this->matchesCustomReleaseFilter($versionNumber, $release) ) {
+ continue;
}
- if ( empty( $download_url ) ) {
+
+ $downloadUrl = $this->findReleaseDownloadUrl($release);
+ if ( empty($downloadUrl) ) {
+ //The latest release doesn't have valid download URL.
return null;
}
- if ( ! empty( $this->accessToken ) ) {
- $download_url = add_query_arg('private_token', $this->accessToken, $download_url);
+
+ if ( !empty($this->accessToken) ) {
+ $downloadUrl = add_query_arg('private_token', $this->accessToken, $downloadUrl);
}
- $reference->downloadUrl = $download_url;
- return $reference;
-
- } elseif ( isset($release->assets) ) {
- /**
- * Use the first asset SOURCE file that is a zip format from a Gitlab Release which should be a zip file
- */
- foreach ($release->assets->sources as $source) {
- if ( 'zip' === $source->format ) {
- $download_url = $source->url;
- break 1;
+
+ return new Reference(array(
+ 'name' => $release->tag_name,
+ 'version' => $versionNumber,
+ 'downloadUrl' => $downloadUrl,
+ 'updated' => $release->released_at,
+ 'apiResponse' => $release,
+ ));
+ }
+
+ return null;
+ }
+
+ /**
+ * @param object $release
+ * @return string|null
+ */
+ protected function findReleaseDownloadUrl($release) {
+ if ( $this->releaseAssetsEnabled ) {
+ if ( isset($release->assets, $release->assets->links) ) {
+ //Use the first asset link where the URL matches the filter.
+ foreach ($release->assets->links as $link) {
+ if ( $this->matchesAssetFilter($link) ) {
+ return $link->url;
+ }
}
}
- if ( empty( $download_url ) ) {
+
+ if ( $this->releaseAssetPreference === Api::REQUIRE_RELEASE_ASSETS ) {
+ //Falling back to source archives is not allowed, so give up.
return null;
}
- if ( ! empty( $this->accessToken ) ) {
- $download_url = add_query_arg('private_token', $this->accessToken, $download_url);
- }
- $reference->downloadUrl = $download_url;
- return $reference;
+ }
+ //Use the first source code archive that's in ZIP format.
+ foreach ($release->assets->sources as $source) {
+ if ( isset($source->format) && ($source->format === 'zip') ) {
+ return $source->url;
+ }
}
- //If we get this far without a return then obviosuly noi release download urls were found
return null;
- }
+ }
/**
* Get the tag that looks like the highest version number.
*
- * @return Puc_v4p13_Vcs_Reference|null
+ * @return Reference|null
*/
public function getLatestTag() {
$tags = $this->api('/:id/repository/tags');
@@ -191,7 +201,7 @@ public function getLatestTag() {
}
$tag = $versionTags[0];
- return new Puc_v4p13_Vcs_Reference(array(
+ return new Reference(array(
'name' => $tag->name,
'version' => ltrim($tag->name, 'v'),
'downloadUrl' => $this->buildArchiveDownloadUrl($tag->name),
@@ -203,7 +213,7 @@ public function getLatestTag() {
* Get a branch by name.
*
* @param string $branchName
- * @return null|Puc_v4p13_Vcs_Reference
+ * @return null|Reference
*/
public function getBranch($branchName) {
$branch = $this->api('/:id/repository/branches/' . $branchName);
@@ -211,7 +221,7 @@ public function getBranch($branchName) {
return null;
}
- $reference = new Puc_v4p13_Vcs_Reference(array(
+ $reference = new Reference(array(
'name' => $branch->name,
'downloadUrl' => $this->buildArchiveDownloadUrl($branch->name),
'apiResponse' => $branch,
@@ -244,13 +254,13 @@ public function getLatestCommitTime($ref) {
*
* @param string $url
* @param array $queryParams
- * @return mixed|WP_Error
+ * @return mixed|\WP_Error
*/
protected function api($url, $queryParams = array()) {
$baseUrl = $url;
$url = $this->buildApiUrl($url, $queryParams);
- $options = array('timeout' => 10);
+ $options = array('timeout' => wp_doing_cron() ? 10 : 3);
if ( !empty($this->httpFilterName) ) {
$options = apply_filters($this->httpFilterName, $options);
}
@@ -267,7 +277,7 @@ protected function api($url, $queryParams = array()) {
return json_decode($body);
}
- $error = new WP_Error(
+ $error = new \WP_Error(
'puc-gitlab-http-error',
sprintf('GitLab API error. URL: "%s", HTTP status code: %d.', $baseUrl, $code)
);
@@ -353,31 +363,22 @@ public function buildArchiveDownloadUrl($ref = 'master') {
* @return void
*/
public function getTag($tagName) {
- throw new LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
+ throw new \LogicException('The ' . __METHOD__ . ' method is not implemented and should not be used.');
}
- /**
- * Figure out which reference (i.e tag or branch) contains the latest version.
- *
- * @param string $configBranch Start looking in this branch.
- * @return null|Puc_v4p13_Vcs_Reference
- */
- public function chooseReference($configBranch) {
-
- if ( $configBranch === 'main' || $configBranch === 'master' ) {
- //Use the latest release.
- $updateSource = $this->getLatestRelease();
- if ( $updateSource === null ) {
- //Failing that, use the tag with the highest version number.
- $updateSource = $this->getLatestTag();
- }
- }
- //Alternatively, just use the branch itself.
- if ( empty($updateSource) ) {
- $updateSource = $this->getBranch($configBranch);
+ protected function getUpdateDetectionStrategies($configBranch) {
+ $strategies = array();
+
+ if ( ($configBranch === 'main') || ($configBranch === 'master') ) {
+ $strategies[self::STRATEGY_LATEST_RELEASE] = array($this, 'getLatestRelease');
+ $strategies[self::STRATEGY_LATEST_TAG] = array($this, 'getLatestTag');
}
- return $updateSource;
+ $strategies[self::STRATEGY_BRANCH] = function () use ($configBranch) {
+ return $this->getBranch($configBranch);
+ };
+
+ return $strategies;
}
public function setAuthentication($credentials) {
@@ -385,16 +386,29 @@ public function setAuthentication($credentials) {
$this->accessToken = is_string($credentials) ? $credentials : null;
}
- public function enableReleaseAssets() {
- $this->releaseAssetsEnabled = true;
- $this->releasePackageEnabled = false;
- }
-
+ /**
+ * Use release assets that link to GitLab generic packages (e.g. .zip files)
+ * instead of automatically generated source archives.
+ *
+ * This is included for backwards compatibility with older versions of PUC.
+ *
+ * @return void
+ * @deprecated Use enableReleaseAssets() instead.
+ * @noinspection PhpUnused -- Public API
+ */
public function enableReleasePackages() {
- $this->releaseAssetsEnabled = false;
- $this->releasePackageEnabled = true;
+ $this->enableReleaseAssets(
+ /** @lang RegExp */ '/\.zip($|[?&#])/i',
+ Api::REQUIRE_RELEASE_ASSETS
+ );
}
+ protected function getFilterableAssetName($releaseAsset) {
+ if ( isset($releaseAsset->url) ) {
+ return $releaseAsset->url;
+ }
+ return null;
+ }
}
endif;
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/PluginUpdateChecker.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/PluginUpdateChecker.php
similarity index 84%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/PluginUpdateChecker.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/PluginUpdateChecker.php
index 33d914294..082a847f6 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/PluginUpdateChecker.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/PluginUpdateChecker.php
@@ -1,21 +1,18 @@
api = $api;
- $this->api->setHttpFilterName($this->getUniqueName('request_info_options'));
parent::__construct($api->getRepositoryUrl(), $pluginFile, $slug, $checkPeriod, $optionName, $muPluginFile);
+ $this->api->setHttpFilterName($this->getUniqueName('request_info_options'));
+ $this->api->setStrategyFilterName($this->getUniqueName('vcs_update_detection_strategies'));
$this->api->setSlug($this->slug);
}
@@ -41,7 +39,7 @@ public function requestInfo($unusedParameter = null) {
$api = $this->api;
$api->setLocalDirectory($this->package->getAbsoluteDirectoryPath());
- $info = new Puc_v4p13_Plugin_Info();
+ $info = new Plugin\PluginInfo();
$info->filename = $this->pluginFile;
$info->slug = $this->slug;
@@ -67,7 +65,7 @@ public function requestInfo($unusedParameter = null) {
//There's probably a network problem or an authentication error.
do_action(
'puc_api_error',
- new WP_Error(
+ new \WP_Error(
'puc-no-update-source',
'Could not retrieve version information from the repository. '
. 'This usually means that the update checker either can\'t connect '
@@ -126,7 +124,7 @@ protected function readmeTxtExistsLocally() {
* Copy plugin metadata from a file header to a Plugin Info object.
*
* @param array $fileHeader
- * @param Puc_v4p13_Plugin_Info $pluginInfo
+ * @param Plugin\PluginInfo $pluginInfo
*/
protected function setInfoFromHeader($fileHeader, $pluginInfo) {
$headerToPropertyMap = array(
@@ -159,7 +157,7 @@ protected function setInfoFromHeader($fileHeader, $pluginInfo) {
* Copy plugin metadata from the remote readme.txt file.
*
* @param string $ref GitHub tag or branch where to look for the readme.
- * @param Puc_v4p13_Plugin_Info $pluginInfo
+ * @param Plugin\PluginInfo $pluginInfo
*/
protected function setInfoFromRemoteReadme($ref, $pluginInfo) {
$readme = $this->api->getRemoteReadme($ref);
@@ -192,7 +190,7 @@ protected function setInfoFromRemoteReadme($ref, $pluginInfo) {
* and file names are described here:
* @link https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/#plugin-icons
*
- * @param Puc_v4p13_Plugin_Info $pluginInfo
+ * @param Plugin\PluginInfo $pluginInfo
*/
protected function setIconsFromLocalAssets($pluginInfo) {
$icons = $this->getLocalAssetUrls(array(
@@ -221,7 +219,7 @@ protected function setIconsFromLocalAssets($pluginInfo) {
* and file names are described here:
* @link https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/#plugin-headers
*
- * @param Puc_v4p13_Plugin_Info $pluginInfo
+ * @param Plugin\PluginInfo $pluginInfo
*/
protected function setBannersFromLocalAssets($pluginInfo) {
$banners = $this->getLocalAssetUrls(array(
@@ -257,37 +255,6 @@ protected function getLocalAssetUrls($filesToKeys) {
return $foundAssets;
}
-
- public function setBranch($branch) {
- $this->branch = $branch;
- return $this;
- }
-
- public function setAuthentication($credentials) {
- $this->api->setAuthentication($credentials);
- return $this;
- }
-
- public function getVcsApi() {
- return $this->api;
- }
-
- public function getUpdate() {
- $update = parent::getUpdate();
-
- if ( isset($update) && !empty($update->download_url) ) {
- $update->download_url = $this->api->signDownloadUrl($update->download_url);
- }
-
- return $update;
- }
-
- public function onDisplayConfiguration($panel) {
- parent::onDisplayConfiguration($panel);
- $panel->row('Branch', $this->branch);
- $panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
- $panel->row('API client', get_class($this->api));
- }
}
endif;
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/Reference.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/Reference.php
similarity index 89%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/Reference.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/Reference.php
index 925116586..6cff32a45 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/Reference.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/Reference.php
@@ -1,5 +1,7 @@
releaseAssetsEnabled = true;
+ $this->assetFilterRegex = $nameRegex;
+ $this->releaseAssetPreference = $preference;
+ }
+
+ /**
+ * Disable release assets.
+ *
+ * @return void
+ * @noinspection PhpUnused -- Public API
+ */
+ public function disableReleaseAssets() {
+ $this->releaseAssetsEnabled = false;
+ $this->assetFilterRegex = null;
+ }
+
+ /**
+ * Does the specified asset match the name regex?
+ *
+ * @param mixed $releaseAsset Data type and structure depend on the host/API.
+ * @return bool
+ */
+ protected function matchesAssetFilter($releaseAsset) {
+ if ( $this->assetFilterRegex === null ) {
+ //The default is to accept all assets.
+ return true;
+ }
+
+ $name = $this->getFilterableAssetName($releaseAsset);
+ if ( !is_string($name) ) {
+ return false;
+ }
+ return (bool)preg_match($this->assetFilterRegex, $releaseAsset->name);
+ }
+
+ /**
+ * Get the part of asset data that will be checked against the filter regex.
+ *
+ * @param mixed $releaseAsset
+ * @return string|null
+ */
+ abstract protected function getFilterableAssetName($releaseAsset);
+ }
+
+endif;
\ No newline at end of file
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/ReleaseFilteringFeature.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/ReleaseFilteringFeature.php
new file mode 100644
index 000000000..12ef54ed6
--- /dev/null
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/ReleaseFilteringFeature.php
@@ -0,0 +1,108 @@
+ 100 ) {
+ throw new \InvalidArgumentException(sprintf(
+ 'The max number of releases is too high (%d). It must be 100 or less.',
+ $maxReleases
+ ));
+ } else if ( $maxReleases < 1 ) {
+ throw new \InvalidArgumentException(sprintf(
+ 'The max number of releases is too low (%d). It must be at least 1.',
+ $maxReleases
+ ));
+ }
+
+ $this->releaseFilterCallback = $callback;
+ $this->releaseFilterByType = $releaseTypes;
+ $this->releaseFilterMaxReleases = $maxReleases;
+ return $this;
+ }
+
+ /**
+ * Filter releases by their version number.
+ *
+ * @param string $regex A regular expression. The release version number must match this regex.
+ * @param int $releaseTypes
+ * @param int $maxReleasesToExamine
+ * @return $this
+ * @noinspection PhpUnused -- Public API
+ */
+ public function setReleaseVersionFilter(
+ $regex,
+ $releaseTypes = Api::RELEASE_FILTER_SKIP_PRERELEASE,
+ $maxReleasesToExamine = 20
+ ) {
+ return $this->setReleaseFilter(
+ function ($versionNumber) use ($regex) {
+ return (preg_match($regex, $versionNumber) === 1);
+ },
+ $releaseTypes,
+ $maxReleasesToExamine
+ );
+ }
+
+ /**
+ * @param string $versionNumber The detected release version number.
+ * @param object $releaseObject Varies depending on the host/API.
+ * @return bool
+ */
+ protected function matchesCustomReleaseFilter($versionNumber, $releaseObject) {
+ if ( !is_callable($this->releaseFilterCallback) ) {
+ return true; //No custom filter.
+ }
+ return call_user_func($this->releaseFilterCallback, $versionNumber, $releaseObject);
+ }
+
+ /**
+ * @return bool
+ */
+ protected function shouldSkipPreReleases() {
+ //Maybe this could be a bitfield in the future, if we need to support
+ //more release types.
+ return ($this->releaseFilterByType !== Api::RELEASE_FILTER_ALL);
+ }
+
+ /**
+ * @return bool
+ */
+ protected function hasCustomReleaseFilter() {
+ return isset($this->releaseFilterCallback) && is_callable($this->releaseFilterCallback);
+ }
+ }
+
+endif;
\ No newline at end of file
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/ThemeUpdateChecker.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/ThemeUpdateChecker.php
similarity index 55%
rename from vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/ThemeUpdateChecker.php
rename to vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/ThemeUpdateChecker.php
index c463b8e5f..c871ce9fe 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/Puc/v4p13/Vcs/ThemeUpdateChecker.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/ThemeUpdateChecker.php
@@ -1,22 +1,19 @@
api = $api;
- $this->api->setHttpFilterName($this->getUniqueName('request_update_options'));
parent::__construct($api->getRepositoryUrl(), $stylesheet, $customSlug, $checkPeriod, $optionName);
+ $this->api->setHttpFilterName($this->getUniqueName('request_update_options'));
+ $this->api->setStrategyFilterName($this->getUniqueName('vcs_update_detection_strategies'));
$this->api->setSlug($this->slug);
}
@@ -35,7 +33,7 @@ public function requestUpdate() {
$api = $this->api;
$api->setLocalDirectory($this->package->getAbsoluteDirectoryPath());
- $update = new Puc_v4p13_Theme_Update();
+ $update = new Theme\Update();
$update->slug = $this->slug;
//Figure out which reference (tag or branch) we'll use to get the latest version of the theme.
@@ -46,7 +44,7 @@ public function requestUpdate() {
} else {
do_action(
'puc_api_error',
- new WP_Error(
+ new \WP_Error(
'puc-no-update-source',
'Could not retrieve version information from the repository. '
. 'This usually means that the update checker either can\'t connect '
@@ -60,13 +58,13 @@ public function requestUpdate() {
//Get headers from the main stylesheet in this branch/tag. Its "Version" header and other metadata
//are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
$remoteHeader = $this->package->getFileHeader($api->getRemoteFile('style.css', $ref));
- $update->version = Puc_v4p13_Utils::findNotEmpty(array(
+ $update->version = Utils::findNotEmpty(array(
$remoteHeader['Version'],
- Puc_v4p13_Utils::get($updateSource, 'version'),
+ Utils::get($updateSource, 'version'),
));
//The details URL defaults to the Theme URI header or the repository URL.
- $update->details_url = Puc_v4p13_Utils::findNotEmpty(array(
+ $update->details_url = Utils::findNotEmpty(array(
$remoteHeader['ThemeURI'],
$this->package->getHeaderValue('ThemeURI'),
$this->metadataUrl,
@@ -80,39 +78,6 @@ public function requestUpdate() {
$update = $this->filterUpdateResult($update);
return $update;
}
-
- //FIXME: This is duplicated code. Both theme and plugin subclasses that use VCS share these methods.
-
- public function setBranch($branch) {
- $this->branch = $branch;
- return $this;
- }
-
- public function setAuthentication($credentials) {
- $this->api->setAuthentication($credentials);
- return $this;
- }
-
- public function getVcsApi() {
- return $this->api;
- }
-
- public function getUpdate() {
- $update = parent::getUpdate();
-
- if ( isset($update) && !empty($update->download_url) ) {
- $update->download_url = $this->api->signDownloadUrl($update->download_url);
- }
-
- return $update;
- }
-
- public function onDisplayConfiguration($panel) {
- parent::onDisplayConfiguration($panel);
- $panel->row('Branch', $this->branch);
- $panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
- $panel->row('API client', get_class($this->api));
- }
}
endif;
diff --git a/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/VcsCheckerMethods.php b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/VcsCheckerMethods.php
new file mode 100644
index 000000000..113d663bc
--- /dev/null
+++ b/vendor/yahnis-elsts/plugin-update-checker/Puc/v5p1/Vcs/VcsCheckerMethods.php
@@ -0,0 +1,59 @@
+branch = $branch;
+ return $this;
+ }
+
+ /**
+ * Set authentication credentials.
+ *
+ * @param array|string $credentials
+ * @return $this
+ */
+ public function setAuthentication($credentials) {
+ $this->api->setAuthentication($credentials);
+ return $this;
+ }
+
+ /**
+ * @return Api
+ */
+ public function getVcsApi() {
+ return $this->api;
+ }
+
+ public function getUpdate() {
+ $update = parent::getUpdate();
+
+ if ( isset($update) && !empty($update->download_url) ) {
+ $update->download_url = $this->api->signDownloadUrl($update->download_url);
+ }
+
+ return $update;
+ }
+
+ public function onDisplayConfiguration($panel) {
+ parent::onDisplayConfiguration($panel);
+ $panel->row('Branch', $this->branch);
+ $panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
+ $panel->row('API client', get_class($this->api));
+ }
+ }
+
+endif;
\ No newline at end of file
diff --git a/vendor/yahnis-elsts/plugin-update-checker/README.md b/vendor/yahnis-elsts/plugin-update-checker/README.md
index 469564fc9..5a3b4b2d4 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/README.md
+++ b/vendor/yahnis-elsts/plugin-update-checker/README.md
@@ -20,6 +20,7 @@ From the users' perspective, it works just like with plugins and themes hosted o
- [How to Release an Update](#how-to-release-an-update-2)
- [GitLab Integration](#gitlab-integration)
- [How to Release a GitLab Update](#how-to-release-a-gitlab-update)
+- [Migrating from 4.x](#migrating-from-4x)
- [License Management](#license-management)
- [Resources](#resources)
@@ -40,7 +41,7 @@ Getting Started
{
"name" : "Plugin Name",
"version" : "2.0",
- "download_url" : "http://example.com/plugin-name-2.0.zip",
+ "download_url" : "https://example.com/plugin-name-2.0.zip",
"sections" : {
"description" : "Plugin description here. You can use HTML."
}
@@ -53,8 +54,8 @@ Getting Started
```json
{
"version": "2.0",
- "details_url": "http://example.com/version-2.0-details.html",
- "download_url": "http://example.com/example-theme-2.0.zip"
+ "details_url": "https://example.com/version-2.0-details.html",
+ "download_url": "https://example.com/example-theme-2.0.zip"
}
```
@@ -64,8 +65,10 @@ Getting Started
```php
require 'path/to/plugin-update-checker/plugin-update-checker.php';
- $myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
- 'http://example.com/path/to/details.json',
+ use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
+
+ $myUpdateChecker = PucFactory::buildUpdateChecker(
+ 'https://example.com/path/to/details.json',
__FILE__, //Full path to the main plugin file or functions.php.
'unique-plugin-or-theme-slug'
);
@@ -96,7 +99,9 @@ By default, the library will check the specified URL for changes every 12 hours.
```php
require 'plugin-update-checker/plugin-update-checker.php';
- $myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
+ use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
+
+ $myUpdateChecker = PucFactory::buildUpdateChecker(
'https://github.com/user-name/repo-name/',
__FILE__,
'unique-plugin-or-theme-slug'
@@ -127,7 +132,7 @@ This library supports a couple of different ways to release updates on GitHub. P
To release version 1.2.3, create a new Git tag named `v1.2.3` or `1.2.3`. That's it.
- PUC doesn't require strict adherence to [SemVer](http://semver.org/). These are all valid tag names: `v1.2.3`, `v1.2-foo`, `1.2.3_rc1-ABC`, `1.2.3.4.5`. However, be warned that it's not smart enough to filter out alpha/beta/RC versions. If that's a problem, you might want to use GitHub releases or branches instead.
+ PUC doesn't require strict adherence to [SemVer](https://semver.org/). These are all valid tag names: `v1.2.3`, `v1.2-foo`, `1.2.3_rc1-ABC`, `1.2.3.4.5`. However, be warned that it's not smart enough to filter out alpha/beta/RC versions. If that's a problem, you might want to use GitHub releases or branches instead.
- **Stable branch**
@@ -175,7 +180,9 @@ The library will pull update details from the following parts of a release/tag/b
```php
require 'plugin-update-checker/plugin-update-checker.php';
- $myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
+ use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
+
+ $myUpdateChecker = PucFactory::buildUpdateChecker(
'https://bitbucket.org/user-name/repo-name',
__FILE__,
'unique-plugin-or-theme-slug'
@@ -214,7 +221,7 @@ BitBucket doesn't have an equivalent to GitHub's releases, so the process is sli
You can skip the "stable tag" bit and just create a new Git tag named `v1.2.3` or `1.2.3`. The update checker will look at the most recent tags and pick the one that looks like the highest version number.
- PUC doesn't require strict adherence to [SemVer](http://semver.org/). These are all valid tag names: `v1.2.3`, `v1.2-foo`, `1.2.3_rc1-ABC`, `1.2.3.4.5`. However, be warned that it's not smart enough to filter out alpha/beta/RC versions.
+ PUC doesn't require strict adherence to [SemVer](https://semver.org/). These are all valid tag names: `v1.2.3`, `v1.2-foo`, `1.2.3_rc1-ABC`, `1.2.3.4.5`. However, be warned that it's not smart enough to filter out alpha/beta/RC versions.
- **Stable branch**
@@ -231,7 +238,9 @@ BitBucket doesn't have an equivalent to GitHub's releases, so the process is sli
```php
require 'plugin-update-checker/plugin-update-checker.php';
- $myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
+ use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
+
+ $myUpdateChecker = PucFactory::buildUpdateChecker(
'https://gitlab.com/user-name/repo-name/',
__FILE__,
'unique-plugin-or-theme-slug'
@@ -243,72 +252,109 @@ BitBucket doesn't have an equivalent to GitHub's releases, so the process is sli
Alternatively, if you're using a self-hosted GitLab instance, initialize the update checker like this:
```php
- $myUpdateChecker = new Puc_v4p13_Vcs_PluginUpdateChecker(
- new Puc_v4p13_Vcs_GitLabApi('https://myserver.com/user-name/repo-name/'),
- __FILE__,
- 'unique-plugin-or-theme-slug'
- );
- //Optional: Add setAuthentication(...) and setBranch(...) as shown above.
- ```
- If you're using a self-hosted GitLab instance and [subgroups or nested groups](https://docs.gitlab.com/ce/user/group/subgroups/index.html), you have to tell the update checker which parts of the URL are subgroups:
- ```php
- $myUpdateChecker = new Puc_v4p13_Vcs_PluginUpdateChecker(
- new Puc_v4p13_Vcs_GitLabApi('https://myserver.com/group-name/subgroup-level1/subgroup-level2/subgroup-level3/repo-name/', null, 'subgroup-level1/subgroup-level2/subgroup-level3'),
- __FILE__,
- 'unique-plugin-or-theme-slug'
- );
-
- ```
+ use YahnisElsts\PluginUpdateChecker\v5p1\Vcs\PluginUpdateChecker;
+ use YahnisElsts\PluginUpdateChecker\v5p1\Vcs\GitLabApi;
+
+ $myUpdateChecker = new PluginUpdateChecker(
+ new GitLabApi('https://myserver.com/user-name/repo-name/'),
+ __FILE__,
+ 'unique-plugin-or-theme-slug'
+ );
+ //Optional: Add setAuthentication(...) and setBranch(...) as shown above.
+ ```
+ If you're using a self-hosted GitLab instance and [subgroups or nested groups](https://docs.gitlab.com/ce/user/group/subgroups/index.html), you have to tell the update checker which parts of the URL are subgroups:
+ ```php
+ use YahnisElsts\PluginUpdateChecker\v5p1\Vcs\PluginUpdateChecker;
+ use YahnisElsts\PluginUpdateChecker\v5p1\Vcs\GitLabApi;
+
+ $myUpdateChecker = new PluginUpdateChecker(
+ new GitLabApi(
+ 'https://myserver.com/group-name/subgroup-level1/subgroup-level2/subgroup-level3/repo-name/',
+ null,
+ 'subgroup-level1/subgroup-level2/subgroup-level3'
+ ),
+ __FILE__,
+ 'unique-plugin-or-theme-slug'
+ );
+ ```
3. Plugins only: Add a `readme.txt` file formatted according to the [WordPress.org plugin readme standard](https://wordpress.org/plugins/readme.txt) to your repository. The contents of this file will be shown when the user clicks the "View version 1.2.3 details" link.
#### How to Release a GitLab Update
-A Gitlab repository can be checked for updates in 4 different ways.
-
-1. **Stable branch** (other than `master` or `main`):
- - Point the update checker at any stable, production-ready branch and PUC will periodically check the `Version` header in the main plugin file or `style.css` and display a notification if it's greater than the installed version.
- - Add the following code:
- ```php
- //Add the following code to your main plugin file or `functions.php` file to check for updates from a custom branch
- $myUpdateChecker->setBranch('stable-branch-name');
- ```
- - Caveats:
- - If you set the branch to `main` (the default) or `master` (the historical default), the update checker will look for recent releases and tags first. It'll only use the `main` or `master` branch if it doesn't find anything else suitable.
-
-2. **GitLab Releases using Generic Packages**:
- - Use a Gitlab CI/CD Pipeline to automatically generate your update on release using a Generic Package. The benefit of using Generic Package assets over the Source Code assets is that the code can already be built and production ready.
- - Add the following code:
- ```php
- //Add the following code to your main plugin file or `functions.php` file to check for a new update from releases using generic packages
- $myUpdateChecker->getVcsApi()->enableReleasePackages();
- ```
- - PUC will periodically check the release version (i.e. the tag name of the release) and will display a notification if the release is a greater version than the installed version.
- - The release tag name should loosely follow [SemVer](http://semver.org/) but these are all valid release names: `v1.2.3`, `v1.2-foo`, `1.2.3_rc1-ABC`, `1.2.3.4.5` However, be warned that it's not smart enough to filter out alpha/beta/RC versions. If that's a problem, you might want to use GitLab branches instead.
- - For more information about *Gitlab Release Generic Packages* refer to the following links:
+
+A GitLab repository can be checked for updates in 3 different ways.
+
+- **GitLab releases**
+
+ Create a new release using the "Releases" feature on GitLab. The tag name should match the version number. You can add a `v` prefix to the tag, like `v1.2.3`. Releases that are marked as ["Upcoming Release"](https://docs.gitlab.com/ee/user/project/releases/index.html#upcoming-releases) will be automatically ignored.
+
+ If you want to use custom release assets, call the `enableReleaseAssets()` method after creating the update checker instance:
+ ```php
+ $myUpdateChecker->getVcsApi()->enableReleaseAssets();
+ ```
+
+ By default, PUC will use the first available asset link, regardless of type. You can pass a regular expression to `enableReleaseAssets()` to make it pick the first link where the URL matches the regex. For example:
+ ```php
+ $myUpdateChecker->getVcsApi()->enableReleaseAssets('/\.zip($|[?&#])/i');
+ ```
+
+ **Tip:** You can use a Gitlab CI/CD Pipeline to automatically generate your update on release using a Generic Package. For more information about generic packages, refer to the following links:
- [Gitlab CI/CD Release Documentation](https://docs.gitlab.com/ee/user/project/releases/#create-release-from-gitlab-ci)
- [Gitlab Release Assets as Generic Package Documentation](https://gitlab.com/gitlab-org/release-cli/-/tree/master/docs/examples/release-assets-as-generic-package/)
- [Example .gitlab-ci.yml file using Release Generic Packages for generating a update package from the Sensei-LMS wordpress plugin](https://gist.github.com/timwiel/9dfd3526c768efad4973254085e065ce)
+- **Tags**
-3. **GitLab Releases using Source Code Assets**:
- - Create a new release using the "Releases" feature on Gitlab.
- - Add the following code:
- ```php
- //Add the following code to your main plugin file or `functions.php` file to check for a new update from releases using release assets
- $myUpdateChecker->getVcsApi()->enableReleaseAssets();
- ```
- - PUC will periodically check the release version (based on release tag name) and display a notification if the release version is greater than the installed version.
- - The release name should loosely follow [SemVer](http://semver.org/) but these are all valid release names: `v1.2.3`, `v1.2-foo`, `1.2.3_rc1-ABC`, `1.2.3.4.5` However, be warned that it's not smart enough to filter out alpha/beta/RC versions. If that's a problem, you might want to use GitLab branches instead.
+ To release version 1.2.3, create a new Git tag named `v1.2.3` or `1.2.3`. The update checker will look at recent tags and use the one that looks like the highest version number.
+
+ PUC doesn't require strict adherence to [SemVer](https://semver.org/). However, be warned that it's not smart enough to filter out alpha/beta/RC versions. If that's a problem, you might want to use GitLab branches instead.
+- **Stable branch**
-4. **Tags** (this is the default option):
- - To release version 1.2.3, create a new Git tag named `v1.2.3` or `1.2.3`.
- - Optionally, add the following code:
- ```php
- //Add the following code to your main plugin file or `functions.php` file to check for updates from the default branch
- $myUpdateChecker->setBranch('master'); //or 'main'
- ```
- - PUC doesn't require strict adherence to [SemVer](http://semver.org/). These are all valid tag names: `v1.2.3`, `v1.2-foo`, `1.2.3_rc1-ABC`, `1.2.3.4.5`. However, be warned that it's not smart enough to filter out alpha/beta/RC versions. If that's a problem, you might want to use GitLab branches instead.
+ Point the update checker at any stable, production-ready branch:
+ ```php
+ $myUpdateChecker->setBranch('stable-branch-name');
+ ```
+ PUC will periodically check the `Version` header in the main plugin file or `style.css` and display a notification if it's greater than the installed version. Caveat: Even if you set the branch to `main` (the default) or `master` (the historical default), the update checker will still look for recent releases and tags first.
+
+Migrating from 4.x
+------------------
+
+Older versions of the library didn't use namespaces. Code that was written for those versions will need to be updated to work with the current version. At a minimum, you'll need to change the factory class name.
+
+Old code:
+```php
+$myUpdateChecker = Puc_v4_Factory::buildUpdateChecker(
+ 'https://example.com/info.json',
+ __FILE__,
+ 'my-slug'
+);
+```
+
+New code:
+```php
+use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
+
+$myUpdateChecker = PucFactory::buildUpdateChecker(
+ 'https://example.com/info.json',
+ __FILE__,
+ 'my-slug'
+);
+```
+
+Other classes have also been renamed, usually by simply removing the `Puc_vXpY_` prefix and converting `Category_Thing` to `Category\Thing`. Here's a table of the most commonly used classes and their new names:
+
+| Old class name | New class name |
+|-------------------------------------|----------------------------------------------------------------|
+| `Puc_v4_Factory` | `YahnisElsts\PluginUpdateChecker\v5\PucFactory` |
+| `Puc_v4p13_Factory` | `YahnisElsts\PluginUpdateChecker\v5p1\PucFactory` |
+| `Puc_v4p13_Plugin_UpdateChecker` | `YahnisElsts\PluginUpdateChecker\v5p1\Plugin\UpdateChecker` |
+| `Puc_v4p13_Theme_UpdateChecker` | `YahnisElsts\PluginUpdateChecker\v5p1\Theme\UpdateChecker` |
+| `Puc_v4p13_Vcs_PluginUpdateChecker` | `YahnisElsts\PluginUpdateChecker\v5p1\Vcs\PluginUpdateChecker` |
+| `Puc_v4p13_Vcs_ThemeUpdateChecker` | `YahnisElsts\PluginUpdateChecker\v5p1\Vcs\ThemeUpdateChecker` |
+| `Puc_v4p13_Vcs_GitHubApi` | `YahnisElsts\PluginUpdateChecker\v5p1\Vcs\GitHubApi` |
+| `Puc_v4p13_Vcs_GitLabApi` | `YahnisElsts\PluginUpdateChecker\v5p1\Vcs\GitLabApi` |
+| `Puc_v4p13_Vcs_BitBucketApi` | `YahnisElsts\PluginUpdateChecker\v5p1\Vcs\BitBucketApi` |
License Management
------------------
@@ -318,9 +364,9 @@ Currently, the update checker doesn't have any built-in license management featu
Resources
---------
-- [This blog post](http://w-shadow.com/blog/2010/09/02/automatic-updates-for-any-plugin/) has more information about the update checker API. *Slightly out of date.*
+- [This blog post](https://w-shadow.com/blog/2010/09/02/automatic-updates-for-any-plugin/) has more information about the update checker API. *Slightly out of date.*
- [Debug Bar](https://wordpress.org/plugins/debug-bar/) - useful for testing and debugging the update checker.
- [Update format reference](https://docs.google.com/spreadsheets/d/1eOBbW7Go2qEQXReOOCdidMTf_tDYRq4JfegcO1CBPIs/edit?usp=sharing) - describes all fields supported by the JSON-based update information format used by the update checker. Only covers plugins. Themes use a similar but more limited format.
-- [Securing download links](http://w-shadow.com/blog/2013/03/19/plugin-updates-securing-download-links/) - a general overview.
-- [A GUI for entering download credentials](http://open-tools.net/documentation/tutorial-automatic-updates.html#wordpress)
-- [Theme Update Checker](http://w-shadow.com/blog/2011/06/02/automatic-updates-for-commercial-themes/) - an older, theme-only variant of this update checker.
+- [Securing download links](https://w-shadow.com/blog/2013/03/19/plugin-updates-securing-download-links/) - a general overview.
+- [A GUI for entering download credentials](https://open-tools.net/documentation/tutorial-automatic-updates.html#wordpress)
+- [Theme Update Checker](https://w-shadow.com/blog/2011/06/02/automatic-updates-for-commercial-themes/) - an older, theme-only variant of this update checker.
diff --git a/vendor/yahnis-elsts/plugin-update-checker/composer.json b/vendor/yahnis-elsts/plugin-update-checker/composer.json
index 7f97a49bd..1a71ce838 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/composer.json
+++ b/vendor/yahnis-elsts/plugin-update-checker/composer.json
@@ -9,15 +9,15 @@
{
"name": "Yahnis Elsts",
"email": "whiteshadow@w-shadow.com",
- "homepage": "http://w-shadow.com/",
+ "homepage": "https://w-shadow.com/",
"role": "Developer"
}
],
"require": {
- "php": ">=5.2.0",
+ "php": ">=5.6.20",
"ext-json": "*"
},
"autoload": {
- "files": ["load-v4p13.php"]
+ "files": ["load-v5p1.php"]
}
}
diff --git a/vendor/yahnis-elsts/plugin-update-checker/css/puc-debug-bar.css b/vendor/yahnis-elsts/plugin-update-checker/css/puc-debug-bar.css
index 2cb3f8e69..649db4fa1 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/css/puc-debug-bar.css
+++ b/vendor/yahnis-elsts/plugin-update-checker/css/puc-debug-bar.css
@@ -1,4 +1,4 @@
-.puc-debug-bar-panel-v4 pre {
+.puc-debug-bar-panel-v5 pre {
margin-top: 0;
}
diff --git a/vendor/yahnis-elsts/plugin-update-checker/examples/plugin.json b/vendor/yahnis-elsts/plugin-update-checker/examples/plugin.json
index fea211a12..946b73076 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/examples/plugin.json
+++ b/vendor/yahnis-elsts/plugin-update-checker/examples/plugin.json
@@ -1,52 +1,52 @@
-{
- "name": "My Example Plugin",
- "version": "2.0",
- "download_url": "http://example.com/updates/example-plugin.zip",
-
- "homepage": "http://example.com/",
- "requires": "4.5",
- "tested": "4.8",
- "last_updated": "2017-01-01 16:17:00",
- "upgrade_notice": "Here's why you should upgrade...",
-
- "author": "Janis Elsts",
- "author_homepage": "http://example.com/",
-
- "sections": {
- "description": "(Required) Plugin description. Basic HTML can be used in all sections.",
- "installation": "(Recommended) Installation instructions.",
- "changelog": "(Recommended) Changelog. This section will be displayed by default when the user clicks 'View version x.y.z details'.
",
- "custom_section": "This is a custom section labeled 'Custom Section'."
- },
-
- "icons" : {
- "1x" : "http://w-shadow.com/files/external-update-example/assets/icon-128x128.png",
- "2x" : "http://w-shadow.com/files/external-update-example/assets/icon-256x256.png"
- },
-
- "banners": {
- "low": "http://w-shadow.com/files/external-update-example/assets/banner-772x250.png",
- "high": "http://w-shadow.com/files/external-update-example/assets/banner-1544x500.png"
- },
-
- "translations": [
- {
- "language": "fr_FR",
- "version": "4.0",
- "updated": "2016-04-22 23:22:42",
- "package": "http://example.com/updates/translations/french-language-pack.zip"
- },
- {
- "language": "de_DE",
- "version": "5.0",
- "updated": "2016-04-22 23:22:42",
- "package": "http://example.com/updates/translations/german-language-pack.zip"
- }
- ],
-
- "rating": 90,
- "num_ratings": 123,
-
- "downloaded": 1234,
- "active_installs": 12345
+{
+ "name": "My Example Plugin",
+ "version": "2.0",
+ "download_url": "http://example.com/updates/example-plugin.zip",
+
+ "homepage": "http://example.com/",
+ "requires": "4.5",
+ "tested": "4.8",
+ "last_updated": "2017-01-01 16:17:00",
+ "upgrade_notice": "Here's why you should upgrade...",
+
+ "author": "Janis Elsts",
+ "author_homepage": "http://example.com/",
+
+ "sections": {
+ "description": "(Required) Plugin description. Basic HTML can be used in all sections.",
+ "installation": "(Recommended) Installation instructions.",
+ "changelog": "(Recommended) Changelog. This section will be displayed by default when the user clicks 'View version x.y.z details'.
",
+ "custom_section": "This is a custom section labeled 'Custom Section'."
+ },
+
+ "icons" : {
+ "1x" : "http://w-shadow.com/files/external-update-example/assets/icon-128x128.png",
+ "2x" : "http://w-shadow.com/files/external-update-example/assets/icon-256x256.png"
+ },
+
+ "banners": {
+ "low": "http://w-shadow.com/files/external-update-example/assets/banner-772x250.png",
+ "high": "http://w-shadow.com/files/external-update-example/assets/banner-1544x500.png"
+ },
+
+ "translations": [
+ {
+ "language": "fr_FR",
+ "version": "4.0",
+ "updated": "2016-04-22 23:22:42",
+ "package": "http://example.com/updates/translations/french-language-pack.zip"
+ },
+ {
+ "language": "de_DE",
+ "version": "5.0",
+ "updated": "2016-04-22 23:22:42",
+ "package": "http://example.com/updates/translations/german-language-pack.zip"
+ }
+ ],
+
+ "rating": 90,
+ "num_ratings": 123,
+
+ "downloaded": 1234,
+ "active_installs": 12345
}
\ No newline at end of file
diff --git a/vendor/yahnis-elsts/plugin-update-checker/examples/theme.json b/vendor/yahnis-elsts/plugin-update-checker/examples/theme.json
index df6c8c797..0e080725f 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/examples/theme.json
+++ b/vendor/yahnis-elsts/plugin-update-checker/examples/theme.json
@@ -1,5 +1,5 @@
-{
- "version": "2.0",
- "details_url": "http://example.com/version-2.0-details.html",
- "download_url": "http://example.com/example-theme-2.0.zip"
+{
+ "version": "2.0",
+ "details_url": "http://example.com/version-2.0-details.html",
+ "download_url": "http://example.com/example-theme-2.0.zip"
}
\ No newline at end of file
diff --git a/vendor/yahnis-elsts/plugin-update-checker/js/debug-bar.js b/vendor/yahnis-elsts/plugin-update-checker/js/debug-bar.js
index 2452c0204..80f53f11e 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/js/debug-bar.js
+++ b/vendor/yahnis-elsts/plugin-update-checker/js/debug-bar.js
@@ -2,7 +2,7 @@ jQuery(function($) {
function runAjaxAction(button, action) {
button = $(button);
- var panel = button.closest('.puc-debug-bar-panel-v4');
+ var panel = button.closest('.puc-debug-bar-panel-v5');
var responseBox = button.closest('td').find('.puc-ajax-response');
responseBox.text('Processing...').show();
@@ -14,19 +14,21 @@ jQuery(function($) {
_wpnonce: panel.data('nonce')
},
function(data) {
+ //The response contains HTML that should already be escaped in server-side code.
+ //phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.html
responseBox.html(data);
},
'html'
);
}
- $('.puc-debug-bar-panel-v4 input[name="puc-check-now-button"]').on('click', function() {
- runAjaxAction(this, 'puc_v4_debug_check_now');
+ $('.puc-debug-bar-panel-v5 input[name="puc-check-now-button"]').on('click', function() {
+ runAjaxAction(this, 'puc_v5_debug_check_now');
return false;
});
- $('.puc-debug-bar-panel-v4 input[name="puc-request-info-button"]').on('click', function() {
- runAjaxAction(this, 'puc_v4_debug_request_info');
+ $('.puc-debug-bar-panel-v5 input[name="puc-request-info-button"]').on('click', function() {
+ runAjaxAction(this, 'puc_v5_debug_request_info');
return false;
});
@@ -34,7 +36,7 @@ jQuery(function($) {
// Debug Bar uses the panel class name as part of its link and container IDs. This means we can
// end up with multiple identical IDs if more than one plugin uses the update checker library.
// Fix it by replacing the class name with the plugin slug.
- var panels = $('#debug-menu-targets').find('.puc-debug-bar-panel-v4');
+ var panels = $('#debug-menu-targets').find('.puc-debug-bar-panel-v5');
panels.each(function() {
var panel = $(this);
var uid = panel.data('uid');
diff --git a/vendor/yahnis-elsts/plugin-update-checker/languages/plugin-update-checker.pot b/vendor/yahnis-elsts/plugin-update-checker/languages/plugin-update-checker.pot
index 127a4893c..edc8de4f2 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/languages/plugin-update-checker.pot
+++ b/vendor/yahnis-elsts/plugin-update-checker/languages/plugin-update-checker.pot
@@ -17,33 +17,33 @@ msgstr ""
"X-Poedit-KeywordsList: __;_e;_x:1,2c;_x\n"
"X-Poedit-SearchPath-0: .\n"
-#: Puc/v4p13/Plugin/Ui.php:128
+#: Puc/v5p1/Plugin/Ui.php:128
msgid "Check for updates"
msgstr ""
-#: Puc/v4p13/Plugin/Ui.php:214
+#: Puc/v5p1/Plugin/Ui.php:214
#, php-format
msgctxt "the plugin title"
msgid "The %s plugin is up to date."
msgstr ""
-#: Puc/v4p13/Plugin/Ui.php:216
+#: Puc/v5p1/Plugin/Ui.php:216
#, php-format
msgctxt "the plugin title"
msgid "A new version of the %s plugin is available."
msgstr ""
-#: Puc/v4p13/Plugin/Ui.php:218
+#: Puc/v5p1/Plugin/Ui.php:218
#, php-format
msgctxt "the plugin title"
msgid "Could not determine if updates are available for %s."
msgstr ""
-#: Puc/v4p13/Plugin/Ui.php:224
+#: Puc/v5p1/Plugin/Ui.php:224
#, php-format
msgid "Unknown update checker status \"%s\""
msgstr ""
-#: Puc/v4p13/Vcs/PluginUpdateChecker.php:100
+#: Puc/v5p1/Vcs/PluginUpdateChecker.php:100
msgid "There is no changelog available."
msgstr ""
diff --git a/vendor/yahnis-elsts/plugin-update-checker/load-v4p13.php b/vendor/yahnis-elsts/plugin-update-checker/load-v4p13.php
deleted file mode 100644
index 8b67c1a29..000000000
--- a/vendor/yahnis-elsts/plugin-update-checker/load-v4p13.php
+++ /dev/null
@@ -1,28 +0,0 @@
- 'Puc_v4p13_Plugin_UpdateChecker',
- 'Theme_UpdateChecker' => 'Puc_v4p13_Theme_UpdateChecker',
-
- 'Vcs_PluginUpdateChecker' => 'Puc_v4p13_Vcs_PluginUpdateChecker',
- 'Vcs_ThemeUpdateChecker' => 'Puc_v4p13_Vcs_ThemeUpdateChecker',
-
- 'GitHubApi' => 'Puc_v4p13_Vcs_GitHubApi',
- 'BitBucketApi' => 'Puc_v4p13_Vcs_BitBucketApi',
- 'GitLabApi' => 'Puc_v4p13_Vcs_GitLabApi',
- )
- as $pucGeneralClass => $pucVersionedClass
-) {
- Puc_v4_Factory::addVersion($pucGeneralClass, $pucVersionedClass, '4.13');
- //Also add it to the minor-version factory in case the major-version factory
- //was already defined by another, older version of the update checker.
- Puc_v4p13_Factory::addVersion($pucGeneralClass, $pucVersionedClass, '4.13');
-}
-
diff --git a/vendor/yahnis-elsts/plugin-update-checker/load-v5p1.php b/vendor/yahnis-elsts/plugin-update-checker/load-v5p1.php
new file mode 100644
index 000000000..83cebcb65
--- /dev/null
+++ b/vendor/yahnis-elsts/plugin-update-checker/load-v5p1.php
@@ -0,0 +1,34 @@
+ Plugin\UpdateChecker::class,
+ 'Theme\\UpdateChecker' => Theme\UpdateChecker::class,
+
+ 'Vcs\\PluginUpdateChecker' => Vcs\PluginUpdateChecker::class,
+ 'Vcs\\ThemeUpdateChecker' => Vcs\ThemeUpdateChecker::class,
+
+ 'GitHubApi' => Vcs\GitHubApi::class,
+ 'BitBucketApi' => Vcs\BitBucketApi::class,
+ 'GitLabApi' => Vcs\GitLabApi::class,
+ )
+ as $pucGeneralClass => $pucVersionedClass
+) {
+ MajorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.1');
+ //Also add it to the minor-version factory in case the major-version factory
+ //was already defined by another, older version of the update checker.
+ MinorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.1');
+}
+
diff --git a/vendor/yahnis-elsts/plugin-update-checker/phpcs.xml b/vendor/yahnis-elsts/plugin-update-checker/phpcs.xml
new file mode 100644
index 000000000..e8260b99a
--- /dev/null
+++ b/vendor/yahnis-elsts/plugin-update-checker/phpcs.xml
@@ -0,0 +1,21 @@
+
+
+ PHPCS settings for Plugin Update Checker
+
+
+
+
+
+
+
+ ./
+
+
+
+
+
+
+
+
+ ^vendor/*
+
diff --git a/vendor/yahnis-elsts/plugin-update-checker/plugin-update-checker.php b/vendor/yahnis-elsts/plugin-update-checker/plugin-update-checker.php
index da4348f97..ebf10bc75 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/plugin-update-checker.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/plugin-update-checker.php
@@ -1,10 +1,10 @@
=') ) {
- require __DIR__ . '/ParsedownModern.php';
- } else {
- require __DIR__ . '/ParsedownLegacy.php';
- }
+ require __DIR__ . '/ParsedownModern.php';
}
diff --git a/vendor/yahnis-elsts/plugin-update-checker/vendor/ParsedownLegacy.php b/vendor/yahnis-elsts/plugin-update-checker/vendor/ParsedownLegacy.php
deleted file mode 100644
index bbc2d3236..000000000
--- a/vendor/yahnis-elsts/plugin-update-checker/vendor/ParsedownLegacy.php
+++ /dev/null
@@ -1,1535 +0,0 @@
-DefinitionData = array();
-
- # standardize line breaks
- $text = str_replace(array("\r\n", "\r"), "\n", $text);
-
- # remove surrounding line breaks
- $text = trim($text, "\n");
-
- # split text into lines
- $lines = explode("\n", $text);
-
- # iterate through lines to identify blocks
- $markup = $this->lines($lines);
-
- # trim line breaks
- $markup = trim($markup, "\n");
-
- return $markup;
- }
-
- #
- # Setters
- #
-
- function setBreaksEnabled($breaksEnabled)
- {
- $this->breaksEnabled = $breaksEnabled;
-
- return $this;
- }
-
- protected $breaksEnabled;
-
- function setMarkupEscaped($markupEscaped)
- {
- $this->markupEscaped = $markupEscaped;
-
- return $this;
- }
-
- protected $markupEscaped;
-
- function setUrlsLinked($urlsLinked)
- {
- $this->urlsLinked = $urlsLinked;
-
- return $this;
- }
-
- protected $urlsLinked = true;
-
- #
- # Lines
- #
-
- protected $BlockTypes = array(
- '#' => array('Header'),
- '*' => array('Rule', 'List'),
- '+' => array('List'),
- '-' => array('SetextHeader', 'Table', 'Rule', 'List'),
- '0' => array('List'),
- '1' => array('List'),
- '2' => array('List'),
- '3' => array('List'),
- '4' => array('List'),
- '5' => array('List'),
- '6' => array('List'),
- '7' => array('List'),
- '8' => array('List'),
- '9' => array('List'),
- ':' => array('Table'),
- '<' => array('Comment', 'Markup'),
- '=' => array('SetextHeader'),
- '>' => array('Quote'),
- '[' => array('Reference'),
- '_' => array('Rule'),
- '`' => array('FencedCode'),
- '|' => array('Table'),
- '~' => array('FencedCode'),
- );
-
- # ~
-
- protected $DefinitionTypes = array(
- '[' => array('Reference'),
- );
-
- # ~
-
- protected $unmarkedBlockTypes = array(
- 'Code',
- );
-
- #
- # Blocks
- #
-
- private function lines(array $lines)
- {
- $CurrentBlock = null;
-
- foreach ($lines as $line)
- {
- if (chop($line) === '')
- {
- if (isset($CurrentBlock))
- {
- $CurrentBlock['interrupted'] = true;
- }
-
- continue;
- }
-
- if (strpos($line, "\t") !== false)
- {
- $parts = explode("\t", $line);
-
- $line = $parts[0];
-
- unset($parts[0]);
-
- foreach ($parts as $part)
- {
- $shortage = 4 - mb_strlen($line, 'utf-8') % 4;
-
- $line .= str_repeat(' ', $shortage);
- $line .= $part;
- }
- }
-
- $indent = 0;
-
- while (isset($line[$indent]) and $line[$indent] === ' ')
- {
- $indent ++;
- }
-
- $text = $indent > 0 ? substr($line, $indent) : $line;
-
- # ~
-
- $Line = array('body' => $line, 'indent' => $indent, 'text' => $text);
-
- # ~
-
- if (isset($CurrentBlock['incomplete']))
- {
- $Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock);
-
- if (isset($Block))
- {
- $CurrentBlock = $Block;
-
- continue;
- }
- else
- {
- if (method_exists($this, 'block'.$CurrentBlock['type'].'Complete'))
- {
- $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
- }
-
- unset($CurrentBlock['incomplete']);
- }
- }
-
- # ~
-
- $marker = $text[0];
-
- # ~
-
- $blockTypes = $this->unmarkedBlockTypes;
-
- if (isset($this->BlockTypes[$marker]))
- {
- foreach ($this->BlockTypes[$marker] as $blockType)
- {
- $blockTypes []= $blockType;
- }
- }
-
- #
- # ~
-
- foreach ($blockTypes as $blockType)
- {
- $Block = $this->{'block'.$blockType}($Line, $CurrentBlock);
-
- if (isset($Block))
- {
- $Block['type'] = $blockType;
-
- if ( ! isset($Block['identified']))
- {
- $Blocks []= $CurrentBlock;
-
- $Block['identified'] = true;
- }
-
- if (method_exists($this, 'block'.$blockType.'Continue'))
- {
- $Block['incomplete'] = true;
- }
-
- $CurrentBlock = $Block;
-
- continue 2;
- }
- }
-
- # ~
-
- if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
- {
- $CurrentBlock['element']['text'] .= "\n".$text;
- }
- else
- {
- $Blocks []= $CurrentBlock;
-
- $CurrentBlock = $this->paragraph($Line);
-
- $CurrentBlock['identified'] = true;
- }
- }
-
- # ~
-
- if (isset($CurrentBlock['incomplete']) and method_exists($this, 'block'.$CurrentBlock['type'].'Complete'))
- {
- $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
- }
-
- # ~
-
- $Blocks []= $CurrentBlock;
-
- unset($Blocks[0]);
-
- # ~
-
- $markup = '';
-
- foreach ($Blocks as $Block)
- {
- if (isset($Block['hidden']))
- {
- continue;
- }
-
- $markup .= "\n";
- $markup .= isset($Block['markup']) ? $Block['markup'] : $this->element($Block['element']);
- }
-
- $markup .= "\n";
-
- # ~
-
- return $markup;
- }
-
- #
- # Code
-
- protected function blockCode($Line, $Block = null)
- {
- if (isset($Block) and ! isset($Block['type']) and ! isset($Block['interrupted']))
- {
- return;
- }
-
- if ($Line['indent'] >= 4)
- {
- $text = substr($Line['body'], 4);
-
- $Block = array(
- 'element' => array(
- 'name' => 'pre',
- 'handler' => 'element',
- 'text' => array(
- 'name' => 'code',
- 'text' => $text,
- ),
- ),
- );
-
- return $Block;
- }
- }
-
- protected function blockCodeContinue($Line, $Block)
- {
- if ($Line['indent'] >= 4)
- {
- if (isset($Block['interrupted']))
- {
- $Block['element']['text']['text'] .= "\n";
-
- unset($Block['interrupted']);
- }
-
- $Block['element']['text']['text'] .= "\n";
-
- $text = substr($Line['body'], 4);
-
- $Block['element']['text']['text'] .= $text;
-
- return $Block;
- }
- }
-
- protected function blockCodeComplete($Block)
- {
- $text = $Block['element']['text']['text'];
-
- $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
-
- $Block['element']['text']['text'] = $text;
-
- return $Block;
- }
-
- #
- # Comment
-
- protected function blockComment($Line)
- {
- if ($this->markupEscaped)
- {
- return;
- }
-
- if (isset($Line['text'][3]) and $Line['text'][3] === '-' and $Line['text'][2] === '-' and $Line['text'][1] === '!')
- {
- $Block = array(
- 'markup' => $Line['body'],
- );
-
- if (preg_match('/-->$/', $Line['text']))
- {
- $Block['closed'] = true;
- }
-
- return $Block;
- }
- }
-
- protected function blockCommentContinue($Line, array $Block)
- {
- if (isset($Block['closed']))
- {
- return;
- }
-
- $Block['markup'] .= "\n" . $Line['body'];
-
- if (preg_match('/-->$/', $Line['text']))
- {
- $Block['closed'] = true;
- }
-
- return $Block;
- }
-
- #
- # Fenced Code
-
- protected function blockFencedCode($Line)
- {
- if (preg_match('/^(['.$Line['text'][0].']{3,})[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches))
- {
- $Element = array(
- 'name' => 'code',
- 'text' => '',
- );
-
- if (isset($matches[2]))
- {
- $class = 'language-'.$matches[2];
-
- $Element['attributes'] = array(
- 'class' => $class,
- );
- }
-
- $Block = array(
- 'char' => $Line['text'][0],
- 'element' => array(
- 'name' => 'pre',
- 'handler' => 'element',
- 'text' => $Element,
- ),
- );
-
- return $Block;
- }
- }
-
- protected function blockFencedCodeContinue($Line, $Block)
- {
- if (isset($Block['complete']))
- {
- return;
- }
-
- if (isset($Block['interrupted']))
- {
- $Block['element']['text']['text'] .= "\n";
-
- unset($Block['interrupted']);
- }
-
- if (preg_match('/^'.$Block['char'].'{3,}[ ]*$/', $Line['text']))
- {
- $Block['element']['text']['text'] = substr($Block['element']['text']['text'], 1);
-
- $Block['complete'] = true;
-
- return $Block;
- }
-
- $Block['element']['text']['text'] .= "\n".$Line['body'];;
-
- return $Block;
- }
-
- protected function blockFencedCodeComplete($Block)
- {
- $text = $Block['element']['text']['text'];
-
- $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
-
- $Block['element']['text']['text'] = $text;
-
- return $Block;
- }
-
- #
- # Header
-
- protected function blockHeader($Line)
- {
- if (isset($Line['text'][1]))
- {
- $level = 1;
-
- while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
- {
- $level ++;
- }
-
- if ($level > 6)
- {
- return;
- }
-
- $text = trim($Line['text'], '# ');
-
- $Block = array(
- 'element' => array(
- 'name' => 'h' . min(6, $level),
- 'text' => $text,
- 'handler' => 'line',
- ),
- );
-
- return $Block;
- }
- }
-
- #
- # List
-
- protected function blockList($Line)
- {
- list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.]');
-
- if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
- {
- $Block = array(
- 'indent' => $Line['indent'],
- 'pattern' => $pattern,
- 'element' => array(
- 'name' => $name,
- 'handler' => 'elements',
- ),
- );
-
- $Block['li'] = array(
- 'name' => 'li',
- 'handler' => 'li',
- 'text' => array(
- $matches[2],
- ),
- );
-
- $Block['element']['text'] []= & $Block['li'];
-
- return $Block;
- }
- }
-
- protected function blockListContinue($Line, array $Block)
- {
- if ($Block['indent'] === $Line['indent'] and preg_match('/^'.$Block['pattern'].'(?:[ ]+(.*)|$)/', $Line['text'], $matches))
- {
- if (isset($Block['interrupted']))
- {
- $Block['li']['text'] []= '';
-
- unset($Block['interrupted']);
- }
-
- unset($Block['li']);
-
- $text = isset($matches[1]) ? $matches[1] : '';
-
- $Block['li'] = array(
- 'name' => 'li',
- 'handler' => 'li',
- 'text' => array(
- $text,
- ),
- );
-
- $Block['element']['text'] []= & $Block['li'];
-
- return $Block;
- }
-
- if ($Line['text'][0] === '[' and $this->blockReference($Line))
- {
- return $Block;
- }
-
- if ( ! isset($Block['interrupted']))
- {
- $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
-
- $Block['li']['text'] []= $text;
-
- return $Block;
- }
-
- if ($Line['indent'] > 0)
- {
- $Block['li']['text'] []= '';
-
- $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
-
- $Block['li']['text'] []= $text;
-
- unset($Block['interrupted']);
-
- return $Block;
- }
- }
-
- #
- # Quote
-
- protected function blockQuote($Line)
- {
- if (preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
- {
- $Block = array(
- 'element' => array(
- 'name' => 'blockquote',
- 'handler' => 'lines',
- 'text' => (array) $matches[1],
- ),
- );
-
- return $Block;
- }
- }
-
- protected function blockQuoteContinue($Line, array $Block)
- {
- if ($Line['text'][0] === '>' and preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
- {
- if (isset($Block['interrupted']))
- {
- $Block['element']['text'] []= '';
-
- unset($Block['interrupted']);
- }
-
- $Block['element']['text'] []= $matches[1];
-
- return $Block;
- }
-
- if ( ! isset($Block['interrupted']))
- {
- $Block['element']['text'] []= $Line['text'];
-
- return $Block;
- }
- }
-
- #
- # Rule
-
- protected function blockRule($Line)
- {
- if (preg_match('/^(['.$Line['text'][0].'])([ ]*\1){2,}[ ]*$/', $Line['text']))
- {
- $Block = array(
- 'element' => array(
- 'name' => 'hr'
- ),
- );
-
- return $Block;
- }
- }
-
- #
- # Setext
-
- protected function blockSetextHeader($Line, array $Block = null)
- {
- if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
- {
- return;
- }
-
- if (chop($Line['text'], $Line['text'][0]) === '')
- {
- $Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2';
-
- return $Block;
- }
- }
-
- #
- # Markup
-
- protected function blockMarkup($Line)
- {
- if ($this->markupEscaped)
- {
- return;
- }
-
- if (preg_match('/^<(\w*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
- {
- if (in_array($matches[1], $this->textLevelElements))
- {
- return;
- }
-
- $Block = array(
- 'name' => $matches[1],
- 'depth' => 0,
- 'markup' => $Line['text'],
- );
-
- $length = strlen($matches[0]);
-
- $remainder = substr($Line['text'], $length);
-
- if (trim($remainder) === '')
- {
- if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
- {
- $Block['closed'] = true;
-
- $Block['void'] = true;
- }
- }
- else
- {
- if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
- {
- return;
- }
-
- if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
- {
- $Block['closed'] = true;
- }
- }
-
- return $Block;
- }
- }
-
- protected function blockMarkupContinue($Line, array $Block)
- {
- if (isset($Block['closed']))
- {
- return;
- }
-
- if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
- {
- $Block['depth'] ++;
- }
-
- if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
- {
- if ($Block['depth'] > 0)
- {
- $Block['depth'] --;
- }
- else
- {
- $Block['closed'] = true;
- }
-
- $Block['markup'] .= $matches[1];
- }
-
- if (isset($Block['interrupted']))
- {
- $Block['markup'] .= "\n";
-
- unset($Block['interrupted']);
- }
-
- $Block['markup'] .= "\n".$Line['body'];
-
- return $Block;
- }
-
- #
- # Reference
-
- protected function blockReference($Line)
- {
- if (preg_match('/^\[(.+?)\]:[ ]*?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches))
- {
- $id = strtolower($matches[1]);
-
- $Data = array(
- 'url' => $matches[2],
- 'title' => null,
- );
-
- if (isset($matches[3]))
- {
- $Data['title'] = $matches[3];
- }
-
- $this->DefinitionData['Reference'][$id] = $Data;
-
- $Block = array(
- 'hidden' => true,
- );
-
- return $Block;
- }
- }
-
- #
- # Table
-
- protected function blockTable($Line, array $Block = null)
- {
- if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
- {
- return;
- }
-
- if (strpos($Block['element']['text'], '|') !== false and chop($Line['text'], ' -:|') === '')
- {
- $alignments = array();
-
- $divider = $Line['text'];
-
- $divider = trim($divider);
- $divider = trim($divider, '|');
-
- $dividerCells = explode('|', $divider);
-
- foreach ($dividerCells as $dividerCell)
- {
- $dividerCell = trim($dividerCell);
-
- if ($dividerCell === '')
- {
- continue;
- }
-
- $alignment = null;
-
- if ($dividerCell[0] === ':')
- {
- $alignment = 'left';
- }
-
- if (substr($dividerCell, - 1) === ':')
- {
- $alignment = $alignment === 'left' ? 'center' : 'right';
- }
-
- $alignments []= $alignment;
- }
-
- # ~
-
- $HeaderElements = array();
-
- $header = $Block['element']['text'];
-
- $header = trim($header);
- $header = trim($header, '|');
-
- $headerCells = explode('|', $header);
-
- foreach ($headerCells as $index => $headerCell)
- {
- $headerCell = trim($headerCell);
-
- $HeaderElement = array(
- 'name' => 'th',
- 'text' => $headerCell,
- 'handler' => 'line',
- );
-
- if (isset($alignments[$index]))
- {
- $alignment = $alignments[$index];
-
- $HeaderElement['attributes'] = array(
- 'style' => 'text-align: '.$alignment.';',
- );
- }
-
- $HeaderElements []= $HeaderElement;
- }
-
- # ~
-
- $Block = array(
- 'alignments' => $alignments,
- 'identified' => true,
- 'element' => array(
- 'name' => 'table',
- 'handler' => 'elements',
- ),
- );
-
- $Block['element']['text'] []= array(
- 'name' => 'thead',
- 'handler' => 'elements',
- );
-
- $Block['element']['text'] []= array(
- 'name' => 'tbody',
- 'handler' => 'elements',
- 'text' => array(),
- );
-
- $Block['element']['text'][0]['text'] []= array(
- 'name' => 'tr',
- 'handler' => 'elements',
- 'text' => $HeaderElements,
- );
-
- return $Block;
- }
- }
-
- protected function blockTableContinue($Line, array $Block)
- {
- if (isset($Block['interrupted']))
- {
- return;
- }
-
- if ($Line['text'][0] === '|' or strpos($Line['text'], '|'))
- {
- $Elements = array();
-
- $row = $Line['text'];
-
- $row = trim($row);
- $row = trim($row, '|');
-
- preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]+`|`)+/', $row, $matches);
-
- foreach ($matches[0] as $index => $cell)
- {
- $cell = trim($cell);
-
- $Element = array(
- 'name' => 'td',
- 'handler' => 'line',
- 'text' => $cell,
- );
-
- if (isset($Block['alignments'][$index]))
- {
- $Element['attributes'] = array(
- 'style' => 'text-align: '.$Block['alignments'][$index].';',
- );
- }
-
- $Elements []= $Element;
- }
-
- $Element = array(
- 'name' => 'tr',
- 'handler' => 'elements',
- 'text' => $Elements,
- );
-
- $Block['element']['text'][1]['text'] []= $Element;
-
- return $Block;
- }
- }
-
- #
- # ~
- #
-
- protected function paragraph($Line)
- {
- $Block = array(
- 'element' => array(
- 'name' => 'p',
- 'text' => $Line['text'],
- 'handler' => 'line',
- ),
- );
-
- return $Block;
- }
-
- #
- # Inline Elements
- #
-
- protected $InlineTypes = array(
- '"' => array('SpecialCharacter'),
- '!' => array('Image'),
- '&' => array('SpecialCharacter'),
- '*' => array('Emphasis'),
- ':' => array('Url'),
- '<' => array('UrlTag', 'EmailTag', 'Markup', 'SpecialCharacter'),
- '>' => array('SpecialCharacter'),
- '[' => array('Link'),
- '_' => array('Emphasis'),
- '`' => array('Code'),
- '~' => array('Strikethrough'),
- '\\' => array('EscapeSequence'),
- );
-
- # ~
-
- protected $inlineMarkerList = '!"*_&[:<>`~\\';
-
- #
- # ~
- #
-
- public function line($text)
- {
- $markup = '';
-
- $unexaminedText = $text;
-
- $markerPosition = 0;
-
- while ($excerpt = strpbrk($unexaminedText, $this->inlineMarkerList))
- {
- $marker = $excerpt[0];
-
- $markerPosition += strpos($unexaminedText, $marker);
-
- $Excerpt = array('text' => $excerpt, 'context' => $text);
-
- foreach ($this->InlineTypes[$marker] as $inlineType)
- {
- $Inline = $this->{'inline'.$inlineType}($Excerpt);
-
- if ( ! isset($Inline))
- {
- continue;
- }
-
- if (isset($Inline['position']) and $Inline['position'] > $markerPosition) # position is ahead of marker
- {
- continue;
- }
-
- if ( ! isset($Inline['position']))
- {
- $Inline['position'] = $markerPosition;
- }
-
- $unmarkedText = substr($text, 0, $Inline['position']);
-
- $markup .= $this->unmarkedText($unmarkedText);
-
- $markup .= isset($Inline['markup']) ? $Inline['markup'] : $this->element($Inline['element']);
-
- $text = substr($text, $Inline['position'] + $Inline['extent']);
-
- $unexaminedText = $text;
-
- $markerPosition = 0;
-
- continue 2;
- }
-
- $unexaminedText = substr($excerpt, 1);
-
- $markerPosition ++;
- }
-
- $markup .= $this->unmarkedText($text);
-
- return $markup;
- }
-
- #
- # ~
- #
-
- protected function inlineCode($Excerpt)
- {
- $marker = $Excerpt['text'][0];
-
- if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(? strlen($matches[0]),
- 'element' => array(
- 'name' => 'code',
- 'text' => $text,
- ),
- );
- }
- }
-
- protected function inlineEmailTag($Excerpt)
- {
- if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $Excerpt['text'], $matches))
- {
- $url = $matches[1];
-
- if ( ! isset($matches[2]))
- {
- $url = 'mailto:' . $url;
- }
-
- return array(
- 'extent' => strlen($matches[0]),
- 'element' => array(
- 'name' => 'a',
- 'text' => $matches[1],
- 'attributes' => array(
- 'href' => $url,
- ),
- ),
- );
- }
- }
-
- protected function inlineEmphasis($Excerpt)
- {
- if ( ! isset($Excerpt['text'][1]))
- {
- return;
- }
-
- $marker = $Excerpt['text'][0];
-
- if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
- {
- $emphasis = 'strong';
- }
- elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
- {
- $emphasis = 'em';
- }
- else
- {
- return;
- }
-
- return array(
- 'extent' => strlen($matches[0]),
- 'element' => array(
- 'name' => $emphasis,
- 'handler' => 'line',
- 'text' => $matches[1],
- ),
- );
- }
-
- protected function inlineEscapeSequence($Excerpt)
- {
- if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
- {
- return array(
- 'markup' => $Excerpt['text'][1],
- 'extent' => 2,
- );
- }
- }
-
- protected function inlineImage($Excerpt)
- {
- if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
- {
- return;
- }
-
- $Excerpt['text']= substr($Excerpt['text'], 1);
-
- $Link = $this->inlineLink($Excerpt);
-
- if ($Link === null)
- {
- return;
- }
-
- $Inline = array(
- 'extent' => $Link['extent'] + 1,
- 'element' => array(
- 'name' => 'img',
- 'attributes' => array(
- 'src' => $Link['element']['attributes']['href'],
- 'alt' => $Link['element']['text'],
- ),
- ),
- );
-
- $Inline['element']['attributes'] += $Link['element']['attributes'];
-
- unset($Inline['element']['attributes']['href']);
-
- return $Inline;
- }
-
- protected function inlineLink($Excerpt)
- {
- $Element = array(
- 'name' => 'a',
- 'handler' => 'line',
- 'text' => null,
- 'attributes' => array(
- 'href' => null,
- 'title' => null,
- ),
- );
-
- $extent = 0;
-
- $remainder = $Excerpt['text'];
-
- if (preg_match('/\[((?:[^][]|(?R))*)\]/', $remainder, $matches))
- {
- $Element['text'] = $matches[1];
-
- $extent += strlen($matches[0]);
-
- $remainder = substr($remainder, $extent);
- }
- else
- {
- return;
- }
-
- if (preg_match('/^[(]((?:[^ (]|[(][^ )]+[)])+)(?:[ ]+("[^"]+"|\'[^\']+\'))?[)]/', $remainder, $matches))
- {
- $Element['attributes']['href'] = $matches[1];
-
- if (isset($matches[2]))
- {
- $Element['attributes']['title'] = substr($matches[2], 1, - 1);
- }
-
- $extent += strlen($matches[0]);
- }
- else
- {
- if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
- {
- $definition = $matches[1] ? $matches[1] : $Element['text'];
- $definition = strtolower($definition);
-
- $extent += strlen($matches[0]);
- }
- else
- {
- $definition = strtolower($Element['text']);
- }
-
- if ( ! isset($this->DefinitionData['Reference'][$definition]))
- {
- return;
- }
-
- $Definition = $this->DefinitionData['Reference'][$definition];
-
- $Element['attributes']['href'] = $Definition['url'];
- $Element['attributes']['title'] = $Definition['title'];
- }
-
- $Element['attributes']['href'] = str_replace(array('&', '<'), array('&', '<'), $Element['attributes']['href']);
-
- return array(
- 'extent' => $extent,
- 'element' => $Element,
- );
- }
-
- protected function inlineMarkup($Excerpt)
- {
- if ($this->markupEscaped or strpos($Excerpt['text'], '>') === false)
- {
- return;
- }
-
- if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w*[ ]*>/s', $Excerpt['text'], $matches))
- {
- return array(
- 'markup' => $matches[0],
- 'extent' => strlen($matches[0]),
- );
- }
-
- if ($Excerpt['text'][1] === '!' and preg_match('/^/s', $Excerpt['text'], $matches))
- {
- return array(
- 'markup' => $matches[0],
- 'extent' => strlen($matches[0]),
- );
- }
-
- if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches))
- {
- return array(
- 'markup' => $matches[0],
- 'extent' => strlen($matches[0]),
- );
- }
- }
-
- protected function inlineSpecialCharacter($Excerpt)
- {
- if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
- {
- return array(
- 'markup' => '&',
- 'extent' => 1,
- );
- }
-
- $SpecialCharacter = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
-
- if (isset($SpecialCharacter[$Excerpt['text'][0]]))
- {
- return array(
- 'markup' => '&'.$SpecialCharacter[$Excerpt['text'][0]].';',
- 'extent' => 1,
- );
- }
- }
-
- protected function inlineStrikethrough($Excerpt)
- {
- if ( ! isset($Excerpt['text'][1]))
- {
- return;
- }
-
- if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
- {
- return array(
- 'extent' => strlen($matches[0]),
- 'element' => array(
- 'name' => 'del',
- 'text' => $matches[1],
- 'handler' => 'line',
- ),
- );
- }
- }
-
- protected function inlineUrl($Excerpt)
- {
- if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
- {
- return;
- }
-
- if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE))
- {
- $Inline = array(
- 'extent' => strlen($matches[0][0]),
- 'position' => $matches[0][1],
- 'element' => array(
- 'name' => 'a',
- 'text' => $matches[0][0],
- 'attributes' => array(
- 'href' => $matches[0][0],
- ),
- ),
- );
-
- return $Inline;
- }
- }
-
- protected function inlineUrlTag($Excerpt)
- {
- if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $Excerpt['text'], $matches))
- {
- $url = str_replace(array('&', '<'), array('&', '<'), $matches[1]);
-
- return array(
- 'extent' => strlen($matches[0]),
- 'element' => array(
- 'name' => 'a',
- 'text' => $url,
- 'attributes' => array(
- 'href' => $url,
- ),
- ),
- );
- }
- }
-
- #
- # ~
-
- protected $unmarkedInlineTypes = array("\n" => 'Break', '://' => 'Url');
-
- # ~
-
- protected function unmarkedText($text)
- {
- if ($this->breaksEnabled)
- {
- $text = preg_replace('/[ ]*\n/', "
\n", $text);
- }
- else
- {
- $text = preg_replace('/(?:[ ][ ]+|[ ]*\\\\)\n/', "
\n", $text);
- $text = str_replace(" \n", "\n", $text);
- }
-
- return $text;
- }
-
- #
- # Handlers
- #
-
- protected function element(array $Element)
- {
- $markup = '<'.$Element['name'];
-
- if (isset($Element['attributes']))
- {
- foreach ($Element['attributes'] as $name => $value)
- {
- if ($value === null)
- {
- continue;
- }
-
- $markup .= ' '.$name.'="'.$value.'"';
- }
- }
-
- if (isset($Element['text']))
- {
- $markup .= '>';
-
- if (isset($Element['handler']))
- {
- $markup .= $this->{$Element['handler']}($Element['text']);
- }
- else
- {
- $markup .= $Element['text'];
- }
-
- $markup .= '';
- }
- else
- {
- $markup .= ' />';
- }
-
- return $markup;
- }
-
- protected function elements(array $Elements)
- {
- $markup = '';
-
- foreach ($Elements as $Element)
- {
- $markup .= "\n" . $this->element($Element);
- }
-
- $markup .= "\n";
-
- return $markup;
- }
-
- # ~
-
- protected function li($lines)
- {
- $markup = $this->lines($lines);
-
- $trimmedMarkup = trim($markup);
-
- if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '')
- {
- $markup = $trimmedMarkup;
- $markup = substr($markup, 3);
-
- $position = strpos($markup, "
");
-
- $markup = substr_replace($markup, '', $position, 4);
- }
-
- return $markup;
- }
-
- #
- # Deprecated Methods
- #
-
- function parse($text)
- {
- $markup = $this->text($text);
-
- return $markup;
- }
-
- #
- # Static Methods
- #
-
- static function instance($name = 'default')
- {
- if (isset(self::$instances[$name]))
- {
- return self::$instances[$name];
- }
-
- $instance = new self();
-
- self::$instances[$name] = $instance;
-
- return $instance;
- }
-
- private static $instances = array();
-
- #
- # Fields
- #
-
- protected $DefinitionData;
-
- #
- # Read-Only
-
- protected $specialCharacters = array(
- '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|',
- );
-
- protected $StrongRegex = array(
- '*' => '/^[*]{2}((?:\\\\\*|[^*]|[*][^*]*[*])+?)[*]{2}(?![*])/s',
- '_' => '/^__((?:\\\\_|[^_]|_[^_]*_)+?)__(?!_)/us',
- );
-
- protected $EmRegex = array(
- '*' => '/^[*]((?:\\\\\*|[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
- '_' => '/^_((?:\\\\_|[^_]|__[^_]*__)+?)_(?!_)\b/us',
- );
-
- protected $regexHtmlAttribute = '[a-zA-Z_:][\w:.-]*(?:\s*=\s*(?:[^"\'=<>`\s]+|"[^"]*"|\'[^\']*\'))?';
-
- protected $voidElements = array(
- 'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source',
- );
-
- protected $textLevelElements = array(
- 'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
- 'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
- 'i', 'rp', 'del', 'code', 'strike', 'marquee',
- 'q', 'rt', 'ins', 'font', 'strong',
- 's', 'tt', 'sub', 'mark',
- 'u', 'xm', 'sup', 'nobr',
- 'var', 'ruby',
- 'wbr', 'span',
- 'time',
- );
-}
diff --git a/vendor/yahnis-elsts/plugin-update-checker/vendor/PucReadmeParser.php b/vendor/yahnis-elsts/plugin-update-checker/vendor/PucReadmeParser.php
index 1f5cec9e1..a794c49ac 100644
--- a/vendor/yahnis-elsts/plugin-update-checker/vendor/PucReadmeParser.php
+++ b/vendor/yahnis-elsts/plugin-update-checker/vendor/PucReadmeParser.php
@@ -241,7 +241,11 @@ function user_sanitize( $text, $strict = false ) { // whitelisted chars
}
function sanitize_text( $text ) { // not fancy
- $text = strip_tags($text);
+ $text = function_exists('wp_strip_all_tags')
+ ? wp_strip_all_tags($text)
+ //phpcs:ignore WordPressVIPMinimum.Functions.StripTags.StripTagsOneParameter -- Using wp_strip_all_tags() if available
+ : strip_tags($text);
+
$text = esc_html($text);
$text = trim($text);
return $text;