Changeset 3218292

Timestamp:

01/07/2025 11:25:04 AM (14 months ago)

Author:

instawp

Message:

Update to version 0.1.0.75 from GitHub

Location:

instawp-connect

Files:

• tags/0.1.0.75 (copied) (copied from instawp-connect/trunk)
• tags/0.1.0.75/includes/apis/class-instawp-rest-api-manage.php (modified) (8 diffs)
• tags/0.1.0.75/includes/apis/class-instawp-rest-api.php (modified) (3 diffs)
• tags/0.1.0.75/includes/class-instawp-ajax.php (modified) (5 diffs)
• tags/0.1.0.75/includes/class-instawp-cli.php (modified) (2 diffs)
• tags/0.1.0.75/includes/class-instawp-tools.php (modified) (3 diffs)
• tags/0.1.0.75/instawp-connect.php (modified) (2 diffs)
• tags/0.1.0.75/migrate/templates/main.php (modified) (1 diff)
• tags/0.1.0.75/readme.txt (modified) (2 diffs)
• tags/0.1.0.75/uninstall.php (modified) (3 diffs)
• tags/0.1.0.75/vendor/composer/installed.json (modified) (2 diffs)
• tags/0.1.0.75/vendor/composer/installed.php (modified) (3 diffs)
• tags/0.1.0.75/vendor/instawp/connect-helpers/src/Helper.php (modified) (2 diffs)
• trunk/includes/apis/class-instawp-rest-api-manage.php (modified) (8 diffs)
• trunk/includes/apis/class-instawp-rest-api.php (modified) (3 diffs)
• trunk/includes/class-instawp-ajax.php (modified) (5 diffs)
• trunk/includes/class-instawp-cli.php (modified) (2 diffs)
• trunk/includes/class-instawp-tools.php (modified) (3 diffs)
• trunk/instawp-connect.php (modified) (2 diffs)
• trunk/migrate/templates/main.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/uninstall.php (modified) (3 diffs)
• trunk/vendor/composer/installed.json (modified) (2 diffs)
• trunk/vendor/composer/installed.php (modified) (3 diffs)
• trunk/vendor/instawp/connect-helpers/src/Helper.php (modified) (2 diffs)

instawp-connect/tags/0.1.0.75/includes/apis/class-instawp-rest-api-manage.php

@@ -58 +58 @@
 
         register_rest_route( $this->namespace . '/' . $this->version_2 . '/manage', '/auto-update', array(
-            array(
-                'methods'             => 'GET',
-                'callback'            => array( $this, 'get_auto_update' ),
-                'permission_callback' => '__return_true',
-            ),
-            array(
-                'methods'             => 'POST',
-                'callback'            => array( $this, 'set_auto_update' ),
-                'permission_callback' => '__return_true',
-            ),
-        ) );
+            array(
+                'methods'             => 'GET',
+                'callback'            => array( $this, 'get_auto_update' ),
+                'permission_callback' => '__return_true',
+            ),
+            array(
+                'methods'             => 'POST',
+                'callback'            => array( $this, 'set_auto_update' ),
+                'permission_callback' => '__return_true',
+            ),
+        ) );
 
         register_rest_route( $this->namespace . '/' . $this->version_2 . '/manage', '/configuration', array(
@@ -286 +286 @@
     }
 
-    /**
-     * Handle response to retrieve the defined constant values.
-     *
-     * @param WP_REST_Request $request
-     *
-     * @return WP_REST_Response
-     */
-    public function get_auto_update( WP_REST_Request $request ) {
-
-        $response = $this->validate_api_request( $request );
-        if ( is_wp_error( $response ) ) {
-            return $this->throw_error( $response );
-        }
-
-        try {
-            $wp_config = new Helpers\WPConfig( array(
-                'AUTOMATIC_UPDATER_DISABLED',
-                'WP_AUTO_UPDATE_CORE',
-            ), false, true );
-            $response  = $wp_config->get();
-        } catch ( \Exception $e ) {
-            $response = array(
-                'success' => false,
-                'message' => $e->getMessage(),
-            );
-        }
-
-        return $this->send_response( $response );
-    }
+    /**
+     * Handle response to retrieve the defined constant values.
+     *
+     * @param WP_REST_Request $request
+     *
+     * @return WP_REST_Response
+     */
+    public function get_auto_update( WP_REST_Request $request ) {
+
+        $response = $this->validate_api_request( $request );
+        if ( is_wp_error( $response ) ) {
+            return $this->throw_error( $response );
+        }
+
+        try {
+            $wp_config = new Helpers\WPConfig( array(
+                'AUTOMATIC_UPDATER_DISABLED',
+                'WP_AUTO_UPDATE_CORE',
+            ), false, true );
+            $response  = $wp_config->get();
+        } catch ( \Exception $e ) {
+            $response = array(
+                'success' => false,
+                'message' => $e->getMessage(),
+            );
+        }
+
+        return $this->send_response( $response );
+    }
 
     /**
@@ -334 +334 @@
         $plugin_theme = $request->get_param( 'plugin-theme' );
 
-        if ( ! empty( $wp_config ) ) {
-            try {
-                $wp_config     = new Helpers\WPConfig( array(
-                    'AUTOMATIC_UPDATER_DISABLED' => ! empty( $wp_config['updater_disabled'] ) ? $wp_config['updater_disabled'] : false,
-                    'WP_AUTO_UPDATE_CORE'        => ! empty( $wp_config['auto_update_core'] ) ? $wp_config['auto_update_core'] : false,
-                ) );
-                $response['wp-config'] = $wp_config->set();
-
-                wp_cache_flush();
-            } catch ( \Exception $e ) {
-                $response['wp-config'] = array(
-                    'success' => false,
-                    'message' => $e->getMessage(),
-                );
-            }
-        }
-
-        if ( ! empty( $plugin_theme ) ) {
-            foreach ( $plugin_theme as $key => $param ) {
-                $type  = isset( $param['type'] ) ? $param['type'] : 'plugin';
-                $asset = isset( $param['asset'] ) ? $param['asset'] : '';
-                $state = isset( $param['state'] ) ? $param['state'] : false;
-
-                if ( 'plugin' === $type ) {
-                    if ( ! function_exists( 'get_plugins' ) ) {
-                        require_once ABSPATH . 'wp-admin/includes/plugin.php';
-                    }
-
-                    $option = 'auto_update_plugins';
-
-                    /** This filter is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-                    $all_items = apply_filters( 'all_plugins', get_plugins() );
-                } elseif ( 'theme' === $type ) {
-                    if ( ! function_exists( 'wp_get_themes' ) ) {
-                        require_once ABSPATH . 'wp-includes/theme.php';
-                    }
-
-                    $option    = 'auto_update_themes';
-                    $all_items = wp_get_themes();
-                }
-
-                if ( ! isset( $option ) || ! isset( $all_items ) ) {
-                    $response['plugin-theme'][ $key ] = array(
-                        'success' => false,
-                        'message' => __( 'Invalid data. Unknown type.', 'instawp-connect' ),
-                    );
-                    continue;
-                }
-
-                if ( ! array_key_exists( $asset, $all_items ) ) {
-                    $response['plugin-theme'][ $key ] = array(
-                        'success' => false,
-                        'message' => __( 'Invalid data. The item does not exist.', 'instawp-connect' ),
-                    );
-                    continue;
-                }
-
-                $auto_updates = ( array ) get_site_option( $option, array() );
-
-                if ( false === $state ) {
-                    $auto_updates = array_diff( $auto_updates, array( $asset ) );
-                } else {
-                    $auto_updates[] = $asset;
-                    $auto_updates   = array_unique( $auto_updates );
-                }
-
-                // Remove items that have been deleted since the site option was last updated.
-                $auto_updates = array_intersect( $auto_updates, array_keys( $all_items ) );
-
-                update_site_option( $option, $auto_updates );
-
-                $response['plugin-theme'][ $key ] = array_merge( array(
-                    'success' => true,
-                ), $param );
-            }
-        }
+        if ( ! empty( $wp_config ) ) {
+            try {
+                $wp_config             = new Helpers\WPConfig( array(
+                    'AUTOMATIC_UPDATER_DISABLED' => ! empty( $wp_config['updater_disabled'] ) ? $wp_config['updater_disabled'] : false,
+                    'WP_AUTO_UPDATE_CORE'        => ! empty( $wp_config['auto_update_core'] ) ? $wp_config['auto_update_core'] : false,
+                ) );
+                $response['wp-config'] = $wp_config->set();
+
+                wp_cache_flush();
+            } catch ( \Exception $e ) {
+                $response['wp-config'] = array(
+                    'success' => false,
+                    'message' => $e->getMessage(),
+                );
+            }
+        }
+
+        if ( ! empty( $plugin_theme ) ) {
+            foreach ( $plugin_theme as $key => $param ) {
+                $type  = isset( $param['type'] ) ? $param['type'] : 'plugin';
+                $asset = isset( $param['asset'] ) ? $param['asset'] : '';
+                $state = isset( $param['state'] ) ? $param['state'] : false;
+
+                if ( 'plugin' === $type ) {
+                    if ( ! function_exists( 'get_plugins' ) ) {
+                        require_once ABSPATH . 'wp-admin/includes/plugin.php';
+                    }
+
+                    $option = 'auto_update_plugins';
+
+                    /** This filter is documented in wp-admin/includes/class-wp-plugins-list-table.php */
+                    $all_items = apply_filters( 'all_plugins', get_plugins() );
+                } elseif ( 'theme' === $type ) {
+                    if ( ! function_exists( 'wp_get_themes' ) ) {
+                        require_once ABSPATH . 'wp-includes/theme.php';
+                    }
+
+                    $option    = 'auto_update_themes';
+                    $all_items = wp_get_themes();
+                }
+
+                if ( ! isset( $option ) || ! isset( $all_items ) ) {
+                    $response['plugin-theme'][ $key ] = array(
+                        'success' => false,
+                        'message' => __( 'Invalid data. Unknown type.', 'instawp-connect' ),
+                    );
+                    continue;
+                }
+
+                if ( ! array_key_exists( $asset, $all_items ) ) {
+                    $response['plugin-theme'][ $key ] = array(
+                        'success' => false,
+                        'message' => __( 'Invalid data. The item does not exist.', 'instawp-connect' ),
+                    );
+                    continue;
+                }
+
+                $auto_updates = ( array ) get_site_option( $option, array() );
+
+                if ( false === $state ) {
+                    $auto_updates = array_diff( $auto_updates, array( $asset ) );
+                } else {
+                    $auto_updates[] = $asset;
+                    $auto_updates   = array_unique( $auto_updates );
+                }
+
+                // Remove items that have been deleted since the site option was last updated.
+                $auto_updates = array_intersect( $auto_updates, array_keys( $all_items ) );
+
+                update_site_option( $option, $auto_updates );
+
+                $response['plugin-theme'][ $key ] = array_merge( array(
+                    'success' => true,
+                ), $param );
+            }
+        }
 
         return $this->send_response( $response );
