Changeset 2366035

Timestamp:

08/20/2020 07:10:25 PM (5 years ago)

Author:

milanmk

Message:

Release 1.16.1

Location:

schema-app-structured-data-for-schemaorg

Files:

• tags/1.16.1 (added)
• tags/1.16.1/css (added)
• tags/1.16.1/css/schemaStyle.css (added)
• tags/1.16.1/data (added)
• tags/1.16.1/data/tree.jsonld (added)
• tags/1.16.1/hunch-schema.php (added)
• tags/1.16.1/js (added)
• tags/1.16.1/js/schema.js (added)
• tags/1.16.1/js/schemaAdmin.js (added)
• tags/1.16.1/js/schemaEditor.js (added)
• tags/1.16.1/lib (added)
• tags/1.16.1/lib/HunchSchema (added)
• tags/1.16.1/lib/HunchSchema/Author.php (added)
• tags/1.16.1/lib/HunchSchema/Blog.php (added)
• tags/1.16.1/lib/HunchSchema/Category.php (added)
• tags/1.16.1/lib/HunchSchema/Page.php (added)
• tags/1.16.1/lib/HunchSchema/Post.php (added)
• tags/1.16.1/lib/HunchSchema/Search.php (added)
• tags/1.16.1/lib/HunchSchema/Tag.php (added)
• tags/1.16.1/lib/HunchSchema/Thing.php (added)
• tags/1.16.1/lib/SchemaEditor.php (added)
• tags/1.16.1/lib/SchemaFront.php (added)
• tags/1.16.1/lib/SchemaServer.php (added)
• tags/1.16.1/lib/SchemaSettings.php (added)
• tags/1.16.1/lib/classmap.php (added)
• tags/1.16.1/readme.txt (added)
• trunk/hunch-schema.php (modified) (1 diff)
• trunk/lib/SchemaEditor.php (modified) (1 diff)
• trunk/lib/SchemaFront.php (modified) (3 diffs)
• trunk/lib/SchemaServer.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 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.0
+ * Version: 1.16.1
  * Author: Hunch Manifest
  * Author URI: https://www.hunchmanifest.com

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

@@ -200 +200 @@
                     <tr>
                         <td style="width: 30%;">
-                            API URL
-                        </td>
-                        <td>
-                            <a href="<?php print $schema_server->api_url; ?>" target="_blank"><?php print $schema_server->api_url; ?></a>
+                            Data Sources
+                        </td>
+                        <td>
+                            <ul>
+                            <?php foreach ( $schema_server->data_sources as $data_source ) : ?>
+                                <li><a href="<?php print $data_source; ?>" target="_blank"><?php print $data_source; ?></a></li>
+                            <?php endforeach; ?>
+                            </ul>
                         </td>
                     </tr>

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

@@ -55 +55 @@
 
     public function hook_plugins_loaded() {
-        if ( defined( 'WPSEO_VERSION' ) ) {
-            if ( version_compare( WPSEO_VERSION, '11.0', '<' ) ) {
-                // Default enabled
-                if ( ! isset( $this->Settings['SchemaRemoveWPSEOMarkup'] ) || $this->Settings['SchemaRemoveWPSEOMarkup'] == 1 ) {
-                    add_filter( 'wpseo_json_ld_output', array( $this, 'RemoveWPSEOJsonLD' ), 10, 2 );
-                }
-
-                // Disable WPSEO Breadcrumb markup if ours is enabled
-                if ( ! empty( $this->Settings['SchemaBreadcrumb'] ) ) {
-                    add_filter( 'wpseo_json_ld_output', array( $this, 'RemoveWPSEOJsonLDBreadcrumb' ), 10, 2 );
-                }
-            } else {
-                // Default enabled
-                if ( ! isset( $this->Settings['SchemaRemoveWPSEOMarkup'] ) || $this->Settings['SchemaRemoveWPSEOMarkup'] == 1 ) {
-                    add_filter( 'wpseo_schema_graph_pieces', array( $this, 'wpseo_remove_schema' ), 10, 2 );
-                }
-            }
+        // Default enabled
+        if ( defined( 'WPSEO_VERSION' ) && ( ! isset( $this->Settings['SchemaRemoveWPSEOMarkup'] ) || $this->Settings['SchemaRemoveWPSEOMarkup'] == 1 ) ) {
+            //https://developer.yoast.com/features/schema/api/
+            add_filter( 'wpseo_json_ld_output', '__return_false', 100 );
         }
     }
@@ -260 +247 @@
             else
             {
+                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 );
+
+                    foreach ( $SchemaServer->data_sources as $data_source ) {
+                        printf( "%s\n", $data_source );
+                    }
+
+                    print "-->\n";
+                }
+
                 printf( '<script type="application/ld+json" data-schema="%s-%s-%s">%s</script>' . "\n", $post->ID, $PostType, $SchemaMarkupType, $SchemaMarkup );
             }
@@ -350 +347 @@
 
         return $Buffer;
