Changeset 2857095

Timestamp:

01/30/2023 01:14:41 PM (3 years ago)

Author:

quentn

Message:

Fix: Learndash issue when new user is registered

Location:

quentn-wp/trunk

Files:

• admin/class-quentn-wp-admin.php (modified) (1 diff)
• includes/class-quentn-wp-elementor-integration.php (modified) (1 diff)
• includes/class-quentn-wp-learndash.php (modified) (2 diffs)
• includes/class-quentn-wp-page-restriction-meta-box.php (modified) (1 diff)
• includes/class-quentn-wp.php (modified) (1 diff)
• quentn-wp.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)

quentn-wp/trunk/admin/class-quentn-wp-admin.php

@@ -400 +400 @@
     public function register_custom_fields() {
 
+        $tab = ( !empty( $_GET['tab'] ) ) ? sanitize_key( $_GET['tab'] ) : '';
+
         $fields = array();
-        $fields[] = array(
-            'id'        => 'quentn_auto_login_redirect_url',
-            'title'     => __( 'Redirect URL', 'quentn-wp' ),
-            'callback'  => array( $this, 'field_quentn_auto_login_redirect_url' ),
-            'page'      => 'quentn-dashboard-auto-login',
-            'section'   => 'quentn_auto_login_option',
-        );
+        if ( $tab == 'quentn_settings' ) {
+            $fields[] = array(
+                'id' => 'quentn_auto_login_redirect_url',
+                'title' => __('Redirect URL', 'quentn-wp'),
+                'callback' => array($this, 'field_quentn_auto_login_redirect_url'),
+                'page' => 'quentn-dashboard-auto-login',
+                'section' => 'quentn_auto_login_option',
+            );
+        }
 
         //add tag fields for all wordpress roles
-        $wp_roles =  new WP_Roles;
-
-        $qntn_terms = $this->api_handler->get_terms();
-
-        //loop through all available roles of WP and set three options for each, add tag (bool), remove tag (bool), quentn tags (array)
-        //set enable/disable add user from wp to quentn
-        foreach ( $wp_roles->get_names() as $slug => $name ) {
-            $fields[] = array(
-                'id'        =>  'add_wp_user_'.$slug.'_to_quentn',
-                'title'     =>  translate_user_role( $name ),
-                'callback'  =>  array( $this, 'input_add_wp_user_to_quentn' ),
-                'page'      =>  'quentn-dashboard-tags',
-                'section'   =>  'quentn_tags_option',
-                'args'      =>  array( 'role' => $slug, 'role_title' => translate_user_role( $name ) )
-            );
-
-            //set quentn terms selection option
-            $fields [] = array(
-                'id'        => 'quentn_tags'.$slug,
-                'title'     => '',
-                'callback'  => array( $this, 'field_wp_role_quentn_tags' ),
-                'page'      => 'quentn-dashboard-tags',
-                'section'   => 'quentn_tags_option',
-                'args'      => array(
-                    'label_for' => __('Please Select Tags', 'quentn-wp'),
-                    'role'      => $slug,
-                    'terms'     => $qntn_terms,
-                )
-            );
-
-            //set enable/disable remove tags when user loses a role
-            $fields[] = array(
-                'id'        => 'delete_wp_user_'.$slug.'_from_quentn',
-                'title'     => '',
-                'callback'  => array( $this, 'input_delete_wp_user_to_quentn' ),
-                'page'      => 'quentn-dashboard-tags',
-                'section'   => 'quentn_tags_option',
-                'args'      => array( 'role' => $slug )
-            );
+        if ( $tab == 'quentn_tags_selection' ) {
+           
+            $wp_roles = new WP_Roles;
+
+            $qntn_terms = $this->api_handler->get_terms();
+
+            //loop through all available roles of WP and set three options for each, add tag (bool), remove tag (bool), quentn tags (array)
+            //set enable/disable add user from wp to quentn
+            foreach ( $wp_roles->get_names() as $slug => $name ) {
+                $fields[] = array(
+                    'id' => 'add_wp_user_' . $slug . '_to_quentn',
+                    'title' => translate_user_role( $name ),
+                    'callback' => array( $this, 'input_add_wp_user_to_quentn' ),
+                    'page' => 'quentn-dashboard-tags',
+                    'section' => 'quentn_tags_option',
+                    'args' => array( 'role' => $slug, 'role_title' => translate_user_role( $name ) )
+                );
+
+                //set quentn terms selection option
+                $fields [] = array(
+                    'id' => 'quentn_tags' . $slug,
+                    'title' => '',
+                    'callback' => array( $this, 'field_wp_role_quentn_tags' ),
+                    'page' => 'quentn-dashboard-tags',
+                    'section' => 'quentn_tags_option',
+                    'args' => array(
+                        'label_for' => __('Please Select Tags', 'quentn-wp'),
+                        'role' => $slug,
+                        'terms' => $qntn_terms,
+                    )
+                );
+
+                //set enable/disable remove tags when user loses a role
+                $fields[] = array(
+                    'id' => 'delete_wp_user_' . $slug . '_from_quentn',
+                    'title' => '',
+                    'callback' => array( $this, 'input_delete_wp_user_to_quentn' ),
+                    'page' => 'quentn-dashboard-tags',
+                    'section' => 'quentn_tags_option',
+                    'args' => array( 'role' => $slug )
+                );
+            }
         }
 

quentn-wp/trunk/includes/class-quentn-wp-elementor-integration.php

@@ -348 +348 @@
         $quentn_attach_contact_information = $record->get_form_settings( 'quentn_attach_contact_information' );
 
+        //add http as prefix if its not set in redirect_url
+        $parsed = parse_url( $quentn_default_redirect_url );
+        if ( empty( $parsed['scheme'] ) ) {
+            $quentn_default_redirect_url = 'http://' . ltrim( $quentn_default_redirect_url, '/' );
+        }
+
+        //add http as prefix if its not set in confirm redirect url
+        $parsed_confirmed_url = parse_url( $quentn_confirmed_redirect_url );
+        if ( empty( $parsed_confirmed_url['scheme'] ) ) {
+            $quentn_confirmed_redirect_url = 'http://' . ltrim( $quentn_confirmed_redirect_url, '/' );
+        }
+
         if( ! empty( $quentn_terms ) ) {
             $contact['terms'] = $quentn_terms;
         }
+
         $contact['request_ip'] = $_SERVER["REMOTE_ADDR"]; //add ip address and terms to subscriber data
         $request_data['contact'] = $contact;

quentn-wp/trunk/includes/class-quentn-wp-learndash.php

@@ -17 +17 @@
             add_action( 'add_user_to_blog', array( $this, 'quentn_learndash_courses' ) );
         } else {
-            add_action( 'user_register', array( $this, 'quentn_learndash_courses', 100, 2 ) );
+            add_action( 'user_register', array( $this, 'quentn_learndash_courses' ), 100 );
         }
 
@@ -24 +24 @@
 
         //update user lerandash courses
-        add_action( 'profile_update', array( $this, 'quentn_learndash_courses' ), 100, 2 );
+        add_action( 'profile_update', array( $this, 'quentn_learndash_courses' ), 100 );
 
         //remove learndash courses if user role is removed

quentn-wp/trunk/includes/class-quentn-wp-page-restriction-meta-box.php

@@ -295 +295 @@
             //if return url is not empty, then it must be valid
             if( $q_redirection_type != 'restricted_url' || ! filter_var( $q_redirect_url, FILTER_VALIDATE_URL ) ) {
+                //we are not stopping complete page to save if redirect url not valid. that's why we comment this code to avoid user confusion
                 //$q_redirect_url = '';
             }

quentn-wp/trunk/includes/class-quentn-wp.php

@@ -75 +75 @@
             $this->version = QUENTN_WP_VERSION;
         } else {
-            $this->version = '1.2.4';
+            $this->version = '1.2.5';
         }
         $this->plugin_name = 'quentn-wp';

