### Eclipse Workspace Patch 1.0 #P emfield Index: contrib/emvideo/providers/veoh.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/veoh.inc,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 veoh.inc --- contrib/emvideo/providers/veoh.inc 10 Aug 2008 22:22:12 -0000 1.1.2.1 +++ contrib/emvideo/providers/veoh.inc 12 Aug 2008 20:28:08 -0000 @@ -65,9 +65,9 @@ function theme_emvideo_veoh_flash($embed, $width, $height, $autoplay) { if ($embed) { - $autoplay = $autoplay ? '&videoAutoPlay=1' : '&videoAutoPlay=0'; + $autoplay = $autoplay ? '&videoAutoPlay=1' : '&videoAutoPlay=0'; - $output .= ''; + $output .= ''; } return $output; } Index: contrib/emvideo/providers/myspace.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/myspace.inc,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 myspace.inc --- contrib/emvideo/providers/myspace.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/myspace.inc 12 Aug 2008 20:28:08 -0000 @@ -31,7 +31,7 @@ function emvideo_myspace_request($code, $cacheable = TRUE) { $args = array(); - return module_invoke('emfield', 'request_xml', 'myspace', "http://vids.myspace.com/index.cfm?fuseaction=vids.individual&videoid=$code", $args, $cacheable); + return module_invoke('emfield', 'request_xml', 'myspace', "http://vids.myspace.com/index.cfm?fuseaction=vids.individual&videoid=$code", $args, $cacheable); } /** @@ -41,13 +41,13 @@ if (!$cached || !$cache = cache_get('myspace:thumbnail:'. $video, 'cache')) { $vidid = drupal_substr($video, 0, 10); - if ($str = file_get_contents("http://vids.myspace.com/index.cfm?fuseaction=vids.individual&videoid=$vidid")) { + if ($str = file_get_contents("http://vids.myspace.com/index.cfm?fuseaction=vids.individual&videoid=$vidid")) { // grab videos channel-id first $channel_id = preg_replace('/.*tvchanid=([0-9]+);.*/si', '\1', $str); if (is_numeric($channel_id)) { // now from channel-page grab videos thumbnail - $str2 = file_get_contents("http://vids.myspace.com/index.cfm?fuseaction=vids.viewVideos&channelid=$channel_id"); + $str2 = file_get_contents("http://vids.myspace.com/index.cfm?fuseaction=vids.viewVideos&channelid=$channel_id"); if ($str2) { $picturelink = preg_replace('@.*href="[^"]+'. $vidid .'"[^>]+>]+src="([^"]+)".*@si', '\1', $str2); @@ -70,15 +70,15 @@ function emvideo_myspace_extract($embed) { // What's That Floating In The Water Part 1