-    }
-
-
-    public function RemoveWPSEOJsonLD( $data, $context )
-    {
-        if ( in_array( $context, array( 'website', 'company', 'person', 'breadcrumb' ) ) )
-        {
-            return array();
-        }
-
-        return $data;
-    }
-
-
-    public function RemoveWPSEOJsonLDBreadcrumb( $data, $context )
-    {
-        if ( $context == 'breadcrumb' )
-        {
-            return array();
-        }
-
-        return $data;
-    }
-
-
-    public function wpseo_remove_schema( $pieces, $context ) {
-        $pieces = array();
-
-        return $pieces;
     }
 

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

@@ -12 +12 @@
         private $options;
         private $resource;
-        public $transient_id;
-        public $transient = false;
-        public $page_url;
-        public $api_url;
+        public $transient_id    = '';
+        public $transient       = false;
+        public $page_url        = '';
+        public $data_sources    = array();
 
-        const API_SERVER = "https://api.schemaapp.com/";
-        const DATA_SERVER = "https://data.schemaapp.com/";
         const EDITOR = "https://app.schemaapp.com/editor";
-        const ACTIVATE = "service/activate.json";
 
         public function __construct($uri = "") {
@@ -47 +44 @@
          */
         public function getResource($uri = '', $pretty = false) {
-
-                if (empty($this->options['graph_uri'])) {
-                        return '';
-                }
+            if ( empty( $this->options['graph_uri'] ) ) {
+                return '';
+            }
 
 
-                $resource = '';
+            $resource = '';
 
-                if (!empty($uri)) {
-                        $resource = $uri;
-                } elseif (!empty($this->resource)) {
-                        $resource = $this->resource;
-                } else {
-                        return '';
-                }
+            if ( ! empty( $uri ) ) {
+                $resource = $uri;
+            } elseif ( ! empty( $this->resource ) ) {
+                $resource = $this->resource;
+            } else {
+                return '';
+            }
 
-                // Decode accent characters
-                $this->page_url = $resource = urldecode( $resource );
 
-                $this->readLink($resource);
+            $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 );
+            $transient          = get_transient( $this->transient_id );
 
-                $this->transient_id = $transient_id = 'HunchSchema-Markup-' . md5($resource);
-                $transient = get_transient($transient_id);
 
-                // Check for missing, empty or 'null' transient
-                if ($transient !== false && $transient !== 'null') {
-                    $this->transient = true;
-                    return $transient;
-                }
+            $data_sources_additional = ( array ) apply_filters( 'hunch_schema_markup_api_data_source', $account_id, $resource );
 
-                $remote_response = wp_remote_get($this->readLink($resource));
+            if ( ! empty( $data_sources_additional ) ) {
+                foreach ( $data_sources_additional as $data_source ) {
+                    if ( filter_var( $data_source, FILTER_VALIDATE_URL ) ) {
+                        $this->data_sources[] = $data_source;
+                    }
+                }
+            }
 
-                // Check for anything unexpected
-                if (is_wp_error($remote_response) || wp_remote_retrieve_body($remote_response) === "" || wp_remote_retrieve_body($remote_response) === false || wp_remote_retrieve_body($remote_response) === 'null' || wp_remote_retrieve_response_code($remote_response) != 200) {
-                        $schemadata = '';
-                } else {
-                        $schemadata = wp_remote_retrieve_body($remote_response);
 
-                        // First delete then set; set method only updates expiry time if transient already exists
-                        delete_transient( $transient_id );
-                        set_transient($transient_id, $schemadata, 86400);
+            // Check for missing, empty or 'null' transient
+            if ( ! empty( $transient ) && $transient !== 'null' ) {
+                $this->transient = true;
 
-                        if ($pretty && version_compare(phpversion(), '5.4.0', '>=')) {
-                                $schemadata = json_encode(json_decode($schemadata), JSON_PRETTY_PRINT);
-                        }
-                }
+                return $transient;
+            }
 
-                return $schemadata;
+
+            $schemadata = '';
+
+            foreach ( $this->data_sources as $data_source ) {
+                $remote_response = wp_remote_get( $data_source );
+
+                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 );
+
+                    // 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 );
+                    }
+
+                    break;
+                }
+            }
+
+            return $schemadata;
         }
 
-        /**
-         * Get the Link to Update a Resource that exists
-         * 
-         * @param type $uri
-         * @return string
-         */
-        protected function readLink($uri = '') {
-                $uri = !empty($uri) ? $uri : $this->resource;
-                $graph = str_replace( array( 'http://schemaapp.com/db/', 'https://schemaapp.com/db/' ), '', $this->options['graph_uri'] );
-
-                $this->api_url = $this::DATA_SERVER . $graph . '/' . trim(base64_encode($uri), '=');
-
-                return $this->api_url;
-        }
 
         /**

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

@@ -8 +8 @@
 Requires at least: 3.7
 Requires PHP: 5.4
-Tested up to: 5.4
+Tested up to: 5.5
 Stable tag: 1.16.0
 License: GPL2
@@ -87 +87 @@
 == Changelog ==
 
+= 1.16.1 = 
+- Improve, updated Yoast SEO filter to remove schema markup
+- Improve, added filter for adding data sources to API
+- Improve, debug info for logged in users
+
+
 = 1.16.0 = 
 - Feature, Added global option to enable or disable video schema markup