Merge pull request #126 from Patreon/1_8_1_release

1 8 1 release

Author: codebard

classes/patreon_options.php

@@ -286,7 +286,7 @@ function patreon_plugin_setup_page(){
 											<th scope="row">
 												<strong>Enable image locking features</strong>
 												<br>
-												<div class="patreon-options-info">If on, you will be able to lock your images and provide patron only images anywhere in your posts like webcomics or visual content. If you aren't using image locking or having complications due to your web host infrastructure, you can keep this feature off. Whenever you turn this feature on or off, you should visit 'Permalinks' settings in your WordPress site and save your permalinks just once by clicking 'Save'. Otherwise your images may appear broken.</div>
+												<div class="patreon-options-info">If on, you will be able to lock your images and provide patron only images anywhere in your posts like webcomics or visual content. This may use noticeable server resources at your web host. If you aren't using image locking or having complications due to your web host infrastructure, you turn this feature off. Whenever you turn this feature on or off, you should visit 'Permalinks' settings in your WordPress site and save your permalinks just once by clicking 'Save'. Otherwise your images may appear broken.</div>
 											</th>
 											<td>
 												<input type="checkbox" name="patreon-enable-file-locking" value="1"<?php checked( get_option( 'patreon-enable-file-locking', false ) ); ?> />

classes/patreon_protect.php

@@ -196,9 +196,9 @@ public static function servePatronOnlyImage( $image=false ) {
 
 		// Check if image exists in media library
 
-		$attachment_id = attachment_url_to_postid( $image );
+		$attachment_id = Patreon_Protect::get_attachment_id_from_url( $image );
 
-		// attachment_url_to_postid returns 0 if it cant find the attachment post id
+		// The above returns 0 if it cant find the attachment post id
 
 		if ( $attachment_id == 0 ) {
 
@@ -731,9 +731,9 @@ public function makeAttachmentPledgeEditor( $attachment_id = false ) {
 		}
 		// Get attachment from attachment url.
 
-		$attachment_id = attachment_url_to_postid( $attachment_url );
+		$attachment_id = Patreon_Wordpress::get_attachment_id_from_url( $attachment_url );
 
-		// attachment_url_to_postid returns 0 if it cant find the attachment post id
+		// The above returns 0 if it cant find the attachment post id
 
 		if ( $attachment_id == 0 ) {
 
@@ -836,9 +836,9 @@ public function ParseContentForProtectedImages( $content ) {
 
 		foreach ( $images as $key => $value ) {
 
-			$attachment_id = attachment_url_to_postid( $images[$key] );
+			$attachment_id = Patreon_Protect::get_attachment_id_from_url( $images[$key] );
 
-			// attachment_url_to_postid returns 0 if it cant find the attachment post id
+			// The above returns 0 if it cant find the attachment post id
 
 			if ( $attachment_id == 0 ) {
 
@@ -940,5 +940,64 @@ public static function checkPatronPledgeForImage( $attachment_id, $user = false
 		return 0;
 
 	}
+	// Taken and modified from https://wordpress.stackexchange.com/questions/6645/turn-a-url-into-an-attachment-post-id/7094#7094
+	// wp attachment_url_to_postid fails for intermediate size images at the time of this commit - this is a replacement
+	public static function get_attachment_id_from_url( $url ) {
+
+        $dir = wp_upload_dir();
+
+        // baseurl never has a trailing slash
+        if ( false === strpos( $url, $dir['baseurl'] . '/' ) ) {
+            // URL points to a place outside of upload directory
+            return 0;
+        }
+
+        $file  = basename( $url );
+        $query = array(
+            'post_type'  => 'attachment',
+            'fields'     => 'ids',
+            'meta_query' => array(
+                array(
+                    'key'     => '_wp_attached_file',
+                    'value'   => $file,
+                    'compare' => 'LIKE',
+                ),
+            )
+        );
+
+        // query attachments
+        $ids = get_posts( $query );
+
+        if ( ! empty( $ids ) ) {
+
+            foreach ( $ids as $id ) {
+
+                // first entry of returned array is the URL
+                if ( $url === array_shift( wp_get_attachment_image_src( $id, 'full' ) ) )
+                    return $id;
+            }
+        }
+
+        $query['meta_query'][0]['key'] = '_wp_attachment_metadata';
+
+        // query attachments again
+        $ids = get_posts( $query );
+
+        if ( empty( $ids) )
+            return 0;
+
+        foreach ( $ids as $id ) {
+
+            $meta = wp_get_attachment_metadata( $id );
+
+            foreach ( $meta['sizes'] as $size => $values ) {
+
+                if ( $values['file'] === $file && $url === array_shift( wp_get_attachment_image_src( $id, $size ) ) )
+                    return $id;
+            }
+        }
+
+        return 0;
+    }
 
 }

classes/patreon_wordpress.php

@@ -951,7 +951,7 @@ public static function AdminMessages() {
 
 		// The addon upsell must be admin wide, permanently dismissable, and must not appear in plugin manager page in admin
 
-		if( !$pcm_addon_upsell_shown AND !self::check_plugin_exists('patron-content-manager') AND $current_screen->id != 'plugins' AND ( (self::check_days_after_last_non_system_notice( 7 ) AND self::calculate_days_after_first_activation( 30 ) ) OR $existing_install ) AND !$already_showed_non_system_notice AND !isset($GLOBALS['patron_content_manager_pitch_being_shown']) ) {
+		if( !$pcm_addon_upsell_shown AND !self::check_plugin_exists('patron-content-manager') AND $current_screen->id != 'plugins' AND ( (self::check_days_after_last_non_system_notice( 7 ) AND self::calculate_days_after_first_activation( 30 ) ) OR $existing_install ) AND !$already_showed_non_system_notice AND !isset($GLOBALS['patron_content_manager_pitch_being_shown']) AND !is_plugin_active( 'patron-plugin-pro/index.php' )) {
 
 			?>
 				<div class="notice notice-success is-dismissible patreon-wordpress" id="patron_content_manager_pitch_shown"><p><div style="display: flex; flex-wrap: wrap; flex-direction: row;"><a href="https://codebard.com/patron-content-manager?utm_source=<?php urlencode( site_url() ) ?>&utm_medium=patreon_wordpress&utm_campaign=&utm_content=patreon_wordpress_addon_upsell_notice_patron_content_manager&utm_term=" target="_blank"><img class="addon_upsell" src="<?php echo PATREON_PLUGIN_ASSETS ?>/img/Easily-manage-gated-posts.jpg" style="width:200px; height:106px;margin: 10px; border: 1px solid #000000; margin-right: 20px;" alt="Patron Content Manager" /></a><div style="max-width: 700px; width: 100%;"><div style="max-width:500px; width: auto; float:left; display:inline-box"><h2 style="margin-top: 0px; font-size: 150%; font-weight: bold;">Easily manage your patron only content with Patron Content Manager</h2></div><div style="width:100%; font-size: 125% !important;clear:both; ">Get new <a href="https://codebard.com/patron-content-manager?utm_source=<?php urlencode( site_url() ) ?>&utm_medium=patreon_wordpress&utm_campaign=&utm_content=patreon_wordpress_addon_upsell_notice_patron_content_manager&utm_term=" target="_blank">Patron Content Manager</a> plugin for Patreon and easily re-gate content, gate old content, use detailed locking options, use content locking wizard to manage your patron only content & increase your patrons and pledges.<br /><br /><a href="https://codebard.com/patron-content-manager?utm_source=<?php urlencode( site_url() ) ?>&utm_medium=patreon_wordpress&utm_campaign=&utm_content=patreon_wordpress_addon_upsell_notice_patron_content_manager&utm_term=" target="_blank">Check out all features here</a></div></div></div></p>

patreon.php

@@ -4,7 +4,7 @@
 Plugin Name: Patreon Wordpress
 Plugin URI: https://www.patreon.com/apps/wordpress
 Description: Patron-only content, directly on your website.
-Version: 1.8.0
+Version: 1.8.1
 Author: Patreon <[email protected]>
 Author URI: https://patreon.com
 */
@@ -68,7 +68,7 @@
 define( "PATREON_CREATOR_BYPASSES_FILTER_MESSAGE", 'This content is for Patrons only, it\'s not locked for you because you are logged in as the Patreon creator' );
 define( "PATREON_NO_LOCKING_LEVEL_SET_FOR_THIS_POST", 'Post is already public. If you would like to lock this post, please set a pledge level for it' );
 define( "PATREON_NO_POST_ID_TO_UNLOCK_POST", 'Sorry - could not get the post id for this locked post' );
-define( "PATREON_WORDPRESS_VERSION", '1.8.0' );
+define( "PATREON_WORDPRESS_VERSION", '1.8.1' );
 define( "PATREON_WORDPRESS_BETA_STRING", '' );
 define( "PATREON_WORDPRESS_PLUGIN_SLUG", plugin_basename( __FILE__ ) );
 define( "PATREON_PRIVACY_POLICY_ADDENDUM", '<h2>Patreon features in this website</h2>In order to enable you to use this website with Patreon services, we save certain functionally important Patreon information about you in this website if you log in with Patreon.

readme.txt

@@ -4,7 +4,7 @@ Tags: patreon, membership, members
 Requires at least: 4.0
 Requires PHP: 5.4
 Tested up to: 5.8.1
-Stable tag: 1.8.0
+Stable tag: 1.8.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -79,6 +79,11 @@ It is  difficult to protect videos due the intensive bandwidth requirements of h
 
 == Upgrade Notice ==
 
+= 1.8.1 =
+
+* Enhanced post id detection from attachment url. This will address various issues those who are using image locking were having with smaller size thumbnails of locked images, or non locked images of smaller attachment sizes.
+* Hid the PCM addon upsell notification when PP addon is active
+
 = 1.8.0 =
 
 * Made the post syncer not overwrite $ level if an existing post has it. This will prevent overriding of already set post tier values with.
@@ -438,6 +443,11 @@ Nothing will be changed at your site - the plugin will just connect your site to
 
 == Changelog ==
 
+= 1.8.1 =
+
+* Enhanced post id detection from attachment url. This will address various issues those who are using image locking were having with smaller size thumbnails of locked images, or non locked images of smaller attachment sizes.
+* Hid the PCM addon upsell notification when PP addon is active
+
 = 1.8.0 =
 
 * Made the post syncer not overwrite $ level if an existing post has it. This will prevent overriding of already set post tier values with.