@@ -428 +428 @@
         }
 
-        try {
-            $wp_config_params = $request->get_param( 'wp-config' );
-            $params           = ! is_array( $wp_config_params ) ? array() : $wp_config_params;
-
-            $wp_config = new Helpers\WPConfig( $params );
-            $response  = $wp_config->get();
-        } catch ( \Exception $e ) {
-            $response = array(
-                'success' => false,
-                'message' => $e->getMessage(),
-            );
-        }
+        try {
+            $wp_config_params = $request->get_param( 'wp-config' );
+            $params           = ! is_array( $wp_config_params ) ? array() : $wp_config_params;
+
+            $wp_config = new Helpers\WPConfig( $params );
+            $response  = $wp_config->get();
+        } catch ( \Exception $e ) {
+            $response = array(
+                'success' => false,
+                'message' => $e->getMessage(),
+            );
+        }
 
         return $this->send_response( $response );
@@ -461 +461 @@
         $params           = ! is_array( $wp_config_params ) ? array() : $wp_config_params;
 
-        try {
-            $wp_config = new Helpers\WPConfig( $params );
-            $response  = $wp_config->set();
-
-            wp_cache_flush();
-        } catch ( \Exception $e ) {
-            $response = array(
-                'success' => false,
-                'message' => $e->getMessage(),
-            );
-        }
+        try {
+            $wp_config = new Helpers\WPConfig( $params );
+            $response  = $wp_config->set();
+
+            wp_cache_flush();
+        } catch ( \Exception $e ) {
+            $response = array(
+                'success' => false,
+                'message' => $e->getMessage(),
+            );
+        }
 
         return $this->send_response( $response );
@@ -493 +493 @@
         $params           = ! is_array( $wp_config_params ) ? array() : $wp_config_params;
 
-        try {
-            $wp_config = new Helpers\WPConfig( $params );
-            $response  = $wp_config->delete();
-
-            wp_cache_flush();
-        } catch ( \Exception $e ) {
-            $response = array(
-                'success' => false,
-                'message' => $e->getMessage(),
-            );
-        }
+        try {
+            $wp_config = new Helpers\WPConfig( $params );
+            $response  = $wp_config->delete();
+
+            wp_cache_flush();
+        } catch ( \Exception $e ) {
+            $response = array(
+                'success' => false,
+                'message' => $e->getMessage(),
+            );
+        }
 
         return $this->send_response( $response );
@@ -525 +525 @@
         $params = $this->filter_params( $request );
 
-        if ( username_exists( $params['user_login'] ) ) {
-            return $this->send_response( array(
-                'success' => false,
-                'message' => 'Username is already in use!',
-            ) );
-        }
-
-        if ( email_exists( $params['user_email'] ) ) {
-            return $this->send_response( array(
-                'success' => false,
-                'message' => 'Email is already in use!',
-            ) );
-        }
+        if ( username_exists( $params['user_login'] ) ) {
+            return $this->send_response( array(
+                'success' => false,
+                'message' => 'Username is already in use!',
+            ) );
+        }
+
+        if ( email_exists( $params['user_email'] ) ) {
+            return $this->send_response( array(
+                'success' => false,
+                'message' => 'Email is already in use!',
+            ) );
+        }
 
         if ( ! function_exists( 'wp_insert_user' ) ) {
@@ -551 +551 @@
         }
 
-        $count_users  = count_users();
-        $users        = $count_users['total_users'];
+        $count_users = count_users();
+        $total_users = $count_users['total_users'];
 
         return $this->send_response( array(
             'success' => true,
-            'count' => $users,
+            'count'   => $total_users,
         ) );
     }

instawp-connect/tags/0.1.0.75/includes/apis/class-instawp-rest-api.php

@@ -138 +138 @@
         $api_key              = isset( $parameters['api_key'] ) ? sanitize_text_field( $parameters['api_key'] ) : '';
         $api_domain           = isset( $parameters['api_domain'] ) ? sanitize_text_field( $parameters['api_domain'] ) : '';
+        $plan_id              = isset( $parameters['advance_connect_plan_id'] ) ? intval( $parameters['advance_connect_plan_id'] ) : 0;
         $api_domain           = rtrim( $api_domain, '/' );
 
@@ -219 +220 @@
         // If api_domain is passed then, set it
         if ( ! empty( $api_domain ) ) {
-            if ( defined( 'INSTAWP_API_DOMAIN' ) ) {
-                Helper::set_api_domain( INSTAWP_API_DOMAIN );
-            } elseif ( in_array( $api_domain, array( 'https://stage.instawp.io', 'https://app.instawp.io' ) ) ) {
-                $api_domain = rtrim( $api_domain, '/' );
-                Helper::set_api_domain( $api_domain );
-            } else {
+            // Use constant if defined, otherwise validate allowed domains
+            $domain_to_set = defined( 'INSTAWP_API_DOMAIN' ) 
+                ? INSTAWP_API_DOMAIN
+                : ( in_array( $api_domain, array( 'https://stage.instawp.io', 'https://app.instawp.io' ) ) ? $api_domain : '' );
+                
+            if ( empty( $domain_to_set ) ) {
                 return $this->send_response( array(
                     'status'  => false,
@@ -230 +231 @@
                 ) );
             }
+            
+            Helper::set_api_domain( $domain_to_set );
+        }
+
+        if ( ! empty( $plan_id ) ) {
+            Option::update_option( 'instawp_connect_plan_id', $plan_id );
         }
 

instawp-connect/tags/0.1.0.75/includes/class-instawp-ajax.php

@@ -4 +4 @@
 use InstaWP\Connect\Helpers\Curl;
 use InstaWP\Connect\Helpers\DatabaseManager;
-use InstaWP\Connect\Helpers\FileManager;
 use InstaWP\Connect\Helpers\Helper;
 use InstaWP\Connect\Helpers\Option;
@@ -33 +32 @@
 
         if ( ! current_user_can( 'manage_options' ) ) {
-            wp_send_json_error( array( 'updated' => false, 'permission' => false ) );
+            wp_send_json_error( array(
+                'updated'    => false,
+                'permission' => false,
+            ) );
         }
 
@@ -45 +47 @@
 
         if ( isset( $response[ INSTAWP_PLUGIN_FILE ] ) && isset( $response[ INSTAWP_PLUGIN_FILE ]['success'] ) && (bool) $response[ INSTAWP_PLUGIN_FILE ]['success'] === true ) {
-            wp_send_json_success( array( 'updated' => true, 'response' => $response ) );
-        }
-
-        wp_send_json_error( array( 'updated' => false, 'response' => $response ) );
+            wp_send_json_success( array(
+                'updated'  => true,
+                'response' => $response,
+            ) );
+        }
+
+        wp_send_json_error( array(
+            'updated'  => false,
+            'response' => $response,
+        ) );
     }
 
