Below is a differential between the unpatched vulnerable code and the patched update, for reference.
--- a/woo-delivery/admin/class-coderockz-woo-delivery-admin.php
+++ b/woo-delivery/admin/class-coderockz-woo-delivery-admin.php
@@ -132,8 +132,8 @@
public function coderockz_woo_delivery_menus_sections() {
add_menu_page(
- __('Woo Delivery', 'woo-delivery'),
- __('Woo Delivery', 'woo-delivery'),
+ esc_html__('Woo Delivery', 'woo-delivery'),
+ esc_html__('Woo Delivery', 'woo-delivery'),
'manage_options',
'coderockz-woo-delivery-settings',
array($this, "coderockz_woo_delivery_main_layout"),
@@ -152,7 +152,12 @@
}
public function coderockz_woo_delivery_process_delivery_option_settings() {
+
check_ajax_referer('coderockz_woo_delivery_nonce');
+
+ if ( !current_user_can( 'manage_options' ) ) {
+ return;
+ }
$delivery_option_settings_form_settings = [];
@@ -184,6 +189,10 @@
public function coderockz_woo_delivery_process_delivery_date_form() {
check_ajax_referer('coderockz_woo_delivery_nonce');
+
+ if ( !current_user_can( 'manage_options' ) ) {
+ return;
+ }
$date_form_settings = [];
@@ -231,6 +240,10 @@
public function coderockz_woo_delivery_process_pickup_date_form() {
check_ajax_referer('coderockz_woo_delivery_nonce');
+
+ if ( !current_user_can( 'manage_options' ) ) {
+ return;
+ }
$date_form_settings = [];
@@ -280,6 +293,11 @@
public function coderockz_woo_delivery_process_delivery_date_offdays_form() {
check_ajax_referer('coderockz_woo_delivery_nonce');
+
+ if ( !current_user_can( 'manage_options' ) ) {
+ return;
+ }
+
$year_array = [];
$offdays_array = [];
parse_str( $_POST[ 'dateFormData' ], $date_form_data );
@@ -321,6 +339,11 @@
public function coderockz_woo_delivery_process_delivery_time_form() {
check_ajax_referer('coderockz_woo_delivery_nonce');
+
+ if ( !current_user_can( 'manage_options' ) ) {
+ return;
+ }
+
parse_str( $_POST[ 'dateFormData' ], $date_form_data );
$time_form_settings = [];
$enable_delivery_time = !isset($date_form_data['coderockz_enable_delivery_time']) ? false : true;
@@ -395,6 +418,11 @@
public function coderockz_woo_delivery_process_pickup_time_form() {
check_ajax_referer('coderockz_woo_delivery_nonce');
+
+ if ( !current_user_can( 'manage_options' ) ) {
+ return;
+ }
+
parse_str( $_POST[ 'dateFormData' ], $pickup_form_data );
$pickup_time_form_settings = [];
$enable_pickup_time = !isset($pickup_form_data['coderockz_enable_pickup_time']) ? false : true;
@@ -469,6 +497,10 @@
public function coderockz_woo_delivery_process_localization_settings() {
check_ajax_referer('coderockz_woo_delivery_nonce');
+
+ if ( !current_user_can( 'manage_options' ) ) {
+ return;
+ }
$localization_settings_form_settings = [];
@@ -511,6 +543,10 @@
public function coderockz_woo_delivery_process_other_settings() {
check_ajax_referer('coderockz_woo_delivery_nonce');
+
+ if ( !current_user_can( 'manage_options' ) ) {
+ return;
+ }
$other_settings_form_settings = [];
@@ -551,7 +587,7 @@
*/
public function coderockz_woo_delivery_add_custom_fields_orders_list($columns) {
- $delivery_details_text = (isset(get_option('coderockz_woo_delivery_localization_settings')['delivery_details_text']) && !empty(get_option('coderockz_woo_delivery_localization_settings')['delivery_details_text'])) ? get_option('coderockz_woo_delivery_localization_settings')['delivery_details_text'] : __("Delivery Details", "woo-delivery");
+ $delivery_details_text = (isset(get_option('coderockz_woo_delivery_localization_settings')['delivery_details_text']) && !empty(get_option('coderockz_woo_delivery_localization_settings')['delivery_details_text'])) ? esc_attr(get_option('coderockz_woo_delivery_localization_settings')['delivery_details_text']) : esc_html__("Delivery Details", "woo-delivery");
$new_columns = [];
@@ -560,7 +596,7 @@
$new_columns[$name] = $value;
if($name == 'order_status') {
- $new_columns['order_delivery_details'] = __($delivery_details_text, "woo-delivery");
+ $new_columns['order_delivery_details'] = esc_html($delivery_details_text);
}
}
return $new_columns;
@@ -575,10 +611,10 @@
$delivery_time_settings = get_option('coderockz_woo_delivery_time_settings');
$pickup_time_settings = get_option('coderockz_woo_delivery_pickup_settings');
- $delivery_date_field_label = (isset($delivery_date_settings['field_label']) && !empty($delivery_date_settings['field_label'])) ? stripslashes($delivery_date_settings['field_label']) : __("Delivery Date", "woo-delivery");
- $pickup_date_field_label = (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? stripslashes($pickup_date_settings['pickup_field_label']) : __("Pickup Date", "woo-delivery");
- $delivery_time_field_label = (isset($delivery_time_settings['field_label']) && !empty($delivery_time_settings['field_label'])) ? stripslashes($delivery_time_settings['field_label']) : __("Delivery Time", "woo-delivery");
- $pickup_time_field_label = (isset($pickup_time_settings['field_label']) && !empty($pickup_time_settings['field_label'])) ? stripslashes($pickup_time_settings['field_label']) : __("Pickup Time", "woo-delivery");
+ $delivery_date_field_label = (isset($delivery_date_settings['field_label']) && !empty($delivery_date_settings['field_label'])) ? stripslashes(esc_attr($delivery_date_settings['field_label'])) : esc_html__("Delivery Date", "woo-delivery");
+ $pickup_date_field_label = (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? stripslashes(esc_attr($pickup_date_settings['pickup_field_label'])) : esc_html__("Pickup Date", "woo-delivery");
+ $delivery_time_field_label = (isset($delivery_time_settings['field_label']) && !empty($delivery_time_settings['field_label'])) ? stripslashes(esc_attr($delivery_time_settings['field_label'])) : esc_html__("Delivery Time", "woo-delivery");
+ $pickup_time_field_label = (isset($pickup_time_settings['field_label']) && !empty($pickup_time_settings['field_label'])) ? stripslashes(esc_attr($pickup_time_settings['field_label'])) : esc_html__("Pickup Time", "woo-delivery");
// if any timezone data is saved, set default timezone with the data
//$timezone = $this->helper->get_the_timezone();
@@ -608,7 +644,7 @@
{
$delivery_date = date($delivery_date_format, strtotime(get_post_meta( $post->ID, 'delivery_date', true )));
- echo __($delivery_date_field_label, "woo-delivery").": " . $delivery_date;
+ echo esc_html($delivery_date_field_label).": " . esc_html($delivery_date);
}
if(metadata_exists('post', $post->ID, 'pickup_date') && get_post_meta($post->ID, 'pickup_date', true) !="")
@@ -616,7 +652,7 @@
$pickup_date = date($pickup_date_format, strtotime(get_post_meta( $post->ID, 'pickup_date', true )));
- echo __($pickup_date_field_label, "woo-delivery").": " . $pickup_date;
+ echo esc_html($pickup_date_field_label).": " . esc_html($pickup_date);
}
if(metadata_exists('post', $post->ID, 'delivery_time') && get_post_meta($post->ID, 'delivery_time', true) !="")
@@ -627,7 +663,7 @@
$time_value = date($time_format, strtotime($minutes[0])) . ' - ' . date($time_format, strtotime($minutes[1]));
- echo __($delivery_time_field_label, "woo-delivery").": " . $time_value;
+ echo esc_html($delivery_time_field_label).": " . esc_html($time_value);
}
@@ -639,7 +675,7 @@
$pickup_minutes = explode(' - ', $pickup_times);
$pickup_time_value = date($pickup_time_format, strtotime($pickup_minutes[0])) . ' - ' . date($pickup_time_format, strtotime($pickup_minutes[1]));
- echo __($pickup_time_field_label, "woo-delivery").": " . $pickup_time_value;
+ echo esc_html($pickup_time_field_label).": " . esc_html($pickup_time_value);
}
}
@@ -661,10 +697,10 @@
$pickup_time_settings = get_option('coderockz_woo_delivery_pickup_settings');
$localization_settings = get_option('coderockz_woo_delivery_localization_settings');
- $delivery_date_field_label = (isset($delivery_date_settings['field_label']) && !empty($delivery_date_settings['field_label'])) ? stripslashes($delivery_date_settings['field_label']) : __("Delivery Date","woo-delivery");
- $pickup_date_field_label = (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? stripslashes($pickup_date_settings['pickup_field_label']) : __("Pickup Date","woo-delivery");
- $delivery_time_field_label = (isset($delivery_time_settings['field_label']) && !empty($delivery_time_settings['field_label'])) ? stripslashes($delivery_time_settings['field_label']) : __("Delivery Time","woo-delivery");
- $pickup_time_field_label = (isset($pickup_time_settings['field_label']) && !empty($pickup_time_settings['field_label'])) ? stripslashes($pickup_time_settings['field_label']) : __("Pickup Time","woo-delivery");
+ $delivery_date_field_label = (isset($delivery_date_settings['field_label']) && !empty($delivery_date_settings['field_label'])) ? stripslashes(esc_attr($delivery_date_settings['field_label'])) : esc_html__("Delivery Date","woo-delivery");
+ $pickup_date_field_label = (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? stripslashes(esc_attr($pickup_date_settings['pickup_field_label'])) : esc_html__("Pickup Date","woo-delivery");
+ $delivery_time_field_label = (isset($delivery_time_settings['field_label']) && !empty($delivery_time_settings['field_label'])) ? stripslashes(esc_attr($delivery_time_settings['field_label'])) : esc_html__("Delivery Time","woo-delivery");
+ $pickup_time_field_label = (isset($pickup_time_settings['field_label']) && !empty($pickup_time_settings['field_label'])) ? stripslashes(esc_attr($pickup_time_settings['field_label'])) : esc_html__("Pickup Time","woo-delivery");
// if any timezone data is saved, set default timezone with the data
@@ -685,7 +721,7 @@
$pickup_date = date($pickup_date_format, strtotime($order->get_meta( 'pickup_date', true )));
- echo $pickup_date_field_label.": " . $pickup_date;
+ echo esc_html($pickup_date_field_label).": " . esc_html($pickup_date);
}
if($order->meta_exists('pickup_time') && $order->get_meta( 'pickup_time', true )!= "")
@@ -708,7 +744,7 @@
$pickup_time_value = date($pickup_time_format, strtotime($pickup_minutes[0])) . ' - ' . date($pickup_time_format, strtotime($pickup_minutes[1]));
}
- echo $pickup_time_field_label.": " . $pickup_time_value;
+ echo esc_html($pickup_time_field_label).": " . esc_html($pickup_time_value);
}
@@ -728,7 +764,7 @@
$delivery_date = date($delivery_date_format, strtotime($order->get_meta( 'delivery_date', true )));
- echo $delivery_date_field_label.": " . $delivery_date;
+ echo esc_html($delivery_date_field_label).": " . esc_html($delivery_date);
}
if($order->meta_exists('delivery_time') && $order->get_meta( 'delivery_time', true )!= "")
@@ -751,7 +787,7 @@
$time_value = date($time_format, strtotime($minutes[0])) . ' - ' . date($time_format, strtotime($minutes[1]));
}
- echo $delivery_time_field_label.": " . $time_value;
+ echo esc_html($delivery_time_field_label).": " . esc_html($time_value);
}
@@ -769,10 +805,10 @@
$pickup_time_settings = get_option('coderockz_woo_delivery_pickup_settings');
- $delivery_date_field_label = (isset($delivery_date_settings['field_label']) && !empty($delivery_date_settings['field_label'])) ? stripslashes($delivery_date_settings['field_label']) : __("Delivery Date", "woo-delivery");
- $pickup_date_field_label = (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? stripslashes($pickup_date_settings['pickup_field_label']) : __("Pickup Date", "woo-delivery");
- $delivery_time_field_label = (isset($delivery_time_settings['field_label']) && !empty($delivery_time_settings['field_label'])) ? stripslashes($delivery_time_settings['field_label']) : __("Delivery Time", "woo-delivery");
- $pickup_time_field_label = (isset($pickup_time_settings['field_label']) && !empty($pickup_time_settings['field_label'])) ? stripslashes($pickup_time_settings['field_label']) : __("Pickup Time", "woo-delivery");
+ $delivery_date_field_label = (isset($delivery_date_settings['field_label']) && !empty($delivery_date_settings['field_label'])) ? stripslashes(esc_attr($delivery_date_settings['field_label'])) : esc_html__("Delivery Date", "woo-delivery");
+ $pickup_date_field_label = (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? stripslashes(esc_attr($pickup_date_settings['pickup_field_label'])) : esc_html__("Pickup Date", "woo-delivery");
+ $delivery_time_field_label = (isset($delivery_time_settings['field_label']) && !empty($delivery_time_settings['field_label'])) ? stripslashes(esc_attr($delivery_time_settings['field_label'])) : esc_html__("Delivery Time", "woo-delivery");
+ $pickup_time_field_label = (isset($pickup_time_settings['field_label']) && !empty($pickup_time_settings['field_label'])) ? stripslashes(esc_attr($pickup_time_settings['field_label'])) : esc_html__("Pickup Time", "woo-delivery");
$delivery_option_settings = get_option('coderockz_woo_delivery_option_delivery_settings');
$enable_delivery_option = (isset($delivery_option_settings['enable_option_time_pickup']) && !empty($delivery_option_settings['enable_option_time_pickup'])) ? $delivery_option_settings['enable_option_time_pickup'] : false;
@@ -800,7 +836,7 @@
$delivery_date = date($delivery_date_format, strtotime(get_post_meta( $order_id, 'delivery_date', true )));
}
- echo '<p><strong>'.__($delivery_date_field_label, "woo-delivery").':</strong> ' . $delivery_date . '</p>';
+ echo '<p><strong>'.esc_html($delivery_date_field_label).':</strong> ' . esc_html($delivery_date) . '</p>';
}
@@ -813,7 +849,7 @@
} else {
$pickup_date = date($pickup_date_format, strtotime(get_post_meta( $order_id, 'pickup_date', true )));
}
- echo '<p><strong>'.__($pickup_date_field_label, "woo-delivery").':</strong> ' . $pickup_date . '</p>';
+ echo '<p><strong>'.esc_html($pickup_date_field_label).':</strong> ' . esc_html($pickup_date) . '</p>';
}
@@ -833,7 +869,7 @@
}
$minutes = explode(' - ', $minutes);
- echo '<p><strong>'.__($delivery_time_field_label, "woo-delivery").':</strong> ' . date($time_format, strtotime($minutes[0])) . ' - ' . date($time_format, strtotime($minutes[1])) . '</p>';
+ echo '<p><strong>'.esc_html($delivery_time_field_label).':</strong> ' . esc_html(date($time_format, strtotime($minutes[0]))) . ' - ' . esc_html(date($time_format, strtotime($minutes[1]))) . '</p>';
}
if((metadata_exists('post', $order_id, 'pickup_time') && get_post_meta($order_id,"pickup_time",true) != "") || ($order->meta_exists('pickup_time') && $order->get_meta( 'pickup_time', true ) != "")) {
@@ -852,7 +888,7 @@
}
$pickup_minutes = explode(' - ', $pickup_minutes);
- echo '<p><strong>'.__($pickup_time_field_label, "woo-delivery").':</strong> ' . date($pickup_time_format, strtotime($pickup_minutes[0])) . ' - ' . date($pickup_time_format, strtotime($pickup_minutes[1])) . '</p>';
+ echo '<p><strong>'.esc_html($pickup_time_field_label).':</strong> ' . esc_html(date($pickup_time_format, strtotime($pickup_minutes[0]))) . ' - ' . esc_html(date($pickup_time_format, strtotime($pickup_minutes[1]))) . '</p>';
}
@@ -867,20 +903,20 @@
$notice = '<div class="coderockz-woo-delivery-review-notice notice notice-success is-dismissible">';
$notice .= '<img class="coderockz-woo-delivery-review-notice-left" src="'.CODEROCKZ_WOO_DELIVERY_URL.'admin/images/woo-delivery-logo.png" alt="coderockz-woo-delivery">';
$notice .= '<div class="coderockz-woo-delivery-review-notice-right">';
- $notice .= '<p><b>'.__("We have worked relentlessly to develop the plugin and it would really appreciate us if you dropped a short review about the plugin. Your review means a lot to us and we are working to make the plugin more awesome. Thanks for using WooCommerce Delivery & Pickup Date Time.","woo-delivery").'</b></p>';
+ $notice .= '<p><b>'.esc_html__("We have worked relentlessly to develop the plugin and it would really appreciate us if you dropped a short review about the plugin. Your review means a lot to us and we are working to make the plugin more awesome. Thanks for using WooCommerce Delivery & Pickup Date Time.","woo-delivery").'</b></p>';
$notice .= '<ul>';
- $notice .= '<li><a val="later" href="#">'.__("Remind me later","woo-delivery").'</a></li>';
- $notice .= '<li><a style="font-weight:bold;" val="given" href="#" target="_blank">'.__("Review Here","woo-delivery").'</a></li>';
- $notice .= '<li><a val="never" href="#">'.__("I would not","woo-delivery").'</a></li>';
+ $notice .= '<li><a val="later" href="#">'.esc_html__("Remind me later","woo-delivery").'</a></li>';
+ $notice .= '<li><a style="font-weight:bold;" val="given" href="#" target="_blank">'.esc_html__("Review Here","woo-delivery").'</a></li>';
+ $notice .= '<li><a val="never" href="#">'.esc_html__("I would not","woo-delivery").'</a></li>';
$notice .= '</ul>';
$notice .= '</div>';
$notice .= '</div>';
if(!$options && time()>= $activation_time + (60*60*24*15)){
- echo $notice;
+ echo esc_html($notice);
} else if(is_array($options)) {
if((!array_key_exists('review_notice',$options)) || ($options['review_notice'] =='later' && time()>=($options['updated_at'] + (60*60*24*30) ))){
- echo $notice;
+ echo esc_html($notice);
}
}
}
@@ -897,7 +933,7 @@
public function coderockz_woo_delivery_custom_meta_box() {
- $order_metabox_heading = (isset(get_option('coderockz_woo_delivery_localization_settings')['order_metabox_heading']) && !empty(get_option('coderockz_woo_delivery_localization_settings')['order_metabox_heading'])) ? get_option('coderockz_woo_delivery_localization_settings')['order_metabox_heading'] : __("Delivery/Pickup Date & Time", "woo-delivery");
+ $order_metabox_heading = (isset(get_option('coderockz_woo_delivery_localization_settings')['order_metabox_heading']) && !empty(get_option('coderockz_woo_delivery_localization_settings')['order_metabox_heading'])) ? esc_attr(get_option('coderockz_woo_delivery_localization_settings')['order_metabox_heading']) : esc_html__("Delivery/Pickup Date & Time", "woo-delivery");
$screen = wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ? wc_get_page_screen_id( 'shop-order' ) : 'shop_order';
add_meta_box( 'coderockz_woo_delivery_meta_box', $order_metabox_heading, array($this,"coderockz_woo_delivery_meta_box_markup"), $screen, 'normal', 'high', null );
@@ -933,7 +969,7 @@
$enable_delivery_option = (isset($delivery_option_settings['enable_option_time_pickup']) && !empty($delivery_option_settings['enable_option_time_pickup'])) ? $delivery_option_settings['enable_option_time_pickup'] : false;
- $order_type_field_label = (isset($delivery_option_settings['delivery_option_label']) && !empty($delivery_option_settings['delivery_option_label'])) ? stripslashes($delivery_option_settings['delivery_option_label']) : __("Select order type", "woo-delivery");
+ $order_type_field_label = (isset($delivery_option_settings['delivery_option_label']) && !empty($delivery_option_settings['delivery_option_label'])) ? stripslashes(esc_attr($delivery_option_settings['delivery_option_label'])) : esc_html__("Select order type", "woo-delivery");
$enable_delivery_date = (isset($delivery_date_settings['enable_delivery_date']) && !empty($delivery_date_settings['enable_delivery_date'])) ? $delivery_date_settings['enable_delivery_date'] : false;
$enable_pickup_date = (isset($pickup_date_settings['enable_pickup_date']) && !empty($pickup_date_settings['enable_pickup_date'])) ? $pickup_date_settings['enable_pickup_date'] : false;
@@ -1016,11 +1052,11 @@
$localization_settings = get_option('coderockz_woo_delivery_localization_settings');
- $order_limit_notice = (isset($localization_settings['order_limit_notice']) && !empty($localization_settings['order_limit_notice'])) ? "(".stripslashes($localization_settings['order_limit_notice']).")" : __("(Maximum delivery limit exceed)", "woo-delivery");
- $pickup_limit_notice = (isset($localization_settings['pickup_limit_notice']) && !empty($localization_settings['pickup_limit_notice'])) ? "(".stripslashes($localization_settings['pickup_limit_notice']).")" : __("(Maximum pickup limit exceed)", "woo-delivery");
+ $order_limit_notice = (isset($localization_settings['order_limit_notice']) && !empty($localization_settings['order_limit_notice'])) ? "(".stripslashes(esc_attr($localization_settings['order_limit_notice'])).")" : esc_html__("(Maximum delivery limit exceed)", "woo-delivery");
+ $pickup_limit_notice = (isset($localization_settings['pickup_limit_notice']) && !empty($localization_settings['pickup_limit_notice'])) ? "(".stripslashes(esc_attr($localization_settings['pickup_limit_notice'])).")" : esc_html__("(Maximum pickup limit exceed)", "woo-delivery");
- $delivery_field_label = (isset($delivery_option_settings['delivery_label']) && !empty($delivery_option_settings['delivery_label'])) ? $delivery_option_settings['delivery_label'] : __("Delivery", "woo-delivery");
- $pickup_field_label = (isset($delivery_option_settings['pickup_label']) && !empty($delivery_option_settings['pickup_label'])) ? $delivery_option_settings['pickup_label'] : __("Pickup", "woo-delivery");
+ $delivery_field_label = (isset($delivery_option_settings['delivery_label']) && !empty($delivery_option_settings['delivery_label'])) ? stripslashes(esc_attr($delivery_option_settings['delivery_label'])) : esc_html__("Delivery", "woo-delivery");
+ $pickup_field_label = (isset($delivery_option_settings['pickup_label']) && !empty($delivery_option_settings['pickup_label'])) ? stripslashes(esc_attr($delivery_option_settings['pickup_label'])) : esc_html__("Pickup", "woo-delivery");
$off_days = (isset($delivery_date_settings['off_days']) && !empty($delivery_date_settings['off_days'])) ? $delivery_date_settings['off_days'] : array();
$selectable_start_date = wp_date('Y-m-d H:i:s', current_time( 'timestamp', 1 ));
@@ -1067,7 +1103,7 @@
if($enable_delivery_date) {
- $delivery_date_field_label = (isset($delivery_date_settings['field_label']) && !empty($delivery_date_settings['field_label'])) ? stripslashes($delivery_date_settings['field_label']) : __("Delivery Date", "woo-delivery");
+ $delivery_date_field_label = (isset($delivery_date_settings['field_label']) && !empty($delivery_date_settings['field_label'])) ? stripslashes(esc_attr($delivery_date_settings['field_label'])) : esc_html__("Delivery Date", "woo-delivery");
$delivery_days = isset($delivery_date_settings['delivery_days']) && $delivery_date_settings['delivery_days'] != "" ? $delivery_date_settings['delivery_days'] : "6,0,1,2,3,4,5";
@@ -1092,7 +1128,7 @@
if($enable_pickup_date) {
- $pickup_date_field_label = (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? stripslashes($pickup_date_settings['pickup_field_label']) : __("Pickup Date", "woo-delivery");
+ $pickup_date_field_label = (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? stripslashes(esc_attr($pickup_date_settings['pickup_field_label'])) : esc_html__("Pickup Date", "woo-delivery");
$pickup_days = isset($pickup_date_settings['pickup_days']) && $pickup_date_settings['pickup_days'] != "" ? $pickup_date_settings['pickup_days'] : "6,0,1,2,3,4,5";
@@ -1117,7 +1153,7 @@
if($enable_delivery_time) {
$meta_box .= '<select style="width:100%;margin:5px auto;display:none" name ="coderockz_woo_delivery_meta_box_time_field" id="coderockz_woo_delivery_meta_box_time_field" data-order_limit_notice="'.$order_limit_notice.'">';
- $meta_box .= '<option value="" disabled="disabled" selected>'.__("Select delivery time", "woo-delivery").'</option>';
+ $meta_box .= '<option value="" disabled="disabled" selected>'.esc_html__("Select delivery time", "woo-delivery").'</option>';
foreach($time_options as $key => $value) {
$selected = ($key == $time) ? "selected" : "";
$meta_box .= '<option value="'.$key.'" '.$selected.'>'.$value.'</option>';
@@ -1127,7 +1163,7 @@
if($enable_pickup_time) {
$meta_box .= '<select style="width:100%;margin:5px auto;display:none" name ="coderockz_woo_delivery_meta_box_pickup_field" id="coderockz_woo_delivery_meta_box_pickup_field" data-pickup_limit_notice="'.$pickup_limit_notice.'">';
- $meta_box .= '<option value="" disabled="disabled" selected>'.__("Select pickup time", "woo-delivery").'</option>';
+ $meta_box .= '<option value="" disabled="disabled" selected>'.esc_html__("Select pickup time", "woo-delivery").'</option>';
foreach($pickup_options as $key => $value) {
$selected = ($key == $pickup_time) ? "selected" : "";
$meta_box .= '<option value="'.$key.'" '.$selected.'>'.$value.'</option>';
@@ -1137,11 +1173,68 @@
$meta_box .= '</div>';
- $meta_box .= '<div class="coderockz-woo-delivery-metabox-update-section" data-plugin-url="'.CODEROCKZ_WOO_DELIVERY_URL.'">';
- $meta_box .= '<a class="coderockz-woo-delivery-metabox-update-btn" href="#" style="margin-right:10px"><button type="button" class="button button-primary">'.__("Update", "woo-delivery").'</button></a>';
+ $meta_box .= '<div class="coderockz-woo-delivery-metabox-update-section" data-plugin-url="'.esc_url(CODEROCKZ_WOO_DELIVERY_URL).'">';
+ $meta_box .= '<a class="coderockz-woo-delivery-metabox-update-btn" href="#" style="margin-right:10px"><button type="button" class="button button-primary">'.esc_html__("Update", "woo-delivery").'</button></a>';
$meta_box .= '</div>';
- echo $meta_box;
+
+ $allowed_html = wp_kses_allowed_html( 'post' );
+ $allowed_html['div'] = array(
+ 'class' => true,
+ 'id' => true,
+ 'style' => true,
+ 'data-today_date' => true,
+ 'data-plugin-url' => true,
+ );
+
+ $allowed_html['input'] = array(
+ 'type' => true,
+ 'class' => true,
+ 'id' => true,
+ 'style' => true,
+ 'name' => true,
+ 'value' => true,
+ 'placeholder' => true,
+ 'readonly' => true,
+ 'data-disable_dates' => true,
+ 'data-selectable_dates' => true,
+ 'data-disable_week_days' => true,
+ 'data-week_starts_from' => true,
+ 'data-date_format' => true,
+ 'data-pickup_disable_dates' => true,
+ 'data-pickup_selectable_dates' => true,
+ 'data-pickup_disable_week_days' => true,
+ 'data-pickup_week_starts_from' => true,
+ 'data-pickup_date_format' => true,
+ );
+
+ $allowed_html['select'] = array(
+ 'style' => true,
+ 'name' => true,
+ 'id' => true,
+ 'data-order_limit_notice' => true,
+ 'data-pickup_limit_notice' => true,
+ );
+
+ $allowed_html['option'] = array(
+ 'value' => true,
+ 'selected' => true,
+ 'disabled' => true,
+ );
+
+ $allowed_html['a'] = array(
+ 'class' => true,
+ 'href' => true,
+ 'style' => true,
+ );
+
+ $allowed_html['button'] = array(
+ 'type' => true,
+ 'class' => true,
+ );
+
+ echo wp_kses( $meta_box, $allowed_html );
+ //echo $meta_box;
}
--- a/woo-delivery/admin/partials/coderockz-woo-delivery-admin-display.php
+++ b/woo-delivery/admin/partials/coderockz-woo-delivery-admin-display.php
@@ -12,6 +12,8 @@
* @subpackage Coderockz_Woo_Delivery/admin/partials
*/
+ if ( ! defined( 'ABSPATH' ) ) exit;
+
$date_settings = get_option('coderockz_woo_delivery_date_settings');
$time_settings = get_option('coderockz_woo_delivery_time_settings');
if(isset($date_settings['delivery_days'])) {
@@ -40,7 +42,7 @@
<div class="coderockz-woo-delivery-container">
<div class="coderockz-woo-delivery-container-header">
- <img style="max-width: 75px;float: left;display: block;padding-bottom: 2px;" src="<?php echo CODEROCKZ_WOO_DELIVERY_URL; ?>admin/images/woo-delivery-logo.png" alt="coderockz-woo-delivery">
+ <img style="max-width: 75px;float: left;display: block;padding-bottom: 2px;" src="<?php echo esc_url(CODEROCKZ_WOO_DELIVERY_URL); ?>admin/images/woo-delivery-logo.png" alt="coderockz-woo-delivery">
<div style="float:left;margin-left:15px;">
<p style="margin: 0!important;text-transform:uppercase;border-bottom:2px solid #1F9E60;padding-bottom:3px;font-size: 20px;font-weight: 700;color: #654C29;">WooCommerce</p>
<p style="margin: 0!important;text-transform:uppercase;padding-top:3px;font-size: 11px;color: #654C29;font-weight: 600;">Delivery & Pickup Date Time</p>
@@ -51,27 +53,27 @@
</div>
<div class="coderockz-woo-delivery-free-vertical-tabs">
<div class="coderockz-woo-delivery-free-tabs">
- <button data-tab="tab2"><i class="dashicons dashicons-plugins-checked" style="margin-bottom: 3px;margin-right: 10px;"></i><?php _e('Order Settings', 'woo-delivery'); ?></button>
- <button data-tab="tab3"><i class="dashicons dashicons-calendar-alt" style="margin-bottom: 3px;margin-right: 10px;"></i><?php _e('Delivery Date', 'woo-delivery'); ?></button>
- <button data-tab="tab4"><i class="dashicons dashicons-calendar" style="margin-bottom: 3px;margin-right: 10px;"></i><?php _e('Pickup Date', 'woo-delivery'); ?></button>
- <button data-tab="tab5"><i class="dashicons dashicons-hidden" style="margin-bottom: 3px;margin-right: 10px;"></i><?php _e('Off Days', 'woo-delivery'); ?></button>
- <button data-tab="tab6"><i class="dashicons dashicons-clock" style="margin-bottom: 3px;margin-right: 10px;"></i><?php _e('Delivery Time', 'woo-delivery'); ?></button>
- <button data-tab="tab7"><i class="dashicons dashicons-cart" style="margin-bottom: 3px;margin-right: 10px;"></i><?php _e('Pickup Time', 'woo-delivery'); ?></button>
- <button data-tab="tab8"><i class="dashicons dashicons-translation" style="margin-bottom: 3px;margin-right: 10px;"></i><?php _e('Localization', 'woo-delivery'); ?></button>
- <button data-tab="tab9"><i class="dashicons dashicons-admin-settings" style="margin-bottom: 3px;margin-right: 10px;"></i><?php _e('Others', 'woo-delivery'); ?></button>
- <button data-tab="tab10"><i class="dashicons dashicons-clipboard" style="margin-bottom: 3px;margin-right: 10px;"></i><?php _e('Free VS Pro', 'woo-delivery'); ?></button>
+ <button data-tab="tab2"><i class="dashicons dashicons-plugins-checked" style="margin-bottom: 3px;margin-right: 10px;"></i><?php esc_html_e('Order Settings', 'woo-delivery'); ?></button>
+ <button data-tab="tab3"><i class="dashicons dashicons-calendar-alt" style="margin-bottom: 3px;margin-right: 10px;"></i><?php esc_html_e('Delivery Date', 'woo-delivery'); ?></button>
+ <button data-tab="tab4"><i class="dashicons dashicons-calendar" style="margin-bottom: 3px;margin-right: 10px;"></i><?php esc_html_e('Pickup Date', 'woo-delivery'); ?></button>
+ <button data-tab="tab5"><i class="dashicons dashicons-hidden" style="margin-bottom: 3px;margin-right: 10px;"></i><?php esc_html_e('Off Days', 'woo-delivery'); ?></button>
+ <button data-tab="tab6"><i class="dashicons dashicons-clock" style="margin-bottom: 3px;margin-right: 10px;"></i><?php esc_html_e('Delivery Time', 'woo-delivery'); ?></button>
+ <button data-tab="tab7"><i class="dashicons dashicons-cart" style="margin-bottom: 3px;margin-right: 10px;"></i><?php esc_html_e('Pickup Time', 'woo-delivery'); ?></button>
+ <button data-tab="tab8"><i class="dashicons dashicons-translation" style="margin-bottom: 3px;margin-right: 10px;"></i><?php esc_html_e('Localization', 'woo-delivery'); ?></button>
+ <button data-tab="tab9"><i class="dashicons dashicons-admin-settings" style="margin-bottom: 3px;margin-right: 10px;"></i><?php esc_html_e('Others', 'woo-delivery'); ?></button>
+ <button data-tab="tab10"><i class="dashicons dashicons-clipboard" style="margin-bottom: 3px;margin-right: 10px;"></i><?php esc_html_e('Free VS Pro', 'woo-delivery'); ?></button>
</div>
<div class="coderockz-woo-delivery-maincontent">
<div data-tab="tab2" class="coderockz-woo-delivery-tabcontent">
<div class="coderockz-woo-delivery-card">
- <p class="coderockz-woo-delivery-card-header"><?php _e('Order Type Settings', 'woo-delivery'); ?></p>
+ <p class="coderockz-woo-delivery-card-header"><?php esc_html_e('Order Type Settings', 'woo-delivery'); ?></p>
<div class="coderockz-woo-delivery-card-body">
- <p class="coderockz-woo-delivery-delivery-option-notice"><span class="dashicons dashicons-yes"></span><?php _e(' Settings Changed Successfully', 'woo-delivery'); ?></p>
+ <p class="coderockz-woo-delivery-delivery-option-notice"><span class="dashicons dashicons-yes"></span><?php esc_html_e(' Settings Changed Successfully', 'woo-delivery'); ?></p>
<form action="" method="post" id ="coderockz_delivery_delivery_option_form_submit">
<?php wp_nonce_field('coderockz_woo_delivery_nonce'); ?>
<div class="coderockz-woo-delivery-form-group">
- <span class="coderockz-woo-delivery-form-label" style="width:426px!important"><?php _e('Give Option to choose from Delivery or Pickup', 'woo-delivery'); ?></span>
+ <span class="coderockz-woo-delivery-form-label" style="width:426px!important"><?php esc_html_e('Give Option to choose from Delivery or Pickup', 'woo-delivery'); ?></span>
<p class="coderockz-woo-delivery-tooltip" tooltip="Enable it if you want to give the freedom to customer whether he wants Home delivery or he picks the ordered products from a pickup location. Default is disable."><span class="dashicons dashicons-editor-help"></span></p>
<label class="coderockz-woo-delivery-toogle-switch" for="coderockz_enable_option_time_pickup">
<input type="checkbox" name="coderockz_enable_option_time_pickup" id="coderockz_enable_option_time_pickup" <?php echo (isset($delivery_option_settings['enable_option_time_pickup']) && !empty($delivery_option_settings['enable_option_time_pickup'])) ? "checked" : "" ?>/>
@@ -79,49 +81,23 @@
</label>
</div>
<div class="coderockz-woo-delivery-form-group">
- <label class="coderockz-woo-delivery-form-label" for="coderockz_woo_delivery_delivery_option_label"><?php _e('Order Type Field Label', 'woo-delivery'); ?></label>
+ <label class="coderockz-woo-delivery-form-label" for="coderockz_woo_delivery_delivery_option_label"><?php esc_html_e('Order Type Field Label', 'woo-delivery'); ?></label>
<p class="coderockz-woo-delivery-tooltip" tooltip="Order Type field label. Default is Order Type."><span class="dashicons dashicons-editor-help"></span></p>
- <input id="coderockz_woo_delivery_delivery_option_label" name="coderockz_woo_delivery_delivery_option_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($delivery_option_settings['delivery_option_label']) && !empty($delivery_option_settings['delivery_option_label'])) ? stripslashes($delivery_option_settings['delivery_option_label']) : "" ?>" placeholder="" autocomplete="off"/>
+ <input id="coderockz_woo_delivery_delivery_option_label" name="coderockz_woo_delivery_delivery_option_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($delivery_option_settings['delivery_option_label']) && !empty($delivery_option_settings['delivery_option_label'])) ? esc_attr( wp_unslash($delivery_option_settings['delivery_option_label'])) : "" ?>" placeholder="" autocomplete="off"/>
</div>
<div class="coderockz-woo-delivery-form-group">
- <label class="coderockz-woo-delivery-form-label" for="coderockz_woo_delivery_option_delivery_label"><?php _e('Delivery Option Label', 'woo-delivery'); ?></label>
+ <label class="coderockz-woo-delivery-form-label" for="coderockz_woo_delivery_option_delivery_label"><?php esc_html_e('Delivery Option Label', 'woo-delivery'); ?></label>
<p class="coderockz-woo-delivery-tooltip" tooltip="Order Type's Home Delivery option label. Default is Delivery."><span class="dashicons dashicons-editor-help"></span></p>
- <input id="coderockz_woo_delivery_option_delivery_label" name="coderockz_woo_delivery_option_delivery_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($delivery_option_settings['delivery_label']) && !empty($delivery_option_settings['delivery_label'])) ? stripslashes($delivery_option_settings['delivery_label']) : "" ?>" placeholder="" autocomplete="off"/>
+ <input id="coderockz_woo_delivery_option_delivery_label" name="coderockz_woo_delivery_option_delivery_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($delivery_option_settings['delivery_label']) && !empty($delivery_option_settings['delivery_label'])) ? esc_attr( wp_unslash($delivery_option_settings['delivery_label'])) : "" ?>" placeholder="" autocomplete="off"/>
</div>
<div class="coderockz-woo-delivery-form-group">
- <label class="coderockz-woo-delivery-form-label" for="coderockz_woo_delivery_option_pickup_label"><?php _e('Self Pickup Option Label', 'woo-delivery'); ?></label>
+ <label class="coderockz-woo-delivery-form-label" for="coderockz_woo_delivery_option_pickup_label"><?php esc_html_e('Self Pickup Option Label', 'woo-delivery'); ?></label>
<p class="coderockz-woo-delivery-tooltip" tooltip="Order Type's Self Pickup option label. Default is Pickup."><span class="dashicons dashicons-editor-help"></span></p>
- <input id="coderockz_woo_delivery_option_pickup_label" name="coderockz_woo_delivery_option_pickup_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($delivery_option_settings['pickup_label']) && !empty($delivery_option_settings['pickup_label'])) ? stripslashes($delivery_option_settings['pickup_label']) : "" ?>" placeholder="" autocomplete="off"/>
- </div>
- <div class="coderockz-woo-delivery-form-group">
- <span class="coderockz-woo-delivery-form-label" style="width:30%!important;"><?php _e('Dynamically Enable/Disable Delivery/Pickup Based on WooCommerce Shipping', 'woo-delivery'); ?><span style="font-size: 11px;font-style: italic;color: lightseagreen;display:block;">( <?php _e('To know more about the feature: ', 'coderockz-woo-delivery'); ?><a href="https://coderockz.com/documentations/dynamically-enable-disable-delivery-pickup-based-on-woocommerce-shipping/" target="_blank">Click here</a> )</span></span>
- <p class="coderockz-woo-delivery-tooltip" tooltip="Enable it if you want to see the delivery or pickup option based on your WoCommerce Shipping. Default is disable."><span class="dashicons dashicons-editor-help"></span></p>
- <label class="coderockz-woo-delivery-toogle-switch" for="coderockz_woo_delivery_enable_dynamic_order_type">
- <input type="checkbox" name="coderockz_woo_delivery_enable_dynamic_order_type" id="coderockz_woo_delivery_enable_dynamic_order_type" class="coderockz_woo_delivery_enable_dynamic_order_type"/>
- <div class="coderockz-woo-delivery-toogle-slider coderockz-woo-delivery-toogle-round"></div>
- </label>
- </div>
-
- <div class="coderockz-woo-delivery-form-group">
- <span class="coderockz-woo-delivery-form-label" style="width:30%!important;"><?php _e('Dynamically Change Shipping Method Based on Delivery/Pickup', 'woo-delivery'); ?><span style="font-size: 11px;font-style: italic;color: lightseagreen;display:block;">( <?php _e('To see how it works: ', 'coderockz-woo-delivery'); ?><a href="https://coderockz.com/woocommerce_shipping_methods_changed_on_delivey_pickup.gif" target="_blank">Click here</a> )</span></span>
- <p class="coderockz-woo-delivery-tooltip" tooltip=""><span class="dashicons dashicons-editor-help"></span></p>
- <label class="coderockz-woo-delivery-toogle-switch" for="coderockz_woo_delivery_enable_dynamic_order_type">
- <input type="checkbox" name="coderockz_woo_delivery_enable_dynamic_order_type" id="coderockz_woo_delivery_enable_dynamic_order_type" class="coderockz_woo_delivery_enable_dynamic_order_type"/>
- <div class="coderockz-woo-delivery-toogle-slider coderockz-woo-delivery-toogle-round"></div>
- </label>
+ <input id="coderockz_woo_delivery_option_pickup_label" name="coderockz_woo_delivery_option_pickup_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($delivery_option_settings['pickup_label']) && !empty($delivery_option_settings['pickup_label'])) ? esc_attr( wp_unslash($delivery_option_settings['pickup_label'])) : "" ?>" placeholder="" autocomplete="off"/>
</div>
- <div class="coderockz-woo-delivery-form-group">
- <span class="coderockz-woo-delivery-form-label" style="width:30%!important;"><?php _e('Hide Shipping Address Section When Selecting Pickup', 'woo-delivery'); ?><span style="font-size: 11px;font-style: italic;color: lightseagreen;display:block;">( <?php _e('To see how it works: ', 'coderockz-woo-delivery'); ?><a href="https://coderockz.com/hide_shipping_address_when_pickup.gif" target="_blank">Click here</a> )</span></span>
- <p class="coderockz-woo-delivery-tooltip" tooltip=""><span class="dashicons dashicons-editor-help"></span></p>
- <label class="coderockz-woo-delivery-toogle-switch" for="coderockz_woo_delivery_enable_dynamic_order_type">
- <input type="checkbox" name="coderockz_woo_delivery_enable_dynamic_order_type" id="coderockz_woo_delivery_enable_dynamic_order_type" class="coderockz_woo_delivery_enable_dynamic_order_type"/>
- <div class="coderockz-woo-delivery-toogle-slider coderockz-woo-delivery-toogle-round"></div>
- </label>
- </div>
-
- <input class="coderockz-woo-delivery-submit-btn" type="submit" name="coderockz_delivery_delivery_option_form_submit" value="<?php _e('Save Changes', 'woo-delivery'); ?>" />
+ <input class="coderockz-woo-delivery-submit-btn" type="submit" name="coderockz_delivery_delivery_option_form_submit" value="<?php esc_html_e('Save Changes', 'woo-delivery'); ?>" />
</form>
</div>
@@ -133,14 +109,14 @@
<div data-tab="tab3" class="coderockz-woo-delivery-tabcontent">
<div class="coderockz-woo-delivery-card">
- <p class="coderockz-woo-delivery-card-header"><?php _e('General Delivery Date Settings', 'woo-delivery'); ?></p>
+ <p class="coderockz-woo-delivery-card-header"><?php esc_html_e('General Delivery Date Settings', 'woo-delivery'); ?></p>
<div class="coderockz-woo-delivery-card-body">
- <p class="coderockz-woo-delivery-date-tab-notice"><span class="dashicons dashicons-yes"></span><?php _e(' Settings Changed Successfully', 'woo-delivery'); ?></p>
+ <p class="coderockz-woo-delivery-date-tab-notice"><span class="dashicons dashicons-yes"></span><?php esc_html_e(' Settings Changed Successfully', 'woo-delivery'); ?></p>
<form action="" method="post" id ="coderockz_delivery_date_form_submit">
<?php wp_nonce_field('coderockz_woo_delivery_nonce'); ?>
<div class="coderockz-woo-delivery-form-group">
- <span class="coderockz-woo-delivery-form-label"><?php _e('Enable Delivery Date', 'woo-delivery'); ?></span>
+ <span class="coderockz-woo-delivery-form-label"><?php esc_html_e('Enable Delivery Date', 'woo-delivery'); ?></span>
<p class="coderockz-woo-delivery-tooltip" tooltip="Enable Delivery Date input field in woocommerce order checkout page."><span class="dashicons dashicons-editor-help"></span></p>
<label class="coderockz-woo-delivery-toogle-switch" for="coderockz_enable_delivery_date">
<input type="checkbox" name="coderockz_enable_delivery_date" id="coderockz_enable_delivery_date" <?php echo (isset($date_settings['enable_delivery_date']) && !empty($date_settings['enable_delivery_date'])) ? "checked" : "" ?>/>
@@ -148,7 +124,7 @@
</label>
</div>
<div class="coderockz-woo-delivery-form-group">
- <span class="coderockz-woo-delivery-form-label"><?php _e('Make Delivery Date Field Mandatory', 'woo-delivery'); ?></span>
+ <span class="coderockz-woo-delivery-form-label"><?php esc_html_e('Make Delivery Date Field Mandatory', 'woo-delivery'); ?></span>
<p class="coderockz-woo-delivery-tooltip" tooltip="Make Delivery Date input field mandatory in woocommerce order checkout page. Default is optional."><span class="dashicons dashicons-editor-help"></span></p>
<label class="coderockz-woo-delivery-toogle-switch" for="coderockz_delivery_date_mandatory">
<input type="checkbox" name="coderockz_delivery_date_mandatory" id="coderockz_delivery_date_mandatory" <?php echo (isset($date_settings['delivery_date_mandatory']) && !empty($date_settings['delivery_date_mandatory'])) ? "checked" : "" ?>/>
@@ -156,22 +132,22 @@
</label>
</div>
<div class="coderockz-woo-delivery-form-group">
- <label class="coderockz-woo-delivery-form-label" for="coderockz_delivery_date_field_label"><?php _e('Delivery Date Field Label', 'woo-delivery'); ?></label>
+ <label class="coderockz-woo-delivery-form-label" for="coderockz_delivery_date_field_label"><?php esc_html_e('Delivery Date Field Label', 'woo-delivery'); ?></label>
<p class="coderockz-woo-delivery-tooltip" tooltip="Delivery Date input field label and placeholder. Default is Delivery Date."><span class="dashicons dashicons-editor-help"></span></p>
- <input id="coderockz_delivery_date_field_label" name="coderockz_delivery_date_field_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($date_settings['field_label']) && !empty($date_settings['field_label'])) ? esc_attr($date_settings['field_label']) : "" ?>" placeholder="" autocomplete="off"/>
+ <input id="coderockz_delivery_date_field_label" name="coderockz_delivery_date_field_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($date_settings['field_label']) && !empty($date_settings['field_label'])) ? esc_attr( wp_unslash($date_settings['field_label'])) : "" ?>" placeholder="" autocomplete="off"/>
</div>
<div class="coderockz-woo-delivery-form-group">
- <label class="coderockz-woo-delivery-form-label" for="coderockz_delivery_date_selectable_date"><?php _e('Allow Delivery in Next Available Days', 'woo-delivery'); ?></label>
+ <label class="coderockz-woo-delivery-form-label" for="coderockz_delivery_date_selectable_date"><?php esc_html_e('Allow Delivery in Next Available Days', 'woo-delivery'); ?></label>
<p class="coderockz-woo-delivery-tooltip" tooltip="User can only select the number of date from calander that is specified Here. Other dates are disabled. Only numerical value is excepted. Default is 365 days."><span class="dashicons dashicons-editor-help"></span></p>
- <input onkeyup="if(!Number.isInteger(Number(this.value)) || this.value < 1) this.value = null;" id="coderockz_delivery_date_selectable_date" name="coderockz_delivery_date_selectable_date" type="number" class="coderockz-woo-delivery-number-field" value="<?php echo (isset($date_settings['selectable_date']) && !empty($date_settings['selectable_date'])) ? stripslashes(esc_attr($date_settings['selectable_date'])) : ""; ?>" placeholder="" autocomplete="off"/>
+ <input onkeyup="if(!Number.isInteger(Number(this.value)) || this.value < 1) this.value = null;" id="coderockz_delivery_date_selectable_date" name="coderockz_delivery_date_selectable_date" type="number" class="coderockz-woo-delivery-number-field" value="<?php echo (isset($date_settings['selectable_date']) && !empty($date_settings['selectable_date'])) ? esc_attr( wp_unslash($date_settings['selectable_date'])) : ""; ?>" placeholder="" autocomplete="off"/>
</div>
<div class="coderockz-woo-delivery-form-group">
- <label class="coderockz-woo-delivery-form-label" for="coderockz_delivery_date_week_starts_from"><?php _e('Week Starts From', 'woo-delivery'); ?></label>
+ <label class="coderockz-woo-delivery-form-label" for="coderockz_delivery_date_week_starts_from"><?php esc_html_e('Week Starts From', 'woo-delivery'); ?></label>
<p class="coderockz-woo-delivery-tooltip" tooltip="Delivery Date's calendar will start from the day that is selected Here. Default is Sunday."><span class="dashicons dashicons-editor-help"></span></p>
<select class="coderockz-woo-delivery-select-field" name="coderockz_delivery_date_week_starts_from">
- <option value="" <?php if(isset($date_settings['week_starts_from']) && $date_settings['week_starts_from'] == ""){ echo "selected"; } ?>><?php _e('Select Day', 'woo-delivery'); ?></option>
+ <option value="" <?php if(isset($date_settings['week_starts_from']) && $date_settings['week_starts_from'] == ""){ echo "selected"; } ?>><?php esc_html_e('Select Day', 'woo-delivery'); ?></option>
<option value="0" <?php if(isset($date_settings['week_starts_from']) && $date_settings['week_starts_from'] == "0"){ echo "selected"; } ?>>Sunday</option>
<option value="1" <?php if(isset($date_settings['week_starts_from']) && $date_settings['week_starts_from'] == "1"){ echo "selected"; } ?>>Monday</option>
<option value="2" <?php if(isset($date_settings['week_starts_from']) && $date_settings['week_starts_from'] == "2"){ echo "selected"; } ?>>Tuesday</option>
@@ -183,7 +159,7 @@
</div>
<div class="coderockz-woo-delivery-form-group">
- <label class="coderockz-woo-delivery-form-label" for="coderockz_delivery_date_format"><?php _e('Delivery Date Format', 'woo-delivery'); ?></label>
+ <label class="coderockz-woo-delivery-form-label" for="coderockz_delivery_date_format"><?php esc_html_e('Delivery Date Format', 'woo-delivery'); ?></label>
<p class="coderockz-woo-delivery-tooltip" tooltip="Date format that is used in everywhere which is available by this plugin. Default is F j, Y ( ex. March 6, 2011 )."><span class="dashicons dashicons-editor-help"></span></p>
<select class="coderockz-woo-delivery-select-field" name="coderockz_delivery_date_format">
<option value="F j, Y" <?php if(isset($date_settings['date_format']) && $date_settings['date_format'] == "F j, Y"){ echo "selected"; } ?>>F j, Y ( ex. March 6, 2011 )</option>
@@ -193,7 +169,7 @@
</select>
</div>
<div class="coderockz-woo-delivery-form-group">
- <span class="coderockz-woo-delivery-form-label"><?php _e('Auto Select 1st Available Date', 'woo-delivery'); ?></span>
+ <span class="coderockz-woo-delivery-form-label"><?php esc_html_e('Auto Select 1st Available Date', 'woo-delivery'); ?></span>
<p class="coderockz-woo-delivery-tooltip" tooltip="Enable the option if you want to select the first available date automatically and shown in the delivery date field. Default is disable."><span class="dashicons dashicons-editor-help"></span></p>
<label class="coderockz-woo-delivery-toogle-switch" for="coderockz_auto_select_first_date">
<input type="checkbox" name="coderockz_auto_select_first_date" id="coderockz_auto_select_first_date" <?php echo (isset($date_settings['auto_select_first_date']) && !empty($date_settings['auto_select_first_date'])) ? "checked" : "" ?>/>
@@ -201,7 +177,7 @@
</label>
</div>
<div class="coderockz-woo-delivery-form-group">
- <label class="coderockz-woo-delivery-form-label coderockz-woo-delivery-checkbox-label" for="coderockz_delivery_date_delivery_days"><?php _e('Delivery Days', 'woo-delivery'); ?></label>
+ <label class="coderockz-woo-delivery-form-label coderockz-woo-delivery-checkbox-label" for="coderockz_delivery_date_delivery_days"><?php esc_html_e('Delivery Days', 'woo-delivery'); ?></label>
<p class="coderockz-woo-delivery-tooltip coderockz-woo-delivery-checkbox-tooltip" tooltip="Delivery is only available in those days that are checked. Other dates corresponding to the unchecked days are disabled in the calendar."><span class="dashicons dashicons-editor-help"></span></p>
<div id="coderockz_delivery_date_delivery_days" style="display:inline-block">
<input type="checkbox" name="coderockz_delivery_date_delivery_days[]" value="6" <?php echo in_array("6",$selected_delivery_day) ? "checked" : "";?>><label class="coderockz-woo-delivery-checkbox-field-text">Saturday</label><br/>
@@ -214,7 +190,7 @@
</div>
</div>
- <input class="coderockz-woo-delivery-submit-btn" type="submit" name="coderockz_delivery_date_form_submit" value="<?php _e('Save Changes', 'woo-delivery'); ?>" />
+ <input class="coderockz-woo-delivery-submit-btn" type="submit" name="coderockz_delivery_date_form_submit" value="<?php esc_html_e('Save Changes', 'woo-delivery'); ?>" />
</form>
</div>
@@ -225,14 +201,14 @@
<div data-tab="tab4" class="coderockz-woo-delivery-tabcontent">
<div class="coderockz-woo-delivery-card">
- <p class="coderockz-woo-delivery-card-header"><?php _e('General Pickup Date Settings', 'woo-delivery'); ?></p>
+ <p class="coderockz-woo-delivery-card-header"><?php esc_html_e('General Pickup Date Settings', 'woo-delivery'); ?></p>
<div class="coderockz-woo-delivery-card-body">
- <p class="coderockz-woo-delivery-pickup-date-tab-notice"><span class="dashicons dashicons-yes"></span><?php _e(' Settings Changed Successfully', 'woo-delivery'); ?></p>
+ <p class="coderockz-woo-delivery-pickup-date-tab-notice"><span class="dashicons dashicons-yes"></span><?php esc_html_e(' Settings Changed Successfully', 'woo-delivery'); ?></p>
<form action="" method="post" id ="coderockz_delivery_pickup_date_form_submit">
<?php wp_nonce_field('coderockz_woo_delivery_nonce'); ?>
<div class="coderockz-woo-delivery-form-group">
- <span class="coderockz-woo-delivery-form-label"><?php _e('Enable Pickup Date', 'woo-delivery'); ?></span>
+ <span class="coderockz-woo-delivery-form-label"><?php esc_html_e('Enable Pickup Date', 'woo-delivery'); ?></span>
<p class="coderockz-woo-delivery-tooltip" tooltip="Enable Pickup Date input field in woocommerce order checkout page."><span class="dashicons dashicons-editor-help"></span></p>
<label class="coderockz-woo-delivery-toogle-switch" for="coderockz_enable_pickup_date">
<input type="checkbox" name="coderockz_enable_pickup_date" id="coderockz_enable_pickup_date" <?php echo (isset($pickup_date_settings['enable_pickup_date']) && !empty($pickup_date_settings['enable_pickup_date'])) ? "checked" : "" ?>/>
@@ -240,7 +216,7 @@
</label>
</div>
<div class="coderockz-woo-delivery-form-group">
- <span class="coderockz-woo-delivery-form-label"><?php _e('Make Pickup Date Field Mandatory', 'woo-delivery'); ?></span>
+ <span class="coderockz-woo-delivery-form-label"><?php esc_html_e('Make Pickup Date Field Mandatory', 'woo-delivery'); ?></span>
<p class="coderockz-woo-delivery-tooltip" tooltip="Make Pickup Date input field mandatory in woocommerce order checkout page. Default is optional."><span class="dashicons dashicons-editor-help"></span></p>
<label class="coderockz-woo-delivery-toogle-switch" for="coderockz_pickup_date_mandatory">
<input type="checkbox" name="coderockz_pickup_date_mandatory" id="coderockz_pickup_date_mandatory" <?php echo (isset($pickup_date_settings['pickup_date_mandatory']) && !empty($pickup_date_settings['pickup_date_mandatory'])) ? "checked" : "" ?>/>
@@ -249,22 +225,22 @@
</div>
<div class="coderockz-woo-delivery-form-group">
- <label class="coderockz-woo-delivery-form-label" for="coderockz_pickup_date_field_label"><?php _e('Pickup Date Field Label', 'woo-delivery'); ?></label>
+ <label class="coderockz-woo-delivery-form-label" for="coderockz_pickup_date_field_label"><?php esc_html_e('Pickup Date Field Label', 'woo-delivery'); ?></label>
<p class="coderockz-woo-delivery-tooltip" tooltip="Pickup Date input field heading. Default is Pickup Date."><span class="dashicons dashicons-editor-help"></span></p>
- <input id="coderockz_pickup_date_field_label" name="coderockz_pickup_date_field_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? stripslashes(esc_attr($pickup_date_settings['pickup_field_label'])) : "" ?>" placeholder="" autocomplete="off"/>
+ <input id="coderockz_pickup_date_field_label" name="coderockz_pickup_date_field_label" type="text" class="coderockz-woo-delivery-input-field" value="<?php echo (isset($pickup_date_settings['pickup_field_label']) && !empty($pickup_date_settings['pickup_field_label'])) ? esc_attr( wp_unslash($pickup_date_settings['pickup_field_label'])) : "" ?>" placeholder="" autoco