X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/checkmark.gif?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=ac3f12ad3d83091c4ea61e318440e957614ef3e7;hb=8870ef4a2301f397d4b71da6ac25f4e2e5564199;hp=319a98efc03848c0bd699d75a584c0d7585d8b87;hpb=1b1822456d66be4761748a02d9f1d9e8caefb8be;p=embedvideo%2F.git
diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 319a98e..ac3f12a 100644
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -34,7 +34,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
* @see ItemAddPlugin::handleRequest
*/
function handleRequest($form, &$item) {
- global $gallery;
+ global $gallery, $url;
$status = $error = array();
@@ -90,6 +90,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$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")) {
@@ -109,6 +111,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
print "watermarkVideos=$watermarkVideos
\n";
print "watermarkImage=$watermarkImage
\n";
print "watermarkAlignment=$watermarkAlignment
\n";
+ print "wordwrapSummary=$wordwrapSummary
\n";
+ print "wordwrapDescription=$wordwrapDescription
\n";
print "
\n";
}
@@ -148,6 +152,15 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
/* divshare */
$divshareUrlPattern="divshare.com";
$divshareThumbnailUrl="http://www.divshare.com/direct/video_thumb/";
+
+ /* stickam */
+ $stickamUrlPattern="stickam.com";
+ $stickamThumbnailUrl="http://static.stickam.com/";
+
+ /* myspace */
+ $myspaceUrlPattern="vids.myspace.com";
+ $myspaceUrlPattern2="myspacetv.com";
+ $myspaceThumbnailUrl="http://mediaservices.myspace.com/services/rss.ashx?type=video&videoID=";
/* Gallery2 specific paths and variables */
$urlGenerator =& $gallery->getUrlGenerator();
@@ -227,7 +240,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description=preg_replace("/width='\d+'/","width='".$width."'",$description);
$description=preg_replace("/height='\d+'/","height='".$height."'",$description);
}
- $description.= "
$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
@@ -307,7 +319,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description.= $video_id.$autoStartStr.$youtubeShowRelatedStr;
$description.= '" type="application/x-shockwave-flash" wmode="transparent" ';
$description.= 'width="'.$width.'" height="'.$height.'">';
- $description.= "
$summary";
}
/*
**********************************
@@ -370,7 +381,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description.= 'type="application/x-shockwave-flash" ';
$description.= 'src="'.$googlePlayer.'?docId='.$doc_id.$autoStartStr.'" flashvars=""> ';
$description.= '';
- $description.= "
$summary";
/*
**********************************
@@ -418,7 +428,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description=preg_replace("/width='\d+'/","width='".$width."'",$description);
$description=preg_replace("/height='\d+'/","height='".$height."'",$description);
}
- $description.= "
$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
@@ -470,7 +479,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description=preg_replace("/\.swf/",".swf?playerVars=autoPlay=yes",$description);
}
$description.= "";
- $description.= "
$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
@@ -529,7 +537,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description=preg_replace("/$height/",$height.";autoplay:true",$description);
}
$description.= ">";
- $description.= "
$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
@@ -561,18 +568,18 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Extract the summary from the webpage contents */
- preg_match('//i', $contents, $matches);
+ preg_match('/(.+?)<\/div>/i', $contents, $matches);
$summary=$matches[1];
/* Extract the title from the webpage contents */
preg_match('/
/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('/