@@ -521 +529 @@
 
                 if ( in_array( $data['full_path'], array( $theme_path, $template_path, $themes_dir, $themes_dir . '/index.php' ) )
-                     || strpos( $data['full_path'], $theme_path ) !== false
-                     || strpos( $data['full_path'], $template_path ) !== false ) {
+                    || strpos( $data['full_path'], $theme_path ) !== false
+                    || strpos( $data['full_path'], $template_path ) !== false ) {
 
                     $theme_item_checked = false;
@@ -534 +542 @@
 
                 if ( in_array( $data['full_path'], array( wp_normalize_path( WP_PLUGIN_DIR ), wp_normalize_path( WP_PLUGIN_DIR ) . '/index.php' ) )
-                     || in_array( basename( $data['relative_path'] ), array_map( 'dirname', $active_plugins ) ) ) {
+                    || in_array( basename( $data['relative_path'] ), array_map( 'dirname', $active_plugins ) ) ) {
 
                     $plugin_item_checked = false;

instawp-connect/tags/0.1.0.75/includes/class-instawp-cli.php

@@ -8 +8 @@
 use InstaWP\Connect\Helpers\WPConfig;
 use InstaWP\Connect\Helpers\Option;
+use InstaWP\Connect\Helpers\WPScanner;
 
 if ( ! class_exists( 'INSTAWP_CLI_Commands' ) ) {
@@ -123 +124 @@
          */
         public function handle_instawp_commands( $args, $assoc_args ) {
-            if ( isset( $args[0] ) && $args[0] === 'local' ) {
-                if ( isset( $args[1] ) && $args[1] === 'push' ) {
-                    $this->cli_local_push();
-                }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'set-waas-mode' ) {
-                if ( isset( $args[1] ) ) {
+            if ( empty( $args[0] ) ) {
+                return false;
+            }
+        
+            $command    = $args[0];
+            $subcommand = isset( $args[1] ) ? $args[1] : '';
+
+            // Command handler mapping
+            $commands = array(
+                'local'                => array(
+                    'push' => function() { // wp instawp local push
+                        $this->cli_local_push();
+                    },
+                ),
+                'set-waas-mode'        => function( $args ) { // wp instawp set-waas-mode https://instawp.com
+                    if ( empty( $args[0] ) ) {
+                        WP_CLI::error( 'WaaS URL is required' );
+                        return false;
+                    }
+
                     try {
                         $wp_config = new WPConfig( array(
                             'INSTAWP_CONNECT_MODE'     => 'WAAS_GO_LIVE',
-                            'INSTAWP_CONNECT_WAAS_URL' => $args[1],
+                            'INSTAWP_CONNECT_WAAS_URL' => $args[0],
                         ) );
                         $wp_config->set();
                     } catch ( \Exception $e ) {
                         WP_CLI::error( $e->getMessage() );
-
-                        return false;
-                    }
+                        return false;
+                    }
+                },
+                'reset-waas-mode'      => function() { // wp instawp reset-waas-mode
+                    try {
+                        $wp_config = new WPConfig( array( 'INSTAWP_CONNECT_MODE', 'INSTAWP_CONNECT_WAAS_URL' ) );
+                        $wp_config->delete();
+                    } catch ( \Exception $e ) {
+                        WP_CLI::error( $e->getMessage() );
+                        return false;
+                    }
+                },
+                'config-set'           => array(
+                    'api-key'    => function( $args, $assoc_args ) { // wp instawp config-set api-key 1234567890
+                        if ( empty( $args[0] ) ) {
+                            WP_CLI::error( 'API key value is required' );
+                            return false;
+                        }
+
+                        $jwt     = ! empty( $assoc_args['jwt'] ) ? $assoc_args['jwt'] : '';
+                        $managed = ! isset( $assoc_args['unmanaged'] );
+
+                        Helper::generate_api_key( $args[0], $jwt, $managed );
+
+                        if ( isset( $args[1] ) ) {
+                            $this->set_connect_mode( $args[1] );
+                        }
+                    },
+                    'api-domain' => function( $args ) { // wp instawp config-set api-domain https://instawp.com
+                        if ( empty( $args[0] ) ) {
+                            WP_CLI::error( 'API domain value is required' );
+                            return false;
+                        }
+                        Helper::set_api_domain( $args[0] );
+
+                        if ( isset( $args[1] ) ) {
+                            $this->set_connect_mode( $args[1] );
+                        }
+                    },
+                ),
+                'config-remove'        => function() { // wp instawp config-remove
+                    $option = new Option();
+                    $option->delete( array( 'instawp_api_options', 'instawp_connect_id_options' ) );
+                },
+                'hard-reset'           => function( $args, $assoc_args ) { // wp instawp hard-reset
+                    instawp_reset_running_migration( 'hard', false );
+
+                    if ( isset( $assoc_args['clear-events'] ) ) {
+                        instawp_delete_sync_entries();
+                    }
+                },
+                'clear-events'         => function() { // wp instawp clear-events
+                    instawp_delete_sync_entries();
+                },
+                'activate-plan'        => function( $args ) { // wp instawp activate-plan 123
+                    $plan_id = isset( $args[0] ) ? intval( $args[0] ) : 0;
+                    if ( empty( $plan_id ) ) {
+                        WP_CLI::error( __( 'Plan ID is required', 'instawp-connect' ) );
+                        return false;
+                    }
+
+                    $response = instawp_connect_activate_plan( $plan_id );
+                    if ( ! $response['success'] ) {
+                        WP_CLI::error( $response['message'] );
+                        return false;
+                    }
+                },
+                'refresh-staging-list' => function() { // wp instawp refresh-staging-list
+                    instawp_set_staging_sites_list();
+                },
+                'staging-set'          => function( $args ) { // wp instawp staging-set 123
+                    if ( empty( $args[0] ) ) {
+                        WP_CLI::error( __( 'Staging ID is required', 'instawp-connect' ) );
+                        return false;
+                    }
+                    Option::update_option( 'instawp_sync_connect_id', intval( $args[0] ) );
+                    Option::update_option( 'instawp_is_staging', true );
+
+                    instawp_get_source_site_detail();
+                },
+                'reset'                => array(
+                    'staging' => function() { // wp instawp reset staging
+                        delete_option( 'instawp_sync_connect_id' );
+                        delete_option( 'instawp_is_staging' );
+
+                        instawp_reset_running_migration();
+                    },
+                ),
+                'scan'                 => array(
+                    'summary'   => function() { // wp instawp scan summary
+                        $this->handle_scan_summary();
+                    },
+                    'slow-item' => function() { // wp instawp scan slow-item
+                        $this->handle_scan_slow_items();
+                    },
+                ),
+            );
+        
+            // Execute command if it exists
+            if ( isset( $commands[ $command ] ) ) {
+                unset( $args[0] );
+                $args = array_values( $args );
+                
+                if ( is_array( $commands[ $command ] ) && isset( $commands[ $command ][ $subcommand ] ) && is_callable( $commands[ $command ][ $subcommand ] ) ) {
+                    unset( $args[0] );
+                    $args = array_values( $args );
+
+                    return $commands[ $command ][ $subcommand ]( $args, $assoc_args ) !== false;
+                } elseif ( is_callable( $commands[ $command ] ) ) {
+                    return $commands[ $command ]( $args, $assoc_args ) !== false;
                 }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'reset-waas-mode' ) {
-                try {
-                    $wp_config = new WPConfig( array( 'INSTAWP_CONNECT_MODE', 'INSTAWP_CONNECT_WAAS_URL' ) );
-                    $wp_config->delete();
-                } catch ( \Exception $e ) {
-                    WP_CLI::error( $e->getMessage() );
-
-                    return false;
+            }
+        
+            return false;
+        }
+
+        // Set connect mode
+        private function set_connect_mode( $data ) {
+            try {
+                $payload = json_decode( base64_decode( $data ), true );
+                if ( json_last_error() !== JSON_ERROR_NONE ) {
+                    throw new \Exception( 'Invalid payload format' );
                 }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'config-set' ) {
-                if ( isset( $args[1] ) ) {
-                    if ( $args[1] === 'api-key' ) {
-                        Helper::instawp_generate_api_key( $args[2] );
-                    } elseif ( $args[1] === 'api-domain' ) {
-                        Helper::set_api_domain( $args[2] );
-                    }
+    
+                if ( ! empty( $payload['mode']['name'] ) ) {
+                    $wp_config = new WPConfig( array( 'INSTAWP_CONNECT_MODE' => $payload['mode']['name'] ) );
+                    $wp_config->set();
+                    
+                    WP_CLI::success( 'Mode configuration updated successfully' );
                 }
-
-                if ( isset( $args[3] ) ) {
-                    $payload_decoded = base64_decode( $args[3] ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_decode
-                    $payload         = json_decode( $payload_decoded, true );
-
-                    if ( isset( $payload['mode'] ) ) {
-                        if ( isset( $payload['mode']['name'] ) ) {
-                            try {
-                                $wp_config = new WPConfig( array( 'INSTAWP_CONNECT_MODE' => $payload['mode']['name'] ) );
-                                $wp_config->set();
-                            } catch ( \Exception $e ) {
-                                WP_CLI::error( $e->getMessage() );
-
-                                return false;
-                            }
-                        }
-                    }
-                }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'config-remove' ) {
-                $option = new \InstaWP\Connect\Helpers\Option();
-                $option->delete( array( 'instawp_api_options', 'instawp_connect_id_options' ) );
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'hard-reset' ) {
-                instawp_reset_running_migration( 'hard', false );
-
-                if ( ! empty( $assoc_args['clear-events'] ) ) {
-                    instawp_delete_sync_entries();
-                }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'clear-events' ) {
-                instawp_delete_sync_entries();
-
-                return true;
-            }
-
-
-            if ( isset( $args[0] ) && $args[0] === 'activate-plan' ) {
-                $plan_id = isset( $args[1] ) ? intval( $args[1] ) : 0;
-                if ( ! $plan_id ) {
-                    WP_CLI::error( esc_html__( 'Plan ID is required', 'instawp-connect' ) );
-
-                    return false;
-                }
-
-                $response = instawp_connect_activate_plan( $plan_id );
-                if ( ! $response['success'] ) {
-                    WP_CLI::error( $response['message'] );
-
-                    return false;
-                }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'refresh-staging-list' ) {
-                instawp_set_staging_sites_list();
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'staging-set' && ! empty( $args[1] ) ) {
-                Option::update_option( 'instawp_sync_connect_id', intval( $args[1] ) );
-                Option::update_option( 'instawp_is_staging', true );
-                instawp_get_source_site_detail();
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'reset' ) {
-                if ( isset( $args[1] ) && $args[1] === 'staging' ) {
-                    delete_option( 'instawp_sync_connect_id' );
-                    delete_option( 'instawp_is_staging' );
-                    instawp_reset_running_migration();
-                }
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'scan' ) {
-                if ( isset( $args[1] ) && $args[1] === 'summary' ) {
-                    $wp_scanner  = new \InstaWP\Connect\Helpers\WPScanner();
-                    $summary_res = $wp_scanner->scan_summary();
-
-                    if ( is_wp_error( $summary_res ) ) {
-                        WP_CLI::error( $summary_res->get_error_message() );
-
-                        return false;
-                    }
-
-                    if ( ! is_array( $summary_res ) ) {
-                        WP_CLI::error( esc_html__( 'Failed: Could not create performance summary.', 'instawp-connect' ) );
-
-                        return false;
-                    }
-
-                    WP_CLI::success( esc_html__( 'Performance Summary of this website is given below:', 'instawp-connect' ) );
-
-                    $this->render_cli_from_array( $summary_res );
-                }
-
-                if ( isset( $args[1] ) && $args[1] === 'slow-item' ) {
-                    $wp_scanner = new \InstaWP\Connect\Helpers\WPScanner();
-                    $slow_items = $wp_scanner->scan_slow_items();
-
-                    if ( is_wp_error( $slow_items ) ) {
-                        WP_CLI::error( $slow_items->get_error_message() );
-
-                        return false;
-                    }
-
-                    if ( ! is_array( $slow_items ) ) {
-                        WP_CLI::error( esc_html__( 'Failed: Could not calculate slow items.', 'instawp-connect' ) );
-
-                        return false;
-                    }
-
-                    $slow_items_table = array();
-                    $counter          = 0;
-                    $fields           = array( 'ID', 'Name', 'Type', 'Time Taken' );
-
-                    foreach ( $slow_items as $slow_item ) {
-                        ++ $counter;
-                        $slow_items_table[] = array(
-                            'ID'         => $counter,
-                            'Name'       => $slow_item[2],
-                            'Type'       => $slow_item[3],
-                            'Time Taken' => $slow_item[1],
-                        );
-                    }
-
-                    WP_CLI::success( esc_html__( 'Slow items of this website are given below: (Top is the slowest one)', 'instawp-connect' ) );
-
-                    WP_CLI\Utils\format_items( 'table', $slow_items_table, $fields );
-                }
-            }
-
-            return true;
+            } catch ( \Exception $e ) {
+                WP_CLI::error( 'Failed to configure mode: ' . $e->getMessage() );
+                return false;
+            }
+        }
+        
+        // Helper methods for scan functionality
+        private function handle_scan_summary() {
+            $wp_scanner = new WPScanner();
+            $summary_res = $wp_scanner->scan_summary();
+        
+            if ( is_wp_error($summary_res) ) {
+                WP_CLI::error($summary_res->get_error_message());
+                return false;
+            }
+        
+            if ( ! is_array($summary_res) ) {
+                WP_CLI::error(__('Failed: Could not create performance summary.', 'instawp-connect'));
+                return false;
+            }
+        
+            WP_CLI::success(__('Performance Summary of this website is given below:', 'instawp-connect'));
+            $this->render_cli_from_array($summary_res);
+        }
+        
+        private function handle_scan_slow_items() {
+            $wp_scanner = new WPScanner();
+            $slow_items = $wp_scanner->scan_slow_items();
+        
+            if ( is_wp_error( $slow_items ) || ! is_array( $slow_items ) ) {
+                WP_CLI::error( __( 'Failed: Could not calculate slow items.', 'instawp-connect' ) );
+                return false;
+            }
+        
+            $slow_items_table = array_map( function( $item, $index ) {
+                return array(
+                    'ID'         => $index + 1,
+                    'Name'       => $item[2],
+                    'Type'       => $item[3],
+                    'Time Taken' => $item[1],
+                );
+            }, $slow_items, array_keys( $slow_items ) );
+        
+            WP_CLI::success( __( 'Slow items of this website are given below: (Top is the slowest one)', 'instawp-connect' ) );
+            WP_CLI\Utils\format_items( 'table', $slow_items_table, array( 'ID', 'Name', 'Type', 'Time Taken' ) );
         }
 

instawp-connect/tags/0.1.0.75/includes/class-instawp-tools.php

@@ -358 +358 @@
             $migrate_settings['excluded_paths'][] = 'wp-includes';
             $migrate_settings['excluded_paths'][] = 'wp-cli.yml';
-//          $migrate_settings['excluded_paths'][] = 'index.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-load.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-activate.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-blog-header.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-comments-post.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-config-sample.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-cron.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-links-opml.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-login.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-mail.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-settings.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-signup.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-trackback.php';
+//          $migrate_settings['excluded_paths'][] = 'index.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-load.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-activate.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-blog-header.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-comments-post.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-config-sample.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-cron.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-links-opml.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-login.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-mail.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-settings.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-signup.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-trackback.php';
             $migrate_settings['excluded_paths'][] = 'xmlrpc.php';
             $migrate_settings['excluded_paths'][] = '.ftpquota';
@@ -379 +379 @@
             $migrate_settings['excluded_paths'][] = 'robots.txt';
 
-//          if ( empty( $migrate_settings['mode'] ) || 'pull' == $migrate_settings['mode'] ) {
-//              $migrate_settings['excluded_paths'][] = $wp_root_dir . '/wp-config.php';
-//          }
+//          if ( empty( $migrate_settings['mode'] ) || 'pull' == $migrate_settings['mode'] ) {
+//              $migrate_settings['excluded_paths'][] = $wp_root_dir . '/wp-config.php';
+//          }
         }
 
@@ -1053 +1053 @@
         $excluded_tables_rows = Helper::get_args_option( 'excluded_tables_rows', $migrate_settings, array() );
 
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_api_options';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_connect_id_options';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_sync_parent_connect_data';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_migration_details';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_last_migration_details';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_api_key_config_completed';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_is_event_syncing';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_staging_sites';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_is_staging';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:schema-ActionScheduler_StoreSchema';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:schema-ActionScheduler_LoggerSchema';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:action_scheduler_hybrid_store_demarkation';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:_transient_timeout_action_scheduler_last_pastdue_actions_check';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:_transient_action_scheduler_last_pastdue_actions_check';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_api_options';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_connect_id_options';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_sync_parent_connect_data';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_migration_details';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_last_migration_details';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_api_key_config_completed';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_is_event_syncing';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_staging_sites';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_is_staging';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:schema-ActionScheduler_StoreSchema';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:schema-ActionScheduler_LoggerSchema';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:action_scheduler_hybrid_store_demarkation';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:_transient_timeout_action_scheduler_last_pastdue_actions_check';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:_transient_action_scheduler_last_pastdue_actions_check';
 
         $migrate_settings['excluded_tables_rows'] = $excluded_tables_rows;
 
+        $migrate_settings['source_ip_address'] = self::get_user_ip_address();
+
         return self::process_migration_settings( $migrate_settings );
+    }
+
+    public static function get_user_ip_address() {
+        // Check for IPv6 and IPv4 validation
+        $ip_pattern = '/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^(?:(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(?::[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:(?:(?::[0-9a-fA-F]{1,4}){1,6})|:(?:(?::[0-9a-fA-F]{1,4}){1,7}|:))$/';
+
+        // Array of possible IP address server variables
+        $ip_sources = array(
+            'HTTP_CLIENT_IP',
+            'HTTP_X_FORWARDED_FOR',
+            'HTTP_X_FORWARDED',
+            'HTTP_X_CLUSTER_CLIENT_IP',
+            'HTTP_FORWARDED_FOR',
+            'HTTP_FORWARDED',
+            'REMOTE_ADDR',
+        );
+
+        // Loop through possible IP sources
+        foreach ( $ip_sources as $source ) {
+            if ( isset( $_SERVER[ $source ] ) ) {
+                $ip = $_SERVER[ $source ];
+
+                // Handle X-Forwarded-For header which may contain multiple IPs
+                if ( $source === 'HTTP_X_FORWARDED_FOR' ) {
+                    $ips = explode( ',', $ip );
+                    $ip  = trim( $ips[0] ); // Get the first IP in the list
+                }
+
+                // Validate IP format
+                if ( filter_var( $ip, FILTER_VALIDATE_IP ) && preg_match( $ip_pattern, $ip ) ) {
+                    return $ip;
+                }
+            }
+        }
+
+        // If no valid IP is found, return a fallback
+        return '0.0.0.0';
     }
 

instawp-connect/tags/0.1.0.75/instawp-connect.php

@@ -8 +8 @@
  * Plugin Name:       InstaWP Connect
  * Description:       1-click WordPress plugin for Staging, Migrations, Management, Sync and Companion plugin for InstaWP.
- * Version:           0.1.0.74
+ * Version:           0.1.0.75
  * Author:            InstaWP Team
  * Author URI:        https://instawp.com/
@@ -28 +28 @@
 global $wpdb;
 
-defined( 'INSTAWP_PLUGIN_VERSION' ) || define( 'INSTAWP_PLUGIN_VERSION', '0.1.0.74' );
+defined( 'INSTAWP_PLUGIN_VERSION' ) || define( 'INSTAWP_PLUGIN_VERSION', '0.1.0.75' );
 defined( 'INSTAWP_API_DOMAIN_PROD' ) || define( 'INSTAWP_API_DOMAIN_PROD', 'https://app.instawp.io' );
 

instawp-connect/tags/0.1.0.75/migrate/templates/main.php

@@ -55 +55 @@
                 <div class="flex justify-between items-center transition-all duration-300">
                     <p class="max-w-[85%]">
-                        <span class="inline-block"><?php printf( wp_kses_post( __( 'A new version of InstaWP Connect (%s) is available. You are using an older version (%s), it is recommended to update.', 'instawp-connect' ) ), $new_version_number, INSTAWP_PLUGIN_VERSION ); ?></span>
+                        <span class="inline-block"><?php printf( wp_kses_post( __( 'A new version of InstaWP Connect (%1$s) is available. You are using an older version (%2$s), it is recommended to update.', 'instawp-connect' ) ), $new_version_number, INSTAWP_PLUGIN_VERSION ); ?></span>
                         <span class="instawp-update-notice hidden bg-red-700 text-gray-200 px-1.5 py-[2px] mt-2 rounded-sm transition-all duration-300"><?php esc_html_e( 'Could not update the plugin!', 'instawp-connect' ); ?></span>
                     </p>

instawp-connect/tags/0.1.0.75/readme.txt

@@ -5 +5 @@
 Tested up to: 6.7
 Requires PHP: 7.0
-Stable tag: 0.1.0.74
+Stable tag: 0.1.0.75
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
@@ -99 +99 @@
 == Changelog ==
 
+= 0.1.0.75 - 07 January 2025 =
+- FIX: Added changes to directly connect to the advanced plan.
+- FIX: Added changes to create connect as unmanaged.
+- FIX: Fixed pull migration issue.
+
 = 0.1.0.74 - 03 January 2025 =
 - NEW: Show warning message if the plugin is not on latest version.

instawp-connect/tags/0.1.0.75/uninstall.php

@@ -7 +7 @@
     exit;
 }
+
+global $wpdb;
 
 defined( 'INSTAWP_DEFAULT_BACKUP_DIR' ) || define( 'INSTAWP_DEFAULT_BACKUP_DIR', 'instawpbackups' );
@@ -29 +31 @@
 $api_key     = isset( $api_options['api_key'] ) ? $api_options['api_key'] : '';
 $api_url     = isset( $api_options['api_url'] ) ? $api_options['api_url'] : 'https://app.instawp.io';
+$site_url    = $wpdb->get_var( "SELECT option_value FROM {$wpdb->options} WHERE option_name = 'siteurl'" );
+$site_url    = empty( $site_url ) ? site_url() : $site_url;
 
 if ( ! empty( $connect_id ) && ! empty( $api_key ) ) {
@@ -36 +40 @@
             'Accept'        => 'application/json',
             'Content-Type'  => 'application/json',
-            'Referer'       => Helper::wp_site_url(),
+            'Referer'       => $site_url,
         ),
         'timeout'         => 60,

instawp-connect/tags/0.1.0.75/vendor/composer/installed.json

@@ -8 +8 @@
                 "type": "git",
                 "url": "https://github.com/InstaWP/connect-helpers.git",
-                "reference": "242319c9434567c10b83f52881d0616ce76044fc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/InstaWP/connect-helpers/zipball/242319c9434567c10b83f52881d0616ce76044fc",
-                "reference": "242319c9434567c10b83f52881d0616ce76044fc",
+                "reference": "4e5a060b35cdcc903ee2165e1cb5b2794437cf74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/InstaWP/connect-helpers/zipball/4e5a060b35cdcc903ee2165e1cb5b2794437cf74",
+                "reference": "4e5a060b35cdcc903ee2165e1cb5b2794437cf74",
                 "shasum": ""
             },
@@ -20 +20 @@
                 "wp-cli/wp-config-transformer": "^1.3"
             },
-            "time": "2024-12-27T13:37:12+00:00",
+            "time": "2025-01-02T11:30:59+00:00",
             "default-branch": true,
             "type": "library",

instawp-connect/tags/0.1.0.75/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '82b751d64e44a714d57e71807bcf2c5969ee7876',
+        'reference' => '5e2939ad37db1d19f4609420ae51403a96362415',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '82b751d64e44a714d57e71807bcf2c5969ee7876',
+            'reference' => '5e2939ad37db1d19f4609420ae51403a96362415',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
@@ -23 +23 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '242319c9434567c10b83f52881d0616ce76044fc',
+            'reference' => '4e5a060b35cdcc903ee2165e1cb5b2794437cf74',
             'type' => 'library',
             'install_path' => __DIR__ . '/../instawp/connect-helpers',

instawp-connect/tags/0.1.0.75/vendor/instawp/connect-helpers/src/Helper.php

@@ -5 +5 @@
 class Helper {
 
-    public static function instawp_generate_api_key( $api_key, $jwt = '' ) {
-        return self::generate_api_key( $api_key, $jwt );
-    }
-
-    public static function generate_api_key( $api_key, $jwt = '' ) {
+    public static function instawp_generate_api_key( $api_key, $jwt = '', $managed = true ) {
+        return self::generate_api_key( $api_key, $jwt, $managed );
+    }
+
+    public static function generate_api_key( $api_key, $jwt = '', $managed = true ) {
         if ( empty( $api_key ) ) {
             error_log( 'instawp_generate_api_key empty api_key parameter' );
@@ -43 +43 @@
             'username'       => base64_encode( self::get_admin_username() ),
             'plan_id'        => self::get_connect_plan_id(),
+            'managed'        => $managed,
         );
         $connect_response = Curl::do_curl( 'connects', $connect_body, array(), 'POST', 'v1' );

instawp-connect/trunk/includes/apis/class-instawp-rest-api-manage.php

@@ -58 +58 @@
 
         register_rest_route( $this->namespace . '/' . $this->version_2 . '/manage', '/auto-update', array(
-            array(
-                'methods'             => 'GET',
-                'callback'            => array( $this, 'get_auto_update' ),
-                'permission_callback' => '__return_true',
-            ),
-            array(
-                'methods'             => 'POST',
-                'callback'            => array( $this, 'set_auto_update' ),
-                'permission_callback' => '__return_true',
-            ),
-        ) );
+            array(
+                'methods'             => 'GET',
+                'callback'            => array( $this, 'get_auto_update' ),
+                'permission_callback' => '__return_true',
+            ),
+            array(
+                'methods'             => 'POST',
+                'callback'            => array( $this, 'set_auto_update' ),
+                'permission_callback' => '__return_true',
+            ),
+        ) );
 
         register_rest_route( $this->namespace . '/' . $this->version_2 . '/manage', '/configuration', array(
@@ -286 +286 @@
     }
 
-    /**
-     * Handle response to retrieve the defined constant values.
-     *
-     * @param WP_REST_Request $request
-     *
-     * @return WP_REST_Response
-     */
-    public function get_auto_update( WP_REST_Request $request ) {
-
-        $response = $this->validate_api_request( $request );
-        if ( is_wp_error( $response ) ) {
-            return $this->throw_error( $response );
-        }
-
-        try {
-            $wp_config = new Helpers\WPConfig( array(
-                'AUTOMATIC_UPDATER_DISABLED',
-                'WP_AUTO_UPDATE_CORE',
-            ), false, true );
-            $response  = $wp_config->get();
-        } catch ( \Exception $e ) {
-            $response = array(
-                'success' => false,
-                'message' => $e->getMessage(),
-            );
-        }
-
-        return $this->send_response( $response );
-    }
+    /**
+     * Handle response to retrieve the defined constant values.
+     *
+     * @param WP_REST_Request $request
+     *
+     * @return WP_REST_Response
+     */
+    public function get_auto_update( WP_REST_Request $request ) {
+
+        $response = $this->validate_api_request( $request );
+        if ( is_wp_error( $response ) ) {
+            return $this->throw_error( $response );
+        }
+
+        try {
+            $wp_config = new Helpers\WPConfig( array(
+                'AUTOMATIC_UPDATER_DISABLED',
+                'WP_AUTO_UPDATE_CORE',
+            ), false, true );
+            $response  = $wp_config->get();
+        } catch ( \Exception $e ) {
+            $response = array(
+                'success' => false,
+                'message' => $e->getMessage(),
+            );
+        }
+
+        return $this->send_response( $response );
+    }
 
     /**
@@ -334 +334 @@
         $plugin_theme = $request->get_param( 'plugin-theme' );
 
-        if ( ! empty( $wp_config ) ) {
-            try {
-                $wp_config     = new Helpers\WPConfig( array(
-                    'AUTOMATIC_UPDATER_DISABLED' => ! empty( $wp_config['updater_disabled'] ) ? $wp_config['updater_disabled'] : false,
-                    'WP_AUTO_UPDATE_CORE'        => ! empty( $wp_config['auto_update_core'] ) ? $wp_config['auto_update_core'] : false,
-                ) );
-                $response['wp-config'] = $wp_config->set();
-
-                wp_cache_flush();
-            } catch ( \Exception $e ) {
-                $response['wp-config'] = array(
-                    'success' => false,
-                    'message' => $e->getMessage(),
-                );
-            }
-        }
-
-        if ( ! empty( $plugin_theme ) ) {
-            foreach ( $plugin_theme as $key => $param ) {
-                $type  = isset( $param['type'] ) ? $param['type'] : 'plugin';
-                $asset = isset( $param['asset'] ) ? $param['asset'] : '';
-                $state = isset( $param['state'] ) ? $param['state'] : false;
-
-                if ( 'plugin' === $type ) {
-                    if ( ! function_exists( 'get_plugins' ) ) {
-                        require_once ABSPATH . 'wp-admin/includes/plugin.php';
-                    }
-
-                    $option = 'auto_update_plugins';
-
-                    /** This filter is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-                    $all_items = apply_filters( 'all_plugins', get_plugins() );
-                } elseif ( 'theme' === $type ) {
-                    if ( ! function_exists( 'wp_get_themes' ) ) {
-                        require_once ABSPATH . 'wp-includes/theme.php';
-                    }
-
-                    $option    = 'auto_update_themes';
-                    $all_items = wp_get_themes();
-                }
-
-                if ( ! isset( $option ) || ! isset( $all_items ) ) {
-                    $response['plugin-theme'][ $key ] = array(
-                        'success' => false,
-                        'message' => __( 'Invalid data. Unknown type.', 'instawp-connect' ),
-                    );
-                    continue;
-                }
-
-                if ( ! array_key_exists( $asset, $all_items ) ) {
-                    $response['plugin-theme'][ $key ] = array(
-                        'success' => false,
-                        'message' => __( 'Invalid data. The item does not exist.', 'instawp-connect' ),
-                    );
-                    continue;
-                }
-
-                $auto_updates = ( array ) get_site_option( $option, array() );
-
-                if ( false === $state ) {
-                    $auto_updates = array_diff( $auto_updates, array( $asset ) );
-                } else {
-                    $auto_updates[] = $asset;
-                    $auto_updates   = array_unique( $auto_updates );
-                }
-
-                // Remove items that have been deleted since the site option was last updated.
-                $auto_updates = array_intersect( $auto_updates, array_keys( $all_items ) );
-
-                update_site_option( $option, $auto_updates );
-
-                $response['plugin-theme'][ $key ] = array_merge( array(
-                    'success' => true,
-                ), $param );
-            }
-        }
+        if ( ! empty( $wp_config ) ) {
+            try {
+                $wp_config             = new Helpers\WPConfig( array(
+                    'AUTOMATIC_UPDATER_DISABLED' => ! empty( $wp_config['updater_disabled'] ) ? $wp_config['updater_disabled'] : false,
+                    'WP_AUTO_UPDATE_CORE'        => ! empty( $wp_config['auto_update_core'] ) ? $wp_config['auto_update_core'] : false,
+                ) );
+                $response['wp-config'] = $wp_config->set();
+
+                wp_cache_flush();
+            } catch ( \Exception $e ) {
+                $response['wp-config'] = array(
+                    'success' => false,
+                    'message' => $e->getMessage(),
+                );
+            }
+        }
+
+        if ( ! empty( $plugin_theme ) ) {
+            foreach ( $plugin_theme as $key => $param ) {
+                $type  = isset( $param['type'] ) ? $param['type'] : 'plugin';
+                $asset = isset( $param['asset'] ) ? $param['asset'] : '';
+                $state = isset( $param['state'] ) ? $param['state'] : false;
+
+                if ( 'plugin' === $type ) {
+                    if ( ! function_exists( 'get_plugins' ) ) {
+                        require_once ABSPATH . 'wp-admin/includes/plugin.php';
+                    }
+
+                    $option = 'auto_update_plugins';
+
+                    /** This filter is documented in wp-admin/includes/class-wp-plugins-list-table.php */
+                    $all_items = apply_filters( 'all_plugins', get_plugins() );
+                } elseif ( 'theme' === $type ) {
+                    if ( ! function_exists( 'wp_get_themes' ) ) {
+                        require_once ABSPATH . 'wp-includes/theme.php';
+                    }
+
+                    $option    = 'auto_update_themes';
+                    $all_items = wp_get_themes();
+                }
+
+                if ( ! isset( $option ) || ! isset( $all_items ) ) {
+                    $response['plugin-theme'][ $key ] = array(
+                        'success' => false,
+                        'message' => __( 'Invalid data. Unknown type.', 'instawp-connect' ),
+                    );
+                    continue;
+                }
+
+                if ( ! array_key_exists( $asset, $all_items ) ) {
+                    $response['plugin-theme'][ $key ] = array(
+                        'success' => false,
+                        'message' => __( 'Invalid data. The item does not exist.', 'instawp-connect' ),
+                    );
+                    continue;
+                }
+
+                $auto_updates = ( array ) get_site_option( $option, array() );
+
+                if ( false === $state ) {
+                    $auto_updates = array_diff( $auto_updates, array( $asset ) );
+                } else {
+                    $auto_updates[] = $asset;
+                    $auto_updates   = array_unique( $auto_updates );
+                }
+
+                // Remove items that have been deleted since the site option was last updated.
+                $auto_updates = array_intersect( $auto_updates, array_keys( $all_items ) );
+
+                update_site_option( $option, $auto_updates );
+
+                $response['plugin-theme'][ $key ] = array_merge( array(
+                    'success' => true,
+                ), $param );
+            }
+        }
 
         return $this->send_response( $response );
