Changeset 2883876

Timestamp:

03/20/2023 11:03:33 PM (3 years ago)

Author:

skyminds

Message:

release Sky Login Redirect v3.6.9

Location:

sky-login-redirect/trunk

Files:

• freemius/includes/class-fs-api.php (modified) (2 diffs)
• freemius/includes/sdk/FreemiusWordPress.php (modified) (1 diff)
• freemius/start.php (modified) (1 diff)
• lib/css/slr.css (modified) (1 diff)
• lib/js/slr.js (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• sky-login-redirect.php (modified) (3 diffs)

sky-login-redirect/trunk/freemius/includes/class-fs-api.php

@@ -379 +379 @@
             }
 
-            return Freemius_Api_WordPress::RemoteRequest( $url, $remote_args );
+            if ( method_exists( 'Freemius_Api_WordPress', 'RemoteRequest' ) ) {
+                return Freemius_Api_WordPress::RemoteRequest( $url, $remote_args );
+            }
+
+            // The following is for backward compatibility when a modified PHP SDK version is in use and the `Freemius_Api_WordPress:RemoteRequest()` method doesn't exist.
+            $response = wp_remote_request( $url, $remote_args );
+
+            if (
+                empty( $response['headers'] ) ||
+                empty( $response['headers']['x-api-server'] )
+            ) {
+                // API is considered blocked if the response doesn't include the `x-api-server` header. When there's no error but this header doesn't exist, the response is usually not in the expected form (e.g., cannot be JSON-decoded).
+                $response = new WP_Error( 'api_blocked', htmlentities( $response['body'] ) );
+            }
+
+            return $response;
         }
 
@@ -463 +478 @@
             if ( $is_http ) {
                 Freemius_Api_WordPress::SetHttp();
-            } else {
+            } else if ( method_exists( 'Freemius_Api_WordPress', 'SetHttps' ) ) {
                 Freemius_Api_WordPress::SetHttps();
             }

sky-login-redirect/trunk/freemius/includes/sdk/FreemiusWordPress.php

@@ -575 +575 @@
         #----------------------------------------------------------------------------------
 
+        /**
+         * This method exists only for backward compatibility to prevent a fatal error from happening when called from an outdated piece of code.
+         *
+         * @param mixed $pPong
+         *
+         * @return bool
+         */
+        public static function Test( $pPong = null ) {
+            return (
+                is_object( $pPong ) &&
+                isset( $pPong->api ) &&
+                'pong' === $pPong->api
+            );
+        }
+
         /**
          * Ping API to test connectivity.

sky-login-redirect/trunk/freemius/start.php

@@ -16 +16 @@
      * @var string
      */
-    $this_sdk_version = '2.5.4.2';
+    $this_sdk_version = '2.5.5';
 
     #region SDK Selection Logic --------------------------------------------------------------------

sky-login-redirect/trunk/lib/css/slr.css

@@ -123 +123 @@
   border-style: solid;
   -webkit-appearance: none;
+  appearance: none;
   border-radius: 3px;
   white-space: nowrap;

sky-login-redirect/trunk/lib/js/slr.js

@@ +1 @@
+"use strict";
+
 jQuery(document).ready(function () {
 
@@ -44 +46 @@
     if (jQuery(".cf-complex__tabs--tabbed-vertical .cf-complex__inserter").length > 0) { jQuery('.more-rules').hide(); }
     else { jQuery('.more-rules').show(); }
-    document.querySelector('.cf-container-carbon_fields_container_sky_login_redirect button.cf-complex__inserter-button').textContent = 'Add rule';
+    var ruleBtn = document.querySelector('.cf-container-carbon_fields_container_sky_login_redirect button.cf-complex__inserter-button')
+    if (ruleBtn) {
+      ruleBtn.textContent = 'Add rule';
+    }
   }, 10);
 

sky-login-redirect/trunk/readme.txt

@@ -4 +4 @@
 Tags: login redirect, login customizer, login menu, woocommerce login, login, edd login, modal login, modal customizer
 Requires at least: 3.0
-Tested up to: 6.1.1
+Tested up to: 6.2.0
 Requires PHP: 7
