Changeset 412894

Timestamp:

07/21/2011 02:25:02 AM (14 years ago)

Author:

mdbitz

Message:

Version 1.7.2

Location:

wordpress-amazon-associate/trunk

Files:

• AmazonProduct.php (modified) (1 diff)
• WPAA.php (modified) (8 diffs)
• WPAA/CacheHandler.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• wordpress_amazon_associate.php (modified) (2 diffs)

wordpress-amazon-associate/trunk/AmazonProduct.php

@@ -171 +171 @@
         // get Locale
         $locale = $wpaa->getGeoLocale( $options['locale'] );
+        //validate Product Exists
+        if( ! $wpaa->getCacheHandler()->productExists( $options['asin'], $locale ) ) {
+            $locale = $wpaa->getLocale();
+        }
+
         // Append service url
         $outputStr .= WPAA_URIHandler::getRemoteContentURI( $locale ) . '?';

wordpress-amazon-associate/trunk/WPAA.php

@@ -205 +205 @@
      * @var String
      */
-    protected $version = '1.7.1';
+    protected $version = '1.7.2';
 
     /**
@@ -211 +211 @@
      * @var String
      */
-    protected $last_updated = '07-16-2011';
+    protected $last_updated = '07-20-2011';
 
     /**
@@ -281 +281 @@
             add_filter('comment_text', array(&$this,'filter_amazon_associate_tag'), 25);
         }
+        // add amazon rel="nofilter" filter
+        add_filter('the_content', array(&$this, 'filter_rel_nofollow'), 20 );
         // insert product preview code if enabled
         if( $this->options['ProductPreview'] === true ) {
@@ -305 +307 @@
         }
         echo $content;
+    }
+
+    /**
+     * Filter content and add rel="nofollow" to Amazon Links
+     * 
+     * @param string $content 
+     * @return string
+     */
+    public function filter_rel_nofollow($content) {
+        preg_match_all('~<a.*>~isU',$content,$matches);
+        for ( $i = 0; $i <= sizeof($matches[0]) - 1; $i++){
+            if ( !preg_match( '~nofollow~is', $matches[0][$i])
+                    && (preg_match('~http://www.amazon.~', $matches[0][$i]) )){
+                $result = trim($matches[0][$i],">");
+                $result .= ' rel="nofollow">';
+                $content = str_replace($matches[0][$i], $result, $content);
+            }
+        }
+        return $content;
     }
 