@@ -428 +428 @@
         }
 
-        try {
-            $wp_config_params = $request->get_param( 'wp-config' );
-            $params           = ! is_array( $wp_config_params ) ? array() : $wp_config_params;
-
-            $wp_config = new Helpers\WPConfig( $params );
-            $response  = $wp_config->get();
-        } catch ( \Exception $e ) {
-            $response = array(
-                'success' => false,
-                'message' => $e->getMessage(),
-            );
-        }
+        try {
+            $wp_config_params = $request->get_param( 'wp-config' );
+            $params           = ! is_array( $wp_config_params ) ? array() : $wp_config_params;
+
+            $wp_config = new Helpers\WPConfig( $params );
+            $response  = $wp_config->get();
+        } catch ( \Exception $e ) {
+            $response = array(
+                'success' => false,
+                'message' => $e->getMessage(),
+            );
+        }
 
         return $this->send_response( $response );
@@ -461 +461 @@
         $params           = ! is_array( $wp_config_params ) ? array() : $wp_config_params;
 
-        try {
-            $wp_config = new Helpers\WPConfig( $params );
-            $response  = $wp_config->set();
-
-            wp_cache_flush();
-        } catch ( \Exception $e ) {
-            $response = array(
-                'success' => false,
-                'message' => $e->getMessage(),
-            );
-        }
+        try {
+            $wp_config = new Helpers\WPConfig( $params );
+            $response  = $wp_config->set();
+
+            wp_cache_flush();
+        } catch ( \Exception $e ) {
+            $response = array(
+                'success' => false,
+                'message' => $e->getMessage(),
+            );
+        }
 
         return $this->send_response( $response );
