Changeset 1353774

Timestamp:

02/18/2016 10:08:50 PM (10 years ago)

Author:

pagefrog

Message:

bug fixes

Location:

pagefrog/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/class-pagefrog-admin.php (modified) (9 diffs)
• admin/class-pagefrog-styling.php (deleted)
• admin/js/pagefrog-change-thickbox-text.js (modified) (1 diff)
• admin/js/pagefrog-styling.js (modified) (1 diff)
• admin/pagefrog-amp-template-single.php (deleted)
• admin/pagefrog-amp-template-styles.php (deleted)
• admin/pagefrog-post-metadata.php (modified) (6 diffs)
• admin/partials/pagefrog-amp-template-meta-author.php (added)
• admin/partials/pagefrog-amp-template-meta-taxonomy.php (added)
• admin/partials/pagefrog-amp-template-meta-time.php (added)
• admin/partials/pagefrog-amp-template-single.php (added)
• admin/partials/pagefrog-amp-template-styles.php (added)
• pagefrog.php (modified) (1 diff)

pagefrog/trunk/README.txt

@@ -218 +218 @@
 
 == Changelog ==
+= 1.0.5.1 =
+*Release Date - February 18, 2016*
+
+* Assorted bug fixes
+
+
 = 1.0.5 =
 *Release Date - February 13, 2016*
@@ -226 +232 @@
 * Included support for facebook ads
 
+
 = 1.0.4 =
 *Release Date - February 3, 2016*

pagefrog/trunk/admin/class-pagefrog-admin.php

@@ -583 +583 @@
     public function pagefrog_set_post_status() {
         if (!isset($_POST['fbia_status']) || !isset($_POST['amp_status']) || !isset($_POST['post_id'])) {
-            wp_die('You must include both the AMP and Instant Articles status, as well as the post ID');
+            $response = array(
+                'status' => 'error',
+                'message' => 'You must include both the AMP and Instant Articles status, as well as the post ID'
+            );
+            wp_send_json( $response );
+            wp_exit();
         }
 
@@ -592 +597 @@
         $fbia_status = $_POST['fbia_status'];
         $fbia_status_bool = false;
-        if ($fbia_status == 'true') {
+        if ( $fbia_status === 'true' || $fbia_status === true ) {
             $fbia_status_bool = true;
-        } else if ($fbia_status == 'false') {
+        } else if ( $fbia_status === 'false' || $fbia_status === false ) {
             $fbia_status_bool = false;
         } else {
-            wp_die('You must set Instant Articles status to true or false!');
+            $response = array(
+                'status' => 'error',
+                'message' => 'You must set Instant Articles status to true or false!'
+            );
+            wp_send_json( $response );
+            wp_exit();
         }
 
@@ -603 +613 @@
         $amp_status = $_POST['amp_status'];
         $amp_status_bool = false;
-        if ($amp_status == 'true') {
-            $amp_status_bool = true;
-        } else if ($amp_status == 'false') {
+        if ( $amp_status === 'true' || $amp_status === true ) {
+            $amp_status_bool = true && wp_amp_plugin_is_installed() && wp_amp_plugin_is_active();
+        } else if ( $amp_status === 'false' || $amp_status === false ) {
             $amp_status_bool = false;
         } else {
-            wp_die('You must set the AMP status to true or false!');
+            $response = array(
+                'status' => 'error',
+                'message' => 'You must set the AMP status to true or false!'
+            );
+            wp_send_json( $response );
+            wp_exit();
         }
 
         // save the statuses in the post metadata
         $post_status = new PageFrog_PostStatus( $post_id );
+
+        if ( ! $post_status->is_valid_post() ) {
+            $response = array(
+                'status' => 'error',
+                'message' => 'You must pass in a valid post.'
+            );
+            wp_send_json( $response );
+            wp_exit();
+        }
         $post_status->set_fbia_status( $fbia_status_bool );
         $post_status->set_amp_status( $amp_status_bool );
 
         $response = array(
+            'status' => 'ok',
             'fbia_status' => $post_status->get_fbia_status(),
             'amp_status' => $post_status->get_amp_status(),
@@ -622 +647 @@
         );
         wp_send_json( $response );
+        wp_exit();
     }
 
@@ -646 +672 @@
         switch( $platform ) {
             case 'amp': {
+                if ( $enable && ( ! wp_amp_plugin_is_installed() || ! wp_amp_plugin_is_active() ) ) {
+                    $response = array(
+                        'status' => 'error',
+                        'message' => 'You must install the WP Amp plugin before you can activate AMP pages. Please visit the PageFrog setup page to do that.',
+                    );
+                    wp_send_json( $response );
+                    wp_exit();
+                }
                 PageFrog_PostStatus::amp_set_all_published_posts( $enable );
                 break;
@@ -830 +864 @@
                 }
             }
-            $file = $pagefrog_path . 'admin/pagefrog-amp-template-styles.php';
+            $file = $pagefrog_path . 'admin/partials/pagefrog-amp-template-styles.php';
         } else if ( 'single' === $type ) {
             $plugins = wp_get_active_and_valid_plugins();
@@ -840 +874 @@
                 }
             }
