Merge pull request #411 from ahmedkaludi/1.9.28

1.9.28

Author: developermustak

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.27
+Version: 1.9.28
 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.27' );
+	define( 'ADSFORWP_VERSION', '1.9.28' );
 }
 
 // define( 'ADSFORWP_ENVIRONMENT', 'DEV' );

output/functions.php

@@ -1156,15 +1156,17 @@ public function adsforwp_display_ads($content){
               $content = $ad_code.$content;
               break;
 
-             case 'between_the_content':      
-                 
+             case 'between_the_content':   
               if($adposition == 'number_of_paragraph'){
 
                 $entered_tag_name     = '';                
                 $display_tag_name     = '';  
                 $every_paragraphs     = 0;
+                // $every_paragraphs_before     = 0;
 
                 $every_paragraphs    = adsforwp_rmv_warnings($post_meta_dataset, 'ads_on_every_paragraphs_number', 'adsforwp_array');
+
+                // $every_paragraphs_before    = adsforwp_rmv_warnings($post_meta_dataset, 'ads_before_every_paragraphs_number', 'adsforwp_array');
 
                 $paragraph_id        = adsforwp_rmv_warnings($post_meta_dataset, 'paragraph_number', 'adsforwp_array');   
 
@@ -1248,7 +1250,13 @@ public function adsforwp_display_ads($content){
                                 $paragraph_id += $p_number;
                            }
 
-                       }else{
+                       }else if ( $every_paragraphs ==2) {
+                           if ( $paragraph_id == $index + $p_number) {
+                                $paragraphs[$index] = $ad_code.$paragraphs[$index];
+                                $paragraph_id += $p_number;
+                                
+                           }  
+                       } else{
 
                             if ( $paragraph_id == $index + 1 ) {
                                 $paragraphs[$index] .= $ad_code;
@@ -1377,6 +1385,8 @@ public function adsforwp_display_ads($content){
 
                 $every_paragraphs    = adsforwp_rmv_warnings($post_meta_dataset, 'ads_on_every_paragraphs_number', 'adsforwp_array');
 
+                // $every_paragraphs_before    = adsforwp_rmv_warnings($post_meta_dataset, 'ads_before_every_paragraphs_number', 'adsforwp_array');
+                
                 $paragraph_id        = adsforwp_rmv_warnings($post_meta_dataset, 'paragraph_number', 'adsforwp_array');   
 
                 $display_tag_name    = adsforwp_rmv_warnings($post_meta_dataset, 'display_tag_name', 'adsforwp_array');                                  
@@ -2994,7 +3004,10 @@ public function adsforwp_group_ads($atts, $group_id = null, $widget=null, $all_c
 
         $response['adsforwp_refresh_type']           = adsforwp_rmv_warnings($post_data, 'adsforwp_refresh_type', 'adsforwp_array');                
         $response['adsforwp_group_ref_interval_sec'] = adsforwp_rmv_warnings($post_data, 'adsforwp_group_ref_interval_sec', 'adsforwp_array');               
-        $response['adsforwp_group_type']             = adsforwp_rmv_warnings($post_data, 'adsforwp_group_type', 'adsforwp_array');
+        $response['adsforwp_group_type']             = adsforwp_rmv_warnings($post_data, 'adsforwp_group_type', 'adsforwp_array');  
+        $settings = adsforwp_defaultSettings();
+        $response['adsforwp_group_sponsorship_label_text'] = esc_html($settings['ad_sponsorship_label_text']);     
+        $response['adsforwp_group_hide_ad_label']   = adsforwp_rmv_warnings($post_data, 'adsforwp_hide_ad_label', 'adsforwp_array');
 
         $response['ads'] = $adsresultset;  
         if($response['adsforwp_refresh_type'] == 'on_interval'){

public/assets/css/adsforwp.css

@@ -294,9 +294,12 @@ Tooltip css ends here
 .adsforwp-general table td{
     padding: 8px 13px;
 }
+input#paragraph_number {
+    margin-bottom: 5px;
+}
 
 #ads_on_every_paragraphs_number{
-    margin-left: 20px !important;
+    margin-left: 0px !important;
     margin-right: 5px !important;        
 }
 a.adsforwp-advance-option-click:focus {