Changeset 3315519

Timestamp:

06/21/2025 12:03:37 AM (7 months ago)

Author:

codexonics

Message:

Updated trunk for version 2.0.7

Location:

prime-mover/trunk

Files:

• PrimeMoverFactory.php (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• classes/PrimeMoverSystemFunctions.php (modified) (5 diffs)
• classes/PrimeMoverUsers.php (modified) (3 diffs)
• engines/prime-mover-panel/advance/PrimeMoverTroubleshooting.php (modified) (3 diffs)
• engines/prime-mover-panel/prime-mover-panel.php (modified) (1 diff)
• engines/prime-mover-panel/vendor/composer/installed.php (modified) (2 diffs)
• global/PrimeMoverGlobalConstants.php (modified) (2 diffs)
• global/PrimeMoverGlobalFunctions.php (modified) (1 diff)
• prime-mover.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• utilities/PrimeMoverSearchReplaceUtilities.php (modified) (1 diff)
• vendor/composer/installed.php (modified) (2 diffs)

prime-mover/trunk/PrimeMoverFactory.php

@@ -319 +319 @@
         $this->removePrimeMoverDirectoriesOnUninstall();
         $this->removePrimeMoverOptionsInDb();
+        $this->removePrimeMoverCrons();
+    }
+    
+    /**
+     * Remove Prime Mover cron hooks on uninstall
+     */
+    private function removePrimeMoverCrons()
+    {
+        if (!function_exists('getPrimeMoverCronHooks')) {
+            return;
+        }
+        
+        $prime_mover_crons = getPrimeMoverCronHooks();
+        if (!is_array($prime_mover_crons)) {
+            return;
+        }
+        
+        foreach ($prime_mover_crons as $cron_hook) {
+            if ($cron_hook && is_string($cron_hook)) {
+                wp_unschedule_hook($cron_hook);
+            }            
+        }
     }
     

prime-mover/trunk/changelog.txt

@@ -2 +2 @@
 
 **This is a list detailing changes for all Prime Mover releases.**
+
+= 2.0.4 =
+
+* Fixed: Data was missing on import due to a large extended insert in the database restore.
+* Updated Freemius SDK to the latest version.
 
 = 2.0.3 =

prime-mover/trunk/classes/PrimeMoverSystemFunctions.php