@@ -320 +341 @@
         foreach ($filtered_matches as $key => $match) {
             $orig_str = $match;
-            $new_str = $orig_str;
-            if( $this->modules[self::MODULE_IP2NATION]->isInstalled() && $this->options['LocaleByGeoIP'] ) {
-                $new_str = $this->localize_static_tag( $new_str );
-            }
+            $new_str = $orig_str;
+            if( $this->modules[self::MODULE_IP2NATION]->isInstalled() && $this->options['LocaleByGeoIP'] ) {
+                $new_str = $this->localize_static_tag( $new_str );
+            }
             $new_str = $this->replace_associate_tag( $new_str );
             if( $orig_str != $new_str ) {
@@ -605 +626 @@
         if( is_null( $locale ) || empty( $locale ) ) {
             // Admin Localization
-            if( function_exists('wp_get_current_user') && function_exists('current_user_can') ) {
-                if ( current_user_can('manage_options') ) {
-                    if( $this->options['CVEnabled'] && $this->options['CVLocale'] != '' ) {
-                        return $this->options['CVLocale'];
-                    }
-                }
-            }
+            if( function_exists('wp_get_current_user') && function_exists('current_user_can') ) {
+                if ( current_user_can('manage_options') ) {
+                    if( $this->options['CVEnabled'] && $this->options['CVLocale'] != '' ) {
+                        return $this->options['CVLocale'];
+                    }
+                }
+            }
             // Get Geo Locale if enabled
             if(  $this->modules[self::MODULE_IP2NATION]->isInstalled() && $this->options['LocaleByGeoIP'] ) {
@@ -867 +888 @@
         }
 
-        // migration of Widgets Enabled :: Version < 2.0.0 Upgrade
+        // migration of Widgets Enabled :: Version < 1.7.0 Upgrade
         if( isset( $this->options['AmazonCarouselWidget'])) {
             $this->modules[self::MODULE_AMAZON_WIDGETS]->updateSettings( $this->options );
@@ -879 +900 @@
         }
 
-        // update AWSValid with current settings :: Version < 2.0.0 Upgrade
+        // update AWSValid with current settings :: Version < 1.7.0 Upgrade
         if( is_null( $this->options['AWSValid'] ) ) {
             $this->options['AWSValid'] = $this->validateCredentials();

wordpress-amazon-associate/trunk/WPAA/CacheHandler.php

@@ -149 +149 @@
 
     /**
+     * check if Amazon Product exists in given locale
+     * @global WPAA $wpaa
+     * @global WPDB $wpdb
+     * @param string $id
+     * @param string $locale
+     * @param string $type
+     * @param string $responseGroup
+     */
+    public function productExists( $id, $locale=null, $type="ASIN", $responseGroup=null ) {
+        global $wpaa;
+        global $wpdb;
+        $locale = $wpaa->getGeoLocale( $locale );
+
+        if( $this->_enabled ) { // cache is enabled
+            $cache_index = $locale . $id . $type . $responseGroup;
+            if( isset( $this->_cache[$cache_index] ) ) { // check php cache
+                $result = $this->_cache[$cache_index];
+                return $result->isSuccess();
+            } else {
+                //lookup product in db cache
+                $sql = $wpdb->prepare( "Select data, updated_ts FROM `$this->_table` WHERE id='%s' AND locale='%s' AND type='%s' AND response_group='%s';", $id, $locale, $type, $responseGroup );
+                $result = $wpdb->get_row( $sql );
+
+                //product not in cache
+                if( is_null( $result ) ) {
+                    $result = $this->getProductByAPI($id, $locale, $type, $responseGroup);
+                    //cache result in db
+                    $sql = $wpdb->insert( $this->_table, array( 'id' => $id, 'locale' => $locale, 'type' => $type, 'response_group' => $responseGroup, 'data' => serialize( $result ), 'updated_ts' => date( 'Y-m-d', time() ) ) );
+                    // cache result in php
+                    $this->_cache[$cache_index] = $result;
+                    return $result->isSuccess();
+                } else {
+
+                    // cache has expired
+                    if( $this->_expire > 0  && strtotime ( '+' . $this->_expire . ' day' , strtotime( $result->updated_ts ) ) < time() ) {
+                        $result = $this->getProductByAPI($id, $locale, $type, $responseGroup);
+                        //cache result in db
+                        $sql = $wpdb->update( $this->_table, array( 'data' => serialize( $result ), 'updated_ts' => date( 'Y-m-d', time() ) ), array( 'id' => $id, 'locale' => $locale, 'type' => $type, 'response_group' => $responseGroup ) );
+                        // cache result in php
+                        $this->_cache[$cache_index] = $result;
+                        // if product does not exist for locale then get product from default locale
+                        return $result->isSuccess();
+                    } else {
+                        //unserialize db cache
+                        $result = unserialize($result->data);
+                        // cache result in php
+                        $this->_cache[$cache_index] = $result;
+                        return $result->isSuccess();
+                    }
+                }
+            }
+        } else { // cache is disabled
+            $result = $this->getProductByAPI($id, $locale, $type, $responseGroup);
+            // if product does not exist for locale then get product from default locale
+            return $result->isSuccess();
+        }
+    }
+
+    /**
      * get Product from Amazon Product API
      * @global WPAA $wpaa

wordpress-amazon-associate/trunk/readme.txt

@@ -45 +45 @@
 1. **Amazon Product Linking**
 
-1. **Amazon Product Link Filtering**
+1. **Amazon Product Link Associate Tag filtering & update with rel="nofollow"**
 
 1. **Amazon Product Preview**
@@ -187 +187 @@
 
 The full project changelogs can be found at [http://labs.mdbitz.com/wordpress/wordpress-amazon-associate-plugin/changelog](http://labs.mdbitz.com/wordpress/wordpress-amazon-associate-plugin/changelog/?utm_source=wordpress&utm_medium=plugin-readme&utm_campaign=plugin)
+
+= 1.7.2 - 07/20/2011 =
+* Added check to Enhanced add to confirm product exists for Geo-Localization if not defaults to primary locale
+* Static Amazon Product links updated with rel="nofollow" automatically
+
+= 1.7.1 - 07/16/2011 =
+* Content Viewer Module - Update to check if wp_get_current_user exists to resolve WordPress issue
 
 = 1.7.0 - 07/15/2011 =

wordpress-amazon-associate/trunk/wordpress_amazon_associate.php

@@ -5 +5 @@
   Description: Quickly and eaily monetize your webiste through the integration of Amazon products and widgets tagged with your associate id.
   Author: MDBitz - Matthew John Denton
-  Version: 1.7.1
+  Version: 1.7.2
   Requires at least: 3.0.0
   Author URI: http://labs.mdbitz.com
@@ -44 +44 @@
 require_once plugin_dir_path(__FILE__) . 'WPAA.php';
 spl_autoload_register(array('WPAA', 'autoload'));
-$wpaa = new WPAA();
+$wpaa = new WPAA( );
+
+// deactivation
+register_deactivation_hook( __FILE__, 'wpaa_deactivate');
+
+/**
+ * send site uninstall information
+ */
+function wpaa_deactivate() {
+    if( function_exists('curl_init') ) {
+        $handle   = curl_init('http://mdbitz.com/installs.php?app=WPAA&uninstall=true&site=' . site_url() );
+        if (false !== $handle) {
+            curl_setopt($handle, CURLOPT_RETURNTRANSFER, TRUE);
+            curl_setopt($handle, CURLOPT_NOBODY, true);
+            $response = curl_exec($handle);
+            curl_close($handle);
+        }
+    }
+}
+
+// deactivation
+register_activation_hook( __FILE__, 'wpaa_activate');
+
+/**
+ * send site activation information
+ */
+function wpaa_activate() {
+    if( function_exists('curl_init') ) {
+        $handle   = curl_init('http://mdbitz.com/installs.php?app=WPAA&activate=true&site=' . site_url() );
+        if (false !== $handle) {
+            curl_setopt($handle, CURLOPT_RETURNTRANSFER, TRUE);
+            curl_setopt($handle, CURLOPT_NOBODY, true);
+            $response = curl_exec($handle);
+            curl_close($handle);
+        }
+    }
+}