Changeset 998562

Timestamp:

09/29/2014 02:10:15 PM (12 years ago)

Author:

mglaman

Message:

Fix the Widget on development for 3.x

Location:

facebook-albums/trunk/inc

Files:

• album-helper.php (modified) (1 diff)
• widget.php (modified) (3 diffs)

facebook-albums/trunk/inc/album-helper.php

@@ -198 +198 @@
    */
   public function clear_api_cache() {
-    delete_transient('fbalbum_' . $this->$album_id);
+    delete_transient('fbalbum_' . $this->album_id);
   }
 

facebook-albums/trunk/inc/widget.php

@@ -53 +53 @@
 
     //Before exiting out, lets clear the cache.
-    FB_Album::_set_album_url($instance['url']);
-    $album_id = FB_Album::_get_album_id();
-    FB_Album::clear_cache($album_id);
+    $album_id = FB_Album_GraphHelper::find_album_id($instance['url']);
+    if ($album_id) {
+      $album = new FB_Album_AlbumHelper($album_id, $instance['limit'], TRUE);
+    }
 
     return $instance;
@@ -63 +64 @@
     extract($args);
 
-    echo $before_widget;
+    echo $args['before_widget'];
 
     if(!empty($instance['title']))
-      echo $before_title . esc_attr($instance['title']) . $after_title;
+      echo $args['before_title'] . esc_attr($instance['title']) . $args['after_title'];
 
     //Loads up plugin variables
@@ -76 +77 @@
     $facebook_album_url = (!empty($wp_pages[$post->ID])) ? $wp_pages[$post->ID] : $instance['url'];
 
+    // Initiate the album.
+    $album_id = FB_Album_GraphHelper::find_album_id($facebook_album_url);
+    $album = new FB_Album_AlbumHelper($album_id, $instance['limit']);
 
-    if($facebook_album_url != '') {
-      FB_Album::_set_album_url( $facebook_album_url );
-    } else {
-      //We didn't have a URL!
-      echo 'No Facebook Album specified.';
-      echo $after_widget;
-      return;
-    }
+    // Returns HTML
+    echo $album->build_album_output();
 
-    if(!FB_Album::_get_album_id()) {
-      echo 'The Facebook album ID came up empty, double check the URL';
-      echo $after_widget;
-      return;
-    } else {
-
-      //Checks if Facebook API came back with a result
-      if(!($fb = FB_Album::_get_graph_results($instance['limit'])) ) {
-        echo 'Sorry, there was an error loading the Facebook album, please refresh the page and try again.';
-        echo $after_widget;
-        return;
-      }
-
-      //Checks if has photo data
-      if(!$fb['data']) {
-        echo 'Facebook API came back with a faulty result. You may be accessing an album you do not have permissions to access.';
-      } else {
-        FB_Album::_enqueue_resources();
-       ?>
-        <?php if( $instance['show_album_title'] ) #TODO: Notice
-          echo '<span class="fbalbum-title"><a href="' . FB_Album::_clean_url(FB_Album::_get_album_url()) . '" target="_blank"">' . $fb['data'][0]['album']['name'] . '</a></span>'; ?>
-
-        <div class="fbalbum fbalbum-widget"> <?php
-        //Reverse array to show oldest to newest
-        if(isset(FB_Album::$options['order']) && !empty(FB_Album::$options['order']))
-          $fb['data'] = array_reverse($fb['data']);
-
-        foreach ($fb['data'] as $img) :
-          $thumb_size = FB_Album::$options['size'] - 1;
-          $thumbnail_src_url = FB_Album::check_thumbnail_src_size_url($img, $thumb_size);
-          ?>
-          <div class="item">
-            <a href="<?php echo FB_Album::_clean_url($img['images'][1]['source']) ?>" target="_blank" rel="lightbox" class="fbalbum cboxElement">
-              <div class="image size-<?php echo $instance['thumb_size']; ?>" style="background-image: url('<?php echo FB_Album::_clean_url($thumbnail_src_url) ?>');">&nbsp;</div>
-            </a>
-          </div>
-
-          <?php
-        endforeach;
-        echo '</div>';
-        echo FB_Album::build_colorbox();
-      }
-    }
-    echo $after_widget;
+    echo $args['after_widget'];
   }