Merge pull request #405 from ahmedkaludi/1.9.27

1.9.27

Author: developermustak

admin/control-center.php

@@ -494,9 +494,9 @@ function adsforwp_send_query_message(){
         $sent = wp_mail($to, $subject, strip_tags($message), $headers);    
 
         if($sent){
-             echo wp_wp_json_encode(array('status'=>'t', 'msg'=> esc_html__('Request Submitted succeessfully..', 'ads-for-wp' )));            
+             echo wp_json_encode(array('status'=>'t', 'msg'=> esc_html__('Request Submitted succeessfully..', 'ads-for-wp' )));            
         }else{
-            echo wp_wp_json_encode(array('status'=>'f', 'msg'=> esc_html__('Something wrong with this request.', 'ads-for-wp' )));            
+            echo wp_json_encode(array('status'=>'f', 'msg'=> esc_html__('Something wrong with this request.', 'ads-for-wp' )));            
         }
 
         }
@@ -1149,13 +1149,15 @@ function adsforwp_browser_width_conditoinal($data){
                for($j=0;$j<count($visitor_conditions_array);$j++){
                   $conditions = $visitor_conditions_array['group-'.$j]['visitor_conditions'];
                   foreach($conditions as $key => $value){
-                     if(in_array('browser_width', $value)){
-                        if(count($conditions) > 1){
-                           $and_or_conditions[$post_ad_id]['and'][] = $conditions[$key];
-                        }else{
-                           $and_or_conditions[$post_ad_id]['or'][] = $conditions[$key];
-                        }
-                     }
+                    if(is_array($value)){
+                        if(in_array('browser_width', $value)){
+                            if(count($conditions) > 1){
+                               $and_or_conditions[$post_ad_id]['and'][] = $conditions[$key];
+                            }else{
+                               $and_or_conditions[$post_ad_id]['or'][] = $conditions[$key];
+                            }
+                         }
+                    }                     
                   }
                }
             }

ads-for-wp.php

@@ -3,7 +3,7 @@
 Plugin Name: Google Adsense & Banner Ads by AdsforWP
 Plugin URI: https://wordpress.org/plugins/ads-for-wp/
 Description: AdsforWP is an Google Ads & Banner ads plugin built for WordPress & AMP. Easy to Use, Unlimited Incontent Ads, Adsense, Premium Features and more
-Version: 1.9.26
+Version: 1.9.27
 Author: Magazine3
 Author URI: http://adsforwp.com/
 Donate link: https://www.paypal.me/Kaludi/25usd
@@ -20,7 +20,7 @@
 define('ADSFORWP_PLUGIN_BASENAME', plugin_basename(__FILE__));
 define( 'ADSFORWP_LIB_PATH', dirname( __FILE__ ) . '/admin/inc/' );
 if ( ! defined( 'ADSFORWP_VERSION' ) ) {
-	define( 'ADSFORWP_VERSION', '1.9.26' );
+	define( 'ADSFORWP_VERSION', '1.9.27' );
 }
 
 // define( 'ADSFORWP_ENVIRONMENT', 'DEV' );

output/functions.php

@@ -1604,13 +1604,18 @@ public function adsforwp_get_ad_code($post_ad_id, $type, $all_condition_status =
             if(empty($ad_rel_attr)){
                 $ad_rel_attr ='nofollow';
             }
+            $hideAdlabel = get_post_meta($post_ad_id, $key='adsforwp_hide_ad_label',true);
             if(isset($settings['ad_sponsorship_label']) && isset($settings['ad_sponsorship_label_text']) && $settings['ad_sponsorship_label_text'] !=''){
                 if($settings['ad_label_postion'] == 'above'){
-                    $sponsership_label = '<div style="font-size:10px;text-align:'.esc_attr($ad_alignment).';color:'.sanitize_hex_color($settings['ad_label_txt_color']).';">'.esc_html($settings['ad_sponsorship_label_text']).'</div>';
-                    $sponsership_label = apply_filters( 'adsforwp_adtext_above_ad', $sponsership_label );
+                   if($hideAdlabel == 0){
+                     $sponsership_label = '<div style="font-size:10px;text-align:'.esc_attr($ad_alignment).';color:'.sanitize_hex_color($settings['ad_label_txt_color']).';">'.esc_html($settings['ad_sponsorship_label_text']).'</div>';
+                     $sponsership_label = apply_filters( 'adsforwp_adtext_above_ad', $sponsership_label );
+                   }
                 }else{
+                     if($hideAdlabel == 0){
                     $ad_label_bottom = '<div style="font-size:10px;text-align:'.esc_attr($ad_alignment).';color:'.sanitize_hex_color($settings['ad_label_txt_color']).';">'.esc_html($settings['ad_sponsorship_label_text']).'</div>';
                     $ad_label_bottom = apply_filters( 'adsforwp_adtext_below_ad', $ad_label_bottom );
+                    }
                 }
 
             }
@@ -2759,7 +2764,7 @@ class="afw_ad_amp_'.esc_attr($post_ad_id).'"
              $amp_ads_id_json = json_encode($this->amp_ads_id);             
              set_transient('adsforwp_transient_amp_ids', $amp_ads_id_json); 
 
-            if (defined( 'ADSFORWP_PRO_VERSION' ) ) {                 
+            if (defined( 'ADSFORWP_PRO_VERSION' ) && isset( $settings['ad_fraud_protection'] ) && !empty($settings['ad_fraud_protection']) ) {               
                 if(adsforwp_click_fraud_on()){
                     return $ad_code;
                 }

public/assets/css/adsforwp.css

@@ -9,6 +9,7 @@ input[name=adsforwp_group_shortcode] {
     border: 0px;
     color: black;
 }
+input#adsforwp_query_email{ width: 36.2%;}
 .afw_input {
     width: 50%;
 }

public/assets/css/adsforwp.min.css

@@ -1559,8 +1559,7 @@ $(".adsforwp-feedback-notice-remindme").on("click", function(e){
                  }
         }
         if(!$('body').hasClass('adsforpremium-active')){
-            $('.edit-php.post-type-adsforwp .page-title-action, .edit-php.post-type-adsforwp-groups .page-title-action').after('<div id="redux-intro-text" class="adsforwppostpage"><a class="technical_support_btn_txt" href="https://www.adsforwp.com/contact/" target="_blank">Technical Support</a> <a class="premium_features_btn" href="https://www.adsforwp.com/pricing/#pricings" target="_blank">Upgrade to PREMIUM</a> </div>');
-            $(".edit-php.post-type-adsforwp .tablenav.top").css({"display": "inline-block"});     
+            $('.edit-php.post-type-adsforwp .page-title-action, .edit-php.post-type-adsforwp-groups .page-title-action').after('<div id="redux-intro-text" class="adsforwppostpage"><a class="technical_support_btn_txt" href="https://www.adsforwp.com/contact/" target="_blank">Technical Support</a> <a class="premium_features_btn" href="https://www.adsforwp.com/pricing/#pricings" target="_blank">Upgrade to PREMIUM</a> </div>');            
         }