From 4ea1f40efcc7d875214952838a34ca3d0fd5deb6 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Wed, 20 Oct 2021 19:12:34 +0900
Subject: [PATCH 1/3] Fix S3 path-style option

---
 inc/class-destination-s3.php | 26 +++++++++++++-------------
 inc/class-s3-destination.php |  4 ++++
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/inc/class-destination-s3.php b/inc/class-destination-s3.php
index aa06e2fb..432a34d0 100755
--- a/inc/class-destination-s3.php
+++ b/inc/class-destination-s3.php
@@ -20,7 +20,7 @@ public function option_defaults() {
         return [
             's3base_url' => '',
             's3base_multipart' => true,
-            's3base_pathstyle' => false,
+            's3base_pathstylebucket' => false,
             's3base_version' => 'latest',
             's3base_signature' => 'v4',
             's3accesskey' => '',
@@ -130,12 +130,12 @@ class="regular-text"
                                         </legend>
                                         <label for="s3base_multipart">
                                             <input name="s3base_multipart" type="checkbox"
-                                                   checked="checked" value="<?= !empty(
+                                                   value="1" <?= !empty(
                                             BackWPup_Option::get(
                                                 $jobid,
                                                 's3base_multipart'
                                             )
-                                            ) ? '1' : '' ?>">
+                                            ) ? 'checked="checked"' : '' ?>>
                                             <?php esc_html_e(
                                                 'Destination supports multipart',
                                                 'backwpup'
@@ -159,12 +159,12 @@ class="regular-text"
                                         <label
                                             for="s3base_pathstylebucket">
                                             <input name="s3base_pathstylebucket" type="checkbox"
-                                                   value="<?= !empty(
+                                                   value="1" <?= !empty(
                                                    BackWPup_Option::get(
                                                        $jobid,
                                                        's3base_pathstylebucket'
-                                                   ) ? '1' : ''
-                                                   ) ?>">
+                                                   )
+                                                   ) ? 'checked="checked"' : '' ?>>
                                             <?php esc_html_e(
                                                 'Destination provides only Pathstyle buckets',
                                                 'backwpup'
@@ -572,8 +572,8 @@ public function edit_form_post_save( $jobid ) {
         );
         BackWPup_Option::update(
             $jobid,
-            's3base_pathstyle',
-            isset($_POST['s3base_pathstyle']) ? '1' : ''
+            's3base_pathstylebucket',
+            isset($_POST['s3base_pathstylebucket']) ? '1' : ''
         );
         BackWPup_Option::update(
             $jobid,
@@ -1110,11 +1110,11 @@ function awsgetbucket() {
 						s3bucketselected: $( 'input[name="s3bucketselected"]' ).val(),
 						s3base_url      : $( 'input[name="s3base_url"]' ).val(),
 						s3region        : $( '#s3region' ).val(),
-						s3base_region      : $( 'input[name="s3base_region"]' ).val(),
-						s3base_version      : $( 'input[name="s3base_version"]' ).val(),
-						s3base_signature      : $( 'input[name="s3base_signature"]' ).val(),
-						s3base_multipart      : $( 'input[name="s3base_multipart"]' ).is(':checked'),
-						s3base_pathstyle      : $( 'input[name="s3base_pathstyle"]' ).is(':checked'),
+						s3base_region          : $( 'input[name="s3base_region"]' ).val(),
+						s3base_version         : $( 'input[name="s3base_version"]' ).val(),
+						s3base_signature       : $( 'input[name="s3base_signature"]' ).val(),
+						s3base_multipart       : $( 'input[name="s3base_multipart"]' ).is(':checked'),
+						s3base_pathstylebucket : $( 'input[name="s3base_pathstylebucket"]' ).is(':checked'),
 						_ajax_nonce     : $( '#backwpupajaxnonce' ).val()
 					};
 					$.post( ajaxurl, data, function ( response ) {
diff --git a/inc/class-s3-destination.php b/inc/class-s3-destination.php
index be1e947f..cd86b71f 100755
--- a/inc/class-s3-destination.php
+++ b/inc/class-s3-destination.php
@@ -165,6 +165,9 @@ public static function options()
                     'label' => __('Scaleway: AMS', 'backwpup'),
                     'endpoint' => 'https://s3.nl-ams.scw.cloud',
                 ],
+                'custom' => [
+                    'label' => __('Custom S3 destination', 'backwpup'),
+                ],
             ]
         );
     }
