Merge branch 'master' into trunk

Author: Honemo

.github/workflows/deploy-beta.yml

@@ -0,0 +1,20 @@
+name: Deploy Beta to WordPress.org
+on:
+  release:
+    types:
+      - published
+jobs:
+  tag:
+    name: New Release
+    runs-on: ubuntu-latest
+    if: ${{ contains(github.event.release.name, 'beta') }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: WordPress Beta Plugin Deploy
+        uses: wp-media/action-wordpress-plugin-trunk-deploy@v1.0.1
+        env:
+          SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+          SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+          SLUG: backwpup

.github/workflows/deploy-release.yml

@@ -7,10 +7,10 @@ jobs:
   tag:
     name: New Release
     runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.release.name, 'beta') }}
     steps:
-
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
 
       - name: WordPress Plugin Deploy
         uses: 10up/action-wordpress-plugin-deploy@stable

assets/css/backwpup-admin.css

@@ -999,6 +999,10 @@ select {
   margin-top: 0.5rem;
 }
 
+.mt-3 {
+  margin-top: 0.75rem;
+}
+
 .mt-4 {
   margin-top: 1rem;
 }
@@ -1617,6 +1621,14 @@ select {
   padding-bottom: 5rem;
 }
 
+.pl-3 {
+  padding-left: 0.75rem;
+}
+
+.pr-3 {
+  padding-right: 0.75rem;
+}
+
 .pr-4 {
   padding-right: 1rem;
 }
@@ -1766,6 +1778,10 @@ select {
   color: rgb(255 255 255 / var(--tw-text-opacity, 1));
 }
 
+.underline {
+  text-decoration-line: underline;
+}
+
 .opacity-0 {
   opacity: 0;
 }

assets/js/backwpup-admin.js

@@ -2195,6 +2195,17 @@ jQuery(document).ready(function ($) {
     }
   }
 