-            $file = $pagefrog_path . 'admin/pagefrog-amp-template-single.php';
+            $file = $pagefrog_path . 'admin/partials/pagefrog-amp-template-single.php';
+        } else if ( 'meta-author' === $type ) {
+            $plugins = wp_get_active_and_valid_plugins();
+            $pagefrog_path = dirname( plugin_dir_path( __FILE__ ) );
+
+            foreach ( $plugins as $plugin ) {
+                if ( strpos( $plugin, 'pagefrog.php' ) !== false ) {
+                    $pagefrog_path = plugin_dir_path( $plugin );
+                }
+            }
+            $file = $pagefrog_path . 'admin/partials/pagefrog-amp-template-meta-author.php';
+        } else if ( 'meta-taxonomy' === $type ) {
+            $plugins = wp_get_active_and_valid_plugins();
+            $pagefrog_path = dirname( plugin_dir_path( __FILE__ ) );
+
+            foreach ( $plugins as $plugin ) {
+                if ( strpos( $plugin, 'pagefrog.php' ) !== false ) {
+                    $pagefrog_path = plugin_dir_path( $plugin );
+                }
+            }
+            $file = $pagefrog_path . 'admin/partials/pagefrog-amp-template-meta-taxonomy.php';
+        } else if ( 'meta-time' === $type ) {
+            $plugins = wp_get_active_and_valid_plugins();
+            $pagefrog_path = dirname( plugin_dir_path( __FILE__ ) );
+
+            foreach ( $plugins as $plugin ) {
+                if ( strpos( $plugin, 'pagefrog.php' ) !== false ) {
+                    $pagefrog_path = plugin_dir_path( $plugin );
+                }
+            }
+            $file = $pagefrog_path . 'admin/partials/pagefrog-amp-template-meta-time.php';
         }
 
@@ -910 +974 @@
 
 function wp_amp_plugin_is_installed() {
+    if ( isset( $GLOBALS['PRETEND_AMP_WP_IS_INSTALLED'] ) && $GLOBALS['PRETEND_AMP_WP_IS_INSTALLED'] === true ) {
+        // for testing purposes
+        return true;
+    }
     if ( ! function_exists( 'get_plugins' ) ) {
         require_once ABSPATH . 'wp-admin/includes/plugin.php';
@@ -918 +986 @@
 
 function wp_amp_plugin_is_active() {
+    if ( isset( $GLOBALS['PRETEND_AMP_WP_IS_ACTIVATED'] ) && $GLOBALS['PRETEND_AMP_WP_IS_ACTIVATED'] === true ) {
+        // for testing purposes
+        return true;
+    }
     return function_exists( 'amp_render' );
 }

pagefrog/trunk/admin/js/pagefrog-change-thickbox-text.js

@@ -5 +5 @@
             window.setTimeout(change_text, 500);
             jQuery('input[value="Insert into Post"]').attr('value', 'Choose Logo');
+            jQuery('#tab-type_url').css({
+              display: 'none'
+            });
         })();
     });

