Changeset 1361838

Timestamp:

03/01/2016 03:11:53 PM (10 years ago)

Author:

pagefrog

Message:

adding override plugins option

Location:

pagefrog/trunk

Files:

• README.txt (modified) (1 diff)
• admin/class-pagefrog-admin.php (modified) (5 diffs)
• admin/class-pagefrog-new-post-settings-storage.php (modified) (3 diffs)
• admin/pagefrog-amp-template.php (deleted)
• admin/pagefrog-settings.php (modified) (3 diffs)
• includes/class-pagefrog.php (modified) (2 diffs)
• pagefrog.php (modified) (1 diff)

pagefrog/trunk/README.txt

@@ -224 +224 @@
 
 == Changelog ==
+= 1.0.7.2 =
+*Release Date - February 29, 2016*
+
+* Add feature to turn off plugins that might raise AMP errors
+
 = 1.0.7.1 =
-*Release Date - February 27, 2017*
+*Release Date - February 27, 2016*
 
 * Explanation text to help enabling articles

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

@@ -285 +285 @@
             add_action( 'template_redirect', array($this, 'really_handle_preview'));
         }
+    }
+
+    /**
+     * Maybe unattach plugins for this request (if it is amp and the user requested that).
+     *
+     * @since   1.0.7.2
+     */
+    public function maybe_disable_plugins( ) {
+        global $wp_filter;
+        /*
+         * The $wp_filter variable holds a list of hooks in the format
+         * $wp_filter[hook_name][priority_integer][name_of_callable] = array(
+         *      function => 'name_of_callable' string, or array with [0] pointing to an object and
+         *                     [1] pointing to the name of the function to be called on that object,
+         *      accepted_args => number of accepted args (int)
+         * )
+         *
+         * Note that $wp_filter does not differentiate between actions and filters, so we can just call
+         * remove_filter for both.
+         */
+
+
+        // check if we are on an amp endpoint
+        if ( 
+            ( defined( 'AMP_QUERY_VAR' ) && false !== get_query_var( AMP_QUERY_VAR, false ) ) || 
+            ( isset( $GLOBALS['PRETEND_AMP_WP_IS_INSTALLED'] ) && $GLOBALS['PRETEND_AMP_WP_IS_INSTALLED'] == true && isset( $GLOBALS['PRETEND_AMP_WP_IS_ACTIVATED'] ) && $GLOBALS['PRETEND_AMP_WP_IS_ACTIVATED'] === true )
+        ) {
+            // check if we should remove plugins from amp input
+            $new_posts = new PageFrog_NewPostSettings_Storage();
+            if ( ! $new_posts->get_amp_disable_other_plugins_bool() ) {
+                // we aren't supposed to remove other plugins
+                return array();
+            }
+
+            // if we reach here, we need to remove the plugins
+            $to_remove = array();
+            // iterate over all of the hooks, recording which ones we think maybe we should remove
+            foreach ( $wp_filter as $hook => $hook_group ) {
+                foreach ( $hook_group as $priority => $priority_group ) {
+                    foreach ( $priority_group as $callable => $callable_group ) {
+                        try {
+                            if ( is_array( $callable_group['function'] ) ) {
+                                // it looks like we have a class method that we are analyzing
+                                // get hte file path to the function
+                                if ( is_string( $callable_group['function'][0] ) ) {
+                                    // it's a static method
+                                    $refl = new ReflectionMethod( $callable_group['function'][0] . '::' . $callable_group['function'][1] );
+                                } else {
+                                    // it's an instance method
+                                    $refl = new ReflectionClass( get_class( $callable_group['function'][0] ) );
+                                }
+                            } else {
+                                // it looks like we have a simple function that we are analyzing
+                                // get the file path to the function
+                                $refl = new ReflectionFunction( $callable_group['function'] );
+                            }
+
+                            // get the file path
+                            $file_path = $refl->getFileName();
+
+                            // check if the function is inside of the plugins directory
+                            if (
+                                PageFrog_Utils::starts_with( $file_path, WP_PLUGIN_DIR )
+                            ) {
+
+                                // check if the function is not part of pagefrog and not part of the amp-wp plugins
+                                if (
+                                    ! PageFrog_Utils::contains( $file_path, WP_PLUGIN_DIR . '/amp/' ) &&
+                                    ! PageFrog_Utils::contains( $file_path, WP_PLUGIN_DIR . '/pagefrog/' ) &&
+                                    ! PageFrog_Utils::contains( $file_path, WP_PLUGIN_DIR . '/pageforg-wp/' )
+                                    ) {
+                                    // this one should be removed, add it to the list
+                                    $to_remove[] = array(
+                                        'hook' => $hook,
+                                        'callable' => $callable_group['function'],
+                                        'priority' => $priority
+                                    );
+                                }
+                            } else if ( 
+                                PageFrog_Utils::ends_with( $file_path, 'functions.php' ) &&
+                                PageFrog_Utils::contains( $file_path, 'themes' ) 
+                            ) {
+                                // this is probably good to remove too
+                                $to_remove[] = array(
+                                    'hook' => $hook,
+                                    'callable' => $callable_group['function'],
+                                    'priority' => $priority
+                                );
+                            }
+                        } catch ( ReflectionException $e ) {
+                            // it's a private function, must be wordpress core stuff. Keep this one.
+                        }
+                    }
+                }
+            }
+
+            foreach ( $to_remove as $remove ) {
+                // remove the filter
+                $success = remove_filter($remove['hook'], $remove['callable'], $remove['priority']);
+            }
+            return $to_remove;
+        }
+        return array();
     }
 
