updated

drupal/sites/all/modules/contrib/media_flickr/README.txt

@@ -1,7 +1,39 @@
-// $Id: README.txt,v 1.1 2009/06/13 00:38:14 aaron Exp $
+// $Id: README.txt,v 1.1.2.1 2010/11/16 21:12:23 aaron Exp $
 
 Readme for Media: Flicker
 
-The Media: Flickr project currently offers Flickr Photoset capabilities to the Embedded Media Field module, available at http://drupal.org/project/emfield. To use it, enable the Embedded Video Field module, and add a Third Party Video field to a content type. For Thumbnails, you'll also need to apply for a Flickr API key, from http://www.flickr.com/services/api/keys.
+The Media: Flickr project currently offers Flickr Photoset capabilities to the
+Embedded Media Field module, available at http://drupal.org/project/emfield.
+To use it, enable the Embedded Video Field module, and add a Third Party Video
+field to a content type. For Thumbnails, you'll also need to apply for a Flickr
+API key, from http://www.flickr.com/services/api/keys.
 
-After that, editors will be able to paste a URL or the embed code for a Flickr Photoset or Slideshow into the field, and it will be displayed automatically. Additionally, that URL will be parsed automatically, so the module will know the difference between a Flickr Photoset URL and another supported provider, such as a YouTube video.
+After that, editors will be able to paste a URL or the embed code for a Flickr
+Photoset or Slideshow into the field, and it will be displayed automatically.
+Additionally, that URL will be parsed automatically, so the module will know the
+difference between a Flickr Photoset URL and another supported provider, such as
+a YouTube video.
+
+
+Configuration:
+--------------------
+(1) After you install the Embedded Media Field and Media: Flickr modules, go to
+your admin configuration (http://[www.yoursite.com]/admin/content/emfield) and
+set the "Flickr API" values under Images or Videos tab > "Flickr
+configuration". Note: You need to create your Flickr API key and secret from
+your account on Flickr.
+
+(2) Now when you create your Content Type and add the "Embedded Image" and/or
+"Embedded Video" field(s), you will need to fill out additional settings. In
+the "Providers Supported" fieldset area, check the "Custom URL" and "Flickr".
+Save the field settings.
+
+Content Creation:
+----------------
+(3) If you want a single image from Flickr, then use the "Embedded Image" CCK
+field.
+Example Flickr URL: http://www.flickr.com/photos/thusthought/5156938698/in/set-72157625220814125/
+
+(4) If you want to use a set from Flickr, then use the  "Embedded Video" CCK
+field.
+Example Flickr URL: http://www.flickr.com/photos/thusthought/sets/72157625220814125/show/

drupal/sites/all/modules/contrib/media_flickr/contrib/media_flickr_xspf/media_flickr_xspf.info

@@ -8,9 +8,9 @@ package = Media
 
 
 
-; Information added by drupal.org packaging script on 2010-02-01
-version = "6.x-1.11"
+; Information added by drupal.org packaging script on January 1, 1970 - 00:00
+version = "6.x-1.12"
 core = "6.x"
 project = "media_flickr"
-datestamp = "1265060713"
+datestamp = "1296256009"
 

drupal/sites/all/modules/contrib/media_flickr/media_flickr.info

@@ -7,9 +7,9 @@ dependencies[] = emvideo
 package = Media
 
 
-; Information added by drupal.org packaging script on 2010-02-01
-version = "6.x-1.11"
+; Information added by drupal.org packaging script on January 1, 1970 - 00:00
+version = "6.x-1.12"
 core = "6.x"
 project = "media_flickr"
-datestamp = "1265060713"
+datestamp = "1296256009"
 

drupal/sites/all/modules/contrib/media_flickr/providers/emimage/flickr.inc

@@ -1,5 +1,5 @@
 <?php
-// $Id: flickr.inc,v 1.1.2.1 2009/12/07 20:08:41 aaron Exp $
+// $Id: flickr.inc,v 1.1.2.3 2010/11/17 16:46:48 aaron Exp $
 
 /**
  * @file
@@ -273,3 +273,10 @@ function _emimage_flickr_guess_size($width, $height) {
   // If we don't have width or height set, then get the original size.
   return '5';
 }
+
+function emimage_flickr_thumbnail($field, $item, $formatter, $node, $width, $height) {
+  // As this is called by emthumb to grab the original size when available,
+  // for later use w/ imagecache, we'll try to grab an intentionally large
+  // image, at 4800x4800.
+  return emimage_flickr_image_url($item['value'], 4800, 4800, $formatter, $field, $item, $node);
+}

drupal/sites/all/modules/contrib/media_flickr/providers/emvideo/flickr_sets.inc

@@ -1,5 +1,5 @@
 <?php
-// $Id: flickr_sets.inc,v 1.1.2.26 2010/02/01 20:01:19 aaron Exp $
+// $Id: flickr_sets.inc,v 1.1.2.27 2011/01/28 22:45:54 aaron Exp $
 
 /**
  * @file
@@ -393,7 +393,7 @@ function emvideo_flickr_sets_thumbnail($field, $item, $formatter, $node, $width,
  *  @return
  *    the html of the embedded video
  */
-function emvideo_flickr_sets_video($embed, $width, $height, $field, $item, &$node, $autoplay, $options = array()) {
+function emvideo_flickr_sets_video($embed, $width, $height, $field, $item, $node, $autoplay, $options = array()) {
   $options['node'] = $options['node'] ? $options['node'] : $node;
   $options['field'] = $options['field'] ? $options['field'] : $field;
   $options['player'] = $options['player'] ? $options['player'] : ($field['widget']['media_flickr_player_video'] ? $field['widget']['media_flickr_player_video'] : variable_get('media_flickr_player', 'flash'));
@@ -418,7 +418,7 @@ function emvideo_flickr_sets_video($embed, $width, $height, $field, $item, &$nod
  *  @return
  *    the html of the embedded video
  */
-function emvideo_flickr_sets_preview($embed, $width, $height, $field, $item, &$node, $autoplay, $options = array()) {
+function emvideo_flickr_sets_preview($embed, $width, $height, $field, $item, $node, $autoplay, $options = array()) {
   $options['node'] = $options['node'] ? $options['node'] : $node;
   $options['field'] = $options['field'] ? $options['field'] : $field;
   $options['player'] = $options['player'] ? $options['player'] : ($field['widget']['media_flickr_player_preview'] ? $field['widget']['media_flickr_player_preview'] : variable_get('media_flickr_player', 'flash'));

drupal/sites/all/modules/contrib/media_youtube/includes/media_youtube.admin.inc

@@ -1,5 +1,5 @@
 <?php
-// $Id: media_youtube.admin.inc,v 1.1.2.8 2010/10/10 17:39:30 aaron Exp $
+// $Id: media_youtube.admin.inc,v 1.1.2.11 2011/02/04 16:06:40 aaron Exp $
 
 /**
  * @file
@@ -27,7 +27,7 @@ function media_youtube_admin_form() {
   // Find the Zend library.
   $zend_path = media_youtube_zend_path();
 
-  if (!$zend_path && module_exists('media_mover')) {
+  if (!$zend_path && module_exists('media_mover_api')) {
     drupal_set_message(t("For complete video upload capabilities, you need to download the !zend and extract the entire contents of the archive into the %path folder of your server.", array('!zend' => l(t('Zend PHP library'), 'http://framework.zend.com/download/gdata/', array('attributes' => array('target' => '_blank'))), '%path' => 'sites/all/libraries')), 'warning');
   }
 
@@ -118,6 +118,13 @@ function media_youtube_admin_form() {
     '#description' => t("If checked, additional info, such as title and rating, will NOT be displayed on the YouTube player."),
   );
 
+  $form['player']['player_options'][media_youtube_variable_name('html5_player')] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Use the HTML5 player instead of the Flash-based'),
+    '#default_value' => media_youtube_variable_get('html5_player'),
+    '#description' => t("If checked, the HTML5 capable player will be used instead of the regular flash-based. This is achieved as an iframe."),
+  );
+
   $form['player']['jwflv'] = array(
     '#type' => 'fieldset',
     '#title' => t('JW FLV Media Player Options'),
@@ -165,6 +172,12 @@ function media_youtube_admin_form() {
     '#default_value' => media_youtube_variable_get('youtube_password'),
     '#description' => t('If you plan to upload videos, you will need to enter the YouTube account password here.'),
   );
+  $form['api'][media_youtube_variable_name('store_raw_metadata')] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Store raw metadata'),
+    '#description' => t('If checked, then store the full metadata supplied by the YouTube API. Note that the Media: YouTube module does not need this, so only check it if directed to by another module, or if you know you need it for custom purposes.'),
+    '#default_value' => media_youtube_variable_get('store_raw_metadata'),
+  );
 
   $form['status'] = array(
     '#type' => 'fieldset',

drupal/sites/all/modules/contrib/media_youtube/includes/media_youtube.api.inc

@@ -1,5 +1,5 @@
 <?php
-// $Id: media_youtube.api.inc,v 1.1.2.6 2010/05/13 07:18:21 aaron Exp $
+// $Id: media_youtube.api.inc,v 1.1.2.7 2011/02/04 17:59:08 aaron Exp $
 
 /**
  * @file
@@ -29,6 +29,9 @@ function _media_youtube_check_upload($video_id, $youtube_username = NULL, $youtu
   Zend_Loader::loadClass('Zend_Gdata_App_HttpException', $path);
   Zend_Loader::loadClass('Zend_Gdata_App_Extension_Control', $path);
   Zend_Loader::loadClass('Zend_Gdata_YouTube_Extension_State', $path);
+  Zend_Loader::loadClass('Zend_Gdata_AuthSub', $path);
+  Zend_Loader::loadClass('Zend_Gdata_ClientLogin', $path);
+  Zend_Loader::loadClass('Zend_Uri_Http', $path);
 
   $httpClient = _media_youtube_get_auth_sub_http_client($youtube_username, $youtube_password);
   $youTubeService = new Zend_Gdata_YouTube($httpClient);

drupal/sites/all/modules/contrib/media_youtube/includes/media_youtube.variables.inc

@@ -1,5 +1,5 @@
 <?php
-// $Id: media_youtube.variables.inc,v 1.1.2.8 2010/11/12 15:09:38 aaron Exp $
+// $Id: media_youtube.variables.inc,v 1.1.2.12 2011/02/04 17:17:25 aaron Exp $
 
 /**
  * @file Contains the variables and defaults used by Media: YouTube.
@@ -28,7 +28,7 @@ define('MEDIA_YOUTUBE_REST_ENDPOINT', 'http://gdata.youtube.com/feeds/api/videos
  * we must increment this value, which will allow older content to be updated
  * to the new version automatically.
  */
-define('MEDIA_YOUTUBE_DATA_VERSION', 4);
+define('MEDIA_YOUTUBE_DATA_VERSION', 5);
 
 /**
  * These are player defaults. @TODO: Use variable namespace instead.
@@ -181,6 +181,18 @@ function media_youtube_variable_default($name = NULL) {
 
       'cron_time' => 10,
       'cron_limit' => 50,
+
+      // If TRUE, then store the entire metadata fetched from YouTube.
+      'store_raw_metadata' => FALSE,
+
+      // HTML5 Iframe variables.
+      'iframe_title' => 'YouTube video player',
+      'html5_player' => FALSE,
+
+      // We accidentally destroyed all thumbnails in a bad update.
+      // If that's been run improperly, then this will stay FALSE, and
+      // we need to self-correct.
+      'media_youtube_update_6012' => FALSE,
     );
   }
 

drupal/sites/all/modules/contrib/media_youtube/media_youtube.info

@@ -7,9 +7,9 @@ core = 6.x
 dependencies[] = emfield
 dependencies[] = emvideo
 
-; Information added by drupal.org packaging script on 2010-11-12
-version = "6.x-1.2"
+; Information added by drupal.org packaging script on January 1, 1970 - 00:00
+version = "6.x-1.3"
 core = "6.x"
 project = "media_youtube"
-datestamp = "1289578575"
+datestamp = "1296846508"