Merge pull request #235 from Freemius/develop

GDPR Compliance + Premium Theme Update Fix

assets/scss/admin/_gdpr-consent.scss

@@ -0,0 +1,81 @@
+#fs_marketing_optin
+{
+    display:     none;
+    margin-top:  10px;
+    border:      1px solid #ccc;
+    padding:     10px;
+    line-height: 1.5em;
+
+    .fs-message
+    {
+        display:       block;
+        margin-bottom: 5px;
+        font-size:     1.05em;
+        font-weight:   600;
+    }
+
+    &.error
+    {
+        border:     1px solid $fs-logo-magenta-color;
+        background: #fee;
+
+        .fs-message
+        {
+            color: $fs-logo-magenta-color;
+        }
+    }
+
+    .fs-input-container
+    {
+        margin-top: 5px;
+
+        label
+        {
+            margin-top: 5px;
+            display:    block;
+
+            input
+            {
+                float:  left;
+                margin: 1px 0 0 0;
+            }
+
+            &:first-child
+            {
+                display:       block;
+                margin-bottom: 2px;
+            }
+        }
+    }
+
+    .fs-input-label
+    {
+        display:     block;
+        margin-left: 20px;
+
+        .underlined
+        {
+            text-decoration: underline;
+        }
+    }
+}
+
+.rtl
+{
+    #fs_marketing_optin
+    {
+        .fs-input-container
+        {
+            label input
+            {
+                float: right;
+            }
+        }
+
+        .fs-input-label
+        {
+            margin-left:  0;
+            margin-right: 20px;
+        }
+    }
+}

assets/scss/admin/connect.scss

@@ -352,6 +352,7 @@ $form_width: 480px;
 
 @import "multisite-options";
 @import "tooltip";
+@import "gdpr-consent";
 
 .rtl
 {

assets/scss/admin/gdpr-optin-notice.scss

@@ -0,0 +1,17 @@
+.fs-notice[data-id^="gdpr_optin_actions"]
+{
+    .underlined {
+        text-decoration: underline;
+    }
+
+    ul {
+        .button, .action-description {
+            vertical-align: middle;
+        }
+
+        .action-description {
+            display: inline-block;
+            margin-left: 3px;
+        }
+    }
+}

config.php

@@ -248,6 +248,9 @@
     if ( ! defined( 'WP_FS__API_CACHE_OPTION_NAME' ) ) {
         define( 'WP_FS__API_CACHE_OPTION_NAME', WP_FS___OPTION_PREFIX . 'api_cache' );
     }
+    if ( ! defined( 'WP_FS__GDPR_OPTION_NAME' ) ) {
+        define( 'WP_FS__GDPR_OPTION_NAME', WP_FS___OPTION_PREFIX . 'gdpr' );
+    }
     define( 'WP_FS__OPTIONS_OPTION_NAME', WP_FS___OPTION_PREFIX . 'options' );
 
     /**
@@ -282,8 +285,11 @@
         define( 'WP_FS__TIME_10_MIN_IN_SEC', 600 );
     }
 //	define( 'WP_FS__TIME_15_MIN_IN_SEC', 900 );
+    if ( ! defined( 'WP_FS__TIME_12_HOURS_IN_SEC' ) ) {
+        define( 'WP_FS__TIME_12_HOURS_IN_SEC', 43200 );
+    }
     if ( ! defined( 'WP_FS__TIME_24_HOURS_IN_SEC' ) ) {
-        define( 'WP_FS__TIME_24_HOURS_IN_SEC', 86400 );
+        define( 'WP_FS__TIME_24_HOURS_IN_SEC', WP_FS__TIME_12_HOURS_IN_SEC * 2 );
     }
     if ( ! defined( 'WP_FS__TIME_WEEK_IN_SEC' ) ) {
         define( 'WP_FS__TIME_WEEK_IN_SEC', 7 * WP_FS__TIME_24_HOURS_IN_SEC );
@@ -375,4 +381,8 @@
         define( 'WP_FS__SHOW_NETWORK_EVEN_WHEN_DELEGATED', false );
     }
 
-    #endregion
+    #endregion
+
+    if ( ! defined( 'WP_FS__DEMO_MODE' ) ) {
+        define( 'WP_FS__DEMO_MODE', false );
+    }

includes/class-freemius-abstract.php

@@ -359,7 +359,7 @@ abstract function is_trial_utilized();
 		#----------------------------------------------------------------------------------
 
 		/**
-		 * Check if plugin using the free plan.
+		 * Check if the user is on the free plan of the product.
 		 *
 		 * @since 1.0.4
 		 *