Skip to content

refactor: clean up legacy code in index.php #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akshayurankar48 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: clean up legacy code in index.php #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 26 additions & 57 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,51 +129,31 @@ public function bsf_settings_link( $links ) {
return $links;
}
/**
* Print the star rating style on post edit page.
* Enqueue post editor scripts and styles on post.php.
*
* @param string $hook Hook.
*/
public function post_enqueue( $hook ) {
if ( 'post.php' != $hook ) {
if ( 'post.php' !== $hook ) {
return;
}
$current_admin_screen = get_current_screen();

// Default exclusions for WooCommerce and other problematic post types.
$default_exclusions = array( 'product', 'shop_order', 'shop_coupon', 'product_variation' );
$exclude_custom_post_type = apply_filters( 'bsf_exclude_custom_post_type', $default_exclusions );

if ( in_array( $current_admin_screen->post_type, $exclude_custom_post_type ) ) {
return;
}

// Additional check for WooCommerce products to prevent conflicts.
if ( 'product' === $current_admin_screen->post_type ) {
return;
}
wp_enqueue_script( 'jquery' );
wp_enqueue_script( 'bsf_jquery_star' );
wp_enqueue_script( 'bsf_toggle' );
wp_enqueue_style( 'star_style' );
wp_register_script( 'bsf-scripts', BSF_META_BOX_URL . 'js/cmb.js', '', '0.9.1' );
wp_enqueue_script( 'bsf-scripts' );
wp_enqueue_media();
wp_register_script( 'bsf-scripts-media', BSF_META_BOX_URL . 'js/media.js', array( 'jquery' ), '1.0' );
wp_enqueue_script( 'bsf-scripts-media' );
wp_enqueue_script( 'jquery-ui-datepicker' );
if ( ! function_exists( 'vc_map' ) ) {
wp_enqueue_style( 'jquery-style', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/smoothness/jquery-ui.css', null, '1.0' );
}
$this->enqueue_post_editor_scripts();
}
/**
* Post_new_enqueue.
* Enqueue post editor scripts and styles on post-new.php.
*
* @param string $hook Hook.
*/
public function post_new_enqueue( $hook ) {
if ( 'post-new.php' != $hook ) {
if ( 'post-new.php' !== $hook ) {
return;
}
$this->enqueue_post_editor_scripts();
}
/**
* Shared helper: enqueue scripts and styles for the post editor screens.
*/
private function enqueue_post_editor_scripts() {
$current_admin_screen = get_current_screen();

// Default exclusions for WooCommerce and other problematic post types.
Expand All @@ -199,7 +179,7 @@ public function post_new_enqueue( $hook ) {
wp_enqueue_script( 'bsf-scripts-media' );
wp_enqueue_script( 'jquery-ui-datepicker' );
if ( ! function_exists( 'vc_map' ) ) {
wp_enqueue_style( 'jquery-style', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/smoothness/jquery-ui.css', null, 1.0 );
wp_enqueue_style( 'jquery-style', '//ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/smoothness/jquery-ui.css', null, '1.0' );
}
}
/**
Expand Down Expand Up @@ -361,9 +341,12 @@ public function submit_request() {
$headers .= 'Content-type: text/html; charset=iso-8859-1' . "\r\n";
$headers .= 'From:' . $name . '<' . $from . '>' . "\r\n";
$result = wp_mail( $to, $subject, wp_kses_post( $html ), $headers );
echo $result ? esc_html_e( 'Thank you!', 'rich-snippets' ) : esc_html_e( 'Something went wrong!', 'rich-snippets' );

die();
if ( $result ) {
esc_html_e( 'Thank you!', 'rich-snippets' );
} else {
esc_html_e( 'Something went wrong!', 'rich-snippets' );
}
wp_die();
}
/**
* Submit_color.
Expand All @@ -390,9 +373,12 @@ public function submit_color() {
'snippet_title_color' => $title_color,
'snippet_box_color' => $box_color,
);
echo update_option( 'bsf_custom', $color_opt ) ? esc_html_e( 'Settings saved !', 'rich-snippets' ) : esc_html_e( 'Error occured. Settings were not saved !', 'rich-snippets' );

die();
if ( update_option( 'bsf_custom', $color_opt ) ) {
esc_html_e( 'Settings saved !', 'rich-snippets' );
} else {
esc_html_e( 'Error occured. Settings were not saved !', 'rich-snippets' );
}
wp_die();
}
}
}
Expand All @@ -409,25 +395,8 @@ public function iris_enqueue_scripts() {
* Bsf_color_scripts.
*/
public function bsf_color_scripts() {
global $wp_version;
$bsf_script_array = array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'media-upload', 'thickbox' );

// styles required for cmb.
$bsf_style_array = array( 'thickbox' );

// if we're 3.5 or later, user wp-color-picker.
if ( 3.5 <= $wp_version ) {

$bsf_script_array[] = 'wp-color-picker';
$bsf_style_array[] = 'wp-color-picker';

} else {

// otherwise use the older 'farbtastic'.
$bsf_script_array[] = 'farbtastic';
$bsf_style_array[] = 'farbtastic';

}
$bsf_script_array = array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'media-upload', 'thickbox', 'wp-color-picker' );
$bsf_style_array = array( 'thickbox', 'wp-color-picker' );
}

/**
Expand Down
Loading