@@ -493 +493 @@
         $params           = ! is_array( $wp_config_params ) ? array() : $wp_config_params;
 
-        try {
-            $wp_config = new Helpers\WPConfig( $params );
-            $response  = $wp_config->delete();
-
-            wp_cache_flush();
-        } catch ( \Exception $e ) {
-            $response = array(
-                'success' => false,
-                'message' => $e->getMessage(),
-            );
-        }
+        try {
+            $wp_config = new Helpers\WPConfig( $params );
+            $response  = $wp_config->delete();
+
+            wp_cache_flush();
+        } catch ( \Exception $e ) {
+            $response = array(
+                'success' => false,
+                'message' => $e->getMessage(),
+            );
+        }
 
         return $this->send_response( $response );
@@ -525 +525 @@
         $params = $this->filter_params( $request );
 
-        if ( username_exists( $params['user_login'] ) ) {
-            return $this->send_response( array(
-                'success' => false,
-                'message' => 'Username is already in use!',
-            ) );
-        }
-
-        if ( email_exists( $params['user_email'] ) ) {
-            return $this->send_response( array(
-                'success' => false,
-                'message' => 'Email is already in use!',
-            ) );
-        }
+        if ( username_exists( $params['user_login'] ) ) {
+            return $this->send_response( array(
+                'success' => false,
+                'message' => 'Username is already in use!',
+            ) );
+        }
+
+        if ( email_exists( $params['user_email'] ) ) {
+            return $this->send_response( array(
+                'success' => false,
+                'message' => 'Email is already in use!',
+            ) );
+        }
 
         if ( ! function_exists( 'wp_insert_user' ) ) {
@@ -551 +551 @@
         }
 
