Store copyright preservation setting under specific copyright key.

Author: Jippe Holwerda

src/class-tiny-plugin.php

@@ -119,7 +119,7 @@ private function compress($metadata, $attachment_id) {
                 $tiny_metadata->update();
 
                 $resize = $tiny_metadata->is_resizable($uncompressed_size) ? $this->settings->get_resize_options() : false;
-                $preserve = $this->settings->get_preserve_enabled() ? $this->settings->get_preserve_options() : false;
+                $preserve = count($this->settings->get_preserve_options()) > 0 ? $this->settings->get_preserve_options() : false;
                 $response = $compressor->compress_file($tiny_metadata->get_filename($uncompressed_size), $resize, $preserve);
 
                 $tiny_metadata->add_response($response, $uncompressed_size);

src/class-tiny-settings.php

@@ -187,18 +187,21 @@ public function get_resize_enabled() {
         return isset($setting['enabled']) && $setting['enabled'] === 'on';
     }
 
-    public function get_preserve_enabled() {
+    public function get_preserve_enabled($name) {
         $setting = get_option(self::get_prefixed_name('preserve_data'));
-        return isset($setting['enabled']) && $setting['enabled'] === 'on';
+        return isset($setting[$name]) && $setting[$name] === 'on';
     }
 
     public function get_preserve_options() {
-        $setting = get_option(self::get_prefixed_name('preserve_data'));
-        if (!$this->get_preserve_enabled()) {
-            return false;
-
+        $settings = get_option(self::get_prefixed_name('preserve_data'));
+        $options = array();
+        if ($settings) {
+            foreach (array_keys($settings) as &$setting) {
+                if ($settings[$setting] === "on") {
+                    array_push($options, $setting);
+                }
+            }
         }
-        $options = array('copyright');
         return $options;
     }
 
@@ -338,13 +341,17 @@ public function render_resize() {
         esc_html_e('Resizing takes 1 additional compression for each image that is larger.', 'tiny-compress-images');
         echo '</p>';
 
-        $id = self::get_prefixed_name("preserve_data_enabled");
-        $name = self::get_prefixed_name("preserve_data[enabled]");
-        $checked = ( $this->get_preserve_enabled() ? ' checked="checked"' : '' );
-        $label = esc_html__('Preserve copyright information in the original image (JPEG only)', 'tiny-compress-images');
+        echo '<br>';
+        $this->render_preserve_input("copyright", 'Preserve copyright information in the original image (JPEG only)');
+    }
 
-        echo '<p class="tiny-resize-available">';
-        echo '<input  type="checkbox" id="' . $id . '" name="' . $name . '" value="on" '. $checked . '/>';
+    public function render_preserve_input($name, $description) {
+        echo '<p>';
+        $id = sprintf(self::get_prefixed_name('preserve_data_%s'), $name);
+        $field = sprintf(self::get_prefixed_name('preserve_data[%s]'), $name);
+        $checked = ( $this->get_preserve_enabled($name) ? ' checked="checked"' : '' );
+        $label = esc_html__($description, 'tiny-compress-images');
+        echo '<input type="checkbox" id="' . $id . '" name="' . $field . '" value="on" ' . $checked . '/>';
         echo '<label for="' . $id . '">' . $label . '</label>';
         echo '<br>';
         echo '</p>';

test/unit/TinySettingsTest.php

@@ -151,22 +151,22 @@ public function testShouldNotReturnResizeOptionsWhenNotEnabled() {
     }
 
     public function testShouldReturnIncludeMetadataEnabled() {
-        $this->wp->addOption("tinypng_preserve_data", array('enabled' => 'on'));
-        $this->assertEquals(true, $this->subject->get_preserve_enabled());
+        $this->wp->addOption("tinypng_preserve_data", array('copyright' => 'on'));
+        $this->assertEquals(true, $this->subject->get_preserve_enabled("copyright"));
     }
 
     public function testShouldReturnIncludeMetadataNotEnabledWithoutConfiguration() {
         $this->wp->addOption("tinypng_include_metadata", array());
-        $this->assertEquals(false, $this->subject->get_preserve_enabled());
+        $this->assertEquals(false, $this->subject->get_preserve_enabled("copyright"));
     }
 
     public function testShouldReturnPreserveOptionsWhenEnabled() {
-        $this->wp->addOption("tinypng_preserve_data", array('enabled' => 'on'));
+        $this->wp->addOption("tinypng_preserve_data", array('copyright' => 'on'));
         $this->assertEquals(array('0' => 'copyright'), $this->subject->get_preserve_options());
     }
 
     public function testShouldNotReturnPreserveOptionsWhenDisabled() {
         $this->wp->addOption("tinypng_include_metadata", array());
-        $this->assertEquals(false, $this->subject->get_preserve_options());
+        $this->assertEquals(array(), $this->subject->get_preserve_options());
     }
 }