@@ -806 +909 @@
     public function amp_render_template( $post_id ) {
         if ( wp_amp_plugin_is_installed() && wp_amp_plugin_is_active() ) {
-            ///////////////////////////////////
-            // TEMP AMP PLUGIN COMPATIBILITY //
-            ///////////////////////////////////
-            $fct = new ReflectionFunction( 'amp_render' );
-            $is_v1 = $fct->getNumberOfRequiredParameters() == 0;
-            if ( $is_v1 ) {
-                amp_render();
-            } else {
-                amp_render( $post_id );
-            }
-            ///////////////////////////////////////
-            // END TEMP AMP PLUGIN COMPATIBILITY //
-            ///////////////////////////////////////
+            amp_render( $post_id );
             return;
         } else if ( wp_amp_plugin_is_installed() ){
@@ -829 +920 @@
     }
 
-  ///////////////////////////////////
-    // TEMP AMP PLUGIN COMPATIBILITY //
-    ///////////////////////////////////
-    public function render_v01_amp ( $post_id ) {
-        if ( wp_amp_plugin_is_installed() && wp_amp_plugin_is_active() ) {
-            $fct = new ReflectionFunction( 'amp_render' );
-            $is_v1 = $fct->getNumberOfRequiredParameters() == 0;
-            if ( ! $is_v1 ) {
-                $amp_post = new AMP_Post( $post_id );
-                include( dirname(__FILE__) . '/pagefrog-amp-template.php');
-                exit;
-            }
-        } else if ( wp_amp_plugin_is_installed() ){
-            echo "<html><head></head><body style='background-color:white;'><h1>To generate AMP previews, you must activate the Wordpress AMP plugin. Click the button above to get started.</h1></body></html>";
-            return;
-        } else {
-            echo "<html><head></head><body style='background-color:white;'><h1>To generate AMP previews, you must install the official Wordpress AMP plugin. Click the button above to get started.</h1></body></html>";
-            return;
-        }
-    }
-
-    public function add_to_v01_amp_head( $amp_post ) {
-        $fct = new ReflectionFunction( 'amp_render' );
-        $is_v1 = $fct->getNumberOfRequiredParameters() == 0;
-        if ( ! $is_v1 ) {
-            ?>
-            <title><?php echo wp_get_document_title(); ?></title>
-            <link rel="canonical" href="<?php echo esc_url( get_permalink() ); ?>" />
-            <?php
-            foreach ( $amp_post->get_scripts() as $element => $script ) : ?>
-                <script custom-element="<?php echo esc_attr( $element ); ?>" src="<?php echo esc_url( $script ); ?>" async></script>
-            <?php endforeach; ?>
-            <script src="https://cdn.ampproject.org/v0.js" async></script>
-            <script type="application/ld+json"><?php echo json_encode( $amp_post->get_metadata() ); ?></script>
-            <?php
-        }
-    }
-
-    public function change_v01_amp_url( $url ) {
-
-        $fct = new ReflectionFunction( 'amp_render' );
-        $is_v1 = $fct->getNumberOfRequiredParameters() == 0;
-        if ( ! $is_v1 ) {
-            if ( PageFrog_Utils::ends_with( $url, '/amp/' ) ) {
-                $exploded = explode( '/', $url );
-                array_pop( $exploded );
-                array_pop( $exploded );
-                $url = implode( '/', $exploded );
-            } else if ( PageFrog_Utils::ends_with( $url, '/amp' ) ) {
-                $exploded = explode( '/', $url );
-                array_pop( $exploded );
-                $url = implode( '/', $exploded );
-            }
-            $seperator = (parse_url( $url, PHP_URL_QUERY ) == NULL ) ? '?' : '&';
-            $url .= $seperator . 'amp=1';
-        }
-        return $url;
-    }
-    ///////////////////////////////////////
-    // END TEMP AMP PLUGIN COMPATIBILITY //
-    ///////////////////////////////////////
-
     public function amp_add_custom_post_support() {
         if ( defined( 'AMP_QUERY_VAR' ) ) {
@@ -910 +939 @@
         $pagefrog_metadata = new PageFrog_PostStatus( $post );
         return ! $pagefrog_metadata->get_amp_status();
-    }
-
-    public function set_amp_template_file( $file ) {
-        return dirname(__FILE__) . '/pagefrog-amp-template.php';
     }
 
@@ -1153 +1178 @@
 
     public function set_new_post_metadata( $post_id, $post, $update ) {
-        $new_post = new PageFrog_NewPostSettings_Storage();
-        $status = new PageFrog_PostStatus( $post_id );
-        $status->set_fbia_status( $new_post->get_fbia_enable_new_posts_bool_for( $post->post_type ) );
-        $status->set_amp_status( $new_post->get_amp_enable_new_posts_bool_for( $post->post_type ) && wp_amp_plugin_is_installed() && wp_amp_plugin_is_active() );
+        if ( ! $update ) {
+            $new_post = new PageFrog_NewPostSettings_Storage();
+            $status = new PageFrog_PostStatus( $post_id );
+            $status->set_fbia_status( $new_post->get_fbia_enable_new_posts_bool_for( $post->post_type ) );
+            $status->set_amp_status( $new_post->get_amp_enable_new_posts_bool_for( $post->post_type ) && wp_amp_plugin_is_installed() && wp_amp_plugin_is_active() );
+        }
     }
 }

pagefrog/trunk/admin/class-pagefrog-new-post-settings-storage.php

@@ -106 +106 @@
     }
 
