* @see ItemAddPlugin::handleRequest
*/
function handleRequest($form, &$item) {
- global $gallery;
+ global $gallery, $url;
$status = $error = array();
$watermarkImage = $this->getParameter($ItemAddEmbedVideo, 'watermarkImage', "");
$watermarkVideos = $this->getParameter($ItemAddEmbedVideo, 'watermarkVideos', "false");
$watermarkAlignment = $this->getParameter($ItemAddEmbedVideo, 'watermarkAlignment', "left");
+ $wordwrapSummary = $this->getParameter($ItemAddEmbedVideo, 'wordwrapSummary', "0");
+ $wordwrapDescription = $this->getParameter($ItemAddEmbedVideo, 'wordwrapDescription', "0");
/* Print our stored/set Parameters */
if(!strcmp($debugOutput,"true")) {
print "watermarkVideos=$watermarkVideos<br>\n";
print "watermarkImage=$watermarkImage<br>\n";
print "watermarkAlignment=$watermarkAlignment<br>\n";
+ print "wordwrapSummary=$wordwrapSummary<br>\n";
+ print "wordwrapDescription=$wordwrapDescription<br>\n";
print "<hr>\n";
}
*****************************
*/
if(preg_match("/$youtubeUrlPattern/",$url)) {
-
+
/* Make sure we can find a video_id in the URL */
- if(preg_match("/watch\?v=(.*)/",$url,$matches)) {
+ $extra_params = "";
+ if(preg_match("/watch\?v=(.*?)(&\S+=\S+)/",$url,$matches)) {
+ $video_id = $matches[1];
+ $extra_params = $matches[2];
+ } else if (preg_match("/watch\?v=(.*)/",$url,$matches)) {
$video_id = $matches[1];
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER,__FILE__,__LINE__,
"Unable to extract video id from url: $url"),null,null);
}
+
+ /* If extra params were given, handle them here */
+ if(strcmp($extra_params,"")) {
+ /* Handle the HD format information */
+ if(preg_match("/fmt=(\d+)/",$extra_params,$matches)) {
+ $extra_params="&ap=%2526fmt%3D".$matches[1];
+ }
+ }
+
+ if(!strcmp($debugOutput,"true")) {
+ print "<h2>URL Parsing Results</h2>";
+ print "video_id: $video_id<br>";
+ print "extra_embed_params: $extra_params<br>";
+ print "<hr>";
+ }
/* If we have a valid youtube developer id, use that to get information about the video */
/* Otherwise, just parse it directly from the HTML page */
$description=preg_replace("/</","<",$description);
$description=preg_replace("/>/",">",$description);
$description=preg_replace("/&/","&",$description);
- $description=preg_replace("/&rel=1/",$autoStartStr.$youtubeShowRelatedStr,$description);
+ $description=preg_replace("/$video_id/",$video_id.$autoStartStr.$youtubeShowRelatedStr,$description);
+ $description=preg_replace("/$video_id/",$video_id.$extra_params,$description);
if(!strcmp($useRemoteSize,"false")) {
$description=preg_replace("/width='\d+'/","width='".$width."'",$description);
$description=preg_replace("/height='\d+'/","height='".$height."'",$description);
}
- $description.= "<br>$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
/* Format the description to hold a reference to the embedded video */
$description = '<object width="'.$width.'" height="'.$height.'">';
$description.= '<param name="movie" ';
- $description.= 'value="http://www.youtube.com/v/'.$video_id.'"></param>';
+ $description.= 'value="http://www.youtube.com/v/'.$video_id.$extra_params.'"></param>';
$description.= '<param name="wmode" value="transparent"></param>';
$description.= '<embed src="http://www.youtube.com/v/';
- $description.= $video_id.$autoStartStr.$youtubeShowRelatedStr;
+ $description.= $video_id.$extra_params.$autoStartStr.$youtubeShowRelatedStr;
$description.= '" type="application/x-shockwave-flash" wmode="transparent" ';
$description.= 'width="'.$width.'" height="'.$height.'"></embed></object>';
- $description.= "<br>$summary";
}
/*
**********************************
$description.= 'type="application/x-shockwave-flash" ';
$description.= 'src="'.$googlePlayer.'?docId='.$doc_id.$autoStartStr.'" flashvars=""> ';
$description.= '</embed>';
- $description.= "<br>$summary";
/*
**********************************
$description=preg_replace("/width='\d+'/","width='".$width."'",$description);
$description=preg_replace("/height='\d+'/","height='".$height."'",$description);
}
- $description.= "<br>$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
$description=preg_replace("/\.swf/",".swf?playerVars=autoPlay=yes",$description);
}
$description.= "</embed>";
- $description.= "<br>$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
$description=preg_replace("/$height/",$height.";autoplay:true",$description);
}
$description.= ">";
- $description.= "<br>$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
}
/* Extract the summary from the webpage contents */
- preg_match('/<meta name="description" content="(.+?)" \/>/i', $contents, $matches);
+ preg_match('/<div class="description\s+foreground">(.+?)<\/div>/i', $contents, $matches);
$summary=$matches[1];
/* Extract the title from the webpage contents */
preg_match('/<meta name="title" content="Dailymotion : (.+?)" \/>/i', $contents, $matches);
- $title=$matches[1];
+ $title=htmlentities($matches[1], ENT_QUOTES, "UTF-8");
/* Build the thumbnail URL from the item_id */
$thumbnail=$dailymotionThumbnailUrl.$item_id;
/* Format the description to hold a reference to the embedded video */
- if(preg_match('/Embeddable Player:.+?value="(.+?)"/', $contents, $matches)) {
+ if(preg_match('/<textarea id="video_player_embed_code_text".+?>(.+?)<\/textarea>/', $contents, $matches)) {
$description=$matches[1];
$description=preg_replace("/"/","'",$description);
$description=preg_replace("/</","<",$description);
$description=preg_replace("/width=\"\d+\"/","width=\"".$width."\"",$description);
$description=preg_replace("/height=\"\d+\"/","height=\"".$height."\"",$description);
}
- $description.= "<br>$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
$description=preg_replace("/width=\"\d+\"/","width=\"".$width."\"",$description);
$description=preg_replace("/height=\"\d+\"/","height=\"".$height."\"",$description);
}
- $description.= "<br>$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
}
-
-
/*
**********************************
* Embed a StickAm Video
$description=preg_replace("/width='\d+'/","width='".$width."'",$description);
$description=preg_replace("/height='\d+'/","height='".$height."'",$description);
}
- $description.= "<br>$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
$description=preg_replace("/width='\d+'/","width='".$width."'",$description);
$description=preg_replace("/height='\d+'/","height='".$height."'",$description);
}
- $description.= "<br>$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
$fileName = preg_replace("/'/","",$fileName);
$fileName = preg_replace("/\"/","",$fileName);
$fileName = preg_replace("/&#\d+;/","",$fileName);
+
+ /* Wordwrap the description or summary as appropriate */
+ $description_summary = $summary;
+
+ if(strcmp($wordwrapSummary,"0")) {
+ $summary = wordwrap($summary,$wordwrapSummary,"<br>",FALSE);
+ }
+
+ if(strcmp($wordwrapDescription,"0")) {
+ $description_summary = wordwrap($description_summary,$wordwrapDescription,"<br>",FALSE);
+ }
+
+ /* Tack on the summary to the end of the description */
+ $description.= "<br>$description_summary";
/* General debug output */
if(!strcmp($debugOutput,"true")) {
global $gallery;
$requestMethod='GET';
-
+ $requestBody='';
+
/* Convert illegal characters */
$url = str_replace(' ', '%20', $url);