Merge pull request #18 from john-shaffer/17-add-cache-control-setting

Add Cache-Control Setting

Author: leonstafford

src/Controller.php

@@ -175,6 +175,16 @@ public static function seedOptions() : void {
         );
 
         $wpdb->query( $query );
+
+        $query = $wpdb->prepare(
+            $query_string,
+            's3CacheControl',
+            'public, max-age=900',
+            'Cache-Control header value',
+            ''
+        );
+
+        $wpdb->query( $query );
     }
 
     /**
@@ -394,6 +404,12 @@ public static function saveOptionsFromUI() : void {
             [ 'name' => 's3RemotePath' ]
         );
 
+        $wpdb->update(
+            $table_name,
+            [ 'value' => sanitize_text_field( $_POST['s3CacheControl'] ) ],
+            [ 'name' => 's3CacheControl' ]
+        );
+
         wp_safe_redirect( admin_url( 'admin.php?page=wp2static-s3' ) );
         exit;
     }

src/Deployer.php

@@ -35,6 +35,16 @@ public function upload_files( string $processed_site_path ) : void {
             )
         );
 
+        $put_data = [
+            'Bucket' => Controller::getValue( 's3Bucket' ),
+            'ACL'    => 'public-read',
+        ];
+
+        $cache_control = Controller::getValue( 's3CacheControl' );
+        if ( $cache_control ) {
+            $put_data['CacheControl'] = $cache_control;
+        }
+
         foreach ( $iterator as $filename => $file_object ) {
             $base_name = basename( $filename );
             if ( $base_name != '.' && $base_name != '..' ) {
@@ -69,15 +79,11 @@ public function upload_files( string $processed_site_path ) : void {
 
                 $mime_type = MimeTypes::GuessMimeType( $filename );
 
-                $result = $s3->putObject(
-                    [
-                        'Bucket' => Controller::getValue( 's3Bucket' ),
-                        'Key' => $s3_key,
-                        'Body' => file_get_contents( $filename ),
-                        'ACL'    => 'public-read',
-                        'ContentType' => $mime_type,
-                    ]
-                );
+                $put_data['Key'] = $s3_key;
+                $put_data['Body'] = file_get_contents( $filename );
+                $put_data['ContentType'] = $mime_type;
+
+                $result = $s3->putObject( $put_data );
 
                 if ( $result['@metadata']['statusCode'] === 200 ) {
                     \WP2Static\DeployCache::addFile( $cache_key );

views/s3-page.php

@@ -111,6 +111,22 @@
             </td>
         </tr>
 
+        <tr>
+            <td style="width:50%;">
+                <label
+                    for="<?php echo $view['options']['s3CacheControl']->name; ?>"
+                ><?php echo $view['options']['s3CacheControl']->label; ?></label>
+            </td>
+            <td>
+                <input
+                    id="<?php echo $view['options']['s3CacheControl']->name; ?>"
+                    name="<?php echo $view['options']['s3CacheControl']->name; ?>"
+                    type="text"
+                    value="<?php echo $view['options']['s3CacheControl']->value !== '' ? $view['options']['s3CacheControl']->value : ''; ?>"
+                />
+            </td>
+        </tr>
+
     </tbody>
 </table>