Changeset 2997269

Timestamp:

11/16/2023 06:32:01 PM (2 years ago)

Author:

andreamk

Message:

Staging version 1.5.7.1

Location:

duplicator/trunk

Files:

• classes/package/class.pack.php (modified) (2 diffs)
• classes/utilities/class.u.php (modified) (2 diffs)
• define.php (modified) (1 diff)
• duplicator.php (modified) (1 diff)
• installer/dup-installer/main.installer.php (modified) (1 diff)
• src/Core/MigrationMng.php (modified) (3 diffs)
• src/Libs/Snap/SnapIO.php (modified) (1 diff)
• views/tools/diagnostics/information.php (modified) (2 diffs)

duplicator/trunk/classes/package/class.pack.php

@@ -1207 +1207 @@
 
             $file_name = basename($glob_full_path);
+            if ($file_name === 'index.php') {
+                continue;
+            }
+
             // skip all active packages
             foreach ($active_files as $c_nameHash) {
@@ -1691 +1695 @@
             $dir = DUP_Settings::getSsdirTmpPath() . "/*";
             foreach (glob($dir) as $file) {
+                if (basename($file) === 'index.php') {
+                    continue;
+                }
                 @unlink($file);
             }

duplicator/trunk/classes/utilities/class.u.php

@@ -595 +595 @@
         SnapIO::chmod($path_ssdir, 'u+rwx,go+rx');
         SnapIO::dirWriteCheckOrMkdir(DUP_Settings::getSsdirTmpPath(), 'u+rwx');
+        SnapIO::createSilenceIndex(DUP_Settings::getSsdirTmpPath());
 
         //--------------------------------
         //FILE CREATION & HARDEN PROCESS
         //index.php, .htaccess, robots.txt
-        self::setupBackupDirIndexFile();
+        SnapIO::createSilenceIndex(DUP_Settings::getSsdirPath());
         self::setupBackupDirRobotsFile();
         self::setupBackupDirHtaccess();
         self::performHardenProcesses();
+        // For old installations
+        SnapIO::createSilenceIndex(DUP_Settings::getSsdirInstallerPath());
 
         return true;
@@ -641 +644 @@
         } catch (Exception $ex) {
             DUP_Log::Trace("Unable create file htaccess {$fileName} msg:" . $ex->getMessage());
-        }
-    }
-
-    /**
-     * Attempts to create an index.php file in the backups directory
-     *
-     * @return void
-     */
-    protected static function setupBackupDirIndexFile()
-    {
-        try {
-            $fileName = DUP_Settings::getSsdirPath() . '/index.php';
-            if (!file_exists($fileName)) {
-                $fileContent = <<<HTACCESS
-<?php
-// silence;
-HTACCESS;
-                if (file_put_contents($fileName, $fileContent) === false) {
-                    throw new Exception('Can\'t create .haccess');
-                }
-            }
-        } catch (Exception $ex) {
-            DUP_Log::Trace("Unable create index.php {$fileName} msg:" . $ex->getMessage());
         }
     }

duplicator/trunk/define.php

@@ -12 +12 @@
 
 if (function_exists('plugin_dir_url')) {
-    define('DUPLICATOR_VERSION', '1.5.7');
+    define('DUPLICATOR_VERSION', '1.5.7.1');
     define('DUPLICATOR_PLUGIN_URL', plugin_dir_url(__FILE__));
     define('DUPLICATOR_SITE_URL', get_site_url());

duplicator/trunk/duplicator.php

@@ -5 +5 @@
  * Plugin URI: https://duplicator.com/
  * Description: Migrate and backup a copy of your WordPress files and database. Duplicate and move a site from one location to another quickly.
- * Version: 1.5.7
+ * Version: 1.5.7.1
  * Requires at least: 4.0
  * Tested up to: 6.4

duplicator/trunk/installer/dup-installer/main.installer.php

@@ -35 +35 @@
 }
 
-define('DUPX_VERSION', '1.5.7');
+define('DUPX_VERSION', '1.5.7.1');
 define('DUPX_INIT', str_replace('\\', '/', dirname(__FILE__)));
 define('DUPX_ROOT', preg_match('/^[\\\\\/]?$/', dirname(DUPX_INIT)) ? '/' : dirname(DUPX_INIT));