Add to My Profile | More Videos return array( - '@src="myspace\.com/index.cfm\?fuseaction=vids\.individual&videoid=([^&"]+)@i', - '@myspace\.com/index\.cfm\?fuseaction=vids\.individual&videoid=([^&"]+)@i', - '@src="myspacetv\.com/index.cfm\?fuseaction=vids\.individual&videoid=([^&"]+)"@i', - '@myspacetv\.com/index\.cfm\?fuseaction=vids\.individual&videoid=([^&"]+)@i', + '@src="myspace\.com/index.cfm\?fuseaction=vids\.individual&videoid=([^&"]+)@i', + '@myspace\.com/index\.cfm\?fuseaction=vids\.individual&videoid=([^&"]+)@i', + '@src="myspacetv\.com/index.cfm\?fuseaction=vids\.individual&videoid=([^&"]+)"@i', + '@myspacetv\.com/index\.cfm\?fuseaction=vids\.individual&videoid=([^&"]+)@i', ); } function emvideo_myspace_video_link($video_code) { - return 'http://vids.myspace.com/index.cfm?fuseaction=vids.individual&videoid='. $video_code; + return 'http://vids.myspace.com/index.cfm?fuseaction=vids.individual&videoid='. $video_code; } function theme_emvideo_myspace_flash($embed, $width, $height) { @@ -91,7 +91,7 @@ - + \n"; } Index: contrib/emvideo/providers/jumpcut.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/jumpcut.inc,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 jumpcut.inc --- contrib/emvideo/providers/jumpcut.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/jumpcut.inc 12 Aug 2008 20:28:08 -0000 @@ -42,7 +42,7 @@ function theme_emvideo_jumpcut_flash($embed, $width, $height) { if ($embed) { - $output .= ''; + $output .= ''; } return $output; } Index: contrib/emvideo/providers/dailymotion.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/dailymotion.inc,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 dailymotion.inc --- contrib/emvideo/providers/dailymotion.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/dailymotion.inc 12 Aug 2008 20:28:07 -0000 @@ -96,7 +96,7 @@ function theme_emvideo_dailymotion_flash($embed, $width, $height, $autoplay) { if ($embed) { if ($autoplay) { - $autoplay_value = '&autoStart=1'; + $autoplay_value = '&autoStart=1'; } $output .= " Index: contrib/emvideo/providers/livevideo.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/livevideo.inc,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 livevideo.inc --- contrib/emvideo/providers/livevideo.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/livevideo.inc 12 Aug 2008 20:28:08 -0000 @@ -114,7 +114,7 @@ */ function theme_emvideo_livevideo_flash($embed, $width, $height, $autoplay) { if ($embed) { - $autostart = $autoplay ? '&autoStart=1' : ''; + $autostart = $autoplay ? '&autoStart=1' : ''; $output .= ''; } Index: contrib/emvideo/providers/brightcove.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/brightcove.inc,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 brightcove.inc --- contrib/emvideo/providers/brightcove.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/brightcove.inc 12 Aug 2008 20:28:07 -0000 @@ -87,7 +87,7 @@ function theme_emvideo_brightcove_flash($embed, $width, $height, $autoplay) { if ($embed) { $autostart = $autoplay ? 'autoStart=true' : 'autoStart=false'; - $output .= ""; + $output .= ""; } return $output; } Index: contrib/emvideo/providers/zzz_custom_url.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/zzz_custom_url.inc,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 zzz_custom_url.inc --- contrib/emvideo/providers/zzz_custom_url.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/zzz_custom_url.inc 12 Aug 2008 20:28:09 -0000 @@ -128,7 +128,7 @@ return ''; case 'flv': $autostart = $autoplay ? 'true' : 'false'; - return ''; + return ''; } } } Index: contrib/emvideo/providers/imeem.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/imeem.inc,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 imeem.inc --- contrib/emvideo/providers/imeem.inc 10 Aug 2008 22:22:12 -0000 1.1.2.1 +++ contrib/emvideo/providers/imeem.inc 12 Aug 2008 20:28:08 -0000 @@ -4,7 +4,7 @@ define('EMVIDEO_IMEEM_MAIN_URL', 'http://www.imeem.com/'); define('EMVIDEO_IMEEM_API_INFO', 'http://www.imeem.com/developers/documentation/'); define('EMVIDEO_IMEEM_API_APPLICATION_URL', 'http://www.imeem.com/developers/'); -define('EMVIDEO_IMEEM_XML', 'http://www.imeem.com/api/xml/mediaGetInfo?&mediaIds='); +define('EMVIDEO_IMEEM_XML', 'http://www.imeem.com/api/xml/mediaGetInfo?&mediaIds='); function emvideo_imeem_info() { $name = t('IMEEM'); @@ -48,7 +48,7 @@ function emvideo_imeem_request($embed, $cacheable = TRUE) { $args = array('docid' => $embed); - return module_invoke('emfield', 'request_xml', 'imeem', EMVIDEO_IMEEM_XML . $embed .'&version=1.0', $args, $cacheable); + return module_invoke('emfield', 'request_xml', 'imeem', EMVIDEO_IMEEM_XML . $embed .'&version=1.0', $args, $cacheable); } function emvideo_imeem_extract($embed = '') { @@ -63,7 +63,7 @@ function theme_emvideo_imeem_flash($embed, $width, $height, $autoplay) { $autoplay = $autoplay ? '/aus=true' : '/aus=false'; - $colors = 'backColor=666666&primaryColor=cccccc&secondaryColor=333333&linkColor=cccccc'; + $colors = 'backColor=666666&primaryColor=cccccc&secondaryColor=333333&linkColor=cccccc'; $output .= ''; $output .= ''; Index: contrib/emvideo/providers/bliptv.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/bliptv.inc,v retrieving revision 1.1.2.5 diff -u -r1.1.2.5 bliptv.inc --- contrib/emvideo/providers/bliptv.inc 12 Aug 2008 02:51:05 -0000 1.1.2.5 +++ contrib/emvideo/providers/bliptv.inc 12 Aug 2008 20:28:07 -0000 @@ -250,13 +250,13 @@ $id = isset($options['id']) ? $options['id'] : "emfield_videocck_player_bliptv_$count"; $autoplay = $autoplay ? 'autoStart=true' : 'autoStart=false'; - $rss = $item['data']['showpage'] ? "&feedurl={$item['data']['showpage']}/rss" : ''; + $rss = $item['data']['showpage'] ? "&feedurl={$item['data']['showpage']}/rss" : ''; $post_id = $item['data']['post_id']; // if/when we allow featured shows to be embedded, this will handle that. // $file = $item['data']['is_show'] ? "http://$code.blip.tv/rss/flash/" : 'http://blip.tv/rss/flash/'. $item['data']['post_id']; $embed_code = $item['data']['flv']['embed_code']['0']; $file = 'http://blip.tv/rss/flash/'. $item['data']['post_id']; - $embed_file = 'http://blip.tv/scripts/flash/showplayer.swf?enablejs=true'. $rss .'&file='. $file .'&showplayerpath=http://blip.tv/scripts/flash/showplayer.swf'; + $embed_file = 'http://blip.tv/scripts/flash/showplayer.swf?enablejs=true'. $rss .'&file='. $file .'&showplayerpath=http://blip.tv/scripts/flash/showplayer.swf'; // If you want strict html you may want to use the following code instead of the one blip provides // $output .= ''; Index: contrib/emvideo/providers/lastfm.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/lastfm.inc,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 lastfm.inc --- contrib/emvideo/providers/lastfm.inc 10 Aug 2008 22:22:12 -0000 1.1.2.1 +++ contrib/emvideo/providers/lastfm.inc 12 Aug 2008 20:28:08 -0000 @@ -93,7 +93,7 @@ if ($embed) { // set css id count $count++; - $output .= ' '; + $output .= ' '; } return $output; } Index: contrib/emvideo/providers/google.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/google.inc,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 google.inc --- contrib/emvideo/providers/google.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/google.inc 12 Aug 2008 20:28:08 -0000 @@ -58,7 +58,7 @@ function theme_emvideo_google_flash($embed, $width, $height, $autoplay) { if ($embed) { - $autoplay = $autoplay ? '&autoPlay=true' : ''; + $autoplay = $autoplay ? '&autoPlay=true' : ''; // this will be executed by not Internet Explorer browsers $output = ' '; + $autoplay = $autoplay ? '&autoPlay=true' : '&autoPlay=false'; + $output .= ''; return $output; } Index: contrib/emvideo/providers/youtube.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/emfield/contrib/emvideo/providers/Attic/youtube.inc,v retrieving revision 1.1.2.8 diff -u -r1.1.2.8 youtube.inc --- contrib/emvideo/providers/youtube.inc 12 Aug 2008 19:38:44 -0000 1.1.2.8 +++ contrib/emvideo/providers/youtube.inc 12 Aug 2008 20:28:09 -0000 @@ -243,17 +243,17 @@ $related = isset($options['related']) ? $options['related'] : variable_get('emvideo_youtube_show_related_videos', 0); $related = "rel=$related"; $autoplay = isset($options['autoplay']) ? $options['autoplay'] : $autoplay; - $autoplay_value = $autoplay ? '&autoplay=1' : ''; + $autoplay_value = $autoplay ? '&autoplay=1' : ''; $show_colors = isset($options['show_colors']) ? $options['show_colors'] : variable_get('emvideo_youtube_show_colors', FALSE); if ($show_colors) { $color1 = isset($options['color1']) ? $options['color1'] : variable_get('emvideo_youtube_colors_color1', emvideo_YOUTUBE_COLOR1_DEFAULT); $color2 = isset($options['color2']) ? $options['color2'] : variable_get('emvideo_youtube_colors_color2', emvideo_YOUTUBE_COLOR2_DEFAULT); - $colors='&color1=0x'. emvideo_youtube_convert_color($color1) .'&color2=0x'. emvideo_youtube_convert_color($color2); + $colors='&color1=0x'. emvideo_youtube_convert_color($color1) .'&color2=0x'. emvideo_youtube_convert_color($color2); } $border = isset($options['border']) ? $options['border'] : variable_get('emvideo_youtube_show_border', FALSE); - $border = $border ? '&border=1' : ''; + $border = $border ? '&border=1' : ''; $enablejsapi = isset($options['enablejsapi']) ? $options['enablejsapi'] : variable_get('emvideo_youtube_enablejsapi', TRUE); - $enablejsapi = $enablejsapi ? '&enablejsapi=1&playerapiid=ytplayer' : ''; + $enablejsapi = $enablejsapi ? '&enablejsapi=1&playerapiid=ytplayer' : ''; $allowScriptAcess = $enablejsapi ? 'always' : 'sameDomain'; $id = isset($options['id']) ? $options['id'] : 'video-cck-youtube-flash-'. (++$count); $div_id = isset($options['div_id']) ? $options['div_id'] : 'video-cck-youtube-flash-wrapper-'. $count; Index: .project =================================================================== RCS file: .project diff -N .project --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .project 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,22 @@ + + + emfield + + + + + + org.eclipse.php.core.PhpIncrementalProjectBuilder + + + + + org.eclipse.php.core.ValidationManagerWrapper + + + + + + org.eclipse.php.core.PHPNature + +