From: poltawski <poltawski>
Date: Sun, 26 Apr 2009 15:19:45 +0000 (+0000)
Subject: blocks/tags Move youtube/flickr blocks away from magpie
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=becf869c6b35ee40baae2b745126ebbd0ccc5ee0;p=moodle.git

blocks/tags Move youtube/flickr blocks away from magpie

Instead use our general curl cache MDL-18973
---

diff --git a/blocks/tag_flickr/block_tag_flickr.php b/blocks/tag_flickr/block_tag_flickr.php
index 43271d4c0c..eb12112e8c 100644
--- a/blocks/tag_flickr/block_tag_flickr.php
+++ b/blocks/tag_flickr/block_tag_flickr.php
@@ -2,11 +2,9 @@
 
 require_once($CFG->dirroot.'/tag/lib.php');
 require_once($CFG->libdir . '/filelib.php');
-require_once($CFG->libdir . '/magpie/rss_cache.inc');
 
 define('FLICKR_DEV_KEY', '4fddbdd7ff2376beec54d7f6afad425e');
 define('DEFAULT_NUMBER_OF_PHOTOS', 6);
-define('FLICKR_CACHE_EXPIRATION', 1800);
 
 class block_tag_flickr extends block_base {
 
@@ -29,7 +27,7 @@ class block_tag_flickr extends block_base {
 
     function preferred_width() {
         return 170;
-    } 
+    }
 
     function get_content() {
 
@@ -40,7 +38,7 @@ class block_tag_flickr extends block_base {
         }
 
         $tagid = optional_param('id', 0, PARAM_INT);   // tag id - for backware compatibility
-        $tag = optional_param('tag', '', PARAM_TAG); // tag 
+        $tag = optional_param('tag', '', PARAM_TAG); // tag
 
         if ($tag) {
             $tagobject = tag_get('name', $tag);
@@ -104,7 +102,7 @@ class block_tag_flickr extends block_base {
             $response = $this->fetch_request($request);
 
             $search = unserialize($response);
-            $photos = array_values($search['photos']['photo']);  
+            $photos = array_values($search['photos']['photo']);
         }
 
 
@@ -126,33 +124,11 @@ class block_tag_flickr extends block_base {
     }
 
     function fetch_request($request){
-        global $CFG;
-
-        make_upload_directory('/cache/flickr');
-
-        $cache = new RSSCache($CFG->dataroot . '/cache/flickr', FLICKR_CACHE_EXPIRATION);
-        $cache_status = $cache->check_cache( $request);
-
-        if ( $cache_status == 'HIT' ) {
-            $cached_response = $cache->get( $request );
+        $c =  new curl(array('cache' => true, 'module_cache'=> 'tag_flickr'));
 
-            return $cached_response;
-        }
-
-        if ( $cache_status == 'STALE' ) {
-            $cached_response = $cache->get( $request );
-        }
+        $response = $c->get($request);
 
-        $response = download_file_content($request);
-
-        if(empty($response)){
-            $response = $cached_response;
-        }
-        else{
-            $cache->set($request, $response);    
-        }
-
-        return $response;        
+        return $response;
     }
 
     function build_photo_url ($photo, $size='medium') {
@@ -179,7 +155,7 @@ class block_tag_flickr extends block_base {
             $url = 'http://farm' . $photo['farm'] . '.static.flickr.com/' . $photo['server'] . '/' . $photo['id'] . '_' . $photo['secret'] . $sizes[$size] . '.jpg';
         }
         return $url;
-    }    
+    }
 }
 
 ?>
diff --git a/blocks/tag_youtube/block_tag_youtube.php b/blocks/tag_youtube/block_tag_youtube.php
index e9f7b89301..2bbce67b6a 100644
--- a/blocks/tag_youtube/block_tag_youtube.php
+++ b/blocks/tag_youtube/block_tag_youtube.php
@@ -2,12 +2,10 @@
 
 require_once($CFG->dirroot.'/tag/lib.php');
 require_once($CFG->libdir . '/filelib.php');
-require_once($CFG->libdir . '/magpie/rss_cache.inc');
 require_once($CFG->libdir . '/phpxml/xml.php');
 
 define('YOUTUBE_DEV_KEY', 'Dlp6qqRbI28');
 define('DEFAULT_NUMBER_OF_VIDEOS', 5);
-define('YOUTUBE_CACHE_EXPIRATION', 1800);
 
 class block_tag_youtube extends block_base {
 
@@ -30,7 +28,7 @@ class block_tag_youtube extends block_base {
 
     function preferred_width() {
         return 140;
-    } 
+    }
 
     function get_content() {
 
@@ -79,7 +77,7 @@ class block_tag_youtube extends block_base {
     function get_videos_by_tag(){
 
         $tagid = optional_param('id', 0, PARAM_INT);   // tag id - for backware compatibility
-        $tag = optional_param('tag', '', PARAM_TAG); // tag 
+        $tag = optional_param('tag', '', PARAM_TAG); // tag
 
         if ($tag) {
             $tagobject = tag_get('name', $tag);
@@ -110,7 +108,7 @@ class block_tag_youtube extends block_base {
     function get_videos_by_tag_and_category(){
 
         $tagid = optional_param('id', 0, PARAM_INT);   // tag id - for backware compatibility
-        $tag = optional_param('tag', '', PARAM_TAG); // tag 
+        $tag = optional_param('tag', '', PARAM_TAG); // tag
 
         if ($tag) {
             $tagobject = tag_get('name', $tag);
@@ -140,33 +138,9 @@ class block_tag_youtube extends block_base {
     }
 
     function fetch_request($request){
+        $c =  new curl(array('cache' => true, 'module_cache'=>'tag_youtube'));
 
-        global $CFG;
-
-        make_upload_directory('/cache/youtube');
-
-        $cache = new RSSCache($CFG->dataroot . '/cache/youtube',YOUTUBE_CACHE_EXPIRATION);
-        $cache_status = $cache->check_cache( $request);
-
-        if ( $cache_status == 'HIT' ) {
-            $cached_response = $cache->get( $request );
-
-            $xmlobj = XML_unserialize($cached_response);
-            return $this->render_video_list($xmlobj);
-        }
-
-        if ( $cache_status == 'STALE' ) {
-            $cached_response = $cache->get( $request );
-        }
-
-        $response = download_file_content($request);
-
-        if(empty($response)){
-            $response = $cached_response;
-        }
-        else{
-            $cache->set($request, $response);
-        }
+        $response = $c->get($request);
 
         $xmlobj = XML_unserialize($response);
         return $this->render_video_list($xmlobj);
@@ -189,9 +163,9 @@ class block_tag_youtube extends block_base {
                 $text .= format_time($video['length_seconds']);
                 $text .= "</div></li>\n";
             }
-        } else { 
+        } else {
             // if youtube is offline, or for whatever reason the previous
-            // call doesn't work... 
+            // call doesn't work...
             //add_to_log(SITEID, 'blocks/tag_youtube', 'problem in getting videos off youtube');
         }
         $text .= "</ul><div class=\"clearer\"></div>\n";