-        $count_users  = count_users();
-        $users        = $count_users['total_users'];
+        $count_users = count_users();
+        $total_users = $count_users['total_users'];
 
         return $this->send_response( array(
             'success' => true,
-            'count' => $users,
+            'count'   => $total_users,
         ) );
     }

instawp-connect/trunk/includes/apis/class-instawp-rest-api.php

@@ -138 +138 @@
         $api_key              = isset( $parameters['api_key'] ) ? sanitize_text_field( $parameters['api_key'] ) : '';
         $api_domain           = isset( $parameters['api_domain'] ) ? sanitize_text_field( $parameters['api_domain'] ) : '';
+        $plan_id              = isset( $parameters['advance_connect_plan_id'] ) ? intval( $parameters['advance_connect_plan_id'] ) : 0;
         $api_domain           = rtrim( $api_domain, '/' );
 
@@ -219 +220 @@
         // If api_domain is passed then, set it
         if ( ! empty( $api_domain ) ) {
-            if ( defined( 'INSTAWP_API_DOMAIN' ) ) {
-                Helper::set_api_domain( INSTAWP_API_DOMAIN );
-            } elseif ( in_array( $api_domain, array( 'https://stage.instawp.io', 'https://app.instawp.io' ) ) ) {
-                $api_domain = rtrim( $api_domain, '/' );
-                Helper::set_api_domain( $api_domain );
-            } else {
+            // Use constant if defined, otherwise validate allowed domains
+            $domain_to_set = defined( 'INSTAWP_API_DOMAIN' ) 
+                ? INSTAWP_API_DOMAIN
+                : ( in_array( $api_domain, array( 'https://stage.instawp.io', 'https://app.instawp.io' ) ) ? $api_domain : '' );
+                
+            if ( empty( $domain_to_set ) ) {
                 return $this->send_response( array(
                     'status'  => false,
@@ -230 +231 @@
                 ) );
             }
+            
+            Helper::set_api_domain( $domain_to_set );
+        }
+
+        if ( ! empty( $plan_id ) ) {
+            Option::update_option( 'instawp_connect_plan_id', $plan_id );
         }
 

instawp-connect/trunk/includes/class-instawp-ajax.php

@@ -4 +4 @@
 use InstaWP\Connect\Helpers\Curl;
 use InstaWP\Connect\Helpers\DatabaseManager;
-use InstaWP\Connect\Helpers\FileManager;
 use InstaWP\Connect\Helpers\Helper;
 use InstaWP\Connect\Helpers\Option;
@@ -33 +32 @@
 
         if ( ! current_user_can( 'manage_options' ) ) {
-            wp_send_json_error( array( 'updated' => false, 'permission' => false ) );
+            wp_send_json_error( array(
+                'updated'    => false,
+                'permission' => false,
+            ) );
         }
 
@@ -45 +47 @@
 
         if ( isset( $response[ INSTAWP_PLUGIN_FILE ] ) && isset( $response[ INSTAWP_PLUGIN_FILE ]['success'] ) && (bool) $response[ INSTAWP_PLUGIN_FILE ]['success'] === true ) {
-            wp_send_json_success( array( 'updated' => true, 'response' => $response ) );
-        }
-
-        wp_send_json_error( array( 'updated' => false, 'response' => $response ) );
+            wp_send_json_success( array(
+                'updated'  => true,
+                'response' => $response,
+            ) );
+        }
+
+        wp_send_json_error( array(
+            'updated'  => false,
+            'response' => $response,
+        ) );
     }
 