+  /**
+   * Function to initialize the frequency job settings
+   * Runs when the element `.js-backwpup-frequency-job` is found in the DOM.
+   */
+  function runWhenJobFormatSettingsLoaded() {
+    const $element = $(".js-backwpup-format-job");
+    if ($element.length) {
+      showArchiveFormatJobFields($element);
+    }
+  }
+
   /**
    * MutationObserver: Watches for new elements being added to the DOM
    * When a `.js-backwpup-frequency-job` field appears, it triggers `runWhenJobFrequencySettingsLoaded()`
@@ -2206,13 +2217,100 @@ jQuery(document).ready(function ($) {
         if ($(node).is(".js-backwpup-frequency-job") || $(node).find(".js-backwpup-frequency-job").length) {
           runWhenJobFrequencySettingsLoaded();
         }
+        const format_job_element = $(node).find(".js-backwpup-format-job");
+        if ($(node).is(".js-backwpup-format-job") || format_job_element.length) {
+          showArchiveFormatJobFields(format_job_element);
+        }
       });
     });
   });
 
   // Start observing DOM changes on the entire document
   observer.observe(document.body, { childList: true, subtree: true });
 
+  /**
+   * Event Listener: Detect changes in format dropdown
+   * Calls `showArchiveFormatJobFields()` whenever the user selects a new frequency.
+   */
+  $document.on("change", ".js-backwpup-format-job", function () {
+    showArchiveFormatJobFields($(this));
+  });
+
+  /**
+   * Event Listener: Detect changes in archive name input
+   * Calls `showArchiveFormatJobFields()` whenever the user selects a new frequency.
+   */
+  $document.on("input", ".js-backwpup-format-job-name", function () {
+    let name = $(this).val();
+    let error_box = $(this).closest(`div`).find(`.js-backwpup-format-job-name-no-hash`);
+    if ( ! name ) {
+      return;
+    }
+    if ( name.includes('%hash%') ) {
+      error_box.hide();
+    } else {
+      error_box.show();
+    }
+    //replace plaseholder
+    let name_preview_span = error_box.parent().find(`.js-backwpup-format-archive-name`);
+    let name_previev = name.trim().replace('%hash%', name_preview_span.data('hash'));
+    const date = new Date();
+    let hourIn12Format = date.getHours();
+    let dayPart = 'am'
+    if (hourIn12Format > 12) {
+      hourIn12Format = hourIn12Format - 12;
+      dayPart = 'pm'
+    }
+    name_previev = name_previev.replace('%d', String(date.getDay() + 1).padStart(2, '0'));
+    name_previev = name_previev.replace('%m', String(date.getMonth() + 1).padStart(2, '0'));
+    name_previev = name_previev.replace('%n', String(date.getMonth() + 1));
+    name_previev = name_previev.replace('%j', date.getDay() + 1);
+    name_previev = name_previev.replace('%Y', date.getFullYear());
+    name_previev = name_previev.replace('%y', String(date.getFullYear()).slice(-2));
+    name_previev = name_previev.replace('%a', dayPart);
+    name_previev = name_previev.replace('%A', dayPart.toUpperCase());
+    let btm = ( ( date.getHours() * 60 + date.getMinutes() ) * 86.4 / 100 ).toFixed(0);
+    name_previev = name_previev.replace('%B', btm);
+    name_previev = name_previev.replace('%g', hourIn12Format);
+    name_previev = name_previev.replace('%G', date.getHours());
+    name_previev = name_previev.replace('%h', String(hourIn12Format).padStart(2, '0'));
+    name_previev = name_previev.replace('%H', String(date.getHours()).padStart(2, '0'));
+    name_previev = name_previev.replace('%i', date.getMinutes());
+    name_previev = name_previev.replace('%s', date.getSeconds());
+    //replace special chars
+    let specialChars = [ '?', '[', ']', '/', '\\', '=', '<', '>', ':', ';', ',', "'", '"', '&', '$', '#', '*', '(', ')', '|', '~', '`', '!', '{', '}' ];
+    specialChars.forEach(function (char) {
+      name_previev = name_previev.replace(char, '');
+    });
+    let spaces = [ ' ', '%20', '+' ];
+    spaces.forEach(function (space) {
+      name_previev = name_previev.replace(space, '_');
+    });
+    let divider = [ '\t', '\r', '\n' ];
+    divider.forEach(function (divider) {
+      name_previev = name_previev.replace(divider, '-');
+    });
+    name_preview_span.text(name_previev);
+  });
+
+  /**
+   * Function to show/hide elements based on selected job archive format
+   * @param {string} element - the element to check.
+   */
+  function showArchiveFormatJobFields(element) {
+    let format = element.val();
+    let alert_box = element.closest(`div`).next(`.js-backwpup-format-job-show-if-zip`);
+    if (format === ".zip") {
+      alert_box.show();
+    } else {
+      alert_box.hide();
+    }
+    let name_preview = alert_box.parent().find(`.js-backwpup-format-archive-name-format`);
+    if ( name_preview ) {
+      name_preview.text(format);
+    }
+  }
+
   /**
    * Event Listener: Detect changes in frequency dropdown
    * Calls `showFrequencyJobFields()` whenever the user selects a new frequency.
@@ -2290,8 +2388,42 @@ jQuery(document).ready(function ($) {
     );
   });
 
+
+  /**
+   * Event Listener: Handles the "Save Job Format Settings" button click
+   * Extracts form data and sends an AJAX request to save the job format settings.
+   */
+  $document.on("click", "#save-job-format", function () {
+    const container = $(this).closest("article");
+
+    // Collect input values from the form
+    const data = {
+      archiveformat: container.find("select[name='archiveformat']").val(),
+      archivename: container.find("input[name='archivename']").val(),
+      job_id: container.find("input[name='job_id']").val(),
+    };
+
+    // Send AJAX request to save job settings
+    requestWPApi(
+      backwpupApi.save_job_format,
+      data,
+      function (response) {
+        if (response.status === 200) {
+          backwpupDisplaySettingsToast('success', response.message);
+          // Close the settings sidebar
+          closeSidebar();
+        }
+        if (response.status === 500) {
+          backwpupDisplaySettingsToast('danger', response.error);
+        }
+      },
+      "POST"
+    );
+  });
+
   // Run the job settings function on initial page load
   runWhenJobFrequencySettingsLoaded();
