Merge pull request #40 from Codeinwp/development

Fixed reset stats error
Fixed icon menu 
Fixed dashboard widget showing for non-admins

Author: selul

README.txt

@@ -2,7 +2,7 @@
 Contributors: themeisle
 Tags:  adblock, page redirect, cookies, notify, modal box, dashboard widget, ads, notification, adBlocker, Responsive, plugin, popup, modal, jquery, ajax, free, advetissement, shortcode, images, image, CSS, lightbox
 Requires at least: 3.7
-Tested up to: 4.6.1
+Tested up to: 4.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -21,6 +21,7 @@ Adblock Notify is a very easy to use plugin with get around options and a lot of
 
 > **Time-saving features available in the Pro version:**
 >
+> * Up to 250k page views blocked by our plugin
 > * Supoort for multisite ( Setup in one place and use it across all network sites )
 > * Advance templating system for modal and easy to customize inside the themes
 > * Advance control for modal behaviour
@@ -128,6 +129,13 @@ If you don't have any caching/minify plugin, it is mostly due to your theme whic
 
 == Changelog ==
 
+= 2.1.0 =
+
+* Fixed reset stats issue.
+* Removed old menu icon.
+* Removed dashboard widget showing non-admins.
+* Added testimonials from plugin users.
+
 = 2.0.12 =
 
 * Fixed issue with modal showing on the footer

adblock-notify-files.php

@@ -73,7 +73,8 @@ function an_change_files_css_selectors( $flush, $tempFolderPath, $tempFolderURL,
 	}
 	// Create new dir and files
 	if ( $wp_filesystem->is_dir( $tempFolderPath ) ) {
-		array_map( 'unlink', glob( $tempFolderPath . '*.' . $fileExt ) );
+		$glob_files = glob( $tempFolderPath . '*.' . $fileExt );
+		array_map( 'unlink', is_array( $glob_files ) ? $glob_files : false );
 	} else {
 		$wp_filesystem->mkdir( $tempFolderPath );
 	}
@@ -101,7 +102,11 @@ function an_save_setting_random_selectors( $force = false ) {
 	}
 	$an_option = unserialize( an_get_option( 'adblocker_notify_options' ) );
 	$anScripts = unserialize( an_get_option( 'adblocker_notify_selectors' ) );
-	if ( true == $an_option['an_option_selectors'] || $force ) {
+	$selectors_option = isset( $an_option['an_option_selectors'] ) ? $an_option['an_option_selectors'] : true;
+	if ( true == $selectors_option || $force ) {
+		if ( ! isset( $an_option['an_option_flush'] ) ) {
+			$an_option['an_option_flush'] = false;
+		}
 		// Define new temp path
 		$uploadDir      = wp_upload_dir();
 		$tempDirName    = an_random_slug();
@@ -122,7 +127,7 @@ function an_save_setting_random_selectors( $force = false ) {
 		}
 		// Define new selectors
 		$newSelectors = array( an_random_slug(), an_random_slug(), an_random_slug() );
-		$flush = false;
+		$flush        = false;
 		if ( true == $an_option['an_option_flush'] || ! file_exists( $anScripts['temp-path'] ) || false == $anScripts['temp-path'] ) {
 			$flush = true;
 		}
@@ -178,14 +183,17 @@ function an_save_setting_random_selectors( $force = false ) {
 		);
 		an_update_option( 'adblocker_notify_selectors', serialize( $newFiles ) );
 		// remove option flush
+		if ( ! isset( $an_option['an_option_flush'] ) ) {
+			$an_option['an_option_flush'] = false;
+		}
 		$an_option['an_option_flush'] = false;
 		an_update_option( 'adblocker_notify_options', serialize( $an_option ) );
 	} else {
 		// Remove temp files
 		if ( isset( $anScripts['temp-path'] ) ) {
 			an_delete_temp_folder( $anScripts['temp-path'] );
 		}
-	}
+	}// End if().
 }
 
 add_action( 'tf_admin_options_saved_adblocker_notify', 'an_save_setting_random_selectors', 99 );
@@ -244,19 +252,19 @@ function an_update_titan_css_selectors( $an_option ) {
  ***************************************************************/
 function an_print_change_files_css_selectors( $an_option, $anScripts ) {
 	// Get AN style and script
-	$anCSS = AN_URL . 'css/an-style.css';
-	$anJS  = AN_URL . 'js/an-scripts.js';
+	$anCSS            = AN_URL . 'css/an-style.css';
+	$anJS             = AN_URL . 'js/an-scripts.js';
 	$newSelectors     = $anScripts['selectors'];
 	$defaultSelectors = array( 'an-Modal', 'reveal-modal', 'an-alternative' );
-	$tfStyle = '';
+	$tfStyle          = '';
 	$tfStyle .= $an_option->getOption( 'an_alternative_custom_css' );
 	$tfStyle .= $an_option->getOption( 'an_option_modal_custom_css' );
 	$anCSSFileContent = wp_remote_get( $anCSS );
 	$anCSSFileContent = wp_remote_retrieve_body( $anCSSFileContent );
 	$anCSSFileContent = str_replace( $defaultSelectors, $newSelectors, $anCSSFileContent . $tfStyle );
-	$anJSFileContent = wp_remote_get( $anJS );
-	$anJSFileContent = wp_remote_retrieve_body( $anJSFileContent );
-	$anJSFileContent = str_replace( $defaultSelectors, $newSelectors, $anJSFileContent );
+	$anJSFileContent  = wp_remote_get( $anJS );
+	$anJSFileContent  = wp_remote_retrieve_body( $anJSFileContent );
+	$anJSFileContent  = str_replace( $defaultSelectors, $newSelectors, $anJSFileContent );
 
 	return '    
             <style type="text/css">