+    public function get_amp_disable_other_plugins_bool() {
+        return $this->settings['amp_disable_other_plugins'] ? true : false;
+    }
+
+    public function get_amp_disable_other_plugins_string() {
+        return $this->get_amp_disable_other_plugins_bool() ? 'true' : 'false';
+    }
+
+    public function get_fbia_disable_other_plugins_bool() {
+        return $this->settings['fbia_disable_other_plugins'] ? true : false;
+    }
+
+    public function get_fbia_disable_other_plugins_string() {
+        return $this->get_fbia_disable_other_plugins_bool() ? 'true' : 'false';
+    }
+
+    /** This function is for TESTING ONLY. Do not call it **/
+    public function __set_amp_disable_other_plugins( $val ) {
+        if ( $val === true ) {
+            $this->settings['amp_disable_other_plugins'] = 1;
+        } else {
+            $this->settings['amp_disable_other_plugins'] = 0;
+        }
+    }
+
+    /** This function is for TESTING ONLY. Do not call it **/
+    public function __get_settings() {
+        return $this->settings;
+    }
+
     /**
      * A convenience method to generate reliable data from the user-inputted values and provide
@@ -122 +152 @@
                     $clean_data[$key] = 0;
                 }
+            }
+        }
+
+        if ( isset( $data['amp_disable_other_plugins'] ) && PageFrog_Utils::string_isnt_empty( $data['amp_disable_other_plugins'] ) ) {
+            if ( $data['amp_disable_other_plugins'] === 'true' || $data['amp_disable_other_plugins'] === true ) {
+                $clean_data['amp_disable_other_plugins'] = 1;
+            } else {
+                $clean_data['amp_disable_other_plugins'] = 0;
+            }
+        }
+
+        if ( isset( $data['fbia_disable_other_plugins'] ) && PageFrog_Utils::string_isnt_empty( $data['fbia_disable_other_plugins'] ) ) {
+            if ( $data['fbia_disable_other_plugins'] === 'true' || $data['fbia_disable_other_plugins'] === true ) {
+                $clean_data['fbia_disable_other_plugins'] = 1;
+            } else {
+                $clean_data['fbia_disable_other_plugins'] = 0;
             }
         }
@@ -148 +194 @@
     'amp_enable_new_post' => 1,
     'fbia_enable_new_post' => 1,
+    'amp_disable_other_plugins' => 0,
+    'fbia_disable_other_plugins' => 0
 );
 ?>

pagefrog/trunk/admin/pagefrog-settings.php

@@ -21 +21 @@
         'render_new_post_main_description',
         $GLOBALS['PAGEFROG_SETTINGS_PAGE_SLUG']
+    );
+
+    add_settings_field(
+        'amp_disable_other_plugins',
+        '',
+        'render_amp_disable_other_plugins',
+        $GLOBALS['PAGEFROG_SETTINGS_PAGE_SLUG'],
+        PageFrog_NewPostSettings_Storage::OPTIONS_KEY,
+        array( 'new_post' => $new_post )
+    );
+
+    add_settings_field(
+        'fbia_disable_other_plugins',
+        '',
+        'render_fbia_disable_other_plugins',
+        $GLOBALS['PAGEFROG_SETTINGS_PAGE_SLUG'],
+        PageFrog_NewPostSettings_Storage::OPTIONS_KEY,
+        array( 'new_post' => $new_post )
     );
 
@@ -57 +75 @@
     ?><input type="hidden" name="<?php echo PageFrog_NewPostSettings_Storage::OPTIONS_KEY; ?>[fbia_enable_new_<?php echo $args['label'] ?>]" value="<?php echo $args['new_post']->get_fbia_enable_new_posts_string_for( $args['label'] ); ?>"><?php
 }
-
+function render_amp_disable_other_plugins( $args ) {
+    ?><input type="hidden" name="<?php echo PageFrog_NewPostSettings_Storage::OPTIONS_KEY; ?>[amp_disable_other_plugins]" value="<?php echo $args['new_post']->get_amp_disable_other_plugins_string(); ?>"><?php
+}
+function render_fbia_disable_other_plugins( $args ) {
+    ?><input type="hidden" name="<?php echo PageFrog_NewPostSettings_Storage::OPTIONS_KEY; ?>[fbia_disable_other_plugins]" value="<?php echo $args['new_post']->get_fbia_disable_other_plugins_string(); ?>"><?php
+}
 
 
@@ -271 +294 @@
                             </div>
                             <div class="row">
+                                <div class="col-sm-12 margin-bottom">
+                                    <div class="row">
+                                    <div class="col-sm-3">
+                                        <p><strong>Other Settings</strong></p>
+                                    </div>
+                                    <div class="col-sm-9">
+                                        <div class="row">
+                                            <div class="col-sm-12">
+                                                <div class="well">
+                                                    <div class="row">
+                                                        <div class="col-sm-12 margin-top-bottom">
+                                                            <label for="amp-disable-other-plugins">
+                                                                <input id="amp-disable-other-plugins" type="checkbox" class="sync-form" name="<?php echo PageFrog_NewPostSettings_Storage::OPTIONS_KEY; ?>[amp_disable_other_plugins]" <?php if ( $new_post->get_amp_disable_other_plugins_bool() ) echo 'checked="checked"'; ?>>&nbsp;Force AMP compliance by removing other plugins/functions from AMP pages.
+                                                            </label>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
                                 <div class="col-sm-12 margin-top-bottom" style="margin-top: 50px">
                                     <input type="submit" class="button green pull-right submit-new-posts-form" value="Save All Settings">

pagefrog/trunk/includes/class-pagefrog.php

@@ -70 +70 @@
 
         $this->plugin_name = 'pagefrog';
-        $this->version = '1.0.7.1';
+        $this->version = '1.0.7.2';
 
         $this->load_dependencies();
@@ -184 +184 @@
         // previews on the posts table
         $this->loader->add_action( 'admin_init', $plugin_admin, 'add_post_listing_table_hooks' );
-        
-
-        ///////////////////////////////////
-        // TEMP AMP PLUGIN COMPATIBILITY //
-        ///////////////////////////////////
-        $this->loader->add_action( 'pre_amp_render', $plugin_admin, 'render_v01_amp' );
-        $this->loader->add_action( 'amp_head', $plugin_admin, 'add_to_v01_amp_head' );
-        $this->loader->add_filter( 'amp_get_url', $plugin_admin, 'change_v01_amp_url' );
-        ///////////////////////////////////////
-        // END TEMP AMP PLUGIN COMPATIBILITY //
-        ///////////////////////////////////////
 
         // amp rendering
         $this->loader->add_action( 'amp_init', $plugin_admin, 'amp_add_custom_post_support' );
         $this->loader->add_action( 'wp', $plugin_admin, 'amp_add_custom_post_support' );
-        $this->loader->add_filter( 'amp_template_file', $plugin_admin, 'set_amp_template_file', 10, 1 );
         $this->loader->add_filter( 'amp_skip_post', $plugin_admin, 'should_amp_be_active_for_post', 10, 2 );
         $this->loader->add_action( 'init', $plugin_admin, 'hook_up_previews' );
         $this->loader->add_action( 'wp', $plugin_admin, 'maybe_handle_preview' );
+        $this->loader->add_filter( 'wp', $plugin_admin, 'maybe_disable_plugins' );
 
         // contact us form page

pagefrog/trunk/pagefrog.php

@@ -16 +16 @@
  * Plugin URI:        http://pagefrog.com/
  * Description:       The PageFrog plugin allows you to easily publish and manage your content directly from WordPress for Facebook Instant Articles (FBIA) and Google Accelerated Mobile Pages (AMP) with full support for ads and analytics.
- * Version:           1.0.7.1
+ * Version:           1.0.7.2
  * Author:            PageFrog Team
  * Author URI:        http://pagefrog.com/