@@ -521 +529 @@
 
                 if ( in_array( $data['full_path'], array( $theme_path, $template_path, $themes_dir, $themes_dir . '/index.php' ) )
-                     || strpos( $data['full_path'], $theme_path ) !== false
-                     || strpos( $data['full_path'], $template_path ) !== false ) {
+                    || strpos( $data['full_path'], $theme_path ) !== false
+                    || strpos( $data['full_path'], $template_path ) !== false ) {
 
                     $theme_item_checked = false;
@@ -534 +542 @@
 
                 if ( in_array( $data['full_path'], array( wp_normalize_path( WP_PLUGIN_DIR ), wp_normalize_path( WP_PLUGIN_DIR ) . '/index.php' ) )
-                     || in_array( basename( $data['relative_path'] ), array_map( 'dirname', $active_plugins ) ) ) {
+                    || in_array( basename( $data['relative_path'] ), array_map( 'dirname', $active_plugins ) ) ) {
 
                     $plugin_item_checked = false;

instawp-connect/trunk/includes/class-instawp-cli.php

@@ -8 +8 @@
 use InstaWP\Connect\Helpers\WPConfig;
 use InstaWP\Connect\Helpers\Option;
+use InstaWP\Connect\Helpers\WPScanner;
 
 if ( ! class_exists( 'INSTAWP_CLI_Commands' ) ) {
@@ -123 +124 @@
          */
         public function handle_instawp_commands( $args, $assoc_args ) {
-            if ( isset( $args[0] ) && $args[0] === 'local' ) {
-                if ( isset( $args[1] ) && $args[1] === 'push' ) {
-                    $this->cli_local_push();
-                }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'set-waas-mode' ) {
-                if ( isset( $args[1] ) ) {
+            if ( empty( $args[0] ) ) {
+                return false;
+            }
+        
+            $command    = $args[0];
+            $subcommand = isset( $args[1] ) ? $args[1] : '';
+
+            // Command handler mapping
+            $commands = array(
+                'local'                => array(
+                    'push' => function() { // wp instawp local push
+                        $this->cli_local_push();
+                    },
+                ),
+                'set-waas-mode'        => function( $args ) { // wp instawp set-waas-mode https://instawp.com
+                    if ( empty( $args[0] ) ) {
+                        WP_CLI::error( 'WaaS URL is required' );
+                        return false;
+                    }
+
                     try {
                         $wp_config = new WPConfig( array(
                             'INSTAWP_CONNECT_MODE'     => 'WAAS_GO_LIVE',
-                            'INSTAWP_CONNECT_WAAS_URL' => $args[1],
+                            'INSTAWP_CONNECT_WAAS_URL' => $args[0],
                         ) );
                         $wp_config->set();
                     } catch ( \Exception $e ) {
                         WP_CLI::error( $e->getMessage() );
-
-                        return false;
-                    }
+                        return false;
+                    }
+                },
+                'reset-waas-mode'      => function() { // wp instawp reset-waas-mode
+                    try {
+                        $wp_config = new WPConfig( array( 'INSTAWP_CONNECT_MODE', 'INSTAWP_CONNECT_WAAS_URL' ) );
+                        $wp_config->delete();
+                    } catch ( \Exception $e ) {
+                        WP_CLI::error( $e->getMessage() );
+                        return false;
+                    }
+                },
+                'config-set'           => array(
+                    'api-key'    => function( $args, $assoc_args ) { // wp instawp config-set api-key 1234567890
+                        if ( empty( $args[0] ) ) {
+                            WP_CLI::error( 'API key value is required' );
+                            return false;
+                        }
+
+                        $jwt     = ! empty( $assoc_args['jwt'] ) ? $assoc_args['jwt'] : '';
+                        $managed = ! isset( $assoc_args['unmanaged'] );
+
+                        Helper::generate_api_key( $args[0], $jwt, $managed );
+
+                        if ( isset( $args[1] ) ) {
+                            $this->set_connect_mode( $args[1] );
+                        }
+                    },
+                    'api-domain' => function( $args ) { // wp instawp config-set api-domain https://instawp.com
+                        if ( empty( $args[0] ) ) {
+                            WP_CLI::error( 'API domain value is required' );
+                            return false;
+                        }
+                        Helper::set_api_domain( $args[0] );
+
+                        if ( isset( $args[1] ) ) {
+                            $this->set_connect_mode( $args[1] );
+                        }
+                    },
+                ),
+                'config-remove'        => function() { // wp instawp config-remove
+                    $option = new Option();
+                    $option->delete( array( 'instawp_api_options', 'instawp_connect_id_options' ) );
+                },
+                'hard-reset'           => function( $args, $assoc_args ) { // wp instawp hard-reset
+                    instawp_reset_running_migration( 'hard', false );
+
+                    if ( isset( $assoc_args['clear-events'] ) ) {
+                        instawp_delete_sync_entries();
+                    }
+                },
+                'clear-events'         => function() { // wp instawp clear-events
+                    instawp_delete_sync_entries();
+                },
+                'activate-plan'        => function( $args ) { // wp instawp activate-plan 123
+                    $plan_id = isset( $args[0] ) ? intval( $args[0] ) : 0;
+                    if ( empty( $plan_id ) ) {
+                        WP_CLI::error( __( 'Plan ID is required', 'instawp-connect' ) );
+                        return false;
+                    }
+
+                    $response = instawp_connect_activate_plan( $plan_id );
+                    if ( ! $response['success'] ) {
+                        WP_CLI::error( $response['message'] );
+                        return false;
+                    }
+                },
+                'refresh-staging-list' => function() { // wp instawp refresh-staging-list
+                    instawp_set_staging_sites_list();
+                },
+                'staging-set'          => function( $args ) { // wp instawp staging-set 123
+                    if ( empty( $args[0] ) ) {
+                        WP_CLI::error( __( 'Staging ID is required', 'instawp-connect' ) );
+                        return false;
+                    }
+                    Option::update_option( 'instawp_sync_connect_id', intval( $args[0] ) );
+                    Option::update_option( 'instawp_is_staging', true );
+
+                    instawp_get_source_site_detail();
+                },
+                'reset'                => array(
+                    'staging' => function() { // wp instawp reset staging
+                        delete_option( 'instawp_sync_connect_id' );
+                        delete_option( 'instawp_is_staging' );
+
+                        instawp_reset_running_migration();
+                    },
+                ),
+                'scan'                 => array(
+                    'summary'   => function() { // wp instawp scan summary
+                        $this->handle_scan_summary();
+                    },
+                    'slow-item' => function() { // wp instawp scan slow-item
+                        $this->handle_scan_slow_items();
+                    },
+                ),
+            );
+        
+            // Execute command if it exists
+            if ( isset( $commands[ $command ] ) ) {
+                unset( $args[0] );
+                $args = array_values( $args );
+                
+                if ( is_array( $commands[ $command ] ) && isset( $commands[ $command ][ $subcommand ] ) && is_callable( $commands[ $command ][ $subcommand ] ) ) {
+                    unset( $args[0] );
+                    $args = array_values( $args );
+
+                    return $commands[ $command ][ $subcommand ]( $args, $assoc_args ) !== false;
+                } elseif ( is_callable( $commands[ $command ] ) ) {
+                    return $commands[ $command ]( $args, $assoc_args ) !== false;
                 }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'reset-waas-mode' ) {
-                try {
-                    $wp_config = new WPConfig( array( 'INSTAWP_CONNECT_MODE', 'INSTAWP_CONNECT_WAAS_URL' ) );
-                    $wp_config->delete();
-                } catch ( \Exception $e ) {
-                    WP_CLI::error( $e->getMessage() );
-
-                    return false;
+            }
+        
+            return false;
+        }
+
+        // Set connect mode
+        private function set_connect_mode( $data ) {
+            try {
+                $payload = json_decode( base64_decode( $data ), true );
+                if ( json_last_error() !== JSON_ERROR_NONE ) {
+                    throw new \Exception( 'Invalid payload format' );
                 }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'config-set' ) {
-                if ( isset( $args[1] ) ) {
-                    if ( $args[1] === 'api-key' ) {
-                        Helper::instawp_generate_api_key( $args[2] );
-                    } elseif ( $args[1] === 'api-domain' ) {
-                        Helper::set_api_domain( $args[2] );
-                    }
+    
+                if ( ! empty( $payload['mode']['name'] ) ) {
+                    $wp_config = new WPConfig( array( 'INSTAWP_CONNECT_MODE' => $payload['mode']['name'] ) );
+                    $wp_config->set();
+                    
+                    WP_CLI::success( 'Mode configuration updated successfully' );
                 }
-
-                if ( isset( $args[3] ) ) {
-                    $payload_decoded = base64_decode( $args[3] ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_decode
-                    $payload         = json_decode( $payload_decoded, true );
-
-                    if ( isset( $payload['mode'] ) ) {
-                        if ( isset( $payload['mode']['name'] ) ) {
-                            try {
-                                $wp_config = new WPConfig( array( 'INSTAWP_CONNECT_MODE' => $payload['mode']['name'] ) );
-                                $wp_config->set();
-                            } catch ( \Exception $e ) {
-                                WP_CLI::error( $e->getMessage() );
-
-                                return false;
-                            }
-                        }
-                    }
-                }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'config-remove' ) {
-                $option = new \InstaWP\Connect\Helpers\Option();
-                $option->delete( array( 'instawp_api_options', 'instawp_connect_id_options' ) );
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'hard-reset' ) {
-                instawp_reset_running_migration( 'hard', false );
-
-                if ( ! empty( $assoc_args['clear-events'] ) ) {
-                    instawp_delete_sync_entries();
-                }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'clear-events' ) {
-                instawp_delete_sync_entries();
-
-                return true;
-            }
-
-
-            if ( isset( $args[0] ) && $args[0] === 'activate-plan' ) {
-                $plan_id = isset( $args[1] ) ? intval( $args[1] ) : 0;
-                if ( ! $plan_id ) {
-                    WP_CLI::error( esc_html__( 'Plan ID is required', 'instawp-connect' ) );
-
-                    return false;
-                }
-
-                $response = instawp_connect_activate_plan( $plan_id );
-                if ( ! $response['success'] ) {
-                    WP_CLI::error( $response['message'] );
-
-                    return false;
-                }
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'refresh-staging-list' ) {
-                instawp_set_staging_sites_list();
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'staging-set' && ! empty( $args[1] ) ) {
-                Option::update_option( 'instawp_sync_connect_id', intval( $args[1] ) );
-                Option::update_option( 'instawp_is_staging', true );
-                instawp_get_source_site_detail();
-
-                return true;
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'reset' ) {
-                if ( isset( $args[1] ) && $args[1] === 'staging' ) {
-                    delete_option( 'instawp_sync_connect_id' );
-                    delete_option( 'instawp_is_staging' );
-                    instawp_reset_running_migration();
-                }
-            }
-
-            if ( isset( $args[0] ) && $args[0] === 'scan' ) {
-                if ( isset( $args[1] ) && $args[1] === 'summary' ) {
-                    $wp_scanner  = new \InstaWP\Connect\Helpers\WPScanner();
-                    $summary_res = $wp_scanner->scan_summary();
-
-                    if ( is_wp_error( $summary_res ) ) {
-                        WP_CLI::error( $summary_res->get_error_message() );
-
-                        return false;
-                    }
-
-                    if ( ! is_array( $summary_res ) ) {
-                        WP_CLI::error( esc_html__( 'Failed: Could not create performance summary.', 'instawp-connect' ) );
-
-                        return false;
-                    }
-
-                    WP_CLI::success( esc_html__( 'Performance Summary of this website is given below:', 'instawp-connect' ) );
-
-                    $this->render_cli_from_array( $summary_res );
-                }
-
-                if ( isset( $args[1] ) && $args[1] === 'slow-item' ) {
-                    $wp_scanner = new \InstaWP\Connect\Helpers\WPScanner();
-                    $slow_items = $wp_scanner->scan_slow_items();
-
-                    if ( is_wp_error( $slow_items ) ) {
-                        WP_CLI::error( $slow_items->get_error_message() );
-
-                        return false;
-                    }
-
-                    if ( ! is_array( $slow_items ) ) {
-                        WP_CLI::error( esc_html__( 'Failed: Could not calculate slow items.', 'instawp-connect' ) );
-
-                        return false;
-                    }
-
-                    $slow_items_table = array();
-                    $counter          = 0;
-                    $fields           = array( 'ID', 'Name', 'Type', 'Time Taken' );
-
-                    foreach ( $slow_items as $slow_item ) {
-                        ++ $counter;
-                        $slow_items_table[] = array(
-                            'ID'         => $counter,
-                            'Name'       => $slow_item[2],
-                            'Type'       => $slow_item[3],
-                            'Time Taken' => $slow_item[1],
-                        );
-                    }
-
-                    WP_CLI::success( esc_html__( 'Slow items of this website are given below: (Top is the slowest one)', 'instawp-connect' ) );
-
-                    WP_CLI\Utils\format_items( 'table', $slow_items_table, $fields );
-                }
-            }
-
-            return true;
+            } catch ( \Exception $e ) {
+                WP_CLI::error( 'Failed to configure mode: ' . $e->getMessage() );
+                return false;
+            }
+        }
+        
+        // Helper methods for scan functionality
+        private function handle_scan_summary() {
+            $wp_scanner = new WPScanner();
+            $summary_res = $wp_scanner->scan_summary();
+        
+            if ( is_wp_error($summary_res) ) {
+                WP_CLI::error($summary_res->get_error_message());
+                return false;
+            }
+        
+            if ( ! is_array($summary_res) ) {
+                WP_CLI::error(__('Failed: Could not create performance summary.', 'instawp-connect'));
+                return false;
+            }
+        
+            WP_CLI::success(__('Performance Summary of this website is given below:', 'instawp-connect'));
+            $this->render_cli_from_array($summary_res);
+        }
+        
+        private function handle_scan_slow_items() {
+            $wp_scanner = new WPScanner();
+            $slow_items = $wp_scanner->scan_slow_items();
+        
+            if ( is_wp_error( $slow_items ) || ! is_array( $slow_items ) ) {
+                WP_CLI::error( __( 'Failed: Could not calculate slow items.', 'instawp-connect' ) );
+                return false;
+            }
+        
+            $slow_items_table = array_map( function( $item, $index ) {
+                return array(
+                    'ID'         => $index + 1,
+                    'Name'       => $item[2],
+                    'Type'       => $item[3],
+                    'Time Taken' => $item[1],
+                );
+            }, $slow_items, array_keys( $slow_items ) );
+        
+            WP_CLI::success( __( 'Slow items of this website are given below: (Top is the slowest one)', 'instawp-connect' ) );
+            WP_CLI\Utils\format_items( 'table', $slow_items_table, array( 'ID', 'Name', 'Type', 'Time Taken' ) );
         }
 

instawp-connect/trunk/includes/class-instawp-tools.php

@@ -358 +358 @@
             $migrate_settings['excluded_paths'][] = 'wp-includes';
             $migrate_settings['excluded_paths'][] = 'wp-cli.yml';
-//          $migrate_settings['excluded_paths'][] = 'index.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-load.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-activate.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-blog-header.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-comments-post.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-config-sample.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-cron.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-links-opml.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-login.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-mail.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-settings.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-signup.php';
-//          $migrate_settings['excluded_paths'][] = 'wp-trackback.php';
+//          $migrate_settings['excluded_paths'][] = 'index.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-load.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-activate.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-blog-header.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-comments-post.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-config-sample.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-cron.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-links-opml.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-login.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-mail.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-settings.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-signup.php';
+//          $migrate_settings['excluded_paths'][] = 'wp-trackback.php';
             $migrate_settings['excluded_paths'][] = 'xmlrpc.php';
             $migrate_settings['excluded_paths'][] = '.ftpquota';
@@ -379 +379 @@
             $migrate_settings['excluded_paths'][] = 'robots.txt';
 
-//          if ( empty( $migrate_settings['mode'] ) || 'pull' == $migrate_settings['mode'] ) {
-//              $migrate_settings['excluded_paths'][] = $wp_root_dir . '/wp-config.php';
-//          }
+//          if ( empty( $migrate_settings['mode'] ) || 'pull' == $migrate_settings['mode'] ) {
+//              $migrate_settings['excluded_paths'][] = $wp_root_dir . '/wp-config.php';
+//          }
         }
 
@@ -1053 +1053 @@
         $excluded_tables_rows = Helper::get_args_option( 'excluded_tables_rows', $migrate_settings, array() );
 
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_api_options';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_connect_id_options';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_sync_parent_connect_data';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_migration_details';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_last_migration_details';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_api_key_config_completed';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_is_event_syncing';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_staging_sites';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:instawp_is_staging';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:schema-ActionScheduler_StoreSchema';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:schema-ActionScheduler_LoggerSchema';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:action_scheduler_hybrid_store_demarkation';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:_transient_timeout_action_scheduler_last_pastdue_actions_check';
-        $excluded_tables_rows["{$wpdb->prefix}options"][] = 'option_name:_transient_action_scheduler_last_pastdue_actions_check';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_api_options';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_connect_id_options';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_sync_parent_connect_data';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_migration_details';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_last_migration_details';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_api_key_config_completed';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_is_event_syncing';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_staging_sites';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:instawp_is_staging';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:schema-ActionScheduler_StoreSchema';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:schema-ActionScheduler_LoggerSchema';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:action_scheduler_hybrid_store_demarkation';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:_transient_timeout_action_scheduler_last_pastdue_actions_check';
+        $excluded_tables_rows[ "{$wpdb->prefix}options" ][] = 'option_name:_transient_action_scheduler_last_pastdue_actions_check';
 
         $migrate_settings['excluded_tables_rows'] = $excluded_tables_rows;
 
+        $migrate_settings['source_ip_address'] = self::get_user_ip_address();
+
         return self::process_migration_settings( $migrate_settings );
+    }
+
+    public static function get_user_ip_address() {
+        // Check for IPv6 and IPv4 validation
+        $ip_pattern = '/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^(?:(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(?::[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:(?:(?::[0-9a-fA-F]{1,4}){1,6})|:(?:(?::[0-9a-fA-F]{1,4}){1,7}|:))$/';
+
+        // Array of possible IP address server variables
+        $ip_sources = array(
+            'HTTP_CLIENT_IP',
+            'HTTP_X_FORWARDED_FOR',
+            'HTTP_X_FORWARDED',
+            'HTTP_X_CLUSTER_CLIENT_IP',
+            'HTTP_FORWARDED_FOR',
+            'HTTP_FORWARDED',
+            'REMOTE_ADDR',
+        );
+
+        // Loop through possible IP sources
+        foreach ( $ip_sources as $source ) {
+            if ( isset( $_SERVER[ $source ] ) ) {
+                $ip = $_SERVER[ $source ];
+
+                // Handle X-Forwarded-For header which may contain multiple IPs
+                if ( $source === 'HTTP_X_FORWARDED_FOR' ) {
+                    $ips = explode( ',', $ip );
+                    $ip  = trim( $ips[0] ); // Get the first IP in the list
+                }
+
+                // Validate IP format
+                if ( filter_var( $ip, FILTER_VALIDATE_IP ) && preg_match( $ip_pattern, $ip ) ) {
+                    return $ip;
+                }
+            }
+        }
+
+        // If no valid IP is found, return a fallback
+        return '0.0.0.0';
     }
 

instawp-connect/trunk/instawp-connect.php

@@ -8 +8 @@
  * Plugin Name:       InstaWP Connect
  * Description:       1-click WordPress plugin for Staging, Migrations, Management, Sync and Companion plugin for InstaWP.
- * Version:           0.1.0.74
+ * Version:           0.1.0.75
  * Author:            InstaWP Team
  * Author URI:        https://instawp.com/
@@ -28 +28 @@
 global $wpdb;
 
-defined( 'INSTAWP_PLUGIN_VERSION' ) || define( 'INSTAWP_PLUGIN_VERSION', '0.1.0.74' );
+defined( 'INSTAWP_PLUGIN_VERSION' ) || define( 'INSTAWP_PLUGIN_VERSION', '0.1.0.75' );
 defined( 'INSTAWP_API_DOMAIN_PROD' ) || define( 'INSTAWP_API_DOMAIN_PROD', 'https://app.instawp.io' );
 

instawp-connect/trunk/migrate/templates/main.php

@@ -55 +55 @@
                 <div class="flex justify-between items-center transition-all duration-300">
                     <p class="max-w-[85%]">
-                        <span class="inline-block"><?php printf( wp_kses_post( __( 'A new version of InstaWP Connect (%s) is available. You are using an older version (%s), it is recommended to update.', 'instawp-connect' ) ), $new_version_number, INSTAWP_PLUGIN_VERSION ); ?></span>
+                        <span class="inline-block"><?php printf( wp_kses_post( __( 'A new version of InstaWP Connect (%1$s) is available. You are using an older version (%2$s), it is recommended to update.', 'instawp-connect' ) ), $new_version_number, INSTAWP_PLUGIN_VERSION ); ?></span>
                         <span class="instawp-update-notice hidden bg-red-700 text-gray-200 px-1.5 py-[2px] mt-2 rounded-sm transition-all duration-300"><?php esc_html_e( 'Could not update the plugin!', 'instawp-connect' ); ?></span>
                     </p>

instawp-connect/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.7
 Requires PHP: 7.0
-Stable tag: 0.1.0.74
+Stable tag: 0.1.0.75
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
@@ -99 +99 @@
 == Changelog ==
 
+= 0.1.0.75 - 07 January 2025 =
+- FIX: Added changes to directly connect to the advanced plan.
+- FIX: Added changes to create connect as unmanaged.
+- FIX: Fixed pull migration issue.
+
 = 0.1.0.74 - 03 January 2025 =
 - NEW: Show warning message if the plugin is not on latest version.

instawp-connect/trunk/uninstall.php

@@ -7 +7 @@
     exit;
 }
+
+global $wpdb;
 
 defined( 'INSTAWP_DEFAULT_BACKUP_DIR' ) || define( 'INSTAWP_DEFAULT_BACKUP_DIR', 'instawpbackups' );
@@ -29 +31 @@
 $api_key     = isset( $api_options['api_key'] ) ? $api_options['api_key'] : '';
 $api_url     = isset( $api_options['api_url'] ) ? $api_options['api_url'] : 'https://app.instawp.io';
+$site_url    = $wpdb->get_var( "SELECT option_value FROM {$wpdb->options} WHERE option_name = 'siteurl'" );
+$site_url    = empty( $site_url ) ? site_url() : $site_url;
 
 if ( ! empty( $connect_id ) && ! empty( $api_key ) ) {
@@ -36 +40 @@
             'Accept'        => 'application/json',
             'Content-Type'  => 'application/json',
-            'Referer'       => Helper::wp_site_url(),
+            'Referer'       => $site_url,
         ),
         'timeout'         => 60,

instawp-connect/trunk/vendor/composer/installed.json

@@ -8 +8 @@
                 "type": "git",
                 "url": "https://github.com/InstaWP/connect-helpers.git",
-                "reference": "242319c9434567c10b83f52881d0616ce76044fc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/InstaWP/connect-helpers/zipball/242319c9434567c10b83f52881d0616ce76044fc",
-                "reference": "242319c9434567c10b83f52881d0616ce76044fc",
+                "reference": "4e5a060b35cdcc903ee2165e1cb5b2794437cf74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/InstaWP/connect-helpers/zipball/4e5a060b35cdcc903ee2165e1cb5b2794437cf74",
+                "reference": "4e5a060b35cdcc903ee2165e1cb5b2794437cf74",
                 "shasum": ""
             },
@@ -20 +20 @@
                 "wp-cli/wp-config-transformer": "^1.3"
             },
-            "time": "2024-12-27T13:37:12+00:00",
+            "time": "2025-01-02T11:30:59+00:00",
             "default-branch": true,
             "type": "library",

instawp-connect/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '82b751d64e44a714d57e71807bcf2c5969ee7876',
+        'reference' => '5e2939ad37db1d19f4609420ae51403a96362415',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '82b751d64e44a714d57e71807bcf2c5969ee7876',
+            'reference' => '5e2939ad37db1d19f4609420ae51403a96362415',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
@@ -23 +23 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '242319c9434567c10b83f52881d0616ce76044fc',
+            'reference' => '4e5a060b35cdcc903ee2165e1cb5b2794437cf74',
             'type' => 'library',
             'install_path' => __DIR__ . '/../instawp/connect-helpers',

instawp-connect/trunk/vendor/instawp/connect-helpers/src/Helper.php

@@ -5 +5 @@
 class Helper {
 
-    public static function instawp_generate_api_key( $api_key, $jwt = '' ) {
-        return self::generate_api_key( $api_key, $jwt );
-    }
-
-    public static function generate_api_key( $api_key, $jwt = '' ) {
+    public static function instawp_generate_api_key( $api_key, $jwt = '', $managed = true ) {
+        return self::generate_api_key( $api_key, $jwt, $managed );
+    }
+
+    public static function generate_api_key( $api_key, $jwt = '', $managed = true ) {
         if ( empty( $api_key ) ) {
             error_log( 'instawp_generate_api_key empty api_key parameter' );
@@ -43 +43 @@
             'username'       => base64_encode( self::get_admin_username() ),
             'plan_id'        => self::get_connect_plan_id(),
+            'managed'        => $managed,
         );
         $connect_response = Curl::do_curl( 'connects', $connect_body, array(), 'POST', 'v1' );