@@ -237,6 +240,7 @@ public function client($accessKey, $secretKey)
                 'verify' => BackWPup::get_plugin_data('cacert'),
             ],
             'version' => $this->version(),
+            'use_path_style_endpoint' => $this->onlyPathStyleBucket(),
         ];
 
         if ($this->endpoint()) {

From a0b01062a54cf0d8c920b7e0dbed3337ef178894 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Tue, 30 Nov 2021 00:18:57 +0900
Subject: [PATCH 2/3] Revert change for custom

---
 inc/class-s3-destination.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/inc/class-s3-destination.php b/inc/class-s3-destination.php
index cd86b71f..5f95819f 100755
--- a/inc/class-s3-destination.php
+++ b/inc/class-s3-destination.php
@@ -165,9 +165,6 @@ public static function options()
                     'label' => __('Scaleway: AMS', 'backwpup'),
                     'endpoint' => 'https://s3.nl-ams.scw.cloud',
                 ],
-                'custom' => [
-                    'label' => __('Custom S3 destination', 'backwpup'),
-                ],
             ]
         );
     }

From f009b0e966c5eaf16389431b64d506cf049fca81 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Tue, 30 Nov 2021 00:19:28 +0900
Subject: [PATCH 3/3] Use checked()

---
 inc/class-destination-s3.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/inc/class-destination-s3.php b/inc/class-destination-s3.php
index 432a34d0..49028845 100755
--- a/inc/class-destination-s3.php
+++ b/inc/class-destination-s3.php
@@ -130,12 +130,11 @@ class="regular-text"
                                         </legend>
                                         <label for="s3base_multipart">
                                             <input name="s3base_multipart" type="checkbox"
-                                                   value="1" <?= !empty(
-                                            BackWPup_Option::get(
-                                                $jobid,
-                                                's3base_multipart'
-                                            )
-                                            ) ? 'checked="checked"' : '' ?>>
+                                                   value="1" <?= checked(
+                                                   BackWPup_Option::get(
+                                                       $jobid,
+                                                       's3base_multipart'
+                                                   ), 1) ?>>
                                             <?php esc_html_e(
                                                 'Destination supports multipart',
                                                 'backwpup'
@@ -159,12 +158,11 @@ class="regular-text"
                                         <label
                                             for="s3base_pathstylebucket">
                                             <input name="s3base_pathstylebucket" type="checkbox"
-                                                   value="1" <?= !empty(
+                                                   value="1" <?= checked(
                                                    BackWPup_Option::get(
                                                        $jobid,
                                                        's3base_pathstylebucket'
-                                                   )
-                                                   ) ? 'checked="checked"' : '' ?>>
+                                                   ), 1) ?>>
                                             <?php esc_html_e(
                                                 'Destination provides only Pathstyle buckets',
                                                 'backwpup'
@@ -1110,10 +1108,10 @@ function awsgetbucket() {
 						s3bucketselected: $( 'input[name="s3bucketselected"]' ).val(),
 						s3base_url      : $( 'input[name="s3base_url"]' ).val(),
 						s3region        : $( '#s3region' ).val(),
-						s3base_region          : $( 'input[name="s3base_region"]' ).val(),
-						s3base_version         : $( 'input[name="s3base_version"]' ).val(),
-						s3base_signature       : $( 'input[name="s3base_signature"]' ).val(),
-						s3base_multipart       : $( 'input[name="s3base_multipart"]' ).is(':checked'),
+						s3base_region      : $( 'input[name="s3base_region"]' ).val(),
+						s3base_version      : $( 'input[name="s3base_version"]' ).val(),
+						s3base_signature      : $( 'input[name="s3base_signature"]' ).val(),
+						s3base_multipart      : $( 'input[name="s3base_multipart"]' ).is(':checked'),
 						s3base_pathstylebucket : $( 'input[name="s3base_pathstylebucket"]' ).is(':checked'),
 						_ajax_nonce     : $( '#backwpupajaxnonce' ).val()
 					};