@@ -1195 +1195 @@
          */
         if ((isset($diff['users'])) && (! empty($diff['users']))) {
+            $admin_text = esc_html__('administrator', 'prime-mover');
+            $platform_text = esc_html__('WordPress', 'prime-mover');
+            $tutorial_link = PRIME_MOVER_RESETDB_TUTORIAL;
+            if (is_multisite()) {
+                $admin_text = esc_html__('super administrator', 'prime-mover');
+                $platform_text = esc_html__('WordPress multisite', 'prime-mover');
+                $tutorial_link = PRIME_MOVER_RESETDB_MULTISITE_TUTORIAL;
+            }            
+             
             $blank_site = true;
             if (isset($diff['users']['blank_site'])) {
@@ -1216 +1225 @@
             $msg .= esc_html__('For best restoration results, the following is recommended:', 'prime-mover');
             $msg .= '<ol>';
-            $msg .= '<li>' . sprintf(esc_html__('Start with a %s', 'prime-mover'), '<a class="prime-mover-external-link" target="_blank" href="' . PRIME_MOVER_RESETDB_TUTORIAL . '">' . esc_html__('fresh WordPress install', 'prime-mover') . '</a>.') . '</li>';
+            $msg .= '<li>' . sprintf(esc_html__('Start with a %s', 'prime-mover'), '<a class="prime-mover-external-link" target="_blank" href="' . $tutorial_link . '">' . sprintf(esc_html__('fresh %s install', 'prime-mover'), $platform_text) . '</a>.') . '</li>';
             
             $recommended_email = '';
@@ -1224 +1233 @@
             
             if ($recommended_email) {
-                $msg .= '<li>' . sprintf(esc_html__('Set %s as its administrator.', 'prime-mover'), '<strong>' . $recommended_email . '</strong>') . '</li>';
+                $msg .= '<li>' . sprintf(esc_html__('Set %s as its %s.', 'prime-mover'), '<strong>' . $recommended_email . '</strong>', $admin_text) . '</li>';
             } else {
                 $msg .= '<li>' . sprintf(esc_html__('Use a %s email, and do not use %s to avoid user restoration conflicts', 'prime-mover'), '<em>' . 
@@ -1231 +1240 @@
             
             $msg .= '</ol>';
-            $msg .= sprintf(esc_html__('To do this, you must cancel this import by clicking the "%s" button and re-install WordPress in a fresh state. Please %s about this feature.', 'prime-mover'), 
+            $msg .= sprintf(esc_html__('To do this, you must cancel this import by clicking the "%s" button and re-install %s in a fresh state. Please %s about this feature.', 'prime-mover'), 
                 '<strong>' . esc_html__('No', 'prime-mover') . '</strong>',
+                $platform_text,
                 '<a class="prime-mover-external-link" target="_blank" href="' . CODEXONICS_USER_DIFF_FAQ . '">' . esc_html__('read the FAQ', 'prime-mover') . '</a>');
             $msg .= PHP_EOL;
@@ -4759 +4769 @@
     
     /**
+     * Replace is_multisite returns TRUE if multisite.
+     * This function returns TRUE if multisite AND MAIN SITE IS fresh (entire network also)
+     * @param number $blog_id
+     * @return boolean
+     */
+    public function isFreshMultisiteMainSite($blog_id = 0)
+    {
+        if (!$blog_id) {
+            return false;
+        }
+
+        if (!is_multisite()) {
+            return false;
+        }
+        
+        $admins = get_super_admins();
+        if (!is_array($admins)) {
+            return false;
+        }
+        
+        $count_admins = count($admins);
+        $count_admins = (int)$count_admins;
+        if ($count_admins > 1) {
+            return false;
+        }
+        
+        $count_users = get_user_count();
+        $count_users = (int)$count_users;
+        if ($count_users > 1) {
+            return false;
+        }
+        
+        $large_network = wp_is_large_network();
+        if ($large_network) {
+            return false;
+        }
+        
+        $count_blogs = get_blog_count();
+        $count_blogs = (int)$count_blogs;
+        if ($count_blogs > 1) {
+            return false;
+        }       
+        
+        if (!$this->isMultisiteMainSite($blog_id)) {
+            return false;
+        }
+        
+        return true;
+    }
+    
+    /**
      * Clean Tables to export
      * @param number $blogid_to_export

prime-mover/trunk/classes/PrimeMoverUsers.php

@@ -134 +134 @@
         add_filter('prime_mover_process_userid_adjustment_db', [$this, 'dBCustomerUserIdsHelper'], 10, 13); 
         
-        add_filter('prime_mover_filter_config_after_diff_check', [ $this, 'handleUserDifferences'], 99, 1);
+        add_filter('prime_mover_filter_config_after_diff_check', [ $this, 'handleUserDifferences'], 99, 2);
     }   
     
@@ -140 +140 @@
      * Handle user differences
      * @param array $import_data
-     * @return array
-     */
-    public function handleUserDifferences(array $import_data)
-    {
-        $bailout = apply_filters('prime_mover_maybe_bailout_user_diff_check', false, $import_data);
+     * @param number $blog_id
+     * @return array
+     */
+    public function handleUserDifferences(array $import_data = [], $blog_id = 0)
+    {
+        $bailout = apply_filters('prime_mover_maybe_bailout_user_diff_check', false, $import_data, $blog_id);
         if ($bailout) {
             return $import_data;
@@ -154 +155 @@
         
         $do_user_diff_check = !wp_is_large_user_count();
-        if (!$do_user_diff_check || is_multisite()) {
+        if (!$do_user_diff_check) {
+            return $import_data;
+        }
+        
+        if (is_multisite() && false === $this->getSystemFunctions()->isFreshMultisiteMainSite($blog_id)) {
             return $import_data;
         }

prime-mover/trunk/engines/prime-mover-panel/advance/PrimeMoverTroubleshooting.php

@@ -178 +178 @@
         add_action('wp_ajax_prime_mover_clear_locked_settings', [$this,'clearLockedSettings']);
         
-        add_filter('prime_mover_maybe_bailout_user_diff_check', [$this, 'maybeBailOutUserSiteDiff'], 10, 1);
+        add_filter('prime_mover_maybe_bailout_user_diff_check', [$this, 'maybeBailOutUserSiteDiff'], 10, 3);
     }
 
@@ -184 +184 @@
      * Maybe bail out user site diff
      * @param boolean $bailout
+     * @param array $ret
+     * @param number $blog_id
      * @return string|boolean
      */
-    public function maybeBailOutUserSiteDiff($bailout = false)
+    public function maybeBailOutUserSiteDiff($bailout = false, $ret = [], $blog_id = 0)
     {
         $setting = $this->getPrimeMoverSettings()->getSetting(self::DISABLE_USER_DIFF_CHECK);
-        if (!$setting || is_multisite()) {
+        if (!$setting) {
+            return $bailout;
+        }
+        
+        if (is_multisite() && false === $this->getPrimeMover()->getSystemFunctions()->isFreshMultisiteMainSite($blog_id)) {
             return $bailout;
         }
@@ -740 +746 @@
     public function renderDisableUserDiffMarkup()
     {
+        $blog_id = 0;
         if (is_multisite()) {
+            $blog_id = get_current_blog_id();
+        }
+        
+        if ($blog_id && false === $this->getPrimeMover()->getSystemFunctions()->isFreshMultisiteMainSite($blog_id)) {   
             return;
         }

prime-mover/trunk/engines/prime-mover-panel/prime-mover-panel.php

@@ -43 +43 @@
 }
 define( 'PRIME_MOVER_PANEL_PLUGINPATH', plugin_dir_path( __FILE__ ) );
-define( 'PRIME_MOVER_PANEL_VERSION', '2.0.6' );
+define( 'PRIME_MOVER_PANEL_VERSION', '2.0.7' );
 define( 'PRIME_MOVER_PANEL_MAINPLUGIN_FILE', __FILE__ );
 define( 'PRIME_MOVER_PANEL_PLUGINBASENAME', plugin_basename( PRIME_MOVER_PANEL_MAINPLUGIN_FILE ) );

prime-mover/trunk/engines/prime-mover-panel/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '50872445a354c9a4f93d35b245b7a9b4db40a151',
+        'reference' => '44126d4736eeaf70024cc5acab43fdfe647dd0df',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '50872445a354c9a4f93d35b245b7a9b4db40a151',
+            'reference' => '44126d4736eeaf70024cc5acab43fdfe647dd0df',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',

prime-mover/trunk/global/PrimeMoverGlobalConstants.php

@@ -9 +9 @@
 }
 
-define('PRIME_MOVER_VERSION', '2.0.6');
+define('PRIME_MOVER_VERSION', '2.0.7');
 define('PRIME_MOVER_PLUGIN_CODENAME', 'Prime Mover');
 define('PRIME_MOVER_PRO_PLUGIN_CODENAME', 'Prime Mover PRO');
@@ -224 +224 @@
 }
 
+if (!defined('PRIME_MOVER_RESETDB_MULTISITE_TUTORIAL')) {
+    define('PRIME_MOVER_RESETDB_MULTISITE_TUTORIAL', 'https://codexonics.com/prime_mover/prime-mover/how-to-create-a-fresh-wordpress-multisite-install-with-a-specific-network-administrator-email/');
+}
+
 if (!defined('PRIME_MOVER_FIX_MU_SCRIPT_TUTORIAL')) {
     define('PRIME_MOVER_FIX_MU_SCRIPT_TUTORIAL', 'https://codexonics.com/prime_mover/prime-mover/troubleshooting-unable-to-activate-prime-mover-in-restricted-mu-plugins-directory/');

prime-mover/trunk/global/PrimeMoverGlobalFunctions.php

@@ -615 +615 @@
 
 }
+if ( !function_exists( 'str_starts_with' ) ) {
+    function str_starts_with(  $haystack, $needle  ) {
+        if ( '' === $needle ) {
+            return true;
+        }
+        return 0 === strpos( $haystack, $needle );
+    }
+
+}
+if ( !function_exists( 'getPrimeMoverCronHooks' ) ) {
+    function getPrimeMoverCronHooks() {
+        $prime_mover_crons = [];
+        if ( !function_exists( '_get_cron_array' ) ) {
+            return $prime_mover_crons;
+        }
+        $cron = _get_cron_array();
+        if ( !is_array( $cron ) ) {
+            return $prime_mover_crons;
+        }
+        $cron_values = array_values( $cron );
+        foreach ( $cron_values as $v ) {
+            if ( !is_array( $v ) ) {
+                continue;
+            }
+            $cron_hooks = array_keys( $v );
+            foreach ( $cron_hooks as $hook ) {
+                if ( $hook && is_string( $hook ) && str_starts_with( $hook, 'primeMover' ) ) {
+                    $prime_mover_crons[] = $hook;
+                }
+            }
+        }
+        return $prime_mover_crons;
+    }
+
+}
 if ( !function_exists( 'primeMoverRestoreAdminCaps' ) ) {
     function primeMoverRestoreAdminCaps() {

prime-mover/trunk/prime-mover.php

@@ -5 +5 @@
 Plugin URI: https://codexonics.com/
 Description: The simplest all-around WordPress migration tool/backup plugin. These support multisite backup/migration or clone WP site/multisite subsite.
-Version: 2.0.6
+Version: 2.0.7
 Author: Codexonics
 Author URI: https://codexonics.com/

prime-mover/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.8
 Requires PHP: 5.6
-Stable tag: 2.0.6
+Stable tag: 2.0.7
 License: GPLv3 or later
 License URI: https://codexonics.com
@@ -105 +105 @@
 == Changelog ==
 
+= 2.0.7 =
+
+* Fixed: Malformed domain name due to edge case double search replace.
+* Feature: Added user difference check when migrating site to multisite main site.
+* Fixed: Removed cron jobs when the plugin is uninstalled.
+
 = 2.0.6 =
 
@@ -125 +131 @@
 * Usability: Added tutorial to download packages in different ways.
 
-= 2.0.4 =
-
-* Fixed: Data was missing on import due to a large extended insert in the database restore.
-* Updated Freemius SDK to the latest version.
-
 See the previous changelogs in changelog.txt.

prime-mover/trunk/utilities/PrimeMoverSearchReplaceUtilities.php

@@ -325 +325 @@
         add_filter('prime_mover_filter_final_replaceables', [$this, 'maybeUnsetWpRoot'], 25000, 4);
         add_filter('prime_mover_filter_final_replaceables', [$this, 'maybeAdjustEdgeRelativeCustomContentUploads'], 30000, 4);
+        add_filter('prime_mover_filter_final_replaceables', [$this, 'maybeUnsetGenericAltDomain'], 35000, 4);
+    }
+ 
+    /**
+     * Maybe unset generic alt domain
+     * @param array $replaceables
+     * @param array $ret
+     * @param boolean $retries
+     * @param number $blogid_to_import
+     */
+    public function maybeUnsetGenericAltDomain($replaceables = [], $ret = [], $retries = false, $blogid_to_import = 0)
+    {
+        if (!$this->getSystemAuthorization()->isUserAuthorized() || !is_array($replaceables)) {
+            return $replaceables;
+        }
+        
+        if (!is_multisite()) {
+            return $replaceables;
+        }
+        
+        if (!isset($replaceables['generic_alt_domain_scheme'])) {               
+            return $replaceables;
+        }      
+        
+        $generic_domain_scheme_replace = '';
+        $generic_alt_domain_scheme_replace = '';
+       
+        if (isset($replaceables['generic_domain_scheme']['replace'])) {
+            $generic_domain_scheme_replace = $replaceables['generic_domain_scheme']['replace'];
+        }
+           
+        if (isset($replaceables['generic_alt_domain_scheme']['replace'])) {
+            $generic_alt_domain_scheme_replace = $replaceables['generic_alt_domain_scheme']['replace'];
+        }
+        
+        if (!$generic_domain_scheme_replace || !$generic_alt_domain_scheme_replace) {
+            return $replaceables;
+        }
+        
+        if ($generic_domain_scheme_replace !== $generic_alt_domain_scheme_replace) {
+            return $replaceables;
+        }
+        
+        $search = '';
+        $replace = '';
+        $subject = '';
+        
+        if (isset($replaceables['generic_alt_domain_scheme']['search'])) {
+            $search = $replaceables['generic_alt_domain_scheme']['search'];
+        }
+        
+        if (isset($replaceables['generic_alt_domain_scheme']['replace'])) {
+            $replace = $replaceables['generic_alt_domain_scheme']['replace'];
+        }
+        
+        if (isset($replaceables['generic_domain_scheme']['replace'])) {
+            $subject = $replaceables['generic_domain_scheme']['replace'];
+        }
+        
+        if (!$search || !$replace || !$subject) {
+            return $replaceables;
+        }
+        
+        if (!is_string($search) || !is_string($replace) || !is_string($subject)) {
+            return $replaceables;
+        }
+        
+        $search = trim($search);
+        $replace = trim($replace);
+        $subject = trim($subject);
+        
+        $result = str_replace($search, $replace, $subject);
+        $problem = false;
+        if ($result !== $subject && $result !== $replace) {
+             $problem = true;
+        }
+        
+        if (!$problem) {
+            return $replaceables;            
+        }
+        
+        if (isset($replaceables['generic_alt_domain_scheme'])) {
+            unset($replaceables['generic_alt_domain_scheme']);
+        }
+
+        if (isset($replaceables['generic_alt_domain_scheme_slashedvar'])) {
+            unset($replaceables['generic_alt_domain_scheme_slashedvar']);
+        } 
+        
+        return $replaceables;;
     }
     

prime-mover/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '50872445a354c9a4f93d35b245b7a9b4db40a151',
+        'reference' => '44126d4736eeaf70024cc5acab43fdfe647dd0df',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '50872445a354c9a4f93d35b245b7a9b4db40a151',
+            'reference' => '44126d4736eeaf70024cc5acab43fdfe647dd0df',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',