pagefrog/trunk/admin/js/pagefrog-styling.js

@@ -20 +20 @@
 
     // function to catch the uploaded logo
-    window.send_to_editor = function (html, other_param) {
+    window.send_to_editor = function (html) {
+        if (typeof console !== 'undefined' && typeof console.log !== 'undefined') {
+            console.log(html);
+        }
         var classes = '';
         if (jQuery(html).prop('tagName').toLowerCase() == 'img') {

pagefrog/trunk/admin/pagefrog-post-metadata.php

@@ -74 +74 @@
 
     /**
+     * A boolean that indicates whether we are operating on a valid post or a random made-up id.
+     *
+     * @since   1.0.4.1
+     * @access  private
+     * @var     boolean     $valid_post     Whether or not the post is valid.
+     */
+    private $valid_post;
+
+
+    /**
      * Initialize the class and set any necessary properties.
      *
@@ -81 +91 @@
     function __construct( $post_id ) {
         $this->post_id = $post_id;
+        $this->valid_post = get_post_status( $post_id ) !== false;
     }
 
@@ -120 +131 @@
      */
     public function set_fbia_status( $status ) {
-        if ($status !== true && $status !== false) {
+        if ( $status !== true && $status !== false ) {
             // only allow booleans to be saved
             return false;
-        } else {
-            add_post_meta( $this->post_id, self::FBIA_STATUS_KEY, $status, true ) or 
-                update_post_meta( $this->post_id, self::FBIA_STATUS_KEY, $status );
-            return true;
-        }
+        }
+        if ( ! $this->valid_post ) {
+            // only write to valid posts
+            return false;
+        }
+
+        add_post_meta( $this->post_id, self::FBIA_STATUS_KEY, $status, true ) or 
+            update_post_meta( $this->post_id, self::FBIA_STATUS_KEY, $status );
+        return true;
     }
 
@@ -140 +155 @@
             // only allow booleans to be saved
             return false;
-        } else {
-            add_post_meta( $this->post_id, self::AMP_STATUS_KEY, $status, true ) or
-                update_post_meta( $this->post_id, self::AMP_STATUS_KEY, $status );
-            return true;
-        }
+        }
+        if ( ! $this->valid_post ) {
+            // only write to valid posts
+            return false;
+        }
+
+        $enabled = $status && wp_amp_plugin_is_installed() && wp_amp_plugin_is_active();
+        add_post_meta( $this->post_id, self::AMP_STATUS_KEY, $status, true ) or
+            update_post_meta( $this->post_id, self::AMP_STATUS_KEY, $status );
+        return true;
+    }
+
+    /**
+     * A method to communicate to the outside world if the post is valid or no such post exists for the passed
+     * in ID.
+     *
+     * @since   1.0.4.1
+     */
+    public function is_valid_post() {
+        return $this->valid_post;
     }
 
@@ -194 +224 @@
     public static function amp_set_all_published_posts( $enabled ) {
         $query = new WP_Query( array(
-            'post_status' => 'publish'
+            'post_status' => 'publish',
+            'nopaging' => true
         ) );
         $posts = $query->get_posts();
@@ -210 +241 @@
     public static function fbia_set_all_published_posts( $enabled ) {
         $query = new WP_Query( array(
-            'post_status' => 'publish'
+            'post_status' => 'publish',
+            'nopaging' => true
         ) );
         $posts = $query->get_posts();

pagefrog/trunk/pagefrog.php

@@ -16 +16 @@
  * Plugin URI:        http://pagefrog.com/
  * Description:       PageFrog is the mobile hub for your website. Manage your content across AMP, Facebook Instant Articles and Apple News.
- * Version:           1.0.5
+ * Version:           1.0.5.1
  * Author:            PageFrog Team
  * Author URI:        http://pagefrog.com/