quentn-wp/trunk/quentn-wp.php

@@ -17 +17 @@
  * Plugin URI:        https://docs.quentn.com/de/beta-quentn-wordpress-plugin/installieren-und-verbinden
  * Description:       This plugin allows you to restrict access to specific pages, create custom access links and create dynamic page countdowns. Optionally, you can connect your Quentn account to your WordPress installation to share contacts and manage access restrictions through Quentn.
- * Version:           1.2.4
+ * Version:           1.2.5
  * Author:            Quentn.com GmbH
  * Author URI:        https://quentn.com/
@@ -37 +37 @@
 define( "TABLE_QUENTN_RESTRICTIONS", 'qntn_restrictions' );
 define( "TABLE_QUENTN_USER_DATA", 'qntn_user_data' );
-define( 'QUENTN_WP_VERSION', '1.2.4' );
+define( 'QUENTN_WP_VERSION', '1.2.5' );
 
 /**

quentn-wp/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.6.0
 Tested up to: 6.1.1
-Stable tag: 1.2.4
+Stable tag: 1.2.5
 Requires PHP: 5.6.0
 License: GPLv2 or later
@@ -66 +66 @@
 
 == Changelog ==
+= 1.2.5 =
+* Fix: Learndash issue when new user is registered.
+
 = 1.2.4 =
 * Test with new wordpress ( 6.1.1 ), Elementor ( 3.9.0 ) and Elemnetor PRO ( 3.9.0 ) versions.
@@ -150 +153 @@
 == Upgrade Notice ==
 
+= 1.2.5 =
+Thanks for using Quentn Plugin! Please update the plugin to fix Learndash error when new user is registered.
+
 = 1.2.4 =
 Thanks for using Quentn Plugin! Please update the plugin. It is now tested with new wordpress ( 6.1.1 ), Elementor ( 3.9.0 ) and Elemnetor PRO ( 3.9.0 ) versions.