Changeset 1650593

Timestamp:

05/03/2017 09:25:48 PM (9 years ago)

Author:

potatomaster

Message:

Releasing version 1.2.7

Location:

publish-to-apple-news/trunk

Files:

• admin/apple-actions/index/class-push.php (modified) (2 diffs)
• admin/class-admin-apple-themes.php (modified) (2 diffs)
• apple-news.php (modified) (1 diff)
• includes/apple-exporter/components/class-component.php (modified) (2 diffs)
• includes/class-apple-news.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

publish-to-apple-news/trunk/admin/apple-actions/index/class-push.php

@@ -155 +155 @@
         $this->process_errors( $errors );
 
-        // Validate the data before using since it's filterable.
-        // JSON should just be a string.
-        // Apple News format is complex and has too many options to validate otherwise.
-        // Let's just make sure it's not doing anything bad and is the right data type.
-        $json = sanitize_text_field( $json );
+        // Sanitize the data before using since it's filterable.
+        $json = $this->sanitize_json( $json );
 
         // Bundles should be an array of URLs
@@ -387 +384 @@
         return array( $this->exporter->get_json(), $this->exporter->get_bundles(), $this->exporter->get_errors() );
     }
+
+    /**
+     * Sanitize the JSON output based on whether HTML or markdown is used.
+     *
+     * @access private
+     * @param string $json
+     * @return string
+     * @since 1.2.7
+     */
+    private function sanitize_json( $json ) {
+        // Apple News format is complex and has too many options to validate otherwise.
+        // Let's just make sure the JSON is valid
+        $decoded = json_decode( $json );
+        if ( ! $decoded ) {
+             throw new \Apple_Actions\Action_Exception( __( 'The Apple News JSON is invalid and cannot be published.', 'apple-news' ) );
+        } else {
+             return wp_json_encode( $decoded );
+        }
+    }
 }

publish-to-apple-news/trunk/admin/class-admin-apple-themes.php

@@ -694 +694 @@
     private function validate_data( $data ) {
         $settings = new \Apple_Exporter\Settings();
-        $valid_settings = array_keys( $settings->all() );
+        $default_settings = $settings->all();
         $clean_settings = array();
 
@@ -719 +719 @@
         foreach ( $valid_settings as $setting ) {
             if ( ! isset( $data[ $setting ] ) ) {
-                return sprintf(
-                    __( 'The theme was missing the required setting %s', 'apple-news' ),
-                    $setting
-                );
+                // Get the default value instead.
+                // This ensures backwards compatiblity with theme files
+                // when new settings are added in future plugin versions.
+                if ( isset( $default_settings[ $setting ] ) ) {
+                    $data[ $setting ] = $default_settings[ $setting ];
+                } else {
+                    return sprintf(
+                        __( 'The theme was missing the required setting %s and no default was found', 'apple-news' ),
+                        $setting
+                    );
+                }
             }
 

publish-to-apple-news/trunk/apple-news.php

@@ -13 +13 @@
  * Plugin URI:  http://github.com/alleyinteractive/apple-news
  * Description: Export and sync posts to Apple format.
- * Version:     1.2.6
+ * Version:     1.2.7
  * Author:      Alley Interactive
  * Author URI:  https://www.alleyinteractive.com

publish-to-apple-news/trunk/includes/apple-exporter/components/class-component.php

@@ -145 +145 @@
 
     /**
+     * Allowed HTML tags for components that support it.
+     *
+     * @since 1.2.7
+     * @var array
+     * @access public
+     */
+    public $allowed_html = array(
+        'p' => array(),
+        'strong' => array(),
+        'b' => array(),
+        'em' => array(),
+        'i' => array(),
+        'a' => array(
+            'href' => array(),
+        ),
+        'ul' => array(),
+        'ol' => array(),
+        'li' => array(),
+        'br' => array(),
+        'sub' => array(),
+        'sup' => array(),
+        'del' => array(),
+        's' => array(),
+        'pre' => array(),
+        'code' => array(),
+        'samp' => array(),
+        'footer' => array(),
+        'aside' => array(),
+        'blockquote' => array(),
+    );
+
+    /**
      * Constructor.
      *
@@ -234 +266 @@
      */
     public function to_array() {
+        // If HTML support is enabled, provide an extra level of validation for supported tags.
+        if ( ! empty( $this->json['text'] ) && $this->html_enabled() ) {
+            $this->json['text'] = wp_kses( $this->json['text'], $this->allowed_html );
+        }
+
         return apply_filters( 'apple_news_' . $this->get_component_name() . '_json', $this->json );
     }

publish-to-apple-news/trunk/includes/class-apple-news.php

@@ -40 +40 @@
      * @access public
      */
-    public static $version = '1.2.6';
+    public static $version = '1.2.7';
 
     /**

publish-to-apple-news/trunk/readme.txt

@@ -4 +4 @@
 Tags: publish, apple, news, iOS
 Requires at least: 4.0
-Tested up to: 4.7.3
-Stable tag: 1.2.6
+Tested up to: 4.7.4
+Stable tag: 1.2.7
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl.html
@@ -45 +45 @@
 
 == Changelog ==
+
+= 1.2.7 =
+* Fixed a bug where HTML tags were being stripped before being sent to the API.
+* Fixed a bug where older theme files couldn't be imported if new formatting settings were added.
 
 = 1.2.6 =