+  runWhenJobFormatSettingsLoaded();
 
   $document.on('click', '.backwpup-start-backup-job', function () {
 	  startBackupProcess({ 'job_id': $(this).data('job_id') });

assets/js/backwpup-admin.min.js

@@ -5,7 +5,7 @@
  * Description: WordPress Backup Plugin
  * Author: BackWPup – WordPress Backup & Restore Plugin
  * Author URI: https://backwpup.com
- * Version: 5.4.0
+ * Version: 5.5.0
  * Requires at least: 4.9
  * Requires PHP: 7.4
  * Text Domain: backwpup

backwpup.php

@@ -1,12 +1,23 @@
 == Changelog ==
+= 5.5.0 =
+Release date: September 16, 2025
+
+* New Feature: Archive format per backup
+* New Feature: Archive name per backup
+
+= 5.4.1 =
+Release date: September 2, 2025
+
+* Fix: Additional Guzzle Dependency conflicts causing errors.
+
 = 5.4 =
 Release date: August 20, 2025
 
 * New feature: Add extra files or folders for backups
 * Fix: Sending unwanted warning email because of .donotbackup file.
-* FIx: Showing cursor pointer on non-clickable elements.
-* FIx: Backup downloads are not working for FTP storage.
-* Fix: Guzzle Dependency conflict causing errors in backups.
+* Fix: Showing cursor pointer on non-clickable elements.
+* Fix: Backup downloads are not working for FTP storage.
+* Fix: Guzzle Dependency conflict causing errors in backups
 * Fix: The Encrypt archive option is disabled after the update.
 * Fix: The backup now icon is closer to the date of scheduled backups.
 * Fix: No backup is created for any storage when OneDrive is selected during onboarding.

changelog.txt

@@ -41,7 +41,7 @@
 
 ?>
 <label class="<?php echo BackWPupHelpers::clsx($container_classes, $container_contextual_classes); ?>">
-  <input name="<?=esc_attr($name)?>" type="<?php echo esc_attr($type); ?>" <?php echo $id; ?> class="<?php echo BackWPupHelpers::clsx("input-base text-lg w-full", $trigger); ?>" placeholder="" <?php if ($required) : ?>required<?php endif; ?> value="<?php echo esc_attr($value); ?>" <?php if (isset($min) && $type === "number") : ?>min="<?php echo esc_attr($min); ?>" <?php endif; ?> <?php if (isset($max) && $type === "number") : ?>max="<?php echo esc_attr($max); ?>" <?php endif; ?>>
+  <input name="<?=esc_attr($name)?>" type="<?php echo esc_attr($type); ?>" <?php echo $id; ?> class="<?php echo BackWPupHelpers::clsx("input-base text-lg w-full", $trigger); ?>" placeholder="" <?php if ($required) : ?>required<?php endif; ?> value="<?php echo esc_attr($value); ?>" <?php if (isset($min) && $type === "number") : ?>min="<?php echo esc_attr($min); ?>" <?php endif; ?> <?php if (isset($max) && $type === "number") : ?>max="<?php echo esc_attr($max); ?>" <?php endif; ?><?php if (isset($maxlength)) : ?> maxlength="<?php echo esc_attr($maxlength); ?>" <?php endif; ?>>
   <p class="<?php echo $text_classes; ?> <?php echo $text_contextual_classes; ?>">
     <?php echo $label; ?>
     <?php isset($tooltip) && BackWPupHelpers::component("tooltip", ["content" => $tooltip, "icon_size" => "small", "position" => $tooltip_pos]); ?>

components/form/text.php

@@ -206,5 +206,23 @@
 			]
 		);
 		?>
+      <span class="h-5 w-0 border-r border-primary-darker"></span>
+      <?php
+      BackWPupHelpers::component(
+        'form/button',
+        [
+          'type'     => 'link',
+          'label'    => __( 'Format', 'backwpup' ),
+          'trigger'  => 'load-and-open-sidebar',
+          'display'  => 'format',
+          'disabled' => ! $is_active,
+          'data'     => [
+            'job-id'     => $job_id,
+            'block-type' => 'children',
+            'block-name' => 'sidebar/format',
+          ],
+        ]
+      );
+      ?>
     </p>
 </div>

components/job-item.php

@@ -113,12 +113,16 @@ function ( &$item ) use ( $job_data, $dest, $page ) {
 				$item = array_merge( $item, $job_data, [ 'stored_on' => $dest ] );
 
 				// Parse the filename to get the type of backup.
-				$filename       = pathinfo( $item['filename'] )['filename'];
-				$filename       = preg_replace( '/\.[^.]+$/', '', $filename ); // Remove file extensions.
+				$filename = pathinfo( $item['filename'] )['filename'];
+				if ( stripos( $item['filename'], '.tar.gz' ) === strlen( $item['filename'] ) - 7 ) {
+					$filename = substr( $item['filename'], 0, -7 );
+				} elseif ( stripos( $item['filename'], '.tar.bz2' ) === strlen( $item['filename'] ) - 8 ) {
+					$filename = substr( $item['filename'], 0, -8 );
+				}
 				$filename_parts = explode( '_', $filename );
 
-				if ( isset( $filename_parts[3] ) ) {
-					$item['data'] = (array) explode( '-', $filename_parts[3] );
+				if ( count( $filename_parts ) > 1 ) {
+					$item['data'] = (array) explode( '-', end( $filename_parts ) );
 				}
 
 				$local_file      = untrailingslashit( BackWPup::get_plugin_data( 'TEMP' ) ) . "/{$item['filename']}";