Merge pull request #38 from Codeinwp/development

Fixed issue with popup showing on the footer

Author: selul

README.txt

@@ -128,6 +128,10 @@ If you don't have any caching/minify plugin, it is mostly due to your theme whic
 
 == Changelog ==
 
+= 2.0.12 =
+
+* Fixed issue with modal showing on the footer
+
 = 2.0.11 =
 
 * Fixed upgrade issue which was recreating js and css files

adblock-notify-files.php

@@ -13,7 +13,7 @@
  * Generate random selector or file name
  ***************************************************************/
 function an_random_slug() {
-	$alphabet    = 'abcdefghijklmnopqrstuwxyzABCDEFGHIJKLMNOPQRSTUWXYZ0123456789';
+	$alphabet    = 'abcdefghijklmnopqrstuwxyzABCDEFGHIJKLMNOPQRSTUWXYZ';
 	$prefix      = array();
 	$alphaLength = strlen( $alphabet ) - 1;
 	for ( $i = 0; $i < 12; $i ++ ) {

adblock-notify-functions.php

@@ -383,6 +383,7 @@ function an_check_key( $key ) {
 		'adblocker_upgrade_200',
 		'adblocker_upgrade_205',
 		'adblocker_upgrade_2010',
+		'adblocker_upgrade_2012',
 	);
 
 	return in_array( $key, $all_keys );
@@ -540,3 +541,20 @@ function an_upgrade_routine_2010() {
 		}
 	}
 }
+
+add_action( 'an_upgrade_routine','an_upgrade_routine_2012' );
+
+/**
+ * Upgrade routine from version <= 2.0.12
+ */
+function an_upgrade_routine_2012() {
+	$upgrade = an_get_option( 'adblocker_upgrade_2012','no' );
+	if ( $upgrade != 'yes' ) {
+		$anTempDir = unserialize( an_get_option( 'adblocker_notify_selectors' ) );
+		if ( isset( $anTempDir['temp-path'] ) ) {
+			an_delete_temp_folder( $anTempDir['temp-path'] );
+			an_save_setting_random_selectors( true );
+			an_update_option( 'adblocker_upgrade_2012','yes' );
+		}
+	}
+}

adblock-notify.php

@@ -7,7 +7,7 @@
  * Plugin Name: Adblock Notify Lite
  * Plugin URI: http://themeisle.com/plugins/adblock-notify-lite/
  * Description: An Adblock detection and nofitication plugin with get around options and a lot of settings. Dashboard widget with adblock counter included!
- * Version: 2.0.11
+ * Version: 2.0.12
  * Author: Themeisle
  * Author URI: http://themeisle.com
  * Text Domain: an-translate
@@ -47,7 +47,7 @@
 	define( 'AN_COOKIE', 'anCookie' );
 }
 if ( ! defined( 'AN_VERSION' ) ) {
-	define( 'AN_VERSION', '2.0.11' );
+	define( 'AN_VERSION', '2.0.12' );
 }
 if ( ! defined( 'AN_TEMP_DEVELOPMENT' ) ) {
 	define( 'AN_TEMP_DEVELOPMENT', false );

css/an-style.css

@@ -2,7 +2,7 @@
 	an_style.css
 	AdBlock Notify
 	Copyright: (c) 2016 Themeisle, themeisle.com
-	Version: 2.0.11
+	Version: 2.0.12
 */
 .reveal-modal-bg {
 	display: none;

languages/an-translate.pot

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: Adblock Notify Lite 2.0.11\n"
 "Report-Msgid-Bugs-To: "
 "https://github.com/Codeinwp/adblock-notify-by-bweb/issues\n"
-"POT-Creation-Date: 2016-11-23 12:35:47+00:00\n"
+"POT-Creation-Date: 2016-12-06 04:17:40+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,19 +39,19 @@ msgid ""
 "change your uploads directory CHMOD."
 msgstr ""
 
-#: adblock-notify-functions.php:430
+#: adblock-notify-functions.php:431
 msgid "Show your love"
 msgstr ""
 
-#: adblock-notify-functions.php:433
+#: adblock-notify-functions.php:434
 msgid "Leave A Review"
 msgstr ""
 
-#: adblock-notify-functions.php:439
+#: adblock-notify-functions.php:440
 msgid "Buy now"
 msgstr ""
 
-#: adblock-notify-functions.php:442
+#: adblock-notify-functions.php:443
 msgid "Multi-Site Support"
 msgstr ""
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adblock-notify-by-bweb",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "Adblock Notify plugin",
   "repository": {
     "type": "git",