Changeset 748098

Timestamp:

07/30/2013 01:59:04 AM (13 years ago)

Author:

mglaman

Message:

Updating development branch: added caching, along with workaround to fix thumbnail resolution

Location:

facebook-albums/trunk

Files:

• fbalbum.php (modified) (6 diffs)
• inc/options-facebookalbum.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

facebook-albums/trunk/fbalbum.php

@@ -4 +4 @@
 Plugin URI: http://glamanate.com/wordpress/facebook-album/?utm_source=fbalbum_pluginspage&utm_medium=website&utm_campaign=fbalbum
 Description: Facebook Albums allows you to display Facebook Albums on your WordPress site. Brought to you by <a href="http://dooleyandassociates.com/?utm_source=fbalbum&utm_medium=referral&utm_campaign=Facebook%2BAlbum">Dooley & Associates</a>
-Version: 2.0.3
+Version: 2.0.2
 Author: Matt Glaman
 Author URI: http://glamanate.com
@@ -130 +130 @@
                 return 'Facebook API came back with a faulty result. You may be accessing an album you do not have permissions to access.';                     
             self::_enqueue_resources();
-            
+
             $html = '<div class="facebook-album-container">';
             if(self::$options['title']) $html .= '<h2><a href="' . self::_clean_url(self::_get_album_url()) . '" target="_blank"">' . $fb['name'] . '</a></h2>';
@@ -140 +140 @@
             foreach ($fb['photos']['data'] as $img) {
                 $photo_title = (isset(self::$options['photo_title'])) ? $img['name'] : '';
+                //Quick workaround to fix thumbnail resolution without causing issues on current saved data.
+                $thumb_size = self::$options['size'] - 1;
                 
                 $html .= '<div class="facebook-album-wrapper" style="float: left;margin: 2px;">';
                 $html   .= '<a href="'. self::_clean_url($img['source']) . '" title="'. $photo_title .'" rel="lightbox" class="fbalbum cboxElement">';
-                $html   .= '<div class="image size-'. self::$options['size'] .'" style="background-image: url(' . self::_clean_url($img['images'][self::$options['size']]['source']) . ')">&nbsp;</div>';
+                $html   .= '<div class="image size-'. self::$options['size'] .'" style="background-image: url(' . self::_clean_url($img['images'][$thumb_size]['source']) . ')">&nbsp;</div>';
                 $html   .= '</a>';
                 $html .= '</div>';
@@ -197 +199 @@
                 'secret' => self::$options['app_secret'],
             ));
-            if(!empty(self::$options['access_token'])) {
+            if(self::$facebook_sdk->getUser()) {
+                try{
+
+                } 
+                catch (FacebookApiException $e) {
+                    echo "<!--DEBUG: ".$e." :END-->";
+                    error_log($e);
+                }
+            }
+            
+            if(!empty(self::$options['access_token']))
                 self::$facebook_sdk->setAccessToken(self::$options['access_token']);
                 self::$facebook_sdk->setExtendedAccessToken();
                 self::$options['access_token'] = FB_Album::$facebook_sdk->getAccessToken();
                 update_option('facebookalbum', self::$options);
-            }
         }
         
@@ -215 +226 @@
      */
     public static function _get_graph_results($limit) {
-            if(!empty(self::$facebook_sdk)) {
-                try {
-                    $api_call = '/'.self::_get_album_id()."?fields=id,name,photos.limit({$limit}).fields(source,link,images,name)";
-                    $album = self::$facebook_sdk->api($api_call);
-                  } catch (FacebookApiException $e) {
-                    error_log($e);
-                    $album = null;
-                  }
+        
+        if(self::get_api_cache())
+            return self::get_api_cache();
+        if(!empty(self::$facebook_sdk)) {
+            try {
+                $api_call = '/'.self::_get_album_id()."?fields=id,name,photos.limit({$limit}).fields(source,link,images,name)";
+                $album = self::$facebook_sdk->api($api_call);
+                //We're good to go, let's cache the JSON
+                self::set_api_cache($album);
+            } catch (FacebookApiException $e) {
+                error_log($e);
+                 $album = null;
+            }
                 return $album;
             } else {
                 //Just in case the user did not set API access through a Facebook application
                 $facebook_graph_url = str_replace(array('{ALBUM_ID}', '{LIMIT}'), array(self::_get_album_id(), $limit), self::$graph_url);
+                //We're good to go, let's cache the JSON
+                self::set_api_cache($album);
                 return self::decap_do_curl($facebook_graph_url);                
             }
@@ -291 +309 @@
         self::_set_album_id( $facebook_album_id );
     }
+
+    /**
+     * Sets WordPress transient to cache API response
+     */
+    protected function set_api_cache($json) {
+        //Just in case
+        if(!self::$album_id)
+            return;
+        $cahce_lifetime = (isset(self::$options['cache'])) ? self::$options['cache'] * DAY_IN_SECONDS : DAY_IN_SECONDS;
+
+        set_transient("fbalbum_".self::$album_id, $json, DAY_IN_SECONDS); //caching for 24 hours
+    }
+
+    /**
+     * Gets WordPress transient of cached JSON response
+     **/
+    protected function get_api_cache() {
+        return get_transient("fbalbum_".self::$album_id);
+    }
     
     /**

facebook-albums/trunk/inc/options-facebookalbum.php

@@ -49 +49 @@
                             <option value="3" <?php selected($options['size'], 3) ?>>Bigger</option>
                             <option value="2" <?php selected($options['size'], 2) ?>>Large</option>
+                        </select>
+                    </p>
+                    <p><label for="fbalbum_cache">Cache Lifetime (Days)</label>: 
+                        <select name="facebookalbum[cache]" id="fbalbum_cache" value="" class="regular-text">
+                            <option value="1" <?php selected($options['cache'], 1) ?>>1 day</option>
+                            <option value="2" <?php selected($options['cache'], 2) ?>>2 days</option>
+                            <option value="3" <?php selected($options['cache'], 3) ?>>3 days</option>
+                            <option value="4" <?php selected($options['cache'], 4) ?>>4 days</option>
+                            <option value="5" <?php selected($options['cache'], 5) ?>>5 days</option>
+                            <option value="6" <?php selected($options['cache'], 6) ?>>6 days</option>
+                            <option value="7" <?php selected($options['cache'], 7) ?>>7 days</option>
                         </select>
                     </p>

facebook-albums/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.4
 Tested up to: 3.5.1
-Stable tag: 2.0.3
+Stable tag: 2.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -18 +18 @@
 Through Settings -> Facebook Album you can adjust the thumbnail sizes of your album's photos when they are displayed, along with enabling or disabling the album's title or the photo's description display.
 
+This plugin comes bundled with Colorbox, which can be disabled. Certain colorbox options are configurable, more will be soon. Priority was integrating Facebook app's.
+
 = Please consult developer if having issues integrating plugin with Facebook App for personal photo album use! =
-
-This plugin comes bundled with Colorbox, which can be disabled. Certain colorbox options are configurable, more will be soon. Priority was integrating Facebook app's.
 
 = Shortcode Example: = 
@@ -51 +51 @@
 
 == Changelog ==
+
+= 2.0.3 =
+* Add WordPress transients to cache Facebook response to increase performance
+* Adjusted thumbnail resolution
 
 = 2.0.1/2.0.2 =