duplicator/trunk/src/Core/MigrationMng.php

@@ -10 +10 @@
 use DUP_CTRL_Tools;
 use DUP_Settings;
+use DUP_Util;
 use Duplicator\Libs\Snap\SnapWP;
 use Duplicator\Libs\Snap\SnapIO;
@@ -46 +47 @@
     {
         add_action('admin_init', array(__CLASS__, 'adminInit'));
+        add_action(self::HOOK_FIRST_LOGIN_AFTER_INSTALL, function ($migrationData) {
+            DUP_Util::initSnapshotDirectory();
+        });
         add_action(self::HOOK_FIRST_LOGIN_AFTER_INSTALL, array(__CLASS__, 'removeFirstLoginOption'));
         add_action(self::HOOK_FIRST_LOGIN_AFTER_INSTALL, array(__CLASS__, 'renameInstallersPhpFiles'));
@@ -359 +363 @@
         wp_mkdir_p($ssdInstallerPath);
         SnapIO::emptyDir($ssdInstallerPath);
+        SnapIO::createSilenceIndex($ssdInstallerPath);
 
         $filesToMove = array(

duplicator/trunk/src/Libs/Snap/SnapIO.php

@@ -918 +918 @@
 
     /**
+     * Create an empty index.php file in dir.
+     *
+     * @param string $dir Dir where create index.php
+     *
+     * @return bool true on success, false on failure
+     */
+    public static function createSilenceIndex($dir)
+    {
+        if (!is_dir($dir)) {
+            return false;
+        }
+
+        $path = self::trailingslashit($dir) . 'index.php';
+        if (!file_exists($path)) {
+            $fileContent = <<<INDEXPHP
+<?php
+// silence
+
+INDEXPHP;
+            return (file_put_contents($path, $fileContent) !== false);
+        }
+
+        return true;
+    }
+
+    /**
      * from wordpress function wp_is_stream
      *

duplicator/trunk/views/tools/diagnostics/information.php

@@ -47 +47 @@
     }
 }
+
+$remove_response = '';
+if (isset($_POST['remove-options'])) {
+    if (!isset($_POST['_wpnonce']) || !wp_verify_nonce($_POST['_wpnonce'], 'duplicator_settings_page')) {
+        wp_die(__('Security check failed.', 'duplicator'));
+    }
+
+    $remove_options = sanitize_text_field($_POST['remove-options']);
+    $action_result  = DUP_Settings::DeleteWPOption($remove_options);
+    switch ($remove_options) {
+        case 'duplicator_settings':
+                $remove_response = __('Plugin settings reset.', 'duplicator');
+            break;
+        case 'duplicator_ui_view_state':
+                $remove_response = __('View state settings reset.', 'duplicator');
+            break;
+        case 'duplicator_package_active':
+                $remove_response = __('Active package settings reset.', 'duplicator');
+            break;
+    }
+}
 ?>
-
 
 <form id="dup-settings-form" action="<?php echo admin_url('admin.php?page=duplicator-tools&tab=diagnostics&section=info'); ?>" method="post">
@@ -55 +75 @@
 
     <?php
-    if (isset($_POST['remove-options'])) {
-        $remove_options = sanitize_text_field($_POST['remove-options']);
-        $action_result  = DUP_Settings::DeleteWPOption($remove_options);
-        switch ($remove_options) {
-            case 'duplicator_settings':
-                    $remove_response = __('Plugin settings reset.', 'duplicator');
-                break;
-            case 'duplicator_ui_view_state':
-                    $remove_response = __('View state settings reset.', 'duplicator');
-                break;
-            case 'duplicator_package_active':
-                    $remove_response = __('Active package settings reset.', 'duplicator');
-                break;
-        }
-    }
-
     if (! empty($remove_response)) {
         echo "<div id='message' class='notice notice-success is-dismissible dup-wpnotice-box'><p>" . esc_html($remove_response) . "</p></div>";
     }
 
-        include_once 'inc.data.php';
-        include_once 'inc.settings.php';
-        include_once 'inc.validator.php';
-        include_once 'inc.phpinfo.php';
+    include_once 'inc.data.php';
+    include_once 'inc.settings.php';
+    include_once 'inc.validator.php';
+    include_once 'inc.phpinfo.php';
     ?>
+    
 </form>