-Stable tag: 3.6.8
+Stable tag: 3.6.9
 License: GPLv3 or later
 
@@ -62 +62 @@
 == Changelog ==
 
-= 3.6.8 - 2023-03-19 =
-*   Enhancement - improve tab spacing and legibility
-*   Enhancement - solve more PHP8 warnings
-*   Update - tested comptability with WC 7.5.0
+= 3.6.9 - 2023-03-20 =
+*   Enhancement - solve an undefined JS var
+*   Enhancement - only load assets on our plugin page
+*   Update - tested comptability with WP 6.2.0
 *   Update - FS library
-*   Update - CF library
 
 Older versions changes can be found in [the changelog](https://utopique.net/products/sky-login-redirect-premium/#changelog "Sky Login Redirect changelog")

sky-login-redirect/trunk/sky-login-redirect.php

@@ -5 +5 @@
  * Plugin URI: https://utopique.net/products/sky-login-redirect-premium/
  * Description: Redirects users to the page they were prior to logging in or out. Features an awesome login customizer.
- * Version: 3.6.8
+ * Version: 3.6.9
  * Author: Utopique
  * Author URI: https://utopique.net/
  * Developer: Utopique
  * Developer URI: https://utopique.net/
- * Copyright: (c) 2009-2022 Utopique
+ * Copyright: (c) 2009-2023 Utopique
  * Text Domain: sky-login-redirect
  * Domain Path: /languages
  * License: GPLv2 or later
  * Requires at least: 4.7
- * Tested up to: 6.1.1
+ * Tested up to: 6.2.0
  * Requires PHP: 7
  * WC requires at least: 3.3
@@ -36 +36 @@
 
 // current version
-define( 'SLR_VERSION', '3.6.8' );
+define( 'SLR_VERSION', '3.6.9' );
 /**
  * FS
@@ -602 +602 @@
         
         if ( in_array( $hook, $array ) ) {
-            wp_enqueue_style(
-                'utopique-elements',
-                plugins_url( 'lib/css/elements.css', __FILE__ ),
-                false,
-                SLR_VERSION,
-                'all'
-            );
-            wp_enqueue_style(
-                'slr',
-                plugins_url( 'lib/css/slr.css', __FILE__ ),
-                false,
-                SLR_VERSION,
-                'all'
-            );
-            wp_enqueue_script(
-                'slr-js',
-                plugins_url( 'lib/js/slr.js', __FILE__ ),
-                [ 'jquery' ],
-                SLR_VERSION,
-                true
-            );
-            wp_localize_script( 'slr-js', 'SLR', array(
-                'upgrade_url'      => Sky_Login_Redirect_fs()->get_upgrade_url(),
-                'pro_feature'      => __( 'unlock with Pro version', 'sky-login-redirect' ),
-                'business_feature' => __( 'unlock with Business version', 'sky-login-redirect' ),
-            ) );
-            // Codemirror editor
+            // Only on our plugin page
             
             if ( $hook === $array[0] ) {
+                wp_enqueue_style(
+                    'utopique-elements',
+                    plugins_url( 'lib/css/elements.css', __FILE__ ),
+                    false,
+                    SLR_VERSION,
+                    'all'
+                );
+                wp_enqueue_style(
+                    'slr',
+                    plugins_url( 'lib/css/slr.css', __FILE__ ),
+                    false,
+                    SLR_VERSION,
+                    'all'
+                );
+                wp_enqueue_script(
+                    'slr-js',
+                    plugins_url( 'lib/js/slr.js', __FILE__ ),
+                    [ 'jquery' ],
+                    SLR_VERSION,
+                    true
+                );
+                wp_localize_script( 'slr-js', 'SLR', array(
+                    'upgrade_url'      => Sky_Login_Redirect_fs()->get_upgrade_url(),
+                    'pro_feature'      => __( 'unlock with Pro version', 'sky-login-redirect' ),
+                    'business_feature' => __( 'unlock with Business version', 'sky-login-redirect' ),
+                ) );
+                // Codemirror editor
                 $cm_css['codeEditor'] = wp_enqueue_code_editor( [
                     'type' => 'text/css',