Changeset 2411907

Timestamp:

11/03/2020 03:37:53 PM (5 years ago)

Author:

milanmk

Message:

Release 1.17.0

Location:

schema-app-structured-data-for-schemaorg

Files:

• tags/1.17.0 (added)
• tags/1.17.0/css (added)
• tags/1.17.0/css/schemaStyle.css (added)
• tags/1.17.0/data (added)
• tags/1.17.0/data/tree.jsonld (added)
• tags/1.17.0/hunch-schema.php (added)
• tags/1.17.0/js (added)
• tags/1.17.0/js/schema.js (added)
• tags/1.17.0/js/schemaAdmin.js (added)
• tags/1.17.0/js/schemaEditor.js (added)
• tags/1.17.0/lib (added)
• tags/1.17.0/lib/HunchSchema (added)
• tags/1.17.0/lib/HunchSchema/Author.php (added)
• tags/1.17.0/lib/HunchSchema/Blog.php (added)
• tags/1.17.0/lib/HunchSchema/Category.php (added)
• tags/1.17.0/lib/HunchSchema/Page.php (added)
• tags/1.17.0/lib/HunchSchema/Post.php (added)
• tags/1.17.0/lib/HunchSchema/Search.php (added)
• tags/1.17.0/lib/HunchSchema/Tag.php (added)
• tags/1.17.0/lib/HunchSchema/Thing.php (added)
• tags/1.17.0/lib/SchemaCron.php (added)
• tags/1.17.0/lib/SchemaEditor.php (added)
• tags/1.17.0/lib/SchemaFront.php (added)
• tags/1.17.0/lib/SchemaServer.php (added)
• tags/1.17.0/lib/SchemaSettings.php (added)
• tags/1.17.0/lib/classmap.php (added)
• tags/1.17.0/readme.txt (added)
• trunk/hunch-schema.php (modified) (2 diffs)
• trunk/lib/HunchSchema/Post.php (modified) (1 diff)
• trunk/lib/HunchSchema/Thing.php (modified) (5 diffs)
• trunk/lib/SchemaCron.php (added)
• trunk/lib/SchemaEditor.php (modified) (1 diff)
• trunk/lib/SchemaFront.php (modified) (2 diffs)
• trunk/lib/SchemaServer.php (modified) (7 diffs)
• trunk/lib/SchemaSettings.php (modified) (3 diffs)
• trunk/lib/classmap.php (modified) (1 diff)
• trunk/readme.txt (modified) (4 diffs)

schema-app-structured-data-for-schemaorg/trunk/hunch-schema.php

@@ -5 +5 @@
  * Plugin URI: http://www.schemaapp.com
  * Description: This plugin adds http://schema.org structured data to your website
- * Version: 1.16.2
+ * Version: 1.17.0
  * Author: Hunch Manifest
  * Author URI: https://www.hunchmanifest.com
@@ -33 +33 @@
     $HunchSchemaFront = new SchemaFront();
 }
+
+
+$hunch_schema_cron = new SchemaCron();

schema-app-structured-data-for-schemaorg/trunk/lib/HunchSchema/Post.php

