Changeset 1917953

Timestamp:

08/01/2018 03:19:10 AM (7 years ago)

Author:

userdeck

Message:

Tagging version 1.1.6

Location:

userdeck

Files:

• tags/1.1.6 (added)
• tags/1.1.6/readme.txt (added)
• tags/1.1.6/userdeck.js (added)
• tags/1.1.6/userdeck.php (added)
• tags/1.1.6/views (added)
• tags/1.1.6/views/admin-options.php (added)
• trunk/readme.txt (modified) (3 diffs)
• trunk/userdeck.js (modified) (1 diff)
• trunk/userdeck.php (modified) (12 diffs)

userdeck/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.7
 Tested up to: 4.9
-Stable tag: 1.1.5
+Stable tag: 1.1.6
 
 Easily integrate UserDeck's embedded support software into your WordPress website.
@@ -51 +51 @@
 == Upgrade Notice ==
 
+= 1.1.6 =
+Fixed bug with empty content when fetching guide seo content.
+
 = 1.1.5 =
 Fixed bug with registering sitemaps with seo plugin if guide is not setup.
@@ -84 +87 @@
 
 == Changelog ==
+
+= 1.1.6 =
+* Fixed bug with empty content when fetching guide seo content
 
 = 1.1.5 =

userdeck/trunk/userdeck.js

@@ -11 +11 @@
         }
 
-        var iframe = jQuery('<iframe id="iframe-guides" src="https://app.userdeck.com/' + type + '?redir=' + start + '" width="400" height="600" frameborder="0" ALLOWTRANSPARENCY="true"></iframe>')
+        var iframe = jQuery('<iframe id="iframe-guides" src="https://app.userdeck.com/' + type + '?redir=' + start + '" width="400" height="600" frameborder="0" ALLOWTRANSPARENCY="true"></iframe>');
 
         wrapper.append(iframe);

userdeck/trunk/userdeck.php

@@ -4 +4 @@
  * Plugin URI: http://wordpress.org/plugins/userdeck
  * Description: Embedded customer support from <a href="http://userdeck.com?utm_source=wordpress&utm_medium=link&utm_campaign=website">UserDeck</a> that embeds into your website.
- * Version: 1.1.5
+ * Version: 1.1.6
  * Author: UserDeck
  * Author URI: http://userdeck.com?utm_source=wordpress&utm_medium=link&utm_campaign=website
@@ -45 +45 @@
         $this->add_actions();
         $this->add_filters();
-        $this->add_shortcodes();
         
     }
@@ -92 +91 @@
         add_filter( "plugin_action_links_$plugin", array( $this, 'add_action_links' ) );
         add_filter( 'plugin_row_meta', array( $this, 'add_plugin_meta_links' ), 10, 4 );
-    }
-    
-    public function add_shortcodes() {
-        
-        add_shortcode( 'userdeck_guides', array( $this, 'output_guides_shortcode') );
-        
     }
     
@@ -200 +193 @@
     }
     
-    public function has_guide_meta() {
-        
-        global $post;
+    public function has_guide_meta( $post ) {
         
         $guides_key = get_post_meta($post->ID, 'userdeck_guides_key', true);
         
         if (!empty($guides_key)) {
-            return true;
+            return $guides_key;
         }
         
@@ -255 +246 @@
         $post = $this->guide_page;
         
-        if ( empty( $post ) ) {
+        $guides_key = $this->has_guide_meta( $post );
+        
+        if ( empty( $guides_key ) ) {
             return '';
         }
         
-        $guides_key = get_post_meta($post->ID, 'userdeck_guides_key', true);
-
         $sitemap_url = 'https://userdeck.net/g/' . $guides_key . '/sitemap.xml';
 
@@ -288 +279 @@
         $post = $this->guide_page;
         
-        if ( empty( $post ) ) {
+        $guides_key = $this->has_guide_meta( $post );
+        
+        if ( empty( $guides_key ) ) {
             return;
         }
-        
-        $guides_key = get_post_meta($post->ID, 'userdeck_guides_key', true);
 
         $sitemap_url = 'https://userdeck.net/g/' . $guides_key . '/sitemap.xml';
@@ -435 +426 @@
         if ( isset( $post ) && is_page() ) {
         
-            $guides_key = get_post_meta($post->ID, 'userdeck_guides_key', true);
+            $guides_key = $this->has_guide_meta( $post );
             
             if (!empty($guides_key)) {
@@ -447 +438 @@
     }
     
-    public function output_guides_shortcode() {
-        
-        // retrieve the options
-        $options = $this->get_settings();
-        
-        $guides_key = $options['guides_key'];
-        
-        return $this->output_guides_code($guides_key);
-        
-    }
-    
     /**
      * output the userdeck guides javascript install code
@@ -466 +446 @@
         $content = '';
 
-        if (isset( $_GET['_escaped_fragment_'] )) {
-
-            $path = '';
-
-            if ( $_GET['_escaped_fragment_'] ) {
-                $path = $_GET['_escaped_fragment_'][0] == '/' ? substr( $_GET['_escaped_fragment_'], 1 ) : $_GET['_escaped_fragment_'];
-            }
+        if ( $this->is_escaped_fragment_request() ) {
+
+            $path = $this->escaped_fragment_path();
 
             $base_uri = 'https://userdeck.net/g/' . $guides_key . '/';
@@ -481 +457 @@
 
             $request = wp_remote_get( $base_uri . $path );
-
+            $status = wp_remote_retrieve_response_code( $request );
             $content = '';
-
-            if ( wp_remote_retrieve_response_code( $request ) == 200 ) {
+            $body = '';
+            
+            if ( $status == 200 ) {
                 $content = wp_remote_retrieve_body( $request );
             }
 
-            preg_match('/\<body\>(.*?)\<\/body\>/is', $content, $body);
-            $body = $body[1];
+            if ( preg_match('/\<body\>(.*?)\<\/body\>/is', $content, $body ) ) {
+                $body = $body[1];
+            }
+            else {
+                $body = $content;
+            }
             
             $content = strstr($body, '<div class="content">');
-            
             $content = str_replace('/g/'.$guides_key.'/', get_permalink().'#!', $content);
 
@@ -507 +487 @@
     }
     
-    public function generate_guides_shortcode($guides_key) {
-        
-        return '[userdeck_guides key="'.$guides_key.'"]';
+    public function is_escaped_fragment_request() {
+        
+        return isset( $_GET['_escaped_fragment_'] );
+        
+    }
+    
+    public function escaped_fragment_path() {
+        
+        $path = '';
+        
+        if ( $_GET['_escaped_fragment_'] ) {
+            $path = $_GET['_escaped_fragment_'][0] == '/' ? substr( $_GET['_escaped_fragment_'], 1 ) : $_GET['_escaped_fragment_'];
+        }
+        
+        return $path;
         
     }
@@ -518 +510 @@
         
         if ( isset( $post ) && is_page() ) {
-            if ($this->has_guide_meta() || has_shortcode( $post->post_content, 'userdeck_guides' ))
+            if ( $this->has_guide_meta( $post ) )
             ?>
             <meta name="fragment" content="!">