Simplified api key support in wp-config

Author: Jacob Middag

src/class-tiny-plugin.php

@@ -174,11 +174,13 @@ public function render_media_column($column, $id) {
                     self::translate_escape('Compress') . '</button>';
                 echo '<div class="spinner"></div>';
             } else {
-                $details = $tiny_metadata->get_value();
                 printf(self::translate_escape('Compressed %d out of %d sizes'), $success, $total);
-                echo '<br/>';
-                echo self::translate_escape('Original size') . ': ' . size_format($details['input']['size']) . '<br/>';
-                echo self::translate_escape('Compressed size') . ': ' . size_format($details['output']['size']);
+                $details = $tiny_metadata->get_value();
+                if ($details && isset($details['input'])) {
+                    echo '<br/>';
+                    echo self::translate_escape('Original size') . ': ' . size_format($details['input']['size']) . '<br/>';
+                    echo self::translate_escape('Compressed size') . ': ' . size_format($details['output']['size']);
+                }
             }
         }
     }

src/class-tiny-settings.php

@@ -33,15 +33,9 @@ public function admin_init() {
         $section = self::get_prefixed_name('settings');
         add_settings_section($section, self::translate('PNG and JPEG compression'), $this->get_method('render_section'), 'media');
 
-        if (tiny_is_network_activated()) {
-            $field = self::get_prefixed_name('api_key');
-            register_setting('media', $field);
-            add_settings_field($field, self::translate('Multisite API key'), $this->get_method('render_api_key'), 'media', $section, array('label_for' => $field));
-        } else {
-            $field = self::get_prefixed_name('api_key');
-            register_setting('media', $field);
-            add_settings_field($field, self::translate('TinyPNG API key'), $this->get_method('render_api_key'), 'media', $section, array('label_for' => $field));
-        }
+        $field = self::get_prefixed_name('api_key');
+        register_setting('media', $field);
+        add_settings_field($field, self::translate('TinyPNG API key'), $this->get_method('render_api_key'), 'media', $section, array('label_for' => $field));
 
         $field = self::get_prefixed_name('sizes');
         register_setting('media', $field);
@@ -56,18 +50,6 @@ public function get_api_key() {
         }
     }
 
-    public function get_multisite_api_key() {
-        if (is_multisite()) {
-             if (defined('TINY_API_KEY')) {
-                 return TINY_API_KEY;
-             } else {
-                 return NULL;
-             }
-        } else {
-            return NULL;
-        }
-    }
-
     protected static function get_intermediate_size($size) {
         # Inspired by http://codex.wordpress.org/Function_Reference/get_intermediate_image_sizes
         global $_wp_additional_image_sizes;
@@ -136,35 +118,16 @@ public function render_section() {
     public function render_api_key() {
         $field = self::get_prefixed_name('api_key');
         $key = $this->get_api_key();
-        $multisite_key = $this->get_multisite_api_key();
-
-        if (tiny_is_network_activated()) {
-            if (empty($multisite_key)) {
-                if (empty($key)) {
-                    echo '<p>' . self::translate('Your Network Admin has not configured an API key yet') . '.</p>';
-                } else {
-                    echo '<p>' . self::translate('You have an API key configured') . '. ' . self::translate('Your Network Admin can change the key') . '.</p>';
-                }
-            } else {
-                echo '<p>' . self::translate('The API key has been installed by the Network Admin') . '.</p>';
-            }
+
+        if (defined('TINY_API_KEY')) {
+            echo '<p>' . self::translate('The API key has been configured in wp-config.php') . '.</p>';
         } else {
-            if (is_multisite() && !empty($multisite_key)) {
-                echo '<p>' . self::translate('The API key has been installed by the Network Admin') . '.</p>';
-            } else {
-                if (defined('TINY_API_KEY')) {
-                    echo '<p>' . self::translate('The API key has been configured in wp-config.php') . '.</p>';
-                } else {
-                    echo '<input type="text" id="' . $field . '" name="' . $field . '" value="' . htmlspecialchars($key) . '" size="40" />';
-                }
-                if (empty($key)) {
-                    echo '<p>';
-                    $link = '<a href="https://tinypng.com/developers">' . self::translate_escape('TinyPNG Developer section') . '</a>';
-                    printf(self::translate_escape('Visit %s to get an API key') . '.', $link);
-                    echo '</p>';
-                }
-            }
+            echo '<input type="text" id="' . $field . '" name="' . $field . '" value="' . htmlspecialchars($key) . '" size="40" />';
         }
+        echo '<p>';
+        $link = '<a href="https://tinypng.com/developers">' . self::translate_escape('TinyPNG Developer section') . '</a>';
+        printf(self::translate_escape('Visit %s to get an API key') . '.', $link);
+        echo '</p>';
     }
 
     public function render_sizes() {

src/languages/tiny-compress-images-nl_NL.mo

@@ -52,6 +52,9 @@ msgstr "Laatste fout"
 msgid "Credentials are invalid"
 msgstr "Ongeldige API-sleutel"
 
+msgid "Your monthly limit has been exceeded"
+msgstr "Je maandelijks limiet is bereikt"
+
 msgid "File is empty"
 msgstr "Bestand is leeg"
 
@@ -96,18 +99,3 @@ msgstr "Kon de metadata niet vinden van het bestand"
 
 msgid "The API key has been configured in %s"
 msgstr "De API-sleutel is geconfigureerd in %s"
-
-msgid "Your Network Admin has not configured an API key yet"
-msgstr "Je netwerkbeheerder heeft nog geen API-sleutel geconfigureerd"
-
-msgid "You have an API key configured"
-msgstr "Je hebt een API-sleutel geconfigureerd"
-
-msgid "Your Network Admin can change the key"
-msgstr "Je netwerkbeheerder kan de sleutel wijzigen"
-
-msgid "The API key has been installed by the Network Admin"
-msgstr "De API-sleutel is geïnstalleerd door de netwerkbeheerder"
-
-msgid "The API key has been configured in wp-config.php"
-msgstr "De API-sleutel is geconfigureerd in wp-config.php"

src/languages/tiny-compress-images-nl_NL.po

@@ -15,10 +15,6 @@ function plugin_autoloader($class) {
 
 spl_autoload_register('plugin_autoloader');
 
-function tiny_is_network_activated() {
-    return false;
-}
-
 abstract class TinyTestCase extends PHPUnit_Framework_TestCase {
     protected $wp;
 

test/unit/TinyTestCase.php

@@ -9,14 +9,6 @@
  */
 
 
-function tiny_is_network_activated() {
-    if (!function_exists('is_plugin_active_for_network')) {
-        require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
-    }
-
-    return is_plugin_active_for_network(plugin_basename( __FILE__ ));
-}
-
 require (dirname(__FILE__) . '/src/class-tiny-php.php');
 require (dirname(__FILE__) . '/src/class-tiny-wp-base.php');
 require (dirname(__FILE__) . '/src/class-tiny-exception.php');