@@ -44 +44 @@
     public function getBreadcrumb( $Pretty = false ) {
         $position                           = 1;
-        $permalink_structure                = get_option( 'permalink_structure' );
         $this->SchemaBreadcrumb['@context'] = 'https://schema.org/';
         $this->SchemaBreadcrumb['@type']    = 'BreadcrumbList';
 
-        if ( $permalink_structure ) {
+        if ( get_option( 'permalink_structure' ) ) {
             $permalink_host         = stristr( get_permalink(), parse_url( get_permalink(), PHP_URL_PATH ), true );
             $permalink_path_parts   = array_values( array_filter( explode( '/', parse_url( get_permalink(), PHP_URL_PATH ) ) ) );

schema-app-structured-data-for-schemaorg/trunk/lib/HunchSchema/Thing.php

@@ -74 +74 @@
 
     public static function getPermalink() {
-        $permalink = '';
-
-        if ( is_author() ) {
-            $permalink = get_author_posts_url( get_the_author_meta( 'ID' ) );
-        } elseif ( is_category() ) {
-            $permalink = get_category_link(get_query_var( 'cat' ) );
-        } elseif ( is_singular() ) {
-            $permalink = get_permalink();
-        } elseif ( is_front_page() && is_home() || is_front_page() ) {
-            $permalink = home_url();
-        } elseif ( is_home() ) {
-            $permalink = get_permalink( get_option( 'page_for_posts' ) );
+        global $wp;
+
+        // Using home_url instead of site_url as WP directory can be different from homepage
+        $permalink = home_url( '/' );
+
+        if ( $wp->did_permalink ) {
+        // Pretty permalink
+            if ( $wp->request ) {
+            // Non homepage request
+                if ( substr( get_option( 'permalink_structure' ), -1 ) == '/' ) {
+                // Permalink with directory structure; ends with "/"
+                    $permalink = trailingslashit( home_url( $wp->request ) );
+                } else {
+                    $permalink = home_url( $wp->request );
+                }
+            }
+        } else {
+        // Plain permalink
+            if ( $wp->query_string ) {
+            // Non homepage request
+                if ( count( $wp->query_vars ) > 1 ) {
+                // Remove unnecessary query variables
+                    $permalink = home_url( '/' ) . '?' . urldecode( strstr( $wp->query_string, '&', true ) );
+                } else {
+                    $permalink = home_url( '/' ) . '?' . urldecode( $wp->query_string );
+                }
+            }
         }
 
@@ -324 +339 @@
         global $post;
 
-        $featured_video_url = '';
+        $post_content       = apply_filters( 'the_content', $post->post_content );
+        $featured_video_url = '';
 
         if ( function_exists( 'get_the_post_video_url' ) ) {
@@ -331 +347 @@
 
         $videos = array();
-        $urls = wp_extract_urls( $post->post_content . $featured_video_url );
+        $urls = wp_extract_urls( $post_content . $featured_video_url );
 
         if ( count( $urls ) ) {
             foreach ( $urls as $url ) {
-                $url = trim( $url );
-
                 if ( filter_var( $url, FILTER_VALIDATE_URL ) != false  &&  stripos( $url, 'vimeo.com' ) !== false ) {
                     $videos[] = $this->get_vimeo_video( $url );
@@ -344 +358 @@
 
 
-        $youtube_video_ids = $this->get_youtube_video_ids( $post->post_content . $featured_video_url );
+        $youtube_video_ids = $this->get_youtube_video_ids( $post_content . $featured_video_url );
 
         if ( count( $youtube_video_ids ) ) {
@@ -388 +402 @@
     protected function get_youtube_video_ids( $string ) {
         if ( ! empty( $string ) ) {
-            // https?://(?:[0-9A-Z-]+\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-] )([\w-]{11})(?=[^\w-]|$)(?![?=&+%\w.-]*(?:[\'"][^<>]*>|</a>) )[?=&+%\w.-]*
-            // https?://(?:[0-9A-Z-]+\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-] )([\w-]{11})(?=[^\w-]|$)[?=&+%\w.-]*
-            preg_match_all( '~https?://(?:www\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-] )([\w-]{11})(?=[^\w-]|$)[?=&+%\w.-]*~im', $string, $matches );
+            // https?://(?:[0-9A-Z-]+\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-])([\w-]{11})(?=[^\w-]|$)(?![?=&+%\w.-]*(?:[\'"][^<>]*>|</a>))[?=&+%\w.-]*
+            // https?://(?:[0-9A-Z-]+\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-])([\w-]{11})(?=[^\w-]|$)[?=&+%\w.-]*
+            preg_match_all( '~https?://(?:www\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-])([\w-]{11})(?=[^\w-]|$)[?=&+%\w.-]*~im', $string, $matches );
 
             if ( isset( $matches[1] ) && count( $matches[1] ) ) {
-                return $matches[1];
+                return array_unique( $matches[1] );
             }
         }

schema-app-structured-data-for-schemaorg/trunk/lib/SchemaEditor.php

@@ -179 +179 @@
                         </td>
                         <td>
-                            <?php print $schema_server->page_url; ?>
+                            <a href="<?php print $schema_server->resource_url; ?>" target="_blank"><?php print $schema_server->resource_url; ?></a>
                         </td>
                     </tr>

schema-app-structured-data-for-schemaorg/trunk/lib/SchemaFront.php

@@ -248 +248 @@
             {
                 if ( ! empty( $this->Settings['Debug'] ) && is_user_logged_in() ) {
-                    printf( "\n<!--\nURL: %s\nTransient: %s\nTransient Id: %s\nData Sources:\n", $SchemaServer->page_url, ( $SchemaServer->transient ? 'Yes' : 'No' ), $SchemaServer->transient_id );
+                    printf( "\n<!--\nURL: %s\nTransient: %s\nTransient Id: %s\nData Sources:\n", $SchemaServer->resource_url, ( $SchemaServer->transient ? 'Yes' : 'No' ), $SchemaServer->transient_id );
 
                     foreach ( $SchemaServer->data_sources as $data_source ) {
@@ -360 +360 @@
                 'id'    => 'Hunch-Schema',
                 'title' => 'Test Schema',
-                'href'  => 'https://developers.google.com/structured-data/testing-tool?url=' . urlencode( $Permalink ),
+                'href'  => 'https://search.google.com/structured-data/testing-tool#url=' . urlencode( $Permalink ),
                 'meta'  => array
                 (

schema-app-structured-data-for-schemaorg/trunk/lib/SchemaServer.php

@@ -4 +4 @@
 
 /**
- * Handle interactions with the http://app.schemaapp,com server
+ * Handle interactions with the http://app.schemaapp.com server
  *
  * @author Mark van Berkel
@@ -12 +12 @@
         private $options;
         private $resource;
+        public $resource_url    = '';
         public $transient_id    = '';
         public $transient       = false;
-        public $page_url        = '';
         public $data_sources    = array();
 
         const EDITOR = "https://app.schemaapp.com/editor";
 
-        public function __construct($uri = "") {
+
+        public function __construct( $uri = '' ) {
             $this->options = get_option( 'schema_option_name' );
 
             if ( ! empty( $uri ) ) {
                 $this->resource = $uri;
-            } elseif ( is_singular() ) {
-                $this->resource = get_permalink();
             } else {
-                $permalink_structure = get_option( 'permalink_structure' );
-
-                // If pretty permalink then remove query string from URL
-                if ( $permalink_structure ) {
-                    $request_uri = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
-                
-                    $this->resource = ( is_ssl() ? 'https' : 'http' ) . "://{$_SERVER['HTTP_HOST']}{$request_uri}";
-                } else {
-                    $this->resource = ( is_ssl() ? 'https' : 'http' ) . "://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}";
-                }
+                $this->resource = HunchSchema_Thing::getPermalink();
             }
         }
 
-        /**
-         * Get Resource JSON_LD content
-         * 
-         * @param type $uri
-         * @return string
-         */
-        public function getResource($uri = '', $pretty = false) {
+
+        /**
+         * Get a resource's schema data from transient cache.
+         *
+         * @uses get_transient()
+         * @param string $uri Post/Page permalink.
+         * @param bool $pretty Whether to prettify JSON data or not.
+         * @return string JSON encoded schema markup.
+         */
+        public function getResource( $uri = '', $pretty = false ) {
             if ( empty( $this->options['graph_uri'] ) ) {
                 return '';
@@ -64 +57 @@
 
             $account_id         = str_replace( array( 'http://schemaapp.com/db/', 'https://schemaapp.com/db/' ), '', $this->options['graph_uri'] );
-            $resource           = $this->page_url = urldecode( $resource ); // Decode accent characters
-            $resource_hash      = trim( base64_encode( $resource ), '=' );
-            $this->data_sources = array( "https://data.schemaapp.com/{$account_id}/{$resource_hash}" );
-            $this->transient_id = 'HunchSchema-Markup-' . md5( $resource );
+            $this->resource_url = urldecode( $resource ); // Decode accent characters
+            $this->data_sources = array( "https://data.schemaapp.com/{$account_id}/" . trim( base64_encode( $this->resource_url ), '=' ) );
+            $this->transient_id = 'HunchSchema-Markup-' . md5( $this->resource_url );
             $transient          = get_transient( $this->transient_id );
 
 
-            $data_sources_additional = ( array ) apply_filters( 'hunch_schema_markup_api_data_source', $account_id, $resource );
+            $data_sources_additional = ( array ) apply_filters( 'hunch_schema_markup_api_data_source', $account_id, $this->resource_url );
 
             if ( ! empty( $data_sources_additional ) ) {
@@ -86 +78 @@
                 $this->transient = true;
 
+                if ( $pretty && version_compare( phpversion(), '5.4.0', '>=' ) ) {
+                    $transient = json_encode( json_decode( $transient ), JSON_PRETTY_PRINT );
+                }
+
                 return $transient;
             }
 
 
-            $schemadata = '';
+            // Check to avoid triggering of schedule event when request is originated from WP Cron
+            if ( ! defined( 'DOING_CRON' ) || ! DOING_CRON ) {
+                // Delegate API schema fetching to cron and pass requested resource as argument
+                wp_schedule_single_event( time(), 'schema_app_cron_resource_from_api', array( $resource ) );
+            }
+
+
+            return '';
+        }
+
+
+        /**
+         * Get a resource's schema data through API.
+         *
+         * @uses SchemaServer->getResource()
+         * @uses wp_remote_get()
+         * @uses set_transient()
+         * @param string $uri Post/Page permalink.
+         * @return string JSON encoded schema markup.
+         */
+        public function getResourceFromAPI( $uri = '' ) {
+            // Prepare necessary resource attributes
+            $this->getResource( $uri );
+
+            $schema_data = '';
 
             foreach ( $this->data_sources as $data_source ) {
@@ -96 +116 @@
 
                 if ( ! is_wp_error( $remote_response ) && wp_remote_retrieve_response_code( $remote_response ) == 200 && ! empty( wp_remote_retrieve_body( $remote_response ) ) && wp_remote_retrieve_body( $remote_response ) !== 'null' ) {
-                    $schemadata = wp_remote_retrieve_body( $remote_response );
+                    $schema_data = wp_remote_retrieve_body( $remote_response );
 
                     // First delete then set; set method only updates expiry time if transient already exists
                     delete_transient( $this->transient_id );
-                    set_transient( $this->transient_id, $schemadata, 86400 );
-
-                    if ( $pretty && version_compare( phpversion(), '5.4.0', '>=' ) ) {
-                        $schemadata = json_encode( json_decode( $schemadata ), JSON_PRETTY_PRINT );
-                    }
+                    set_transient( $this->transient_id, $schema_data, 86400 ); // Expiry 1 day
 
                     break;
@@ -110 +126 @@
             }
 
-            return $schemadata;
+            return $schema_data;
         }
 
@@ -154 +170 @@
                 return array( true, $response_data->status );
             } else {
-                return array( false, $response_data->error );
+                return array( false, "{$response_data->status} : {$response_data->error}" );
             }
         }

schema-app-structured-data-for-schemaorg/trunk/lib/SchemaSettings.php

@@ -47 +47 @@
     function PluginActivate()
     {
+        if ( ! current_user_can( 'activate_plugins' ) ) {
+            return;
+        }
+
         $Settings = get_option( 'schema_option_name' );
 
@@ -662 +666 @@
 
 
+        print '<h3>Scheduled resources from API</h3>';
+
+        if ( ! empty( _get_cron_array() ) ) {
+            print '<ol>';
+
+            foreach ( _get_cron_array() as $item ) {
+                foreach ( $item as $key => $value ) {
+                    if ( $key != 'schema_app_cron_resource_from_api' ) {
+                        continue 2;
+                    }
+
+                    $event = reset( $value );
+                    $argument = reset( $event['args'] );
+                }
+
+                printf( '<li> <p>%s</p> </li>', $argument );
+            }
+
+            print '</ol>';
+        } else {
+            print '<p>No scheduled items found.</p>';
+        }
+
+
         $transients = $wpdb->get_col( "SELECT DISTINCT option_name  FROM {$wpdb->options}  WHERE option_name LIKE '_transient_HunchSchema-Markup-%'" );
 
 
-        print '<h3>Cached Schema Items</h3>';
+        print '<br><br> <hr> <h3>Cached schema data</h3>';
 
         if ( $transients ) {
@@ -685 +713 @@
 
 
-        print '<br><br> <hr> <h3>Cache REST API Log</h3>';
+        print '<br><br> <hr> <h3>Cache REST API log</h3>';
 
         if ( file_exists( $rest_api_cache_log_file ) ) {

schema-app-structured-data-for-schemaorg/trunk/lib/classmap.php

@@ -13 +13 @@
 require_once $baseDir . 'SchemaSettings.php';
 require_once $baseDir . 'SchemaFront.php';
+require_once $baseDir . 'SchemaCron.php';
 require_once $baseDir . $schemaDir . 'Thing.php';
 require_once $baseDir . $schemaDir . 'Page.php';

schema-app-structured-data-for-schemaorg/trunk/readme.txt

@@ -9 +9 @@
 Requires PHP: 5.4
 Tested up to: 5.5
-Stable tag: 1.16.2
+Stable tag: 1.17.0
 License: GPL2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -75 +75 @@
 
 == Frequently Asked Questions ==
-You\'ll find the [FAQ on SchemaApp.com] (https://www.schemaapp.com/wordpress/faq/).
+
+You'll find the [FAQ on SchemaApp.com](https://www.schemaapp.com/solutions/wordpress-plugin/faq/).
 
 == Screenshots ==
@@ -86 +87 @@
 
 == Changelog ==
+
+= 1.17.0 =
+- Feature, Schema data fetching from API is now handled by WP Cron to improve page load time
+- Improve, License check message for WooCommerce plugin
+- Improve, Updated get permalink routine to use $wp for detecting correct urls
+- Improve, Optimized video parsing routine
 
 = 1.16.2 =
@@ -426 +433 @@
 == Upgrade Notice ==
 
-= 1.16.2 =
-- Fix archive permalinks for Schema API resource
+= 1.17.0 =
+ - Schema data fetching from API is now handled by WP Cron, updated get permalink routine for detecting correct urls