' . $invalid - . ' -
' . __( 'Learn how to organize feeds in Groups', 'feedzy-rss-feeds' ) . '
+ . ' +
+
+
+
';
echo wp_kses( $output, apply_filters( 'feedzy_wp_kses_allowed_html', array() ) );
}
+ /**
+ * Render the feed preview metabox.
+ *
+ * @return void
+ */
+ public function render_feed_preview() {
+ // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ if ( isset( $_GET['action'] ) && 'edit' !== $_GET['action'] ) {
+ return;
+ }
+ $feeds = get_post_meta( get_the_ID(), 'feedzy_category_feed', true );
+ $feed_urls = $this->normalize_urls( $feeds );
+ if ( empty( $feed_urls ) ) {
+ echo '' . esc_html__( 'No feeds available for preview.', 'feedzy-rss-feeds' ) . '
'; + return; + } + $shortcode = array( + 'sort' => 'date_desc', + 'thumb' => 'no', + 'max' => 0, + ); + $atts = $this->get_short_code_attributes( $shortcode ); + $atts = $this->sanitize_attr( $atts, $feed_urls ); + $sizes = array( + 'width' => 0, + 'height' => 0, + ); + $feed = $this->fetch_feed( $feed_urls, $atts['refresh'], $atts ); + $feed_items = apply_filters( 'feedzy_get_feed_array', array(), $atts, $feed, $feed_urls, $sizes ); + $total_items = count( $feed_items ); + + $max_items_preview_count = 5; + $preview_feed_items = array_slice( $feed_items, 0, $max_items_preview_count ); + ?> + + + +
+
+ getTimestamp() + $array->getOffset();
+
+ return sprintf(
+ // translators: %s is the time difference.
+ __( '%s ago', 'feedzy-rss-feeds' ),
+ human_time_diff( $item_publish_time, $localtime )
+ );
+ }
+
/**
* Utility method to save metabox data to
* custom post type.
@@ -841,6 +1141,8 @@ public function feedzy_category_columns( $columns ) {
$columns['actions'] = __( 'Actions', 'feedzy-rss-feeds' );
}
+ $new_columns = $this->array_insert_before( 'slug', $columns, 'source', __( 'Source', 'feedzy-rss-feeds' ) );
+
return $columns;
}
@@ -885,6 +1187,33 @@ public function manage_feedzy_category_columns( $column, $post_id ) {
case 'actions':
echo wp_kses_post( sprintf( '', __( 'Click to remove invalid URLs from this category', 'feedzy-rss-feeds' ), $post_id, __( 'Validate & Clean', 'feedzy-rss-feeds' ) ) );
break;
+ case 'source':
+ $src = get_post_meta( $post_id, 'feedzy_category_feed', true );
+ if ( empty( $src ) ) {
+ $src = __( 'No Source Configured', 'feedzy-rss-feeds' );
+ } else {
+ $urls = $this->normalize_urls( $src );
+ $src = '';
+ if ( is_array( $urls ) ) {
+
+ foreach ( $urls as $key => $url ) {
+ $too_long = 130;
+ if ( strlen( $src ) > $too_long ) {
+ $src .= '...';
+ break;
+ } else {
+ $src .= '' . $url . '';
+ if ( count( $urls ) > $key + 1 ) {
+ $src .= ', ';
+ }
+ }
+ }
+ } else {
+ $src .= '' . esc_html( $urls ) . '';
+ }
+ }
+ echo wp_kses_post( $src );
+ break;
default:
break;
}
@@ -923,6 +1252,7 @@ public function feedzy_filter_plugin_row_meta( $links, $file ) {
*
* @since 3.0.12
* @access public
+ * @return void
*/
public function feedzy_menu_pages() {
$capability = feedzy_current_user_can();
@@ -934,35 +1264,35 @@ public function feedzy_menu_pages() {
add_submenu_page(
'feedzy-admin-menu',
- __( 'Settings', 'feedzy-rss-feeds' ),
- __( 'Settings', 'feedzy-rss-feeds' ),
+ __( 'Dashboard', 'feedzy-rss-feeds' ),
+ __( 'Dashboard', 'feedzy-rss-feeds' ),
'manage_options',
- 'feedzy-settings',
+ 'feedzy-support',
array(
$this,
- 'feedzy_settings_page',
+ 'render_support',
)
);
add_submenu_page(
'feedzy-admin-menu',
- __( 'Integration', 'feedzy-rss-feeds' ),
- __( 'Integration', 'feedzy-rss-feeds' ),
+ __( 'Settings', 'feedzy-rss-feeds' ),
+ '↳ ' . __( 'Settings', 'feedzy-rss-feeds' ),
'manage_options',
- 'feedzy-integration',
+ 'feedzy-settings',
array(
$this,
- 'feedzy_integration_page',
+ 'feedzy_settings_page',
)
);
add_submenu_page(
'feedzy-admin-menu',
- __( 'Support', 'feedzy-rss-feeds' ),
- __( 'Support', 'feedzy-rss-feeds' ) . '',
+ __( 'Integration', 'feedzy-rss-feeds' ),
+ '↳ ' . __( 'Integration', 'feedzy-rss-feeds' ),
'manage_options',
- 'feedzy-support',
+ 'feedzy-integration',
array(
$this,
- 'render_support',
+ 'feedzy_integration_page',
)
);
@@ -981,37 +1311,55 @@ public function feedzy_menu_pages() {
add_action( "load-$hook", array( $this, 'feedzy_load_setup_wizard_page' ) );
add_action( 'adminmenu', array( $this, 'feedzy_hide_wizard_menu' ) );
}
- if ( ! defined( 'REVIVE_NETWORK_VERSION' ) ) {
- $rss_to_social = __( 'RSS to Social', 'feedzy-rss-feeds' ) . '';
- add_action(
- 'admin_footer',
- function () {
- ?>
-
- ';
+ add_action(
+ 'admin_footer',
+ function () {
+ ?>
+
+ isset( $_POST['proxy-pass'] ) ? sanitize_text_field( wp_unslash( $_POST['proxy-pass'] ) ) : '',
);
break;
+ case 'schedules':
+ if ( feedzy_is_pro() ) {
+ // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+ $custom_schedules = isset( $_POST['fz-custom-schedule-interval'] ) ? (array) wp_unslash( $_POST['fz-custom-schedule-interval'] ) : array();
+ $settings['custom_schedules'] = array();
+ if ( ! empty( $custom_schedules ) ) {
+ $cron_timout = defined( 'WP_CRON_LOCK_TIMEOUT' ) ? WP_CRON_LOCK_TIMEOUT : 60;
+
+ foreach ( $custom_schedules as $key => $value ) {
+ $interval = isset( $value['interval'] ) ? absint( $value['interval'] ) : $cron_timout;
+ $display = isset( $value['display'] ) ? sanitize_text_field( $value['display'] ) : '';
+
+ if (
+ is_numeric( $interval ) && $cron_timout <= $interval &&
+ ! empty( $display )
+ ) {
+ $settings['custom_schedules'][ $key ] = array(
+ 'interval' => $interval,
+ 'display' => $display,
+ );
+ }
+ }
+ }
+ }
+ break;
default:
$settings = apply_filters( 'feedzy_save_tab_settings', $settings, $post_tab );
}
@@ -1166,7 +1539,13 @@ private function add_proxy( $url ) {
if ( $settings && isset( $settings['proxy'] ) && is_array( $settings['proxy'] ) && ! empty( $settings['proxy'] ) ) {
// if even one constant is defined, escape.
if ( defined( 'WP_PROXY_HOST' ) || defined( 'WP_PROXY_PORT' ) || defined( 'WP_PROXY_USERNAME' ) || defined( 'WP_PROXY_PASSWORD' ) ) {
- do_action( 'themeisle_log_event', FEEDZY_NAME, 'Some proxy constants already defined; ignoring proxy settings', 'info', __FILE__, __LINE__ );
+ Feedzy_Rss_Feeds_Log::info(
+ 'Some proxy constants already defined; ignoring proxy settings',
+ array(
+ 'url' => $url,
+ 'settings' => $settings['proxy'],
+ )
+ );
return;
}
@@ -1223,7 +1602,14 @@ public function http_request_args( $args ) {
public function add_user_agent( $ua ) {
$settings = apply_filters( 'feedzy_get_settings', null );
if ( $settings && isset( $settings['header']['user-agent'] ) && ! empty( $settings['header']['user-agent'] ) ) {
- do_action( 'themeisle_log_event', FEEDZY_NAME, sprintf( 'Override user-agent from %s to %s', $ua, $settings['header']['user-agent'] ), 'info', __FILE__, __LINE__ );
+ Feedzy_Rss_Feeds_Log::info(
+ 'Overriding user-agent',
+ array(
+ 'old_user_agent' => $ua,
+ 'new_user_agent' => $settings['header']['user-agent'],
+ )
+ );
+
$ua = $settings['header']['user-agent'];
}
@@ -1242,7 +1628,14 @@ public function add_user_agent( $ua ) {
public function send_through_proxy( $return_value, $uri, $check, $home ) {
$proxied = defined( 'FEEZY_URL_THRU_PROXY' ) ? FEEZY_URL_THRU_PROXY : null;
if ( $proxied && ( ( is_array( $proxied ) && in_array( $uri, $proxied, true ) ) || $uri === $proxied ) ) {
- do_action( 'themeisle_log_event', FEEDZY_NAME, sprintf( 'sending %s through proxy', $uri ), 'info', __FILE__, __LINE__ );
+ Feedzy_Rss_Feeds_Log::info(
+ 'Sending through proxy',
+ array(
+ 'uri' => $uri,
+ 'check' => $check,
+ 'home' => $home,
+ )
+ );
return true;
}
@@ -1441,7 +1834,7 @@ public function get_source_validity_error( $message = '', $post = '', $css_class
if ( $invalid ) {
if ( empty( $css_class ) ) {
- $css_class = 'notice notice-error notice-alt feedzy-error-critical';
+ $css_class = 'notice notice-error notice-alt fz-notice feedzy-error-critical';
}
$message .= '-
+
+
- >
+
+
+
+
+ +
+
+
' . $text . ':
- ';
foreach ( $invalid as $url ) {
@@ -1477,6 +1870,23 @@ public function ajax() {
}
wp_send_json_success( array( 'invalid' => count( $invalid ) ) );
break;
+ case 'validate_feeds_group':
+ $feeds = isset( $_POST['feeds'] ) ? sanitize_text_field( wp_unslash( $_POST['feeds'] ) ) : '';
+ if ( empty( $feeds ) ) {
+ wp_send_json_error( __( 'No feeds provided for validation.', 'feedzy-rss-feeds' ) );
+ }
+ $feeds = $this->normalize_urls( $feeds );
+ if ( ! is_array( $feeds ) ) {
+ $feeds = array( $feeds );
+ }
+ $valid = $this->get_valid_source_urls( $feeds, '1_mins', false );
+ $invalid = array_diff( $feeds, $valid );
+ wp_send_json_success(
+ array(
+ 'valid' => $valid,
+ 'invalid' => $invalid,
+ )
+ );
}
}
@@ -1564,6 +1974,10 @@ public function feedzy_load_setup_wizard_page() {
* Enqueue setup wizard required scripts.
*/
public function feedzy_enqueue_setup_wizard_scripts() {
+ if ( ! did_action( 'wp_enqueue_media' ) ) {
+ wp_enqueue_media();
+ }
+
wp_enqueue_style( $this->plugin_name . '_chosen' );
wp_enqueue_style( $this->plugin_name . '_smart_wizard', FEEDZY_ABSURL . 'css/smart_wizard_all.min.css', array(), $this->version );
wp_enqueue_style( $this->plugin_name . '_setup_wizard', FEEDZY_ABSURL . 'includes/views/css/style-wizard.css', array( $this->plugin_name . '-settings' ), $this->version, 'all' );
@@ -1589,6 +2003,18 @@ public function feedzy_enqueue_setup_wizard_scripts() {
'firstButtonText' => __( 'Create Page', 'feedzy-rss-feeds' ),
'secondButtonText' => __( 'Do not create', 'feedzy-rss-feeds' ),
),
+ 'mediaUploadText' => array(
+ 'iframeTitle' => __( 'Select image', 'feedzy-rss-feeds' ),
+ 'iframeButton' => __( 'Set default image', 'feedzy-rss-feeds' ),
+ 'actionButtonTextOne' => __( 'Choose image', 'feedzy-rss-feeds' ),
+ 'actionButtonTextTwo' => __( 'Replace image', 'feedzy-rss-feeds' ),
+ 'actionButtonTextThree' => __( 'Remove image', 'feedzy-rss-feeds' ),
+ ),
+ 'dryRun' => array(
+ 'loading' => ''
+ . '',
+ 'title' => __( 'Importable Items', 'feedzy-rss-feeds' ),
+ ),
)
);
}
@@ -1605,7 +2031,20 @@ public function feedzy_dismiss_wizard( $redirect_to_dashboard = true ) {
update_option( 'feedzy_fresh_install', $status );
delete_option( 'feedzy_wizard_data' );
if ( false !== $redirect_to_dashboard ) {
- wp_safe_redirect( remove_query_arg( array( 'action', 'status' ) ) );
+
+ $cleaned_url = remove_query_arg( array( 'page', 'action', 'status' ) );
+ $parsed_url = wp_parse_url( $cleaned_url );
+
+ // Default to dashboard if no page is set.
+ if (
+ isset( $parsed_url['path'] ) &&
+ strpos( $parsed_url['path'], '/wp-admin/admin.php' ) !== false &&
+ empty( $parsed_url['query'] )
+ ) {
+ $cleaned_url = add_query_arg( 'page', 'feedzy-support', $cleaned_url );
+ }
+
+ wp_safe_redirect( $cleaned_url );
exit;
}
return true;
@@ -1809,7 +2248,12 @@ private function setup_wizard_subscribe_process() {
$segment = 1;
$response = array(
'status' => 1,
- 'redirect_to' => add_query_arg( 'post_type', 'feedzy_imports', admin_url( 'edit.php' ) ),
+ 'redirect_to' => add_query_arg(
+ array(
+ 'page' => 'feedzy-support',
+ ),
+ admin_url( 'admin.php' )
+ ),
'message' => __( 'Redirecting to Feedzy dashboard', 'feedzy-rss-feeds' ),
);
@@ -1834,30 +2278,48 @@ private function setup_wizard_subscribe_process() {
} else {
$response = array(
'status' => 1,
- 'redirect_to' => add_query_arg( 'post_type', 'feedzy_imports', admin_url( 'edit.php' ) ),
+ 'redirect_to' => add_query_arg(
+ array(
+ 'page' => 'feedzy-support',
+ ),
+ admin_url( 'admin.php' )
+ ),
'message' => __( 'Redirecting to Feedzy dashboard', 'feedzy-rss-feeds' ),
);
}
} elseif ( 'page_builder' === $integrate_with ) {
- $post_edit_link = get_edit_post_link( $page_id, 'db' );
- // Get elementor edit page link.
- if ( defined( 'ELEMENTOR_PATH' ) && class_exists( 'Elementor\Widget_Base' ) ) {
- $segment = 3;
- $post_edit_link = add_query_arg(
- array(
- 'post' => $page_id,
- 'action' => 'elementor',
+ if ( empty( $page_id ) ) {
+ $response = array(
+ 'status' => 1,
+ 'redirect_to' => add_query_arg(
+ array(
+ 'page' => 'feedzy-support',
+ ),
+ admin_url( 'admin.php' )
),
- admin_url( 'post.php' )
+ 'message' => __( 'Redirecting to Feedzy dashboard', 'feedzy-rss-feeds' ),
);
} else {
- $segment = 4;
+ $post_edit_link = get_edit_post_link( $page_id, 'db' );
+ // Get elementor edit page link.
+ if ( defined( 'ELEMENTOR_PATH' ) && class_exists( 'Elementor\Widget_Base' ) ) {
+ $segment = 3;
+ $post_edit_link = add_query_arg(
+ array(
+ 'post' => $page_id,
+ 'action' => 'elementor',
+ ),
+ admin_url( 'post.php' )
+ );
+ } else {
+ $segment = 4;
+ }
+ $response = array(
+ 'status' => 1,
+ 'redirect_to' => $post_edit_link,
+ 'message' => __( 'Redirecting to draft page', 'feedzy-rss-feeds' ),
+ );
}
- $response = array(
- 'status' => 1,
- 'redirect_to' => $post_edit_link,
- 'message' => __( 'Redirecting to draft page', 'feedzy-rss-feeds' ),
- );
}
if ( $with_subscribe && is_email( $email ) ) {
update_option( 'feedzy_rss_feeds_logger_flag', 'yes' );
@@ -1892,6 +2354,7 @@ private function setup_wizard_subscribe_process() {
if ( ! is_wp_error( $request_res ) ) {
$body = json_decode( wp_remote_retrieve_body( $request_res ) );
if ( 'success' === $body->code ) {
+ update_option( 'feedzy_onboarding_user_subscribed', 'yes' );
$this->feedzy_dismiss_wizard( false );
wp_send_json( $response );
}
@@ -1909,6 +2372,74 @@ private function setup_wizard_subscribe_process() {
}
}
+ /**
+ * AJAX method to subscribe user to Feedzy newsletter via dashboard notice.
+ *
+ * @since 5.1.0
+ * @access public
+ * @return void
+ */
+ public function feedzy_dashboard_subscribe() {
+ check_ajax_referer( 'feedzy_subscribe_nonce', '_wpnonce' );
+
+ $email = ! empty( $_POST['email'] ) ? sanitize_email( $_POST['email'] ) : '';
+ $skip = ! empty( $_POST['skip'] ) ? sanitize_text_field( wp_unslash( $_POST['skip'] ) ) : '';
+
+ if ( 'yes' === $skip ) {
+ $this->dismiss_subscribe_notice();
+ wp_send_json_success();
+ }
+
+ if ( empty( $email ) || ! is_email( $email ) ) {
+ wp_send_json_error(
+ array(
+ 'message' => __( 'Validation failed', 'feedzy-rss-feeds' ),
+ )
+ );
+ }
+
+ update_option( 'feedzy_rss_feeds_logger_flag', 'yes' );
+
+ $request_res = wp_remote_post(
+ FEEDZY_SUBSCRIBE_API,
+ array(
+ 'timeout' => 100, // phpcs:ignore WordPressVIPMinimum.Performance.RemoteRequestTimeout.timeout_timeout
+ 'headers' => array(
+ 'Content-Type' => 'application/json',
+ ),
+ 'body' => wp_json_encode(
+ array(
+ 'slug' => 'feedzy-rss-feeds',
+ 'site' => home_url(),
+ 'email' => $email,
+ 'data' => array( 'source' => 'dashboard-notice' ),
+ )
+ ),
+ )
+ );
+
+ if ( ! is_wp_error( $request_res ) ) {
+ $this->dismiss_subscribe_notice();
+ wp_send_json_success();
+ } else {
+ wp_send_json_error(
+ array(
+ 'message' => $request_res->get_error_message(),
+ )
+ );
+ }
+ }
+
+ /**
+ * Dismiss subscribe notice.
+ *
+ * @since 5.1.0
+ * @return void
+ */
+ public function dismiss_subscribe_notice() {
+ update_option( 'feedzy_dismiss_subscribe_notice_dashboard', 'yes' );
+ }
+
/**
* Create draft page.
*
@@ -2215,7 +2746,7 @@ public function add_banner_anchor() {
add_action(
'admin_notices',
function () {
- echo '';
+ echo '';
},
999
);
@@ -2513,4 +3044,179 @@ public function add_black_friday_data( $configs ) {
return $configs;
}
+
+ /**
+ * Validate the feed URL and check if it's a valid RSS/Atom feed.
+ *
+ * @return void
+ */
+ public function validate_feed() {
+ try {
+ if (
+ ! isset( $_POST['nonce'] ) ||
+ ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['nonce'] ) ), FEEDZY_BASEFILE )
+ ) {
+ wp_send_json_error( array( 'message' => __( 'Security check failed.', 'feedzy-rss-feeds' ) ) );
+ }
+
+ $feed_urls = isset( $_POST['feed_url'] ) ? sanitize_text_field( wp_unslash( $_POST['feed_url'] ) ) : '';
+
+ if ( empty( $feed_urls ) ) {
+ wp_send_json_error( array( 'message' => __( 'Feed URL cannot be empty.', 'feedzy-rss-feeds' ) ) );
+ }
+
+ $urls = array_map( 'trim', explode( ',', $feed_urls ) );
+ $urls = array_filter( $urls );
+
+ if ( empty( $urls ) ) {
+ wp_send_json_error( array( 'message' => __( 'No valid URLs provided.', 'feedzy-rss-feeds' ) ) );
+ }
+
+ $results = array();
+
+ foreach ( $urls as $feed_url ) {
+ $feed_url = esc_url_raw( $feed_url );
+
+ if ( ! filter_var( $feed_url, FILTER_VALIDATE_URL ) ) {
+ $results[] = array(
+ 'url' => $feed_url,
+ 'status' => 'error',
+ 'message' => __( 'Invalid URL format', 'feedzy-rss-feeds' ),
+ );
+ continue;
+ }
+
+ $feed = $this->fetch_feed( array( $feed_url ), '1_mins', array() );
+
+ if ( is_wp_error( $feed ) ) {
+ $results[] = array(
+ 'url' => $feed_url,
+ 'status' => 'error',
+ 'message' => __( 'Error fetching feed: ', 'feedzy-rss-feeds' ) . $feed->get_error_message(),
+ );
+ continue;
+ }
+
+ if (
+ ! is_object( $feed ) ||
+ ! method_exists( $feed, 'get_item_quantity' )
+ ) {
+ $results[] = array(
+ 'url' => $feed_url,
+ 'status' => 'error',
+ 'message' => __( 'Invalid feed object returned', 'feedzy-rss-feeds' ),
+ );
+ continue;
+ }
+
+ try {
+ $items = $feed->get_item_quantity();
+ $title = $feed->get_title();
+ $error = $feed->error();
+
+ if ( is_array( $error ) && ! empty( $error ) ) {
+ $results[] = array(
+ 'url' => $feed_url,
+ 'status' => 'error',
+ 'message' => __( 'Error fetching feed: ', 'feedzy-rss-feeds' ) . implode( ', ', $error ),
+ );
+ continue;
+ }
+
+ if ( 0 === $items ) {
+ $results[] = array(
+ 'url' => $feed_url,
+ 'status' => 'warning',
+ 'message' => __( 'Feed is empty', 'feedzy-rss-feeds' ),
+ );
+ continue;
+ }
+
+ $results[] = array(
+ 'url' => $feed_url,
+ 'status' => 'success',
+ 'message' => $title . sprintf(
+ /* translators: %d is the number of items found in the feed */
+ _n(
+ '%d item found',
+ '%d items found',
+ $items,
+ 'feedzy-rss-feeds'
+ ),
+ $items
+ ),
+ 'items' => $items,
+ 'title' => $title,
+ );
+
+ } catch ( Throwable $e ) {
+ $results[] = array(
+ 'url' => $feed_url,
+ 'status' => 'error',
+ /* translators: %s is the error message */
+ 'message' => sprintf( __( 'Error reading feed: %s', 'feedzy-rss-feeds' ), $e->getMessage() ),
+ );
+ }
+ }
+
+ wp_send_json_success(
+ array(
+ 'results' => $results,
+ )
+ );
+ } catch ( Throwable $e ) {
+ wp_send_json_error(
+ array(
+ /* translators: %s is the error message */
+ 'message' => sprintf( __( 'An error occurred: %s', 'feedzy-rss-feeds' ), $e->getMessage() ),
+ )
+ );
+ }
+ }
+
+ /**
+ * Append custom schedules to the existing schedules.
+ *
+ * @since 5.1.0
+ * @param array
-
- - +
+ +
+ ++ +
diff --git a/includes/layouts/setup-wizard.php b/includes/layouts/setup-wizard.php index 7a6a5f4df..8d61f8c53 100644 --- a/includes/layouts/setup-wizard.php +++ b/includes/layouts/setup-wizard.php @@ -5,13 +5,13 @@ * @package Feedzy_Rss_Feeds */ -$dashboard_url = add_query_arg( +// Note: It will be redirect to dashboard by `feedzy_dismiss_wizard` action. +$skip_onboarding_url_callback = add_query_arg( array( - 'post_type' => 'feedzy_imports', - 'action' => 'feedzy_dismiss_wizard', - 'status' => 0, + 'action' => 'feedzy_dismiss_wizard', + 'status' => 0, ), - admin_url( 'edit.php' ) + admin_url( 'admin.php' ) ); // phpcs:ignore WordPress.Security.NonceVerification $integrate_with = ! empty( $_GET['integrate-with'] ) ? sanitize_text_field( wp_unslash( $_GET['integrate-with'] ) ) : ''; @@ -24,6 +24,7 @@ } $published_status = array( 'publish', 'draft' ); +add_thickbox(); ?>- diff --git a/includes/layouts/header.php b/includes/layouts/header.php index b2f0e8b47..ea53b34a4 100644 --- a/includes/layouts/header.php +++ b/includes/layouts/header.php @@ -10,7 +10,7 @@ // phpcs:disable WordPress.Security.NonceVerification $page_title = __( 'Settings', 'feedzy-rss-feeds' ); if ( isset( $_GET['page'] ) && 'feedzy-support' === $_GET['page'] ) { - $page_title = __( 'Support', 'feedzy-rss-feeds' ); + $page_title = __( 'Dashboard', 'feedzy-rss-feeds' ); } elseif ( isset( $_GET['page'] ) && 'feedzy-integration' === $_GET['page'] ) { $page_title = __( 'Integration', 'feedzy-rss-feeds' ); } diff --git a/includes/layouts/settings.php b/includes/layouts/settings.php index 53f092f34..dfa0ebbf7 100644 --- a/includes/layouts/settings.php +++ b/includes/layouts/settings.php @@ -25,6 +25,24 @@ } elseif ( 'amazon-product-advertising' === $active_tab ) { $help_btn_url = 'https://docs.themeisle.com/article/1745-how-to-display-amazon-products-using-feedzy'; } + + $logs = array(); + $logging_level = isset( $settings['logs'], $settings['logs']['level'] ) ? $settings['logs']['level'] : 'error'; + $email_error_address = isset( $settings['logs'], $settings['logs']['email'] ) ? $settings['logs']['email'] : ''; + $email_error_enabled = isset( $settings['logs'], $settings['logs']['send_email_report'] ) ? $settings['logs']['send_email_report'] : 0; + $email_error_address_placeholder = ( ! empty( $email_error_address ) ) ? $email_error_address : get_option( 'admin_email' ); + + if ( 'logs' === $active_tab ) { + $logs_type = isset( $_REQUEST['logs_type'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['logs_type'] ) ) : null;// phpcs:ignore WordPress.Security.NonceVerification + $logs = Feedzy_Rss_Feeds_Log::get_instance()->get_recent_logs( 50, $logs_type ); + } + + $file_size = Feedzy_Rss_Feeds_Log::get_instance()->get_log_file_size(); + if ( is_numeric( $file_size ) && $file_size > 0 ) { + $file_size = size_format( $file_size, 0 ); + } + + ?> notice ) { ?> @@ -50,16 +68,39 @@
@@ -195,28 +225,11 @@ class="btn btn-outline-primary"---- - - ---- /> - --- ---- + " $hourly ), $schedules ); } + $internal_cron_schedules = apply_filters( 'feedzy_internal_cron_schedule_slugs', array() ); ?> --- -- /> - -+-- + + ++ ++++ + () ++ +--- - +++++ + /> + +++ +++ + +++ + + +++-+ /> + +++ +@@ -34,7 +35,7 @@
 . ')
' . __( 'Please note that if some of these items have already have been imported in previous runs with the same filters, they may be shown here but will not be imported again.', 'feedzy-rss-feeds' ) . '
' - . '', + . '' . __( 'Please note that if some of these items have already have been imported in previous runs with the same filters, they may be shown here but will not be imported again.', 'feedzy-rss-feeds' ) . '
' + . '', 'dry_run_title' => __( 'Importable Items', 'feedzy-rss-feeds' ), 'delete_post_message' => __( 'Would you also like to delete all the imported posts for this import job?', 'feedzy-rss-feeds' ), 'media_iframe_title' => __( 'Select image', 'feedzy-rss-feeds' ), @@ -166,6 +188,7 @@ public function enqueue_styles() { 'action_btn_text_2' => __( 'Replace image', 'feedzy-rss-feeds' ), 'author_helper' => __( 'We display up to 100 users. If the desired username isn’t listed, type the exact existing username manually to save it.', 'feedzy-rss-feeds' ), 'clearLogButton' => __( 'Clear Log', 'feedzy-rss-feeds' ), + 'goToLogsTab' => __( 'See more details', 'feedzy-rss-feeds' ), 'okButton' => __( 'Ok', 'feedzy-rss-feeds' ), 'removeErrorLogsMsg' => __( 'Removed all error logs.', 'feedzy-rss-feeds' ), // translators: %d select images count. @@ -176,6 +199,11 @@ public function enqueue_styles() { feedzy_is_pro() ? 'dashicons-upload' : 'dashicons-lock', esc_html__( 'Upload Import', 'feedzy-rss-feeds' ) ), + 'is_pro' => feedzy_is_pro(), + 'validation_messages' => array( + 'invalid_feed_url' => __( 'Invalid feed URL.', 'feedzy-rss-feeds' ), + 'error_validating_feed_url' => __( 'Error validating feed URL.', 'feedzy-rss-feeds' ), + ), ), ) ); @@ -185,11 +213,11 @@ public function enqueue_styles() { /** * Add attributes to $item_array. * - * @param array $item_array The item attributes array. - * @param object $item The feed item. - * @param array $sc The shortcode attributes array. - * @param int $index The item number. - * @param int $item_index The real index of this item in the feed. + * @param array $item_array The item attributes array. + * @param SimplePie\Item $item The feed item. + * @param array $sc The shortcode attributes array. + * @param int $index The item number. + * @param int $item_index The real index of this item in the feed. * @return mixed * @since 1.0.0 * @access public @@ -204,17 +232,84 @@ public function add_data_to_item( $item_array, $item, $sc = null, $index = null, $item_array['item'] = $item; $item_array['item_index'] = $item_index; + $item_array = $this->handle_youtube_content( $item_array, $item, $sc ); + + return $item_array; + } + + /** + * Fetches additional information for each item. + * + * @param array' . __( 'WP Cron is disabled. Your feeds would not get updated. Please contact your hosting provider or system administrator', 'feedzy-rss-feeds' ) . '
' . __( 'WP Cron is disabled. Your feeds would not get updated. Please contact your hosting provider or system administrator', 'feedzy-rss-feeds' ) . '
' . __( 'Unable to register cron job. Your feeds might not get updated', 'feedzy-rss-feeds' ) . '
' . __( 'Unable to register cron job. Your feeds might not get updated', 'feedzy-rss-feeds' ) . '
' . __( 'Successfully imported.', 'feedzy-rss-feeds' ) . '
' . __( 'Successfully imported.', 'feedzy-rss-feeds' ) . '
-
-
+
+
+
'all',
+ 'conditions' => array(),
+ );
+
+ if ( ! empty( $excluded_post_title ) ) {
+ $filter_conditions['conditions'] = array(
+ array(
+ 'field' => 'title',
+ 'operator' => 'not_contains',
+ 'value' => $excluded_post_title,
+ ),
+ );
+ }
+
+ update_post_meta( $job_id, 'filter_conditions', wp_json_encode( $filter_conditions ) );
+ update_post_meta( $job_id, 'default_thumbnail_id', $fallback_image );
+
$response = array(
'status' => true,
);
@@ -3587,25 +4169,7 @@ public function load_edit_screen() {
* Add import export section.
*/
public function add_import_export_section() {
- if ( ! feedzy_is_pro() ) :
- ?>
-
-
-
-
+ ?>
\ No newline at end of file
diff --git a/includes/layouts/feedzy-support.php b/includes/layouts/feedzy-support.php
index e7e975744..6eb700669 100644
--- a/includes/layouts/feedzy-support.php
+++ b/includes/layouts/feedzy-support.php
@@ -1,13 +1,21 @@
-
+
+?>
+
-
@@ -138,6 +139,11 @@
+
\ No newline at end of file
diff --git a/includes/layouts/feedzy-tutorial.php b/includes/layouts/feedzy-tutorial.php
index a2aea99e8..244c3b582 100644
--- a/includes/layouts/feedzy-tutorial.php
+++ b/includes/layouts/feedzy-tutorial.php
@@ -6,6 +6,26 @@
-->
'feedzy-settings',
+ ],
+ admin_url( 'admin.php' )
+);
+$feed_imports_link = add_query_arg(
+ [
+ 'post_type' => 'feedzy_imports',
+ ],
+ admin_url( 'edit.php' )
+);
+$logs_link = add_query_arg(
+ [
+ 'tab' => 'logs',
+ ],
+ $settings_link
+);
+
?>
-
@@ -27,7 +47,7 @@
-
+
@@ -35,8 +55,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
@@ -239,7 +278,7 @@ class="pro-label free-label"><
+
@@ -131,13 +132,6 @@ class="dashicons dashicons-arrow-down-alt2">
-
+
diff --git a/includes/util/feedzy-rss-feeds-conditions.php b/includes/util/feedzy-rss-feeds-conditions.php
index 559773a97..b52d4d022 100644
--- a/includes/util/feedzy-rss-feeds-conditions.php
+++ b/includes/util/feedzy-rss-feeds-conditions.php
@@ -247,10 +247,6 @@ public function is_condition_met( $condition, $value ): bool {
* @return bool True if the conditions are met, false otherwise.
*/
public function evaluate_conditions( $default_value, $attrs, $item, $feed_url, $index ): bool {
- if ( feedzy_is_new() && ! feedzy_is_pro() ) {
- return $default_value;
- }
-
if ( ! isset( $attrs['filters'] ) || empty( $attrs['filters'] ) ) {
return $default_value;
}
@@ -299,6 +295,9 @@ public function evaluate_conditions( $default_value, $attrs, $item, $feed_url, $
$image = $admin->feedzy_retrieve_image( $item, $attrs );
$value = $image;
break;
+ case 'link':
+ $value = $item->get_link();
+ break;
default:
$value = '';
break;
diff --git a/includes/views/amazon-product-advertising-view.php b/includes/views/amazon-product-advertising-view.php
index 98f854227..984e4673a 100644
--- a/includes/views/amazon-product-advertising-view.php
+++ b/includes/views/amazon-product-advertising-view.php
@@ -1,10 +1,13 @@
+
+
+
-
-
- -
-
-
@@ -241,9 +221,6 @@ class="dashicons dashicons-arrow-down-alt2">
-
-
@@ -310,15 +289,23 @@ class="dashicons dashicons-arrow-down-alt2">
-
+
-
-
+
-
@@ -350,15 +326,24 @@ class="dashicons dashicons-arrow-down-alt2">
-
+
-
+
?>
-
-
-
-
-
-
@@ -402,15 +376,23 @@ class="form-control fz-textarea-tagify">
-
-
-
+ class="form-control fz-input-tagify"
+ value="" />
+
-
@@ -463,7 +434,6 @@ class="fz-switch-toggle" type="checkbox" value="yes"
-
+
-
+
-