From 291b4e67a1b233cca6b95963e7c14bf8319b8f72 Mon Sep 17 00:00:00 2001 From: shridhamdeveloper <38998323+shridhamdeveloper@users.noreply.github.com> Date: Mon, 14 Oct 2024 16:55:34 +0530 Subject: [PATCH 1/7] #415 --- admin/class-adsforwp-admin-settings.php | 3 +-- admin/control-center.php | 2 +- output/class-adsforwp-output-functions.php | 21 ++++++++++++--------- public/assets/js/adsforwp.js | 3 ++- public/assets/js/adsforwp.min.js | 2 +- view/class-adsforwp-view-ad-groups.php | 5 +++-- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/admin/class-adsforwp-admin-settings.php b/admin/class-adsforwp-admin-settings.php index 716d735..71d2d1d 100644 --- a/admin/class-adsforwp-admin-settings.php +++ b/admin/class-adsforwp-admin-settings.php @@ -674,10 +674,9 @@ public function adsforwp_import_callback() { } public function adsforwp_ad_blocker_notice_opt_callback() { $settings = adsforwp_defaultSettings(); - $notice_type = esc_attr( $settings['notice_type'] ); + $notice_type = isset( $settings['notice_type'] ) ? esc_attr( $settings['notice_type'] ) : ''; $notice_title = esc_attr( $settings['notice_title'] ); $notice_description = esc_html( $settings['notice_description'] ); - $notice_close_btn = esc_attr( $settings['notice_close_btn'] ); $btn_txt = esc_attr( $settings['btn_txt'] ); $notice_bg_color = sanitize_hex_color( $settings['notice_bg_color'] ); $notice_txt_color = sanitize_hex_color( $settings['notice_txt_color'] ); diff --git a/admin/control-center.php b/admin/control-center.php index d60bf12..f2e4788 100644 --- a/admin/control-center.php +++ b/admin/control-center.php @@ -127,7 +127,7 @@ function adsforwp_reset_all_settings() { $result = ''; // Deleting Settings - update_option( 'adsforwp_settings', array() ); // Security: Permission and nonce verified + delete_option( 'adsforwp_settings' ); // Security: Permission and nonce verified // Deleting Ads $allposts = get_posts( diff --git a/output/class-adsforwp-output-functions.php b/output/class-adsforwp-output-functions.php index 269d015..bf86d01 100644 --- a/output/class-adsforwp-output-functions.php +++ b/output/class-adsforwp-output-functions.php @@ -1401,20 +1401,23 @@ public function adsforwp_display_ads( $content ) { $p_number = $paragraph_id; foreach ( $paragraphs as $index => $paragraph ) { + + if ( ! empty( $paragraph ) ) { - if ( trim( $paragraph ) ) { - $paragraphs[ $index ] .= $closing_p; - } + if ( trim( $paragraph ) ) { + $paragraphs[ $index ] .= $closing_p; + } - if ( $every_paragraphs == 1 ) { + if ( $every_paragraphs == 1 ) { + + if ( $paragraph_id == $index + 1 ) { + $paragraphs[ $index ] .= $ad_code; + $paragraph_id += $p_number; + } + } elseif ( $paragraph_id == $index + 1 ) { - if ( $paragraph_id == $index + 1 ) { $paragraphs[ $index ] .= $ad_code; - $paragraph_id += $p_number; } - } elseif ( $paragraph_id == $index + 1 ) { - - $paragraphs[ $index ] .= $ad_code; } } diff --git a/public/assets/js/adsforwp.js b/public/assets/js/adsforwp.js index f4aa176..bf53c26 100644 --- a/public/assets/js/adsforwp.js +++ b/public/assets/js/adsforwp.js @@ -12,6 +12,7 @@ nextId = jQuery(this).parents("tbody").find("tr").length; selectrow = selectrow.replace(/\[0\]/g, "["+nextId+"]"); selectrow = selectrow.replace(/\[group-0\]/g, "[group-"+group_index+"]"); + selectrow = selectrow.replace(/afw-select-post-type 0/g, "afw-select-post-type "+nextId); jQuery(this).parents("tr").after(selectrow);adsforwpremoveHtml();adsforwpclone(); }); } @@ -906,7 +907,7 @@ jQuery( document ).ready(function($) { window.history.pushState("", "", href); return false; }); - $('#adsforwp_ad_expire_from, #adsforwp_ad_expire_to').datepicker({ + $('#adsforwp_ad_expire_from').datepicker({ dateFormat: "yy-mm-dd", minDate: 0, onSelect: function(selected){ diff --git a/public/assets/js/adsforwp.min.js b/public/assets/js/adsforwp.min.js index c42d33f..f302308 100644 --- a/public/assets/js/adsforwp.min.js +++ b/public/assets/js/adsforwp.min.js @@ -1 +1 @@ -var e=document.createElement("div");e.id="adsforwp-hidden-block",e.style.display="none",document.body.appendChild(e);var adsforwpclone=function(){jQuery(".placement-row-clone").off("click").click(function(){var t=jQuery(this).closest(".afw-placement-group").attr("data-id"),a=jQuery(document).find("#call_html_template_afw").html();nextId=jQuery(this).parents("tbody").find("tr").length,a=(a=a.replace(/\[0\]/g,"["+nextId+"]")).replace(/\[group-0\]/g,"[group-"+t+"]"),jQuery(this).parents("tr").after(a),adsforwpremoveHtml(),adsforwpclone()})},adsforwpremoveHtml=function(){jQuery(".placement-row-delete").off("click").click(function(){1==jQuery(".afw-placement-group").length?jQuery(this).parents("tbody").find("tr").length>1&&jQuery(this).parents("tr").remove():1==jQuery(this).parents("tbody").find("tr").length?jQuery(this).parents(".afw-placement-group").remove():jQuery(this).parents("tr").remove()})};function taxonomyDataCall(){jQuery("select.ajax-output").change(function(){if("ef_taxonomy"==jQuery(this).closest("tr").find(".afw-select-post-type").val()){parentSelector=jQuery(this).parents("td").find(".afw-insert-ajax-select");var t=jQuery(this).val(),a=jQuery(this).attr("name").split("[")[1].replace("]",""),o=$("#adsforwp_select_name_nonce").val();parentSelector.find(".afw-ajax-output-child").remove(),parentSelector.find(".spinner").attr("style","visibility:visible"),parentSelector.children(".spinner").addClass("show");var i=adsforwp_localize_data.ajax_url,n=jQuery(this).closest(".afw-placement-group").attr("data-id");jQuery.ajax({url:i,method:"POST",data:{action:"adsforwp_ajax_select_taxonomy",id:t,number:a,group_number:n,adsforwp_call_nonce:o},beforeSend:function(){},success:function(t){parentSelector.find(".afw-ajax-output-child").remove(),parentSelector.children(".spinner").removeClass("show"),parentSelector.find(".spinner").attr("style","visibility:hidden").hide(),parentSelector.append(t)},error:function(t){console.log("Failed Ajax Request"),console.log(t)}})}})}var adsforwpvisitorclone=function(){jQuery(".adsforwp-visitor-condition-row-clone").off("click").click(function(){var t=jQuery(this).closest(".adsforwp-visitor-condition-group").attr("data-id"),a=jQuery(document).find("#adsforwp_visitor_condition_html_template").html(),o=jQuery(this).parents("tbody").find("tr").length;a=(a=a.replace(/\[0\]/g,"["+o+"]")).replace(/\[group-0\]/g,"[group-"+t+"]"),jQuery(this).parents("tr").after(a),adsforwpvisitorremoveHtml(),adsforwpvisitorclone()})},adsforwpvisitorremoveHtml=function(){jQuery(".adsforwp-visitor-condition-row-delete").off("click").click(function(t){var a;1==jQuery(".adsforwp-visitor-condition-group").length?jQuery(this).parents("tbody").find("tr").length>1?jQuery(this).parents("tr").remove():(jQuery(this).parents(".adsforwp_visitor_condition_group").find(".adsforwp-visitor-condition-div").length<1?(jQuery('
User Targeting conditions to limit the number of users who can see your ad.
Enabling the option will make the ad float on content scroll, please Click Here for more info.
';break;case"afw_adsense_pointer":o=""+adsforwp_localize_data.adsense_pointer+"
";break;case"afw_media_net_pointer":o=""+adsforwp_localize_data.media_net_pointer+"
";break;case"afw_ad_now_pointer":o=""+adsforwp_localize_data.ad_now_pointer+"
";break;case"afw_revcontent_pointer":o=""+adsforwp_localize_data.revcontent_pointer+"
";break;case"afw_mgid_pointer":o=""+adsforwp_localize_data.mgid_pointer+"
";break;case"afw_contentad_pointer":o=""+adsforwp_localize_data.contentad_pointer+"
";break;case"afw_infolinks_pointer":o=""+adsforwp_localize_data.infolinks_pointer+"
";break;case"afw_ad_image_pointer":o=""+adsforwp_localize_data.ad_image_pointer+"
";break;case"afw_custom_pointer":o=""+adsforwp_localize_data.custom_pointer+"
";break;case"afw_doubleclick_pointer":o=""+adsforwp_localize_data.doubleclick_pointer+"
";break;case"afw_ad_background_pointer":o=""+adsforwp_localize_data.ad_background_pointer+"
";break;case"afw_ezoic_pointer":o=""+adsforwp_localize_data.ezoic_pointer+"
";break;case"afw_engageya_pointer":o=""+adsforwp_localize_data.engageya_pointer+"
";break;case"afw_mantis_pointer":o=""+adsforwp_localize_data.mantis_pointer+"
";break;case"afw_outbrain_pointer":o=""+adsforwp_localize_data.outbrain_pointer+"
";break;case"afw_mediavine_pointer":o=""+adsforwp_localize_data.mediavine_pointer+"
";break;case"afw_taboola_pointer":o=""+adsforwp_localize_data.taboola_pointer+"
"}adsforwp_pointer(t,o,a)}!function(t){t("#display-metabox,#adsforwp-location,#setexpiredate,#adsforwp_visitor_condition_metabox,#adsforwp_placement_metabox").show(),t("#select_adtype").trigger("change"),t("#adsense_type").trigger("change"),t("#wheretodisplay").trigger("change"),jQuery(".afw_display_pointer").attr("id","afw_adsforwp_ad_floating_pointer")}(jQuery),afw_amp_status=jQuery("#ads-for-wp_amp_compatibilty").val(),function(t){t("#select_adtype").change(function(){t(this).find("option:selected").each(function(){var a=t(this).attr("value");if(t(this).html().toLowerCase())switch(t(".afw-amp-support").addClass("afw_hide"),t(".afw-amp-support").addClass("afw_hide"),t(".afw-amp-support span").text(""),t("#afw-amp-status-display").text(afw_amp_status),t(".afw-amp-edit-post-status").show(),t("#ads-for-wp_amp_compatibilty").val(afw_amp_status),a){case"ad_background":t("#ad_background_image").attr("readonly",!0);break;case"ad_now":t(".afw-amp-support").removeClass("afw_hide"),t(".afw-amp-support span").text(adsforwp_localize_data.adnow_note),t("#afw-amp-status-display").text("disable"),t(".afw-amp-edit-post-status").hide(),t("#ads-for-wp_amp_compatibilty").val("disable");break;case"infolinks":t(".afw-amp-support").removeClass("afw_hide"),t(".afw-amp-support span").text(adsforwp_localize_data.infolinks_note),t("#afw-amp-status-display").text("disable"),t(".afw-amp-edit-post-status").hide(),t("#ads-for-wp_amp_compatibilty").val("disable");break;case"ad_image":t("#adsforwp_ad_image").attr("readonly",!0)}})}).change()}(jQuery),jQuery(document).ready(function(t){if(t(".adsforwp-upgrade-to-pro").parent().attr({href:"https://www.adsforwp.com/pricing/#pricings",target:"_blank"}),adsforwp_localize_data.do_tour){var a,o="Do you want the latest on Ads update before others and some best resources on monetization in a single email? - Free just for users of ADS!
",o+='",o+='